diff options
| author | Rozhuk Ivan <rozhuk.im@gmail.com> | 2015-03-24 02:53:25 +0000 |
|---|---|---|
| committer | Rozhuk Ivan <rozhuk.im@gmail.com> | 2015-03-24 02:53:25 +0000 |
| commit | 65aaaa950c793e9408a42d352db919d487ef2a2f (patch) | |
| tree | cbbdbff8a721e5fd6efa78754ca75a05b625ac3c /src | |
| parent | b2e1ec3eb79227ccea43e270d5ed1917cc0dcc53 (diff) | |
* multiple WINE bug fixes over IsDialogMessage(), bug rep: https://bugs.winehq.org/show_bug.cgi?id=38276
git-svn-id: http://svn.miranda-ng.org/main/trunk@12489 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/miranda.cpp | 2 | ||||
| -rw-r--r-- | src/mir_core/src/threads.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/miranda.cpp b/src/core/miranda.cpp index c2f92d7e9d..b5b65f8d40 100644 --- a/src/core/miranda.cpp +++ b/src/core/miranda.cpp @@ -266,7 +266,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE, LPTSTR cmdLine, int) DWORD pid = 0;
checkIdle(&msg);
if (h != NULL && GetWindowThreadProcessId(h, &pid) && pid == myPid && GetClassLongPtr(h, GCW_ATOM) == 32770)
- if (IsDialogMessage(h, &msg))
+ if (h != NULL && IsDialogMessage(h, &msg)) /* Wine fix. */
continue;
TranslateMessage(&msg);
diff --git a/src/mir_core/src/threads.cpp b/src/mir_core/src/threads.cpp index 5ab917460f..237bc2ed97 100644 --- a/src/mir_core/src/threads.cpp +++ b/src/mir_core/src/threads.cpp @@ -44,7 +44,8 @@ static int MirandaWaitForMutex(HANDLE hEvent) if (rc == WAIT_OBJECT_0 + 1) {
MSG msg;
while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
- if (IsDialogMessage(msg.hwnd, &msg)) continue;
+ if (msg.hwnd != NULL && IsDialogMessage(msg.hwnd, &msg)) /* Wine fix. */
+ continue;
TranslateMessage(&msg);
DispatchMessage(&msg);
}
|