August 2020 - Wine-Commits - list.winehq.org

Alex Henrie : urlmon/tests: Work around broken Win10 in test_CoInternetCombineUrlEx.
by Alexandre Julliard Aug. 21, 2020

Aug. 21, 2020

Module: wine Branch: master Commit: bcfd32edad0812e26dcf3ac6d17a43dfe1ca3ce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcfd32edad0812e26dcf3ac6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 19 21:54:12 2020 -0600 urlmon/tests: Work around broken Win10 in test_CoInternetCombineUrlEx. The exact same workaround was already being used in test_CoInternetCombineIUri. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/uri.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index b1390a35bf..b6d2182a27 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -10899,10 +10899,11 @@ static void test_CoInternetCombineUrlEx(void) { hr = pCoInternetCombineUrlEx(base, relativeW, uri_combine_tests[i].combine_flags, &result, 0); todo_wine_if(uri_combine_tests[i].todo) - ok(hr == uri_combine_tests[i].expected, + ok(hr == uri_combine_tests[i].expected || + broken(hr == S_OK && uri_combine_tests[i].expected == E_INVALIDARG) /* win10 1607 to 1709 */, "Error: CoInternetCombineUrlEx returned 0x%08x, expected 0x%08x on uri_combine_tests[%d].\n", hr, uri_combine_tests[i]. expected, i); - if(SUCCEEDED(hr)) { + if(SUCCEEDED(hr) && SUCCEEDED(uri_combine_tests[i].expected)) { DWORD j; for(j = 0; j < ARRAY_SIZE(uri_combine_tests[i].str_props); ++j) {

1 0

Martin Storsjo : winedump: Fix dumping of rare arm64 unwind opcodes.
by Alexandre Julliard Aug. 21, 2020

Aug. 21, 2020

Module: wine Branch: master Commit: af6853278f74b1e5ea4db93fc433448a49eca047 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af6853278f74b1e5ea4db93f… Author: Martin Storsjo <martin(a)martin.st> Date: Fri Aug 21 14:57:20 2020 +0300 winedump: Fix dumping of rare arm64 unwind opcodes. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/pe.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 7252a6a61f..f03c523be0 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -1345,18 +1345,22 @@ static void dump_arm64_codes( const BYTE *ptr, unsigned int count ) default:printf( "unknown op\n" ); break; } } - else if (ptr[i] == 0xe9) /* MSFT_OP_TRAP_FRAME */ + else if (ptr[i] == 0xe8) /* MSFT_OP_TRAP_FRAME */ { printf( "MSFT_OP_TRAP_FRAME\n" ); } - else if (ptr[i] == 0xea) /* MSFT_OP_MACHINE_FRAME */ + else if (ptr[i] == 0xe9) /* MSFT_OP_MACHINE_FRAME */ { printf( "MSFT_OP_MACHINE_FRAME\n" ); } - else if (ptr[i] == 0xeb) /* MSFT_OP_CONTEXT */ + else if (ptr[i] == 0xea) /* MSFT_OP_CONTEXT */ { printf( "MSFT_OP_CONTEXT\n" ); } + else if (ptr[i] == 0xec) /* MSFT_OP_CLEAR_UNWOUND_TO_CALL */ + { + printf( "MSFT_OP_CLEAR_UNWOUND_TO_CALL\n" ); + } else printf( "??\n"); } }

1 0

Julian Rüger : winemine: Widen some controls to accomodate translations.
by Alexandre Julliard Aug. 20, 2020

Aug. 20, 2020

Module: wine Branch: master Commit: 3aa1bc5718d5816d33eeed3dd160a9b832d2631b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3aa1bc5718d5816d33eeed3d… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Aug 20 13:59:21 2020 +0200 winemine: Widen some controls to accomodate translations. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemine/winemine.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winemine/winemine.rc b/programs/winemine/winemine.rc index fbc73292be..5bbd68247b 100644 --- a/programs/winemine/winemine.rc +++ b/programs/winemine/winemine.rc @@ -60,9 +60,9 @@ FONT 8, "MS Shell Dlg" CAPTION "Fastest Times" { GROUPBOX "Fastest times", -1, 10, 10, 150, 45 - LTEXT "Beginner", -1, 20, 20, 50, 8 - LTEXT "Intermediate", -1, 20, 30, 50, 8 - LTEXT "Expert", -1, 20, 40, 50, 8 + LTEXT "Beginner", -1, 20, 20, 60, 8 + LTEXT "Intermediate", -1, 20, 30, 60, 8 + LTEXT "Expert", -1, 20, 40, 60, 8 LTEXT "", IDC_TIME1, 80, 20, 15, 8 LTEXT "", IDC_TIME2, 80, 30, 15, 8 LTEXT "", IDC_TIME3, 80, 40, 15, 8 @@ -70,7 +70,7 @@ CAPTION "Fastest Times" LTEXT "", IDC_NAME2, 100, 30, 55, 8 LTEXT "", IDC_NAME3, 100, 40, 55, 8 DEFPUSHBUTTON "OK", IDOK, 115, 60, 40, 15 - PUSHBUTTON "Reset Results", IDC_RESET, 15, 60, 80, 15 + PUSHBUTTON "Reset Results", IDC_RESET, 15, 60, 90, 15 } DLG_CONGRATS DIALOG 0, 0, 160, 60

1 0

Biswapriyo Nath : include/dxgi.idl: Fix typo in DXGI_SWAP_CHAIN_FLAG_RESTRICTED_CONTENT member name.
by Alexandre Julliard Aug. 20, 2020

Aug. 20, 2020

Module: wine Branch: master Commit: bcb9db416382b18bc74ad75caff426f7a8b62f92 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bcb9db416382b18bc74ad75c… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Aug 14 11:06:43 2020 +0530 include/dxgi.idl: Fix typo in DXGI_SWAP_CHAIN_FLAG_RESTRICTED_CONTENT member name. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxgi.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dxgi.idl b/include/dxgi.idl index c2960fd88c..6c9a4fac91 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -119,7 +119,7 @@ typedef enum DXGI_SWAP_CHAIN_FLAG DXGI_SWAP_CHAIN_FLAG_NONPREROTATED = 0x0001, DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH = 0x0002, DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE = 0x0004, - DXGI_SWAP_CHAIN_FLAG_RESTRICTED_CONTEXT = 0x0008, + DXGI_SWAP_CHAIN_FLAG_RESTRICTED_CONTENT = 0x0008, DXGI_SWAP_CHAIN_FLAG_RESTRICT_SHARED_RESOURCE_DRIVER = 0x0010, DXGI_SWAP_CHAIN_FLAG_DISPLAY_ONLY = 0x0020, DXGI_SWAP_CHAIN_FLAG_FRAME_LATENCY_WAITABLE_OBJECT = 0x0040,

1 0

Biswapriyo Nath : include/dxgi1_5.idl: Add missing values in DXGI_HDR_METADATA_TYPE enum.
by Alexandre Julliard Aug. 20, 2020

Aug. 20, 2020

Module: wine Branch: master Commit: e002b8257730fbb0c84b75f0be461f9cbbd444cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=e002b8257730fbb0c84b75f0… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Aug 14 11:06:43 2020 +0530 include/dxgi1_5.idl: Add missing values in DXGI_HDR_METADATA_TYPE enum. Also add the related DXGI_HDR_METADATA_HDR10PLUS structure. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxgi1_5.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/dxgi1_5.idl b/include/dxgi1_5.idl index d88d1417f5..7919f01616 100644 --- a/include/dxgi1_5.idl +++ b/include/dxgi1_5.idl @@ -27,6 +27,7 @@ typedef enum DXGI_HDR_METADATA_TYPE { DXGI_HDR_METADATA_TYPE_NONE = 0x0, DXGI_HDR_METADATA_TYPE_HDR10 = 0x1, + DXGI_HDR_METADATA_TYPE_HDR10PLUS = 0x2, } DXGI_HDR_METADATA_TYPE; typedef enum _DXGI_OFFER_RESOURCE_FLAGS @@ -58,6 +59,11 @@ typedef struct DXGI_HDR_METADATA_HDR10 UINT16 MaxFrameAverageLightLevel; } DXGI_HDR_METADATA_HDR10; +typedef struct DXGI_HDR_METADATA_HDR10PLUS +{ + BYTE Data[72]; +} DXGI_HDR_METADATA_HDR10PLUS; + [ object, uuid(80a07424-ab52-42eb-833c-0c42fd282d98),

1 0

Biswapriyo Nath : include/dxgi.idl: Add missing DXGI_DISPLAY_COLOR_SPACE structure.
by Alexandre Julliard Aug. 20, 2020

Aug. 20, 2020

Module: wine Branch: master Commit: 9b53378cf5d97c0f027ffae4e548abde7eb42f87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b53378cf5d97c0f027ffae4… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Aug 14 11:06:43 2020 +0530 include/dxgi.idl: Add missing DXGI_DISPLAY_COLOR_SPACE structure. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxgi.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/dxgi.idl b/include/dxgi.idl index 6c9a4fac91..65c5a4b9d4 100644 --- a/include/dxgi.idl +++ b/include/dxgi.idl @@ -462,6 +462,11 @@ typedef struct DXGI_ADAPTER_DESC1 { UINT Flags; } DXGI_ADAPTER_DESC1; +typedef struct DXGI_DISPLAY_COLOR_SPACE { + FLOAT PrimaryCoordinates[8][2]; + FLOAT WhitePoints[16][2]; +} DXGI_DISPLAY_COLOR_SPACE; + [ object, uuid(29038f61-3839-4626-91fd-086879011a05),

1 0

Julian Rüger : winemine: Rename difficulty to avoid translation issues.
by Alexandre Julliard Aug. 20, 2020

Aug. 20, 2020

1 0

Biswapriyo Nath : include/dxgi1_2.idl: Add missing values in DXGI_SCALING enum.
by Alexandre Julliard Aug. 20, 2020

Aug. 20, 2020

Module: wine Branch: master Commit: 3822e4f3c218e5de6bde1a2d6548ccbcd42f2831 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3822e4f3c218e5de6bde1a2d… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Aug 14 11:06:43 2020 +0530 include/dxgi1_2.idl: Add missing values in DXGI_SCALING enum. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxgi1_2.idl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/dxgi1_2.idl b/include/dxgi1_2.idl index eeabd031ed..ef256d4fd8 100644 --- a/include/dxgi1_2.idl +++ b/include/dxgi1_2.idl @@ -213,7 +213,8 @@ interface IDXGIDevice2 : IDXGIDevice1 typedef enum DXGI_SCALING { DXGI_SCALING_STRETCH = 0, - DXGI_SCALING_NONE = 1 + DXGI_SCALING_NONE = 1, + DXGI_SCALING_ASPECT_RATIO_STRETCH = 2, } DXGI_SCALING; typedef struct DXGI_SWAP_CHAIN_DESC1 {

1 0

Alexandre Julliard : kernel32: Fix user handle conversion in GetConsoleWindow().
by Alexandre Julliard Aug. 20, 2020

Aug. 20, 2020

Module: wine Branch: master Commit: 13ea90d80f7275e1ad4f3fc3c1c75b68bdbefbb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13ea90d80f7275e1ad4f3fc3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 20 21:44:20 2020 +0200 kernel32: Fix user handle conversion in GetConsoleWindow(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 44df9463da..afbf9a91da 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -194,7 +194,7 @@ HWND WINAPI GetConsoleWindow(void) ret = DeviceIoControl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL, NULL ); - return ret ? (HWND)info.win : NULL; + return ret ? wine_server_ptr_handle(info.win) : NULL; }

1 0

Biswapriyo Nath : include/dxgi1_6.idl: Add missing values in DXGI_ADAPTER_FLAG3 enum.
by Alexandre Julliard Aug. 20, 2020

Aug. 20, 2020

Module: wine Branch: master Commit: d02962996a7712e610e8f0982e1bf3a52fa890ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=d02962996a7712e610e8f098… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Fri Aug 14 11:06:43 2020 +0530 include/dxgi1_6.idl: Add missing values in DXGI_ADAPTER_FLAG3 enum. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxgi1_6.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/dxgi1_6.idl b/include/dxgi1_6.idl index e24dd4b367..5657f73dca 100644 --- a/include/dxgi1_6.idl +++ b/include/dxgi1_6.idl @@ -24,6 +24,9 @@ typedef enum DXGI_ADAPTER_FLAG3 DXGI_ADAPTER_FLAG3_REMOTE = 0x1, DXGI_ADAPTER_FLAG3_SOFTWARE = 0x2, DXGI_ADAPTER_FLAG3_ACG_COMPATIBLE = 0x4, + DXGI_ADAPTER_FLAG3_SUPPORT_MONITORED_FENCES = 0x8, + DXGI_ADAPTER_FLAG3_SUPPORT_NON_MONITORED_FENCES = 0x10, + DXGI_ADAPTER_FLAG3_KEYED_MUTEX_CONFORMANCE = 0x20, DXGI_ADAPTER_FLAG3_FORCE_DWORD = 0xffffffff, } DXGI_ADAPTER_FLAG3;

1 0