January 2019 - Wine-devel - list.winehq.org

[PATCH 2/2] po: Update French translation.
by Isira Seneviratne 19 Jan '19

19 Jan '19

2 1

[PATCH 1/2] po: Update Sinhala translation.
by Isira Seneviratne 19 Jan '19

19 Jan '19

2 1

[PATCH] ntdll/tests: Fix some string leaks (Valgrind).
by Sven Baars 18 Jan '19

18 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/ntdll/tests/file.c | 2 ++ dlls/ntdll/tests/reg.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index dcea45e27b..8391570e91 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3662,6 +3662,8 @@ static void test_file_mode(void) if (option_tests[i].file_name == &file_name) DeleteFileW(dos_file_name); } + + pRtlFreeUnicodeString(&file_name); } static void test_query_volume_information_file(void) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index b59d267618..9bb8d25020 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -2008,6 +2008,8 @@ static void test_RtlCreateRegistryKey(void) status = pRtlCreateRegistryKey((RTL_REGISTRY_USER+1) | RTL_REGISTRY_OPTIONAL, NULL); ok(status == STATUS_INVALID_PARAMETER, "RtlCreateRegistryKey unexpected return value: %08x, expected %08x\n", status, STATUS_INVALID_PARAMETER); + + pRtlFreeUnicodeString(&str); } START_TEST(reg) -- 2.17.1

1 0

[PATCH] ntoskrnl.exe/tests: Fix some memory leaks (Valgrind).
by Sven Baars 17 Jan '19

17 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 9ab05bc279..5579a7f401 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -33,6 +33,7 @@ static HANDLE device; static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)( LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR* ); +static BOOL (WINAPI *pRtlFreeUnicodeString)( PUNICODE_STRING ); static void load_resource(const char *name, char *filename) { @@ -176,6 +177,8 @@ static void main_test(void) } while (read == sizeof(buffer)); winetest_add_failures(new_failures); + pRtlFreeUnicodeString(&pathU); + heap_free(test_input); CloseHandle(okfile); DeleteFileW(pathW); } @@ -248,6 +251,7 @@ START_TEST(ntoskrnl) HMODULE hntdll = GetModuleHandleA("ntdll.dll"); pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); + pRtlFreeUnicodeString = (void *)GetProcAddress(hntdll, "RtlFreeUnicodeString"); if (!(service = load_driver(filename, "driver.dll", "WineTestDriver"))) return; -- 2.17.1

1 0

[PATCH] msvcp140/tests: Fix typos in ok() messages.
by Gijs Vermeulen 17 Jan '19

17 Jan '19

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/msvcp140/tests/msvcp140.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 5705882c88..ac7154bec2 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -880,13 +880,13 @@ static void test_Stat(void) ok(0777 == perms, "_Stat(): perms expect: 0777, got 0%o\n", perms); if(ret) { - todo_wine ok(DeleteFileW(test_f1_linkW), "expect tr2_test_dir/f1_link to exist\n"); - todo_wine ok(RemoveDirectoryW(test_dir_linkW), "expect tr2_test_dir/dir_link to exist\n"); + todo_wine ok(DeleteFileW(test_f1_linkW), "expect wine_test_dir/f1_link to exist\n"); + todo_wine ok(RemoveDirectoryW(test_dir_linkW), "expect wine_test_dir/dir_link to exist\n"); } - ok(DeleteFileW(test_f1W), "expect tr2_test_dir/f1 to exist\n"); + ok(DeleteFileW(test_f1W), "expect wine_test_dir/f1 to exist\n"); SetFileAttributesW(test_f2W, FILE_ATTRIBUTE_NORMAL); - ok(DeleteFileW(test_f2W), "expect tr2_test_dir/f2 to exist\n"); - ok(RemoveDirectoryW(test_dirW), "expect tr2_test_dir to exist\n"); + ok(DeleteFileW(test_f2W), "expect wine_test_dir/f2 to exist\n"); + ok(RemoveDirectoryW(test_dirW), "expect wine_test_dir to exist\n"); ok(SetCurrentDirectoryW(origin_path), "SetCurrentDirectoryW to origin_path failed\n"); } @@ -1173,7 +1173,7 @@ static void test_Rename(void) CloseHandle(h2); ok(info1.nFileIndexHigh == info2.nFileIndexHigh && info1.nFileIndexLow == info2.nFileIndexLow, - "test_tr2_sys__Rename(): test %d expect two files equivalent\n", i+1); + "_Rename(): test %d expect two files equivalent\n", i+1); } } @@ -1187,7 +1187,7 @@ static void test_Rename(void) ok(ret == ERROR_ALREADY_EXISTS, "_Rename(): expect: ERROR_ALREADY_EXISTS, got %d\n", ret); ok(p_File_size(f1W) == 7, "_Rename(): expect: 7, got %s\n", wine_dbgstr_longlong(p_File_size(f1W))); - ok(p_File_size(f1_renameW) == 0, "test_tr2_sys__Rename(): expect: 0, got %s\n", + ok(p_File_size(f1_renameW) == 0, "_Rename(): expect: 0, got %s\n", wine_dbgstr_longlong(p_File_size(f1_renameW))); ok(DeleteFileW(f1_renameW), "expect f1_rename to exist\n"); -- 2.20.1

2 1

[PATCH] ole32/tests: Fix a memory leak (Valgrind).
by Sven Baars 17 Jan '19

17 Jan '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/ole32/tests/ole2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index f0ff24b622..422e03a358 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4091,6 +4091,8 @@ static void check_storage_contents(IStorage *stg, const struct storage_def *stg_ *enumerated_streams += 1; } + + IStorage_Release(enumstg); } static HRESULT stgmedium_cmp(const STGMEDIUM *med1, STGMEDIUM *med2) -- 2.17.1

1 0

[PATCH] ddraw/tests: Add a test for the "GDI" surface.
by Henri Verbeet 17 Jan '19

17 Jan '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 364 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index d36120426f9..d52fc313c4b 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -12013,6 +12013,96 @@ static void test_killfocus(void) UnregisterClassA("ddraw_killfocus_wndproc_wc", GetModuleHandleA(NULL)); } +static void test_gdi_surface(void) +{ + IDirectDrawSurface *primary, *backbuffer, *gdi_surface; + DDSCAPS caps = {DDSCAPS_BACKBUFFER}; + DDSURFACEDESC surface_desc; + IDirectDraw *ddraw; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + /* Retrieving the GDI surface requires a primary surface to exist. */ + gdi_surface = (void *)0xc0dec0de; + hr = IDirectDraw_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!gdi_surface, "Got unexpected surface %p.\n", gdi_surface); + + hr = IDirectDraw_FlipToGDISurface(ddraw); + todo_wine ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS; + surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &primary, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(gdi_surface == primary, "Got unexpected surface %p, expected %p.\n", gdi_surface, primary); + IDirectDrawSurface_Release(gdi_surface); + + /* Flipping to the GDI surface requires the primary surface to be + * flippable. */ + hr = IDirectDraw_FlipToGDISurface(ddraw); + todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface_Release(primary); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP; + U5(surface_desc).dwBackBufferCount = 1; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &primary, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(primary, &caps, &backbuffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(backbuffer != primary, "Got unexpected backbuffer %p.\n", backbuffer); + + hr = IDirectDraw_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(gdi_surface == primary, "Got unexpected surface %p, expected %p.\n", gdi_surface, primary); + IDirectDrawSurface_Release(gdi_surface); + + hr = IDirectDrawSurface_Flip(primary, NULL, DDFLIP_WAIT); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDraw_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(gdi_surface == backbuffer || broken(gdi_surface == primary), + "Got unexpected surface %p, expected %p.\n", gdi_surface, backbuffer); + IDirectDrawSurface_Release(gdi_surface); + + hr = IDirectDraw_FlipToGDISurface(ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(gdi_surface == primary, "Got unexpected surface %p, expected %p.\n", gdi_surface, primary); + IDirectDrawSurface_Release(gdi_surface); + + hr = IDirectDraw_FlipToGDISurface(ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface_Release(backbuffer); + IDirectDrawSurface_Release(primary); + + refcount = IDirectDraw_Release(ddraw); + ok(!refcount, "%u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw1) { DDDEVICEIDENTIFIER identifier; @@ -12119,4 +12209,5 @@ START_TEST(ddraw1) test_viewport(); test_find_device(); test_killfocus(); + test_gdi_surface(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 7cbfce056fd..bacc35d31d8 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -13314,6 +13314,96 @@ static void test_killfocus(void) UnregisterClassA("ddraw_killfocus_wndproc_wc", GetModuleHandleA(NULL)); } +static void test_gdi_surface(void) +{ + IDirectDrawSurface *primary, *backbuffer, *gdi_surface; + DDSCAPS caps = {DDSCAPS_BACKBUFFER}; + DDSURFACEDESC surface_desc; + IDirectDraw2 *ddraw; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + /* Retrieving the GDI surface requires a primary surface to exist. */ + gdi_surface = (void *)0xc0dec0de; + hr = IDirectDraw2_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!gdi_surface, "Got unexpected surface %p.\n", gdi_surface); + + hr = IDirectDraw2_FlipToGDISurface(ddraw); + todo_wine ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS; + surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &primary, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw2_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(gdi_surface == primary, "Got unexpected surface %p, expected %p.\n", gdi_surface, primary); + IDirectDrawSurface_Release(gdi_surface); + + /* Flipping to the GDI surface requires the primary surface to be + * flippable. */ + hr = IDirectDraw2_FlipToGDISurface(ddraw); + todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface_Release(primary); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP; + U5(surface_desc).dwBackBufferCount = 1; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &primary, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(primary, &caps, &backbuffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(backbuffer != primary, "Got unexpected backbuffer %p.\n", backbuffer); + + hr = IDirectDraw2_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(gdi_surface == primary, "Got unexpected surface %p, expected %p.\n", gdi_surface, primary); + IDirectDrawSurface_Release(gdi_surface); + + hr = IDirectDrawSurface_Flip(primary, NULL, DDFLIP_WAIT); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDraw2_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(gdi_surface == backbuffer || broken(gdi_surface == primary), + "Got unexpected surface %p, expected %p.\n", gdi_surface, backbuffer); + IDirectDrawSurface_Release(gdi_surface); + + hr = IDirectDraw2_FlipToGDISurface(ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw2_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(gdi_surface == primary, "Got unexpected surface %p, expected %p.\n", gdi_surface, primary); + IDirectDrawSurface_Release(gdi_surface); + + hr = IDirectDraw2_FlipToGDISurface(ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface_Release(backbuffer); + IDirectDrawSurface_Release(primary); + + refcount = IDirectDraw2_Release(ddraw); + ok(!refcount, "%u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw2) { DDDEVICEIDENTIFIER identifier; @@ -13428,4 +13518,5 @@ START_TEST(ddraw2) test_viewport(); test_find_device(); test_killfocus(); + test_gdi_surface(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 9b47c2bd3ca..0066bf770f9 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -15519,6 +15519,96 @@ static void test_sysmem_draw(void) DestroyWindow(window); } +static void test_gdi_surface(void) +{ + IDirectDrawSurface4 *primary, *backbuffer, *gdi_surface; + DDSCAPS2 caps = {DDSCAPS_BACKBUFFER, 0, 0, {0}}; + DDSURFACEDESC2 surface_desc; + IDirectDraw4 *ddraw; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + /* Retrieving the GDI surface requires a primary surface to exist. */ + gdi_surface = (void *)0xc0dec0de; + hr = IDirectDraw4_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!gdi_surface, "Got unexpected surface %p.\n", gdi_surface); + + hr = IDirectDraw4_FlipToGDISurface(ddraw); + todo_wine ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS; + surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &primary, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw4_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(gdi_surface == primary, "Got unexpected surface %p, expected %p.\n", gdi_surface, primary); + IDirectDrawSurface4_Release(gdi_surface); + + /* Flipping to the GDI surface requires the primary surface to be + * flippable. */ + hr = IDirectDraw4_FlipToGDISurface(ddraw); + todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface4_Release(primary); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP; + U5(surface_desc).dwBackBufferCount = 1; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &primary, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetAttachedSurface(primary, &caps, &backbuffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(backbuffer != primary, "Got unexpected backbuffer %p.\n", backbuffer); + + hr = IDirectDraw4_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(gdi_surface == primary, "Got unexpected surface %p, expected %p.\n", gdi_surface, primary); + IDirectDrawSurface4_Release(gdi_surface); + + hr = IDirectDrawSurface4_Flip(primary, NULL, DDFLIP_WAIT); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDraw4_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(gdi_surface == backbuffer || broken(gdi_surface == primary), + "Got unexpected surface %p, expected %p.\n", gdi_surface, backbuffer); + IDirectDrawSurface4_Release(gdi_surface); + + hr = IDirectDraw4_FlipToGDISurface(ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw4_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(gdi_surface == primary, "Got unexpected surface %p, expected %p.\n", gdi_surface, primary); + IDirectDrawSurface4_Release(gdi_surface); + + hr = IDirectDraw4_FlipToGDISurface(ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface4_Release(backbuffer); + IDirectDrawSurface4_Release(primary); + + refcount = IDirectDraw4_Release(ddraw); + ok(!refcount, "%u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw4) { DDDEVICEIDENTIFIER identifier; @@ -15648,4 +15738,5 @@ START_TEST(ddraw4) test_find_device(); test_killfocus(); test_sysmem_draw(); + test_gdi_surface(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index fbc27376a53..1f57420250e 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -15227,6 +15227,96 @@ static void test_sysmem_draw(void) DestroyWindow(window); } +static void test_gdi_surface(void) +{ + IDirectDrawSurface7 *primary, *backbuffer, *gdi_surface; + DDSCAPS2 caps = {DDSCAPS_BACKBUFFER, 0, 0, {0}}; + DDSURFACEDESC2 surface_desc; + IDirectDraw7 *ddraw; + ULONG refcount; + HWND window; + HRESULT hr; + + window = create_window(); + ddraw = create_ddraw(); + ok(!!ddraw, "Failed to create a ddraw object.\n"); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + /* Retrieving the GDI surface requires a primary surface to exist. */ + gdi_surface = (void *)0xc0dec0de; + hr = IDirectDraw7_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + ok(!gdi_surface, "Got unexpected surface %p.\n", gdi_surface); + + hr = IDirectDraw7_FlipToGDISurface(ddraw); + todo_wine ok(hr == DDERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS; + surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &primary, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw7_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(gdi_surface == primary, "Got unexpected surface %p, expected %p.\n", gdi_surface, primary); + IDirectDrawSurface7_Release(gdi_surface); + + /* Flipping to the GDI surface requires the primary surface to be + * flippable. */ + hr = IDirectDraw7_FlipToGDISurface(ddraw); + todo_wine ok(hr == DDERR_NOTFLIPPABLE, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface7_Release(primary); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_BACKBUFFERCOUNT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_COMPLEX | DDSCAPS_FLIP; + U5(surface_desc).dwBackBufferCount = 1; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &primary, NULL); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetAttachedSurface(primary, &caps, &backbuffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(backbuffer != primary, "Got unexpected backbuffer %p.\n", backbuffer); + + hr = IDirectDraw7_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(gdi_surface == primary, "Got unexpected surface %p, expected %p.\n", gdi_surface, primary); + IDirectDrawSurface7_Release(gdi_surface); + + hr = IDirectDrawSurface7_Flip(primary, NULL, DDFLIP_WAIT); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDraw7_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(gdi_surface == backbuffer || broken(gdi_surface == primary), + "Got unexpected surface %p, expected %p.\n", gdi_surface, backbuffer); + IDirectDrawSurface7_Release(gdi_surface); + + hr = IDirectDraw7_FlipToGDISurface(ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDraw7_GetGDISurface(ddraw, &gdi_surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + ok(gdi_surface == primary, "Got unexpected surface %p, expected %p.\n", gdi_surface, primary); + IDirectDrawSurface7_Release(gdi_surface); + + hr = IDirectDraw7_FlipToGDISurface(ddraw); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface7_Release(backbuffer); + IDirectDrawSurface7_Release(primary); + + refcount = IDirectDraw7_Release(ddraw); + ok(!refcount, "%u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -15367,4 +15457,5 @@ START_TEST(ddraw7) test_color_vertex(); test_killfocus(); test_sysmem_draw(); + test_gdi_surface(); } -- 2.11.0

2 1

[PATCH] wined3d: Avoid potential out-of-bounds memory access in surface_cpu_blt_colour_fill().
by Józef Kucia 17 Jan '19

17 Jan '19

Draw rects are derived from the current viewport. It is possible to produce a clear operation with a draw rect which lies completely outside of one of render targets in D3D9. It seems that we never use the CPU blitter for D3D9 render target clears, so it might not be a problem in practice. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1b6e7a5a0654..0ee2f8266372 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2970,8 +2970,8 @@ static void surface_cpu_blt_colour_fill(struct wined3d_rendertarget_view *view, c = wined3d_format_convert_from_float(view->format, colour); bpp = view->format->byte_count; - w = min(box->right, view->width) - box->left; - h = min(box->bottom, view->height) - box->top; + w = min(box->right, view->width) - min(box->left, view->width); + h = min(box->bottom, view->height) - min(box->top, view->height); texture = texture_from_resource(view->resource); map_binding = texture->resource.map_binding; -- 2.19.2

2 1

[PATCH vkd3d 3/3] vkd3d-shader: Rename vkd3d_shader_interface to vkd3d_shader_interface_info.
by Józef Kucia 17 Jan '19

17 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> For consistency with other vkd3d and vkd3d-shader structures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_shader.h | 8 ++++---- libs/vkd3d-shader/spirv.c | 14 +++++++------- libs/vkd3d-shader/vkd3d_shader_main.c | 12 ++++++------ libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- libs/vkd3d/state.c | 10 +++++----- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 2ac8e0fd9505..67884254a88b 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -29,7 +29,7 @@ extern "C" { enum vkd3d_shader_structure_type { - VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE, + VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO, VKD3D_SHADER_STRUCTURE_TYPE_COMPILE_ARGUMENTS, VKD3D_SHADER_STRUCTURE_TYPE_SCAN_INFO, VKD3D_SHADER_STRUCTURE_TYPE_TRANSFORM_FEEDBACK_INFO, @@ -129,7 +129,7 @@ struct vkd3d_shader_push_constant_buffer unsigned int size; /* in bytes */ }; -struct vkd3d_shader_interface +struct vkd3d_shader_interface_info { enum vkd3d_shader_structure_type type; const void *next; @@ -163,7 +163,7 @@ struct vkd3d_shader_transform_feedback_element uint8_t output_slot; }; -/* Extends vkd3d_shader_interface. */ +/* Extends vkd3d_shader_interface_info. */ struct vkd3d_shader_transform_feedback_info { enum vkd3d_shader_structure_type type; @@ -197,7 +197,7 @@ struct vkd3d_shader_compile_arguments int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_code *spirv, unsigned int compiler_options, - const struct vkd3d_shader_interface *shader_interface, + const struct vkd3d_shader_interface_info *shader_interface_info, const struct vkd3d_shader_compile_arguments *compile_args); void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 82a9f628ba88..7afc255edf4e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1898,7 +1898,7 @@ struct vkd3d_dxbc_compiler struct vkd3d_control_flow_info *control_flow_info; size_t control_flow_info_size; - struct vkd3d_shader_interface shader_interface; + struct vkd3d_shader_interface_info shader_interface; struct vkd3d_push_constant_buffer_binding *push_constants; const struct vkd3d_shader_compile_arguments *compile_args; @@ -1925,7 +1925,7 @@ static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_comp struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, uint32_t compiler_options, - const struct vkd3d_shader_interface *shader_interface, + const struct vkd3d_shader_interface_info *shader_interface, const struct vkd3d_shader_compile_arguments *compile_args, const struct vkd3d_shader_scan_info *scan_info) { @@ -2039,7 +2039,7 @@ static struct vkd3d_push_constant_buffer_binding *vkd3d_dxbc_compiler_find_push_ static bool vkd3d_dxbc_compiler_have_combined_sampler(const struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *resource, const struct vkd3d_shader_register *sampler) { - const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; + const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; const struct vkd3d_shader_combined_resource_sampler *combined_sampler; unsigned int i; @@ -2065,7 +2065,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, enum vkd3d_shader_resource_type resource_type, bool is_uav_counter) { - const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; + const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; enum vkd3d_shader_descriptor_type descriptor_type; enum vkd3d_shader_binding_flag resource_type_flag; struct vkd3d_shader_descriptor_binding binding; @@ -3993,7 +3993,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_sampler(struct vkd3d_dxbc_compiler *com static uint32_t vkd3d_dxbc_compiler_get_dummy_sampler_id(struct vkd3d_dxbc_compiler *compiler) { - const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; + const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; const SpvStorageClass storage_class = SpvStorageClassUniformConstant; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, ptr_type_id, var_id; @@ -4079,7 +4079,7 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ enum vkd3d_component_type sampled_type, unsigned int structure_stride, bool raw, const struct vkd3d_spirv_resource_type *resource_type_info) { - const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; + const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; const struct vkd3d_shader_scan_info *scan_info = compiler->scan_info; const SpvStorageClass storage_class = SpvStorageClassUniformConstant; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; @@ -5662,7 +5662,7 @@ static const struct vkd3d_symbol *vkd3d_dxbc_compiler_find_resource(struct vkd3d static const struct vkd3d_symbol *vkd3d_dxbc_compiler_find_combined_sampler(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *resource_reg, const struct vkd3d_shader_register *sampler_reg) { - const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; + const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; unsigned int resource_index, sampler_index; struct vkd3d_symbol key; struct rb_entry *entry; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 37aee0f6fce4..73a9236799d0 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -85,7 +85,7 @@ static int vkd3d_shader_validate_compile_args(const struct vkd3d_shader_compile_ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_code *spirv, unsigned int compiler_options, - const struct vkd3d_shader_interface *shader_interface, + const struct vkd3d_shader_interface_info *shader_interface_info, const struct vkd3d_shader_compile_arguments *compile_args) { struct vkd3d_shader_instruction instruction; @@ -94,12 +94,12 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_parser parser; int ret; - TRACE("dxbc {%p, %zu}, spirv %p, compiler_options %#x, shader_interface %p, compile_args %p.\n", - dxbc->code, dxbc->size, spirv, compiler_options, shader_interface, compile_args); + TRACE("dxbc {%p, %zu}, spirv %p, compiler_options %#x, shader_interface_info %p, compile_args %p.\n", + dxbc->code, dxbc->size, spirv, compiler_options, shader_interface_info, compile_args); - if (shader_interface && shader_interface->type != VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE) + if (shader_interface_info && shader_interface_info->type != VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO) { - WARN("Invalid structure type %#x.\n", shader_interface->type); + WARN("Invalid structure type %#x.\n", shader_interface_info->type); return VKD3D_ERROR_INVALID_ARGUMENT; } @@ -118,7 +118,7 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, vkd3d_shader_trace(parser.data); if (!(spirv_compiler = vkd3d_dxbc_compiler_create(&parser.shader_version, - &parser.shader_desc, compiler_options, shader_interface, compile_args, &scan_info))) + &parser.shader_desc, compiler_options, shader_interface_info, compile_args, &scan_info))) { ERR("Failed to create DXBC compiler.\n"); vkd3d_shader_parser_destroy(&parser); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index bf2f45571375..2942a3408498 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -806,7 +806,7 @@ struct vkd3d_dxbc_compiler; struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader_version *shader_version, const struct vkd3d_shader_desc *shader_desc, uint32_t compiler_options, - const struct vkd3d_shader_interface *shader_interface, + const struct vkd3d_shader_interface_info *shader_interface_info, const struct vkd3d_shader_compile_arguments *compile_args, const struct vkd3d_shader_scan_info *scan_info) DECLSPEC_HIDDEN; int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 18addf39409d..eb7c8be3c6c4 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1310,7 +1310,7 @@ static void dump_shader_stage(VkShaderStageFlagBits stage, const void *data, siz static HRESULT create_shader_stage(struct d3d12_device *device, struct VkPipelineShaderStageCreateInfo *stage_desc, enum VkShaderStageFlagBits stage, - const D3D12_SHADER_BYTECODE *code, const struct vkd3d_shader_interface *shader_interface, + const D3D12_SHADER_BYTECODE *code, const struct vkd3d_shader_interface_info *shader_interface, const struct vkd3d_shader_compile_arguments *compile_args) { struct vkd3d_shader_code dxbc = {code->pShaderBytecode, code->BytecodeLength}; @@ -1435,8 +1435,8 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st struct d3d12_device *device, const D3D12_COMPUTE_PIPELINE_STATE_DESC *desc) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + struct vkd3d_shader_interface_info shader_interface; const struct d3d12_root_signature *root_signature; - struct vkd3d_shader_interface shader_interface; VkComputePipelineCreateInfo pipeline_info; struct vkd3d_shader_scan_info shader_info; struct vkd3d_shader_code dxbc; @@ -1475,7 +1475,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st return hr; } - shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE; + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO; shader_interface.next = NULL; shader_interface.bindings = root_signature->descriptor_mapping; shader_interface.binding_count = root_signature->descriptor_count; @@ -1949,8 +1949,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s uint32_t aligned_offsets[D3D12_VS_INPUT_REGISTER_COUNT]; struct vkd3d_shader_compile_arguments ps_compile_args; struct vkd3d_shader_transform_feedback_info xfb_info; + struct vkd3d_shader_interface_info shader_interface; const struct d3d12_root_signature *root_signature; - struct vkd3d_shader_interface shader_interface; struct vkd3d_shader_signature input_signature; struct VkSubpassDescription sub_pass_desc; struct VkRenderPassCreateInfo pass_desc; @@ -2202,7 +2202,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s xfb_stage = VK_SHADER_STAGE_VERTEX_BIT; } - shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE; + shader_interface.type = VKD3D_SHADER_STRUCTURE_TYPE_SHADER_INTERFACE_INFO; shader_interface.next = NULL; shader_interface.bindings = root_signature->descriptor_mapping; shader_interface.binding_count = root_signature->descriptor_count; -- 2.19.2

2 1

[PATCH vkd3d 2/3] vkd3d: Require D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT for input layout.
by Józef Kucia 17 Jan '19

17 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index e9f73e82b44f..18addf39409d 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -904,7 +904,8 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa root_signature->static_sampler_count = 0; root_signature->static_samplers = NULL; - if (desc->Flags & ~D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT) + if (desc->Flags & ~(D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT + | D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT)) FIXME("Ignoring root signature flags %#x.\n", desc->Flags); if (FAILED(hr = d3d12_root_signature_info_from_desc(&info, desc))) @@ -2282,6 +2283,14 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->attribute_count = ARRAY_SIZE(graphics->attributes); } + if (graphics->attribute_count + && !(root_signature->flags & D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT)) + { + WARN("Input layout is used without D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT.\n"); + hr = E_INVALIDARG; + goto fail; + } + if (FAILED(hr = compute_input_layout_offsets(&desc->InputLayout, aligned_offsets))) goto fail; -- 2.19.2

2 1