simtactics/niotso
1
0
Fork 0
mirror of https://github.com/simtactics/niotso.git synced 2025-03-22 02:52:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Just learned that PostThreadMessage(ThreadID, WM_QUIT, 0, 0) works while PostQuitMessage(0) does not. Fixed an issue where, if the system fails before the window is created, the message loop thread is never killed.

Browse source
This commit is contained in:
Fatbag 2012-04-13 23:08:36 -05:00
parent 4294cb41f7
commit c5117169b9
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Client/CMakeLists.txt
View file

@ -16,6 +16,6 @@ if(WIN32)
System/System.cpp System/System.cpp
Window/Window.cpp Window/Window.cpp
) )
add_executable(TSO ${NIOTSOCLIENT_SOURCES}) add_executable(TSO WIN32 ${NIOTSOCLIENT_SOURCES})
target_link_libraries(TSO FileHandler_shared freetype_shared ole32 opengl32) target_link_libraries(TSO FileHandler_shared freetype_shared ole32 opengl32)
endif() endif()

13
Client/Window/Window.cpp
View file

@ -25,7 +25,8 @@ HWND hWnd;
static HANDLE Response = NULL; static HANDLE Response = NULL;
static HANDLE Thread = NULL; static HANDLE Thread = NULL;
static volatile int Result; static DWORD ThreadID = NULL;
static volatile int Result = NULL;
static DWORD WINAPI Procedure(LPVOID); static DWORD WINAPI Procedure(LPVOID);
static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
@ -39,7 +40,7 @@ int Initialize(){
return ERROR_WINDOW_SYNCOBJECT; return ERROR_WINDOW_SYNCOBJECT;
} }
Thread = CreateThread(NULL, 1024 /* very tiny stack size is needed */, Window::Procedure, NULL, 0, NULL); Thread = CreateThread(NULL, 1024 /* very tiny stack size is needed */, Window::Procedure, NULL, 0, &ThreadID);
if(Thread == NULL){ if(Thread == NULL){
MessageBox(NULL, "Failed to create the message loop thread.", NULL, MB_OK | MB_ICONERROR); MessageBox(NULL, "Failed to create the message loop thread.", NULL, MB_OK | MB_ICONERROR);
Shutdown(); Shutdown();
@ -75,7 +76,7 @@ void Shutdown(){
if(Thread){ if(Thread){
DWORD value; DWORD value;
while(GetExitCodeThread(Thread, &value) && value){ while(GetExitCodeThread(Thread, &value) && value){
//PostQuitMessage() doesn't reliably work from a separate thread PostThreadMessage(ThreadID, WM_QUIT, 0, 0);
Sleep(1); Sleep(1);
} }
Thread = NULL; Thread = NULL;
@ -103,12 +104,6 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
case WM_CLOSE: case WM_CLOSE:
System::UserInput_v.CloseWindow = true; System::UserInput_v.CloseWindow = true;
return 0; return 0;
case WM_SHOWWINDOW:
//Once the window is hidden (we cannot safely destroy the window while we have the OpenGL context),
//WM_QUIT and WM_DESTROY won't show up when a separate thread calls DestroyWindow() or PostQuitMessage().
if(wParam == FALSE) PostQuitMessage(0);
return 0;
case WM_DEVMODECHANGE: { case WM_DEVMODECHANGE: {
DEVMODE dm; DEVMODE dm;