November 2022 - Wine-commits

Zebediah Figura : ws2_32/tests: Add tests for WSAStartup().
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: f524c2cd178570f8ab34c8d44c93e2576a943e05 URL: https://gitlab.winehq.org/wine/wine/-/commit/f524c2cd178570f8ab34c8d44c93e2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 1 00:20:46 2022 -0600 ws2_32/tests: Add tests for WSAStartup(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 155449c5d1d8c12114b2cdda2855e28c158e271f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/tests/protocol.c | 99 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 881e3a388fd..c7ba014a0bf 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2815,10 +2815,86 @@ static void test_WSCGetProviderPath(void) ok(len == 256, "Got unexpected len %d.\n", len); } +static void test_startup(void) +{ + unsigned int i; + WSADATA data; + int ret; + + static const struct + { + WORD version; + WORD ret_version; + } + tests[] = + { + {MAKEWORD(0, 0), MAKEWORD(2, 2)}, + {MAKEWORD(0, 1), MAKEWORD(2, 2)}, + {MAKEWORD(1, 0), MAKEWORD(1, 0)}, + {MAKEWORD(1, 1), MAKEWORD(1, 1)}, + {MAKEWORD(1, 2), MAKEWORD(1, 1)}, + {MAKEWORD(1, 0xff), MAKEWORD(1, 1)}, + {MAKEWORD(2, 0), MAKEWORD(2, 0)}, + {MAKEWORD(2, 1), MAKEWORD(2, 1)}, + {MAKEWORD(2, 2), MAKEWORD(2, 2)}, + {MAKEWORD(2, 3), MAKEWORD(2, 2)}, + {MAKEWORD(2, 0xff), MAKEWORD(2, 2)}, + {MAKEWORD(3, 0), MAKEWORD(2, 2)}, + {MAKEWORD(0xff, 0), MAKEWORD(2, 2)}, + }; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + winetest_push_context("Version %#x", tests[i].version); + + memset(&data, 0xcc, sizeof(data)); + data.lpVendorInfo = (void *)0xdeadbeef; + ret = WSAStartup(tests[i].version, &data); + ok(ret == (LOBYTE(tests[i].version) ? 0 : WSAVERNOTSUPPORTED), "got %d\n", ret); + todo_wine_if (tests[i].version != tests[i].ret_version) + ok(data.wVersion == tests[i].ret_version, "got version %#x\n", data.wVersion); + if (!ret) + { + ret = WSAStartup(tests[i].version, &data); + ok(!ret, "got %d\n", ret); + + WSASetLastError(0xdeadbeef); + ret = WSACleanup(); + ok(!ret, "got %d\n", ret); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = WSACleanup(); + ok(!ret, "got %d\n", ret); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + } + ok(data.lpVendorInfo == (void *)0xdeadbeef, "got vendor info %p\n", data.lpVendorInfo); + todo_wine_if (ret) + { + ok(data.wHighVersion == 0x202, "got maximum version %#x\n", data.wHighVersion); + ok(!strcmp(data.szDescription, "WinSock 2.0"), "got description %s\n", debugstr_a(data.szDescription)); + ok(!strcmp(data.szSystemStatus, "Running"), "got status %s\n", debugstr_a(data.szSystemStatus)); + } + todo_wine ok(data.iMaxSockets == (LOBYTE(tests[i].version) == 1 ? 32767 : 0), "got maximum sockets %u\n", data.iMaxSockets); + todo_wine ok(data.iMaxUdpDg == (LOBYTE(tests[i].version) == 1 ? 65467 : 0), "got maximum datagram size %u\n", data.iMaxUdpDg); + + WSASetLastError(0xdeadbeef); + ret = WSACleanup(); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSANOTINITIALISED, "got error %u\n", WSAGetLastError()); + + ret = WSAStartup(tests[i].version, NULL); + todo_wine_if (LOBYTE(tests[i].version)) + ok(ret == (LOBYTE(tests[i].version) ? WSAEFAULT : WSAVERNOTSUPPORTED), "got %d\n", ret); + + winetest_pop_context(); + } +} + START_TEST( protocol ) { WSADATA data; - WORD version = MAKEWORD( 2, 2 ); + int ret; pFreeAddrInfoExW = (void *)GetProcAddress(GetModuleHandleA("ws2_32"), "FreeAddrInfoExW"); pGetAddrInfoExOverlappedResult = (void *)GetProcAddress(GetModuleHandleA("ws2_32"), "GetAddrInfoExOverlappedResult"); @@ -2830,7 +2906,8 @@ START_TEST( protocol ) pInetPtonW = (void *)GetProcAddress(GetModuleHandleA("ws2_32"), "InetPtonW"); pWSCGetProviderInfo = (void *)GetProcAddress(GetModuleHandleA("ws2_32"), "WSCGetProviderInfo"); - if (WSAStartup( version, &data )) return; + ret = WSAStartup(0x202, &data); + ok(!ret, "got %d\n", ret); test_WSAEnumProtocolsA(); test_WSAEnumProtocolsW(); @@ -2839,8 +2916,6 @@ START_TEST( protocol ) test_getservbyname(); test_WSALookupService(); - test_WSAAsyncGetServByPort(); - test_WSAAsyncGetServByName(); test_inet_ntoa(); test_inet_pton(); @@ -2862,4 +2937,20 @@ START_TEST( protocol ) test_WSAEnumNameSpaceProvidersW(); test_WSCGetProviderInfo(); test_WSCGetProviderPath(); + + WSACleanup(); + + /* These tests are finnicky. If WSAStartup() is ever called with a + * version below 2.2, it causes getaddrinfo() to behave differently. */ + + test_startup(); + + /* And if WSAAsyncGetServBy*() is ever called, it somehow causes + * WSAStartup() to succeed with 0.1 instead of failing. */ + + ret = WSAStartup(0x202, &data); + ok(!ret, "got %d\n", ret); + + test_WSAAsyncGetServByPort(); + test_WSAAsyncGetServByName(); }

1 0

Zebediah Figura : ws2_32: Always fill the WSADATA structure in WSAStartup().
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 2df966efba17814a418865f0d111cb2bf1b5df42 URL: https://gitlab.winehq.org/wine/wine/-/commit/2df966efba17814a418865f0d111cb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 1 00:20:47 2022 -0600 ws2_32: Always fill the WSADATA structure in WSAStartup(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 864bef4f8d3faadcc83f94b213e7fae4e564c217) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/socket.c | 33 ++++++++++++++++----------------- dlls/ws2_32/tests/protocol.c | 9 +++------ 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fe7e4fb3464..23140529b24 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -572,29 +572,28 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) /*********************************************************************** * WSAStartup (WS2_32.115) */ -int WINAPI WSAStartup(WORD wVersionRequested, LPWSADATA lpWSAData) +int WINAPI WSAStartup( WORD version, WSADATA *data ) { - TRACE("verReq=%x\n", wVersionRequested); + TRACE( "version %#x\n", version ); - if (LOBYTE(wVersionRequested) < 1) + if (data) + { + data->wVersion = version; + data->wHighVersion = MAKEWORD(2, 2); + strcpy( data->szDescription, "WinSock 2.0" ); + strcpy( data->szSystemStatus, "Running" ); + data->iMaxSockets = MAX_SOCKETS_PER_PROCESS; + data->iMaxUdpDg = MAX_UDP_DATAGRAM; + /* don't fill lpVendorInfo */ + } + + if (!LOBYTE(version)) return WSAVERNOTSUPPORTED; - if (!lpWSAData) return WSAEINVAL; + if (!data) return WSAEINVAL; num_startup++; - - /* that's the whole of the negotiation for now */ - lpWSAData->wVersion = wVersionRequested; - /* return winsock information */ - lpWSAData->wHighVersion = 0x0202; - strcpy(lpWSAData->szDescription, "WinSock 2.0" ); - strcpy(lpWSAData->szSystemStatus, "Running" ); - lpWSAData->iMaxSockets = MAX_SOCKETS_PER_PROCESS; - lpWSAData->iMaxUdpDg = MAX_UDP_DATAGRAM; - /* don't do anything with lpWSAData->lpVendorInfo */ - /* (some apps don't allocate the space for this field) */ - - TRACE("succeeded starts: %d\n", num_startup); + TRACE( "increasing startup count to %d\n", num_startup ); return 0; } diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index c7ba014a0bf..6ac0eb96521 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2869,12 +2869,9 @@ static void test_startup(void) todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); } ok(data.lpVendorInfo == (void *)0xdeadbeef, "got vendor info %p\n", data.lpVendorInfo); - todo_wine_if (ret) - { - ok(data.wHighVersion == 0x202, "got maximum version %#x\n", data.wHighVersion); - ok(!strcmp(data.szDescription, "WinSock 2.0"), "got description %s\n", debugstr_a(data.szDescription)); - ok(!strcmp(data.szSystemStatus, "Running"), "got status %s\n", debugstr_a(data.szSystemStatus)); - } + ok(data.wHighVersion == 0x202, "got maximum version %#x\n", data.wHighVersion); + ok(!strcmp(data.szDescription, "WinSock 2.0"), "got description %s\n", debugstr_a(data.szDescription)); + ok(!strcmp(data.szSystemStatus, "Running"), "got status %s\n", debugstr_a(data.szSystemStatus)); todo_wine ok(data.iMaxSockets == (LOBYTE(tests[i].version) == 1 ? 32767 : 0), "got maximum sockets %u\n", data.iMaxSockets); todo_wine ok(data.iMaxUdpDg == (LOBYTE(tests[i].version) == 1 ? 65467 : 0), "got maximum datagram size %u\n", data.iMaxUdpDg);

1 0

Zebediah Figura : ws2_32: Cap the negotiated winsock version to 1.1 or 2.2.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: e27f4ab23d09c0dbc6774557a59e3af09b831951 URL: https://gitlab.winehq.org/wine/wine/-/commit/e27f4ab23d09c0dbc6774557a59e3a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 1 00:20:48 2022 -0600 ws2_32: Cap the negotiated winsock version to 1.1 or 2.2. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit e078f698815ea160ee78b49f2c9679d3607e998d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/socket.c | 8 +++++++- dlls/ws2_32/tests/protocol.c | 3 +-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 23140529b24..565f1c89dc0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -578,7 +578,13 @@ int WINAPI WSAStartup( WORD version, WSADATA *data ) if (data) { - data->wVersion = version; + if (!LOBYTE(version) || LOBYTE(version) > 2 + || (LOBYTE(version) == 2 && HIBYTE(version) > 2)) + data->wVersion = MAKEWORD(2, 2); + else if (LOBYTE(version) == 1 && HIBYTE(version) > 1) + data->wVersion = MAKEWORD(1, 1); + else + data->wVersion = version; data->wHighVersion = MAKEWORD(2, 2); strcpy( data->szDescription, "WinSock 2.0" ); strcpy( data->szSystemStatus, "Running" ); diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 6ac0eb96521..a8b12441f2b 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2851,8 +2851,7 @@ static void test_startup(void) data.lpVendorInfo = (void *)0xdeadbeef; ret = WSAStartup(tests[i].version, &data); ok(ret == (LOBYTE(tests[i].version) ? 0 : WSAVERNOTSUPPORTED), "got %d\n", ret); - todo_wine_if (tests[i].version != tests[i].ret_version) - ok(data.wVersion == tests[i].ret_version, "got version %#x\n", data.wVersion); + ok(data.wVersion == tests[i].ret_version, "got version %#x\n", data.wVersion); if (!ret) { ret = WSAStartup(tests[i].version, &data);

1 0

Zebediah Figura : ws2_32: Return 32767 or 0 in the iMaxSockets field.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 4479b1a04a5e3d234815f642ff3aca370210c3b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/4479b1a04a5e3d234815f642ff3aca… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 1 00:20:49 2022 -0600 ws2_32: Return 32767 or 0 in the iMaxSockets field. Depending on reported winsock version. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50352 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 699643c4276ad6b73a2077886ed1bef138b5cfef) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/socket.c | 3 +-- dlls/ws2_32/tests/protocol.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 565f1c89dc0..19a7d901414 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -419,7 +419,6 @@ static BOOL socket_list_remove( SOCKET socket ) return FALSE; } -#define MAX_SOCKETS_PER_PROCESS 128 /* reasonable guess */ #define MAX_UDP_DATAGRAM 1024 static INT WINAPI WSA_DefaultBlockingHook( FARPROC x ); @@ -588,7 +587,7 @@ int WINAPI WSAStartup( WORD version, WSADATA *data ) data->wHighVersion = MAKEWORD(2, 2); strcpy( data->szDescription, "WinSock 2.0" ); strcpy( data->szSystemStatus, "Running" ); - data->iMaxSockets = MAX_SOCKETS_PER_PROCESS; + data->iMaxSockets = (LOBYTE(version) == 1 ? 32767 : 0); data->iMaxUdpDg = MAX_UDP_DATAGRAM; /* don't fill lpVendorInfo */ } diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index a8b12441f2b..7c003780e39 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2871,7 +2871,7 @@ static void test_startup(void) ok(data.wHighVersion == 0x202, "got maximum version %#x\n", data.wHighVersion); ok(!strcmp(data.szDescription, "WinSock 2.0"), "got description %s\n", debugstr_a(data.szDescription)); ok(!strcmp(data.szSystemStatus, "Running"), "got status %s\n", debugstr_a(data.szSystemStatus)); - todo_wine ok(data.iMaxSockets == (LOBYTE(tests[i].version) == 1 ? 32767 : 0), "got maximum sockets %u\n", data.iMaxSockets); + ok(data.iMaxSockets == (LOBYTE(tests[i].version) == 1 ? 32767 : 0), "got maximum sockets %u\n", data.iMaxSockets); todo_wine ok(data.iMaxUdpDg == (LOBYTE(tests[i].version) == 1 ? 65467 : 0), "got maximum datagram size %u\n", data.iMaxUdpDg); WSASetLastError(0xdeadbeef);

1 0

Zebediah Figura : ws2_32: Return 65467 or 0 in the iMaxUdpDg field.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 3c6d6acb9bc1e6503b175bda9d6de584fc958291 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c6d6acb9bc1e6503b175bda9d6de5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 1 00:20:50 2022 -0600 ws2_32: Return 65467 or 0 in the iMaxUdpDg field. Depending on reported winsock version. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5efc6369ebf5d1e262ac68dbcac546a11bded6ca) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/socket.c | 3 +-- dlls/ws2_32/tests/protocol.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 19a7d901414..7a1483f140f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -419,7 +419,6 @@ static BOOL socket_list_remove( SOCKET socket ) return FALSE; } -#define MAX_UDP_DATAGRAM 1024 static INT WINAPI WSA_DefaultBlockingHook( FARPROC x ); int num_startup; @@ -588,7 +587,7 @@ int WINAPI WSAStartup( WORD version, WSADATA *data ) strcpy( data->szDescription, "WinSock 2.0" ); strcpy( data->szSystemStatus, "Running" ); data->iMaxSockets = (LOBYTE(version) == 1 ? 32767 : 0); - data->iMaxUdpDg = MAX_UDP_DATAGRAM; + data->iMaxUdpDg = (LOBYTE(version) == 1 ? 65467 : 0); /* don't fill lpVendorInfo */ } diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 7c003780e39..9273c23b73f 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2872,7 +2872,7 @@ static void test_startup(void) ok(!strcmp(data.szDescription, "WinSock 2.0"), "got description %s\n", debugstr_a(data.szDescription)); ok(!strcmp(data.szSystemStatus, "Running"), "got status %s\n", debugstr_a(data.szSystemStatus)); ok(data.iMaxSockets == (LOBYTE(tests[i].version) == 1 ? 32767 : 0), "got maximum sockets %u\n", data.iMaxSockets); - todo_wine ok(data.iMaxUdpDg == (LOBYTE(tests[i].version) == 1 ? 65467 : 0), "got maximum datagram size %u\n", data.iMaxUdpDg); + ok(data.iMaxUdpDg == (LOBYTE(tests[i].version) == 1 ? 65467 : 0), "got maximum datagram size %u\n", data.iMaxUdpDg); WSASetLastError(0xdeadbeef); ret = WSACleanup();

1 0

Zebediah Figura : ws2_32: Return WSAEFAULT instead of WSAEINVAL from WSAStartup() if "data" is NULL.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: ac95629d35622ab13f78f3acd235c8bf4de199e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/ac95629d35622ab13f78f3acd235c8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 1 00:20:51 2022 -0600 ws2_32: Return WSAEFAULT instead of WSAEINVAL from WSAStartup() if "data" is NULL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a6cbdb7de82387e1a75bfdb77fa66310a322e6c8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/socket.c | 2 +- dlls/ws2_32/tests/protocol.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7a1483f140f..a75aaee68be 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -594,7 +594,7 @@ int WINAPI WSAStartup( WORD version, WSADATA *data ) if (!LOBYTE(version)) return WSAVERNOTSUPPORTED; - if (!data) return WSAEINVAL; + if (!data) return WSAEFAULT; num_startup++; TRACE( "increasing startup count to %d\n", num_startup ); diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 9273c23b73f..43c3fa58c88 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2880,8 +2880,7 @@ static void test_startup(void) ok(WSAGetLastError() == WSANOTINITIALISED, "got error %u\n", WSAGetLastError()); ret = WSAStartup(tests[i].version, NULL); - todo_wine_if (LOBYTE(tests[i].version)) - ok(ret == (LOBYTE(tests[i].version) ? WSAEFAULT : WSAVERNOTSUPPORTED), "got %d\n", ret); + ok(ret == (LOBYTE(tests[i].version) ? WSAEFAULT : WSAVERNOTSUPPORTED), "got %d\n", ret); winetest_pop_context(); }

1 0

Zhiyi Zhang : comctl32/button: Use pressed state when a pushlike checkbox or radio button is checked and hovered.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 66247bf1fa9637862b9d1e652b40f1247f7cfb91 URL: https://gitlab.winehq.org/wine/wine/-/commit/66247bf1fa9637862b9d1e652b40f1… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 10 14:57:36 2022 +0800 comctl32/button: Use pressed state when a pushlike checkbox or radio button is checked and hovered. On XP, when a pushlike checkbox or radio button is checked and hovered, PBS_HOT is used. In later versions of Windows, PBS_PRESSED is used. This patch changes pushlike checkboxes and radio buttons to use the new behavior because it seems more intuitive. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52436 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0cbfa9be51eafc985678bf2d67c34fb906282e05) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/button.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c index 72c1a17402c..edbaae0f3c0 100644 --- a/dlls/comctl32/button.c +++ b/dlls/comctl32/button.c @@ -396,7 +396,7 @@ static int get_draw_state(const BUTTON_INFO *infoPtr) static const int pushlike_cb_states[3][DRAW_STATE_COUNT] = { { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_NORMAL }, - { PBS_PRESSED, PBS_PRESSED, PBS_HOT, PBS_PRESSED, PBS_PRESSED }, + { PBS_PRESSED, PBS_PRESSED, PBS_PRESSED, PBS_PRESSED, PBS_PRESSED }, { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_NORMAL } }; static const int rb_states[2][DRAW_STATE_COUNT] = @@ -407,7 +407,7 @@ static int get_draw_state(const BUTTON_INFO *infoPtr) static const int pushlike_rb_states[2][DRAW_STATE_COUNT] = { { PBS_NORMAL, PBS_DISABLED, PBS_HOT, PBS_PRESSED, PBS_NORMAL }, - { PBS_PRESSED, PBS_PRESSED, PBS_HOT, PBS_PRESSED, PBS_PRESSED } + { PBS_PRESSED, PBS_PRESSED, PBS_PRESSED, PBS_PRESSED, PBS_PRESSED } }; static const int gb_states[DRAW_STATE_COUNT] = { GBS_NORMAL, GBS_DISABLED, GBS_NORMAL, GBS_NORMAL, GBS_NORMAL }; LONG style = GetWindowLongW(infoPtr->hwnd, GWL_STYLE);

1 0

Zhiyi Zhang : comctl32/treeview: Do not draw client edge without WS_EX_CLIENTEDGE.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: 95eb14dd342ae44a4d440bb8e2550e0cdf7a506a URL: https://gitlab.winehq.org/wine/wine/-/commit/95eb14dd342ae44a4d440bb8e2550e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Feb 10 14:57:29 2022 +0800 comctl32/treeview: Do not draw client edge without WS_EX_CLIENTEDGE. Fix foobar2000 having an extra edge around tree view non-client size box. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8ce869f40b0887bd465f27ac1db7393067540aba) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/treeview.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index f4a387dd0d2..6399115525d 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -5447,18 +5447,25 @@ TREEVIEW_MouseMove (TREEVIEW_INFO * infoPtr, LPARAM lParam) /* Draw themed border */ static BOOL TREEVIEW_NCPaint (const TREEVIEW_INFO *infoPtr, HRGN region, LPARAM lParam) { - HTHEME theme = GetWindowTheme (infoPtr->hwnd); + int cxEdge, cyEdge; + LONG ex_style; + HTHEME theme; HDC dc; RECT r; HRGN cliprgn; - int cxEdge = GetSystemMetrics (SM_CXEDGE), - cyEdge = GetSystemMetrics (SM_CYEDGE); + ex_style = GetWindowLongW(infoPtr->hwnd, GWL_EXSTYLE); + if (!(ex_style & WS_EX_CLIENTEDGE)) + return DefWindowProcW(infoPtr->hwnd, WM_NCPAINT, (WPARAM)region, lParam); + + theme = GetWindowTheme(infoPtr->hwnd); if (!theme) return DefWindowProcW (infoPtr->hwnd, WM_NCPAINT, (WPARAM)region, lParam); GetWindowRect(infoPtr->hwnd, &r); + cxEdge = GetSystemMetrics(SM_CXEDGE); + cyEdge = GetSystemMetrics(SM_CYEDGE); cliprgn = CreateRectRgn (r.left + cxEdge, r.top + cyEdge, r.right - cxEdge, r.bottom - cyEdge); if (region != (HRGN)1)

1 0

Alex Henrie : explorer: Only try to destroy the IShellWindows object if it exists.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: a85eedb43f9f93b2ecfe68e04399d872767c0203 URL: https://gitlab.winehq.org/wine/wine/-/commit/a85eedb43f9f93b2ecfe68e04399d8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 30 19:25:07 2022 -0700 explorer: Only try to destroy the IShellWindows object if it exists. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52494 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit adda27cdb82fd40ef71e554b8ba17244cb871710) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/explorer/explorer.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index cb0d63fb688..8fa732d6c1a 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -671,8 +671,11 @@ static LRESULT CALLBACK explorer_wnd_proc(HWND hwnd, UINT uMsg, WPARAM wParam, L switch(uMsg) { case WM_DESTROY: - IShellWindows_Revoke(info->sw, info->sw_cookie); - IShellWindows_Release(info->sw); + if(info->sw) + { + IShellWindows_Revoke(info->sw, info->sw_cookie); + IShellWindows_Release(info->sw); + } IExplorerBrowser_Unadvise(browser,info->advise_cookie); IExplorerBrowser_Destroy(browser);

1 0

Paul Gofman : concrt140: Add ?_Byte_reverse_table@details@Concurrency@@3QBEB data export.
by Alexandre Julliard 08 Nov '22

08 Nov '22

Module: wine Branch: stable Commit: c5a760d69e582c9b3a5edd7aa2814c4096e2f125 URL: https://gitlab.winehq.org/wine/wine/-/commit/c5a760d69e582c9b3a5edd7aa2814c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jan 19 19:50:32 2022 +0300 concrt140: Add ?_Byte_reverse_table(a)details@Concurrency@@3QBEB data export. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b3698977a5330f950c05449d22255b4c5190d65a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/concrt140/concrt140.spec | 2 +- dlls/concrt140/details.c | 21 +++++++++++++++++++++ dlls/concrt140/tests/concrt140.c | 24 ++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/concrt140/concrt140.spec b/dlls/concrt140/concrt140.spec index 364a1ad8d84..50db9348327 100644 --- a/dlls/concrt140/concrt140.spec +++ b/dlls/concrt140/concrt140.spec @@ -433,7 +433,7 @@ @ stub -arch=arm ?_Assign(a)_Concurrent_queue_iterator_base_v4@details(a)Concurrency@@IAAXABV123@@Z @ stub -arch=i386 ?_Assign(a)_Concurrent_queue_iterator_base_v4@details(a)Concurrency@@IAEXABV123@@Z @ stub -arch=win64 ?_Assign(a)_Concurrent_queue_iterator_base_v4@details(a)Concurrency@@IEAAXAEBV123@@Z -# extern ?_Byte_reverse_table(a)details@Concurrency@@3QBEB +@ extern ?_Byte_reverse_table(a)details@Concurrency@@3QBEB byte_reverse_table @ stub -arch=arm ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXXZ @ stub -arch=i386 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXXZ @ stub -arch=win64 ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXXZ diff --git a/dlls/concrt140/details.c b/dlls/concrt140/details.c index 27cdd911ad2..13a2fbbca96 100644 --- a/dlls/concrt140/details.c +++ b/dlls/concrt140/details.c @@ -1110,3 +1110,24 @@ void init_concurrency_details(void *base) init__Runtime_object_rtti(base); #endif } + +/* ?_Byte_reverse_table(a)details@Concurrency@@3QBEB */ +const BYTE byte_reverse_table[256] = +{ + 0x00, 0x80, 0x40, 0xc0, 0x20, 0xa0, 0x60, 0xe0, 0x10, 0x90, 0x50, 0xd0, 0x30, 0xb0, 0x70, 0xf0, + 0x08, 0x88, 0x48, 0xc8, 0x28, 0xa8, 0x68, 0xe8, 0x18, 0x98, 0x58, 0xd8, 0x38, 0xb8, 0x78, 0xf8, + 0x04, 0x84, 0x44, 0xc4, 0x24, 0xa4, 0x64, 0xe4, 0x14, 0x94, 0x54, 0xd4, 0x34, 0xb4, 0x74, 0xf4, + 0x0c, 0x8c, 0x4c, 0xcc, 0x2c, 0xac, 0x6c, 0xec, 0x1c, 0x9c, 0x5c, 0xdc, 0x3c, 0xbc, 0x7c, 0xfc, + 0x02, 0x82, 0x42, 0xc2, 0x22, 0xa2, 0x62, 0xe2, 0x12, 0x92, 0x52, 0xd2, 0x32, 0xb2, 0x72, 0xf2, + 0x0a, 0x8a, 0x4a, 0xca, 0x2a, 0xaa, 0x6a, 0xea, 0x1a, 0x9a, 0x5a, 0xda, 0x3a, 0xba, 0x7a, 0xfa, + 0x06, 0x86, 0x46, 0xc6, 0x26, 0xa6, 0x66, 0xe6, 0x16, 0x96, 0x56, 0xd6, 0x36, 0xb6, 0x76, 0xf6, + 0x0e, 0x8e, 0x4e, 0xce, 0x2e, 0xae, 0x6e, 0xee, 0x1e, 0x9e, 0x5e, 0xde, 0x3e, 0xbe, 0x7e, 0xfe, + 0x01, 0x81, 0x41, 0xc1, 0x21, 0xa1, 0x61, 0xe1, 0x11, 0x91, 0x51, 0xd1, 0x31, 0xb1, 0x71, 0xf1, + 0x09, 0x89, 0x49, 0xc9, 0x29, 0xa9, 0x69, 0xe9, 0x19, 0x99, 0x59, 0xd9, 0x39, 0xb9, 0x79, 0xf9, + 0x05, 0x85, 0x45, 0xc5, 0x25, 0xa5, 0x65, 0xe5, 0x15, 0x95, 0x55, 0xd5, 0x35, 0xb5, 0x75, 0xf5, + 0x0d, 0x8d, 0x4d, 0xcd, 0x2d, 0xad, 0x6d, 0xed, 0x1d, 0x9d, 0x5d, 0xdd, 0x3d, 0xbd, 0x7d, 0xfd, + 0x03, 0x83, 0x43, 0xc3, 0x23, 0xa3, 0x63, 0xe3, 0x13, 0x93, 0x53, 0xd3, 0x33, 0xb3, 0x73, 0xf3, + 0x0b, 0x8b, 0x4b, 0xcb, 0x2b, 0xab, 0x6b, 0xeb, 0x1b, 0x9b, 0x5b, 0xdb, 0x3b, 0xbb, 0x7b, 0xfb, + 0x07, 0x87, 0x47, 0xc7, 0x27, 0xa7, 0x67, 0xe7, 0x17, 0x97, 0x57, 0xd7, 0x37, 0xb7, 0x77, 0xf7, + 0x0f, 0x8f, 0x4f, 0xcf, 0x2f, 0xaf, 0x6f, 0xef, 0x1f, 0x9f, 0x5f, 0xdf, 0x3f, 0xbf, 0x7f, 0xff, +}; diff --git a/dlls/concrt140/tests/concrt140.c b/dlls/concrt140/tests/concrt140.c index 55b200c6c78..7b3300a3d59 100644 --- a/dlls/concrt140/tests/concrt140.c +++ b/dlls/concrt140/tests/concrt140.c @@ -90,6 +90,8 @@ static void (__thiscall *p__Timer_dtor)(_Timer*); static void (__thiscall *p__Timer__Start)(_Timer*); static void (__thiscall *p__Timer__Stop)(_Timer*); +static const BYTE *p_byte_reverse_table; + #define SETNOFAIL(x,y) x = (void*)GetProcAddress(module,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -142,6 +144,7 @@ static BOOL init(void) } init_thiscall_thunk(); + SET(p_byte_reverse_table, "?_Byte_reverse_table(a)details@Concurrency@@3QBEB"); return TRUE; } @@ -217,9 +220,30 @@ static void test_Timer(void) CloseHandle(callback_called); } +static BYTE byte_reverse(BYTE b) +{ + b = ((b & 0xf0) >> 4) | ((b & 0x0f) << 4); + b = ((b & 0xcc) >> 2) | ((b & 0x33) << 2); + b = ((b & 0xaa) >> 1) | ((b & 0x55) << 1); + return b; +} + +static void test_data_exports(void) +{ + unsigned int i; + + ok(IsBadWritePtr((BYTE *)p_byte_reverse_table, 256), "byte_reverse_table is writeable.\n"); + for (i = 0; i < 256; ++i) + { + ok(p_byte_reverse_table[i] == byte_reverse(i), "Got unexpected byte %#x, expected %#x.\n", + p_byte_reverse_table[i], byte_reverse(i)); + } +} + START_TEST(concrt140) { if (!init()) return; test_CurrentContext(); test_Timer(); + test_data_exports(); }

1 0