February 2022 - Wine-commits

Akihiro Sagawa : ntdll/tests: Expand path name tests with path + device name.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: b301e0285e78b3c873522dcae8c297bf4258746d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b301e0285e78b3c873522dca… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jun 19 18:25:33 2021 +0900 ntdll/tests: Expand path name tests with path + device name. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 64c4582a40a512181bddd8d7e02f25f343049c7f) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/tests/path.c | 44 +++++++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index e4adc992a28..66d029b2016 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -316,6 +316,11 @@ static void test_RtlGetFullPathName_U(void) { "...", "C:\\windows\\", NULL}, { "./foo", "C:\\windows\\foo", "foo"}, { "foo/..", "C:\\windows", "windows"}, + { "\\windows\\nul", "\\\\.\\nul", NULL}, + { "C:\\nonexistent\\nul", "\\\\.\\nul", NULL}, + { "C:\\con\\con", "\\\\.\\con", NULL}, + { "C:NUL.", "\\\\.\\NUL", NULL}, + { "C:NUL", "\\\\.\\NUL", NULL}, { "AUX", "\\\\.\\AUX", NULL}, { "COM1", "\\\\.\\COM1", NULL}, { "?<>*\"|:", "C:\\windows\\?<>*\"|:", "?<>*\"|:"}, @@ -458,6 +463,9 @@ static void test_RtlDosPathNameToNtPathName_U(void) {L"...", L"\\??\\C:\\windows\\", -1}, {L"./foo", L"\\??\\C:\\windows\\foo", 15}, {L"foo/..", L"\\??\\C:\\windows", 7}, + {L"\\windows\\nul", L"\\??\\nul", -1}, + {L"C:NUL.", L"\\??\\NUL", -1}, + {L"C:NUL", L"\\??\\NUL", -1}, {L"AUX" , L"\\??\\AUX", -1}, {L"COM1" , L"\\??\\COM1", -1}, {L"?<>*\"|:", L"\\??\\C:\\windows\\?<>*\"|:", 15}, @@ -533,32 +541,30 @@ static void test_RtlDosPathNameToNtPathName_U(void) {L"cOnOuT$", L"\\??\\cOnOuT$", -1, L"\\??\\C:\\windows\\cOnOuT$" /* winxp */ }, {L"CONERR$", L"\\??\\C:\\windows\\CONERR$", 15}, }; + static const WCHAR *error_paths[] = { + NULL, L"", L" ", L"C:\\nonexistent\\nul", L"C:\\con\\con" + }; GetCurrentDirectoryA(sizeof(curdir), curdir); SetCurrentDirectoryA("C:\\windows\\"); - ret = pRtlDosPathNameToNtPathName_U(NULL, &nameW, &file_part, NULL); - ok(!ret, "Got %d.\n", ret); - - ret = pRtlDosPathNameToNtPathName_U(L"", &nameW, &file_part, NULL); - ok(!ret, "Got %d.\n", ret); - - ret = pRtlDosPathNameToNtPathName_U(L" ", &nameW, &file_part, NULL); - ok(!ret, "Got %d.\n", ret); - - if (pRtlDosPathNameToNtPathName_U_WithStatus) + for (i = 0; i < ARRAY_SIZE(error_paths); ++i) { - status = pRtlDosPathNameToNtPathName_U_WithStatus(NULL, &nameW, &file_part, NULL); - ok(status == STATUS_OBJECT_NAME_INVALID || status == STATUS_OBJECT_PATH_NOT_FOUND /* 2003 */, - "Got status %#x.\n", status); + winetest_push_context("%s", debugstr_w(error_paths[i])); - status = pRtlDosPathNameToNtPathName_U_WithStatus(L"", &nameW, &file_part, NULL); - ok(status == STATUS_OBJECT_NAME_INVALID || status == STATUS_OBJECT_PATH_NOT_FOUND /* 2003 */, - "Got status %#x.\n", status); + ret = pRtlDosPathNameToNtPathName_U(error_paths[i], &nameW, &file_part, NULL); + todo_wine_if(i == 3 || i == 4) + ok(!ret, "Got %d.\n", ret); + + if (pRtlDosPathNameToNtPathName_U_WithStatus) + { + status = pRtlDosPathNameToNtPathName_U_WithStatus(error_paths[i], &nameW, &file_part, NULL); + todo_wine_if(i == 3 || i == 4) + ok(status == STATUS_OBJECT_NAME_INVALID || broken(status == STATUS_OBJECT_PATH_NOT_FOUND /* 2003 */), + "Got status %#x.\n", status); + } - status = pRtlDosPathNameToNtPathName_U_WithStatus(L" ", &nameW, &file_part, NULL); - ok(status == STATUS_OBJECT_NAME_INVALID || status == STATUS_OBJECT_PATH_NOT_FOUND /* 2003 */, - "Got status %#x.\n", status); + winetest_pop_context(); } for (i = 0; i < ARRAY_SIZE(tests); ++i)

1 0

Akihiro Sagawa : ntdll: Validate directory path when the path name ends with a dos device name.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: a917d758b37cf7ba73e446e96b01c5976aa27d7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a917d758b37cf7ba73e446e9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Jun 19 18:25:35 2021 +0900 ntdll: Validate directory path when the path name ends with a dos device name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51291 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0acd98f135b246176f33896bdc13ee6cadc3339e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/path.c | 91 ++++++++++++++++++++++++++++++++++++++++++------- dlls/ntdll/tests/path.c | 2 -- 2 files changed, 78 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 86760f178e1..9cb4ba7d49b 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -129,6 +129,40 @@ ULONG WINAPI RtlIsDosDeviceName_U( PCWSTR dos_name ) return 0; } +/****************************************************************** + * is_valid_directory + * + * Helper for RtlDosPathNameToNtPathName_U_WithStatus. + * Test if the path is an exisiting directory. + */ +static BOOL is_valid_directory(LPCWSTR path) +{ + OBJECT_ATTRIBUTES attr; + UNICODE_STRING ntpath; + IO_STATUS_BLOCK io; + HANDLE handle; + NTSTATUS nts; + + if (!RtlDosPathNameToNtPathName_U(path, &ntpath, NULL, NULL)) + return FALSE; + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = &ntpath; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + nts = NtOpenFile(&handle, FILE_READ_ATTRIBUTES | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT); + RtlFreeUnicodeString(&ntpath); + if (nts != STATUS_SUCCESS) + return FALSE; + NtClose(handle); + return TRUE; +} + /************************************************************************** * RtlDosPathNameToNtPathName_U_WithStatus [NTDLL.@] * @@ -146,9 +180,10 @@ NTSTATUS WINAPI RtlDosPathNameToNtPathName_U_WithStatus(const WCHAR *dos_path, U { static const WCHAR global_prefix[] = {'\\','\\','?','\\'}; static const WCHAR global_prefix2[] = {'\\','?','?','\\'}; - ULONG sz, offset; + NTSTATUS nts = STATUS_SUCCESS; + ULONG sz, offset, dosdev; WCHAR local[MAX_PATH]; - LPWSTR ptr; + LPWSTR ptr = local; TRACE("(%s,%p,%p,%p)\n", debugstr_w(dos_path), ntpath, file_part, cd); @@ -178,28 +213,57 @@ NTSTATUS WINAPI RtlDosPathNameToNtPathName_U_WithStatus(const WCHAR *dos_path, U return STATUS_SUCCESS; } - ptr = local; - sz = RtlGetFullPathName_U(dos_path, sizeof(local), ptr, file_part); - if (sz == 0) return STATUS_OBJECT_NAME_INVALID; + dosdev = RtlIsDosDeviceName_U(dos_path); + if ((offset = HIWORD(dosdev))) + { + sz = offset + sizeof(WCHAR); + + if (sz > sizeof(local) && + (!(ptr = RtlAllocateHeap(GetProcessHeap(), 0, sz)))) + return STATUS_NO_MEMORY; + + memcpy(ptr, dos_path, offset); + ptr[offset/sizeof(WCHAR)] = '\0'; + + if (!is_valid_directory(ptr)) + { + nts = STATUS_OBJECT_NAME_INVALID; + goto out; + } + + if (*file_part) *file_part = NULL; - if (sz > sizeof(local)) + sz = LOWORD(dosdev); + + wcscpy(ptr, L"\\\\.\\"); + memcpy(ptr + 4, dos_path + offset / sizeof(WCHAR), sz); + ptr[4 + sz / sizeof(WCHAR)] = '\0'; + sz += 4 * sizeof(WCHAR); + } + else { - if (!(ptr = RtlAllocateHeap(GetProcessHeap(), 0, sz))) return STATUS_NO_MEMORY; - sz = RtlGetFullPathName_U(dos_path, sz, ptr, file_part); + sz = RtlGetFullPathName_U(dos_path, sizeof(local), ptr, file_part); + if (sz == 0) return STATUS_OBJECT_NAME_INVALID; + + if (sz > sizeof(local)) + { + if (!(ptr = RtlAllocateHeap(GetProcessHeap(), 0, sz))) return STATUS_NO_MEMORY; + sz = RtlGetFullPathName_U(dos_path, sz, ptr, file_part); + } } sz += (1 /* NUL */ + 4 /* unc\ */ + 4 /* \??\ */) * sizeof(WCHAR); if (sz > MAXWORD) { - if (ptr != local) RtlFreeHeap(GetProcessHeap(), 0, ptr); - return STATUS_OBJECT_NAME_INVALID; + nts = STATUS_OBJECT_NAME_INVALID; + goto out; } ntpath->MaximumLength = sz; ntpath->Buffer = RtlAllocateHeap(GetProcessHeap(), 0, ntpath->MaximumLength); if (!ntpath->Buffer) { - if (ptr != local) RtlFreeHeap(GetProcessHeap(), 0, ptr); - return STATUS_NO_MEMORY; + nts = STATUS_NO_MEMORY; + goto out; } wcscpy(ntpath->Buffer, L"\\??\\"); @@ -225,8 +289,9 @@ NTSTATUS WINAPI RtlDosPathNameToNtPathName_U_WithStatus(const WCHAR *dos_path, U /* FIXME: cd filling */ +out: if (ptr != local) RtlFreeHeap(GetProcessHeap(), 0, ptr); - return STATUS_SUCCESS; + return nts; } /************************************************************************** diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 66d029b2016..47afaf2aa3a 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -553,13 +553,11 @@ static void test_RtlDosPathNameToNtPathName_U(void) winetest_push_context("%s", debugstr_w(error_paths[i])); ret = pRtlDosPathNameToNtPathName_U(error_paths[i], &nameW, &file_part, NULL); - todo_wine_if(i == 3 || i == 4) ok(!ret, "Got %d.\n", ret); if (pRtlDosPathNameToNtPathName_U_WithStatus) { status = pRtlDosPathNameToNtPathName_U_WithStatus(error_paths[i], &nameW, &file_part, NULL); - todo_wine_if(i == 3 || i == 4) ok(status == STATUS_OBJECT_NAME_INVALID || broken(status == STATUS_OBJECT_PATH_NOT_FOUND /* 2003 */), "Got status %#x.\n", status); }

1 0

Akihiro Sagawa : ntdll: Fix null pointer dereference in RtlDosPathNameToNtPathName_U_WithStatus.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: d3ffdb1740beb4efc66c0ce94b69be99ceb3daa5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3ffdb1740beb4efc66c0ce9… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Jun 25 18:47:00 2021 +0900 ntdll: Fix null pointer dereference in RtlDosPathNameToNtPathName_U_WithStatus. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c94ac2e0619ab31bc3138f17786e7cac00a95bcd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index 9cb4ba7d49b..af52e0e2833 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -231,7 +231,7 @@ NTSTATUS WINAPI RtlDosPathNameToNtPathName_U_WithStatus(const WCHAR *dos_path, U goto out; } - if (*file_part) *file_part = NULL; + if (file_part) *file_part = NULL; sz = LOWORD(dosdev);

1 0

Francois Gouget : ntdll: Fix the spelling of a comment.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 4b3ca9abee7fd52d418811bfe4f9fa792f675ac9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b3ca9abee7fd52d418811bf… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Aug 27 12:57:46 2021 +0200 ntdll: Fix the spelling of a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 167c7a524fd0ebc8c3ef3afd1af463dbf2b374ce) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index af52e0e2833..e452c48df33 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -133,7 +133,7 @@ ULONG WINAPI RtlIsDosDeviceName_U( PCWSTR dos_name ) * is_valid_directory * * Helper for RtlDosPathNameToNtPathName_U_WithStatus. - * Test if the path is an exisiting directory. + * Test if the path is an existing directory. */ static BOOL is_valid_directory(LPCWSTR path) {

1 0

Henri Verbeet : dxgi/tests: Add a test for swapchain present counts.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: f8d613fdc540a38c1d4cb3ffcbc0ef5b8f2b114a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8d613fdc540a38c1d4cb3ff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 1 16:56:30 2021 +0200 dxgi/tests: Add a test for swapchain present counts. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7eadbae52c9d287524acbe61121939d536a4026a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 53d768d1a36..8ee61fd800d 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -908,6 +908,38 @@ static IDXGIAdapter *get_adapter_(unsigned int line, IUnknown *device, BOOL is_d return adapter; } +#define create_swapchain(a, b, c) create_swapchain_(__LINE__, a, b, c) +static IDXGISwapChain *create_swapchain_(unsigned int line, IUnknown *device, BOOL is_d3d12, HWND window) +{ + DXGI_SWAP_CHAIN_DESC desc; + IDXGISwapChain *swapchain; + IDXGIFactory *factory; + HRESULT hr; + + desc.BufferDesc.Width = 640; + desc.BufferDesc.Height = 480; + desc.BufferDesc.RefreshRate.Numerator = 60; + desc.BufferDesc.RefreshRate.Denominator = 1; + desc.BufferDesc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; + desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + desc.BufferCount = is_d3d12 ? 2 : 1; + desc.OutputWindow = window; + desc.Windowed = TRUE; + desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; + desc.Flags = 0; + + get_factory(device, is_d3d12, &factory); + hr = IDXGIFactory_CreateSwapChain(factory, device, &desc, &swapchain); + ok_(__FILE__, line)(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + IDXGIFactory_Release(factory); + + return swapchain; +} + static void test_adapter_desc(void) { DXGI_ADAPTER_DESC1 desc1; @@ -7324,6 +7356,63 @@ done: heap_free(original_modes); } +static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12) +{ + UINT present_count, expected; + IDXGISwapChain *swapchain; + HWND window; + HRESULT hr; + + window = create_window(); + swapchain = create_swapchain(device, is_d3d12, window); + + present_count = ~0u; + hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(!present_count, "Got unexpected present count %u.\n", present_count); + + hr = IDXGISwapChain_Present(swapchain, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + expected = present_count + 1; + hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + + hr = IDXGISwapChain_Present(swapchain, 10, 0); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + expected = present_count; + hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + + hr = IDXGISwapChain_Present(swapchain, 0, DXGI_PRESENT_TEST); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + expected = present_count; + hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + + ShowWindow(window, SW_MINIMIZE); + hr = IDXGISwapChain_Present(swapchain, 0, 0); + ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Got unexpected hr %#x.\n", hr); + expected = present_count + !!is_d3d12; + hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) + ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + + ShowWindow(window, SW_NORMAL); + hr = IDXGISwapChain_Present(swapchain, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + expected = present_count + 1; + hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + + IDXGISwapChain_Release(swapchain); + DestroyWindow(window); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -7441,6 +7530,7 @@ START_TEST(dxgi) run_on_d3d10(test_window_association); run_on_d3d10(test_default_fullscreen_target_output); run_on_d3d10(test_mode_change); + run_on_d3d10(test_swapchain_present_count); if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) { @@ -7471,6 +7561,7 @@ START_TEST(dxgi) run_on_d3d12(test_window_association); run_on_d3d12(test_default_fullscreen_target_output); run_on_d3d12(test_mode_change); + run_on_d3d12(test_swapchain_present_count); FreeLibrary(d3d12_module); }

1 0

Henri Verbeet : dxgi: Implement d3d11_swapchain_GetLastPresentCount().
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: b96d75db4dfe70944d65a5c6a2b040382f099226 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b96d75db4dfe70944d65a5c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 1 16:56:31 2021 +0200 dxgi: Implement d3d11_swapchain_GetLastPresentCount(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6f674ef6f137afe719f5cf049c60f4303bee205e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dxgi/dxgi_private.h | 1 + dlls/dxgi/swapchain.c | 14 +++++++++++--- dlls/dxgi/tests/dxgi.c | 20 +++++++++++--------- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index acba3544e39..82272ff165a 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -182,6 +182,7 @@ struct d3d11_swapchain IDXGIFactory *factory; IDXGIOutput *target; + LONG present_count; }; HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 0f335a71cb7..b5a9c15a091 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -328,6 +328,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetDevice(IDXGISwapChain1 *ifac static HRESULT d3d11_swapchain_present(struct d3d11_swapchain *swapchain, unsigned int sync_interval, unsigned int flags) { + HRESULT hr; + if (sync_interval > 4) { WARN("Invalid sync interval %u.\n", sync_interval); @@ -345,7 +347,9 @@ static HRESULT d3d11_swapchain_present(struct d3d11_swapchain *swapchain, return S_OK; } - return wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, sync_interval, 0); + if (SUCCEEDED(hr = wined3d_swapchain_present(swapchain->wined3d_swapchain, NULL, NULL, NULL, sync_interval, 0))) + InterlockedIncrement(&swapchain->present_count); + return hr; } static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_Present(IDXGISwapChain1 *iface, UINT sync_interval, UINT flags) @@ -599,9 +603,13 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFrameStatistics(IDXGISwapCha static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetLastPresentCount(IDXGISwapChain1 *iface, UINT *last_present_count) { - FIXME("iface %p, last_present_count %p stub!\n", iface, last_present_count); + struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); - return E_NOTIMPL; + TRACE("iface %p, last_present_count %p.\n", iface, last_present_count); + + *last_present_count = swapchain->present_count; + + return S_OK; } /* IDXGISwapChain1 methods */ diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 8ee61fd800d..238bc014c18 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -7368,28 +7368,29 @@ static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12) present_count = ~0u; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(!present_count, "Got unexpected present count %u.\n", present_count); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(!present_count, "Got unexpected present count %u.\n", present_count); hr = IDXGISwapChain_Present(swapchain, 0, 0); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected = present_count + 1; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) + ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); hr = IDXGISwapChain_Present(swapchain, 10, 0); ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); expected = present_count; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); hr = IDXGISwapChain_Present(swapchain, 0, DXGI_PRESENT_TEST); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected = present_count; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); ShowWindow(window, SW_MINIMIZE); @@ -7397,7 +7398,7 @@ static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12) ok(hr == (is_d3d12 ? S_OK : DXGI_STATUS_OCCLUDED), "Got unexpected hr %#x.\n", hr); expected = present_count + !!is_d3d12; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); todo_wine_if(is_d3d12) ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); @@ -7406,8 +7407,9 @@ static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); expected = present_count + 1; hr = IDXGISwapChain_GetLastPresentCount(swapchain, &present_count); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); + todo_wine_if(is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine_if(is_d3d12) + ok(present_count == expected, "Got unexpected present count %u, expected %u.\n", present_count, expected); IDXGISwapChain_Release(swapchain); DestroyWindow(window);

1 0

Zhiyi Zhang : uxtheme/tests: Test that SetWindowTheme() should send WM_THEMECHANGED instead of posting it.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 6b501df752d9817771e6ef7ab5f3ab9207953b42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b501df752d9817771e6ef7a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 2 11:36:49 2021 +0800 uxtheme/tests: Test that SetWindowTheme() should send WM_THEMECHANGED instead of posting it. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 064dad234295c2f5a2b95017dc280cac06afd614) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/uxtheme/tests/msg.h | 409 ++++++++++++++++++++++++++++++++++++++++++++ dlls/uxtheme/tests/system.c | 138 ++++++++++++++- 2 files changed, 545 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6b501df752d9817771e6…

1 0

Zhiyi Zhang : uxtheme: Send WM_THEMECHANGED instead of posting it in SetWindowTheme().
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 46390286f0002bc47af22d4cb1dfa79f3a3e24c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=46390286f0002bc47af22d4c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jul 2 11:36:59 2021 +0800 uxtheme: Send WM_THEMECHANGED instead of posting it in SetWindowTheme(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51348 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit fe257dde58f03fe1fc9705caf24edbe16df7a1cd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/uxtheme/system.c | 2 +- dlls/uxtheme/tests/system.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index aaef03f0205..f8cc876b0c9 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -685,7 +685,7 @@ HRESULT WINAPI SetWindowTheme(HWND hwnd, LPCWSTR pszSubAppName, if(SUCCEEDED(hr)) hr = UXTHEME_SetWindowProperty(hwnd, atSubIdList, pszSubIdList); if(SUCCEEDED(hr)) - UXTHEME_broadcast_msg (hwnd, WM_THEMECHANGED); + SendMessageW(hwnd, WM_THEMECHANGED, 0, 0); return hr; } diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index e008319e82a..f4719caad89 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -237,8 +237,8 @@ todo_wine } DispatchMessageA(&msg); } - ok_sequence(sequences, PARENT_SEQ_INDEX, SetWindowThemeSeq, "SetWindowTheme parent", TRUE); - ok_sequence(sequences, CHILD_SEQ_INDEX, EmptySeq, "SetWindowTheme child", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, SetWindowThemeSeq, "SetWindowTheme parent", FALSE); + ok_sequence(sequences, CHILD_SEQ_INDEX, EmptySeq, "SetWindowTheme child", FALSE); DestroyWindow(hWnd); UnregisterClassA("TestSetWindowThemeParentClass", GetModuleHandleA(0)); UnregisterClassA("TestSetWindowThemeChildClass", GetModuleHandleA(0));

1 0

Jactry Zeng : gdi32: Fix a typo in unix_face_create().
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 89926751ff94d7640a252887e1cf799f5d3c4b2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=89926751ff94d7640a252887… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Jul 12 20:55:32 2021 +0800 gdi32: Fix a typo in unix_face_create(). This also fixes test failures in test_lang_names() when on Japanese system. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51382 Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit aee7d560ae1834cb1a66c9057a230c6d56d9a943) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 4f5d4725876..bbfe72cc769 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1243,7 +1243,7 @@ static struct unix_face *unix_face_create( const char *unix_name, void *data_ptr This->style_name = decode_opentype_name( &style_name.face_name ); memset( &full_name, 0, sizeof(full_name) ); - style_name.primary_langid = primary_langid; + full_name.primary_langid = primary_langid; opentype_enum_full_names( tt_name_v0, search_face_name_callback, &full_name ); This->full_name = decode_opentype_name( &full_name.face_name );

1 0

Piotr Caban : msvcrt: Update round_limb on first limb length change in printf.
by Alexandre Julliard 25 Feb '22

25 Feb '22

Module: wine Branch: oldstable Commit: 2253901ccf181e4365b16cd02903c3da4ec41514 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2253901ccf181e4365b16cd0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 10 20:38:16 2021 +0200 msvcrt: Update round_limb on first limb length change in printf. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51435 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 2ffcf4402181e7e7e8c322b713924e5738506c88) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/printf.h | 14 ++++++++++++++ dlls/ucrtbase/tests/printf.c | 1 + 2 files changed, 15 insertions(+) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index c6c074de795..d6b945e8ac7 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -704,11 +704,25 @@ static inline int FUNC_NAME(pf_output_fp)(FUNC_NAME(puts_clbk) pf_puts, void *pu if(i != first_limb_len) { first_limb_len = i; radix_pos++; + + round_pos++; + if (round_pos == LIMB_DIGITS) + { + round_pos = 0; + round_limb++; + } } } else if(i == b->e) { first_limb_len = 1; radix_pos++; b->e++; + + round_pos++; + if (round_pos == LIMB_DIGITS) + { + round_pos = 0; + round_limb++; + } } } } diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 96241b22cf0..588e579cc7e 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -819,6 +819,7 @@ static void test_printf_fp(void) { "%.0f", 0.5, { "1", NULL, NULL, NULL, "0" }, {NULL, NULL, NULL, NULL, "1" }}, { "%.0f", 1.5, { "2" }}, { "%.0f", 2.5, { "3", NULL, NULL, NULL, "2" }, {NULL, NULL, NULL, NULL, "3" }}, + { "%g", 9.999999999999999e-5, { "0.0001" }}, }; const char *res = NULL;

1 0