July 2023 - Wine-Commits - list.winehq.org

Francois Gouget : wininet: InternetGetConnectedStateExA() must always null-terminate the state string.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 430737f19acb84a92bd76a23c79551ed182991e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/430737f19acb84a92bd76a23c79551… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 7 15:23:40 2023 +0200 wininet: InternetGetConnectedStateExA() must always null-terminate the state string. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54799 (cherry picked from commit 6fa67bc8d70368e33510cce5128e9e01b2fdce7c) --- dlls/wininet/internet.c | 4 ++++ dlls/wininet/tests/internet.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 2926fbccf9b..093212936d5 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1295,8 +1295,12 @@ BOOL WINAPI InternetGetConnectedStateExA(LPDWORD lpdwStatus, LPSTR lpszConnectio rc = InternetGetConnectedStateExW(lpdwStatus,lpwszConnectionName, dwNameLen, dwReserved); if (rc && lpwszConnectionName) + { WideCharToMultiByte(CP_ACP,0,lpwszConnectionName,-1,lpszConnectionName, dwNameLen, NULL, NULL); + /* Yes, blindly truncate double-byte characters */ + lpszConnectionName[dwNameLen - 1] = '\0'; + } free(lpwszConnectionName); return rc; diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 0b88c9bc81e..87a2c7d03e8 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -1685,7 +1685,7 @@ static void test_InternetGetConnectedStateExA(void) ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - /* no space for complete string this time */ + /* no space for complete string this time, double-byte characters get truncated */ memset(buffer, 'z', sizeof(buffer) - 1); buffer[sizeof(buffer) - 1] = 0; flags = 0;

1 0

Francois Gouget : wininet/tests: Dump the state string if it is not as expected.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 9bad60833aaf562adfd1fc322818ed3a723453c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/9bad60833aaf562adfd1fc322818ed… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Apr 7 15:18:19 2023 +0200 wininet/tests: Dump the state string if it is not as expected. Also set up the buffer so dumping it is safe enough if the string is not null-terminated. And fix the failure messages since the tested value is the string length in characters, not the buffer size in bytes. (cherry picked from commit f0b9f257c486f4ba1d6f7a1f7469bc3ed0cbfd38) --- dlls/wininet/tests/internet.c | 47 ++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/dlls/wininet/tests/internet.c b/dlls/wininet/tests/internet.c index 04b7f1041f7..0b88c9bc81e 100644 --- a/dlls/wininet/tests/internet.c +++ b/dlls/wininet/tests/internet.c @@ -29,6 +29,7 @@ #include "winerror.h" #include "winreg.h" #include "winnls.h" +#include "wchar.h" #include "wine/test.h" @@ -1685,21 +1686,24 @@ static void test_InternetGetConnectedStateExA(void) ok(flags, "Expected at least one flag set\n"); /* no space for complete string this time */ - buffer[0] = 0; + memset(buffer, 'z', sizeof(buffer) - 1); + buffer[sizeof(buffer) - 1] = 0; flags = 0; res = pInternetGetConnectedStateExA(&flags, buffer, sz, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(sz - 1 == strlen(buffer), "Expected %lu bytes, got %u\n", sz - 1, lstrlenA(buffer)); + ok(sz - 1 == strlen(buffer), "Expected len %lu, got %u: %s\n", sz - 1, lstrlenA(buffer), wine_dbgstr_a(buffer)); - buffer[0] = 0; + memset(buffer, 'z', sizeof(buffer) - 1); + buffer[sizeof(buffer) - 1] = 0; flags = 0; res = pInternetGetConnectedStateExA(&flags, buffer, sz / 2, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(sz / 2 - 1 == strlen(buffer), "Expected %lu bytes, got %u\n", sz / 2 - 1, lstrlenA(buffer)); + ok(sz / 2 - 1 == strlen(buffer), "Expected len %lu, got %u: %s\n", sz / 2 - 1, lstrlenA(buffer), wine_dbgstr_a(buffer)); - buffer[0] = 0; + memset(buffer, 'z', sizeof(buffer) - 1); + buffer[sizeof(buffer) - 1] = 0; flags = 0; res = pInternetGetConnectedStateExA(&flags, buffer, 1, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); @@ -1711,14 +1715,15 @@ static void test_InternetGetConnectedStateExA(void) res = pInternetGetConnectedStateExA(&flags, buffer, 2, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(strlen(buffer) == 1, "Expected 1 byte, got %u\n", lstrlenA(buffer)); + ok(strlen(buffer) == 1, "Expected len 1, got %u: %s\n", lstrlenA(buffer), wine_dbgstr_a(buffer)); + memset(buffer, 'z', sizeof(buffer) - 1); + buffer[sizeof(buffer) - 1] = 0; flags = 0; - buffer[0] = 0xDE; res = pInternetGetConnectedStateExA(&flags, buffer, 1, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenA(buffer)); + ok(!buffer[0], "Expected len 0, got %u: %s\n", lstrlenA(buffer), wine_dbgstr_a(buffer)); } static void test_InternetGetConnectedStateExW(void) @@ -1791,27 +1796,30 @@ static void test_InternetGetConnectedStateExW(void) ok(flags, "Expected at least one flag set\n"); /* no space for complete string this time */ - buffer[0] = 0; + wmemset(buffer, 'z', ARRAY_SIZE(buffer) - 1); + buffer[ARRAY_SIZE(buffer) - 1] = 0; flags = 0; res = pInternetGetConnectedStateExW(&flags, buffer, sz, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); if (flags & INTERNET_CONNECTION_MODEM) - ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenW(buffer)); + ok(!buffer[0], "Expected len 0, got %u: %s\n", lstrlenW(buffer), wine_dbgstr_w(buffer)); else - ok(sz - 1 == lstrlenW(buffer), "Expected %lu bytes, got %u\n", sz - 1, lstrlenW(buffer)); + ok(sz - 1 == lstrlenW(buffer), "Expected len %lu, got %u: %s\n", sz - 1, lstrlenW(buffer), wine_dbgstr_w(buffer)); - buffer[0] = 0; + wmemset(buffer, 'z', ARRAY_SIZE(buffer) - 1); + buffer[ARRAY_SIZE(buffer) - 1] = 0; flags = 0; res = pInternetGetConnectedStateExW(&flags, buffer, sz / 2, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); if (flags & INTERNET_CONNECTION_MODEM) - ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenW(buffer)); + ok(!buffer[0], "Expected len 0, got %u: %s\n", lstrlenW(buffer), wine_dbgstr_w(buffer)); else - ok(sz / 2 - 1 == lstrlenW(buffer), "Expected %lu bytes, got %u\n", sz / 2 - 1, lstrlenW(buffer)); + ok(sz / 2 - 1 == lstrlenW(buffer), "Expected len %lu, got %u: %s\n", sz / 2 - 1, lstrlenW(buffer), wine_dbgstr_w(buffer)); - buffer[0] = 0; + wmemset(buffer, 'z', ARRAY_SIZE(buffer) - 1); + buffer[ARRAY_SIZE(buffer) - 1] = 0; flags = 0; res = pInternetGetConnectedStateExW(&flags, buffer, 1, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); @@ -1824,16 +1832,17 @@ static void test_InternetGetConnectedStateExW(void) ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); if (flags & INTERNET_CONNECTION_MODEM) - ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenW(buffer)); + ok(!buffer[0], "Expected len 0, got %u: %s\n", lstrlenW(buffer), wine_dbgstr_w(buffer)); else - ok(lstrlenW(buffer) == 1, "Expected 1 byte, got %u\n", lstrlenW(buffer)); + ok(lstrlenW(buffer) == 1, "Expected len 1, got %u: %s\n", lstrlenW(buffer), wine_dbgstr_w(buffer)); - buffer[0] = 0xDEAD; + wmemset(buffer, 'z', ARRAY_SIZE(buffer) - 1); + buffer[ARRAY_SIZE(buffer) - 1] = 0; flags = 0; res = pInternetGetConnectedStateExW(&flags, buffer, 1, 0); ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(flags, "Expected at least one flag set\n"); - ok(!buffer[0], "Expected 0 bytes, got %u\n", lstrlenW(buffer)); + ok(!buffer[0], "Expected len 0, got %u: %s\n", lstrlenW(buffer), wine_dbgstr_w(buffer)); } static void test_format_message(HMODULE hdll)

1 0

Bernhard Übelacker : ntoskrnl: Do not leak memory by setting input buffer to NULL.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 4000f08c3295c3f587ad5da6ace1e6bd5939d050 URL: https://gitlab.winehq.org/wine/wine/-/commit/4000f08c3295c3f587ad5da6ace1e6… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Tue Jan 11 22:15:26 2022 +0100 ntoskrnl: Do not leak memory by setting input buffer to NULL. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52322 (cherry picked from commit 07c0cd6ba5f4b1d6ef738ad7f3cad9992947dd3d) --- dlls/ntoskrnl.exe/ntoskrnl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index cc30750a160..b5872cc57eb 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -832,7 +832,6 @@ static NTSTATUS dispatch_volume( struct dispatch_context *context ) irp->Tail.Overlay.Thread = (PETHREAD)KeGetCurrentThread(); irp->Tail.Overlay.OriginalFileObject = file; irp->RequestorMode = UserMode; - context->in_buff = NULL; irp->Flags |= IRP_DEALLOCATE_BUFFER; /* deallocate out_buff */ return dispatch_irp( device, irp, context );

1 0

Hans Leidekker : ws2_32: Skip non-address records in dns_only_query().
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: f206f787da22cd229a4d4eea19931cf7df743cac URL: https://gitlab.winehq.org/wine/wine/-/commit/f206f787da22cd229a4d4eea19931c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 12 15:17:10 2023 +0200 ws2_32: Skip non-address records in dns_only_query(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54819 (cherry picked from commit f512b3c08ccfc9b9c235964002e644e2cbd657cf) --- dlls/ws2_32/protocol.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 1f840832c7a..f746257a4fc 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -96,8 +96,8 @@ static int dns_only_query( const char *node, const struct addrinfo *hints, struc } } - for (ptr = rec; ptr; ptr = ptr->pNext) count++; - for (ptr = rec6; ptr; ptr = ptr->pNext) count++; + for (ptr = rec; ptr; ptr = ptr->pNext) { if (ptr->wType == DNS_TYPE_A) count++; }; + for (ptr = rec6; ptr; ptr = ptr->pNext) { if (ptr->wType == DNS_TYPE_AAAA) count++; }; if (!count) { DnsRecordListFree( (DNS_RECORD *)rec, DnsFreeRecordList ); @@ -114,6 +114,7 @@ static int dns_only_query( const char *node, const struct addrinfo *hints, struc for (ptr = rec; ptr; ptr = ptr->pNext) { + if (ptr->wType != DNS_TYPE_A) continue; info->ai_family = AF_INET; info->ai_socktype = hints->ai_socktype; info->ai_protocol = hints->ai_protocol; @@ -128,6 +129,7 @@ static int dns_only_query( const char *node, const struct addrinfo *hints, struc } for (ptr = rec6; ptr; ptr = ptr->pNext) { + if (ptr->wType != DNS_TYPE_AAAA) continue; info->ai_family = AF_INET6; info->ai_socktype = hints->ai_socktype; info->ai_protocol = hints->ai_protocol;

1 0

Zhiyi Zhang : light.msstyles: Use border fill background for progress parts.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: af5d66649eea2feb4a840481b8b5eaa689a5cbf0 URL: https://gitlab.winehq.org/wine/wine/-/commit/af5d66649eea2feb4a840481b8b5ea… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Apr 6 16:14:28 2023 +0800 light.msstyles: Use border fill background for progress parts. These parts only contain simple images that can be achieved with border fill backgrounds as well. So visually, this change is a no-op. The reason for using image file backgrounds is that I tend to use the same background type as the theme files for Windows. However, drawing border fill background is much more efficient. Pro Evolution Soccer 2008 demo is buggy and generates ~570,000 WM_PAINT messages for the progress control. On Windows, it's ~1,140,000 WM_PAINT messages. DrawThemeBackground() on Wine is 10x more expensive than that of Windows and I found little room for optimization. 60% of the time in DrawThemeBackground() is spend for CreateCompatibleDC() and other 30% for actually drawing. So I decided to change light.msstyles instead. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54728 (cherry picked from commit 2960cf2e0616216fb8d01e11d7ca7475bfe26d97) --- dlls/light.msstyles/Makefile.in | 4 -- .../blue_progress_chunk_horizontal.bmp | Bin 2358 -> 0 bytes .../blue_progress_chunk_horizontal.svg | 13 ------ .../blue_progress_chunk_vertical.bmp | Bin 2490 -> 0 bytes .../blue_progress_chunk_vertical.svg | 13 ------ .../blue_progress_track_horizontal.bmp | Bin 2698 -> 0 bytes .../blue_progress_track_horizontal.svg | 13 ------ .../blue_progress_track_vertical.bmp | Bin 886 -> 0 bytes .../blue_progress_track_vertical.svg | 13 ------ dlls/light.msstyles/light.rc | 46 ++++----------------- 10 files changed, 8 insertions(+), 94 deletions(-) diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 8c31d5b9b08..dc8837f9364 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -204,10 +204,6 @@ SVG_SRCS = \ blue_navigation_menu_button_32px.svg \ blue_navigation_menu_button_39px.svg \ blue_navigation_menu_button_52px.svg \ - blue_progress_chunk_horizontal.svg \ - blue_progress_chunk_vertical.svg \ - blue_progress_track_horizontal.svg \ - blue_progress_track_vertical.svg \ blue_radiobutton_13px.svg \ blue_radiobutton_16px.svg \ blue_radiobutton_19px.svg \ diff --git a/dlls/light.msstyles/blue_progress_chunk_horizontal.bmp b/dlls/light.msstyles/blue_progress_chunk_horizontal.bmp deleted file mode 100644 index 60debfe4049..00000000000 Binary files a/dlls/light.msstyles/blue_progress_chunk_horizontal.bmp and /dev/null differ diff --git a/dlls/light.msstyles/blue_progress_chunk_horizontal.svg b/dlls/light.msstyles/blue_progress_chunk_horizontal.svg deleted file mode 100644 index 629b667f585..00000000000 --- a/dlls/light.msstyles/blue_progress_chunk_horizontal.svg +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:49-24" width="49" height="15" version="1.1" viewBox="0 0 12.965 3.9688" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> - <metadata> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> - </cc:Work> - </rdf:RDF> - </metadata> - <rect width="12.965" height="3.9688" fill="#3096fa" style="paint-order:normal"/> -</svg> diff --git a/dlls/light.msstyles/blue_progress_chunk_vertical.bmp b/dlls/light.msstyles/blue_progress_chunk_vertical.bmp deleted file mode 100644 index f9816b09dcf..00000000000 Binary files a/dlls/light.msstyles/blue_progress_chunk_vertical.bmp and /dev/null differ diff --git a/dlls/light.msstyles/blue_progress_chunk_vertical.svg b/dlls/light.msstyles/blue_progress_chunk_vertical.svg deleted file mode 100644 index 4f43374dce5..00000000000 --- a/dlls/light.msstyles/blue_progress_chunk_vertical.svg +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:15-24" width="15" height="49" version="1.1" viewBox="0 0 3.9687 12.965" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> - <metadata> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> - </cc:Work> - </rdf:RDF> - </metadata> - <rect transform="rotate(90)" y="-3.9688" width="12.965" height="3.9688" fill="#3096fa" style="paint-order:normal"/> -</svg> diff --git a/dlls/light.msstyles/blue_progress_track_horizontal.bmp b/dlls/light.msstyles/blue_progress_track_horizontal.bmp deleted file mode 100644 index 43d5eaa441a..00000000000 Binary files a/dlls/light.msstyles/blue_progress_track_horizontal.bmp and /dev/null differ diff --git a/dlls/light.msstyles/blue_progress_track_horizontal.svg b/dlls/light.msstyles/blue_progress_track_horizontal.svg deleted file mode 100644 index af25bbbcd51..00000000000 --- a/dlls/light.msstyles/blue_progress_track_horizontal.svg +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:53-24" width="53" height="16" version="1.1" viewBox="0 0 14.023 4.2333" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> - <metadata> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> - </cc:Work> - </rdf:RDF> - </metadata> - <rect x=".13229" y=".13229" width="13.758" height="3.9688" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/> -</svg> diff --git a/dlls/light.msstyles/blue_progress_track_vertical.bmp b/dlls/light.msstyles/blue_progress_track_vertical.bmp deleted file mode 100644 index 5dddee9c32e..00000000000 Binary files a/dlls/light.msstyles/blue_progress_track_vertical.bmp and /dev/null differ diff --git a/dlls/light.msstyles/blue_progress_track_vertical.svg b/dlls/light.msstyles/blue_progress_track_vertical.svg deleted file mode 100644 index 2f0f638bd8a..00000000000 --- a/dlls/light.msstyles/blue_progress_track_vertical.svg +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<svg id="bitmap:14-24" width="14" height="17" version="1.1" viewBox="0 0 3.7042 4.4979" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> - <metadata> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> - </cc:Work> - </rdf:RDF> - </metadata> - <rect x=".13229" y=".13229" width="3.4396" height="4.2333" fill="#fff" stroke="#aeaeae" stroke-width=".26458"/> -</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index be8b1dfda57..ec832e83ea0 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -1204,29 +1204,19 @@ BLUE_INI TEXTFILE "BorderColor = 174 174 174\r\n" "[Progress.Bar]\r\n" -"BgType = ImageFile\r\n" -"ImageFile = blue_progress_track_horizontal.bmp\r\n" "MinSize = 10, 10\r\n" -"SizingMargins = 1, 1, 1, 1\r\n" -"SizingType = Stretch\r\n" +"FillColor = 255 255 255\r\n" "[Progress.BarVert]\r\n" -"BgType = ImageFile\r\n" -"ImageFile = blue_progress_track_vertical.bmp\r\n" -"SizingMargins = 1, 1, 1, 1\r\n" -"SizingType = Stretch\r\n" +"FillColor = 255 255 255\r\n" "[Progress.Chunk]\r\n" -"BgType = ImageFile\r\n" -"ImageFile = blue_progress_chunk_horizontal.bmp\r\n" -"SizingMargins = 1, 1, 1, 1\r\n" -"SizingType = Stretch\r\n" +"BorderSize = 0\r\n" +"FillColor = 48 150 250\r\n" "[Progress.ChunkVert]\r\n" -"BgType = ImageFile\r\n" -"ImageFile = blue_progress_chunk_vertical.bmp\r\n" -"SizingMargins = 1, 1, 1, 1\r\n" -"SizingType = Stretch\r\n" +"BorderSize = 0\r\n" +"FillColor = 48 150 250\r\n" "[Progress.Fill]\r\n" "FillColor = 48 150 250\r\n" @@ -1265,17 +1255,10 @@ BLUE_INI TEXTFILE "BgType = None\r\n" "[Progress.TransparentBar]\r\n" -"BgType = ImageFile\r\n" -"ImageFile = blue_progress_track_horizontal.bmp\r\n" -"MinSize = 10, 10\r\n" -"SizingMargins = 1, 1, 1, 1\r\n" -"SizingType = Stretch\r\n" +"FillColor = 255 255 255\r\n" "[Progress.TransparentBarVert]\r\n" -"BgType = ImageFile\r\n" -"ImageFile = blue_progress_track_vertical.bmp\r\n" -"SizingMargins = 1, 1, 1, 1\r\n" -"SizingType = Stretch\r\n" +"FillColor = 255 255 255\r\n" "\r\n; Rebar\r\n" "[Rebar]\r\n" @@ -3519,19 +3502,6 @@ BLUE_NAVIGATION_MENU_BUTTON_39PX_BMP BITMAP "blue_navigation_menu_button_39px.bm /* @makedep: blue_navigation_menu_button_52px.bmp */ BLUE_NAVIGATION_MENU_BUTTON_52PX_BMP BITMAP "blue_navigation_menu_button_52px.bmp" -/* Progress */ -/* @makedep: blue_progress_chunk_horizontal.bmp */ -BLUE_PROGRESS_CHUNK_HORIZONTAL_BMP BITMAP "blue_progress_chunk_horizontal.bmp" - -/* @makedep: blue_progress_chunk_vertical.bmp */ -BLUE_PROGRESS_CHUNK_VERTICAL_BMP BITMAP "blue_progress_chunk_vertical.bmp" - -/* @makedep: blue_progress_track_horizontal.bmp */ -BLUE_PROGRESS_TRACK_HORIZONTAL_BMP BITMAP "blue_progress_track_horizontal.bmp" - -/* @makedep: blue_progress_track_vertical.bmp */ -BLUE_PROGRESS_TRACK_VERTICAL_BMP BITMAP "blue_progress_track_vertical.bmp" - /* Rebar */ /* @makedep: blue_rebar_background.bmp */ BLUE_REBAR_BACKGROUND_BMP BITMAP "blue_rebar_background.bmp"

1 0

Zhiyi Zhang : light.msstyles: Don't draw a border for progress fill parts.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: f6d9d4a340e8e62c0d1c3b96d4a31167a004a839 URL: https://gitlab.winehq.org/wine/wine/-/commit/f6d9d4a340e8e62c0d1c3b96d4a311… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Apr 6 16:08:11 2023 +0800 light.msstyles: Don't draw a border for progress fill parts. These parts were supposed to contain a solid fill background without a border. If BorderSize is not set, they will use the border size of 1 from the inherited progress class. (cherry picked from commit 77b6cf56c1e5fc0eb2c5e16ff70cc6137298d73a) --- dlls/light.msstyles/light.rc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index ec832e83ea0..0bdc62f7bb2 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -1219,27 +1219,35 @@ BLUE_INI TEXTFILE "FillColor = 48 150 250\r\n" "[Progress.Fill]\r\n" +"BorderSize = 0\r\n" "FillColor = 48 150 250\r\n" "[Progress.FillVert]\r\n" +"BorderSize = 0\r\n" "FillColor = 48 150 250\r\n" "[Progress.Fill(Error)]\r\n" +"BorderSize = 0\r\n" "FillColor = 213 0 0\r\n" "[Progress.FillVert(Error)]\r\n" +"BorderSize = 0\r\n" "FillColor = 213 0 0\r\n" "[Progress.Fill(Paused)]\r\n" +"BorderSize = 0\r\n" "FillColor = 255 238 88\r\n" "[Progress.FillVert(Paused)]\r\n" +"BorderSize = 0\r\n" "FillColor = 255 238 88\r\n" "[Progress.Fill(Partial)]\r\n" +"BorderSize = 0\r\n" "FillColor = 189 189 189\r\n" "[Progress.FillVert(Partial)]\r\n" +"BorderSize = 0\r\n" "FillColor = 189 189 189\r\n" "[Progress.PulseOverlay]\r\n"

1 0

Paul Gofman : ntdll: Add stub for NtQueryInformationProcess( ProcessHandleTable ).
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 65cbb5c243a5bc9ae4839eee521ac426df889bd3 URL: https://gitlab.winehq.org/wine/wine/-/commit/65cbb5c243a5bc9ae4839eee521ac4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jan 30 17:14:33 2023 -0600 ntdll: Add stub for NtQueryInformationProcess( ProcessHandleTable ). (cherry picked from commit 1b1f8d914e4d47a2d9c0e2ee1f919d8beb6b0368) --- dlls/ntdll/unix/process.c | 6 ++++++ include/winternl.h | 1 + 2 files changed, 7 insertions(+) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index ca153a30bf2..4b9c42467e7 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1343,6 +1343,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class else if (!handle) ret = STATUS_INVALID_HANDLE; else { + FIXME( "ProcessHandleCount (%p,%p,0x%08x,%p) stub\n", handle, info, (int)size, ret_len ); memset(info, 0, 4); len = 4; } @@ -1355,6 +1356,11 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class } break; + case ProcessHandleTable: + FIXME( "ProcessHandleTable (%p,%p,0x%08x,%p) stub\n", handle, info, (int)size, ret_len ); + len = 0; + break; + case ProcessAffinityMask: len = sizeof(ULONG_PTR); if (size == len) diff --git a/include/winternl.h b/include/winternl.h index b6222159016..75d856ea451 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1574,6 +1574,7 @@ typedef enum _PROCESSINFOCLASS { ProcessConsoleHostProcess = 49, ProcessWindowInformation = 50, ProcessHandleInformation = 51, + ProcessHandleTable = 58, ProcessPowerThrottlingState = 77, ProcessLeapSecondInformation = 97, MaxProcessInfoClass,

1 0

Vijay Kiran Kamuju : msvcp110: Add std::_Rethrow_future_exception implementation.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 9c8920c9a2c2df480336e908af53393296c48e77 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c8920c9a2c2df480336e908af5339… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sat Apr 1 11:23:41 2023 +0000 msvcp110: Add std::_Rethrow_future_exception implementation. (cherry picked from commit 389fbcf961732528d8cc4351e299256ae5782b96) --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/exception.c | 53 +++++++++++++++++++++++-------------- dlls/msvcp_win/msvcp_win.spec | 2 +- 6 files changed, 38 insertions(+), 25 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 2de95bf94ef..074ca946b19 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1732,7 +1732,7 @@ @ cdecl -arch=win64 ?_Rep@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@G_K(a)Z(ptr ptr ptr long long) num_put_wchar__Rep @ cdecl -arch=win32 ?_Rep@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@_WI(a)Z(ptr ptr long ptr long long) num_put_wchar__Rep @ cdecl -arch=win64 ?_Rep@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@_W_K(a)Z(ptr ptr ptr long long) num_put_wchar__Rep -@ stub ?_Rethrow_future_exception(a)std@@YAXVexception_ptr(a)1@@Z +@ cdecl -norelay ?_Rethrow_future_exception(a)std@@YAXVexception_ptr(a)1@@Z() _Rethrow_future_exception @ stub -arch=win32 ?_Rng_abort(a)std@@YAXPBD(a)Z @ stub -arch=win64 ?_Rng_abort(a)std@@YAXPEBD(a)Z @ cdecl -arch=win32 ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KAII(a)Z(long) _vector_base_v4__Segment_index_of diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index e0adc83113f..0d2a5fe0fca 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1693,7 +1693,7 @@ @ cdecl -arch=win64 ?_Rep@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@G_K(a)Z(ptr ptr ptr long long) num_put_wchar__Rep @ cdecl -arch=win32 ?_Rep@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@_WI(a)Z(ptr ptr long ptr long long) num_put_wchar__Rep @ cdecl -arch=win64 ?_Rep@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@_W_K(a)Z(ptr ptr ptr long long) num_put_wchar__Rep -@ stub ?_Rethrow_future_exception(a)std@@YAXVexception_ptr(a)1@@Z +@ cdecl -norelay ?_Rethrow_future_exception(a)std@@YAXVexception_ptr(a)1@@Z() _Rethrow_future_exception @ stub -arch=win32 ?_Rng_abort(a)std@@YAXPBD(a)Z @ stub -arch=win64 ?_Rng_abort(a)std@@YAXPEBD(a)Z @ cdecl -arch=win32 ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KAII(a)Z(long) _vector_base_v4__Segment_index_of diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index dd8e3ebf173..d11ba788898 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1693,7 +1693,7 @@ @ cdecl -arch=win64 ?_Rep@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@G_K(a)Z(ptr ptr ptr long long) msvcp120.?_Rep@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@G_K(a)Z @ cdecl -arch=win32 ?_Rep@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@_WI(a)Z(ptr ptr long ptr long long) msvcp120.?_Rep@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@_WI(a)Z @ cdecl -arch=win64 ?_Rep@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@_W_K(a)Z(ptr ptr ptr long long) msvcp120.?_Rep@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@_W_K(a)Z -@ stub ?_Rethrow_future_exception(a)std@@YAXVexception_ptr(a)1@@Z +@ cdecl -norelay ?_Rethrow_future_exception(a)std@@YAXVexception_ptr(a)1@@Z() msvcp120.?_Rethrow_future_exception(a)std@@YAXVexception_ptr(a)1@@Z @ stub -arch=win32 ?_Rng_abort(a)std@@YAXPBD(a)Z @ stub -arch=win64 ?_Rng_abort(a)std@@YAXPEBD(a)Z @ cdecl -arch=win32 ?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KAII(a)Z(long) msvcp120.?_Segment_index_of(a)_Concurrent_vector_base_v4@details(a)Concurrency@@KAII(a)Z diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index dd619c637e1..8e57b828182 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1595,7 +1595,7 @@ @ cdecl -arch=arm ?_Reset(a)_ContextCallback@details(a)Concurrency@@AAAXXZ(ptr) _ContextCallback__Reset @ thiscall -arch=i386 ?_Reset(a)_ContextCallback@details(a)Concurrency@@AAEXXZ(ptr) _ContextCallback__Reset @ cdecl -arch=win64 ?_Reset(a)_ContextCallback@details(a)Concurrency@@AEAAXXZ(ptr) _ContextCallback__Reset -@ stub ?_Rethrow_future_exception(a)std@@YAXVexception_ptr(a)1@@Z +@ cdecl -norelay ?_Rethrow_future_exception(a)std@@YAXVexception_ptr(a)1@@Z() _Rethrow_future_exception @ stub -arch=win32 ?_Rng_abort(a)std@@YAXPBD(a)Z @ stub -arch=win64 ?_Rng_abort(a)std@@YAXPEBD(a)Z @ cdecl -arch=win32 ?_Schedule_chore(a)details@Concurrency@@YAHPAU_Threadpool_chore(a)12@@Z(ptr) _Schedule_chore diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 8ceaa91e884..66a5061a4f0 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -947,6 +947,38 @@ bool __cdecl MSVCP__uncaught_exception(void) return __uncaught_exception(); } +#if _MSVCP_VER >= 110 +typedef struct +{ + EXCEPTION_RECORD *rec; + LONG *ref; /* not binary compatible with native */ +} exception_ptr; + +static void exception_ptr_rethrow(const exception_ptr *ep) +{ + TRACE("(%p)\n", ep); + + if (!ep->rec) + { + static const char *exception_msg = "bad exception"; + exception e; + + MSVCP_exception_ctor(&e, &exception_msg); + _CxxThrowException(&e, &exception_cxx_type); + return; + } + + RaiseException(ep->rec->ExceptionCode, ep->rec->ExceptionFlags & (~EH_UNWINDING), + ep->rec->NumberParameters, ep->rec->ExceptionInformation); +} + +/* ?_Rethrow_future_exception(a)std@@YAXVexception_ptr(a)1@@Z */ +void __cdecl _Rethrow_future_exception(const exception_ptr ep) +{ + exception_ptr_rethrow(&ep); +} +#endif + #if _MSVCP_VER >= 140 void** CDECL __current_exception(void); @@ -1002,12 +1034,6 @@ int __cdecl __uncaught_exceptions(void) return *__processing_throw(); } -typedef struct -{ - EXCEPTION_RECORD *rec; - LONG *ref; /* not binary compatible with native */ -} exception_ptr; - /********************************************************************* * ?__ExceptionPtrCreate@@YAXPAX(a)Z * ?__ExceptionPtrCreate@@YAXPEAX(a)Z @@ -1102,20 +1128,7 @@ void __cdecl __ExceptionPtrAssign(exception_ptr *ep, const exception_ptr *assign */ void __cdecl __ExceptionPtrRethrow(const exception_ptr *ep) { - TRACE("(%p)\n", ep); - - if (!ep->rec) - { - static const char *exception_msg = "bad exception"; - exception e; - - MSVCP_exception_ctor(&e, &exception_msg); - _CxxThrowException(&e, &exception_cxx_type); - return; - } - - RaiseException(ep->rec->ExceptionCode, ep->rec->ExceptionFlags & (~EH_UNWINDING), - ep->rec->NumberParameters, ep->rec->ExceptionInformation); + exception_ptr_rethrow(ep); } /********************************************************************* diff --git a/dlls/msvcp_win/msvcp_win.spec b/dlls/msvcp_win/msvcp_win.spec index d2fae9f1e14..0e05582e251 100644 --- a/dlls/msvcp_win/msvcp_win.spec +++ b/dlls/msvcp_win/msvcp_win.spec @@ -1595,7 +1595,7 @@ @ cdecl -arch=arm ?_Reset(a)_ContextCallback@details(a)Concurrency@@AAAXXZ(ptr) msvcp140.?_Reset(a)_ContextCallback@details(a)Concurrency@@AAAXXZ @ thiscall -arch=i386 ?_Reset(a)_ContextCallback@details(a)Concurrency@@AAEXXZ(ptr) msvcp140.?_Reset(a)_ContextCallback@details(a)Concurrency@@AAEXXZ @ cdecl -arch=win64 ?_Reset(a)_ContextCallback@details(a)Concurrency@@AEAAXXZ(ptr) msvcp140.?_Reset(a)_ContextCallback@details(a)Concurrency@@AEAAXXZ -@ stub ?_Rethrow_future_exception(a)std@@YAXVexception_ptr(a)1@@Z +@ cdecl -norelay ?_Rethrow_future_exception(a)std@@YAXVexception_ptr(a)1@@Z() msvcp140.?_Rethrow_future_exception(a)std@@YAXVexception_ptr(a)1@@Z @ stub -arch=win32 ?_Rng_abort(a)std@@YAXPBD(a)Z @ stub -arch=win64 ?_Rng_abort(a)std@@YAXPEBD(a)Z @ cdecl -arch=win32 ?_Schedule_chore(a)details@Concurrency@@YAHPAU_Threadpool_chore(a)12@@Z(ptr) msvcp140.?_Schedule_chore(a)details@Concurrency@@YAHPAU_Threadpool_chore(a)12@@Z

1 0

Alex Henrie : opengl32/tests: Make the wglShareLists tests comprehensive.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: d528bf9da9fd863b0f20209f78d6b8b75ff73414 URL: https://gitlab.winehq.org/wine/wine/-/commit/d528bf9da9fd863b0f20209f78d6b8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Apr 9 22:32:57 2023 -0600 opengl32/tests: Make the wglShareLists tests comprehensive. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51311 (cherry picked from commit c3eca06a2aa5d7fc791f32a89a59d0a239b37bb1) --- dlls/opengl32/tests/opengl.c | 118 +++++++++++++++++++++++++++---------------- 1 file changed, 74 insertions(+), 44 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 42c2626a2c2..4fb7f9669b2 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -541,54 +541,84 @@ static void test_setpixelformat(HDC winhdc) static void test_sharelists(HDC winhdc) { - HGLRC hglrc1, hglrc2, hglrc3; - BOOL res; - - hglrc1 = wglCreateContext(winhdc); - res = wglShareLists(0, 0); - ok(res == FALSE, "Sharing display lists for no contexts passed!\n"); + BOOL res, nvidia, amd, source_current, source_sharing, dest_current, dest_sharing; + HGLRC source, dest, other; - /* Test 1: Create a context and just share lists without doing anything special */ - hglrc2 = wglCreateContext(winhdc); - if(hglrc2) - { - res = wglShareLists(hglrc1, hglrc2); - ok(res, "Sharing of display lists failed\n"); - wglDeleteContext(hglrc2); - } + res = wglShareLists(NULL, NULL); + ok(!res, "Sharing display lists for no contexts passed!\n"); - /* Test 2: Share display lists with a 'destination' context which has been made current */ - hglrc2 = wglCreateContext(winhdc); - if(hglrc2) - { - res = wglMakeCurrent(winhdc, hglrc2); - ok(res, "Make current failed\n"); - res = wglShareLists(hglrc1, hglrc2); - todo_wine ok(res, "Sharing display lists with a destination context which has been made current failed\n"); - wglMakeCurrent(0, 0); - wglDeleteContext(hglrc2); - } + nvidia = !!strstr((const char*)glGetString(GL_VENDOR), "NVIDIA"); + amd = strstr((const char*)glGetString(GL_VENDOR), "AMD") || + strstr((const char*)glGetString(GL_VENDOR), "ATI"); - /* Test 3: Share display lists with a context which already shares display lists with another context. - * According to MSDN the second parameter cannot share any display lists but some buggy drivers might allow it */ - hglrc3 = wglCreateContext(winhdc); - if(hglrc3) + for (source_current = FALSE; source_current <= TRUE; source_current++) { - res = wglShareLists(hglrc3, hglrc1); - ok(res == FALSE, "Sharing of display lists passed for a context which already shared lists before\n"); - wglDeleteContext(hglrc3); - } - - /* Test 4: Share display lists with a 'source' context which has been made current */ - hglrc2 = wglCreateContext(winhdc); - if(hglrc2) - { - res = wglMakeCurrent(winhdc, hglrc1); - ok(res, "Make current failed\n"); - res = wglShareLists(hglrc1, hglrc2); - ok(res, "Sharing display lists with a source context which has been made current failed\n"); - wglMakeCurrent(0, 0); - wglDeleteContext(hglrc2); + for (source_sharing = FALSE; source_sharing <= TRUE; source_sharing++) + { + for (dest_current = FALSE; dest_current <= TRUE; dest_current++) + { + for (dest_sharing = FALSE; dest_sharing <= TRUE; dest_sharing++) + { + winetest_push_context("source_current=%d source_sharing=%d dest_current=%d dest_sharing=%d", + source_current, source_sharing, dest_current, dest_sharing); + + source = wglCreateContext(winhdc); + ok(!!source, "Create source context failed\n"); + dest = wglCreateContext(winhdc); + ok(!!dest, "Create dest context failed\n"); + other = wglCreateContext(winhdc); + ok(!!other, "Create other context failed\n"); + + if (source_current) + { + res = wglMakeCurrent(winhdc, source); + ok(res, "Make source current failed\n"); + } + if (source_sharing) + { + res = wglShareLists(other, source); + todo_wine_if(source_current) + ok(res, "Sharing of display lists from other to source failed\n"); + } + if (dest_current) + { + res = wglMakeCurrent(winhdc, dest); + ok(res, "Make dest current failed\n"); + } + if (dest_sharing) + { + res = wglShareLists(other, dest); + todo_wine_if(dest_current) + ok(res, "Sharing of display lists from other to dest failed\n"); + } + + res = wglShareLists(source, dest); + todo_wine_if(dest_current || dest_sharing) + ok(res || broken(nvidia && !source_sharing && dest_sharing), + "Sharing of display lists from source to dest failed\n"); + + if (source_current || dest_current) + { + res = wglMakeCurrent(NULL, NULL); + ok(res, "Make none current failed\n"); + } + res = wglDeleteContext(source); + ok(res, "Delete source context failed\n"); + res = wglDeleteContext(dest); + ok(res, "Delete dest context failed\n"); + if (!strcmp(winetest_platform, "wine") || !amd || source_sharing || !dest_sharing) + { + /* If source_sharing=FALSE and dest_sharing=TRUE, wglShareLists succeeds on AMD, but + * sometimes wglDeleteContext crashes afterwards. On Wine, both functions should always + * succeed in this case. */ + res = wglDeleteContext(other); + ok(res, "Delete other context failed\n"); + } + + winetest_pop_context(); + } + } + } } }

1 0

Alex Henrie : winex11: Allow replacing either context in wglShareLists.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 6ee4d4f662ac2a86cc4b9e36e6acb827bebb00b7 URL: https://gitlab.winehq.org/wine/wine/-/commit/6ee4d4f662ac2a86cc4b9e36e6acb8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Apr 9 22:32:57 2023 -0600 winex11: Allow replacing either context in wglShareLists. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=11436 (cherry picked from commit 28233dd3bc4963e6205d33aedb665bfdb995c9c6) --- dlls/opengl32/tests/opengl.c | 5 ++--- dlls/winex11.drv/opengl.c | 41 ++++++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 22 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 4fb7f9669b2..aa90a394737 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -577,7 +577,6 @@ static void test_sharelists(HDC winhdc) if (source_sharing) { res = wglShareLists(other, source); - todo_wine_if(source_current) ok(res, "Sharing of display lists from other to source failed\n"); } if (dest_current) @@ -588,12 +587,12 @@ static void test_sharelists(HDC winhdc) if (dest_sharing) { res = wglShareLists(other, dest); - todo_wine_if(dest_current) + todo_wine_if(source_sharing && dest_current) ok(res, "Sharing of display lists from other to dest failed\n"); } res = wglShareLists(source, dest); - todo_wine_if(dest_current || dest_sharing) + todo_wine_if((source_current || source_sharing) && (dest_current || dest_sharing)) ok(res || broken(nvidia && !source_sharing && dest_sharing), "Sharing of display lists from source to dest failed\n"); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index c44e9579cb6..ab235d94250 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1917,6 +1917,8 @@ done: */ static BOOL glxdrv_wglShareLists(struct wgl_context *org, struct wgl_context *dest) { + struct wgl_context *keep, *clobber; + TRACE("(%p, %p)\n", org, dest); /* Sharing of display lists works differently in GLX and WGL. In case of GLX it is done @@ -1927,34 +1929,35 @@ static BOOL glxdrv_wglShareLists(struct wgl_context *org, struct wgl_context *de * so there delaying context creation doesn't work. * * The new approach is to create a GLX context in wglCreateContext / wglCreateContextAttribsARB - * and when a program requests sharing we recreate the destination context if it hasn't been made - * current or when it hasn't shared display lists before. + * and when a program requests sharing we recreate the destination or source context if it + * hasn't been made current and it hasn't shared display lists before. */ - if(dest->has_been_current) + if (!dest->has_been_current && !dest->sharing) { - ERR("Could not share display lists because the destination context has already been current\n"); - return FALSE; + keep = org; + clobber = dest; } - else if(dest->sharing) + else if (!org->has_been_current && !org->sharing) { - ERR("Could not share display lists because the destination context has already shared lists\n"); - return FALSE; + keep = dest; + clobber = org; } else { - /* Re-create the GLX context and share display lists */ - pglXDestroyContext(gdi_display, dest->ctx); - dest->ctx = create_glxcontext(gdi_display, dest, org->ctx); - TRACE(" re-created context (%p) for Wine context %p (%s) sharing lists with ctx %p (%s)\n", - dest->ctx, dest, debugstr_fbconfig(dest->fmt->fbconfig), - org->ctx, debugstr_fbconfig( org->fmt->fbconfig)); - - org->sharing = TRUE; - dest->sharing = TRUE; - return TRUE; + ERR("Could not share display lists because both of the contexts have already been current or shared\n"); + return FALSE; } - return FALSE; + + pglXDestroyContext(gdi_display, clobber->ctx); + clobber->ctx = create_glxcontext(gdi_display, clobber, keep->ctx); + TRACE("re-created context (%p) for Wine context %p (%s) sharing lists with ctx %p (%s)\n", + clobber->ctx, clobber, debugstr_fbconfig(clobber->fmt->fbconfig), + keep->ctx, debugstr_fbconfig(keep->fmt->fbconfig)); + + org->sharing = TRUE; + dest->sharing = TRUE; + return TRUE; } static void wglFinish(void)

1 0