Lucas Zawacki : joy.cpl: Correct joystick testing thread behavior.
Alexandre Julliard
julliard at winehq.org
Mon Jul 16 14:14:31 CDT 2012
Module: wine
Branch: master
Commit: 6e60adbf5b4d2f02475e231553149c2f9cc97acf
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e60adbf5b4d2f02475e231553149c2f9cc97acf
Author: Lucas Zawacki <lfzawacki at gmail.com>
Date: Mon Jul 16 14:05:39 2012 -0300
joy.cpl: Correct joystick testing thread behavior.
---
dlls/joy.cpl/main.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c
index eb8f982..e9b3a72 100644
--- a/dlls/joy.cpl/main.c
+++ b/dlls/joy.cpl/main.c
@@ -424,9 +424,11 @@ static INT_PTR CALLBACK test_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
}
break;
- case PSN_RESET:
+ case PSN_RESET: /* intentional fall-through */
+ case PSN_KILLACTIVE:
/* Stop input thread */
data->stop = TRUE;
+ MsgWaitForMultipleObjects(1, &thread, FALSE, INFINITE, 0);
CloseHandle(thread);
break;
}
More information about the wine-cvs
mailing list