wine-commits November 2020

wine-commits@winehq.org

1 participants
851 discussions

Esme Povirk : windowscodecs: Fix allocation in tiff_decoder_get_metadata_blocks.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: 764a93f121c6b0f88c3444454ebb85eb7cb63295 URL: https://source.winehq.org/git/wine.git/?a=commit;h=764a93f121c6b0f88c344445… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Nov 17 14:06:45 2020 -0600 windowscodecs: Fix allocation in tiff_decoder_get_metadata_blocks. Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libtiff.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/libtiff.c b/dlls/windowscodecs/libtiff.c index 27f89679766..7f174bbd5dd 100644 --- a/dlls/windowscodecs/libtiff.c +++ b/dlls/windowscodecs/libtiff.c @@ -1127,7 +1127,7 @@ static HRESULT CDECL tiff_decoder_get_metadata_blocks(struct decoder *iface, result.options |= WICPersistOptionNoCacheStream|DECODER_BLOCK_FULL_STREAM|DECODER_BLOCK_READER_CLSID; result.reader_clsid = CLSID_WICIfdMetadataReader; - *blocks = malloc(sizeof(**blocks)); + *blocks = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(**blocks)); **blocks = result; return S_OK;

1 0

Esme Povirk : windowscodecs: Fix memory leak in common decoder.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: 466bec7c1690edc52824ef6c3ad5a2b6e1ad2ecb URL: https://source.winehq.org/git/wine.git/?a=commit;h=466bec7c1690edc52824ef6c… Author: Esme Povirk <esme(a)codeweavers.com> Date: Tue Nov 17 14:06:44 2020 -0600 windowscodecs: Fix memory leak in common decoder. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50140 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/decoder.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/windowscodecs/decoder.c b/dlls/windowscodecs/decoder.c index ad5127cd258..0e97135bc16 100644 --- a/dlls/windowscodecs/decoder.c +++ b/dlls/windowscodecs/decoder.c @@ -95,6 +95,7 @@ static ULONG WINAPI CommonDecoder_Release(IWICBitmapDecoder *iface) IStream_Release(This->stream); This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); + decoder_destroy(This->decoder); HeapFree(GetProcessHeap(), 0, This); }

1 0

Paul Gofman : ntdll: Avoid overwriting parameters with context in call_user_apc_dispatcher() on x86.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: 2002aa15f476b4bb9039d5e47dfa2e3c0be58ee3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2002aa15f476b4bb9039d5e4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Nov 12 17:20:10 2020 +0300 ntdll: Avoid overwriting parameters with context in call_user_apc_dispatcher() on x86. Fixes crash in 32 bit kernel32 file test. The crash is not always reproducible as the issue depends on stack layout. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 4d8eeb2072c..58b79940773 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1688,15 +1688,18 @@ __ASM_GLOBAL_FUNC( call_user_apc_dispatcher, "movl %esp,%ebx\n\t" "cmpl %esp,%esi\n\t" "cmovbl %esi,%esp\n\t" + "pushl 20(%ebx)\n\t" /* func */ + "pushl 16(%ebx)\n\t" /* arg2 */ + "pushl 12(%ebx)\n\t" /* arg1 */ + "movl 8(%ebx),%ebx\n\t" /* ctx */ "movl $0x00010007,(%esi)\n\t" /* context.ContextFlags = CONTEXT_FULL */ "pushl %esi\n\t" /* context */ "pushl $0xfffffffe\n\t" "call " __ASM_STDCALL("NtGetContextThread",8) "\n\t" "movl $0xc0,0xb0(%esi)\n" /* context.Eax = STATUS_USER_APC */ - "movl 20(%ebx),%eax\n\t" /* func */ - "movl 16(%ebx),%ecx\n\t" /* arg2 */ - "movl 12(%ebx),%edx\n\t" /* arg1 */ - "movl 8(%ebx),%ebx\n\t" /* ctx */ + "popl %edx\n\t" + "popl %ecx\n\t" + "popl %eax\n\t" "leal -20(%esi),%esp\n\t" "movl %eax,16(%esp)\n" /* func */ "2:\tmovl %ecx,12(%esp)\n\t" /* arg2 */

1 0

Paul Gofman : directmanipulation: Return S_OK form viewport_SetViewportOptions stub.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: b58882993e7b28bd71f50f1eecd4750d576167e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b58882993e7b28bd71f50f1e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Nov 13 19:26:41 2020 +0300 directmanipulation: Return S_OK form viewport_SetViewportOptions stub. Fixes Paradox launcher crash on start when Windows version is set to 10. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/directmanipulation/directmanipulation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/directmanipulation/directmanipulation.c b/dlls/directmanipulation/directmanipulation.c index 36a863c7c69..5bb3461d443 100644 --- a/dlls/directmanipulation/directmanipulation.c +++ b/dlls/directmanipulation/directmanipulation.c @@ -610,7 +610,7 @@ static HRESULT WINAPI viewport_SetViewportOptions(IDirectManipulationViewport2 * { struct directviewport *This = impl_from_IDirectManipulationViewport2(iface); FIXME("%p, %d\n", This, options); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI viewport_AddConfiguration(IDirectManipulationViewport2 *iface, DIRECTMANIPULATION_CONFIGURATION configuration)

1 0

Damjan Jovanovic : cmd.exe: Increase size of WCMD_HandleTildeModifiers() buffers to MAXSTRING.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: abe848f05f5d91d4c8eb875ebbf143ca9ca9a210 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abe848f05f5d91d4c8eb875e… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Nov 13 18:09:59 2020 +0200 cmd.exe: Increase size of WCMD_HandleTildeModifiers() buffers to MAXSTRING. Some buffers in WCMD_HandleTildeModifiers() are only of size MAX_PATH, even though they handle strings that aren't necessarily filenames. When changed to have size MAXSTRING, a stack overflow crash with strings of size MAX_PATH stops happening. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42731 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/batch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 3aa40874aea..a08648d8c26 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -342,8 +342,8 @@ void WCMD_HandleTildeModifiers(WCHAR **start, BOOL atExecute) }; WIN32_FILE_ATTRIBUTE_DATA fileInfo; - WCHAR outputparam[MAX_PATH]; - WCHAR finaloutput[MAX_PATH]; + WCHAR outputparam[MAXSTRING]; + WCHAR finaloutput[MAXSTRING]; WCHAR fullfilename[MAX_PATH]; WCHAR thisoutput[MAX_PATH]; WCHAR *filepart = NULL;

1 0

Jeff Smith : user32: Only child windows should not receive broadcast messages.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: ab1a97926811f91760d699a5f98b25febdfbf8eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab1a97926811f91760d699a5… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Nov 16 08:45:31 2020 -0600 user32: Only child windows should not receive broadcast messages. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 3 ++- dlls/user32/tests/msg.c | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 4434f4b0c2a..d8ebbfd32e3 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -552,7 +552,8 @@ LRESULT WINAPI MessageWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lP static BOOL CALLBACK broadcast_message_callback( HWND hwnd, LPARAM lparam ) { struct send_message_info *info = (struct send_message_info *)lparam; - if (!(GetWindowLongW( hwnd, GWL_STYLE ) & (WS_POPUP|WS_CAPTION))) return TRUE; + if ((GetWindowLongW( hwnd, GWL_STYLE ) & (WS_POPUP|WS_CHILD)) == WS_CHILD) + return TRUE; switch(info->type) { case MSG_UNICODE: diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f6802fe3bdd..2ce2b3c6e54 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16002,10 +16002,9 @@ static void test_broadcast(void) { LONG style; BOOL receive; - BOOL todo; } bcast_expect[] = { - {WS_OVERLAPPED, TRUE, TRUE}, + {WS_OVERLAPPED, TRUE}, {WS_OVERLAPPED|WS_DLGFRAME, TRUE}, {WS_OVERLAPPED|WS_BORDER, TRUE}, {WS_OVERLAPPED|WS_CAPTION, TRUE}, @@ -16096,7 +16095,6 @@ static void test_broadcast(void) for (j = 0; j < ARRAY_SIZE(bcast_expect); j++) { wparam_expected = (msg_expected && bcast_expect[j].receive) ? 0xbaadbeef : 0xdead; - todo_wine_if (msg_expected && bcast_expect[j].todo) ok(g_broadcast_sub_wparam[j] == wparam_expected, "%d,%d: message %04x, got %#lx, error %d\n", i, j, messages[i], g_broadcast_sub_wparam[j], GetLastError()); @@ -16118,7 +16116,6 @@ static void test_broadcast(void) for (j = 0; j < ARRAY_SIZE(bcast_expect); j++) { wparam_expected = (msg_expected && bcast_expect[j].receive) ? 0xbaadbeef : 0xdead; - todo_wine_if (msg_expected && bcast_expect[j].todo) ok(g_broadcast_sub_wparam[j] == wparam_expected, "%d,%d: message %04x, got %#lx, error %d\n", i, j, messages[i], g_broadcast_sub_wparam[j], GetLastError());

1 0

Jeff Smith : user32/tests: Test message broadcast to parented windows.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: 81dec8de77a50148ba50ac05a307431bcf365147 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81dec8de77a50148ba50ac05… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Nov 16 08:45:30 2020 -0600 user32/tests: Test message broadcast to parented windows. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 81 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 8aae9405320..f6802fe3bdd 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15976,6 +15976,16 @@ static LRESULT WINAPI broadcast_test_proc(HWND hwnd, UINT message, WPARAM wParam return CallWindowProcA(oldproc, hwnd, message, wParam, lParam); } +static WNDPROC *g_oldproc_sub; +static WPARAM *g_broadcast_sub_wparam; +static LRESULT WINAPI broadcast_test_sub_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + int sub_index = GetWindowLongPtrA(hwnd, GWLP_USERDATA); + + g_broadcast_sub_wparam[sub_index] = (wParam == 0xbaadbeef) ? wParam : 0; + + return CallWindowProcA(g_oldproc_sub[sub_index], hwnd, message, wParam, lParam); +} static void test_broadcast(void) { @@ -15988,9 +15998,35 @@ static void test_broadcast(void) 0xc000, /* lowest possible atom returned by RegisterWindowMessage */ 0xffff, }; + static const struct + { + LONG style; + BOOL receive; + BOOL todo; + } bcast_expect[] = + { + {WS_OVERLAPPED, TRUE, TRUE}, + {WS_OVERLAPPED|WS_DLGFRAME, TRUE}, + {WS_OVERLAPPED|WS_BORDER, TRUE}, + {WS_OVERLAPPED|WS_CAPTION, TRUE}, + {WS_CHILD, FALSE}, + {WS_CHILD|WS_DLGFRAME, FALSE}, + {WS_CHILD|WS_BORDER, FALSE}, + {WS_CHILD|WS_CAPTION, FALSE}, + {WS_CHILD|WS_POPUP, TRUE}, + {WS_POPUP, TRUE}, + {WS_POPUP|WS_DLGFRAME, TRUE}, + {WS_POPUP|WS_BORDER, TRUE}, + {WS_POPUP|WS_CAPTION, TRUE}, + }; WNDPROC oldproc; - unsigned int i; + unsigned int i, j; HWND hwnd; + HWND *hwnd_sub; + + hwnd_sub = HeapAlloc( GetProcessHeap(), 0, ARRAY_SIZE(bcast_expect) * sizeof(*hwnd_sub) ); + g_oldproc_sub = HeapAlloc( GetProcessHeap(), 0, ARRAY_SIZE(bcast_expect) * sizeof(*g_oldproc_sub) ); + g_broadcast_sub_wparam = HeapAlloc( GetProcessHeap(), 0, ARRAY_SIZE(bcast_expect) * sizeof(*g_broadcast_sub_wparam) ); hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP, 0, 0, 0, 0, 0, 0, 0, NULL); ok(hwnd != NULL, "got %p\n", hwnd); @@ -16027,9 +16063,28 @@ static void test_broadcast(void) ok(ret == msg_expected, "%d: message %04x, got %d, error %d\n", i, messages[i], ret, GetLastError()); if (msg_expected) ok(msg.hwnd == hwnd, "%d: got %p\n", i, msg.hwnd); + } + + for (j = 0; j < ARRAY_SIZE(bcast_expect); j++) + { + hwnd_sub[j] = CreateWindowA("static", NULL, bcast_expect[j].style, 0, 0, 0, 0, hwnd, 0, 0, NULL); + ok(hwnd_sub[j] != NULL, "got %p\n", hwnd_sub[j]); + /* CreateWindow adds extra style flags, so call SetWindowLong to clear some of those. */ + SetWindowLongA(hwnd_sub[j], GWL_STYLE, bcast_expect[j].style); + + g_oldproc_sub[j] = (WNDPROC)SetWindowLongPtrA(hwnd_sub[j], GWLP_WNDPROC, (LONG_PTR)broadcast_test_sub_proc); + SetWindowLongPtrA(hwnd_sub[j], GWLP_USERDATA, (LONG_PTR)j); + } + + for (i = 0; i < ARRAY_SIZE(messages); i++) + { + BOOL ret; + BOOL msg_expected = (messages[i] < WM_USER || messages[i] >= 0xc000); /* send, broadcast */ g_broadcast_wparam = 0xdead; + for (j = 0; j < ARRAY_SIZE(bcast_expect); j++) + g_broadcast_sub_wparam[j] = 0xdead; ret = SendMessageTimeoutA(HWND_BROADCAST, messages[i], 0xbaadbeef, 0, SMTO_NORMAL, 2000, NULL); if (!ret && GetLastError() == ERROR_TIMEOUT) win_skip("broadcasting test %d, timeout\n", i); @@ -16038,10 +16093,20 @@ static void test_broadcast(void) WPARAM wparam_expected = msg_expected ? 0xbaadbeef : 0xdead; ok(g_broadcast_wparam == wparam_expected, "%d: message %04x, got %#lx, error %d\n", i, messages[i], g_broadcast_wparam, GetLastError()); + for (j = 0; j < ARRAY_SIZE(bcast_expect); j++) + { + wparam_expected = (msg_expected && bcast_expect[j].receive) ? 0xbaadbeef : 0xdead; + todo_wine_if (msg_expected && bcast_expect[j].todo) + ok(g_broadcast_sub_wparam[j] == wparam_expected, + "%d,%d: message %04x, got %#lx, error %d\n", i, j, messages[i], + g_broadcast_sub_wparam[j], GetLastError()); + } } /* send, topmost */ g_broadcast_wparam = 0xdead; + for (j = 0; j < ARRAY_SIZE(bcast_expect); j++) + g_broadcast_sub_wparam[j] = 0xdead; ret = SendMessageTimeoutA(HWND_TOPMOST, messages[i], 0xbaadbeef, 0, SMTO_NORMAL, 2000, NULL); if (!ret && GetLastError() == ERROR_TIMEOUT) win_skip("broadcasting test %d, timeout\n", i); @@ -16050,9 +16115,24 @@ static void test_broadcast(void) WPARAM wparam_expected = msg_expected ? 0xbaadbeef : 0xdead; ok(g_broadcast_wparam == wparam_expected, "%d: message %04x, got %#lx, error %d\n", i, messages[i], g_broadcast_wparam, GetLastError()); + for (j = 0; j < ARRAY_SIZE(bcast_expect); j++) + { + wparam_expected = (msg_expected && bcast_expect[j].receive) ? 0xbaadbeef : 0xdead; + todo_wine_if (msg_expected && bcast_expect[j].todo) + ok(g_broadcast_sub_wparam[j] == wparam_expected, + "%d,%d: message %04x, got %#lx, error %d\n", i, j, messages[i], + g_broadcast_sub_wparam[j], GetLastError()); + } } } + for (j = 0; j < ARRAY_SIZE(bcast_expect); j++) + DestroyWindow(hwnd_sub[j]); + + HeapFree(GetProcessHeap(), 0, g_broadcast_sub_wparam); + HeapFree(GetProcessHeap(), 0, g_oldproc_sub); + HeapFree(GetProcessHeap(), 0, hwnd_sub); + DestroyWindow(hwnd); }

1 0

Jeff Smith : user32/tests: Simplification of some message broadcast tests.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: e4538d9a1131e0051de213b74b30929897b8e330 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4538d9a1131e0051de213b7… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Nov 16 08:45:29 2020 -0600 user32/tests: Simplification of some message broadcast tests. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 47 +++++++++++------------------------------------ 1 file changed, 11 insertions(+), 36 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 1e616e3d061..8aae9405320 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16001,6 +16001,7 @@ static void test_broadcast(void) for (i = 0; i < ARRAY_SIZE(messages); i++) { BOOL ret; + BOOL msg_expected = (messages[i] < WM_USER || messages[i] >= 0xc000); MSG msg; flush_events(); @@ -16013,15 +16014,9 @@ static void test_broadcast(void) memset(&msg, 0xab, sizeof(msg)); ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); - if (messages[i] < WM_USER || messages[i] >= 0xc000) - { - ok(ret, "%d: message %04x, got %d, error %d\n", i, messages[i], ret, GetLastError()); + ok(ret == msg_expected, "%d: message %04x, got %d, error %d\n", i, messages[i], ret, GetLastError()); + if (msg_expected) ok(msg.hwnd == hwnd, "%d: got %p\n", i, msg.hwnd); - } - else - { - ok(!ret, "%d: message %04x, got %d, error %d\n", i, messages[i], ret, GetLastError()); - } /* post, topmost */ ret = PostMessageA(HWND_TOPMOST, messages[i], 0, 0); @@ -16029,15 +16024,9 @@ static void test_broadcast(void) memset(&msg, 0xab, sizeof(msg)); ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); - if (messages[i] < WM_USER || messages[i] >= 0xc000) - { - ok(ret, "%d: message %04x, got %d, error %d\n", i, messages[i], ret, GetLastError()); + ok(ret == msg_expected, "%d: message %04x, got %d, error %d\n", i, messages[i], ret, GetLastError()); + if (msg_expected) ok(msg.hwnd == hwnd, "%d: got %p\n", i, msg.hwnd); - } - else - { - ok(!ret, "%d: got %d, error %d\n", i, ret, GetLastError()); - } /* send, broadcast */ g_broadcast_wparam = 0xdead; @@ -16046,16 +16035,9 @@ static void test_broadcast(void) win_skip("broadcasting test %d, timeout\n", i); else { - if (messages[i] < WM_USER || messages[i] >= 0xc000) - { - ok(g_broadcast_wparam == 0xbaadbeef, "%d: message %04x, got %#lx, error %d\n", i, messages[i], - g_broadcast_wparam, GetLastError()); - } - else - { - ok(g_broadcast_wparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], - g_broadcast_wparam, GetLastError()); - } + WPARAM wparam_expected = msg_expected ? 0xbaadbeef : 0xdead; + ok(g_broadcast_wparam == wparam_expected, "%d: message %04x, got %#lx, error %d\n", + i, messages[i], g_broadcast_wparam, GetLastError()); } /* send, topmost */ @@ -16065,16 +16047,9 @@ static void test_broadcast(void) win_skip("broadcasting test %d, timeout\n", i); else { - if (messages[i] < WM_USER || messages[i] >= 0xc000) - { - ok(g_broadcast_wparam == 0xbaadbeef, "%d: message %04x, got %#lx, error %d\n", i, messages[i], - g_broadcast_wparam, GetLastError()); - } - else - { - ok(g_broadcast_wparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], - g_broadcast_wparam, GetLastError()); - } + WPARAM wparam_expected = msg_expected ? 0xbaadbeef : 0xdead; + ok(g_broadcast_wparam == wparam_expected, "%d: message %04x, got %#lx, error %d\n", + i, messages[i], g_broadcast_wparam, GetLastError()); } }

1 0

Jeff Smith : user32/tests: Change misleading variable name and type.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: e92cc29d6c520ff44e73a6dc7f2807bbe78c2746 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e92cc29d6c520ff44e73a6dc… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Mon Nov 16 08:45:28 2020 -0600 user32/tests: Change misleading variable name and type. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index bf20c5c7f20..1e616e3d061 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15964,15 +15964,15 @@ static void test_PostMessage(void) flush_events(); } -static LPARAM g_broadcast_lparam; +static WPARAM g_broadcast_wparam; static LRESULT WINAPI broadcast_test_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); if (wParam == 0xbaadbeef) - g_broadcast_lparam = wParam; + g_broadcast_wparam = wParam; else - g_broadcast_lparam = 0; + g_broadcast_wparam = 0; return CallWindowProcA(oldproc, hwnd, message, wParam, lParam); } @@ -16040,7 +16040,7 @@ static void test_broadcast(void) } /* send, broadcast */ - g_broadcast_lparam = 0xdead; + g_broadcast_wparam = 0xdead; ret = SendMessageTimeoutA(HWND_BROADCAST, messages[i], 0xbaadbeef, 0, SMTO_NORMAL, 2000, NULL); if (!ret && GetLastError() == ERROR_TIMEOUT) win_skip("broadcasting test %d, timeout\n", i); @@ -16048,18 +16048,18 @@ static void test_broadcast(void) { if (messages[i] < WM_USER || messages[i] >= 0xc000) { - ok(g_broadcast_lparam == 0xbaadbeef, "%d: message %04x, got %#lx, error %d\n", i, messages[i], - g_broadcast_lparam, GetLastError()); + ok(g_broadcast_wparam == 0xbaadbeef, "%d: message %04x, got %#lx, error %d\n", i, messages[i], + g_broadcast_wparam, GetLastError()); } else { - ok(g_broadcast_lparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], - g_broadcast_lparam, GetLastError()); + ok(g_broadcast_wparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], + g_broadcast_wparam, GetLastError()); } } /* send, topmost */ - g_broadcast_lparam = 0xdead; + g_broadcast_wparam = 0xdead; ret = SendMessageTimeoutA(HWND_TOPMOST, messages[i], 0xbaadbeef, 0, SMTO_NORMAL, 2000, NULL); if (!ret && GetLastError() == ERROR_TIMEOUT) win_skip("broadcasting test %d, timeout\n", i); @@ -16067,13 +16067,13 @@ static void test_broadcast(void) { if (messages[i] < WM_USER || messages[i] >= 0xc000) { - ok(g_broadcast_lparam == 0xbaadbeef, "%d: message %04x, got %#lx, error %d\n", i, messages[i], - g_broadcast_lparam, GetLastError()); + ok(g_broadcast_wparam == 0xbaadbeef, "%d: message %04x, got %#lx, error %d\n", i, messages[i], + g_broadcast_wparam, GetLastError()); } else { - ok(g_broadcast_lparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], - g_broadcast_lparam, GetLastError()); + ok(g_broadcast_wparam == 0xdead, "%d: message %04x, got %#lx, error %d\n", i, messages[i], + g_broadcast_wparam, GetLastError()); } } }

1 0

Zhiyi Zhang : winex11.drv: Clarify parent in struct x11drv_win_data comments.
by Alexandre Julliard 17 Nov '20

17 Nov '20

Module: wine Branch: master Commit: ae79a91902857f186b02e97ae81708cc19574e63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae79a91902857f186b02e97a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 17 17:05:33 2020 +0800 winex11.drv: Clarify parent in struct x11drv_win_data comments. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/x11drv.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 173d94b9efa..45855976607 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -563,9 +563,9 @@ struct x11drv_win_data HWND hwnd; /* hwnd that this private data belongs to */ Window whole_window; /* X window for the complete window */ Window client_window; /* X window for the client area */ - RECT window_rect; /* USER window rectangle relative to parent */ - RECT whole_rect; /* X window rectangle for the whole window relative to parent */ - RECT client_rect; /* client area relative to parent */ + RECT window_rect; /* USER window rectangle relative to win32 parent window client area */ + RECT whole_rect; /* X window rectangle for the whole window relative to win32 parent window client area */ + RECT client_rect; /* client area relative to win32 parent window client area */ XIC xic; /* X input context */ BOOL managed : 1; /* is window managed? */ BOOL mapped : 1; /* is window mapped? (in either normal or iconic state) */

1 0

← Newer
1
...
37
38
39
40
41
42
43
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2020