- wine-devel - winehq.org

[PATCH] winebrowser: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winebrowser/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winebrowser/main.c b/programs/winebrowser/main.c index b1c49e7cd1..7fcaba13a1 100644 --- a/programs/winebrowser/main.c +++ b/programs/winebrowser/main.c @@ -334,7 +334,7 @@ static WCHAR *encode_unix_path(const char *src) const char safe_chars[] = "/-_.~@&=+$,:"; const char hex_digits[] = "0123456789ABCDEF"; const WCHAR schema[] = {'f','i','l','e',':','/','/',0}; - int len = sizeof(schema)/sizeof(schema[0]); + int len = ARRAY_SIZE(schema); tmp_src = src; -- 2.14.4

1 0

[PATCH] regsvr32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/regsvr32/regsvr32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 988aaa3a20..cfbb80d465 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -49,7 +49,7 @@ static void WINAPIV output_write(UINT id, ...) if (Silent) return; - if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, sizeof(fmt)/sizeof(fmt[0]))) + if (!LoadStringW(GetModuleHandleW(NULL), id, fmt, ARRAY_SIZE(fmt))) { WINE_FIXME("LoadString failed with %d\n", GetLastError()); return; -- 2.14.4

1 0

[PATCH] extrac32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/extrac32/extrac32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c index 63205e8176..7ab936eec0 100644 --- a/programs/extrac32/extrac32.c +++ b/programs/extrac32/extrac32.c @@ -118,7 +118,7 @@ static void copy_file(LPCWSTR source, LPCWSTR destination) static const WCHAR overwriteMsg[] = {'O','v','e','r','w','r','i','t','e',' ','"','%','s','"','?',0}; static const WCHAR titleMsg[] = {'E','x','t','r','a','c','t',0}; WCHAR msg[MAX_PATH+100]; - snprintfW(msg, sizeof(msg)/sizeof(msg[0]), overwriteMsg, destination); + snprintfW(msg, ARRAY_SIZE(msg), overwriteMsg, destination); if (MessageBoxW(NULL, msg, titleMsg, MB_YESNO | MB_ICONWARNING) != IDYES) return; } -- 2.14.4

1 0

[PATCH] xolehlp: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xolehlp/xolehlp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index 4714f8ced5..2a741f4914 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -650,7 +650,7 @@ static BOOL is_local_machineA( const CHAR *server ) { static const CHAR dot[] = "."; CHAR buffer[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD len = sizeof(buffer) / sizeof(buffer[0]); + DWORD len = ARRAY_SIZE( buffer ); if (!server || !strcmp( server, dot )) return TRUE; if (GetComputerNameA( buffer, &len ) && !lstrcmpiA( server, buffer )) return TRUE; @@ -660,7 +660,7 @@ static BOOL is_local_machineW( const WCHAR *server ) { static const WCHAR dotW[] = {'.',0}; WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD len = sizeof(buffer) / sizeof(buffer[0]); + DWORD len = ARRAY_SIZE( buffer ); if (!server || !strcmpW( server, dotW )) return TRUE; if (GetComputerNameW( buffer, &len ) && !strcmpiW( server, buffer )) return TRUE; -- 2.14.4

1 0

[PATCH] wsdapi: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wsdapi/address.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wsdapi/address.c b/dlls/wsdapi/address.c index d6be6a2c57..7f11f48ce7 100644 --- a/dlls/wsdapi/address.c +++ b/dlls/wsdapi/address.c @@ -150,7 +150,7 @@ static HRESULT WINAPI IWSDUdpAddressImpl_GetTransportAddressEx(IWSDUdpAddress *T switch (((SOCKADDR_IN *) &impl->sockAddr)->sin_family) { case AF_INET: - size = sizeof(impl->ipv4Address) / sizeof(WCHAR); + size = ARRAY_SIZE(impl->ipv4Address); if (WSAAddressToStringW((LPSOCKADDR) &impl->sockAddr, sizeof(SOCKADDR_IN), NULL, impl->ipv4Address, &size) == 0) { @@ -161,7 +161,7 @@ static HRESULT WINAPI IWSDUdpAddressImpl_GetTransportAddressEx(IWSDUdpAddress *T break; case AF_INET6: - size = sizeof(impl->ipv6Address) / sizeof(WCHAR); + size = ARRAY_SIZE(impl->ipv6Address); /* Copy the SOCKADDR structure so we can remove the scope ID if not required */ memcpy(&storage, &impl->sockAddr, sizeof(SOCKADDR_IN6)); -- 2.14.4

1 0

[PATCH 2/3] ddraw/tests: Add tests for cross-device blits.
by Józef Kucia 09 Aug '18

09 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 128 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 128 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 528 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c767d3a38d3e..39e7d109438b 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -9046,6 +9046,133 @@ static void test_blt_z_alpha(void) DestroyWindow(window); } +static void test_cross_device_blt(void) +{ + IDirectDrawSurface *surface, *surface2, *sysmem_surface; + IDirect3DDevice *device, *device2; + IDirectDraw *ddraw, *ddraw2; + DDSURFACEDESC surface_desc; + HWND window, window2; + ULONG refcount; + D3DCOLOR color; + DDBLTFX fx; + HRESULT hr; + + window = create_window(); + ddraw = create_ddraw(); + if (!(device = create_device(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN))) + { + skip("Failed to create a 3D device.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + + window2 = create_window(); + ddraw2 = create_ddraw(); + if (!(device2 = create_device(ddraw2, window2, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device.\n"); + IDirectDraw_Release(ddraw2); + IDirect3DDevice_Release(device); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + DestroyWindow(window2); + return; + } + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &sysmem_surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, 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 | DDSCAPS_VIDEOMEMORY; + U5(surface_desc).dwBackBufferCount = 2; + hr = IDirectDraw_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_PIXELFORMAT; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 16; + U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00007c00; + U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x000003e0; + U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x0000001f; + hr = IDirectDraw_CreateSurface(ddraw2, &surface_desc, &surface2, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + memset(&fx, 0, sizeof(fx)); + fx.dwSize = sizeof(fx); + U5(fx).dwFillColor = 0xff0000ff; + hr = IDirectDrawSurface_Blt(surface2, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(SUCCEEDED(hr), "Failed to fill surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface_Blt(surface, NULL, surface2, NULL, DDFLIP_WAIT, NULL); + ok(hr == E_NOTIMPL, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Blt(surface, NULL, surface2, NULL, DDFLIP_WAIT, NULL); + ok(hr == E_NOTIMPL, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(surface, 320, 240); + ok(color == 0x00000000, "Got unexpected color 0x%08x.\n", color); + + hr = IDirectDrawSurface_Blt(sysmem_surface, NULL, surface2, NULL, DDFLIP_WAIT, NULL); + ok(hr == E_NOTIMPL, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(sysmem_surface, 320, 240); + ok(color == 0x00000000, "Got unexpected color 0x%08x.\n", color); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(sysmem_surface); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDrawSurface_Blt(sysmem_surface, NULL, surface2, NULL, DDFLIP_WAIT, NULL); + ok(hr == E_NOTIMPL, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(sysmem_surface, 320, 240); + ok(color == 0x00000000, "Got unexpected color 0x%08x.\n", color); + + IDirectDrawSurface_Release(surface2); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY; + hr = IDirectDraw_CreateSurface(ddraw2, &surface_desc, &surface2, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirectDrawSurface_Blt(surface2, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(SUCCEEDED(hr), "Failed to fill surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface_Blt(sysmem_surface, NULL, surface2, NULL, DDFLIP_WAIT, NULL); + todo_wine ok(hr == D3D_OK, "Failed to blit, hr %#x.\n", hr); + color = get_surface_color(sysmem_surface, 320, 240); + todo_wine ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + + IDirectDrawSurface_Release(surface); + IDirectDrawSurface_Release(surface2); + IDirectDrawSurface_Release(sysmem_surface); + refcount = IDirect3DDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDirect3DDevice_Release(device2); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirectDraw_Release(ddraw); + IDirectDraw_Release(ddraw2); + DestroyWindow(window); + DestroyWindow(window2); +} + static void test_getdc(void) { IDirectDrawSurface *surface, *surface2, *tmp; @@ -11677,6 +11804,7 @@ START_TEST(ddraw1) test_overlay_rect(); test_blt(); test_blt_z_alpha(); + test_cross_device_blt(); test_getdc(); test_transform_vertices(); test_display_mode_surface_pixel_format(); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 794f90b94005..9e2107cda43c 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -10159,6 +10159,133 @@ static void test_blt_z_alpha(void) DestroyWindow(window); } +static void test_cross_device_blt(void) +{ + IDirectDrawSurface *surface, *surface2, *sysmem_surface; + IDirect3DDevice2 *device, *device2; + IDirectDraw2 *ddraw, *ddraw2; + DDSURFACEDESC surface_desc; + HWND window, window2; + ULONG refcount; + D3DCOLOR color; + DDBLTFX fx; + HRESULT hr; + + window = create_window(); + ddraw = create_ddraw(); + if (!(device = create_device(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN))) + { + skip("Failed to create a 3D device.\n"); + IDirectDraw2_Release(ddraw); + DestroyWindow(window); + return; + } + + window2 = create_window(); + ddraw2 = create_ddraw(); + if (!(device2 = create_device(ddraw2, window2, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device.\n"); + IDirectDraw2_Release(ddraw2); + IDirect3DDevice2_Release(device); + IDirectDraw2_Release(ddraw); + DestroyWindow(window); + DestroyWindow(window2); + return; + } + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &sysmem_surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, 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 | DDSCAPS_VIDEOMEMORY; + U5(surface_desc).dwBackBufferCount = 2; + hr = IDirectDraw2_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_PIXELFORMAT; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 16; + U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00007c00; + U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x000003e0; + U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x0000001f; + hr = IDirectDraw2_CreateSurface(ddraw2, &surface_desc, &surface2, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + memset(&fx, 0, sizeof(fx)); + fx.dwSize = sizeof(fx); + U5(fx).dwFillColor = 0xff0000ff; + hr = IDirectDrawSurface_Blt(surface2, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(SUCCEEDED(hr), "Failed to fill surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface_Blt(surface, NULL, surface2, NULL, DDFLIP_WAIT, NULL); + ok(hr == E_NOTIMPL, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Blt(surface, NULL, surface2, NULL, DDFLIP_WAIT, NULL); + ok(hr == E_NOTIMPL, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(surface, 320, 240); + ok(color == 0x00000000, "Got unexpected color 0x%08x.\n", color); + + hr = IDirectDrawSurface_Blt(sysmem_surface, NULL, surface2, NULL, DDFLIP_WAIT, NULL); + ok(hr == E_NOTIMPL, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(sysmem_surface, 320, 240); + ok(color == 0x00000000, "Got unexpected color 0x%08x.\n", color); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(sysmem_surface); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDrawSurface_Blt(sysmem_surface, NULL, surface2, NULL, DDFLIP_WAIT, NULL); + ok(hr == E_NOTIMPL, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(sysmem_surface, 320, 240); + ok(color == 0x00000000, "Got unexpected color 0x%08x.\n", color); + + IDirectDrawSurface_Release(surface2); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY; + hr = IDirectDraw2_CreateSurface(ddraw2, &surface_desc, &surface2, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirectDrawSurface_Blt(surface2, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(SUCCEEDED(hr), "Failed to fill surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface_Blt(sysmem_surface, NULL, surface2, NULL, DDFLIP_WAIT, NULL); + todo_wine ok(hr == D3D_OK, "Failed to blit, hr %#x.\n", hr); + color = get_surface_color(sysmem_surface, 320, 240); + todo_wine ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + + IDirectDrawSurface_Release(surface); + IDirectDrawSurface_Release(surface2); + IDirectDrawSurface_Release(sysmem_surface); + refcount = IDirect3DDevice2_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDirect3DDevice2_Release(device2); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirectDraw2_Release(ddraw); + IDirectDraw2_Release(ddraw2); + DestroyWindow(window); + DestroyWindow(window2); +} + static void test_getdc(void) { IDirectDrawSurface *surface, *surface2, *tmp; @@ -12966,6 +13093,7 @@ START_TEST(ddraw2) test_overlay_rect(); test_blt(); test_blt_z_alpha(); + test_cross_device_blt(); test_getdc(); test_draw_primitive(); test_edge_antialiasing_blending(); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 172d99d16707..cc77eea4a99f 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -11615,6 +11615,141 @@ static void test_blt_z_alpha(void) DestroyWindow(window); } +static void test_cross_device_blt(void) +{ + IDirectDrawSurface4 *surface, *surface2, *sysmem_surface; + IDirect3DDevice3 *device, *device2; + IDirectDraw4 *ddraw, *ddraw2; + DDSURFACEDESC2 surface_desc; + HWND window, window2; + IDirect3D3 *d3d; + ULONG refcount; + D3DCOLOR color; + DDBLTFX fx; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN))) + { + skip("Failed to create a 3D device.\n"); + DestroyWindow(window); + return; + } + + window2 = create_window(); + if (!(device2 = create_device(window2, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device.\n"); + IDirect3DDevice3_Release(device); + DestroyWindow(window); + DestroyWindow(window2); + return; + } + + hr = IDirect3DDevice3_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D3 interface, hr %#x.\n", hr); + hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to get DirectDraw4 interface, hr %#x.\n", hr); + IDirect3D3_Release(d3d); + + hr = IDirect3DDevice3_GetDirect3D(device2, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D3 interface, hr %#x.\n", hr); + hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw2); + ok(SUCCEEDED(hr), "Failed to get DirectDraw4 interface, hr %#x.\n", hr); + IDirect3D3_Release(d3d); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &sysmem_surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, 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 | DDSCAPS_VIDEOMEMORY; + U5(surface_desc).dwBackBufferCount = 2; + hr = IDirectDraw4_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_PIXELFORMAT; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 16; + U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00007c00; + U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x000003e0; + U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x0000001f; + hr = IDirectDraw4_CreateSurface(ddraw2, &surface_desc, &surface2, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + memset(&fx, 0, sizeof(fx)); + fx.dwSize = sizeof(fx); + U5(fx).dwFillColor = 0xff0000ff; + hr = IDirectDrawSurface4_Blt(surface2, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(SUCCEEDED(hr), "Failed to fill surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface4_Blt(surface, NULL, surface2, NULL, DDFLIP_WAIT, NULL); + ok(hr == E_NOTIMPL, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_Flip(surface, NULL, DDFLIP_WAIT); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_Blt(surface, NULL, surface2, NULL, DDFLIP_WAIT, NULL); + ok(hr == E_NOTIMPL, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(surface, 320, 240); + ok(color == 0x00000000, "Got unexpected color 0x%08x.\n", color); + + hr = IDirectDrawSurface4_Blt(sysmem_surface, NULL, surface2, NULL, DDFLIP_WAIT, NULL); + ok(hr == E_NOTIMPL, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(sysmem_surface, 320, 240); + ok(color == 0x00000000, "Got unexpected color 0x%08x.\n", color); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(sysmem_surface); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDrawSurface4_Blt(sysmem_surface, NULL, surface2, NULL, DDFLIP_WAIT, NULL); + ok(hr == E_NOTIMPL, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(sysmem_surface, 320, 240); + ok(color == 0x00000000, "Got unexpected color 0x%08x.\n", color); + + IDirectDrawSurface4_Release(surface2); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY; + hr = IDirectDraw4_CreateSurface(ddraw2, &surface_desc, &surface2, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirectDrawSurface4_Blt(surface2, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(SUCCEEDED(hr), "Failed to fill surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface4_Blt(sysmem_surface, NULL, surface2, NULL, DDFLIP_WAIT, NULL); + todo_wine ok(hr == D3D_OK, "Failed to blit, hr %#x.\n", hr); + color = get_surface_color(sysmem_surface, 320, 240); + todo_wine ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + + IDirectDrawSurface4_Release(surface); + IDirectDrawSurface4_Release(surface2); + IDirectDrawSurface4_Release(sysmem_surface); + IDirectDraw4_Release(ddraw); + IDirectDraw4_Release(ddraw2); + refcount = IDirect3DDevice3_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDirect3DDevice3_Release(device2); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); + DestroyWindow(window2); +} + static void test_color_clamping(void) { static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; @@ -15060,6 +15195,7 @@ START_TEST(ddraw4) test_overlay_rect(); test_blt(); test_blt_z_alpha(); + test_cross_device_blt(); test_color_clamping(); test_getdc(); test_draw_primitive(); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 35a45c034566..501c9a184e28 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -11581,6 +11581,141 @@ static void test_blt_z_alpha(void) DestroyWindow(window); } +static void test_cross_device_blt(void) +{ + IDirectDrawSurface7 *surface, *surface2, *sysmem_surface; + IDirect3DDevice7 *device, *device2; + IDirectDraw7 *ddraw, *ddraw2; + DDSURFACEDESC2 surface_desc; + HWND window, window2; + IDirect3D7 *d3d; + ULONG refcount; + D3DCOLOR color; + DDBLTFX fx; + HRESULT hr; + + window = create_window(); + if (!(device = create_device(window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN))) + { + skip("Failed to create a 3D device.\n"); + DestroyWindow(window); + return; + } + + window2 = create_window(); + if (!(device2 = create_device(window2, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device.\n"); + IDirect3DDevice7_Release(device); + DestroyWindow(window); + DestroyWindow(window2); + return; + } + + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D7 interface, hr %#x.\n", hr); + hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to get DirectDraw7 interface, hr %#x.\n", hr); + IDirect3D7_Release(d3d); + + hr = IDirect3DDevice7_GetDirect3D(device2, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D7 interface, hr %#x.\n", hr); + hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw2); + ok(SUCCEEDED(hr), "Failed to get DirectDraw7 interface, hr %#x.\n", hr); + IDirect3D7_Release(d3d); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &sysmem_surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, 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 | DDSCAPS_VIDEOMEMORY; + U5(surface_desc).dwBackBufferCount = 2; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS | DDSD_PIXELFORMAT; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY; + surface_desc.ddpfPixelFormat.dwSize = sizeof(surface_desc.ddpfPixelFormat); + surface_desc.ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(surface_desc.ddpfPixelFormat).dwRGBBitCount = 16; + U2(surface_desc.ddpfPixelFormat).dwRBitMask = 0x00007c00; + U3(surface_desc.ddpfPixelFormat).dwGBitMask = 0x000003e0; + U4(surface_desc.ddpfPixelFormat).dwBBitMask = 0x0000001f; + hr = IDirectDraw7_CreateSurface(ddraw2, &surface_desc, &surface2, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + + memset(&fx, 0, sizeof(fx)); + fx.dwSize = sizeof(fx); + U5(fx).dwFillColor = 0xff0000ff; + hr = IDirectDrawSurface7_Blt(surface2, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(SUCCEEDED(hr), "Failed to fill surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface7_Blt(surface, NULL, surface2, NULL, DDFLIP_WAIT, NULL); + ok(hr == E_NOTIMPL, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_Flip(surface, NULL, DDFLIP_WAIT); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_Blt(surface, NULL, surface2, NULL, DDFLIP_WAIT, NULL); + ok(hr == E_NOTIMPL, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(surface, 320, 240); + ok(color == 0x00000000, "Got unexpected color 0x%08x.\n", color); + + hr = IDirectDrawSurface7_Blt(sysmem_surface, NULL, surface2, NULL, DDFLIP_WAIT, NULL); + ok(hr == E_NOTIMPL, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(sysmem_surface, 320, 240); + ok(color == 0x00000000, "Got unexpected color 0x%08x.\n", color); + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + hr = IDirectDrawSurface7_IsLost(sysmem_surface); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDrawSurface7_Blt(sysmem_surface, NULL, surface2, NULL, DDFLIP_WAIT, NULL); + ok(hr == E_NOTIMPL, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(sysmem_surface, 320, 240); + ok(color == 0x00000000, "Got unexpected color 0x%08x.\n", color); + + IDirectDrawSurface7_Release(surface2); + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; + surface_desc.dwWidth = 640; + surface_desc.dwHeight = 480; + surface_desc.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN | DDSCAPS_SYSTEMMEMORY; + hr = IDirectDraw7_CreateSurface(ddraw2, &surface_desc, &surface2, NULL); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirectDrawSurface7_Blt(surface2, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(SUCCEEDED(hr), "Failed to fill surface, hr %#x.\n", hr); + + hr = IDirectDrawSurface7_Blt(sysmem_surface, NULL, surface2, NULL, DDFLIP_WAIT, NULL); + todo_wine ok(hr == D3D_OK, "Failed to blit, hr %#x.\n", hr); + color = get_surface_color(sysmem_surface, 320, 240); + todo_wine ok(compare_color(color, 0x000000ff, 1), "Got unexpected color 0x%08x.\n", color); + + IDirectDrawSurface7_Release(surface); + IDirectDrawSurface7_Release(surface2); + IDirectDrawSurface7_Release(sysmem_surface); + IDirectDraw7_Release(ddraw); + IDirectDraw7_Release(ddraw2); + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDirect3DDevice7_Release(device2); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); + DestroyWindow(window2); +} + static void test_color_clamping(void) { static D3DMATRIX mat = @@ -14384,6 +14519,7 @@ START_TEST(ddraw7) test_overlay_rect(); test_blt(); test_blt_z_alpha(); + test_cross_device_blt(); test_color_clamping(); test_getdc(); test_draw_primitive(); -- 2.16.4

3 3

[PATCH 1/3] wined3d: Reject cross-device blits.
by Józef Kucia 09 Aug '18

09 Aug '18

DirectDraw tests show that cross-device blits are supposed to work for limited cases between system memory surfaces. However, cross-device blits are unsafe in wined3d, especially with CSMT enabled. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45382 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- FWIW, the games affected by this bug shouldn't use cross-device blits at all. Cross-device blits happen between a surface created by our amstream implementation, and the bug doesn't occur with native amstream. --- dlls/wined3d/texture.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c316906a9576..634992714d02 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3097,6 +3097,12 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned return WINED3DERR_INVALIDCALL; } + if (dst_texture->resource.device != src_texture->resource.device) + { + FIXME("Rejecting cross-device blit.\n"); + return E_NOTIMPL; + } + wined3d_cs_emit_blt_sub_resource(dst_texture->resource.device->cs, &dst_texture->resource, dst_sub_resource_idx, &dst_box, &src_texture->resource, src_sub_resource_idx, &src_box, flags, fx, filter); -- 2.16.4

2 1

[PATCH 11/11] dxgi/tests: Add option to enable Direct3D 12 validation.
by Józef Kucia 09 Aug '18

09 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/device.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 6e14010f5c33..81b231a4d36f 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -37,6 +37,7 @@ static HRESULT (WINAPI *pCreateDXGIFactory1)(REFIID iid, void **factory); static HRESULT (WINAPI *pCreateDXGIFactory2)(UINT flags, REFIID iid, void **factory); static PFN_D3D12_CREATE_DEVICE pD3D12CreateDevice; +static PFN_D3D12_GET_DEBUG_INTERFACE pD3D12GetDebugInterface; static ULONG get_refcount(IUnknown *iface) { @@ -4042,7 +4043,9 @@ static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) START_TEST(device) { HMODULE dxgi_module, d3d12_module; + BOOL enable_debug_layer = FALSE; unsigned int argc, i; + ID3D12Debug *debug; char **argv; dxgi_module = GetModuleHandleA("dxgi.dll"); @@ -4055,7 +4058,9 @@ START_TEST(device) argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) { - if (!strcmp(argv[i], "--warp")) + if (!strcmp(argv[i], "--validate")) + enable_debug_layer = TRUE; + else if (!strcmp(argv[i], "--warp")) use_warp_adapter = TRUE; else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) use_adapter_idx = atoi(argv[++i]); @@ -4091,6 +4096,13 @@ START_TEST(device) } pD3D12CreateDevice = (void *)GetProcAddress(d3d12_module, "D3D12CreateDevice"); + pD3D12GetDebugInterface = (void *)GetProcAddress(d3d12_module, "D3D12GetDebugInterface"); + + if (enable_debug_layer && SUCCEEDED(pD3D12GetDebugInterface(&IID_ID3D12Debug, (void **)&debug))) + { + ID3D12Debug_EnableDebugLayer(debug); + ID3D12Debug_Release(debug); + } run_on_d3d12(test_swapchain_backbuffer_index); -- 2.16.4

2 1

[PATCH 10/11] include/d3d12: Add PFN_D3D12_GET_DEBUG_INTERFACE declaration.
by Józef Kucia 09 Aug '18

09 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/d3d12.idl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index 43e9c2dca3bb..6f515e6ad6d1 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -2177,4 +2177,6 @@ typedef HRESULT (__stdcall *PFN_D3D12_CREATE_DEVICE)(IUnknown *adapter, [local] HRESULT __stdcall D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device); +typedef HRESULT (__stdcall *PFN_D3D12_GET_DEBUG_INTERFACE)(REFIID iid, void **debug); + [local] HRESULT __stdcall D3D12GetDebugInterface(REFIID iid, void **debug); -- 2.16.4

2 1

[PATCH 09/11] dxgi/tests: Make sure that command queue is idle before destroying it.
by Józef Kucia 09 Aug '18

09 Aug '18

Fixes invalid Direct3D 12 API usage. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/device.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 124c5a43d6e9..6e14010f5c33 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -502,6 +502,47 @@ static ID3D12CommandQueue *create_d3d12_direct_queue(ID3D12Device *device) return queue; } +static HRESULT wait_for_fence(ID3D12Fence *fence, UINT64 value) +{ + HANDLE event; + HRESULT hr; + DWORD ret; + + if (ID3D12Fence_GetCompletedValue(fence) >= value) + return S_OK; + + if (!(event = CreateEventA(NULL, FALSE, FALSE, NULL))) + return E_FAIL; + + if (FAILED(hr = ID3D12Fence_SetEventOnCompletion(fence, value, event))) + { + CloseHandle(event); + return hr; + } + + ret = WaitForSingleObject(event, INFINITE); + CloseHandle(event); + return ret == WAIT_OBJECT_0 ? S_OK : E_FAIL; +} + +#define wait_queue_idle(a, b) wait_queue_idle_(__LINE__, a, b) +static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12CommandQueue *queue) +{ + ID3D12Fence *fence; + HRESULT hr; + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, + &IID_ID3D12Fence, (void **)&fence); + ok_(__FILE__, line)(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + + hr = ID3D12CommandQueue_Signal(queue, fence, 1); + ok_(__FILE__, line)(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + hr = wait_for_fence(fence, 1); + ok_(__FILE__, line)(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr); + + ID3D12Fence_Release(fence); +} + #define get_factory(a, b, c) get_factory_(__LINE__, a, b, c) static void get_factory_(unsigned int line, IUnknown *device, BOOL is_d3d12, IDXGIFactory **factory) { @@ -3990,6 +4031,8 @@ static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) test_func((IUnknown *)queue, TRUE); + wait_queue_idle(device, queue); + refcount = ID3D12CommandQueue_Release(queue); ok(!refcount, "Command queue has %u references left.\n", refcount); refcount = ID3D12Device_Release(device); -- 2.16.4

2 1

[PATCH 08/11] d3d12/tests: Add test for R8G8B8A8_UNORM swapchain format.
by Józef Kucia 09 Aug '18

09 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/tests/d3d12.c | 187 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 139 insertions(+), 48 deletions(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 99641be0f683..2e2e69be0adc 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -177,28 +177,33 @@ static HRESULT create_root_signature(ID3D12Device *device, const D3D12_ROOT_SIGN return hr; } -#define create_empty_root_signature(device, flags) create_empty_root_signature_(__LINE__, device, flags) -static ID3D12RootSignature *create_empty_root_signature_(unsigned int line, - ID3D12Device *device, D3D12_ROOT_SIGNATURE_FLAGS flags) +static ID3D12RootSignature *create_default_root_signature(ID3D12Device *device) { D3D12_ROOT_SIGNATURE_DESC root_signature_desc; ID3D12RootSignature *root_signature = NULL; + D3D12_ROOT_PARAMETER root_parameters[1]; HRESULT hr; - root_signature_desc.NumParameters = 0; - root_signature_desc.pParameters = NULL; + root_parameters[0].ParameterType = D3D12_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS; + root_parameters[0].Constants.ShaderRegister = 0; + root_parameters[0].Constants.RegisterSpace = 0; + root_parameters[0].Constants.Num32BitValues = 4; + root_parameters[0].ShaderVisibility = D3D12_SHADER_VISIBILITY_ALL; + + root_signature_desc.NumParameters = ARRAY_SIZE(root_parameters); + root_signature_desc.pParameters = root_parameters; root_signature_desc.NumStaticSamplers = 0; root_signature_desc.pStaticSamplers = NULL; - root_signature_desc.Flags = flags; + root_signature_desc.Flags = D3D12_ROOT_SIGNATURE_FLAG_NONE; hr = create_root_signature(device, &root_signature_desc, &root_signature); - ok_(__FILE__, line)(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create root signature, hr %#x.\n", hr); return root_signature; } -#define create_pipeline_state(a, b, c) create_pipeline_state_(__LINE__, a, b, c) +#define create_pipeline_state(a, b, c, d) create_pipeline_state_(__LINE__, a, b, c, d) static ID3D12PipelineState *create_pipeline_state_(unsigned int line, ID3D12Device *device, - ID3D12RootSignature *root_signature, DXGI_FORMAT rt_format) + ID3D12RootSignature *root_signature, DXGI_FORMAT rt_format, const D3D12_SHADER_BYTECODE *ps) { D3D12_GRAPHICS_PIPELINE_STATE_DESC pipeline_state_desc; ID3D12PipelineState *pipeline_state; @@ -244,12 +249,15 @@ static ID3D12PipelineState *create_pipeline_state_(unsigned int line, ID3D12Devi 0x0000000f, 0x0100086a, 0x03000065, 0x001020f2, 0x00000000, 0x08000036, 0x001020f2, 0x00000000, 0x00004002, 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x0100003e, }; - static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + static const D3D12_SHADER_BYTECODE default_ps = {ps_code, sizeof(ps_code)}; + + if (!ps) + ps = &default_ps; memset(&pipeline_state_desc, 0, sizeof(pipeline_state_desc)); pipeline_state_desc.pRootSignature = root_signature; pipeline_state_desc.VS = vs; - pipeline_state_desc.PS = ps; + pipeline_state_desc.PS = *ps; pipeline_state_desc.BlendState.RenderTarget[0].RenderTargetWriteMask = D3D12_COLOR_WRITE_ENABLE_ALL; pipeline_state_desc.RasterizerState.FillMode = D3D12_FILL_MODE_SOLID; pipeline_state_desc.RasterizerState.CullMode = D3D12_CULL_MODE_BACK; @@ -265,6 +273,24 @@ static ID3D12PipelineState *create_pipeline_state_(unsigned int line, ID3D12Devi return pipeline_state; } +#define reset_command_list(a, b) reset_command_list_(__LINE__, a, b) +static void reset_command_list_(unsigned int line, + ID3D12GraphicsCommandList *list, ID3D12CommandAllocator *allocator) +{ + HRESULT hr; + + hr = ID3D12CommandAllocator_Reset(allocator); + ok_(__FILE__, line)(hr == S_OK, "Failed to reset command allocator, hr %#x.\n", hr); + hr = ID3D12GraphicsCommandList_Reset(list, allocator, NULL); + ok_(__FILE__, line)(hr == S_OK, "Failed to reset command list, hr %#x.\n", hr); +} + +struct test_context_desc +{ + BOOL no_pipeline; + const D3D12_SHADER_BYTECODE *ps; +}; + struct test_context { ID3D12Device *device; @@ -326,8 +352,9 @@ static void create_render_target_(unsigned int line, struct test_context *contex ID3D12Device_CreateRenderTargetView(context->device, *render_target, NULL, *rtv); } -#define init_test_context(context) init_test_context_(__LINE__, context) -static BOOL init_test_context_(unsigned int line, struct test_context *context) +#define init_test_context(a, b) init_test_context_(__LINE__, a, b) +static BOOL init_test_context_(unsigned int line, struct test_context *context, + const struct test_context_desc *desc) { D3D12_COMMAND_QUEUE_DESC command_queue_desc; D3D12_DESCRIPTOR_HEAP_DESC rtv_heap_desc; @@ -376,11 +403,14 @@ static BOOL init_test_context_(unsigned int line, struct test_context *context) SetRect(&context->scissor_rect, 0, 0, context->render_target_desc.Width, context->render_target_desc.Height); - context->root_signature = create_empty_root_signature_(line, - device, D3D12_ROOT_SIGNATURE_FLAG_NONE); + context->root_signature = create_default_root_signature(device); + + if (desc && desc->no_pipeline) + return TRUE; context->pipeline_state = create_pipeline_state_(line, device, - context->root_signature, context->render_target_desc.Format); + context->root_signature, context->render_target_desc.Format, + desc ? desc->ps : NULL); return TRUE; } @@ -516,7 +546,7 @@ static HWND create_window(DWORD style) } static IDXGISwapChain3 *create_swapchain(ID3D12CommandQueue *queue, HWND window, - unsigned int width, unsigned int height) + DXGI_FORMAT format, unsigned int width, unsigned int height) { IDXGISwapChain1 *swapchain1; DXGI_SWAP_CHAIN_DESC1 desc; @@ -529,7 +559,7 @@ static IDXGISwapChain3 *create_swapchain(ID3D12CommandQueue *queue, HWND window, desc.Width = width; desc.Height = height; - desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; + desc.Format = format; desc.Stereo = FALSE; desc.SampleDesc.Count = 1; desc.SampleDesc.Quality = 0; @@ -735,7 +765,7 @@ static void test_draw(void) struct test_context context; ID3D12CommandQueue *queue; - if (!init_test_context(&context)) + if (!init_test_context(&context, NULL)) return; command_list = context.list; queue = context.queue; @@ -762,54 +792,115 @@ static void test_swapchain_draw(void) { static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; ID3D12GraphicsCommandList *command_list; + struct test_context_desc desc; struct test_context context; ID3D12Resource *backbuffer; IDXGISwapChain3 *swapchain; ID3D12CommandQueue *queue; - unsigned int index; + unsigned int i, index; + ID3D12Device *device; ULONG refcount; HWND window; HRESULT hr; RECT rect; BOOL ret; - if (!init_test_context(&context)) + static const DWORD ps_code[] = + { +#if 0 + float4 color; + + float4 main() : SV_Target + { + return color; + } +#endif + 0x43425844, 0x69e703c1, 0xf0db50aa, 0x9af7ae76, 0x623b93f7, 0x00000001, 0x000000bc, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000044, 0x00000050, 0x00000011, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x06000036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + + static const struct + { + DXGI_FORMAT format; + float input[4]; + unsigned int color; + } + tests[] = + { + {DXGI_FORMAT_B8G8R8A8_UNORM, {1.0f, 0.0f, 0.0f, 1.0f}, 0xffff0000}, + {DXGI_FORMAT_B8G8R8A8_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00}, + {DXGI_FORMAT_R8G8B8A8_UNORM, {1.0f, 0.0f, 0.0f, 1.0f}, 0xff0000ff}, + {DXGI_FORMAT_R8G8B8A8_UNORM, {0.0f, 1.0f, 0.0f, 1.0f}, 0xff00ff00}, + }; + + desc.no_pipeline = TRUE; + if (!init_test_context(&context, &desc)) return; + device = context.device; command_list = context.list; queue = context.queue; - window = create_window(0); + window = create_window(WS_VISIBLE); ret = GetClientRect(window, &rect); ok(ret, "Failed to get client rect.\n"); set_viewport(&context.viewport, 0.0f, 0.0f, rect.right, rect.bottom, 0.0f, 1.0f); - swapchain = create_swapchain(queue, window, rect.right, rect.bottom); - index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); - hr = IDXGISwapChain3_GetBuffer(swapchain, index, &IID_ID3D12Resource, (void **)&backbuffer); - ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", index, hr); - ID3D12Device_CreateRenderTargetView(context.device, backbuffer, NULL, context.rtv); - - transition_sub_resource_state(command_list, backbuffer, 0, - D3D12_RESOURCE_STATE_PRESENT, D3D12_RESOURCE_STATE_RENDER_TARGET); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); - - ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); - ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); - ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); - ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); - ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); - ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &rect); - ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); - - transition_sub_resource_state(command_list, backbuffer, 0, - D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - - check_sub_resource_uint(backbuffer, 0, queue, command_list, 0xff00ff00, 0); + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + context.pipeline_state = create_pipeline_state(device, + context.root_signature, tests[i].format, &ps); + + swapchain = create_swapchain(queue, window, tests[i].format, rect.right, rect.bottom); + index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); + hr = IDXGISwapChain3_GetBuffer(swapchain, index, &IID_ID3D12Resource, (void **)&backbuffer); + ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", index, hr); + ID3D12Device_CreateRenderTargetView(device, backbuffer, NULL, context.rtv); + + transition_sub_resource_state(command_list, backbuffer, 0, + D3D12_RESOURCE_STATE_PRESENT, D3D12_RESOURCE_STATE_RENDER_TARGET); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &rect); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, tests[i].input, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_sub_resource_state(command_list, backbuffer, 0, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(backbuffer, 0, queue, command_list, tests[i].color, 0); + + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, backbuffer, 0, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_PRESENT); + hr = ID3D12GraphicsCommandList_Close(command_list); + ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + exec_command_list(queue, command_list); + + hr = IDXGISwapChain3_Present(swapchain, 0, 0); + ok(hr == S_OK, "Failed to present, hr %#x.\n", hr); + + wait_queue_idle(device, queue); + + refcount = ID3D12Resource_Release(backbuffer); + ok(!refcount, "Backbuffer has %u references left.\n", refcount); + refcount = IDXGISwapChain3_Release(swapchain); + ok(!refcount, "Swapchain has %u references left.\n", refcount); + ID3D12PipelineState_Release(context.pipeline_state); + context.pipeline_state = NULL; + + reset_command_list(command_list, context.allocator); + } - refcount = ID3D12Resource_Release(backbuffer); - ok(!refcount, "Backbuffer has %u references left.\n", refcount); - refcount = IDXGISwapChain3_Release(swapchain); - ok(!refcount, "Swapchain has %u references left.\n", refcount); DestroyWindow(window); destroy_test_context(&context); } -- 2.16.4

2 1

[PATCH 07/11] dxgi: Blit user buffers to Vulkan swapchain buffers while presenting.
by Józef Kucia 09 Aug '18

09 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 282 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 260 insertions(+), 22 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index ad7d02a4aefc..241db3b10b10 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -826,16 +826,25 @@ static PFN_vkd3d_resource_incref vkd3d_resource_incref; struct dxgi_vk_funcs { PFN_vkAcquireNextImageKHR p_vkAcquireNextImageKHR; + PFN_vkAllocateCommandBuffers p_vkAllocateCommandBuffers; PFN_vkAllocateMemory p_vkAllocateMemory; + PFN_vkBeginCommandBuffer p_vkBeginCommandBuffer; PFN_vkBindImageMemory p_vkBindImageMemory; + PFN_vkCmdBlitImage p_vkCmdBlitImage; + PFN_vkCmdPipelineBarrier p_vkCmdPipelineBarrier; + PFN_vkCreateCommandPool p_vkCreateCommandPool; PFN_vkCreateFence p_vkCreateFence; PFN_vkCreateImage p_vkCreateImage; + PFN_vkCreateSemaphore p_vkCreateSemaphore; PFN_vkCreateSwapchainKHR p_vkCreateSwapchainKHR; PFN_vkCreateWin32SurfaceKHR p_vkCreateWin32SurfaceKHR; + PFN_vkDestroyCommandPool p_vkDestroyCommandPool; PFN_vkDestroyFence p_vkDestroyFence; PFN_vkDestroyImage p_vkDestroyImage; + PFN_vkDestroySemaphore p_vkDestroySemaphore; PFN_vkDestroySurfaceKHR p_vkDestroySurfaceKHR; PFN_vkDestroySwapchainKHR p_vkDestroySwapchainKHR; + PFN_vkEndCommandBuffer p_vkEndCommandBuffer; PFN_vkFreeMemory p_vkFreeMemory; PFN_vkGetDeviceProcAddr p_vkGetDeviceProcAddr; PFN_vkGetImageMemoryRequirements p_vkGetImageMemoryRequirements; @@ -848,6 +857,7 @@ struct dxgi_vk_funcs PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR p_vkGetPhysicalDeviceWin32PresentationSupportKHR; PFN_vkGetSwapchainImagesKHR p_vkGetSwapchainImagesKHR; PFN_vkQueuePresentKHR p_vkQueuePresentKHR; + PFN_vkQueueSubmit p_vkQueueSubmit; PFN_vkQueueWaitIdle p_vkQueueWaitIdle; PFN_vkResetFences p_vkResetFences; PFN_vkWaitForFences p_vkWaitForFences; @@ -881,7 +891,10 @@ struct d3d12_swapchain VkDevice vk_device; VkPhysicalDevice vk_physical_device; VkDeviceMemory vk_memory; + VkCommandPool vk_cmd_pool; VkImage vk_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]; + VkCommandBuffer vk_cmd_buffers[DXGI_MAX_SWAP_CHAIN_BUFFERS]; + VkSemaphore vk_semaphores[DXGI_MAX_SWAP_CHAIN_BUFFERS]; ID3D12Resource *buffers[DXGI_MAX_SWAP_CHAIN_BUFFERS]; unsigned int buffer_count; @@ -970,7 +983,10 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) vkd3d_resource_decref(swapchain->buffers[i]); if (swapchain->vk_device) + { vk_funcs->p_vkDestroyImage(swapchain->vk_device, swapchain->vk_images[i], NULL); + vk_funcs->p_vkDestroySemaphore(swapchain->vk_device, swapchain->vk_semaphores[i], NULL); + } } if (swapchain->vk_device) @@ -979,6 +995,7 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) vk_funcs->p_vkDestroySwapchainKHR(swapchain->vk_device, swapchain->vk_swapchain, NULL); vk_funcs->p_vkFreeMemory(swapchain->vk_device, swapchain->vk_memory, NULL); + vk_funcs->p_vkDestroyCommandPool(swapchain->vk_device, swapchain->vk_cmd_pool, NULL); } if (swapchain->vk_instance) @@ -1262,13 +1279,59 @@ static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapch return S_OK; } +static HRESULT d3d12_swapchain_blit_buffer(struct d3d12_swapchain *swapchain, VkQueue vk_queue) +{ + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + VkSubmitInfo submit_info; + VkResult vr; + + submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; + submit_info.pNext = NULL; + submit_info.waitSemaphoreCount = 0; + submit_info.pWaitSemaphores = NULL; + submit_info.pWaitDstStageMask = NULL; + submit_info.commandBufferCount = 1; + submit_info.pCommandBuffers = &swapchain->vk_cmd_buffers[swapchain->current_buffer_index]; + submit_info.signalSemaphoreCount = 1; + submit_info.pSignalSemaphores = &swapchain->vk_semaphores[swapchain->current_buffer_index]; + + if ((vr = vk_funcs->p_vkQueueSubmit(vk_queue, 1, &submit_info, VK_NULL_HANDLE)) < 0) + ERR("Failed to blit swapchain buffer, vr %d.\n", vr); + return hresult_from_vk_result(vr); +} + +static HRESULT d3d12_swapchain_queue_present(struct d3d12_swapchain *swapchain, VkQueue vk_queue) +{ + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + VkPresentInfoKHR present_info; + VkResult vr; + + present_info.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; + present_info.pNext = NULL; + present_info.waitSemaphoreCount = 0; + present_info.pWaitSemaphores = NULL; + present_info.swapchainCount = 1; + present_info.pSwapchains = &swapchain->vk_swapchain; + present_info.pImageIndices = &swapchain->current_buffer_index; + present_info.pResults = NULL; + + if (swapchain->vk_semaphores[swapchain->current_buffer_index]) + { + present_info.waitSemaphoreCount = 1; + present_info.pWaitSemaphores = &swapchain->vk_semaphores[swapchain->current_buffer_index]; + } + + if ((vr = vk_funcs->p_vkQueuePresentKHR(vk_queue, &present_info)) < 0) + ERR("Failed to queue present, vr %d.\n", vr); + return hresult_from_vk_result(vr); +} + static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface, UINT sync_interval, UINT flags, const DXGI_PRESENT_PARAMETERS *present_parameters) { struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); - const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - VkPresentInfoKHR present_desc; VkQueue vk_queue; + HRESULT hr; TRACE("iface %p, sync_interval %u, flags %#x, present_parameters %p.\n", iface, sync_interval, flags, present_parameters); @@ -1292,21 +1355,27 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface if (present_parameters) FIXME("Ignored present parameters %p.\n", present_parameters); - present_desc.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; - present_desc.pNext = NULL; - present_desc.waitSemaphoreCount = 0; - present_desc.pWaitSemaphores = NULL; - present_desc.swapchainCount = 1; - present_desc.pSwapchains = &swapchain->vk_swapchain; - present_desc.pImageIndices = &swapchain->current_buffer_index; - present_desc.pResults = NULL; - if (!(vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) { ERR("Failed to acquire Vulkan queue.\n"); return E_FAIL; } - vk_funcs->p_vkQueuePresentKHR(vk_queue, &present_desc); + + if (swapchain->vk_images[swapchain->current_buffer_index]) + { + if (FAILED(hr = d3d12_swapchain_blit_buffer(swapchain, vk_queue))) + { + vkd3d_release_vk_queue(swapchain->command_queue); + return hr; + } + } + + if (FAILED(hr = d3d12_swapchain_queue_present(swapchain, vk_queue))) + { + vkd3d_release_vk_queue(swapchain->command_queue); + return hr; + } + vkd3d_release_vk_queue(swapchain->command_queue); return d3d12_swapchain_acquire_next_image(swapchain); @@ -1601,14 +1670,24 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, Vk return FALSE; \ } LOAD_DEVICE_PFN(vkAcquireNextImageKHR) + LOAD_DEVICE_PFN(vkAllocateCommandBuffers) LOAD_DEVICE_PFN(vkAllocateMemory) + LOAD_DEVICE_PFN(vkBeginCommandBuffer) LOAD_DEVICE_PFN(vkBindImageMemory) + LOAD_DEVICE_PFN(vkCmdBlitImage) + LOAD_DEVICE_PFN(vkCmdPipelineBarrier) + LOAD_DEVICE_PFN(vkCreateCommandPool) LOAD_DEVICE_PFN(vkCreateFence) LOAD_DEVICE_PFN(vkCreateImage) + LOAD_DEVICE_PFN(vkCreateSemaphore) + LOAD_DEVICE_PFN(vkDestroyCommandPool) LOAD_DEVICE_PFN(vkDestroyFence) LOAD_DEVICE_PFN(vkDestroyImage) + LOAD_DEVICE_PFN(vkDestroySemaphore) + LOAD_DEVICE_PFN(vkEndCommandBuffer) LOAD_DEVICE_PFN(vkFreeMemory) LOAD_DEVICE_PFN(vkGetImageMemoryRequirements) + LOAD_DEVICE_PFN(vkQueueSubmit) LOAD_DEVICE_PFN(vkQueueWaitIdle) LOAD_DEVICE_PFN(vkResetFences) LOAD_DEVICE_PFN(vkWaitForFences) @@ -1809,16 +1888,154 @@ static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapc return S_OK; } +static void vk_cmd_image_barrier(const struct dxgi_vk_funcs *vk_funcs, VkCommandBuffer cmd_buffer, + VkPipelineStageFlags src_stage_mask, VkPipelineStageFlags dst_stage_mask, + VkAccessFlags src_access_mask, VkAccessFlags dst_access_mask, + VkImageLayout old_layout, VkImageLayout new_layout, VkImage image) +{ + VkImageMemoryBarrier barrier; + + barrier.sType = VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER; + barrier.pNext = NULL; + barrier.srcAccessMask = src_access_mask; + barrier.dstAccessMask = dst_access_mask; + barrier.oldLayout = old_layout; + barrier.newLayout = new_layout; + barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + barrier.image = image; + barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + barrier.subresourceRange.baseMipLevel = 0; + barrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS; + barrier.subresourceRange.baseArrayLayer = 0; + barrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS; + + vk_funcs->p_vkCmdPipelineBarrier(cmd_buffer, + src_stage_mask, dst_stage_mask, 0, 0, NULL, 0, NULL, 1, &barrier); +} + +static HRESULT d3d12_swapchain_prepare_command_buffers(struct d3d12_swapchain *swapchain, + const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, uint32_t queue_family_index, + VkImage vk_swapchain_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]) +{ + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + VkDevice vk_device = swapchain->vk_device; + VkCommandBufferAllocateInfo allocate_info; + VkSemaphoreCreateInfo semaphore_info; + VkCommandBufferBeginInfo begin_info; + VkCommandPoolCreateInfo pool_info; + VkImageBlit blit; + unsigned int i; + VkResult vr; + + pool_info.sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO; + pool_info.pNext = NULL; + pool_info.flags = 0; + pool_info.queueFamilyIndex = queue_family_index; + + if ((vr = vk_funcs->p_vkCreateCommandPool(vk_device, &pool_info, + NULL, &swapchain->vk_cmd_pool)) < 0) + { + WARN("Failed to create command pool, vr %d.\n", vr); + swapchain->vk_cmd_pool = VK_NULL_HANDLE; + return hresult_from_vk_result(vr); + } + + allocate_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO; + allocate_info.pNext = NULL; + allocate_info.commandPool = swapchain->vk_cmd_pool; + allocate_info.level = VK_COMMAND_BUFFER_LEVEL_PRIMARY; + allocate_info.commandBufferCount = swapchain->buffer_count; + + if ((vr = vk_funcs->p_vkAllocateCommandBuffers(vk_device, &allocate_info, + swapchain->vk_cmd_buffers)) < 0) + { + WARN("Failed to allocate command buffers, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + + for (i = 0; i < swapchain->buffer_count; ++i) + { + VkCommandBuffer vk_cmd_buffer = swapchain->vk_cmd_buffers[i]; + + begin_info.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO; + begin_info.pNext = NULL; + begin_info.flags = 0; + begin_info.pInheritanceInfo = NULL; + + if ((vr = vk_funcs->p_vkBeginCommandBuffer(vk_cmd_buffer, &begin_info)) < 0) + { + WARN("Failed to begin command buffer, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + + vk_cmd_image_barrier(vk_funcs, vk_cmd_buffer, + VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, + 0, VK_ACCESS_TRANSFER_WRITE_BIT, + VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, + vk_swapchain_images[i]); + + blit.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + blit.srcSubresource.mipLevel = 0; + blit.srcSubresource.baseArrayLayer = 0; + blit.srcSubresource.layerCount = 1; + blit.srcOffsets[0].x = 0; + blit.srcOffsets[0].y = 0; + blit.srcOffsets[0].z = 0; + blit.srcOffsets[1].x = swapchain_desc->Width; + blit.srcOffsets[1].y = swapchain_desc->Height; + blit.srcOffsets[1].z = 1; + blit.dstSubresource = blit.srcSubresource; + blit.dstOffsets[0] = blit.srcOffsets[0]; + blit.dstOffsets[1] = blit.srcOffsets[1]; + + vk_funcs->p_vkCmdBlitImage(vk_cmd_buffer, + swapchain->vk_images[i], VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + vk_swapchain_images[i], VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, + 1, &blit, VK_FILTER_NEAREST); + + vk_cmd_image_barrier(vk_funcs, vk_cmd_buffer, + VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, + VK_ACCESS_TRANSFER_WRITE_BIT, 0, + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, + vk_swapchain_images[i]); + + if ((vr = vk_funcs->p_vkEndCommandBuffer(vk_cmd_buffer)) < 0) + { + WARN("Failed to end command buffer, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + } + + for (i = 0; i < swapchain->buffer_count; ++i) + { + semaphore_info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO; + semaphore_info.pNext = NULL; + semaphore_info.flags = 0; + + if ((vr = vk_funcs->p_vkCreateSemaphore(vk_device, &semaphore_info, + NULL, &swapchain->vk_semaphores[i])) < 0) + { + WARN("Failed to create semaphore, vr %d.\n", vr); + swapchain->vk_semaphores[i] = VK_NULL_HANDLE; + return hresult_from_vk_result(vr); + } + } + + return S_OK; +} + static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, - ID3D12Device *device, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, - VkFormat vk_swapchain_format, VkFormat vk_format) + ID3D12Device *device, ID3D12CommandQueue *queue, + const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, VkFormat vk_swapchain_format, VkFormat vk_format) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + VkImage vk_swapchain_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]; struct vkd3d_image_resource_create_info resource_info; VkSwapchainKHR vk_swapchain = swapchain->vk_swapchain; - VkImage vk_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]; VkDevice vk_device = swapchain->vk_device; - uint32_t image_count; + uint32_t image_count, queue_family_index; + D3D12_COMMAND_QUEUE_DESC queue_desc; unsigned int i; VkResult vr; HRESULT hr; @@ -1830,10 +2047,11 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, } if (image_count != swapchain_desc->BufferCount) FIXME("Got %u swapchain images, expected %u.\n", image_count, swapchain_desc->BufferCount); - if (image_count > ARRAY_SIZE(vk_images)) + if (image_count > ARRAY_SIZE(vk_swapchain_images)) return E_FAIL; swapchain->buffer_count = image_count; - if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, vk_images)) < 0) + if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, + &image_count, vk_swapchain_images)) < 0) { WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); return hresult_from_vk_result(vr); @@ -1853,21 +2071,41 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, resource_info.desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; resource_info.desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; resource_info.flags = VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION; - resource_info.present_state = D3D12_RESOURCE_STATE_PRESENT; if (vk_swapchain_format != vk_format) { + queue_desc = ID3D12CommandQueue_GetDesc(queue); + if (queue_desc.Type != D3D12_COMMAND_LIST_TYPE_DIRECT) + { + /* vkCmdBlitImage() is only supported for Graphics queues. */ + FIXME("Format conversion not implemented for command queue type %#x.\n", queue_desc.Type); + return E_NOTIMPL; + } + queue_family_index = vkd3d_get_vk_queue_family_index(queue); + TRACE("Creating user swapchain buffers for format conversion.\n"); if (FAILED(hr = d3d12_swapchain_create_user_buffers(swapchain, swapchain_desc, vk_format))) return hr; - resource_info.present_state = D3D12_RESOURCE_STATE_COPY_SOURCE; + if (FAILED(hr = d3d12_swapchain_prepare_command_buffers(swapchain, swapchain_desc, + queue_family_index, vk_swapchain_images))) + return hr; } for (i = 0; i < swapchain->buffer_count; ++i) { - resource_info.vk_image = swapchain->vk_images[i] ? swapchain->vk_images[i] : vk_images[i]; + if (swapchain->vk_images[i]) + { + resource_info.vk_image = swapchain->vk_images[i]; + resource_info.present_state = D3D12_RESOURCE_STATE_COPY_SOURCE; + } + else + { + resource_info.vk_image = vk_swapchain_images[i]; + resource_info.present_state = D3D12_RESOURCE_STATE_PRESENT; + } + if (FAILED(hr = vkd3d_create_image_resource(device, &resource_info, &swapchain->buffers[i]))) { WARN("Failed to create vkd3d resource for Vulkan image %u, hr %#x.\n", i, hr); @@ -2071,7 +2309,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI } swapchain->vk_fence = vk_fence; - if (FAILED(hr = d3d12_swapchain_create_buffers(swapchain, device, + if (FAILED(hr = d3d12_swapchain_create_buffers(swapchain, device, queue, swapchain_desc, vk_swapchain_format, vk_format))) { d3d12_swapchain_destroy(swapchain); -- 2.16.4

2 1

[PATCH 06/11] dxgi: Create user images for swapchain formats not supported by Vulkan.
by Józef Kucia 09 Aug '18

09 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 222 +++++++++++++++++++++++++++++++++++++++++++---- dlls/dxgi/tests/device.c | 3 +- 2 files changed, 208 insertions(+), 17 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 07329b115079..ad7d02a4aefc 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -826,14 +826,21 @@ static PFN_vkd3d_resource_incref vkd3d_resource_incref; struct dxgi_vk_funcs { PFN_vkAcquireNextImageKHR p_vkAcquireNextImageKHR; + PFN_vkAllocateMemory p_vkAllocateMemory; + PFN_vkBindImageMemory p_vkBindImageMemory; PFN_vkCreateFence p_vkCreateFence; + PFN_vkCreateImage p_vkCreateImage; PFN_vkCreateSwapchainKHR p_vkCreateSwapchainKHR; PFN_vkCreateWin32SurfaceKHR p_vkCreateWin32SurfaceKHR; PFN_vkDestroyFence p_vkDestroyFence; + PFN_vkDestroyImage p_vkDestroyImage; PFN_vkDestroySurfaceKHR p_vkDestroySurfaceKHR; PFN_vkDestroySwapchainKHR p_vkDestroySwapchainKHR; + PFN_vkFreeMemory p_vkFreeMemory; PFN_vkGetDeviceProcAddr p_vkGetDeviceProcAddr; + PFN_vkGetImageMemoryRequirements p_vkGetImageMemoryRequirements; PFN_vkGetInstanceProcAddr p_vkGetInstanceProcAddr; + PFN_vkGetPhysicalDeviceMemoryProperties p_vkGetPhysicalDeviceMemoryProperties; PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR; PFN_vkGetPhysicalDeviceSurfaceFormatsKHR p_vkGetPhysicalDeviceSurfaceFormatsKHR; PFN_vkGetPhysicalDeviceSurfacePresentModesKHR p_vkGetPhysicalDeviceSurfacePresentModesKHR; @@ -872,6 +879,9 @@ struct d3d12_swapchain VkFence vk_fence; VkInstance vk_instance; VkDevice vk_device; + VkPhysicalDevice vk_physical_device; + VkDeviceMemory vk_memory; + VkImage vk_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]; ID3D12Resource *buffers[DXGI_MAX_SWAP_CHAIN_BUFFERS]; unsigned int buffer_count; @@ -958,12 +968,17 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) { if (swapchain->buffers[i]) vkd3d_resource_decref(swapchain->buffers[i]); + + if (swapchain->vk_device) + vk_funcs->p_vkDestroyImage(swapchain->vk_device, swapchain->vk_images[i], NULL); } if (swapchain->vk_device) { vk_funcs->p_vkDestroyFence(swapchain->vk_device, swapchain->vk_fence, NULL); vk_funcs->p_vkDestroySwapchainKHR(swapchain->vk_device, swapchain->vk_swapchain, NULL); + + vk_funcs->p_vkFreeMemory(swapchain->vk_device, swapchain->vk_memory, NULL); } if (swapchain->vk_instance) @@ -1546,7 +1561,7 @@ static BOOL init_vkd3d(void) return !!vkd3d_handle; } -static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkDevice vk_device) +static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkInstance vk_instance, VkDevice vk_device) { const struct vulkan_funcs *vk; @@ -1570,6 +1585,15 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkDevice vk_device) dxgi->p_vkGetSwapchainImagesKHR = vk->p_vkGetSwapchainImagesKHR; dxgi->p_vkQueuePresentKHR = vk->p_vkQueuePresentKHR; +#define LOAD_INSTANCE_PFN(name) \ + if (!(dxgi->p_##name = vk->p_vkGetInstanceProcAddr(vk_instance, #name))) \ + { \ + ERR("Failed to get instance proc "#name".\n"); \ + return FALSE; \ + } + LOAD_INSTANCE_PFN(vkGetPhysicalDeviceMemoryProperties) +#undef LOAD_INSTANCE_PFN + #define LOAD_DEVICE_PFN(name) \ if (!(dxgi->p_##name = vk->p_vkGetDeviceProcAddr(vk_device, #name))) \ { \ @@ -1577,8 +1601,14 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkDevice vk_device) return FALSE; \ } LOAD_DEVICE_PFN(vkAcquireNextImageKHR) + LOAD_DEVICE_PFN(vkAllocateMemory) + LOAD_DEVICE_PFN(vkBindImageMemory) LOAD_DEVICE_PFN(vkCreateFence) + LOAD_DEVICE_PFN(vkCreateImage) LOAD_DEVICE_PFN(vkDestroyFence) + LOAD_DEVICE_PFN(vkDestroyImage) + LOAD_DEVICE_PFN(vkFreeMemory) + LOAD_DEVICE_PFN(vkGetImageMemoryRequirements) LOAD_DEVICE_PFN(vkQueueWaitIdle) LOAD_DEVICE_PFN(vkResetFences) LOAD_DEVICE_PFN(vkWaitForFences) @@ -1600,8 +1630,6 @@ static HRESULT select_vk_format(const struct dxgi_vk_funcs *vk_funcs, *vk_format = VK_FORMAT_UNDEFINED; format = vkd3d_get_vk_format(swapchain_desc->Format); - if (format == VK_FORMAT_UNDEFINED) - return DXGI_ERROR_INVALID_CALL; vr = vk_funcs->p_vkGetPhysicalDeviceSurfaceFormatsKHR(vk_physical_device, vk_surface, &format_count, NULL); if (vr < 0 || !format_count) @@ -1626,20 +1654,164 @@ static HRESULT select_vk_format(const struct dxgi_vk_funcs *vk_funcs, if (formats[i].format == format && formats[i].colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR) break; } + if (i == format_count) + { + /* Try to create a swapchain with format conversion. */ + WARN("Failed to find Vulkan swapchain format for %s.\n", debug_dxgi_format(swapchain_desc->Format)); + for (i = 0; i < format_count; ++i) + { + if (formats[i].colorSpace == VK_COLOR_SPACE_SRGB_NONLINEAR_KHR) + { + format = formats[i].format; + break; + } + } + } heap_free(formats); - if (i == format_count) { - FIXME("Failed to find suitable format for %s.\n", debug_dxgi_format(swapchain_desc->Format)); - return DXGI_ERROR_INVALID_CALL; + FIXME("Failed to find Vulkan swapchain format for %s.\n", debug_dxgi_format(swapchain_desc->Format)); + return DXGI_ERROR_UNSUPPORTED; } + TRACE("Using Vulkan swapchain format %#x.\n", format); + *vk_format = format; return S_OK; } +static DXGI_FORMAT dxgi_format_from_vk_format(VkFormat vk_format) +{ + switch (vk_format) + { + case VK_FORMAT_B8G8R8A8_SRGB: return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; + case VK_FORMAT_B8G8R8A8_UNORM: return DXGI_FORMAT_B8G8R8A8_UNORM; + case VK_FORMAT_R8G8B8A8_SRGB: return DXGI_FORMAT_R8G8B8A8_UNORM_SRGB; + case VK_FORMAT_R8G8B8A8_UNORM: return DXGI_FORMAT_R8G8B8A8_UNORM; + default: + FIXME("Unhandled format %#x.\n", vk_format); + return DXGI_FORMAT_UNKNOWN; + } +} + +static HRESULT vk_select_memory_type(const struct dxgi_vk_funcs *vk_funcs, + VkPhysicalDevice vk_physical_device, uint32_t memory_type_mask, + VkMemoryPropertyFlags flags, uint32_t *memory_type_index) +{ + VkPhysicalDeviceMemoryProperties memory_properties; + unsigned int i; + + vk_funcs->p_vkGetPhysicalDeviceMemoryProperties(vk_physical_device, &memory_properties); + for (i = 0; i < memory_properties.memoryTypeCount; ++i) + { + if (!(memory_type_mask & (1u << i))) + continue; + + if ((memory_properties.memoryTypes[i].propertyFlags & flags) == flags) + { + *memory_type_index = i; + return S_OK; + } + } + + FIXME("Failed to find memory type (allowed types %#x).\n", memory_type_mask); + return E_FAIL; +} + +static HRESULT d3d12_swapchain_create_user_buffers(struct d3d12_swapchain *swapchain, + const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, VkFormat vk_format) +{ + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + VkDeviceSize image_offset[DXGI_MAX_SWAP_CHAIN_BUFFERS]; + VkDevice vk_device = swapchain->vk_device; + VkMemoryAllocateInfo allocate_info; + VkMemoryRequirements requirements; + VkImageCreateInfo image_info; + uint32_t memory_type_mask; + VkDeviceSize memory_size; + unsigned int i; + VkResult vr; + HRESULT hr; + + memset(&image_info, 0, sizeof(image_info)); + image_info.sType = VK_STRUCTURE_TYPE_IMAGE_CREATE_INFO; + image_info.flags = VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT; + image_info.imageType = VK_IMAGE_TYPE_2D; + image_info.format = vk_format; + image_info.extent.width = swapchain_desc->Width; + image_info.extent.height = swapchain_desc->Height; + image_info.extent.depth = 1; + image_info.mipLevels = 1; + image_info.arrayLayers = 1; + image_info.samples = VK_SAMPLE_COUNT_1_BIT; + image_info.tiling = VK_IMAGE_TILING_OPTIMAL; + image_info.usage = VK_IMAGE_USAGE_TRANSFER_SRC_BIT + | VK_IMAGE_USAGE_TRANSFER_DST_BIT + | VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + image_info.sharingMode = VK_SHARING_MODE_EXCLUSIVE; + image_info.queueFamilyIndexCount = 0; + image_info.pQueueFamilyIndices = NULL; + image_info.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED; + + for (i = 0; i < swapchain->buffer_count; ++i) + { + if ((vr = vk_funcs->p_vkCreateImage(vk_device, &image_info, NULL, &swapchain->vk_images[i])) < 0) + { + WARN("Failed to create Vulkan image, vr %d.\n", vr); + swapchain->vk_images[i] = VK_NULL_HANDLE; + return hresult_from_vk_result(vr); + } + } + + memory_size = 0; + memory_type_mask = ~0u; + for (i = 0; i < swapchain->buffer_count; ++i) + { + vk_funcs->p_vkGetImageMemoryRequirements(vk_device, swapchain->vk_images[i], &requirements); + + TRACE("Size %s, alignment %s, memory types %#x.\n", + wine_dbgstr_longlong(requirements.size), wine_dbgstr_longlong(requirements.alignment), + requirements.memoryTypeBits); + + image_offset[i] = (memory_size + (requirements.alignment - 1)) & ~(requirements.alignment - 1); + memory_size = image_offset[i] + requirements.size; + + memory_type_mask &= requirements.memoryTypeBits; + } + + TRACE("Allocating %s bytes for user images.\n", wine_dbgstr_longlong(memory_size)); + + allocate_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; + allocate_info.pNext = NULL; + allocate_info.allocationSize = memory_size; + + if (FAILED(hr = vk_select_memory_type(vk_funcs, swapchain->vk_physical_device, + memory_type_mask, VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, &allocate_info.memoryTypeIndex))) + return hr; + + if ((vr = vk_funcs->p_vkAllocateMemory(vk_device, &allocate_info, NULL, &swapchain->vk_memory)) < 0) + { + WARN("Failed to allocate device memory, vr %d.\n", vr); + swapchain->vk_memory = VK_NULL_HANDLE; + return hresult_from_vk_result(vr); + } + + for (i = 0; i < swapchain->buffer_count; ++i) + { + if ((vr = vk_funcs->p_vkBindImageMemory(vk_device, swapchain->vk_images[i], + swapchain->vk_memory, image_offset[i])) < 0) + { + WARN("Failed to bind image memory, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + } + + return S_OK; +} + static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, - ID3D12Device *device, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc) + ID3D12Device *device, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, + VkFormat vk_swapchain_format, VkFormat vk_format) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; struct vkd3d_image_resource_create_info resource_info; @@ -1675,16 +1847,27 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, resource_info.desc.Height = swapchain_desc->Height; resource_info.desc.DepthOrArraySize = 1; resource_info.desc.MipLevels = 1; - resource_info.desc.Format = swapchain_desc->Format; + resource_info.desc.Format = dxgi_format_from_vk_format(vk_format); resource_info.desc.SampleDesc.Count = 1; resource_info.desc.SampleDesc.Quality = 0; resource_info.desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; resource_info.desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; resource_info.flags = VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION; resource_info.present_state = D3D12_RESOURCE_STATE_PRESENT; - for (i = 0; i < image_count; ++i) + + if (vk_swapchain_format != vk_format) { - resource_info.vk_image = vk_images[i]; + TRACE("Creating user swapchain buffers for format conversion.\n"); + + if (FAILED(hr = d3d12_swapchain_create_user_buffers(swapchain, swapchain_desc, vk_format))) + return hr; + + resource_info.present_state = D3D12_RESOURCE_STATE_COPY_SOURCE; + } + + for (i = 0; i < swapchain->buffer_count; ++i) + { + resource_info.vk_image = swapchain->vk_images[i] ? swapchain->vk_images[i] : vk_images[i]; if (FAILED(hr = vkd3d_create_image_resource(device, &resource_info, &swapchain->buffers[i]))) { WARN("Failed to create vkd3d resource for Vulkan image %u, hr %#x.\n", i, hr); @@ -1707,6 +1890,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI struct VkWin32SurfaceCreateInfoKHR surface_desc; VkSwapchainKHR vk_swapchain = VK_NULL_HANDLE; VkSurfaceKHR vk_surface = VK_NULL_HANDLE; + VkFormat vk_swapchain_format, vk_format; VkSurfaceCapabilitiesKHR surface_caps; VkPhysicalDevice vk_physical_device; VkFence vk_fence = VK_NULL_HANDLE; @@ -1716,7 +1900,6 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI VkInstance vk_instance; VkBool32 supported; VkDevice vk_device; - VkFormat vk_format; VkResult vr; HRESULT hr; @@ -1744,6 +1927,12 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return DXGI_ERROR_UNSUPPORTED; } + if (!(vk_format = vkd3d_get_vk_format(swapchain_desc->Format))) + { + WARN("Invalid format %#x.\n", swapchain_desc->Format); + return DXGI_ERROR_INVALID_CALL; + } + if (swapchain_desc->BufferUsage && swapchain_desc->BufferUsage != DXGI_USAGE_RENDER_TARGET_OUTPUT) FIXME("Ignoring buffer usage %#x.\n", swapchain_desc->BufferUsage); if (swapchain_desc->Scaling != DXGI_SCALING_STRETCH) @@ -1767,8 +1956,9 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI swapchain->vk_instance = vk_instance; swapchain->vk_device = vk_device; + swapchain->vk_physical_device = vk_physical_device; - if (!init_vk_funcs(&swapchain->vk_funcs, vk_device)) + if (!init_vk_funcs(&swapchain->vk_funcs, vk_instance, vk_device)) return E_FAIL; wined3d_private_store_init(&swapchain->private_store); @@ -1795,7 +1985,8 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return DXGI_ERROR_UNSUPPORTED; } - if (FAILED(hr = select_vk_format(vk_funcs, vk_physical_device, vk_surface, swapchain_desc, &vk_format))) + if (FAILED(hr = select_vk_format(vk_funcs, vk_physical_device, + vk_surface, swapchain_desc, &vk_swapchain_format))) { d3d12_swapchain_destroy(swapchain); return hr; @@ -1847,7 +2038,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI vk_swapchain_desc.flags = 0; vk_swapchain_desc.surface = vk_surface; vk_swapchain_desc.minImageCount = swapchain_desc->BufferCount; - vk_swapchain_desc.imageFormat = vk_format; + vk_swapchain_desc.imageFormat = vk_swapchain_format; vk_swapchain_desc.imageColorSpace = VK_COLOR_SPACE_SRGB_NONLINEAR_KHR; vk_swapchain_desc.imageExtent.width = swapchain_desc->Width; vk_swapchain_desc.imageExtent.height = swapchain_desc->Height; @@ -1880,7 +2071,8 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI } swapchain->vk_fence = vk_fence; - if (FAILED(hr = d3d12_swapchain_create_buffers(swapchain, device, swapchain_desc))) + if (FAILED(hr = d3d12_swapchain_create_buffers(swapchain, device, + swapchain_desc, vk_swapchain_format, vk_format))) { d3d12_swapchain_destroy(swapchain); return hr; diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 2e68511137a7..124c5a43d6e9 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -3645,9 +3645,8 @@ static void test_swapchain_backbuffer_index(IUnknown *device, BOOL is_d3d12) for (i = 0; i < ARRAY_SIZE(tests); ++i) { swapchain_desc.SwapEffect = tests[i].swap_effect; - expected_hr = !is_d3d12 || tests[i].supported_in_d3d12 ? S_OK : DXGI_ERROR_INVALID_CALL; + expected_hr = is_d3d12 && !tests[i].supported_in_d3d12 ? DXGI_ERROR_INVALID_CALL : S_OK; hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - todo_wine_if(is_d3d12 && tests[i].supported_in_d3d12) ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); if (FAILED(hr)) continue; -- 2.16.4

2 1

[PATCH 05/11] dxgi: Factor out d3d12_swapchain_create_buffers().
by Józef Kucia 09 Aug '18

09 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 113 +++++++++++++++++++++++++++----------------------- 1 file changed, 62 insertions(+), 51 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index f222568865fd..07329b115079 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1638,15 +1638,73 @@ static HRESULT select_vk_format(const struct dxgi_vk_funcs *vk_funcs, return S_OK; } +static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, + ID3D12Device *device, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc) +{ + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + struct vkd3d_image_resource_create_info resource_info; + VkSwapchainKHR vk_swapchain = swapchain->vk_swapchain; + VkImage vk_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]; + VkDevice vk_device = swapchain->vk_device; + uint32_t image_count; + unsigned int i; + VkResult vr; + HRESULT hr; + + if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, NULL)) < 0) + { + WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + if (image_count != swapchain_desc->BufferCount) + FIXME("Got %u swapchain images, expected %u.\n", image_count, swapchain_desc->BufferCount); + if (image_count > ARRAY_SIZE(vk_images)) + return E_FAIL; + swapchain->buffer_count = image_count; + if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, vk_images)) < 0) + { + WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); + return hresult_from_vk_result(vr); + } + + resource_info.type = VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO; + resource_info.next = NULL; + resource_info.desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; + resource_info.desc.Alignment = 0; + resource_info.desc.Width = swapchain_desc->Width; + resource_info.desc.Height = swapchain_desc->Height; + resource_info.desc.DepthOrArraySize = 1; + resource_info.desc.MipLevels = 1; + resource_info.desc.Format = swapchain_desc->Format; + resource_info.desc.SampleDesc.Count = 1; + resource_info.desc.SampleDesc.Quality = 0; + resource_info.desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; + resource_info.desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; + resource_info.flags = VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION; + resource_info.present_state = D3D12_RESOURCE_STATE_PRESENT; + for (i = 0; i < image_count; ++i) + { + resource_info.vk_image = vk_images[i]; + if (FAILED(hr = vkd3d_create_image_resource(device, &resource_info, &swapchain->buffers[i]))) + { + WARN("Failed to create vkd3d resource for Vulkan image %u, hr %#x.\n", i, hr); + return hr; + } + + vkd3d_resource_incref(swapchain->buffers[i]); + ID3D12Resource_Release(swapchain->buffers[i]); + } + + return S_OK; +} + static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGIFactory *factory, ID3D12Device *device, ID3D12CommandQueue *queue, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - struct vkd3d_image_resource_create_info resource_info; struct VkSwapchainCreateInfoKHR vk_swapchain_desc; struct VkWin32SurfaceCreateInfoKHR surface_desc; - VkImage vk_images[DXGI_MAX_SWAP_CHAIN_BUFFERS]; VkSwapchainKHR vk_swapchain = VK_NULL_HANDLE; VkSurfaceKHR vk_surface = VK_NULL_HANDLE; VkSurfaceCapabilitiesKHR surface_caps; @@ -1654,7 +1712,6 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI VkFence vk_fence = VK_NULL_HANDLE; VkFenceCreateInfo fence_desc; uint32_t queue_family_index; - unsigned int image_count, i; VkImageUsageFlags usage; VkInstance vk_instance; VkBool32 supported; @@ -1823,25 +1880,10 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI } swapchain->vk_fence = vk_fence; - if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, NULL)) < 0) + if (FAILED(hr = d3d12_swapchain_create_buffers(swapchain, device, swapchain_desc))) { - WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); d3d12_swapchain_destroy(swapchain); - return hresult_from_vk_result(vr); - } - if (image_count != swapchain_desc->BufferCount) - FIXME("Got %u swapchain images, expected %u.\n", image_count, swapchain_desc->BufferCount); - if (image_count > ARRAY_SIZE(vk_images)) - { - d3d12_swapchain_destroy(swapchain); - return E_FAIL; - } - swapchain->buffer_count = image_count; - if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, vk_images)) < 0) - { - WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); - d3d12_swapchain_destroy(swapchain); - return hresult_from_vk_result(vr); + return hr; } if (FAILED(hr = d3d12_swapchain_acquire_next_image(swapchain))) @@ -1851,37 +1893,6 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI return hr; } - resource_info.type = VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO; - resource_info.next = NULL; - resource_info.desc.Dimension = D3D12_RESOURCE_DIMENSION_TEXTURE2D; - resource_info.desc.Alignment = 0; - resource_info.desc.Width = swapchain_desc->Width; - resource_info.desc.Height = swapchain_desc->Height; - resource_info.desc.DepthOrArraySize = 1; - resource_info.desc.MipLevels = 1; - resource_info.desc.Format = swapchain_desc->Format; - resource_info.desc.SampleDesc.Count = 1; - resource_info.desc.SampleDesc.Quality = 0; - resource_info.desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; - resource_info.desc.Flags = D3D12_RESOURCE_FLAG_ALLOW_RENDER_TARGET; - resource_info.flags = VKD3D_RESOURCE_INITIAL_STATE_TRANSITION | VKD3D_RESOURCE_PRESENT_STATE_TRANSITION; - resource_info.present_state = D3D12_RESOURCE_STATE_PRESENT; - for (i = 0; i < image_count; ++i) - { - resource_info.vk_image = vk_images[i]; - if (SUCCEEDED(hr = vkd3d_create_image_resource(device, &resource_info, &swapchain->buffers[i]))) - { - vkd3d_resource_incref(swapchain->buffers[i]); - ID3D12Resource_Release(swapchain->buffers[i]); - } - else - { - ERR("Failed to create vkd3d resource for Vulkan image %u, hr %#x.\n", i, hr); - d3d12_swapchain_destroy(swapchain); - return hr; - } - } - ID3D12CommandQueue_AddRef(swapchain->command_queue = queue); ID3D12Device_AddRef(swapchain->device = device); IWineDXGIFactory_AddRef(swapchain->factory = factory); -- 2.16.4

2 1

[PATCH 04/11] dxgi: Wait for Vulkan queue to become idle before destroying swapchain.
by Józef Kucia 09 Aug '18

09 Aug '18

Direct3D 12 debug layers do not complain when a swapchain is destroyed immediately after Present(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 7a305554dbeb..f222568865fd 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -826,8 +826,10 @@ static PFN_vkd3d_resource_incref vkd3d_resource_incref; struct dxgi_vk_funcs { PFN_vkAcquireNextImageKHR p_vkAcquireNextImageKHR; + PFN_vkCreateFence p_vkCreateFence; PFN_vkCreateSwapchainKHR p_vkCreateSwapchainKHR; PFN_vkCreateWin32SurfaceKHR p_vkCreateWin32SurfaceKHR; + PFN_vkDestroyFence p_vkDestroyFence; PFN_vkDestroySurfaceKHR p_vkDestroySurfaceKHR; PFN_vkDestroySwapchainKHR p_vkDestroySwapchainKHR; PFN_vkGetDeviceProcAddr p_vkGetDeviceProcAddr; @@ -839,10 +841,9 @@ struct dxgi_vk_funcs PFN_vkGetPhysicalDeviceWin32PresentationSupportKHR p_vkGetPhysicalDeviceWin32PresentationSupportKHR; PFN_vkGetSwapchainImagesKHR p_vkGetSwapchainImagesKHR; PFN_vkQueuePresentKHR p_vkQueuePresentKHR; - PFN_vkCreateFence p_vkCreateFence; - PFN_vkWaitForFences p_vkWaitForFences; + PFN_vkQueueWaitIdle p_vkQueueWaitIdle; PFN_vkResetFences p_vkResetFences; - PFN_vkDestroyFence p_vkDestroyFence; + PFN_vkWaitForFences p_vkWaitForFences; }; static HRESULT hresult_from_vk_result(VkResult vr) @@ -929,10 +930,25 @@ static ULONG STDMETHODCALLTYPE d3d12_swapchain_AddRef(IDXGISwapChain3 *iface) static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + VkQueue vk_queue; unsigned int i; if (swapchain->command_queue) + { + if ((vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) + { + vk_funcs->p_vkQueueWaitIdle(vk_queue); + + vkd3d_release_vk_queue(swapchain->command_queue); + } + else + { + WARN("Failed to acquire Vulkan queue.\n"); + } + ID3D12CommandQueue_Release(swapchain->command_queue); + } + if (swapchain->factory) IWineDXGIFactory_Release(swapchain->factory); @@ -1563,6 +1579,7 @@ static BOOL init_vk_funcs(struct dxgi_vk_funcs *dxgi, VkDevice vk_device) LOAD_DEVICE_PFN(vkAcquireNextImageKHR) LOAD_DEVICE_PFN(vkCreateFence) LOAD_DEVICE_PFN(vkDestroyFence) + LOAD_DEVICE_PFN(vkQueueWaitIdle) LOAD_DEVICE_PFN(vkResetFences) LOAD_DEVICE_PFN(vkWaitForFences) #undef LOAD_DEVICE_PFN -- 2.16.4

2 1

[PATCH 03/11] dxgi: Introduce helper function to destroy partially initialized swapchain.
by Józef Kucia 09 Aug '18

09 Aug '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 117 +++++++++++++++++++++++++++----------------------- 1 file changed, 63 insertions(+), 54 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 3537f117d1b6..7a305554dbeb 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -926,33 +926,47 @@ static ULONG STDMETHODCALLTYPE d3d12_swapchain_AddRef(IDXGISwapChain3 *iface) return refcount; } -static ULONG STDMETHODCALLTYPE d3d12_swapchain_Release(IDXGISwapChain3 *iface) +static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) { - struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - ULONG refcount = InterlockedDecrement(&swapchain->refcount); unsigned int i; - TRACE("%p decreasing refcount to %u.\n", swapchain, refcount); - - if (!refcount) - { + if (swapchain->command_queue) ID3D12CommandQueue_Release(swapchain->command_queue); + if (swapchain->factory) IWineDXGIFactory_Release(swapchain->factory); - wined3d_private_store_cleanup(&swapchain->private_store); + wined3d_private_store_cleanup(&swapchain->private_store); - for (i = 0; i < swapchain->buffer_count; ++i) - { + for (i = 0; i < swapchain->buffer_count; ++i) + { + if (swapchain->buffers[i]) vkd3d_resource_decref(swapchain->buffers[i]); - } + } + if (swapchain->vk_device) + { vk_funcs->p_vkDestroyFence(swapchain->vk_device, swapchain->vk_fence, NULL); vk_funcs->p_vkDestroySwapchainKHR(swapchain->vk_device, swapchain->vk_swapchain, NULL); + } + + if (swapchain->vk_instance) vk_funcs->p_vkDestroySurfaceKHR(swapchain->vk_instance, swapchain->vk_surface, NULL); + if (swapchain->device) ID3D12Device_Release(swapchain->device); +} + +static ULONG STDMETHODCALLTYPE d3d12_swapchain_Release(IDXGISwapChain3 *iface) +{ + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); + ULONG refcount = InterlockedDecrement(&swapchain->refcount); + TRACE("%p decreasing refcount to %u.\n", swapchain, refcount); + + if (!refcount) + { + d3d12_swapchain_destroy(swapchain); heap_free(swapchain); } @@ -1621,9 +1635,9 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI VkSurfaceCapabilitiesKHR surface_caps; VkPhysicalDevice vk_physical_device; VkFence vk_fence = VK_NULL_HANDLE; - unsigned int image_count, i, j; VkFenceCreateInfo fence_desc; uint32_t queue_family_index; + unsigned int image_count, i; VkImageUsageFlags usage; VkInstance vk_instance; VkBool32 supported; @@ -1677,9 +1691,14 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI vk_physical_device = vkd3d_get_vk_physical_device(device); vk_device = vkd3d_get_vk_device(device); + swapchain->vk_instance = vk_instance; + swapchain->vk_device = vk_device; + if (!init_vk_funcs(&swapchain->vk_funcs, vk_device)) return E_FAIL; + wined3d_private_store_init(&swapchain->private_store); + surface_desc.sType = VK_STRUCTURE_TYPE_WIN32_SURFACE_CREATE_INFO_KHR; surface_desc.pNext = NULL; surface_desc.flags = 0; @@ -1688,28 +1707,32 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if ((vr = vk_funcs->p_vkCreateWin32SurfaceKHR(vk_instance, &surface_desc, NULL, &vk_surface)) < 0) { WARN("Failed to create Vulkan surface, vr %d.\n", vr); - hr = hresult_from_vk_result(vr); - goto fail; + d3d12_swapchain_destroy(swapchain); + return hresult_from_vk_result(vr); } + swapchain->vk_surface = vk_surface; queue_family_index = vkd3d_get_vk_queue_family_index(queue); if ((vr = vk_funcs->p_vkGetPhysicalDeviceSurfaceSupportKHR(vk_physical_device, queue_family_index, vk_surface, &supported)) < 0 || !supported) { FIXME("Queue family does not support presentation, vr %d.\n", vr); - hr = DXGI_ERROR_UNSUPPORTED; - goto fail; + d3d12_swapchain_destroy(swapchain); + return DXGI_ERROR_UNSUPPORTED; } if (FAILED(hr = select_vk_format(vk_funcs, vk_physical_device, vk_surface, swapchain_desc, &vk_format))) - goto fail; + { + d3d12_swapchain_destroy(swapchain); + return hr; + } if ((vr = vk_funcs->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(vk_physical_device, vk_surface, &surface_caps)) < 0) { WARN("Failed to get surface capabilities, vr %d.\n", vr); - hr = hresult_from_vk_result(vr); - goto fail; + d3d12_swapchain_destroy(swapchain); + return hresult_from_vk_result(vr); } if (surface_caps.maxImageCount && (swapchain_desc->BufferCount > surface_caps.maxImageCount @@ -1717,8 +1740,8 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI { WARN("Buffer count %u is not supported (%u-%u).\n", swapchain_desc->BufferCount, surface_caps.minImageCount, surface_caps.maxImageCount); - hr = DXGI_ERROR_UNSUPPORTED; - goto fail; + d3d12_swapchain_destroy(swapchain); + return DXGI_ERROR_UNSUPPORTED; } if (swapchain_desc->Width > surface_caps.maxImageExtent.width @@ -1735,8 +1758,8 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if (!(surface_caps.supportedCompositeAlpha & VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR)) { FIXME("Unsupported alpha mode.\n"); - hr = DXGI_ERROR_UNSUPPORTED; - goto fail; + d3d12_swapchain_destroy(swapchain); + return DXGI_ERROR_UNSUPPORTED; } usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; @@ -1767,9 +1790,10 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if ((vr = vk_funcs->p_vkCreateSwapchainKHR(vk_device, &vk_swapchain_desc, NULL, &vk_swapchain)) < 0) { WARN("Failed to create Vulkan swapchain, vr %d.\n", vr); - hr = hresult_from_vk_result(vr); - goto fail; + d3d12_swapchain_destroy(swapchain); + return hresult_from_vk_result(vr); } + swapchain->vk_swapchain = vk_swapchain; fence_desc.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; fence_desc.pNext = NULL; @@ -1777,40 +1801,37 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if ((vr = vk_funcs->p_vkCreateFence(vk_device, &fence_desc, NULL, &vk_fence)) < 0) { WARN("Failed to create Vulkan fence, vr %d.\n", vr); - hr = hresult_from_vk_result(vr); - goto fail; + d3d12_swapchain_destroy(swapchain); + return hresult_from_vk_result(vr); } + swapchain->vk_fence = vk_fence; if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, NULL)) < 0) { WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); - hr = hresult_from_vk_result(vr); - goto fail; + d3d12_swapchain_destroy(swapchain); + return hresult_from_vk_result(vr); } if (image_count != swapchain_desc->BufferCount) FIXME("Got %u swapchain images, expected %u.\n", image_count, swapchain_desc->BufferCount); if (image_count > ARRAY_SIZE(vk_images)) { - hr = E_FAIL; - goto fail; + d3d12_swapchain_destroy(swapchain); + return E_FAIL; } + swapchain->buffer_count = image_count; if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, vk_images)) < 0) { WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); - hr = hresult_from_vk_result(vr); - goto fail; + d3d12_swapchain_destroy(swapchain); + return hresult_from_vk_result(vr); } - swapchain->vk_swapchain = vk_swapchain; - swapchain->vk_surface = vk_surface; - swapchain->vk_fence = vk_fence; - swapchain->vk_instance = vk_instance; - swapchain->vk_device = vk_device; - if (FAILED(hr = d3d12_swapchain_acquire_next_image(swapchain))) { WARN("Failed to acquire Vulkan image, hr %#x.\n", hr); - goto fail; + d3d12_swapchain_destroy(swapchain); + return hr; } resource_info.type = VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO; @@ -1839,28 +1860,16 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI else { ERR("Failed to create vkd3d resource for Vulkan image %u, hr %#x.\n", i, hr); - for (j = 0; j < i; ++j) - { - vkd3d_resource_decref(swapchain->buffers[j]); - } - goto fail; + d3d12_swapchain_destroy(swapchain); + return hr; } } - swapchain->buffer_count = image_count; - - wined3d_private_store_init(&swapchain->private_store); ID3D12CommandQueue_AddRef(swapchain->command_queue = queue); ID3D12Device_AddRef(swapchain->device = device); IWineDXGIFactory_AddRef(swapchain->factory = factory); return S_OK; - -fail: - vk_funcs->p_vkDestroyFence(vk_device, vk_fence, NULL); - vk_funcs->p_vkDestroySwapchainKHR(vk_device, vk_swapchain, NULL); - vk_funcs->p_vkDestroySurfaceKHR(vk_instance, vk_surface, NULL); - return hr; } HRESULT d3d12_swapchain_create(IWineDXGIFactory *factory, ID3D12CommandQueue *queue, HWND window, -- 2.16.4

2 1

[PATCH 2/2] xaudio2: IXAPO::Reset returns void
by Andrew Eikum 09 Aug '18

09 Aug '18

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_7/xapofx.c | 9 +++------ include/xapo.idl | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/xaudio2_7/xapofx.c b/dlls/xaudio2_7/xapofx.c index c39b428e29..e450851b25 100644 --- a/dlls/xaudio2_7/xapofx.c +++ b/dlls/xaudio2_7/xapofx.c @@ -145,11 +145,10 @@ static HRESULT WINAPI VUMXAPO_Initialize(IXAPO *iface, const void *data, return E_NOTIMPL; } -static HRESULT WINAPI VUMXAPO_Reset(IXAPO *iface) +static void WINAPI VUMXAPO_Reset(IXAPO *iface) { VUMeterImpl *This = VUMeterImpl_from_IXAPO(iface); TRACE("%p\n", This); - return E_NOTIMPL; } static HRESULT WINAPI VUMXAPO_LockForProcess(IXAPO *iface, @@ -347,11 +346,10 @@ static HRESULT WINAPI RVBXAPO_Initialize(IXAPO *iface, const void *data, return E_NOTIMPL; } -static HRESULT WINAPI RVBXAPO_Reset(IXAPO *iface) +static void WINAPI RVBXAPO_Reset(IXAPO *iface) { ReverbImpl *This = ReverbImpl_from_IXAPO(iface); TRACE("%p\n", This); - return E_NOTIMPL; } static HRESULT WINAPI RVBXAPO_LockForProcess(IXAPO *iface, UINT32 in_params_count, @@ -548,11 +546,10 @@ static HRESULT WINAPI EQXAPO_Initialize(IXAPO *iface, const void *data, return E_NOTIMPL; } -static HRESULT WINAPI EQXAPO_Reset(IXAPO *iface) +static void WINAPI EQXAPO_Reset(IXAPO *iface) { EQImpl *This = EQImpl_from_IXAPO(iface); TRACE("%p\n", This); - return E_NOTIMPL; } static HRESULT WINAPI EQXAPO_LockForProcess(IXAPO *iface, UINT32 in_params_count, diff --git a/include/xapo.idl b/include/xapo.idl index de09ba0c91..9c3ad15134 100644 --- a/include/xapo.idl +++ b/include/xapo.idl @@ -110,7 +110,7 @@ interface IXAPO : IUnknown HRESULT Initialize(const void *data, UINT32 data_len); - HRESULT Reset(void); + void Reset(void); HRESULT LockForProcess(UINT32 in_params_count, const XAPO_LOCKFORPROCESS_BUFFER_PARAMETERS *in_params, UINT32 out_params_count, const XAPO_LOCKFORPROCESS_BUFFER_PARAMETERS *out_params); -- 2.18.0

1 0

[PATCH 1/2] xaudio2: Fix XAUDIO2_VOICE_SENDS usage before version 2.4
by Andrew Eikum 09 Aug '18

09 Aug '18

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_7/compat.c | 199 +++++++++++++++++++++++++++------------- include/xaudio2.idl | 8 +- 2 files changed, 137 insertions(+), 70 deletions(-) diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c index b9e720f22c..b9f416654d 100644 --- a/dlls/xaudio2_7/compat.c +++ b/dlls/xaudio2_7/compat.c @@ -105,6 +105,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(xaudio2); #endif +#if XAUDIO2_VER <= 3 +static XAUDIO2_SEND_DESCRIPTOR *convert_send_descriptors23(const XAUDIO23_VOICE_SENDS *sends) +{ + XAUDIO2_SEND_DESCRIPTOR *ret; + DWORD i; + + ret = HeapAlloc(GetProcessHeap(), 0, sends->OutputCount * sizeof(XAUDIO2_SEND_DESCRIPTOR)); + + for(i = 0; i < sends->OutputCount; ++i){ + ret[i].Flags = 0; + ret[i].pOutputVoice = sends->pOutputVoices[i]; + } + + return ret; +} +#endif + /* BEGIN IXAudio2SourceVoice */ #if XAUDIO2_VER == 0 static XA2SourceImpl *impl_from_IXAudio20SourceVoice(IXAudio20SourceVoice *iface) @@ -129,22 +146,21 @@ static HRESULT WINAPI XA20SRC_SetOutputVoices(IXAudio20SourceVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { XA2SourceImpl *This = impl_from_IXAudio20SourceVoice(iface); - XAUDIO2_VOICE_SENDS sends; + XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; - DWORD i; TRACE("%p, %p\n", This, pSendList); - sends.SendCount = pSendList->OutputCount; - sends.pSends = HeapAlloc(GetProcessHeap(), 0, sends.SendCount * sizeof(*sends.pSends)); - for(i = 0; i < sends.SendCount; ++i){ - sends.pSends[i].Flags = 0; - sends.pSends[i].pOutputVoice = pSendList->pOutputVoices[i]; + if(pSendList){ + sends.SendCount = pSendList->OutputCount; + sends.pSends = convert_send_descriptors23(pSendList); + psends = &sends; } - hr = IXAudio2SourceVoice_SetOutputVoices(&This->IXAudio2SourceVoice_iface, &sends); + hr = IXAudio2SourceVoice_SetOutputVoices(&This->IXAudio2SourceVoice_iface, psends); - HeapFree(GetProcessHeap(), 0, sends.pSends); + if(pSendList) + HeapFree(GetProcessHeap(), 0, sends.pSends); return hr; } @@ -387,22 +403,21 @@ static HRESULT WINAPI XA23SRC_SetOutputVoices(IXAudio23SourceVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { XA2SourceImpl *This = impl_from_IXAudio23SourceVoice(iface); - XAUDIO2_VOICE_SENDS sends; + XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; - DWORD i; TRACE("%p, %p\n", This, pSendList); - sends.SendCount = pSendList->OutputCount; - sends.pSends = HeapAlloc(GetProcessHeap(), 0, sends.SendCount * sizeof(*sends.pSends)); - for(i = 0; i < sends.SendCount; ++i){ - sends.pSends[i].Flags = 0; - sends.pSends[i].pOutputVoice = pSendList->pOutputVoices[i]; + if(pSendList){ + sends.SendCount = pSendList->OutputCount; + sends.pSends = convert_send_descriptors23(pSendList); + psends = &sends; } - hr = IXAudio2SourceVoice_SetOutputVoices(&This->IXAudio2SourceVoice_iface, &sends); + hr = IXAudio2SourceVoice_SetOutputVoices(&This->IXAudio2SourceVoice_iface, psends); - HeapFree(GetProcessHeap(), 0, sends.pSends); + if(pSendList) + HeapFree(GetProcessHeap(), 0, sends.pSends); return hr; } @@ -908,22 +923,21 @@ static HRESULT WINAPI XA20SUB_SetOutputVoices(IXAudio20SubmixVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { XA2SubmixImpl *This = impl_from_IXAudio20SubmixVoice(iface); - XAUDIO2_VOICE_SENDS sends; + XAUDIO2_VOICE_SENDS sends, *psends; HRESULT hr; - DWORD i; TRACE("%p, %p\n", This, pSendList); - sends.SendCount = pSendList->OutputCount; - sends.pSends = HeapAlloc(GetProcessHeap(), 0, sends.SendCount * sizeof(*sends.pSends)); - for(i = 0; i < sends.SendCount; ++i){ - sends.pSends[i].Flags = 0; - sends.pSends[i].pOutputVoice = pSendList->pOutputVoices[i]; + if(pSendList){ + sends.SendCount = pSendList->OutputCount; + sends.pSends = convert_send_descriptors23(pSendList); + psends = &sends; } - hr = IXAudio2SubmixVoice_SetOutputVoices(&This->IXAudio2SubmixVoice_iface, &sends); + hr = IXAudio2SubmixVoice_SetOutputVoices(&This->IXAudio2SubmixVoice_iface, psends); - HeapFree(GetProcessHeap(), 0, sends.pSends); + if(pSendList) + HeapFree(GetProcessHeap(), 0, sends.pSends); return hr; } @@ -1094,22 +1108,21 @@ static HRESULT WINAPI XA23SUB_SetOutputVoices(IXAudio23SubmixVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { XA2SubmixImpl *This = impl_from_IXAudio23SubmixVoice(iface); - XAUDIO2_VOICE_SENDS sends; + XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; - DWORD i; TRACE("%p, %p\n", This, pSendList); - sends.SendCount = pSendList->OutputCount; - sends.pSends = HeapAlloc(GetProcessHeap(), 0, sends.SendCount * sizeof(*sends.pSends)); - for(i = 0; i < sends.SendCount; ++i){ - sends.pSends[i].Flags = 0; - sends.pSends[i].pOutputVoice = pSendList->pOutputVoices[i]; + if(pSendList){ + sends.SendCount = pSendList->OutputCount; + sends.pSends = convert_send_descriptors23(pSendList); + psends = &sends; } - hr = IXAudio2SubmixVoice_SetOutputVoices(&This->IXAudio2SubmixVoice_iface, &sends); + hr = IXAudio2SubmixVoice_SetOutputVoices(&This->IXAudio2SubmixVoice_iface, psends); - HeapFree(GetProcessHeap(), 0, sends.pSends); + if(pSendList) + HeapFree(GetProcessHeap(), 0, sends.pSends); return hr; } @@ -1470,22 +1483,21 @@ static HRESULT WINAPI XA20M_SetOutputVoices(IXAudio20MasteringVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { IXAudio2Impl *This = impl_from_IXAudio20MasteringVoice(iface); - XAUDIO2_VOICE_SENDS sends; + XAUDIO2_VOICE_SENDS sends, *psends; HRESULT hr; - DWORD i; TRACE("%p, %p\n", This, pSendList); - sends.SendCount = pSendList->OutputCount; - sends.pSends = HeapAlloc(GetProcessHeap(), 0, sends.SendCount * sizeof(*sends.pSends)); - for(i = 0; i < sends.SendCount; ++i){ - sends.pSends[i].Flags = 0; - sends.pSends[i].pOutputVoice = pSendList->pOutputVoices[i]; + if(pSendList){ + sends.SendCount = pSendList->OutputCount; + sends.pSends = convert_send_descriptors23(pSendList); + psends = &sends; } - hr = IXAudio2MasteringVoice_SetOutputVoices(&This->IXAudio2MasteringVoice_iface, &sends); + hr = IXAudio2MasteringVoice_SetOutputVoices(&This->IXAudio2MasteringVoice_iface, psends); - HeapFree(GetProcessHeap(), 0, sends.pSends); + if(pSendList) + HeapFree(GetProcessHeap(), 0, sends.pSends); return hr; } @@ -1656,22 +1668,21 @@ static HRESULT WINAPI XA23M_SetOutputVoices(IXAudio23MasteringVoice *iface, const XAUDIO23_VOICE_SENDS *pSendList) { IXAudio2Impl *This = impl_from_IXAudio23MasteringVoice(iface); - XAUDIO2_VOICE_SENDS sends; + XAUDIO2_VOICE_SENDS sends, *psends = NULL; HRESULT hr; - DWORD i; TRACE("%p, %p\n", This, pSendList); - sends.SendCount = pSendList->OutputCount; - sends.pSends = HeapAlloc(GetProcessHeap(), 0, sends.SendCount * sizeof(*sends.pSends)); - for(i = 0; i < sends.SendCount; ++i){ - sends.pSends[i].Flags = 0; - sends.pSends[i].pOutputVoice = pSendList->pOutputVoices[i]; + if(pSendList){ + sends.SendCount = pSendList->OutputCount; + sends.pSends = convert_send_descriptors23(pSendList); + psends = &sends; } - hr = IXAudio2MasteringVoice_SetOutputVoices(&This->IXAudio2MasteringVoice_iface, &sends); + hr = IXAudio2MasteringVoice_SetOutputVoices(&This->IXAudio2MasteringVoice_iface, psends); - HeapFree(GetProcessHeap(), 0, sends.pSends); + if(pSendList) + HeapFree(GetProcessHeap(), 0, sends.pSends); return hr; } @@ -2151,25 +2162,53 @@ static void WINAPI XA20_UnregisterForCallbacks(IXAudio20 *iface, static HRESULT WINAPI XA20_CreateSourceVoice(IXAudio20 *iface, IXAudio2SourceVoice **ppSourceVoice, const WAVEFORMATEX *pSourceFormat, UINT32 flags, float maxFrequencyRatio, - IXAudio2VoiceCallback *pCallback, const XAUDIO2_VOICE_SENDS *pSendList, + IXAudio2VoiceCallback *pCallback, const XAUDIO23_VOICE_SENDS *pSendList, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { IXAudio2Impl *This = impl_from_IXAudio20(iface); - return IXAudio2_CreateSourceVoice(&This->IXAudio2_iface, ppSourceVoice, - pSourceFormat, flags, maxFrequencyRatio, pCallback, pSendList, + XAUDIO2_VOICE_SENDS sends, *psends = NULL; + HRESULT hr; + + if(pSendList){ + sends.SendCount = pSendList->OutputCount; + sends.pSends = convert_send_descriptors23(pSendList); + psends = &sends; + } + + hr = IXAudio2_CreateSourceVoice(&This->IXAudio2_iface, ppSourceVoice, + pSourceFormat, flags, maxFrequencyRatio, pCallback, psends, pEffectChain); + + if(pSendList) + HeapFree(GetProcessHeap(), 0, sends.pSends); + + return hr; } static HRESULT WINAPI XA20_CreateSubmixVoice(IXAudio20 *iface, IXAudio2SubmixVoice **ppSubmixVoice, UINT32 inputChannels, UINT32 inputSampleRate, UINT32 flags, UINT32 processingStage, - const XAUDIO2_VOICE_SENDS *pSendList, + const XAUDIO23_VOICE_SENDS *pSendList, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { IXAudio2Impl *This = impl_from_IXAudio20(iface); - return IXAudio2_CreateSubmixVoice(&This->IXAudio2_iface, ppSubmixVoice, - inputChannels, inputSampleRate, flags, processingStage, pSendList, + XAUDIO2_VOICE_SENDS sends, *psends; + HRESULT hr; + + if(pSendList){ + sends.SendCount = pSendList->OutputCount; + sends.pSends = convert_send_descriptors23(pSendList); + psends = &sends; + } + + hr = IXAudio2_CreateSubmixVoice(&This->IXAudio2_iface, ppSubmixVoice, + inputChannels, inputSampleRate, flags, processingStage, psends, pEffectChain); + + if(pSendList) + HeapFree(GetProcessHeap(), 0, sends.pSends); + + return hr; } static HRESULT WINAPI XA20_CreateMasteringVoice(IXAudio20 *iface, @@ -2406,25 +2445,53 @@ static void WINAPI XA22_UnregisterForCallbacks(IXAudio22 *iface, static HRESULT WINAPI XA22_CreateSourceVoice(IXAudio22 *iface, IXAudio2SourceVoice **ppSourceVoice, const WAVEFORMATEX *pSourceFormat, UINT32 flags, float maxFrequencyRatio, - IXAudio2VoiceCallback *pCallback, const XAUDIO2_VOICE_SENDS *pSendList, + IXAudio2VoiceCallback *pCallback, const XAUDIO23_VOICE_SENDS *pSendList, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { IXAudio2Impl *This = impl_from_IXAudio22(iface); - return IXAudio2_CreateSourceVoice(&This->IXAudio2_iface, ppSourceVoice, - pSourceFormat, flags, maxFrequencyRatio, pCallback, pSendList, + XAUDIO2_VOICE_SENDS sends, *psends = NULL; + HRESULT hr; + + if(pSendList){ + sends.SendCount = pSendList->OutputCount; + sends.pSends = convert_send_descriptors23(pSendList); + psends = &sends; + } + + hr = IXAudio2_CreateSourceVoice(&This->IXAudio2_iface, ppSourceVoice, + pSourceFormat, flags, maxFrequencyRatio, pCallback, psends, pEffectChain); + + if(pSendList) + HeapFree(GetProcessHeap(), 0, sends.pSends); + + return hr; } static HRESULT WINAPI XA22_CreateSubmixVoice(IXAudio22 *iface, IXAudio2SubmixVoice **ppSubmixVoice, UINT32 inputChannels, UINT32 inputSampleRate, UINT32 flags, UINT32 processingStage, - const XAUDIO2_VOICE_SENDS *pSendList, + const XAUDIO23_VOICE_SENDS *pSendList, const XAUDIO2_EFFECT_CHAIN *pEffectChain) { IXAudio2Impl *This = impl_from_IXAudio22(iface); - return IXAudio2_CreateSubmixVoice(&This->IXAudio2_iface, ppSubmixVoice, - inputChannels, inputSampleRate, flags, processingStage, pSendList, + XAUDIO2_VOICE_SENDS sends, *psends; + HRESULT hr; + + if(pSendList){ + sends.SendCount = pSendList->OutputCount; + sends.pSends = convert_send_descriptors23(pSendList); + psends = &sends; + } + + hr = IXAudio2_CreateSubmixVoice(&This->IXAudio2_iface, ppSubmixVoice, + inputChannels, inputSampleRate, flags, processingStage, psends, pEffectChain); + + if(pSendList) + HeapFree(GetProcessHeap(), 0, sends.pSends); + + return hr; } static HRESULT WINAPI XA22_CreateMasteringVoice(IXAudio22 *iface, diff --git a/include/xaudio2.idl b/include/xaudio2.idl index 9bf33ee17e..e97cf9948b 100644 --- a/include/xaudio2.idl +++ b/include/xaudio2.idl @@ -956,7 +956,7 @@ interface IXAudio20 : IUnknown [in, defaultvalue(0)] UINT32 Flags, [in, defaultvalue(XAUDIO2_DEFAULT_FREQ_RATIO)] float MaxFrequencyRatio, [in, defaultvalue(NULL)] IXAudio2VoiceCallback* pCallback, - [in, defaultvalue(NULL)] const XAUDIO2_VOICE_SENDS* pSendList, + [in, defaultvalue(NULL)] const XAUDIO23_VOICE_SENDS* pSendList, [in, defaultvalue(NULL)] const XAUDIO2_EFFECT_CHAIN* pEffectChain); HRESULT CreateSubmixVoice( @@ -965,7 +965,7 @@ interface IXAudio20 : IUnknown [in] UINT32 InputSampleRate, [in, defaultvalue(0)] UINT32 Flags, [in, defaultvalue(0)] UINT32 ProcessingStage, - [in, defaultvalue(NULL)] const XAUDIO2_VOICE_SENDS* pSendList, + [in, defaultvalue(NULL)] const XAUDIO23_VOICE_SENDS* pSendList, [in, defaultvalue(NULL)] const XAUDIO2_EFFECT_CHAIN* pEffectChain); HRESULT CreateMasteringVoice( @@ -1017,7 +1017,7 @@ interface IXAudio22 : IUnknown [in, defaultvalue(0)] UINT32 Flags, [in, defaultvalue(XAUDIO2_DEFAULT_FREQ_RATIO)] float MaxFrequencyRatio, [in, defaultvalue(NULL)] IXAudio2VoiceCallback* pCallback, - [in, defaultvalue(NULL)] const XAUDIO2_VOICE_SENDS* pSendList, + [in, defaultvalue(NULL)] const XAUDIO23_VOICE_SENDS* pSendList, [in, defaultvalue(NULL)] const XAUDIO2_EFFECT_CHAIN* pEffectChain); HRESULT CreateSubmixVoice( @@ -1026,7 +1026,7 @@ interface IXAudio22 : IUnknown [in] UINT32 InputSampleRate, [in, defaultvalue(0)] UINT32 Flags, [in, defaultvalue(0)] UINT32 ProcessingStage, - [in, defaultvalue(NULL)] const XAUDIO2_VOICE_SENDS* pSendList, + [in, defaultvalue(NULL)] const XAUDIO23_VOICE_SENDS* pSendList, [in, defaultvalue(NULL)] const XAUDIO2_EFFECT_CHAIN* pEffectChain); HRESULT CreateMasteringVoice( -- 2.18.0

1 0

[PATCH] wnaspi32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 09 Aug '18

09 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wnaspi32/aspi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wnaspi32/aspi.c b/dlls/wnaspi32/aspi.c index e03b767979..df052ff2fc 100644 --- a/dlls/wnaspi32/aspi.c +++ b/dlls/wnaspi32/aspi.c @@ -130,7 +130,7 @@ int ASPI_GetNumControllers(void) ERR("Could not open HKLM\\%s\n", debugstr_w(wDevicemapScsi)); return 0; } - while (RegEnumKeyW(hkeyScsi, i++, wPortName, sizeof(wPortName)/sizeof(wPortName[0])) == ERROR_SUCCESS) + while (RegEnumKeyW(hkeyScsi, i++, wPortName, ARRAY_SIZE(wPortName)) == ERROR_SUCCESS) { if (RegOpenKeyExW(hkeyScsi, wPortName, 0, KEY_QUERY_VALUE, &hkeyPort) == ERROR_SUCCESS) { @@ -192,7 +192,7 @@ DWORD ASPI_GetHCforController( int controller ) ERR("Could not open HKLM\\%s\n", debugstr_w(wDevicemapScsi)); return 0xFFFFFFFF; } - while (RegEnumKeyW(hkeyScsi, i++, wPortName, sizeof(wPortName)/sizeof(wPortName[0])) == ERROR_SUCCESS) + while (RegEnumKeyW(hkeyScsi, i++, wPortName, ARRAY_SIZE(wPortName)) == ERROR_SUCCESS) { if (RegOpenKeyExW(hkeyScsi, wPortName, 0, KEY_QUERY_VALUE | KEY_ENUMERATE_SUB_KEYS, &hkeyPort) == ERROR_SUCCESS) @@ -215,7 +215,7 @@ DWORD ASPI_GetHCforController( int controller ) return 0xFFFFFFFF; } - if (RegEnumKeyW(hkeyPort, -num_ha, wBusName, sizeof(wBusName)/sizeof(wBusName[0])) != ERROR_SUCCESS) + if (RegEnumKeyW(hkeyPort, -num_ha, wBusName, ARRAY_SIZE(wBusName)) != ERROR_SUCCESS) { ERR("Failed to enumerate keys\n"); RegCloseKey(hkeyPort); -- 2.14.4

1 0

[PATCH] wldap32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 09 Aug '18

09 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wldap32/error.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wldap32/error.c b/dlls/wldap32/error.c index 2e09e9e399..fbbd124d23 100644 --- a/dlls/wldap32/error.c +++ b/dlls/wldap32/error.c @@ -303,7 +303,7 @@ ULONG CDECL LdapMapErrorToWin32( ULONG err ) { TRACE( "(0x%08x)\n", err ); - if (err >= sizeof(WLDAP32_errormap)/sizeof(WLDAP32_errormap[0])) + if (err >= ARRAY_SIZE( WLDAP32_errormap )) return ERROR_DS_GENERIC_ERROR; return WLDAP32_errormap[err]; } -- 2.14.4

1 0

[PATCH] wlanapi: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 09 Aug '18

09 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wlanapi/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wlanapi/main.c b/dlls/wlanapi/main.c index b764681006..f0a0091d4d 100644 --- a/dlls/wlanapi/main.c +++ b/dlls/wlanapi/main.c @@ -49,7 +49,7 @@ static struct wine_wlan* handle_index(HANDLE handle) { ULONG_PTR i = (ULONG_PTR)handle - 1; - if (i < sizeof(handle_table) / sizeof(handle_table[0]) && handle_table[i].magic == WLAN_MAGIC) + if (i < ARRAY_SIZE(handle_table) && handle_table[i].magic == WLAN_MAGIC) return &handle_table[i]; return NULL; @@ -59,7 +59,7 @@ static HANDLE handle_new(struct wine_wlan **entry) { ULONG_PTR i; - for (i = 0; i < sizeof(handle_table) / sizeof(handle_table[0]); i++) + for (i = 0; i < ARRAY_SIZE(handle_table); i++) { if (handle_table[i].magic == 0) { -- 2.14.4

1 0

[PATCH] version: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 09 Aug '18

09 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/version/version.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index f33361bebb..5299ecd32f 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -1313,7 +1313,7 @@ DWORD WINAPI VerFindFileW( DWORD flags,LPCWSTR lpszFilename,LPCWSTR lpszWinDir, /* Figure out where the file should go; shared files default to the system directory */ - GetSystemDirectoryW(systemDir, sizeof(systemDir)/sizeof(WCHAR)); + GetSystemDirectoryW(systemDir, ARRAY_SIZE(systemDir)); curDir = &emptyW; if(flags & VFFF_ISSHAREDFILE) -- 2.14.4

1 0

[PATCH] amstream: Handle stream object parameter for IDirectDrawMediaStream.
by Józef Kucia 09 Aug '18

09 Aug '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45382 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/amstream/amstream.c | 7 ++----- dlls/amstream/amstream_private.h | 4 ++-- dlls/amstream/mediastream.c | 19 +++++++++++++------ dlls/amstream/tests/amstream.c | 7 ++++--- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 463cba690b39..3b2f71add5ba 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -339,9 +339,6 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream if (!IsEqualGUID(PurposeId, &MSPID_PrimaryVideo) && !IsEqualGUID(PurposeId, &MSPID_PrimaryAudio)) return MS_E_PURPOSEID; - if (stream_object) - FIXME("Specifying a stream object in params is not yet supported\n"); - if (dwFlags & AMMSF_ADDDEFAULTRENDERER) { if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo)) @@ -367,9 +364,9 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream } if (IsEqualGUID(PurposeId, &MSPID_PrimaryVideo)) - hr = ddrawmediastream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); + hr = ddrawmediastream_create((IMultiMediaStream*)iface, PurposeId, stream_object, This->StreamType, &pStream); else - hr = audiomediastream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); + hr = audiomediastream_create((IMultiMediaStream*)iface, PurposeId, stream_object, This->StreamType, &pStream); if (SUCCEEDED(hr)) { pNewStreams = CoTaskMemRealloc(This->pStreams, (This->nbStreams+1) * sizeof(IAMMediaStream*)); diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h index 64a376f0588c..8f25b8e248e6 100644 --- a/dlls/amstream/amstream_private.h +++ b/dlls/amstream/amstream_private.h @@ -37,8 +37,8 @@ HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT ddrawmediastream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId, - STREAM_TYPE StreamType, IAMMediaStream **ppMediaStream) DECLSPEC_HIDDEN; + IUnknown *stream_object, STREAM_TYPE StreamType, IAMMediaStream **ppMediaStream) DECLSPEC_HIDDEN; HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_id, - STREAM_TYPE stream_type, IAMMediaStream **media_stream) DECLSPEC_HIDDEN; + IUnknown *stream_object, STREAM_TYPE stream_type, IAMMediaStream **media_stream) DECLSPEC_HIDDEN; #endif /* __AMSTREAM_PRIVATE_INCLUDED__ */ diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 4971bf166c6d..bc6159750228 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -599,15 +599,15 @@ static const BaseInputPinFuncTable DirectDrawMediaStreamInputPin_FuncTable = }; HRESULT ddrawmediastream_create(IMultiMediaStream *parent, const MSPID *purpose_id, - STREAM_TYPE stream_type, IAMMediaStream **media_stream) + IUnknown *stream_object, STREAM_TYPE stream_type, IAMMediaStream **media_stream) { DirectDrawMediaStreamImpl *object; PIN_INFO pin_info; HRESULT hr; - TRACE("(%p,%s,%p)\n", parent, debugstr_guid(purpose_id), media_stream); + TRACE("(%p,%s,%p,%p)\n", parent, debugstr_guid(purpose_id), stream_object, media_stream); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DirectDrawMediaStreamImpl)); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return E_OUTOFMEMORY; @@ -633,6 +633,10 @@ HRESULT ddrawmediastream_create(IMultiMediaStream *parent, const MSPID *purpose_ object->purpose_id = *purpose_id; object->stream_type = stream_type; + if (stream_object + && FAILED(hr = IUnknown_QueryInterface(stream_object, &IID_IDirectDraw7, (void **)&object->ddraw))) + FIXME("Stream object doesn't implement IDirectDraw7 interface, hr %#x.\n", hr); + *media_stream = &object->IAMMediaStream_iface; return S_OK; @@ -1139,15 +1143,18 @@ static const BaseInputPinFuncTable AudioMediaStreamInputPin_FuncTable = }; HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_id, - STREAM_TYPE stream_type, IAMMediaStream **media_stream) + IUnknown *stream_object, STREAM_TYPE stream_type, IAMMediaStream **media_stream) { AudioMediaStreamImpl *object; PIN_INFO pin_info; HRESULT hr; - TRACE("(%p,%s,%p)\n", parent, debugstr_guid(purpose_id), media_stream); + TRACE("(%p,%s,%p,%p)\n", parent, debugstr_guid(purpose_id), stream_object, media_stream); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AudioMediaStreamImpl)); + if (stream_object) + FIXME("Specifying a stream object is not yet supported.\n"); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return E_OUTOFMEMORY; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 1a14572c8a2d..97111d6b85f3 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -551,8 +551,9 @@ static void test_IDirectDrawStreamSample(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(ddraw == ddraw2, "got %p, %p\n", ddraw, ddraw2); - hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw7, (void**)&ddraw7); + hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw7, (void **)&ddraw7); ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ddraw7 == pdd7, "Got IDirectDraw instance %p, expected %p.\n", ddraw7, pdd7); IDirectDraw7_Release(ddraw7); IDirectDraw_Release(ddraw2); @@ -566,7 +567,7 @@ static void test_IDirectDrawStreamSample(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(surface != NULL, "got %p\n", surface); - hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void**)&surface7); + hr = IDirectDrawSurface_QueryInterface(surface, &IID_IDirectDrawSurface7, (void **)&surface7); ok(hr == S_OK, "got 0x%08x\n", hr); IDirectDrawSurface7_Release(surface7); @@ -579,7 +580,7 @@ static void test_IDirectDrawStreamSample(void) IDirectDrawSurface_Release(surface); IDirectDrawStreamSample_Release(pddsample); - hr = IDirectDrawSurface7_QueryInterface(pdds7, &IID_IDirectDrawSurface, (void**)&surface); + hr = IDirectDrawSurface7_QueryInterface(pdds7, &IID_IDirectDrawSurface, (void **)&surface); ok(hr == S_OK, "got 0x%08x\n", hr); EXPECT_REF(surface, 1); -- 2.16.4

1 0

[PATCH] regedit: Dont expand items on initial tree creation.
by Alistair Leslie-Hughes 09 Aug '18

09 Aug '18

The Message TVM_EXPAND is captured in treeview_notify, then passes g_pChildWnd->hTreeWnd on to OnTreeExpanding which hasn't been initialized yet. The function get_last_key is already called after the hTreeWnd has been assigned to select the previous selected item (if it exists). Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- programs/regedit/treeview.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index d5a6767..15a5136 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -572,9 +572,6 @@ static BOOL InitTreeViewItems(HWND hwndTV, LPWSTR pHostName) if (!AddEntryToTree(hwndTV, hRoot, hkcc, HKEY_CURRENT_CONFIG, 1)) return FALSE; if (!AddEntryToTree(hwndTV, hRoot, hkdd, HKEY_DYN_DATA, 1)) return FALSE; - /* expand and select host name */ - SendMessageW(hwndTV, TVM_EXPAND, TVE_EXPAND, (LPARAM)hRoot ); - SendMessageW(hwndTV, TVM_SELECTITEM, TVGN_CARET, (LPARAM)hRoot); return TRUE; } -- 1.9.1

1 0

[PATCH] vcomp: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 08 Aug '18

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vcomp/main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index ab51ef2bcc..3a9fd22aae 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -523,7 +523,7 @@ void CDECL _vcomp_reduction_i1(unsigned int flags, char *dest, char val) _vcomp_atomic_bool_or_i1, }; unsigned int op = (flags >> 8) & 0xf; - op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + op = min(op, ARRAY_SIZE(funcs) - 1); funcs[op](dest, val); } @@ -617,7 +617,7 @@ void CDECL _vcomp_reduction_i2(unsigned int flags, short *dest, short val) _vcomp_atomic_bool_or_i2, }; unsigned int op = (flags >> 8) & 0xf; - op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + op = min(op, ARRAY_SIZE(funcs) - 1); funcs[op](dest, val); } @@ -711,7 +711,7 @@ void CDECL _vcomp_reduction_i4(unsigned int flags, int *dest, int val) _vcomp_atomic_bool_or_i4, }; unsigned int op = (flags >> 8) & 0xf; - op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + op = min(op, ARRAY_SIZE(funcs) - 1); funcs[op](dest, val); } @@ -807,7 +807,7 @@ void CDECL _vcomp_reduction_i8(unsigned int flags, LONG64 *dest, LONG64 val) _vcomp_atomic_bool_or_i8, }; unsigned int op = (flags >> 8) & 0xf; - op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + op = min(op, ARRAY_SIZE(funcs) - 1); funcs[op](dest, val); } @@ -891,7 +891,7 @@ void CDECL _vcomp_reduction_r4(unsigned int flags, float *dest, float val) _vcomp_atomic_bool_or_r4, }; unsigned int op = (flags >> 8) & 0xf; - op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + op = min(op, ARRAY_SIZE(funcs) - 1); funcs[op](dest, val); } @@ -975,7 +975,7 @@ void CDECL _vcomp_reduction_r8(unsigned int flags, double *dest, double val) _vcomp_atomic_bool_or_r8, }; unsigned int op = (flags >> 8) & 0xf; - op = min(op, sizeof(funcs)/sizeof(funcs[0]) - 1); + op = min(op, ARRAY_SIZE(funcs) - 1); funcs[op](dest, val); } -- 2.14.4

1 0

[PATCH] userenv: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 08 Aug '18

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/userenv/userenv_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index d2adad4434..538b912b20 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -106,20 +106,20 @@ static void set_registry_variables(WCHAR **env, HKEY hkey, DWORD type, BOOL set_ for (index = 0; ; index++) { - size = sizeof(name)/sizeof(WCHAR); + size = ARRAY_SIZE(name); ret = RegEnumValueW(hkey, index, name, &size, NULL, NULL, NULL, NULL); if (ret != ERROR_SUCCESS) break; - if (!memicmpW(name, SystemRootW, sizeof(SystemRootW)/sizeof(WCHAR))) + if (!memicmpW(name, SystemRootW, ARRAY_SIZE(SystemRootW))) continue; - if (!memicmpW(name, SystemDriveW, sizeof(SystemDriveW)/sizeof(WCHAR))) + if (!memicmpW(name, SystemDriveW, ARRAY_SIZE(SystemDriveW))) continue; RtlInitUnicodeString(&us_name, name); us_value.Buffer = value; us_value.MaximumLength = sizeof(value); - if (!memicmpW(name, PATHW, sizeof(PATHW)/sizeof(WCHAR)) && + if (!memicmpW(name, PATHW, ARRAY_SIZE(PATHW)) && !RtlQueryEnvironmentVariable_U(*env, &us_name, &us_value)) { if (!set_path) @@ -339,7 +339,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, RegCloseKey(hkey); } - len = sizeof(buf)/sizeof(WCHAR); + len = ARRAY_SIZE(buf); if (GetComputerNameW(buf, &len)) { RtlInitUnicodeString(&us_name, COMPUTERNAMEW); -- 2.14.4

1 0

[PATCH] user32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 08 Aug '18

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/driver.c | 2 +- dlls/user32/icontitle.c | 4 ++-- dlls/user32/lstr.c | 4 ++-- dlls/user32/user_main.c | 4 ++-- dlls/user32/win.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index d59a2eacf5..561a126bd6 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -57,7 +57,7 @@ static HMODULE load_desktop_driver( HWND hwnd ) HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; - WCHAR key[(sizeof(key_pathW) + sizeof(displayW)) / sizeof(WCHAR) + 40]; + WCHAR key[ARRAY_SIZE(key_pathW) + ARRAY_SIZE(displayW) + 40]; UINT guid_atom = HandleToULong( GetPropW( hwnd, display_device_guid_propW )); USER_CheckNotLock(); diff --git a/dlls/user32/icontitle.c b/dlls/user32/icontitle.c index 95cb51331e..77e286ebc1 100644 --- a/dlls/user32/icontitle.c +++ b/dlls/user32/icontitle.c @@ -90,7 +90,7 @@ static BOOL ICONTITLE_SetTitlePos( HWND hwnd, HWND owner ) INT cx, cy; POINT pt; - int length = GetWindowTextW( owner, str, sizeof(str)/sizeof(WCHAR) ); + int length = GetWindowTextW( owner, str, ARRAY_SIZE( str )); while (length && str[length - 1] == ' ') /* remove trailing spaces */ str[--length] = 0; @@ -178,7 +178,7 @@ static BOOL ICONTITLE_Paint( HWND hwnd, HWND owner, HDC hDC, BOOL bActive ) { WCHAR buffer[80]; - INT length = GetWindowTextW( owner, buffer, sizeof(buffer)/sizeof(buffer[0]) ); + INT length = GetWindowTextW( owner, buffer, ARRAY_SIZE( buffer )); SetTextColor( hDC, textColor ); SetBkMode( hDC, TRANSPARENT ); diff --git a/dlls/user32/lstr.c b/dlls/user32/lstr.c index 80a2cfbe11..145a5c020d 100644 --- a/dlls/user32/lstr.c +++ b/dlls/user32/lstr.c @@ -335,7 +335,7 @@ DWORD WINAPI CharLowerBuffA( LPSTR str, DWORD len ) if (!str) return 0; /* YES */ lenW = MultiByteToWideChar(CP_ACP, 0, str, len, NULL, 0); - if (lenW > sizeof(buffer)/sizeof(WCHAR)) + if (lenW > ARRAY_SIZE(buffer)) { strW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)); if (!strW) return 0; @@ -370,7 +370,7 @@ DWORD WINAPI CharUpperBuffA( LPSTR str, DWORD len ) if (!str) return 0; /* YES */ lenW = MultiByteToWideChar(CP_ACP, 0, str, len, NULL, 0); - if (lenW > sizeof(buffer)/sizeof(WCHAR)) + if (lenW > ARRAY_SIZE(buffer)) { strW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)); if (!strW) return 0; diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index e287150e21..007cb687f5 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -169,7 +169,7 @@ static const WCHAR *get_default_desktop(void) static const WCHAR app_defaultsW[] = {'S','o','f','t','w','a','r','e','\\', 'W','i','n','e','\\', 'A','p','p','D','e','f','a','u','l','t','s',0}; - static WCHAR buffer[MAX_PATH + sizeof(explorerW)/sizeof(WCHAR)]; + static WCHAR buffer[MAX_PATH + ARRAY_SIZE(explorerW)]; WCHAR *p, *appname = buffer; const WCHAR *ret = defaultW; DWORD len; @@ -433,7 +433,7 @@ BOOL WINAPI ExitWindowsEx( UINT flags, DWORD reason ) STARTUPINFOW si; void *redir; - GetSystemDirectoryW( app, MAX_PATH - sizeof(winebootW)/sizeof(WCHAR) ); + GetSystemDirectoryW( app, MAX_PATH - ARRAY_SIZE( winebootW )); strcatW( app, winebootW ); strcpyW( cmdline, app ); diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 5f2ac4e0d7..cbfd8bb14a 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2049,8 +2049,8 @@ HWND WINAPI GetDesktopWindow(void) STARTUPINFOW si; PROCESS_INFORMATION pi; WCHAR windir[MAX_PATH]; - WCHAR app[MAX_PATH + sizeof(explorer)/sizeof(WCHAR)]; - WCHAR cmdline[MAX_PATH + (sizeof(explorer) + sizeof(args))/sizeof(WCHAR)]; + WCHAR app[MAX_PATH + ARRAY_SIZE( explorer )]; + WCHAR cmdline[MAX_PATH + ARRAY_SIZE( explorer ) + ARRAY_SIZE( args )]; WCHAR desktop[MAX_PATH]; void *redir; -- 2.14.4

1 0

[PATCH] user.exe16: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 08 Aug '18

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user.exe16/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user.exe16/window.c b/dlls/user.exe16/window.c index e81d9ace3a..10f1389f0a 100644 --- a/dlls/user.exe16/window.c +++ b/dlls/user.exe16/window.c @@ -1924,7 +1924,7 @@ HWND16 WINAPI CreateWindowEx16( DWORD exStyle, LPCSTR className, { WCHAR bufferW[256]; - if (!MultiByteToWideChar( CP_ACP, 0, className, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) )) + if (!MultiByteToWideChar( CP_ACP, 0, className, -1, bufferW, ARRAY_SIZE(bufferW))) return 0; hwnd = create_window16( (CREATESTRUCTW *)&cs, bufferW, HINSTANCE_32(instance), FALSE ); } -- 2.14.4

1 0

[PATCH] uiribbon: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 08 Aug '18

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/uiribbon/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/uiribbon/main.c b/dlls/uiribbon/main.c index 9306338086..a76c349ad9 100644 --- a/dlls/uiribbon/main.c +++ b/dlls/uiribbon/main.c @@ -173,13 +173,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) && ! IsEqualGUID( &IID_IUnknown, riid) ) return E_NOINTERFACE; - for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + for (i = 0; i < ARRAY_SIZE(object_creation); i++) { if (IsEqualGUID(object_creation[i].clsid, rclsid)) break; } - if (i == sizeof(object_creation)/sizeof(object_creation[0])) + if (i == ARRAY_SIZE(object_creation)) { FIXME("%s: no class found.\n", debugstr_guid(rclsid)); return CLASS_E_CLASSNOTAVAILABLE; -- 2.14.4

1 0

[PATCH] taskschd: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 08 Aug '18

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/taskschd/task.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 432f983c22..1306c8c8f9 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -3852,7 +3852,7 @@ static HRESULT WINAPI TaskService_Connect(ITaskService *iface, VARIANT server, V if (!is_variant_null(&user) || !is_variant_null(&domain) || !is_variant_null(&password)) FIXME("user/domain/password are ignored\n"); - len = sizeof(comp_name)/sizeof(comp_name[0]); + len = ARRAY_SIZE(comp_name); if (!GetComputerNameW(comp_name, &len)) return HRESULT_FROM_WIN32(GetLastError()); -- 2.14.4

1 0

[PATCH] t2embed: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 08 Aug '18

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/t2embed/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/t2embed/main.c b/dlls/t2embed/main.c index 766926fbfa..288c19bee1 100644 --- a/dlls/t2embed/main.c +++ b/dlls/t2embed/main.c @@ -136,7 +136,7 @@ LONG WINAPI TTIsEmbeddingEnabledForFacename(LPCSTR facename, BOOL *enabled) DWORD name_len, value_len, value, type; CHAR name[LF_FACESIZE]; - name_len = sizeof(name)/sizeof(*name); + name_len = ARRAY_SIZE(name); value_len = sizeof(value); ret = RegEnumValueA(hkey, index++, name, &name_len, NULL, &type, (BYTE*)&value, &value_len); if (ret || type != REG_DWORD) -- 2.14.4

1 0

[PATCH 8/8] server: Allow pipe server fd caching throughout its whole lifetime.
by Jacek Caban 08 Aug '18

08 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/file.c | 10 ---------- server/named_pipe.c | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-)

1 0

[PATCH 7/8] server: Don't use set_no_fd_status for error handling in pipe objects.
by Jacek Caban 08 Aug '18

08 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 2 -- server/fd.c | 6 ------ server/file.h | 1 - server/named_pipe.c | 15 --------------- 4 files changed, 24 deletions(-)

1 0

[PATCH 6/8] server: Improve FSCTL_PIPE_TRANSCEIVE error handling.
by Jacek Caban 08 Aug '18

08 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 2 +- server/named_pipe.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH 5/8] server: Improve named pipe write error handling.
by Jacek Caban 08 Aug '18

08 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/pipe.c | 10 +++++----- dlls/ntdll/tests/pipe.c | 1 - server/named_pipe.c | 11 ++++++++++- 3 files changed, 15 insertions(+), 7 deletions(-)

1 0

[PATCH 4/8] server: Improve named pipe read error handling.
by Jacek Caban 08 Aug '18

08 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 2 -- server/named_pipe.c | 12 +++++++++++- 2 files changed, 11 insertions(+), 3 deletions(-)

1 0

[PATCH 3/8] server: Improve FSCTL_PIPE_PEEK error handling.
by Jacek Caban 08 Aug '18

08 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/pipe.c | 2 -- dlls/ntdll/tests/pipe.c | 4 ++-- server/named_pipe.c | 9 ++++++++- 3 files changed, 10 insertions(+), 5 deletions(-)

1 0

[PATCH 2/8] server: Store pipe state in pipe_end struct and return it in FSCTL_PIPE_PEEK.
by Jacek Caban 08 Aug '18

08 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 1 - server/named_pipe.c | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[PATCH 1/8] ntdll/tests: Add pipe state tests.
by Jacek Caban 08 Aug '18

08 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/pipe.c | 300 ++++++++++++++++++++++++++++++++++++++++++++++-- include/winternl.h | 5 + 2 files changed, 295 insertions(+), 10 deletions(-)

1 0

[PATCH] serialui: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 08 Aug '18

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/serialui/confdlg.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c index 7797c238fc..cc3350572b 100644 --- a/dlls/serialui/confdlg.c +++ b/dlls/serialui/confdlg.c @@ -214,7 +214,7 @@ static BOOL SERIALUI_MakeBaudDword(LPDWORD lpdwBaudRate) { unsigned int i; - for(i=0; i<(sizeof(SERIALUI_BaudConvertTable)/sizeof(DWORD)); i+=2) + for(i=0; i<ARRAY_SIZE(SERIALUI_BaudConvertTable); i+=2) { if(*lpdwBaudRate == SERIALUI_BaudConvertTable[i]) { @@ -229,7 +229,7 @@ static BOOL SERIALUI_MakeBaudEnum(LPDWORD lpdwBaudRate) { unsigned int i; - for(i=0; i<(sizeof(SERIALUI_BaudConvertTable)/sizeof(DWORD)); i+=2) + for(i=0; i<ARRAY_SIZE(SERIALUI_BaudConvertTable); i+=2) { if(*lpdwBaudRate == SERIALUI_BaudConvertTable[i+1]) { @@ -352,8 +352,8 @@ static INT_PTR CALLBACK SERIALUI_ConfigDialogProc(HWND hWnd, UINT uMsg, WPARAM w if(!info) return FALSE; SetWindowLongPtrW(hWnd, DWLP_USER, lParam); - GetWindowTextW(hWnd, format, sizeof(format)/sizeof(WCHAR)); - snprintfW( szTitle, sizeof(szTitle)/sizeof(WCHAR), format, info->lpszDevice ); + GetWindowTextW(hWnd, format, ARRAY_SIZE(format)); + snprintfW(szTitle, ARRAY_SIZE(szTitle), format, info->lpszDevice); SetWindowTextW(hWnd, szTitle); SERIALUI_DCBToDialogInfo(hWnd, info); return TRUE; @@ -501,7 +501,7 @@ BOOL WINAPI drvSetDefaultCommConfigW( if(r != ERROR_SUCCESS) return FALSE; - snprintfW(szKeyName, sizeof(szKeyName)/sizeof(WCHAR), fmt, lpszCommKey ,lpszDevice); + snprintfW(szKeyName, ARRAY_SIZE(szKeyName), fmt, lpszCommKey, lpszDevice); r = RegCreateKeyW(hKeyReg, szKeyName, &hKeyPort); if(r == ERROR_SUCCESS) { @@ -556,7 +556,7 @@ DWORD WINAPI drvGetDefaultCommConfigW( } /* only "com1" - "com9" is allowed */ - r = sizeof(comW) / sizeof(WCHAR); /* len of "com\0" */ + r = ARRAY_SIZE(comW); /* len of "com\0" */ lstrcpynW(szKeyName, lpszDevice, r); /* simulate a lstrcmpnW */ r--; @@ -574,7 +574,7 @@ DWORD WINAPI drvGetDefaultCommConfigW( r = RegConnectRegistryW(NULL, HKEY_LOCAL_MACHINE, &hKeyReg); if(r != ERROR_SUCCESS) return r; - snprintfW(szKeyName, sizeof(szKeyName)/sizeof(WCHAR), fmt, lpszCommKey ,lpszDevice); + snprintfW(szKeyName, ARRAY_SIZE(szKeyName), fmt, lpszCommKey, lpszDevice); r = RegOpenKeyW(hKeyReg, szKeyName, &hKeyPort); if(r == ERROR_SUCCESS) { -- 2.14.4

1 0

[PATCH] qmgr: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 08 Aug '18

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/qmgr/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index 3673ede142..dbdfc97bcc 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -518,7 +518,7 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) uc.lpszPassword = NULL; uc.dwPasswordLength = 0; uc.lpszHostName = host; - uc.dwHostNameLength = sizeof(host)/sizeof(host[0]); + uc.dwHostNameLength = ARRAY_SIZE(host); uc.nPort = 0; uc.lpszUrlPath = NULL; uc.dwUrlPathLength = ~0u; -- 2.14.4

1 0

[PATCH] qedit: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 08 Aug '18

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/qedit/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c index a012ff210c..a46f3f02e5 100644 --- a/dlls/qedit/main.c +++ b/dlls/qedit/main.c @@ -167,13 +167,13 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) && ! IsEqualGUID( &IID_IUnknown, riid) ) return E_NOINTERFACE; - for (i=0; i < sizeof(object_creation)/sizeof(object_creation[0]); i++) + for (i = 0; i < ARRAY_SIZE(object_creation); i++) { if (IsEqualGUID(object_creation[i].clsid, rclsid)) break; } - if (i == sizeof(object_creation)/sizeof(object_creation[0])) + if (i == ARRAY_SIZE(object_creation)) { FIXME("%s: no class found.\n", debugstr_guid(rclsid)); return CLASS_E_CLASSNOTAVAILABLE; -- 2.14.4

1 0

[PATCH] qcap: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 08 Aug '18

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/qcap/qcap_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index bc0b903d0b..c5b4931c90 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -142,7 +142,7 @@ FactoryTemplate const g_Templates[] = { } }; -int g_cTemplates = sizeof(g_Templates) / sizeof(g_Templates[0]); +const int g_cTemplates = ARRAY_SIZE(g_Templates); /*********************************************************************** * Dll EntryPoint (QCAP.@) -- 2.14.4

1 0

[PATCH] packager: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 08 Aug '18

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/packager/packager_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index c1d194e368..d70202b73b 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -463,7 +463,7 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, goto exit; }else{ len = MultiByteToWideChar(CP_ACP, 0, filenameA, filenameA_len, - filenameW, sizeof(filenameW) / sizeof(*filenameW)); + filenameW, ARRAY_SIZE(filenameW)); } stream_filename = filenameW + len - 1; @@ -474,7 +474,7 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, ++stream_filename; stream_filename_len = len - (stream_filename - filenameW); - len = GetTempPathW(sizeof(This->filename)/sizeof(WCHAR), This->filename); + len = GetTempPathW(ARRAY_SIZE(This->filename), This->filename); memcpy(This->filename + len, stream_filename, stream_filename_len * sizeof(WCHAR)); This->filename[len + stream_filename_len] = 0; -- 2.14.4

1 0

[PATCH] opengl32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 08 Aug '18

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/opengl32/wgl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index b73920cb25..04ace8effe 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -891,7 +891,7 @@ PROC WINAPI wglGetProcAddress( LPCSTR name ) { "glVertexAttribDivisor", "glVertexAttribDivisorARB"}, /* needed by Caffeine */ }; - for (i = 0; i < sizeof(alternatives)/sizeof(alternatives[0]); i++) + for (i = 0; i < ARRAY_SIZE(alternatives); i++) { if (strcmp( name, alternatives[i].name )) continue; WARN("Extension %s required for %s not supported, trying %s\n", -- 2.14.4

1 0

[PATCH] odbccp32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 08 Aug '18

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index f54674c32f..9420dceb30 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -71,7 +71,7 @@ static const WCHAR odbc_error_invalid_keyword[] = {'I','n','v','a','l','i','d',' /* Push an error onto the error stack, taking care of ranges etc. */ static void push_error(int code, LPCWSTR msg) { - if (num_errors < sizeof error_code/sizeof error_code[0]) + if (num_errors < ARRAY_SIZE(error_code)) { error_code[num_errors] = code; error_msg[num_errors] = msg; -- 2.14.4

1 0

[PATCH] msvfw32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 08 Aug '18

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvfw32/mciwnd.c | 3 +-- dlls/msvfw32/msvideo_main.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msvfw32/mciwnd.c b/dlls/msvfw32/mciwnd.c index fc499732ef..50899e1fbd 100644 --- a/dlls/msvfw32/mciwnd.c +++ b/dlls/msvfw32/mciwnd.c @@ -1006,8 +1006,7 @@ end_of_mci_open: cmdW = (LPWSTR)lParam; mwi->lasterror = mciSendStringW(cmdW, mwi->return_string, - sizeof(mwi->return_string)/sizeof(mwi->return_string[0]), - 0); + ARRAY_SIZE(mwi->return_string), 0); if (mwi->lasterror) MCIWND_notify_error(mwi); diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index 5dc99a42da..ea81e8e4a9 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -310,8 +310,7 @@ static BOOL ICInfo_enum_handler(const char *name, const char *driver, unsigned i lpicinfo->dwVersionICM = ICVERSION; lpicinfo->szName[0] = 0; lpicinfo->szDescription[0] = 0; - MultiByteToWideChar(CP_ACP, 0, driver, -1, lpicinfo->szDriver, - sizeof(lpicinfo->szDriver)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, driver, -1, lpicinfo->szDriver, ARRAY_SIZE(lpicinfo->szDriver)); return TRUE; } -- 2.14.4

1 0

[PATCH] joy.cpl: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 08 Aug '18

08 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/joy.cpl/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 51c2fdfdc9..32dfad0eb5 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -416,7 +416,7 @@ static DWORD WINAPI input_thread(void *param) axes_pos[2][1] = state.lRz; /* Set pov values */ - for (j = 0; j < sizeof(pov_val)/sizeof(pov_val[0]); j++) + for (j = 0; j < ARRAY_SIZE(pov_val); j++) { if (state.rgdwPOV[0] == pov_val[j]) { -- 2.14.4

1 0

[PATCH 1/2] kernel32: Add stub for GetDynamicTimeZoneInformationEffectiveYears().
by Guillaume Charifi 08 Aug '18

08 Aug '18

Signed-off-by: Guillaume Charifi <guillaume.charifi(a)sfr.fr> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/time.c | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index de6f007999..3060896daa 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -657,6 +657,7 @@ # @ stub GetDurationFormat # @ stub GetDurationFormatEx @ stdcall GetDynamicTimeZoneInformation(ptr) +@ stdcall GetDynamicTimeZoneInformationEffectiveYears(ptr ptr ptr) @ stdcall -ret64 -arch=i386,x86_64 GetEnabledXStateFeatures() @ stdcall GetEnvironmentStrings() GetEnvironmentStringsA @ stdcall GetEnvironmentStringsA() diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 91b2c006c7..57ad10d234 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1447,6 +1447,15 @@ DWORD WINAPI GetDynamicTimeZoneInformation(DYNAMIC_TIME_ZONE_INFORMATION *tzinfo return TIME_ZoneID( (TIME_ZONE_INFORMATION*)tzinfo ); } +/*********************************************************************** + * GetDynamicTimeZoneInformationEffectiveYears (KERNEL32.@) + */ +DWORD WINAPI GetDynamicTimeZoneInformationEffectiveYears(DYNAMIC_TIME_ZONE_INFORMATION *tzinfo, DWORD *first_year, DWORD *last_year) +{ + FIXME("(%p, %p, %p): stub!\n", tzinfo, first_year, last_year); + return ERROR_FILE_NOT_FOUND; +} + /*********************************************************************** * QueryProcessCycleTime (KERNEL32.@) */ -- Guillaume Charifi <guillaume.charifi(a)sfr.fr>

1 1

[PATCH vkd3d v2 1/5] vkd3d: Fix pthread_setname_np(3) call on Mac OS.
by Chip Davis 07 Aug '18

07 Aug '18

That function exists on Mac, but it only takes a single argument, the thread's new name. That's OK for our purposes, since we were calling it on pthread_self anyhow. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> --- Notes: Try 2: Pull the pthread_setname_np(3) call into a header. libs/vkd3d/command.c | 4 +--- libs/vkd3d/vkd3d_private.h | 11 +++++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 4db9967..042d2f1 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -199,9 +199,7 @@ static void *vkd3d_fence_worker_main(void *arg) struct vkd3d_fence_worker *worker = arg; int rc; -#ifdef HAVE_PTHREAD_SETNAME_NP - pthread_setname_np(pthread_self(), "vkd3d_worker"); -#endif + vkd3d_set_thread_name("vkd3d_worker"); for (;;) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 8efb930..b233d94 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -86,6 +86,17 @@ struct vkd3d_vulkan_info VkPhysicalDeviceSparseProperties sparse_properties; }; +static inline void vkd3d_set_thread_name(const char *name) +{ +#ifdef HAVE_PTHREAD_SETNAME_NP +#ifdef __APPLE__ + pthread_setname_np(name); +#else + pthread_setname_np(pthread_self(), name); +#endif +#endif +} + struct vkd3d_instance { VkInstance vk_instance; -- 2.18.0

3 13

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel