diff options
| author | Henrik "Henke37" Andersson | 2019-06-24 21:32:45 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2019-06-25 07:54:31 +0300 |
| commit | 39f63f1236e57733189f90ca90fda9aa1e2993f8 (patch) | |
| tree | 9efddd485918247c519cce6f5647f4c8e7c73e93 /backends | |
| parent | 2382200205de5dcd3a109305d76abe867d0e5202 (diff) | |
| download | scummvm-rg350-39f63f1236e57733189f90ca90fda9aa1e2993f8.tar.gz scummvm-rg350-39f63f1236e57733189f90ca90fda9aa1e2993f8.tar.bz2 scummvm-rg350-39f63f1236e57733189f90ca90fda9aa1e2993f8.zip | |
WIN32: Make use of the window handle when calling ShellExecute.
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/platform/sdl/win32/win32.cpp | 4 | ||||
| -rw-r--r-- | backends/platform/sdl/win32/win32.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp index ef101d3075..a116e71e76 100644 --- a/backends/platform/sdl/win32/win32.cpp +++ b/backends/platform/sdl/win32/win32.cpp @@ -136,7 +136,7 @@ bool OSystem_Win32::displayLogFile() { // Try opening the log file with the default text editor // log files should be registered as "txtfile" by default and thus open in the default text editor - HINSTANCE shellExec = ShellExecute(NULL, NULL, _logFilePath.c_str(), NULL, NULL, SW_SHOWNORMAL); + HINSTANCE shellExec = ShellExecute(getHwnd(), NULL, _logFilePath.c_str(), NULL, NULL, SW_SHOWNORMAL); if ((intptr_t)shellExec > 32) return true; @@ -169,7 +169,7 @@ bool OSystem_Win32::displayLogFile() { } bool OSystem_Win32::openUrl(const Common::String &url) { - HINSTANCE result = ShellExecute(NULL, NULL, /*(wchar_t*)nativeFilePath.utf16()*/url.c_str(), NULL, NULL, SW_SHOWNORMAL); + HINSTANCE result = ShellExecute(getHwnd(), NULL, /*(wchar_t*)nativeFilePath.utf16()*/url.c_str(), NULL, NULL, SW_SHOWNORMAL); // ShellExecute returns a value greater than 32 if successful if ((intptr_t)result <= 32) { warning("ShellExecute failed: error = %p", (void*)result); diff --git a/backends/platform/sdl/win32/win32.h b/backends/platform/sdl/win32/win32.h index bee160f0a0..9919495e37 100644 --- a/backends/platform/sdl/win32/win32.h +++ b/backends/platform/sdl/win32/win32.h @@ -24,6 +24,7 @@ #define PLATFORM_SDL_WIN32_H #include "backends/platform/sdl/sdl.h" +#include "backends/platform/sdl/win32/win32-window.h" class OSystem_Win32 : public OSystem_SDL { public: @@ -61,6 +62,8 @@ protected: // Override createAudioCDManager() to get our Mac-specific // version. virtual AudioCDManager *createAudioCDManager(); + + HWND getHwnd() { return ((SdlWindow_Win32*)_window)->getHwnd(); } }; #endif |