- wine-devel - winehq.org

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

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dsound/dsound.c | 4 ++-- dlls/dsound/propset.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index a8b20b1dd1..6a49d638e1 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -85,7 +85,7 @@ static void _dump_DSCAPS(DWORD xmask) { }; unsigned int i; - for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++) + for (i = 0; i < ARRAY_SIZE(flags); i++) if ((flags[i].mask & xmask) == flags[i].mask) TRACE("%s ",flags[i].name); } @@ -113,7 +113,7 @@ static void _dump_DSBCAPS(DWORD xmask) { }; unsigned int i; - for (i=0;i<sizeof(flags)/sizeof(flags[0]);i++) + for (i = 0; i < ARRAY_SIZE(flags); i++) if ((flags[i].mask & xmask) == flags[i].mask) TRACE("%s ",flags[i].name); } diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index 9ef4ac9fbc..0272ac001f 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -361,8 +361,8 @@ static void DSPROPERTY_descWto1(const DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_W DSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_1_DATA *data1) { data1->DeviceId = dataW->DeviceId; - lstrcpynW(data1->ModuleW, dataW->Module, sizeof(data1->ModuleW)/sizeof(*data1->ModuleW)); - lstrcpynW(data1->DescriptionW, dataW->Description, sizeof(data1->DescriptionW)/sizeof(*data1->DescriptionW)); + lstrcpynW(data1->ModuleW, dataW->Module, ARRAY_SIZE(data1->ModuleW)); + lstrcpynW(data1->DescriptionW, dataW->Description, ARRAY_SIZE(data1->DescriptionW)); WideCharToMultiByte(CP_ACP, 0, data1->DescriptionW, -1, data1->DescriptionA, sizeof(data1->DescriptionA)-1, NULL, NULL); WideCharToMultiByte(CP_ACP, 0, data1->ModuleW, -1, data1->ModuleA, sizeof(data1->ModuleA)-1, NULL, NULL); data1->DescriptionA[sizeof(data1->DescriptionA)-1] = 0; -- 2.14.4

2 1

kernel32: Add support for FILE_FLAG_WRITE_THROUGH to CreateFile.
by Dmitry Timoshkov 10 Aug '18

10 Aug '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/file.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 1e5b9fe3e7..1b33cfba5e 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1560,6 +1560,8 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, options |= FILE_SYNCHRONOUS_IO_NONALERT; if (attributes & FILE_FLAG_RANDOM_ACCESS) options |= FILE_RANDOM_ACCESS; + if (attributes & FILE_FLAG_WRITE_THROUGH) + options |= FILE_WRITE_THROUGH; attributes &= FILE_ATTRIBUTE_VALID_FLAGS; attr.Length = sizeof(attr); -- 2.17.1

2 2

[PATCH] winhlp32: Avoid an ARRAY_SIZE-like macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winhlp32/winhelp.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 8ee3d0410e..7ce5d4a0a8 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -66,19 +66,18 @@ static void WINHELP_InitFonts(HWND hWnd) {-12, 0, 0, 0, 700, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, {'H','e','l','v',0}}, {-10, 0, 0, 0, 700, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, {'H','e','l','v',0}}, { -8, 0, 0, 0, 400, 0, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 32, {'H','e','l','v',0}}}; -#define FONTS_LEN (sizeof(logfontlist)/sizeof(*logfontlist)) - static HFONT fonts[FONTS_LEN]; + static HFONT fonts[ARRAY_SIZE(logfontlist)]; static BOOL init = FALSE; - win->fonts_len = FONTS_LEN; + win->fonts_len = ARRAY_SIZE(logfontlist); win->fonts = fonts; if (!init) { UINT i; - for (i = 0; i < FONTS_LEN; i++) + for (i = 0; i < ARRAY_SIZE(logfontlist); i++) { fonts[i] = CreateFontIndirectW(&logfontlist[i]); } -- 2.14.4

1 0

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

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winhlp32/macro.c | 2 +- programs/winhlp32/macro.lex.l | 8 ++++---- programs/winhlp32/winhelp.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index 5a25d6c944..280e618236 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -154,7 +154,7 @@ void CALLBACK MACRO_About(void) WCHAR name[256]; HICON icon = LoadImageW( Globals.hInstance, MAKEINTRESOURCEW(IDI_WINHELP), IMAGE_ICON, 48, 48, LR_SHARED ); - LoadStringW( Globals.hInstance, STID_WINE_HELP, name, sizeof(name)/sizeof(WCHAR) ); + LoadStringW( Globals.hInstance, STID_WINE_HELP, name, ARRAY_SIZE( name )); ShellAboutW( MACRO_CurrentWindow()->hMainWnd, name, NULL, icon ); } diff --git a/programs/winhlp32/macro.lex.l b/programs/winhlp32/macro.lex.l index 8f6945ca98..eab7a795af 100644 --- a/programs/winhlp32/macro.lex.l +++ b/programs/winhlp32/macro.lex.l @@ -75,7 +75,7 @@ struct lexret yylval; /* opening a new one */ if (lex_data->quote_stk_idx == 0) { - assert(lex_data->cache_used < sizeof(lex_data->cache_string) / sizeof(lex_data->cache_string[0])); + assert(lex_data->cache_used < ARRAY_SIZE(lex_data->cache_string)); lex_data->strptr = lex_data->cache_string[lex_data->cache_used] = HeapAlloc(GetProcessHeap(), 0, strlen(lex_data->macroptr) + 1); yylval.string = lex_data->strptr; lex_data->cache_used++; @@ -83,7 +83,7 @@ struct lexret yylval; } else *lex_data->strptr++ = yytext[0]; lex_data->quote_stack[lex_data->quote_stk_idx++] = yytext[0]; - assert(lex_data->quote_stk_idx < sizeof(lex_data->quote_stack) / sizeof(lex_data->quote_stack[0])); + assert(lex_data->quote_stk_idx < ARRAY_SIZE(lex_data->quote_stack)); } else { @@ -222,7 +222,7 @@ CheckArgs_end: static int MACRO_CallBoolFunc(void *fn, const char* args, void** ret) { void* pa[2]; - int idx = MACRO_CheckArgs(pa, sizeof(pa)/sizeof(pa[0]), args); + int idx = MACRO_CheckArgs(pa, ARRAY_SIZE(pa), args); if (idx < 0) return 0; if (!fn) return 1; @@ -257,7 +257,7 @@ static int MACRO_CallBoolFunc(void *fn, const char* args, void** ret) static int MACRO_CallVoidFunc(void *fn, const char* args) { void* pa[6]; - int idx = MACRO_CheckArgs(pa, sizeof(pa)/sizeof(pa[0]), args); + int idx = MACRO_CheckArgs(pa, ARRAY_SIZE(pa), args); if (idx < 0) return 0; if (!fn) return 1; diff --git a/programs/winhlp32/winhelp.c b/programs/winhlp32/winhelp.c index 2ac3d2ff24..8ee3d0410e 100644 --- a/programs/winhlp32/winhelp.c +++ b/programs/winhlp32/winhelp.c @@ -595,7 +595,7 @@ static void WINHELP_RememberPage(WINHELP_WINDOW* win, WINHELP_WNDPAGE* wpage) if (!Globals.history.index || Globals.history.set[0].page != wpage->page) { - num = sizeof(Globals.history.set) / sizeof(Globals.history.set[0]); + num = ARRAY_SIZE(Globals.history.set); /* we're full, remove latest entry */ if (Globals.history.index == num) { @@ -610,7 +610,7 @@ static void WINHELP_RememberPage(WINHELP_WINDOW* win, WINHELP_WNDPAGE* wpage) } if (win->hHistoryWnd) InvalidateRect(win->hHistoryWnd, NULL, TRUE); - num = sizeof(win->back.set) / sizeof(win->back.set[0]); + num = ARRAY_SIZE(win->back.set); if (win->back.index == num) { /* we're full, remove latest entry */ @@ -1136,7 +1136,7 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara GetWindowRect(hWnd, &r); r.right = r.left + 30 * tm.tmAveCharWidth; - r.bottom = r.top + (sizeof(Globals.history.set) / sizeof(Globals.history.set[0])) * tm.tmHeight; + r.bottom = r.top + ARRAY_SIZE(Globals.history.set) * tm.tmHeight; AdjustWindowRect(&r, GetWindowLongW(hWnd, GWL_STYLE), FALSE); if (r.left < 0) {r.right -= r.left; r.left = 0;} if (r.top < 0) {r.bottom -= r.top; r.top = 0;} -- 2.14.4

1 0

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

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 0013b04cee..a81a5c7638 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1807,7 +1807,7 @@ static BOOL GetLinkLocation( LPCWSTR linkfile, DWORD *loc, char **relative ) WINE_TRACE("%s\n", wine_dbgstr_w(filename)); - for( i=0; i<sizeof(locations)/sizeof(locations[0]); i++ ) + for( i=0; i<ARRAY_SIZE( locations ); i++ ) { if (!SHGetSpecialFolderPathW( 0, buffer, locations[i], FALSE )) continue; -- 2.14.4

1 0

[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

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

07 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 2/2] wbemprox: Add support for Win32_PnPEntity table
by Andrew Eikum 07 Aug '18

07 Aug '18

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/wbemprox/Makefile.in | 2 +- dlls/wbemprox/builtin.c | 59 +++++++++++++++++++++++++++++++++++++ dlls/wbemprox/tests/query.c | 51 ++++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index f411898dcd..a86893a45c 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,5 +1,5 @@ MODULE = wbemprox.dll -IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4 +IMPORTS = winspool version iphlpapi dxgi oleaut32 ole32 advapi32 user32 gdi32 ws2_32 rpcrt4 setupapi C_SRCS = \ builtin.c \ diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 73f4192779..2c472edeec 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -58,6 +58,7 @@ #include "sddl.h" #include "ntsecapi.h" #include "winspool.h" +#include "setupapi.h" #include "wine/debug.h" #include "wbemprox_private.h" @@ -103,6 +104,8 @@ static const WCHAR class_physicalmediaW[] = {'W','i','n','3','2','_','P','h','y','s','i','c','a','l','M','e','d','i','a',0}; static const WCHAR class_physicalmemoryW[] = {'W','i','n','3','2','_','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; +static const WCHAR class_pnpentityW[] = + {'W','i','n','3','2','_','P','n','P','E','n','t','i','t','y',0}; static const WCHAR class_printerW[] = {'W','i','n','3','2','_','P','r','i','n','t','e','r',0}; static const WCHAR class_process_getowner_outW[] = @@ -605,6 +608,10 @@ static const struct column col_physicalmemory[] = { prop_capacityW, CIM_UINT64 }, { prop_memorytypeW, CIM_UINT16, VT_I4 } }; +static const struct column col_pnpentity[] = +{ + { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC }, +}; static const struct column col_printer[] = { { prop_attributesW, CIM_UINT32 }, @@ -1022,6 +1029,10 @@ struct record_physicalmemory UINT64 capacity; UINT16 memorytype; }; +struct record_pnpentity +{ + const WCHAR *device_id; +}; struct record_printer { UINT32 attributes; @@ -2513,6 +2524,53 @@ static enum fill_status fill_physicalmemory( struct table *table, const struct e return status; } +static enum fill_status fill_pnpentity( struct table *table, const struct expr *cond ) +{ + struct record_pnpentity *rec; + enum fill_status status = FILL_STATUS_UNFILTERED; + HDEVINFO device_info_set; + SP_DEVINFO_DATA devinfo = {0}; + DWORD idx; + + device_info_set = SetupDiGetClassDevsW( NULL, NULL, NULL, DIGCF_ALLCLASSES|DIGCF_PRESENT ); + + devinfo.cbSize = sizeof(devinfo); + + idx = 0; + while (SetupDiEnumDeviceInfo( device_info_set, idx++, &devinfo )) + { + /* noop */ + } + + resize_table( table, idx, sizeof(*rec) ); + table->num_rows = 0; + rec = (struct record_pnpentity *)table->data; + + idx = 0; + while (SetupDiEnumDeviceInfo( device_info_set, idx++, &devinfo )) + { + WCHAR device_id[MAX_PATH]; + if (SetupDiGetDeviceInstanceIdW( device_info_set, &devinfo, device_id, + ARRAY_SIZE(device_id), NULL )) + { + rec->device_id = heap_strdupW( device_id ); + + table->num_rows++; + if (!match_row( table, table->num_rows - 1, cond, &status )) + { + free_row_values( table, table->num_rows - 1 ); + table->num_rows--; + } + else + rec++; + } + } + + SetupDiDestroyDeviceInfoList( device_info_set ); + + return status; +} + static enum fill_status fill_printer( struct table *table, const struct expr *cond ) { static const WCHAR fmtW[] = {'P','r','i','n','t','e','r','%','d',0}; @@ -3382,6 +3440,7 @@ static struct table builtin_classes[] = { class_paramsW, SIZEOF(col_param), col_param, SIZEOF(data_param), 0, (BYTE *)data_param }, { class_physicalmediaW, SIZEOF(col_physicalmedia), col_physicalmedia, SIZEOF(data_physicalmedia), 0, (BYTE *)data_physicalmedia }, { class_physicalmemoryW, SIZEOF(col_physicalmemory), col_physicalmemory, 0, 0, NULL, fill_physicalmemory }, + { class_pnpentityW, SIZEOF(col_pnpentity), col_pnpentity, 0, 0, NULL, fill_pnpentity }, { class_printerW, SIZEOF(col_printer), col_printer, 0, 0, NULL, fill_printer }, { class_processW, SIZEOF(col_process), col_process, 0, 0, NULL, fill_process }, { class_processorW, SIZEOF(col_processor), col_processor, 0, 0, NULL, fill_processor }, diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 87b42daeca..39b6ba9c95 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1709,6 +1709,56 @@ static void test_Win32_Printer( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_PnPEntity( IWbemServices *services ) +{ + HRESULT hr; + IEnumWbemClassObject *enm; + IWbemClassObject *obj; + VARIANT val; + CIMTYPE type; + ULONG count, i; + BSTR bstr; + + static WCHAR win32_pnpentityW[] = {'W','i','n','3','2','_','P','n','P','E','n','t','i','t','y',0}; + static const WCHAR deviceidW[] = {'D','e','v','i','c','e','I','d',0}; + + bstr = SysAllocString( win32_pnpentityW ); + + hr = IWbemServices_CreateInstanceEnum( services, bstr, 0, NULL, &enm ); + ok( hr == S_OK, "got %08x\n", hr ); + + SysFreeString( bstr ); + bstr = SysAllocString( deviceidW ); + + while (1) + { + hr = IEnumWbemClassObject_Next( enm, 1000, 1, &obj, &count ); + ok( (count == 1 && (hr == WBEM_S_FALSE || hr == WBEM_S_NO_ERROR)) || + (count == 0 && (hr == WBEM_S_FALSE || hr == WBEM_S_TIMEDOUT)), + "got %08x with %u objects returned\n", hr, count ); + + if (count == 0) + break; + + for (i = 0; i < count; ++i) + { + hr = IWbemClassObject_Get( obj, bstr, 0, &val, &type, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + if (SUCCEEDED( hr )) + { + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_STRING, "unexpected type 0x%x\n", type ); + VariantClear( &val ); + } + } + } + + SysFreeString( bstr ); + + IEnumWbemClassObject_Release( enm ); +} + START_TEST(query) { static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0}; @@ -1753,6 +1803,7 @@ START_TEST(query) test_Win32_Processor( services ); test_Win32_VideoController( services ); test_Win32_Printer( services ); + test_Win32_PnPEntity( services ); SysFreeString( path ); IWbemServices_Release( services ); -- 2.18.0

2 1

[PATCH 1/2] wbemprox/tests: Don't crash on VirtualBox
by Andrew Eikum 07 Aug '18

07 Aug '18

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/wbemprox/tests/query.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index cb911d7927..87b42daeca 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1368,25 +1368,28 @@ static void test_Win32_PhysicalMemory( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); ok( hr == S_OK, "got %08x\n", hr ); - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, capacityW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get capacity %08x\n", hr ); - ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT64, "unexpected type 0x%x\n", type ); - trace( "capacity %s\n", wine_dbgstr_w(V_BSTR( &val )) ); - VariantClear( &val ); + if (count > 0) + { + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, capacityW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get capacity %08x\n", hr ); + ok( V_VT( &val ) == VT_BSTR, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT64, "unexpected type 0x%x\n", type ); + trace( "capacity %s\n", wine_dbgstr_w(V_BSTR( &val )) ); + VariantClear( &val ); - type = 0xdeadbeef; - VariantInit( &val ); - hr = IWbemClassObject_Get( obj, memorytypeW, 0, &val, &type, NULL ); - ok( hr == S_OK, "failed to get memory type %08x\n", hr ); - ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); - ok( type == CIM_UINT16, "unexpected type 0x%x\n", type ); - trace( "memorytype %u\n", V_I4( &val ) ); - VariantClear( &val ); + type = 0xdeadbeef; + VariantInit( &val ); + hr = IWbemClassObject_Get( obj, memorytypeW, 0, &val, &type, NULL ); + ok( hr == S_OK, "failed to get memory type %08x\n", hr ); + ok( V_VT( &val ) == VT_I4, "unexpected variant type 0x%x\n", V_VT( &val ) ); + ok( type == CIM_UINT16, "unexpected type 0x%x\n", type ); + trace( "memorytype %u\n", V_I4( &val ) ); + VariantClear( &val ); - IWbemClassObject_Release( obj ); + IWbemClassObject_Release( obj ); + } IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql ); -- 2.18.0

2 1

[PATCH 2/2] wbemprox: Add Win32_NetworkAdapterConfiguration::IPSubnet property.
by Piotr Caban 07 Aug '18

07 Aug '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+)

2 1

[PATCH 1/2] wbemprox: Add Win32_NetworkAdapterConfiguration::IPAddress property.
by Piotr Caban 07 Aug '18

07 Aug '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)

2 1

[PATCH] msi: Avoid an ARRAY_SIZE-like macro
by Michael Stefaniuc 07 Aug '18

07 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/dialog.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 1e78aa9e39..b96c44be44 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3472,8 +3472,6 @@ static const struct control_handler msi_dialog_handler[] = { szHyperLink, msi_dialog_hyperlink } }; -#define NUM_CONTROL_TYPES (sizeof msi_dialog_handler/sizeof msi_dialog_handler[0]) - static UINT msi_dialog_create_controls( MSIRECORD *rec, LPVOID param ) { msi_dialog *dialog = param; @@ -3482,10 +3480,10 @@ static UINT msi_dialog_create_controls( MSIRECORD *rec, LPVOID param ) /* find and call the function that can create this type of control */ control_type = MSI_RecordGetString( rec, 3 ); - for( i=0; i<NUM_CONTROL_TYPES; i++ ) + for( i = 0; i < ARRAY_SIZE( msi_dialog_handler ); i++ ) if (!strcmpiW( msi_dialog_handler[i].control_type, control_type )) break; - if( i != NUM_CONTROL_TYPES ) + if( i != ARRAY_SIZE( msi_dialog_handler )) msi_dialog_handler[i].func( dialog, rec ); else ERR("no handler for element type %s\n", debugstr_w(control_type)); -- 2.14.4

2 1

[PATCH] msi: Generate unique names for 32- and 64-bit custom action server pipes.
by Zebediah Figura 07 Aug '18

07 Aug '18

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Observed with the Microsoft Office 2010 installer. Probably also fixes bugs 45483, 45509, and 45537. dlls/msi/custom.c | 6 ++++-- programs/msiexec/msiexec.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 1a8a982..51755f2 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -590,7 +590,7 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) { - static const WCHAR pipe_name[] = {'\\','\\','.','\\','p','i','p','e','\\','m','s','i','c','a','_','%','x',0}; + static const WCHAR pipe_name[] = {'\\','\\','.','\\','p','i','p','e','\\','m','s','i','c','a','_','%','x','_','%','d',0}; static const WCHAR msiexecW[] = {'\\','m','s','i','e','x','e','c','.','e','x','e',0}; static const WCHAR argsW[] = {'%','s',' ','-','E','m','b','e','d','d','i','n','g',' ','%','d',0}; @@ -606,9 +606,11 @@ static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) (arch == SCS_64BIT_BINARY && package->custom_server_64_process)) return ERROR_SUCCESS; - sprintfW(buffer, pipe_name, GetCurrentProcessId()); + sprintfW(buffer, pipe_name, GetCurrentProcessId(), arch == SCS_32BIT_BINARY ? 32 : 64); pipe = CreateNamedPipeW(buffer, PIPE_ACCESS_DUPLEX, 0, 1, sizeof(DWORD64), sizeof(GUID), 0, NULL); + if (pipe == INVALID_HANDLE_VALUE) + ERR("Failed to create custom action client pipe: %u\n", GetLastError()); if (sizeof(void *) == 8 && arch == SCS_32BIT_BINARY) GetSystemWow64DirectoryW(path, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 5a471a2..c5f9979 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -406,7 +406,7 @@ static DWORD CALLBACK custom_action_thread(void *arg) static int custom_action_server(const WCHAR *arg) { - static const WCHAR pipe_name[] = {'\\','\\','.','\\','p','i','p','e','\\','m','s','i','c','a','_','%','x',0}; + static const WCHAR pipe_name[] = {'\\','\\','.','\\','p','i','p','e','\\','m','s','i','c','a','_','%','x','_','%','d',0}; DWORD client_pid = atoiW(arg); DWORD64 thread64; WCHAR buffer[24]; @@ -423,7 +423,7 @@ static int custom_action_server(const WCHAR *arg) return 1; } - sprintfW(buffer, pipe_name, client_pid); + sprintfW(buffer, pipe_name, client_pid, sizeof(void *) * 8); pipe = CreateFileW(buffer, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); if (pipe == INVALID_HANDLE_VALUE) { -- 2.7.4

2 1

[PATCH resend] msi: Implement deferral for standard and custom actions.
by Zebediah Figura 07 Aug '18

07 Aug '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Resent now that bug 45317 is fixed. dlls/msi/action.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/msi/assembly.c | 6 ++++ dlls/msi/classes.c | 24 +++++++++++++ dlls/msi/custom.c | 1 + dlls/msi/files.c | 18 ++++++++++ dlls/msi/font.c | 6 ++++ dlls/msi/msipriv.h | 1 + dlls/msi/tests/custom.c | 70 +------------------------------------ dlls/msi/tests/install.c | 1 - 9 files changed, 143 insertions(+), 73 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 15f1876..bc18982 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -105,8 +105,6 @@ static const WCHAR szIsolateComponents[] = {'I','s','o','l','a','t','e','C','o','m','p','o','n','e','n','t','s',0}; static const WCHAR szMigrateFeatureStates[] = {'M','i','g','r','a','t','e','F','e','a','t','u','r','e','S','t','a','t','e','s',0}; -static const WCHAR szMsiUnpublishAssemblies[] = - {'M','s','i','U','n','p','u','b','l','i','s','h','A','s','s','e','m','b','l','i','e','s',0}; static const WCHAR szInstallODBC[] = {'I','n','s','t','a','l','l','O','D','B','C',0}; static const WCHAR szInstallServices[] = @@ -858,6 +856,9 @@ static UINT ACTION_CreateFolders(MSIPACKAGE *package) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szCreateFolders); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -937,6 +938,9 @@ static UINT ACTION_RemoveFolders( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRemoveFolders); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -3011,6 +3015,9 @@ static UINT ACTION_WriteRegistryValues(MSIPACKAGE *package) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szWriteRegistryValues); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -3245,6 +3252,9 @@ static UINT ACTION_RemoveRegistryValues( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRemoveRegistryValues); + rc = MSI_DatabaseOpenViewW( package->db, registry_query, &view ); if (rc == ERROR_SUCCESS) { @@ -3563,9 +3573,13 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) TRACE("\n"); - squash_guid( package->ProductCode, squashed_pc ); msi_set_sourcedir_props(package, FALSE); + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szProcessComponents); + + squash_guid( package->ProductCode, squashed_pc ); + LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) { MSIRECORD *uirow; @@ -3839,6 +3853,9 @@ static UINT ACTION_RegisterTypeLibraries(MSIPACKAGE *package) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRegisterTypeLibraries); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -3900,6 +3917,9 @@ static UINT ACTION_UnregisterTypeLibraries( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szUnregisterTypeLibraries); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -4084,6 +4104,9 @@ static UINT ACTION_CreateShortcuts(MSIPACKAGE *package) HRESULT res; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szCreateShortcuts); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -4137,6 +4160,9 @@ static UINT ACTION_RemoveShortcuts( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRemoveShortcuts); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -4509,6 +4535,9 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) MSIRECORD *uirow; BOOL republish = FALSE; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szPublishProduct); + if (!list_empty(&package->patches)) { rc = msi_publish_patches(package); @@ -4706,6 +4735,9 @@ static UINT ACTION_WriteIniValues(MSIPACKAGE *package) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szWriteIniValues); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -4849,6 +4881,9 @@ static UINT ACTION_RemoveIniValues( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRemoveIniValues); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc == ERROR_SUCCESS) { @@ -4934,6 +4969,9 @@ static UINT ACTION_SelfRegModules(MSIPACKAGE *package) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szSelfRegModules); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -4984,6 +5022,9 @@ static UINT ACTION_SelfUnregModules( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szSelfUnregModules); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -4999,6 +5040,9 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) UINT rc; HKEY hkey = NULL, userdata = NULL; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szPublishFeatures); + if (!msi_check_publish(package)) return ERROR_SUCCESS; @@ -5139,6 +5183,9 @@ static UINT ACTION_UnpublishFeatures(MSIPACKAGE *package) { MSIFEATURE *feature; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szUnpublishFeatures); + if (!msi_check_unpublish(package)) return ERROR_SUCCESS; @@ -5291,6 +5338,9 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) HKEY hkey, props, upgrade_key; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRegisterProduct); + /* FIXME: also need to publish if the product is in advertise mode */ if (!msi_get_property_int( package->db, szProductToBeRegistered, 0 ) && !msi_check_publish(package)) @@ -5609,6 +5659,9 @@ static UINT ACTION_RegisterUser(MSIPACKAGE *package) {0}, }; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRegisterUser); + if (msi_check_unpublish(package)) { MSIREG_DeleteUserDataProductKey(package->ProductCode, package->Context); @@ -5931,6 +5984,9 @@ static UINT ACTION_PublishComponents(MSIPACKAGE *package) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szPublishComponents); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -6003,6 +6059,9 @@ static UINT ACTION_UnpublishComponents( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szUnpublishComponents); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -6151,6 +6210,9 @@ static UINT ACTION_InstallServices( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szInstallServices); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -6322,6 +6384,9 @@ static UINT ACTION_StartServices( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szStartServices); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -6485,6 +6550,9 @@ static UINT ACTION_StopServices( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szStopServices); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -6568,6 +6636,9 @@ static UINT ACTION_DeleteServices( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szDeleteServices); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -6838,6 +6909,9 @@ static UINT ACTION_InstallODBC( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szInstallODBC); + rc = MSI_DatabaseOpenViewW(package->db, driver_query, &view); if (rc == ERROR_SUCCESS) { @@ -7016,6 +7090,9 @@ static UINT ACTION_RemoveODBC( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRemoveODBC); + rc = MSI_DatabaseOpenViewW( package->db, driver_query, &view ); if (rc == ERROR_SUCCESS) { @@ -7362,6 +7439,9 @@ static UINT ACTION_WriteEnvironmentStrings( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szWriteEnvironmentStrings); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -7504,6 +7584,9 @@ static UINT ACTION_RemoveEnvironmentStrings( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRemoveEnvironmentStrings); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index bccd114..59fd332 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -652,6 +652,9 @@ UINT ACTION_MsiPublishAssemblies( MSIPACKAGE *package ) { MSICOMPONENT *comp; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szMsiPublishAssemblies); + LIST_FOR_EACH_ENTRY(comp, &package->components, MSICOMPONENT, entry) { LONG res; @@ -717,6 +720,9 @@ UINT ACTION_MsiUnpublishAssemblies( MSIPACKAGE *package ) { MSICOMPONENT *comp; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szMsiUnpublishAssemblies); + LIST_FOR_EACH_ENTRY(comp, &package->components, MSICOMPONENT, entry) { LONG res; diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 60cc3c1..293aa10 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -753,6 +753,9 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) MSICLASS *cls; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRegisterClassInfo); + r = load_classes_and_such( package ); if (r != ERROR_SUCCESS) return r; @@ -918,6 +921,9 @@ UINT ACTION_UnregisterClassInfo( MSIPACKAGE *package ) HKEY hkey, hkey2; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szUnregisterClassInfo); + r = load_classes_and_such( package ); if (r != ERROR_SUCCESS) return r; @@ -1083,6 +1089,9 @@ UINT ACTION_RegisterProgIdInfo(MSIPACKAGE *package) MSIRECORD *uirow; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRegisterProgIdInfo); + r = load_classes_and_such( package ); if (r != ERROR_SUCCESS) return r; @@ -1143,6 +1152,9 @@ UINT ACTION_UnregisterProgIdInfo( MSIPACKAGE *package ) LONG res; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szUnregisterProgIdInfo); + r = load_classes_and_such( package ); if (r != ERROR_SUCCESS) return r; @@ -1255,6 +1267,9 @@ UINT ACTION_RegisterExtensionInfo(MSIPACKAGE *package) LONG res; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRegisterExtensionInfo); + r = load_classes_and_such( package ); if (r != ERROR_SUCCESS) return r; @@ -1363,6 +1378,9 @@ UINT ACTION_UnregisterExtensionInfo( MSIPACKAGE *package ) LONG res; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szUnregisterExtensionInfo); + r = load_classes_and_such( package ); if (r != ERROR_SUCCESS) return r; @@ -1446,6 +1464,9 @@ UINT ACTION_RegisterMIMEInfo(MSIPACKAGE *package) MSIMIME *mt; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRegisterMIMEInfo); + r = load_classes_and_such( package ); if (r != ERROR_SUCCESS) return r; @@ -1500,6 +1521,9 @@ UINT ACTION_UnregisterMIMEInfo( MSIPACKAGE *package ) MSIMIME *mime; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szUnregisterMIMEInfo); + r = load_classes_and_such( package ); if (r != ERROR_SUCCESS) return r; diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 1a8a982..66f9dca 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1246,6 +1246,7 @@ static BOOL action_type_matches_script( UINT type, UINT script ) switch (script) { case SCRIPT_NONE: + return FALSE; case SCRIPT_INSTALL: return !(type & msidbCustomActionTypeCommit) && !(type & msidbCustomActionTypeRollback); case SCRIPT_COMMIT: diff --git a/dlls/msi/files.c b/dlls/msi/files.c index f6cf3e7..5a88c14 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -359,6 +359,9 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) msi_set_sourcedir_props(package, FALSE); + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szInstallFiles); + schedule_install_files(package); mi = msi_alloc_zero( sizeof(MSIMEDIAINFO) ); @@ -584,6 +587,9 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) TRACE("%p\n", package); + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szPatchFiles); + mi = msi_alloc_zero( sizeof(MSIMEDIAINFO) ); TRACE("extracting files\n"); @@ -1002,6 +1008,9 @@ UINT ACTION_MoveFiles( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szMoveFiles); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -1134,6 +1143,9 @@ UINT ACTION_DuplicateFiles(MSIPACKAGE *package) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szDuplicateFiles); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -1210,6 +1222,9 @@ UINT ACTION_RemoveDuplicateFiles( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRemoveDuplicateFiles); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -1350,6 +1365,9 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) MSIFILE *file; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRemoveFiles); + r = MSI_DatabaseOpenViewW(package->db, query, &view); if (r == ERROR_SUCCESS) { diff --git a/dlls/msi/font.c b/dlls/msi/font.c index 5c1e59d..fc05006 100644 --- a/dlls/msi/font.c +++ b/dlls/msi/font.c @@ -294,6 +294,9 @@ UINT ACTION_RegisterFonts(MSIPACKAGE *package) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRegisterFonts); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -374,6 +377,9 @@ UINT ACTION_UnregisterFonts( MSIPACKAGE *package ) MSIQUERY *view; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szUnregisterFonts); + r = MSI_DatabaseOpenViewW( package->db, query, &view ); if (r != ERROR_SUCCESS) return ERROR_SUCCESS; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 7a65e1a..34bc490 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1190,6 +1190,7 @@ static const WCHAR szWow6432NodeCLSID[] = {'W','o','w','6','4','3','2','N','o',' static const WCHAR szStreams[] = {'_','S','t','r','e','a','m','s',0}; static const WCHAR szStorages[] = {'_','S','t','o','r','a','g','e','s',0}; static const WCHAR szMsiPublishAssemblies[] = {'M','s','i','P','u','b','l','i','s','h','A','s','s','e','m','b','l','i','e','s',0}; +static const WCHAR szMsiUnpublishAssemblies[] = {'M','s','i','U','n','p','u','b','l','i','s','h','A','s','s','e','m','b','l','i','e','s',0}; static const WCHAR szCostingComplete[] = {'C','o','s','t','i','n','g','C','o','m','p','l','e','t','e',0}; static const WCHAR szTempFolder[] = {'T','e','m','p','F','o','l','d','e','r',0}; static const WCHAR szDatabase[] = {'D','A','T','A','B','A','S','E',0}; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 59a69ee..3989ca8 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1182,52 +1182,42 @@ static BOOL pf_exists(const char *file) UINT WINAPI cf_present(MSIHANDLE hinst) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, pf_exists("msitest\\first"), "folder absent\n"); ok(hinst, pf_exists("msitest\\second"), "folder absent\n"); ok(hinst, pf_exists("msitest\\third"), "folder absent\n"); -} return ERROR_SUCCESS; } UINT WINAPI cf_absent(MSIHANDLE hinst) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, !pf_exists("msitest\\first"), "folder present\n"); ok(hinst, !pf_exists("msitest\\second"), "folder present\n"); ok(hinst, !pf_exists("msitest\\third"), "folder present\n"); -} return ERROR_SUCCESS; } UINT WINAPI file_present(MSIHANDLE hinst) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, pf_exists("msitest\\first\\one.txt"), "file absent\n"); ok(hinst, pf_exists("msitest\\second\\two.txt"), "file absent\n"); -} return ERROR_SUCCESS; } UINT WINAPI file_absent(MSIHANDLE hinst) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, !pf_exists("msitest\\first\\one.txt"), "file present\n"); ok(hinst, !pf_exists("msitest\\second\\two.txt"), "file present\n"); -} return ERROR_SUCCESS; } UINT WINAPI crs_present(MSIHANDLE hinst) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, pf_exists("msitest\\shortcut.lnk"), "shortcut absent\n"); return ERROR_SUCCESS; } UINT WINAPI crs_absent(MSIHANDLE hinst) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, !pf_exists("msitest\\shortcut.lnk"), "shortcut present\n"); return ERROR_SUCCESS; } @@ -1237,7 +1227,6 @@ UINT WINAPI sds_present(MSIHANDLE hinst) SC_HANDLE manager, service; manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); service = OpenServiceA(manager, "TestService3", GENERIC_ALL); -todo_wine ok(hinst, !!service, "service absent: %u\n", GetLastError()); CloseServiceHandle(service); CloseServiceHandle(manager); @@ -1271,7 +1260,6 @@ UINT WINAPI sis_absent(MSIHANDLE hinst) SC_HANDLE manager, service; manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); service = OpenServiceA(manager, "TestService", GENERIC_ALL); -todo_wine ok(hinst, !service, "service present\n"); if (service) CloseServiceHandle(service); CloseServiceHandle(manager); @@ -1288,7 +1276,6 @@ UINT WINAPI sss_started(MSIHANDLE hinst) service = OpenServiceA(manager, "Spooler", SC_MANAGER_ALL_ACCESS); ret = QueryServiceStatus(service, &status); ok(hinst, ret, "QueryServiceStatus failed: %u\n", GetLastError()); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, status.dwCurrentState == SERVICE_RUNNING, "got %u\n", status.dwCurrentState); CloseServiceHandle(service); @@ -1315,10 +1302,8 @@ UINT WINAPI sss_stopped(MSIHANDLE hinst) UINT WINAPI rd_present(MSIHANDLE hinst) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, pf_exists("msitest\\original2.txt"), "file absent\n"); ok(hinst, pf_exists("msitest\\duplicate.txt"), "file absent\n"); -} ok(hinst, !pf_exists("msitest\\original3.txt"), "file present\n"); ok(hinst, !pf_exists("msitest\\duplicate2.txt"), "file present\n"); return ERROR_SUCCESS; @@ -1326,10 +1311,8 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { UINT WINAPI rd_absent(MSIHANDLE hinst) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, !pf_exists("msitest\\original2.txt"), "file present\n"); ok(hinst, !pf_exists("msitest\\duplicate.txt"), "file present\n"); -} ok(hinst, !pf_exists("msitest\\original3.txt"), "file present\n"); ok(hinst, !pf_exists("msitest\\duplicate2.txt"), "file present\n"); return ERROR_SUCCESS; @@ -1352,10 +1335,8 @@ UINT WINAPI odbc_present(MSIHANDLE hinst) if (!strcmp(p, "ODBC test driver2")) gotdriver2 = 1; } -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, gotdriver, "driver absent\n"); ok(hinst, gotdriver2, "driver 2 absent\n"); -} return ERROR_SUCCESS; } @@ -1376,10 +1357,8 @@ UINT WINAPI odbc_absent(MSIHANDLE hinst) if (!strcmp(p, "ODBC test driver2")) gotdriver2 = 1; } -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, !gotdriver, "driver present\n"); ok(hinst, !gotdriver2, "driver 2 present\n"); -} return ERROR_SUCCESS; } @@ -1392,10 +1371,8 @@ UINT WINAPI mov_present(MSIHANDLE hinst) UINT WINAPI mov_absent(MSIHANDLE hinst) { -todo_wine { ok(hinst, !pf_exists("msitest\\canada"), "file present\n"); ok(hinst, !pf_exists("msitest\\dominica"), "file present\n"); -} return ERROR_SUCCESS; } @@ -1429,9 +1406,7 @@ UINT WINAPI pa_present(MSIHANDLE hinst) res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &key); ok(hinst, !res, "got %d\n", res); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { check_reg_str(hinst, key, name_dotnet, "rcHQPHq?CA@Uv-XqMI1e>Z'q,T*76M@=YEg6My?~]"); -} RegCloseKey(key); return ERROR_SUCCESS; @@ -1446,9 +1421,7 @@ UINT WINAPI pa_absent(MSIHANDLE hinst) ok(hinst, !res || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); if (!res) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { check_reg_str(hinst, key, name_dotnet, NULL); -} RegCloseKey(key); } return ERROR_SUCCESS; @@ -1481,7 +1454,6 @@ UINT WINAPI ppc_absent(MSIHANDLE hinst) UINT r; r = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ppc_key, 0, KEY_QUERY_VALUE | KEY_WOW64_64KEY, &key); -todo_wine ok(hinst, r == ERROR_FILE_NOT_FOUND, "got %u\n", r); return ERROR_SUCCESS; } @@ -1493,12 +1465,10 @@ UINT WINAPI pub_present(MSIHANDLE hinst) HKEY key; LONG res; -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyA(HKEY_CURRENT_USER, pub_key, &key); ok(hinst, !res, "got %u\n", res); res = RegQueryValueExA(key, "english.txt", NULL, NULL, NULL, NULL); ok(hinst, !res, "got %u\n", res); -} RegCloseKey(key); return ERROR_SUCCESS; } @@ -1509,7 +1479,6 @@ UINT WINAPI pub_absent(MSIHANDLE hinst) LONG res; res = RegOpenKeyA(HKEY_CURRENT_USER, pub_key, &key); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); return ERROR_SUCCESS; } @@ -1523,7 +1492,6 @@ UINT WINAPI pf_present(MSIHANDLE hinst) HKEY key; LONG res; -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyExA(HKEY_CLASSES_ROOT, pf_classkey, 0, KEY_READ | KEY_WOW64_64KEY, &key); ok(hinst, !res, "got %u\n", res); check_reg_str(hinst, key, "feature", ""); @@ -1535,7 +1503,6 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { check_reg_str(hinst, key, "feature", "VGtfp^p+,?82@JU1j_KE"); check_reg_str(hinst, key, "montecristo", "VGtfp^p+,?82@JU1j_KE"); RegCloseKey(key); -} return ERROR_SUCCESS; } @@ -1546,11 +1513,9 @@ UINT WINAPI pf_absent(MSIHANDLE hinst) LONG res; res = RegOpenKeyExA(HKEY_CLASSES_ROOT, pf_classkey, 0, KEY_READ | KEY_WOW64_64KEY, &key); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, pf_userkey, 0, KEY_READ | KEY_WOW64_64KEY, &key); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); return ERROR_SUCCESS; @@ -1579,7 +1544,6 @@ UINT WINAPI pp_absent(MSIHANDLE hinst) LONG res; res = RegOpenKeyExA(HKEY_CLASSES_ROOT, pp_prodkey, 0, KEY_READ | KEY_WOW64_64KEY, &key); -todo_wine ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); return ERROR_SUCCESS; @@ -1590,7 +1554,6 @@ UINT WINAPI rci_present(MSIHANDLE hinst) HKEY key; LONG res; -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", 0, KEY_READ | KEY_WOW64_32KEY, &key); ok(hinst, !res, "got %u\n", res); @@ -1603,7 +1566,6 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyA(HKEY_CLASSES_ROOT, "AppID\\{CFCC3B38-E683-497D-9AB4-CB40AAFE307F}", &key); ok(hinst, !res, "got %u\n", res); RegCloseKey(key); -} return ERROR_SUCCESS; } @@ -1613,7 +1575,6 @@ UINT WINAPI rci_absent(MSIHANDLE hinst) HKEY key; LONG res; -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", 0, KEY_READ | KEY_WOW64_32KEY, &key); ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); @@ -1623,7 +1584,6 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyA(HKEY_CLASSES_ROOT, "AppID\\{CFCC3B38-E683-497D-9AB4-CB40AAFE307F}", &key); ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); -} return ERROR_SUCCESS; } @@ -1633,7 +1593,6 @@ UINT WINAPI rei_present(MSIHANDLE hinst) HKEY key; LONG res; -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyA(HKEY_CLASSES_ROOT, ".extension", &key); ok(hinst, !res, "got %u\n", res); RegCloseKey(key); @@ -1641,7 +1600,6 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Prog.Id.1\\shell\\Open\\command", &key); ok(hinst, !res, "got %u\n", res); RegCloseKey(key); -} return ERROR_SUCCESS; } @@ -1651,13 +1609,11 @@ UINT WINAPI rei_absent(MSIHANDLE hinst) HKEY key; LONG res; -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyA(HKEY_CLASSES_ROOT, ".extension", &key); ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Prog.Id.1\\shell\\Open\\command", &key); ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); -} return ERROR_SUCCESS; } @@ -1672,7 +1628,6 @@ UINT WINAPI font_present(MSIHANDLE hinst) res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, font_key, 0, KEY_QUERY_VALUE | KEY_WOW64_64KEY, &key); ok(hinst, !res, "got %u\n", res); res = RegQueryValueExA(key, "msi test font", NULL, NULL, NULL, NULL); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, !res, "got %u\n", res); RegCloseKey(key); @@ -1686,9 +1641,7 @@ UINT WINAPI font_absent(MSIHANDLE hinst) res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, font_key, 0, KEY_QUERY_VALUE | KEY_WOW64_64KEY, &key); ok(hinst, !res, "got %u\n", res); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { check_reg_str(hinst, key, "msi test font", NULL); -} RegCloseKey(key); return ERROR_SUCCESS; @@ -1700,7 +1653,6 @@ UINT WINAPI rmi_present(MSIHANDLE hinst) LONG res; res = RegOpenKeyA(HKEY_CLASSES_ROOT, "MIME\\Database\\Content Type\\mime/type", &key); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, !res, "got %u\n", res); return ERROR_SUCCESS; @@ -1712,7 +1664,6 @@ UINT WINAPI rmi_absent(MSIHANDLE hinst) LONG res; res = RegOpenKeyA(HKEY_CLASSES_ROOT, "MIME\\Database\\Content Type\\mime/type", &key); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); return ERROR_SUCCESS; @@ -1740,7 +1691,6 @@ UINT WINAPI rp_absent(MSIHANDLE hinst) LONG res; res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, rp_key, 0, KEY_READ | KEY_WOW64_32KEY, &key); -todo_wine ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); return ERROR_SUCCESS; @@ -1751,7 +1701,6 @@ UINT WINAPI rpi_present(MSIHANDLE hinst) HKEY key; LONG res; -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", 0, KEY_READ | KEY_WOW64_32KEY, &key); ok(hinst, !res, "got %u\n", res); @@ -1768,7 +1717,6 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.Class.2", &key); ok(hinst, !res, "got %u\n", res); RegCloseKey(key); -} return ERROR_SUCCESS; } @@ -1778,7 +1726,6 @@ UINT WINAPI rpi_absent(MSIHANDLE hinst) HKEY key; LONG res; -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", 0, KEY_READ | KEY_WOW64_32KEY, &key); ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); @@ -1791,7 +1738,6 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.Class.2", &key); ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); -} return ERROR_SUCCESS; } @@ -1818,7 +1764,6 @@ UINT WINAPI ru_absent(MSIHANDLE hinst) LONG res; res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ru_key, 0, KEY_READ | KEY_WOW64_64KEY, &key); -todo_wine ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); return ERROR_SUCCESS; @@ -1833,10 +1778,8 @@ UINT WINAPI tl_present(MSIHANDLE hinst) HRESULT hr; hr = LoadRegTypeLib(&LIBID_register_test, 7, 1, 0, &tlb); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, hr == S_OK, "got %#x\n", hr); - if (tlb) - ITypeLib_Release(tlb); + ITypeLib_Release(tlb); return ERROR_SUCCESS; } @@ -1847,7 +1790,6 @@ UINT WINAPI tl_absent(MSIHANDLE hinst) HRESULT hr; hr = LoadRegTypeLib(&LIBID_register_test, 7, 1, 0, &tlb); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, hr == TYPE_E_LIBNOTREGISTERED, "got %#x\n", hr); return ERROR_SUCCESS; @@ -1859,7 +1801,6 @@ UINT WINAPI sr_present(MSIHANDLE hinst) LONG res; res = RegOpenKeyA(HKEY_CLASSES_ROOT, "selfreg_test", &key); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, !res, "got %u\n", res); RegCloseKey(key); @@ -1872,7 +1813,6 @@ UINT WINAPI sr_absent(MSIHANDLE hinst) LONG res; res = RegOpenKeyA(HKEY_CLASSES_ROOT, "selfreg_test", &key); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); return ERROR_SUCCESS; @@ -1885,10 +1825,8 @@ UINT WINAPI env_present(MSIHANDLE hinst) res = RegOpenKeyA(HKEY_CURRENT_USER, "Environment", &key); ok(hinst, !res, "got %u\n", res); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { check_reg_str(hinst, key, "MSITESTVAR3", "1"); check_reg_str(hinst, key, "MSITESTVAR4", "1"); -} RegCloseKey(key); return ERROR_SUCCESS; @@ -1901,10 +1839,8 @@ UINT WINAPI env_absent(MSIHANDLE hinst) res = RegOpenKeyA(HKEY_CURRENT_USER, "Environment", &key); ok(hinst, !res, "got %u\n", res); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { check_reg_str(hinst, key, "MSITESTVAR3", NULL); check_reg_str(hinst, key, "MSITESTVAR4", NULL); -} RegCloseKey(key); return ERROR_SUCCESS; @@ -1920,7 +1856,6 @@ UINT WINAPI ini_present(MSIHANDLE hinst) strcat(path, "\\msitest\\test.ini"); len = GetPrivateProfileStringA("section1", "key1", NULL, buf, sizeof(buf), path); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, len == 6, "got %u\n", len); return ERROR_SUCCESS; @@ -1936,7 +1871,6 @@ UINT WINAPI ini_absent(MSIHANDLE hinst) strcat(path, "\\msitest\\test.ini"); len = GetPrivateProfileStringA("section1", "key1", NULL, buf, sizeof(buf), path); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, !len, "got %u\n", len); return ERROR_SUCCESS; @@ -1949,7 +1883,6 @@ UINT WINAPI wrv_present(MSIHANDLE hinst) res = RegOpenKeyA(HKEY_CURRENT_USER, "msitest", &key); ok(hinst, !res, "got %u\n", res); - todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) check_reg_str(hinst, key, "sz", "string"); RegCloseKey(key); @@ -1963,7 +1896,6 @@ UINT WINAPI wrv_absent(MSIHANDLE hinst) res = RegOpenKeyA(HKEY_CURRENT_USER, "msitest", &key); ok(hinst, !res, "got %u\n", res); - todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) check_reg_str(hinst, key, "sz", NULL); RegCloseKey(key); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 80137c1..e147df6 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6086,7 +6086,6 @@ static void test_deferred_action(void) } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); -todo_wine check_file_matches(file, "onetwo"); ok(DeleteFileA(file), "Directory not created\n"); -- 2.7.4

3 2

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

07 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/msiexec/msiexec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 5a471a2184..47cef7e0fa 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -71,11 +71,11 @@ static void ShowUsage(int ExitCode) /* MsiGetFileVersion need the full path */ *filename = 0; - res = GetModuleFileNameW(hmsi, filename, sizeof(filename) / sizeof(filename[0])); + res = GetModuleFileNameW(hmsi, filename, ARRAY_SIZE(filename)); if (!res) WINE_ERR("GetModuleFileName failed: %d\n", GetLastError()); - len = sizeof(msiexec_version) / sizeof(msiexec_version[0]); + len = ARRAY_SIZE(msiexec_version); *msiexec_version = 0; res = MsiGetFileVersionW(filename, msiexec_version, &len, NULL, NULL); if (res) -- 2.14.4

2 1

[PATCH] msi: do not free hPackage twice or uninitialized (Coverity)
by Marcus Meissner 07 Aug '18

07 Aug '18

1438056 Uninitialized scalar variable Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> --- dlls/msi/custom.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 1a8a982e48..0d683d5a80 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -581,7 +581,6 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) FreeLibrary(hModule); - MsiCloseHandle(hPackage); midl_user_free(dll); midl_user_free(proc); -- 2.18.0

2 1

[PATCH] winex11: Remove redeclaration of VkXlibSurfaceCreateFlagsKHR.
by Józef Kucia 07 Aug '18

07 Aug '18

VkXlibSurfaceCreateFlagsKHR is also declared in wine/vulkan.h. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45554 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/winex11.drv/vulkan.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index f9eea74d1bde..5de855715f36 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -55,7 +55,6 @@ static CRITICAL_SECTION context_section = { &critsect_debug, -1, 0, 0, 0, 0 }; static XContext vulkan_hwnd_context; -typedef VkFlags VkXlibSurfaceCreateFlagsKHR; #define VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR 1000004000 struct wine_vk_surface -- 2.16.4

1 0

[PATCH 2/2] ntdll: Don't allow blocking on a critical section during process termination.
by Dmitry Timoshkov 07 Aug '18

07 Aug '18

As a result HeapLock() no longer blocks process termination since underlying implementation uses a critical section. However this should be considered as a minor side effect because applications shouldn't depend on this behaviour. This patch should fix the deadlocks observered during various .net setups, and it appears that this is what Windows does as well. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/loader.c | 4 +++- dlls/ntdll/critsection.c | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 46c09d41cb..e4d6741b6f 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2169,6 +2169,7 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) * doesn't call the DLL entry point on process detach either. */ HeapLock(GetProcessHeap()); +todo_wine ok(0, "dll_entry_point: process should already deadlock\n"); break; } @@ -3023,6 +3024,7 @@ static void test_ExitProcess(void) ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); ret = WaitForSingleObject(pi.hProcess, 5000); +todo_wine ok(ret == WAIT_TIMEOUT || broken(ret == WAIT_OBJECT_0) /* XP */, "child process should fail to terminate\n"); if (ret != WAIT_OBJECT_0) { @@ -3032,6 +3034,7 @@ static void test_ExitProcess(void) ret = WaitForSingleObject(pi.hProcess, 1000); ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); GetExitCodeProcess(pi.hProcess, &ret); +todo_wine ok(ret == 201 || broken(ret == 1) /* XP */, "expected exit code 201, got %u\n", ret); if (*child_failures) { @@ -3047,7 +3050,6 @@ static void test_ExitProcess(void) ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); ret = WaitForSingleObject(pi.hProcess, 5000); -todo_wine ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); if (ret != WAIT_OBJECT_0) { diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index e405b08a5a..42e432c8f6 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -436,6 +436,15 @@ NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) { LONGLONG timeout = NtCurrentTeb()->Peb->CriticalSectionTimeout.QuadPart / -10000000; + + /* Don't allow blocking on a critical section during process termination */ + if (RtlDllShutdownInProgress()) + { + WARN( "process %s is shutting down, returning STATUS_SUCCESS\n", + debugstr_w(NtCurrentTeb()->Peb->ProcessParameters->ImagePathName.Buffer) ); + return STATUS_SUCCESS; + } + for (;;) { EXCEPTION_RECORD rec; -- 2.17.1

2 1

[PATCH 1/2] kernel32/tests: Add a test for holding a critical section during process termination.
by Dmitry Timoshkov 07 Aug '18

07 Aug '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/loader.c | 67 +++++++++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 38ae3685dc..46c09d41cb 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2006,13 +2006,15 @@ static void test_import_resolution(void) #define MAX_COUNT 10 static HANDLE attached_thread[MAX_COUNT]; static DWORD attached_thread_count; -HANDLE stop_event, event, mutex, semaphore, loader_lock_event, peb_lock_event, heap_lock_event, ack_event; -static int test_dll_phase, inside_loader_lock, inside_peb_lock, inside_heap_lock; +static HANDLE event, mutex, semaphore; +static HANDLE stop_event, loader_lock_event, peb_lock_event, heap_lock_event, cs_lock_event, ack_event; +static CRITICAL_SECTION cs_lock; +static int test_dll_phase, inside_loader_lock, inside_peb_lock, inside_heap_lock, inside_cs_lock; static LONG fls_callback_count; static DWORD WINAPI mutex_thread_proc(void *param) { - HANDLE wait_list[4]; + HANDLE wait_list[5]; DWORD ret; ret = WaitForSingleObject(mutex, 0); @@ -2024,6 +2026,7 @@ static DWORD WINAPI mutex_thread_proc(void *param) wait_list[1] = loader_lock_event; wait_list[2] = peb_lock_event; wait_list[3] = heap_lock_event; + wait_list[4] = cs_lock_event; trace("%04x: mutex_thread_proc: starting\n", GetCurrentThreadId()); while (1) @@ -2053,6 +2056,13 @@ static DWORD WINAPI mutex_thread_proc(void *param) inside_heap_lock++; SetEvent(ack_event); } + else if (ret == WAIT_OBJECT_0 + 4) + { + trace("%04x: mutex_thread_proc: Entering CS lock\n", GetCurrentThreadId()); + EnterCriticalSection(&cs_lock); + inside_cs_lock++; + SetEvent(ack_event); + } } trace("%04x: mutex_thread_proc: exiting\n", GetCurrentThreadId()); @@ -2162,14 +2172,19 @@ static BOOL WINAPI dll_entry_point(HINSTANCE hinst, DWORD reason, LPVOID param) ok(0, "dll_entry_point: process should already deadlock\n"); break; } + else if (test_dll_phase == 7) + { + EnterCriticalSection(&cs_lock); + } - if (test_dll_phase == 0 || test_dll_phase == 1 || test_dll_phase == 3) + if (test_dll_phase == 0 || test_dll_phase == 1 || test_dll_phase == 3 || test_dll_phase == 7) ok(param != NULL, "dll: param %p\n", param); else ok(!param, "dll: param %p\n", param); if (test_dll_phase == 0 || test_dll_phase == 1) expected_code = 195; else if (test_dll_phase == 3) expected_code = 196; + else if (test_dll_phase == 7) expected_code = 199; else expected_code = STILL_ACTIVE; if (test_dll_phase == 3) @@ -2487,6 +2502,11 @@ static void child_process(const char *dll_name, DWORD target_offset) heap_lock_event = CreateEventW(NULL, FALSE, FALSE, NULL); ok(heap_lock_event != 0, "CreateEvent error %d\n", GetLastError()); + InitializeCriticalSection(&cs_lock); + SetLastError(0xdeadbeef); + cs_lock_event = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(cs_lock_event != 0, "CreateEvent error %d\n", GetLastError()); + SetLastError(0xdeadbeef); ack_event = CreateEventW(NULL, FALSE, FALSE, NULL); ok(ack_event != 0, "CreateEvent error %d\n", GetLastError()); @@ -2703,6 +2723,20 @@ static void child_process(const char *dll_name, DWORD target_offset) ok(0, "ExitProcess should not return\n"); break; + case 7: + trace("setting cs_lock_event\n"); + SetEvent(cs_lock_event); + WaitForSingleObject(ack_event, 1000); + ok(inside_cs_lock != 0, "inside_cs_lock is not set\n"); + + *child_failures = winetest_get_failures(); + + /* calling ExitProcess should not cause a deadlock */ + trace("call ExitProcess(199)\n"); + ExitProcess(199); + ok(0, "ExitProcess should not return\n"); + break; + default: assert(0); break; @@ -3007,6 +3041,31 @@ static void test_ExitProcess(void) CloseHandle(pi.hThread); CloseHandle(pi.hProcess); + /* phase 7 */ + *child_failures = -1; + sprintf(cmdline, "\"%s\" loader %s %u 7", argv[0], dll_name, target_offset); + ret = CreateProcessA(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); + ret = WaitForSingleObject(pi.hProcess, 5000); +todo_wine + ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); + if (ret != WAIT_OBJECT_0) + { + trace("terminating child process\n"); + TerminateProcess(pi.hProcess, 199); + } + ret = WaitForSingleObject(pi.hProcess, 1000); + ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); + GetExitCodeProcess(pi.hProcess, &ret); + ok(ret == 199, "expected exit code 199, got %u\n", ret); + if (*child_failures) + { + trace("%d failures in child process\n", *child_failures); + winetest_add_failures(*child_failures); + } + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + /* test remote process termination */ SetLastError(0xdeadbeef); ret = CreateProcessA(argv[0], NULL, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &si, &pi); -- 2.17.1

1 0

[PATCH v2 1/2] winex11.drv: optimise ChangeDisplaySettingsEx mode tests
by Rob Walker 06 Aug '18

06 Aug '18

Add pre-tests for the requested mode bpp and frequency. Fields: DM_PELSWIDTH , DM_PELSHEIGHT are re-tested in the testing loop multiple times. These fields must both be set and have already been tested before the loop. Signed-off-by: Rob Walker <bob.mt.wya(a)gmail.com> --- dlls/winex11.drv/settings.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index afa26cf543..b0164d5806 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -344,7 +344,7 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, { DWORD i, dwBpp = 0; DEVMODEW dm; - BOOL def_mode = TRUE; + BOOL def_mode = TRUE, test_bpp, test_frequency; TRACE("(%s,%p,%p,0x%08x,%p)\n",debugstr_w(devname),devmode,hwnd,flags,lpvoid); TRACE("flags=%s\n",_CDS_flags(flags)); @@ -387,29 +387,24 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, return DISP_CHANGE_BADMODE; } + test_bpp = devmode->dmFields & DM_BITSPERPEL; + test_frequency = (devmode->dmFields & DM_DISPLAYFREQUENCY) && + (devmode->dmDisplayFrequency != 0); for (i = 0; i < dd_mode_count; i++) { - if (devmode->dmFields & DM_BITSPERPEL) + if (devmode->dmPelsWidth != dd_modes[i].width) continue; + if (devmode->dmPelsHeight != dd_modes[i].height) continue; + if (test_bpp) { if (dwBpp != dd_modes[i].bpp) continue; } - if (devmode->dmFields & DM_PELSWIDTH) - { - if (devmode->dmPelsWidth != dd_modes[i].width) - continue; - } - if (devmode->dmFields & DM_PELSHEIGHT) - { - if (devmode->dmPelsHeight != dd_modes[i].height) - continue; - } - if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && (dd_modes[i].refresh_rate != 0) && - devmode->dmDisplayFrequency != 0) + if (test_frequency && (dd_modes[i].refresh_rate != 0)) { if (devmode->dmDisplayFrequency != dd_modes[i].refresh_rate) continue; } + /* we have a valid mode */ TRACE("Requested display settings match mode %d (%s)\n", i, handler_name); -- 2.18.0

2 2

[PATCH 1/2] winex11.drv: optimise mode tests in X11DRV_ChangeDisplaySettingsEx Fields: DM_PELSWIDTH , DM_PELSHEIGHT are re-tested in the mode testing loop multiple times. However these fields have already been tested before the loop. Add pre-tests for the requested mode bpp and frequency.
by Rob Walker 06 Aug '18

06 Aug '18

--- dlls/winex11.drv/settings.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index afa26cf543..b0164d5806 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -344,7 +344,7 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, { DWORD i, dwBpp = 0; DEVMODEW dm; - BOOL def_mode = TRUE; + BOOL def_mode = TRUE, test_bpp, test_frequency; TRACE("(%s,%p,%p,0x%08x,%p)\n",debugstr_w(devname),devmode,hwnd,flags,lpvoid); TRACE("flags=%s\n",_CDS_flags(flags)); @@ -387,29 +387,24 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, return DISP_CHANGE_BADMODE; } + test_bpp = devmode->dmFields & DM_BITSPERPEL; + test_frequency = (devmode->dmFields & DM_DISPLAYFREQUENCY) && + (devmode->dmDisplayFrequency != 0); for (i = 0; i < dd_mode_count; i++) { - if (devmode->dmFields & DM_BITSPERPEL) + if (devmode->dmPelsWidth != dd_modes[i].width) continue; + if (devmode->dmPelsHeight != dd_modes[i].height) continue; + if (test_bpp) { if (dwBpp != dd_modes[i].bpp) continue; } - if (devmode->dmFields & DM_PELSWIDTH) - { - if (devmode->dmPelsWidth != dd_modes[i].width) - continue; - } - if (devmode->dmFields & DM_PELSHEIGHT) - { - if (devmode->dmPelsHeight != dd_modes[i].height) - continue; - } - if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && (dd_modes[i].refresh_rate != 0) && - devmode->dmDisplayFrequency != 0) + if (test_frequency && (dd_modes[i].refresh_rate != 0)) { if (devmode->dmDisplayFrequency != dd_modes[i].refresh_rate) continue; } + /* we have a valid mode */ TRACE("Requested display settings match mode %d (%s)\n", i, handler_name); -- 2.18.0

3 3

[PATCH] dinput: Use vid/pid for first chunk of product guid on OSX, too
by Andrew Eikum 06 Aug '18

06 Aug '18

This is already done on the linux backends. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/dinput/joystick_osx.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index b0dcdd99d5..282b6c2790 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -932,18 +932,31 @@ static INT find_joystick_devices(void) return joystick_devices_count; } +static DWORD make_vid_pid(IOHIDDeviceRef device) +{ + long vendID, prodID; + + vendID = get_device_property_long(device, CFSTR(kIOHIDVendorIDKey)); + prodID = get_device_property_long(device, CFSTR(kIOHIDProductIDKey)); + + return MAKELONG(vendID, prodID); +} + static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINSTANCEA lpddi, DWORD version, int id) { + IOHIDDeviceRef device; + TRACE("dwDevType %u dwFlags 0x%08x version 0x%04x id %d\n", dwDevType, dwFlags, version, id); if (id >= find_joystick_devices()) return E_FAIL; + device = get_device_ref(id); + if ((dwDevType == 0) || ((dwDevType == DIDEVTYPE_JOYSTICK) && (version > 0x0300 && version < 0x0800)) || (((dwDevType == DI8DEVCLASS_GAMECTRL) || (dwDevType == DI8DEVTYPE_JOYSTICK)) && (version >= 0x0800))) { if (dwFlags & DIEDFL_FORCEFEEDBACK) { - IOHIDDeviceRef device = get_device_ref(id); if(!device) return S_FALSE; if(get_ff(device, NULL) != S_OK) @@ -953,6 +966,7 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS lpddi->guidInstance = DInput_Wine_OsX_Joystick_GUID; lpddi->guidInstance.Data3 = id; lpddi->guidProduct = DInput_Wine_OsX_Joystick_GUID; + lpddi->guidProduct.Data1 = make_vid_pid(device); /* we only support traditional joysticks for now */ if (version >= 0x0800) lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); @@ -993,6 +1007,7 @@ static HRESULT joydev_enum_deviceW(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS lpddi->guidInstance = DInput_Wine_OsX_Joystick_GUID; lpddi->guidInstance.Data3 = id; lpddi->guidProduct = DInput_Wine_OsX_Joystick_GUID; + lpddi->guidProduct.Data1 = make_vid_pid(device); /* we only support traditional joysticks for now */ if (version >= 0x0800) lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); @@ -1060,9 +1075,12 @@ static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, newDevice->id = index; + device = get_device_ref(index); + newDevice->generic.guidInstance = DInput_Wine_OsX_Joystick_GUID; newDevice->generic.guidInstance.Data3 = index; newDevice->generic.guidProduct = DInput_Wine_OsX_Joystick_GUID; + newDevice->generic.guidProduct.Data1 = make_vid_pid(device); newDevice->generic.joy_polldev = poll_osx_device_state; /* get the device name */ @@ -1074,7 +1092,6 @@ static HRESULT alloc_device(REFGUID rguid, IDirectInputImpl *dinput, strcpy(newDevice->generic.name, name); list_init(&newDevice->effects); - device = get_device_ref(index); if(get_ff(device, &newDevice->ff) == S_OK){ newDevice->generic.devcaps.dwFlags |= DIDC_FORCEFEEDBACK; -- 2.18.0

1 0

[PATCH] mscat.h: Add missing declarations.
by Jacek Caban 06 Aug '18

06 Aug '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mscat.h | 2 ++ 1 file changed, 2 insertions(+)

1 0

[PATCH v2] hidclass.sys: Unload all devices before unloading a minidriver
by Aric Stewart 06 Aug '18

06 Aug '18

v2: recomendations from Zhiyi Zhang Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hidclass.sys/hid.h | 8 ++++++++ dlls/hidclass.sys/main.c | 8 ++++++++ dlls/hidclass.sys/pnp.c | 35 +++++++++++++++++++++++++++++++---- 3 files changed, 47 insertions(+), 4 deletions(-)

1 0

[PATCH v7 1/2] riched20: Initialize style_list before ME_MakeFirstParagraph().
by Jactry Zeng 06 Aug '18

06 Aug '18

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/riched20/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 8020117fd2..12f1fa67c1 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3047,6 +3047,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->pBuffer = ME_MakeText(); ed->nZoomNumerator = ed->nZoomDenominator = 0; ed->nAvailWidth = 0; /* wrap to client area */ + list_init( &ed->style_list ); ME_MakeFirstParagraph(ed); /* The four cursors are for: * 0 - The position where the caret is shown @@ -3146,7 +3147,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->wheel_remain = 0; - list_init( &ed->style_list ); list_init( &ed->reobj_list ); OleInitialize(NULL); -- 2.18.0

1 0

[PATCH 1/5] [programs/cmd] Fix shortpath handling in for loops
by Jason Edmeades 05 Aug '18

05 Aug '18

Fixes todo in tests When 's' is used as a modifier, the paths that are presented to the other modifiers needs to be a short path. Given the 'filename' part of the path may not exist, we cannot use GetShortPathName directly without first removing the filename part to just leave the directory bit. Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> --- programs/cmd/batch.c | 17 +++++++++++++---- programs/cmd/tests/test_builtins.cmd.exp | 12 ++++++------ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 1a78b55557..e10baf852c 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -399,6 +399,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) WCHAR finaloutput[MAX_PATH]; WCHAR fullfilename[MAX_PATH]; WCHAR thisoutput[MAX_PATH]; + WCHAR *filepart = NULL; WCHAR *pos = *start+1; WCHAR *firstModifier = pos; WCHAR *lastModifier = NULL; @@ -522,7 +523,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) /* After this, we need full information on the file, which is valid not to exist. */ if (!skipFileParsing) { - if (GetFullPathNameW(outputparam, MAX_PATH, fullfilename, NULL) == 0) { + if (GetFullPathNameW(outputparam, MAX_PATH, fullfilename, &filepart) == 0) { exists = FALSE; fullfilename[0] = 0x00; } else { @@ -598,8 +599,16 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) /* 4. Handle 's' : Use short paths (File doesn't have to exist) */ if (memchrW(firstModifier, 's', modifierLen) != NULL) { if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); - /* Don't flag as doneModifier - %~s on its own is processed later */ - GetShortPathNameW(outputparam, outputparam, sizeof(outputparam)/sizeof(outputparam[0])); + + /* Convert fullfilename's path to a short path - Save filename away as + only path is valid, name may not exist which causes GetShortPathName + to fail if it is provided */ + if (filepart) { + strcpyW(thisoutput, filepart); + *filepart = 0x00; + GetShortPathNameW(fullfilename, fullfilename, sizeof(fullfilename)/sizeof(fullfilename[0])); + strcatW(fullfilename, thisoutput); + } } /* 5. Handle 'f' : Fully qualified path (File doesn't have to exist) */ @@ -673,7 +682,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) memchrW(firstModifier, 's', modifierLen) != NULL) { doneModifier = TRUE; if (finaloutput[0] != 0x00) strcatW(finaloutput, spaceW); - strcatW(finaloutput, outputparam); + strcatW(finaloutput, fullfilename); } } } diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 3118359265..b96d38ff0a 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -527,9 +527,9 @@ N '.OOL' '.TABC' '' -@todo_wine@'@drive@@shortpath@R S'@or_broken@'' -@todo_wine@'@drive@@shortpath@T'@or_broken@'' -@todo_wine@'@drive@@shortpath@ABCDEFGHIJK.LMNOP'@or_broken@'' +'@drive@@shortpath@R S'@or_broken@'' +'@drive@@shortpath@T'@or_broken@'' +'@drive@@shortpath@ABCDEFGHIJK.LMNOP'@or_broken@'' ''@or_broken@'%~ai' ''@or_broken@'%~ai' '--a------'@or_broken@'--a--------'@or_broken@'--a--c---'@or_broken@'%~ai' @@ -563,9 +563,9 @@ N '.OOL' '.TABC' '' -@todo_wine@'@drive@@shortpath@R S'@or_broken@'' -@todo_wine@'@drive@@shortpath@T'@or_broken@'' -@todo_wine@'@drive@@shortpath@ABCDEFGHIJK.LMNOP'@or_broken@'' +'@drive@@shortpath@R S'@or_broken@'' +'@drive@@shortpath@T'@or_broken@'' +'@drive@@shortpath@ABCDEFGHIJK.LMNOP'@or_broken@'' @drive@@path@ @drive@@path@ @drive@ -- 2.17.1

1 4

[PATCH] wininet: Always copy the password even if blank
by Alistair Leslie-Hughes 05 Aug '18

05 Aug '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wininet/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index c699c5b..5aaff9a 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5809,7 +5809,7 @@ DWORD HTTP_Connect(appinfo_t *hIC, LPCWSTR lpszServerName, session->hostName = heap_strdupW(lpszServerName); if (lpszUserName && lpszUserName[0]) session->userName = heap_strdupW(lpszUserName); - if (lpszPassword && lpszPassword[0]) + if (lpszPassword) session->password = heap_strdupW(lpszPassword); session->hostPort = serverPort; session->connect_timeout = hIC->connect_timeout; -- 1.9.1

1 0

[PATCH] hidclass.sys: Unload all devices before unloading a minidriver
by Aric Stewart 05 Aug '18

05 Aug '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hidclass.sys/hid.h | 8 ++++++++ dlls/hidclass.sys/main.c | 8 ++++++++ dlls/hidclass.sys/pnp.c | 35 +++++++++++++++++++++++++++++++---- 3 files changed, 47 insertions(+), 4 deletions(-)

2 1

[PATCH v2 3/3] iphlpapi: Improve parameter checking for IcmpSendEcho().
by Zhiyi Zhang 05 Aug '18

05 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/iphlpapi/icmp.c | 9 +++++++-- dlls/iphlpapi/tests/iphlpapi.c | 8 -------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index 159b7bef18..3e53bfd409 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -290,11 +290,16 @@ DWORD WINAPI IcmpSendEcho( if (IcmpHandle==INVALID_HANDLE_VALUE) { /* FIXME: in fact win98 seems to ignore the handle value !!! */ - SetLastError(ERROR_INVALID_HANDLE); + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + if (!ReplyBuffer||!ReplySize) { + SetLastError(ERROR_INVALID_PARAMETER); return 0; } - if (ReplySize<sizeof(ICMP_ECHO_REPLY)+ICMP_MINLEN) { + if (ReplySize<sizeof(ICMP_ECHO_REPLY)) { SetLastError(IP_BUF_TOO_SMALL); return 0; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index f964878d68..ff381c5e29 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -966,7 +966,6 @@ static void testIcmpSendEcho(void) ret = pIcmpSendEcho(INVALID_HANDLE_VALUE, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); -todo_wine ok (error == ERROR_INVALID_PARAMETER || broken(error == ERROR_INVALID_HANDLE) /* <= 2003 */, "expected 87, got %d\n", error); @@ -1009,20 +1008,16 @@ todo_wine error = GetLastError(); ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); - if (0) /* crashes in wine, remove IF when fixed */ - { SetLastError(0xdeadbeef); ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, NULL, replysz, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); ok (error == ERROR_INVALID_PARAMETER, "expected 87, got %d\n", error); - } SetLastError(0xdeadbeef); ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, 0, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); -todo_wine ok (error == ERROR_INVALID_PARAMETER || broken(error == ERROR_INSUFFICIENT_BUFFER) /* <= 2003 */, "expected 87, got %d\n", error); @@ -1031,7 +1026,6 @@ todo_wine ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, NULL, 0, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); -todo_wine ok (error == ERROR_INVALID_PARAMETER || broken(error == ERROR_INSUFFICIENT_BUFFER) /* <= 2003 */, "expected 87, got %d\n", error); @@ -1049,7 +1043,6 @@ todo_wine replysz = sizeof(ICMP_ECHO_REPLY); ret = pIcmpSendEcho(icmp, address, senddata, 0, NULL, replydata, replysz, 1000); error = GetLastError(); -todo_wine ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); SetLastError(0xdeadbeef); @@ -1071,7 +1064,6 @@ todo_wine ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN, NULL, replydata, replysz - 1, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); -todo_wine ok (error == IP_GENERAL_FAILURE || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, "expected 11050, got %d\n", error); -- 2.17.1

1 0

[PATCH v2 2/3] iphlpapi: Report NO_ERROR when succeeded.
by Zhiyi Zhang 05 Aug '18

05 Aug '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/iphlpapi/icmp.c | 3 +++ dlls/iphlpapi/tests/iphlpapi.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index b965874a53..159b7bef18 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -434,7 +434,10 @@ DWORD WINAPI IcmpSendEcho( TRACE("received an ICMP packet of type,code=%d,%d\n",icmp_header->icmp_type,icmp_header->icmp_code); if (icmp_header->icmp_type==ICMP_ECHOREPLY) { if ((icmp_header->icmp_id==id) && (icmp_header->icmp_seq==seq)) + { ier->Status=IP_SUCCESS; + SetLastError(NO_ERROR); + } } else { switch (icmp_header->icmp_type) { case ICMP_UNREACH: diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 87c3ebfac6..f964878d68 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1118,7 +1118,7 @@ todo_wine error = GetLastError(); reply = (ICMP_ECHO_REPLY *)replydata; ok(ret, "IcmpSendEcho failed unexpectedly\n"); - todo_wine ok(error == NO_ERROR, "Expect last error:0x%08x, got:0x%08x\n", NO_ERROR, error); + ok(error == NO_ERROR, "Expect last error:0x%08x, got:0x%08x\n", NO_ERROR, error); ok(INADDR_LOOPBACK == ntohl(reply->Address), "Address mismatch, expect:%s, got: %s\n", ntoa(INADDR_LOOPBACK), ntoa(reply->Address)); ok(reply->Status == IP_SUCCESS, "Expect status:0x%08x, got:0x%08x\n", IP_SUCCESS, reply->Status); -- 2.17.1

1 0

[PATCH v2 1/3] iphlpapi: Use a standalone buffer in IcmpSendEcho().
by Zhiyi Zhang 05 Aug '18

05 Aug '18

The old implementation uses user provided buffer to receive packet data, which is always not enough, causing data corruptions or incorrectly timeout. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43252 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/iphlpapi/icmp.c | 36 ++++++++++++++++++++++++++-------- dlls/iphlpapi/tests/iphlpapi.c | 21 ++++++++++++++++---- 2 files changed, 45 insertions(+), 12 deletions(-) diff --git a/dlls/iphlpapi/icmp.c b/dlls/iphlpapi/icmp.c index ebc2f2b65c..b965874a53 100644 --- a/dlls/iphlpapi/icmp.c +++ b/dlls/iphlpapi/icmp.c @@ -113,6 +113,9 @@ typedef struct { #define IP_OPTS_DEFAULT 1 #define IP_OPTS_CUSTOM 2 +#define MAXIPLEN 60 +#define MAXICMPLEN 76 + /* The sequence number is unique process wide, so that all threads * have a distinct sequence number. */ @@ -270,13 +273,14 @@ DWORD WINAPI IcmpSendEcho( icmp_t* icp=(icmp_t*)IcmpHandle; unsigned char* reqbuf; int reqsize; + unsigned char* repbuf; + int repsize; struct icmp_echo_reply* ier; struct ip* ip_header; struct icmp* icmp_header; char* endbuf; int ip_header_len; - int maxlen; struct pollfd fdr; DWORD send_time,recv_time; struct sockaddr_in addr; @@ -312,6 +316,16 @@ DWORD WINAPI IcmpSendEcho( return 0; } + /* max ip header + max icmp header and error data + reply size(max 65535 on Windows) */ + /* FIXME: request size of 65535 is not supported yet because max buffer size of raw socket on linux is 32767 */ + repsize=MAXIPLEN+MAXICMPLEN+(ReplySize&0xFFFF); + repbuf=HeapAlloc(GetProcessHeap(), 0, repsize); + if (repbuf==NULL) { + HeapFree(GetProcessHeap(), 0, repbuf); + SetLastError(ERROR_OUTOFMEMORY); + return 0; + } + icmp_header=(struct icmp*)reqbuf; icmp_header->icmp_type=ICMP_ECHO; icmp_header->icmp_code=0; @@ -367,9 +381,7 @@ DWORD WINAPI IcmpSendEcho( fdr.events = POLLIN; addrlen=sizeof(addr); ier=ReplyBuffer; - ip_header=(struct ip *) ((char *) ReplyBuffer+sizeof(ICMP_ECHO_REPLY)); endbuf=(char *) ReplyBuffer+ReplySize; - maxlen=ReplySize-sizeof(ICMP_ECHO_REPLY); /* Send the packet */ TRACE("Sending %d bytes (RequestSize=%d) to %s\n", reqsize, RequestSize, inet_ntoa(addr.sin_addr)); @@ -407,10 +419,11 @@ DWORD WINAPI IcmpSendEcho( } /* Get the reply */ + ip_header=(struct ip*)repbuf; ip_header_len=0; /* because gcc was complaining */ while (poll(&fdr,1,Timeout)>0) { recv_time = GetTickCount(); - res=recvfrom(icp->sid, (char*)ip_header, maxlen, 0, (struct sockaddr*)&addr,&addrlen); + res=recvfrom(icp->sid, (char*)repbuf, repsize, 0, (struct sockaddr*)&addr, &addrlen); TRACE("received %d bytes from %s\n",res, inet_ntoa(addr.sin_addr)); ier->Status=IP_REQ_TIMED_OUT; @@ -508,6 +521,12 @@ DWORD WINAPI IcmpSendEcho( else Timeout = 0; continue; } else { + /* Check free space, should be large enough for an ICMP_ECHO_REPLY and remainning icmp data */ + if (endbuf-(char *)ier < sizeof(struct icmp_echo_reply)+(res-ip_header_len-ICMP_MINLEN)) { + res=ier-(ICMP_ECHO_REPLY *)ReplyBuffer; + SetLastError(IP_GENERAL_FAILURE); + goto done; + } /* This is a reply to our packet */ memcpy(&ier->Address,&ip_header->ip_src,sizeof(IPAddr)); /* Status is already set */ @@ -515,7 +534,7 @@ DWORD WINAPI IcmpSendEcho( ier->DataSize=res-ip_header_len-ICMP_MINLEN; ier->Reserved=0; ier->Data=endbuf-ier->DataSize; - memmove(ier->Data,((char*)ip_header)+ip_header_len+ICMP_MINLEN,ier->DataSize); + memcpy(ier->Data, ((char *)ip_header)+ip_header_len+ICMP_MINLEN, ier->DataSize); ier->Options.Ttl=ip_header->ip_ttl; ier->Options.Tos=ip_header->ip_tos; ier->Options.Flags=ip_header->ip_off >> 13; @@ -523,7 +542,7 @@ DWORD WINAPI IcmpSendEcho( if (ier->Options.OptionsSize!=0) { ier->Options.OptionsData=(unsigned char *) ier->Data-ier->Options.OptionsSize; /* FIXME: We are supposed to rearrange the option's 'source route' data */ - memmove(ier->Options.OptionsData,((char*)ip_header)+ip_header_len,ier->Options.OptionsSize); + memcpy(ier->Options.OptionsData, ((char *)ip_header)+ip_header_len, ier->Options.OptionsSize); endbuf=(char*)ier->Options.OptionsData; } else { ier->Options.OptionsData=NULL; @@ -531,9 +550,8 @@ DWORD WINAPI IcmpSendEcho( } /* Prepare for the next packet */ + endbuf-=ier->DataSize; ier++; - ip_header=(struct ip*)(((char*)ip_header)+sizeof(ICMP_ECHO_REPLY)); - maxlen=endbuf-(char*)ip_header; /* Check out whether there is more but don't wait this time */ Timeout=0; @@ -542,6 +560,8 @@ DWORD WINAPI IcmpSendEcho( res=ier-(ICMP_ECHO_REPLY*)ReplyBuffer; if (res==0) SetLastError(IP_REQ_TIMED_OUT); +done: + HeapFree(GetProcessHeap(), 0, repbuf); TRACE("received %d replies\n",res); return res; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index d5613d7b4b..87c3ebfac6 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -951,6 +951,8 @@ static void testIcmpSendEcho(void) char senddata[32], replydata[sizeof(senddata) + sizeof(ICMP_ECHO_REPLY)]; DWORD ret, error, replysz = sizeof(replydata); IPAddr address; + ICMP_ECHO_REPLY *reply; + INT i; if (!pIcmpSendEcho || !pIcmpCreateFile) { @@ -1038,12 +1040,10 @@ todo_wine replysz = sizeof(replydata) - 1; ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); error = GetLastError(); - todo_wine { ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); ok (error == IP_GENERAL_FAILURE || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, "expected 11050, got %d\n", error); - } SetLastError(0xdeadbeef); replysz = sizeof(ICMP_ECHO_REPLY); @@ -1056,7 +1056,6 @@ todo_wine replysz = sizeof(ICMP_ECHO_REPLY) + ICMP_MINLEN; ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN, NULL, replydata, replysz, 1000); error = GetLastError(); -todo_wine ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error); SetLastError(0xdeadbeef); @@ -1064,7 +1063,6 @@ todo_wine ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN + 1, NULL, replydata, replysz, 1000); error = GetLastError(); ok (!ret, "IcmpSendEcho succeeded unexpectedly\n"); -todo_wine ok (error == IP_GENERAL_FAILURE || broken(error == IP_BUF_TOO_SMALL) /* <= 2003 */, "expected 11050, got %d\n", error); @@ -1111,6 +1109,21 @@ todo_wine { skip ("Failed to ping with error %d, is lo interface down?.\n", error); } + + /* check reply data */ + SetLastError(0xdeadbeef); + address = htonl(INADDR_LOOPBACK); + for (i = 0; i < ARRAY_SIZE(senddata); i++) senddata[i] = i & 0xff; + ret = pIcmpSendEcho(icmp, address, senddata, sizeof(senddata), NULL, replydata, replysz, 1000); + error = GetLastError(); + reply = (ICMP_ECHO_REPLY *)replydata; + ok(ret, "IcmpSendEcho failed unexpectedly\n"); + todo_wine ok(error == NO_ERROR, "Expect last error:0x%08x, got:0x%08x\n", NO_ERROR, error); + ok(INADDR_LOOPBACK == ntohl(reply->Address), "Address mismatch, expect:%s, got: %s\n", ntoa(INADDR_LOOPBACK), + ntoa(reply->Address)); + ok(reply->Status == IP_SUCCESS, "Expect status:0x%08x, got:0x%08x\n", IP_SUCCESS, reply->Status); + ok(reply->DataSize == sizeof(senddata), "Expect data size:%d, got:%d\n", sizeof(senddata), reply->DataSize); + ok(!memcmp(senddata, reply->Data, min(sizeof(senddata), reply->DataSize)), "Data mismatch\n"); } /* -- 2.17.1

1 0

Wine staging 3.13.1 release
by Alistair Leslie-Hughes 05 Aug '18

05 Aug '18

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * This is an out of bounds release to correct a regression in Star Craft 2 and to allow some patches to get some tested before the next official wine release. * Appended is a list of patches pulled from the mailing list. Updated patchsets * Corrected regression with sound not playing in Star Craft 2 Added * [41573] Stop a crash in Battle.Net. * [45524] Speed Improvements in Tital Fall 2. * dinput8 to share code with dinput (part of League of Legends support) * [45327] Improvements to support for League of Legends. * [45535] Stop an out of bounds access in Rekordbox League of Legends currently doesn't work with this release, we are still working through the remaining issues. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair. --- Andrew Eikum (1): dsound: Correctly calculate angle between vectors with equal and opposite directions Andrey Gusev (1): api-ms-win-devices-config-l1-1-0: Add dll. Aric Stewart (1): hidclass.sys: Unload all devices before unloading a minidriver Charles Davis (1): libwine: Use getsegmentdata(3) on Mac OS to find the end of the __TEXT segment. Daniel Lehman (1): odbc32: Rename functions to avoid conflicts with native drivers. Dmitry Timoshkov (5): programs: Allow to disable MIME-type associations. kernel32: Set environment variable %PUBLIC% on the process start-up. kernel32: Add support for MOVEFILE_WRITE_THROUGH to MoveFile. server: Add support for FILE_WRITE_THROUGH to create_file() request. kernel32: Add support for FILE_FLAG_WRITE_THROUGH to CreateFile. Fabian Maurer (4): wnet: Make WNetGetUniversalNameW return required size when buffer is too small and add test ntoskrnl: Emulate sti/cli instructions on x86_64 winmm: Don't crash in waveOutOpen when nSamplesPerSec is 0 and add tests cmd: Handle quotes when parsing the folders in the PATH environment variable Gijs Vermeulen (1): wine.inf: Add "Sources" key. Jacek Caban (2): winevulkan: Expose driver vkGetInstanceProcAddr via winevulkan exports. winevulkan: Mark ICD and thunking functions as private. Kai Krakow (1): winebus.sys: Do not report HID report read errors unconditionally Matteo Bruni (1): d3dcompiler: Make types array static const. Michael Stefaniuc (55): windowscodecs: Use the ARRAY_SIZE() macro localspl: Use the ARRAY_SIZE() macro mmdevapi: Use the ARRAY_SIZE() macro mapi32: Use the ARRAY_SIZE() macro krnl386.exe16: Use the ARRAY_SIZE() macro inetcpl.cpl: Use the ARRAY_SIZE() macro hhctrl.ocx: Use the ARRAY_SIZE() macro dpnet: Use the ARRAY_SIZE() macro dx8vb: Use the ARRAY_SIZE() macro fusion: Use the ARRAY_SIZE() macro evr: Use the ARRAY_SIZE() macro d3d10: Use the ARRAY_SIZE() macro d3d8: Use the ARRAY_SIZE() macro d3dcompiler: Use the ARRAY_SIZE() macro d3dxof: Use the ARRAY_SIZE() macro dnsapi: Use the ARRAY_SIZE() macro amstream: Use the ARRAY_SIZE() macro browseui: Use the ARRAY_SIZE() macro gameux: Use the ARRAY_SIZE() macro inetcomm: Use the ARRAY_SIZE() macro iphlpapi: Use the ARRAY_SIZE() macro itss: Remove a superfluous variable initialization itss: Use the ARRAY_SIZE() macro attrib: Use the ARRAY_SIZE() macro clock: Use the ARRAY_SIZE() macro hostname: Use the ARRAY_SIZE() macro icinfo: Use the ARRAY_SIZE() macro net: Use the ARRAY_SIZE() macro taskkill: Use the ARRAY_SIZE() macro ipconfig: Use the ARRAY_SIZE() macro msiexec: Use the ARRAY_SIZE() macro taskmgr: Use the ARRAY_SIZE() macro uninstaller: Use the ARRAY_SIZE() macro wineboot: Use the ARRAY_SIZE() macro wordpad: Use the ARRAY_SIZE() macro winetest: Use the ARRAY_SIZE() macro mountmgr.sys: Use the ARRAY_SIZE() macro mpr: Use the ARRAY_SIZE() macro msacm32: Use the ARRAY_SIZE() macro msrle32: Use the ARRAY_SIZE() macro msvcrt: Use the ARRAY_SIZE() macro scrobj: Use the ARRAY_SIZE() macro storage.dll16: Use the ARRAY_SIZE() macro urlmon: Use the ARRAY_SIZE() macro msvideo.dll16: Use the ARRAY_SIZE() macro mscoree: Use the ARRAY_SIZE() macro dxdiagn: Use the ARRAY_SIZE() macro localui: Use the ARRAY_SIZE() macro inetmib1: Use the ARRAY_SIZE() macro kernel32: Use the ARRAY_SIZE() macro mciwave: Use the ARRAY_SIZE() macro midimap: Use the ARRAY_SIZE() macro mscms: Use the ARRAY_SIZE() macro msctf: Use the ARRAY_SIZE() macro msscript.ocx: Use the ARRAY_SIZE() macro Nikolay Sivov (1): wmp: Make it possible to query IUnknown from IWMPControls. Piotr Caban (3): msvcp90: Fix EOF delimiter handling in basic_istream<char>::ignore. wbemprox: Add Win32_NetworkAdapterConfiguration::IPAddress property. wbemprox: Add Win32_NetworkAdapterConfiguration::IPSubnet property. Stefan Dösinger (4): wined3d: Fix WINED3D_MCS_COLOR2. d3d9/tests: Add a test for D3DMCS_COLOR{1/2}. d3d8/tests: Add a test for D3DMCS_COLOR{1/2}. ddraw/tests: Add a test for D3DMCS_COLOR{1/2}. Zebediah Figura (1): msi: Generate unique names for 32- and 64-bit custom action server pipes.

1 0

[PATCH 08/12] ddraw/tests: Rewrite DeviceLoadTest().
by Henri Verbeet 04 Aug '18

04 Aug '18

Based on a patch by Alex Henrie. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/tests/d3d.c | 1058 --------------------------------------------- dlls/ddraw/tests/ddraw7.c | 482 +++++++++++++++++++++ 2 files changed, 482 insertions(+), 1058 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 77836fd627e..ec0f8d715ca 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1404,1063 +1404,6 @@ out: IDirect3DVertexBuffer7_Release(lpVBufSrc); } -#define IS_VALUE_NEAR(a, b) ( ((a) == (b)) || ((a) == (b) - 1) || ((a) == (b) + 1) ) -#define MIN(a, b) ((a) < (b) ? (a) : (b)) - -static void DeviceLoadTest(void) -{ - DDSURFACEDESC2 ddsd; - IDirectDrawSurface7 *texture_levels[2][8]; - IDirectDrawSurface7 *cube_face_levels[2][6][8]; - DWORD flags; - HRESULT hr; - DDBLTFX ddbltfx; - RECT loadrect; - POINT loadpoint; - int i, i1, i2; - unsigned diff_count = 0, diff_count2 = 0; - unsigned x, y; - BOOL load_mip_subset_broken = FALSE; - IDirectDrawPalette *palettes[5]; - PALETTEENTRY table1[256]; - DDCOLORKEY ddckey; - D3DDEVICEDESC7 d3dcaps; - - /* Test loading of texture subrectangle with a mipmap surface. */ - memset(texture_levels, 0, sizeof(texture_levels)); - memset(cube_face_levels, 0, sizeof(cube_face_levels)); - memset(palettes, 0, sizeof(palettes)); - - for (i = 0; i < 2; i++) - { - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; - ddsd.dwWidth = 128; - ddsd.dwHeight = 128; - U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); - U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; - U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00FF0000; - U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000FF00; - U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000FF; - hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &texture_levels[i][0], NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - if (FAILED(hr)) goto out; - - /* Check the number of created mipmaps */ - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_GetSurfaceDesc(texture_levels[i][0], &ddsd); - ok(hr==DD_OK,"IDirectDrawSurface7_GetSurfaceDesc returned: %x\n",hr); - ok(U2(ddsd).dwMipMapCount == 8, "unexpected mip count %u\n", U2(ddsd).dwMipMapCount); - if (U2(ddsd).dwMipMapCount != 8) goto out; - - for (i1 = 1; i1 < 8; i1++) - { - hr = IDirectDrawSurface7_GetAttachedSurface(texture_levels[i][i1 - 1], &ddsd.ddsCaps, &texture_levels[i][i1]); - ok(hr == DD_OK, "GetAttachedSurface returned %08x\n", hr); - if (FAILED(hr)) goto out; - } - } - - for (i1 = 0; i1 < 8; i1++) - { - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_Lock(texture_levels[0][i1], NULL, &ddsd, DDLOCK_WAIT, NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Lock returned: %x\n",hr); - if (FAILED(hr)) goto out; - - for (y = 0 ; y < ddsd.dwHeight; y++) - { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); - - for (x = 0; x < ddsd.dwWidth; x++) - { - /* x stored in green component, y in blue. */ - DWORD color = 0xff0000 | (x << 8) | y; - *textureRow++ = color; - } - } - - hr = IDirectDrawSurface7_Unlock(texture_levels[0][i1], NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Unlock returned: %x\n",hr); - } - - for (i1 = 0; i1 < 8; i1++) - { - memset(&ddbltfx, 0, sizeof(ddbltfx)); - ddbltfx.dwSize = sizeof(ddbltfx); - U5(ddbltfx).dwFillColor = 0; - hr = IDirectDrawSurface7_Blt(texture_levels[1][i1], NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); - ok(hr == DD_OK, "IDirectDrawSurface7_Blt failed with %08x\n", hr); - } - - /* First test some broken coordinates. */ - loadpoint.x = loadpoint.y = 0; - SetRectEmpty(&loadrect); - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][0], &loadpoint, texture_levels[0][0], &loadrect, 0); - ok(hr==DDERR_INVALIDPARAMS, "IDirect3DDevice7_Load returned: %x\n",hr); - - loadpoint.x = loadpoint.y = 50; - loadrect.left = 0; - loadrect.top = 0; - loadrect.right = 100; - loadrect.bottom = 100; - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][0], &loadpoint, texture_levels[0][0], &loadrect, 0); - ok(hr==DDERR_INVALIDPARAMS, "IDirect3DDevice7_Load returned: %x\n",hr); - - /* Test actual loading. */ - loadpoint.x = loadpoint.y = 31; - loadrect.left = 30; - loadrect.top = 20; - loadrect.right = 93; - loadrect.bottom = 52; - - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][0], &loadpoint, texture_levels[0][0], &loadrect, 0); - ok(hr==D3D_OK, "IDirect3DDevice7_Load returned: %x\n",hr); - - for (i1 = 0; i1 < 8; i1++) - { - diff_count = 0; - diff_count2 = 0; - - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_Lock(texture_levels[1][i1], NULL, &ddsd, DDLOCK_WAIT, NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Lock returned: %x\n",hr); - if (FAILED(hr)) goto out; - - for (y = 0 ; y < ddsd.dwHeight; y++) - { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); - - for (x = 0; x < ddsd.dwWidth; x++) - { - DWORD color = *textureRow++; - - if (x < loadpoint.x || x >= loadpoint.x + loadrect.right - loadrect.left || - y < loadpoint.y || y >= loadpoint.y + loadrect.bottom - loadrect.top) - { - if (color & 0xffffff) diff_count++; - } - else - { - DWORD r = (color & 0xff0000) >> 16; - DWORD g = (color & 0xff00) >> 8; - DWORD b = (color & 0xff); - - if (r != 0xff || g != x + loadrect.left - loadpoint.x || b != y + loadrect.top - loadpoint.y) diff_count++; - } - - /* This codepath is for software RGB device. It has what looks like some weird off by one errors, but may - technically be correct as it's not precisely defined by docs. */ - if (x < loadpoint.x || x >= loadpoint.x + loadrect.right - loadrect.left || - y < loadpoint.y || y >= loadpoint.y + loadrect.bottom - loadrect.top + 1) - { - if (color & 0xffffff) diff_count2++; - } - else - { - DWORD r = (color & 0xff0000) >> 16; - DWORD g = (color & 0xff00) >> 8; - DWORD b = (color & 0xff); - - if (r != 0xff || !IS_VALUE_NEAR(g, x + loadrect.left - loadpoint.x) || - !IS_VALUE_NEAR(b, y + loadrect.top - loadpoint.y)) diff_count2++; - } - } - } - - hr = IDirectDrawSurface7_Unlock(texture_levels[1][i1], NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Unlock returned: %x\n",hr); - - ok(diff_count == 0 || diff_count2 == 0, "Unexpected destination texture level pixels; %u differences at %d level\n", - MIN(diff_count, diff_count2), i1); - - loadpoint.x /= 2; - loadpoint.y /= 2; - loadrect.top /= 2; - loadrect.left /= 2; - loadrect.right = (loadrect.right + 1) / 2; - loadrect.bottom = (loadrect.bottom + 1) / 2; - } - - /* This crashes on native (tested on real windows XP / directx9 / nvidia and - * qemu Win98 / directx7 / RGB software rasterizer): - * passing non toplevel surfaces (sublevels) to Load (DX7 docs tell not to do this) - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][1], NULL, texture_levels[0][1], NULL, 0); - */ - - /* Freed in reverse order as native seems to dislike and crash on freeing top level surface first. */ - for (i = 0; i < 2; i++) - { - for (i1 = 7; i1 >= 0; i1--) - { - if (texture_levels[i][i1]) IDirectDrawSurface7_Release(texture_levels[i][i1]); - } - } - memset(texture_levels, 0, sizeof(texture_levels)); - - /* Test texture size mismatch. */ - for (i = 0; i < 2; i++) - { - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; - ddsd.dwWidth = i ? 256 : 128; - ddsd.dwHeight = 128; - hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &texture_levels[i][0], NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - if (FAILED(hr)) goto out; - } - - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][0], NULL, texture_levels[0][0], NULL, 0); - ok(hr==DDERR_INVALIDPARAMS, "IDirect3DDevice7_Load returned: %x\n",hr); - - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[0][0], NULL, texture_levels[1][0], NULL, 0); - ok(hr==DDERR_INVALIDPARAMS, "IDirect3DDevice7_Load returned: %x\n",hr); - - IDirectDrawSurface7_Release(texture_levels[0][0]); - IDirectDrawSurface7_Release(texture_levels[1][0]); - memset(texture_levels, 0, sizeof(texture_levels)); - - memset(&d3dcaps, 0, sizeof(d3dcaps)); - hr = IDirect3DDevice7_GetCaps(lpD3DDevice, &d3dcaps); - ok(hr == D3D_OK, "IDirect3DDevice7_GetCaps returned %08x\n", hr); - - if (!(d3dcaps.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_CUBEMAP)) - { - skip("No cubemap support\n"); - } - else - { - /* Test loading mipmapped cubemap texture subrectangle from another similar texture. */ - for (i = 0; i < 2; i++) - { - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; - ddsd.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES; - ddsd.dwWidth = 128; - ddsd.dwHeight = 128; - U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); - U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; - U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00FF0000; - U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000FF00; - U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000FF; - hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &cube_face_levels[i][0][0], NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - if (FAILED(hr)) goto out; - - flags = DDSCAPS2_CUBEMAP_NEGATIVEX; - for (i1 = 1; i1 < 6; i1++, flags <<= 1) - { - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; - ddsd.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP | flags; - hr = IDirectDrawSurface7_GetAttachedSurface(cube_face_levels[i][0][0], &ddsd.ddsCaps, &cube_face_levels[i][i1][0]); - ok(hr == DD_OK, "GetAttachedSurface returned %08x\n", hr); - if (FAILED(hr)) goto out; - } - - for (i1 = 0; i1 < 6; i1++) - { - /* Check the number of created mipmaps */ - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_GetSurfaceDesc(cube_face_levels[i][i1][0], &ddsd); - ok(hr==DD_OK,"IDirectDrawSurface7_GetSurfaceDesc returned: %x\n",hr); - ok(U2(ddsd).dwMipMapCount == 8, "unexpected mip count %u\n", U2(ddsd).dwMipMapCount); - if (U2(ddsd).dwMipMapCount != 8) goto out; - - for (i2 = 1; i2 < 8; i2++) - { - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_MIPMAP; - ddsd.ddsCaps.dwCaps2 = DDSCAPS2_MIPMAPSUBLEVEL; - hr = IDirectDrawSurface7_GetAttachedSurface(cube_face_levels[i][i1][i2 - 1], &ddsd.ddsCaps, &cube_face_levels[i][i1][i2]); - ok(hr == DD_OK, "GetAttachedSurface returned %08x\n", hr); - if (FAILED(hr)) goto out; - } - } - } - - for (i = 0; i < 6; i++) - for (i1 = 0; i1 < 8; i1++) - { - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_Lock(cube_face_levels[0][i][i1], NULL, &ddsd, DDLOCK_WAIT, NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Lock returned: %x\n",hr); - if (FAILED(hr)) goto out; - - for (y = 0 ; y < ddsd.dwHeight; y++) - { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); - - for (x = 0; x < ddsd.dwWidth; x++) - { - /* face number in low 4 bits of red, x stored in green component, y in blue. */ - DWORD color = 0xf00000 | (i << 16) | (x << 8) | y; - *textureRow++ = color; - } - } - - hr = IDirectDrawSurface7_Unlock(cube_face_levels[0][i][i1], NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Unlock returned: %x\n",hr); - } - - for (i = 0; i < 6; i++) - for (i1 = 0; i1 < 8; i1++) - { - memset(&ddbltfx, 0, sizeof(ddbltfx)); - ddbltfx.dwSize = sizeof(ddbltfx); - U5(ddbltfx).dwFillColor = 0; - hr = IDirectDrawSurface7_Blt(cube_face_levels[1][i][i1], NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); - ok(hr == DD_OK, "IDirectDrawSurface7_Blt failed with %08x\n", hr); - } - - loadpoint.x = loadpoint.y = 10; - loadrect.left = 30; - loadrect.top = 20; - loadrect.right = 93; - loadrect.bottom = 52; - - hr = IDirect3DDevice7_Load(lpD3DDevice, cube_face_levels[1][0][0], &loadpoint, cube_face_levels[0][0][0], &loadrect, - DDSCAPS2_CUBEMAP_ALLFACES); - ok(hr==D3D_OK, "IDirect3DDevice7_Load returned: %x\n",hr); - - for (i = 0; i < 6; i++) - { - loadpoint.x = loadpoint.y = 10; - loadrect.left = 30; - loadrect.top = 20; - loadrect.right = 93; - loadrect.bottom = 52; - - for (i1 = 0; i1 < 8; i1++) - { - diff_count = 0; - diff_count2 = 0; - - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_Lock(cube_face_levels[1][i][i1], NULL, &ddsd, DDLOCK_WAIT, NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Lock returned: %x\n",hr); - if (FAILED(hr)) goto out; - - for (y = 0 ; y < ddsd.dwHeight; y++) - { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); - - for (x = 0; x < ddsd.dwWidth; x++) - { - DWORD color = *textureRow++; - - if (x < loadpoint.x || x >= loadpoint.x + loadrect.right - loadrect.left || - y < loadpoint.y || y >= loadpoint.y + loadrect.bottom - loadrect.top) - { - if (color & 0xffffff) diff_count++; - } - else - { - DWORD r = (color & 0xff0000) >> 16; - DWORD g = (color & 0xff00) >> 8; - DWORD b = (color & 0xff); - - if (r != (0xf0 | i) || g != x + loadrect.left - loadpoint.x || - b != y + loadrect.top - loadpoint.y) diff_count++; - } - - /* This codepath is for software RGB device. It has what looks like some weird off by one errors, but may - technically be correct as it's not precisely defined by docs. */ - if (x < loadpoint.x || x >= loadpoint.x + loadrect.right - loadrect.left || - y < loadpoint.y || y >= loadpoint.y + loadrect.bottom - loadrect.top + 1) - { - if (color & 0xffffff) diff_count2++; - } - else - { - DWORD r = (color & 0xff0000) >> 16; - DWORD g = (color & 0xff00) >> 8; - DWORD b = (color & 0xff); - - if (r != (0xf0 | i) || !IS_VALUE_NEAR(g, x + loadrect.left - loadpoint.x) || - !IS_VALUE_NEAR(b, y + loadrect.top - loadpoint.y)) diff_count2++; - } - } - } - - hr = IDirectDrawSurface7_Unlock(cube_face_levels[1][i][i1], NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Unlock returned: %x\n",hr); - - ok(diff_count == 0 || diff_count2 == 0, - "Unexpected destination texture level pixels; %u differences at face %x level %d\n", - MIN(diff_count, diff_count2), i, i1); - - loadpoint.x /= 2; - loadpoint.y /= 2; - loadrect.top /= 2; - loadrect.left /= 2; - loadrect.right = (loadrect.right + 1) / 2; - loadrect.bottom = (loadrect.bottom + 1) / 2; - } - } - - for (i = 0; i < 2; i++) - for (i1 = 5; i1 >= 0; i1--) - for (i2 = 7; i2 >= 0; i2--) - { - if (cube_face_levels[i][i1][i2]) IDirectDrawSurface7_Release(cube_face_levels[i][i1][i2]); - } - memset(cube_face_levels, 0, sizeof(cube_face_levels)); - - /* Test cubemap loading from regular texture. */ - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX; - ddsd.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES; - ddsd.dwWidth = 128; - ddsd.dwHeight = 128; - hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &cube_face_levels[0][0][0], NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - if (FAILED(hr)) goto out; - - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; - ddsd.dwWidth = 128; - ddsd.dwHeight = 128; - hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &texture_levels[0][0], NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - if (FAILED(hr)) goto out; - - hr = IDirect3DDevice7_Load(lpD3DDevice, cube_face_levels[0][0][0], NULL, texture_levels[0][0], NULL, - DDSCAPS2_CUBEMAP_ALLFACES); - ok(hr==DDERR_INVALIDPARAMS, "IDirect3DDevice7_Load returned: %x\n",hr); - - IDirectDrawSurface7_Release(cube_face_levels[0][0][0]); - memset(cube_face_levels, 0, sizeof(cube_face_levels)); - IDirectDrawSurface7_Release(texture_levels[0][0]); - memset(texture_levels, 0, sizeof(texture_levels)); - - /* Partial cube maps(e.g. created with an explicitly set DDSCAPS2_CUBEMAP_POSITIVEX flag) - * BSOD some Windows machines when an app tries to create them(Radeon X1600, Windows XP, - * Catalyst 10.2 driver, 6.14.10.6925) - */ - } - - /* Test texture loading with different mip level count (larger levels match, smaller levels missing in destination. */ - for (i = 0; i < 2; i++) - { - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT | DDSD_MIPMAPCOUNT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; - ddsd.dwWidth = 128; - ddsd.dwHeight = 128; - U2(ddsd).dwMipMapCount = i ? 4 : 8; - U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); - U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; - U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00FF0000; - U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000FF00; - U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000FF; - hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &texture_levels[i][0], NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - if (FAILED(hr)) goto out; - - /* Check the number of created mipmaps */ - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_GetSurfaceDesc(texture_levels[i][0], &ddsd); - ok(hr==DD_OK,"IDirectDrawSurface7_GetSurfaceDesc returned: %x\n",hr); - ok(U2(ddsd).dwMipMapCount == (i ? 4 : 8), "unexpected mip count %u\n", U2(ddsd).dwMipMapCount); - if (U2(ddsd).dwMipMapCount != (i ? 4 : 8)) goto out; - - for (i1 = 1; i1 < (i ? 4 : 8); i1++) - { - hr = IDirectDrawSurface7_GetAttachedSurface(texture_levels[i][i1 - 1], &ddsd.ddsCaps, &texture_levels[i][i1]); - ok(hr == DD_OK, "GetAttachedSurface returned %08x\n", hr); - if (FAILED(hr)) goto out; - } - } - - for (i1 = 0; i1 < 8; i1++) - { - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_Lock(texture_levels[0][i1], NULL, &ddsd, DDLOCK_WAIT, NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Lock returned: %x\n",hr); - if (FAILED(hr)) goto out; - - for (y = 0 ; y < ddsd.dwHeight; y++) - { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); - - for (x = 0; x < ddsd.dwWidth; x++) - { - /* x stored in green component, y in blue. */ - DWORD color = 0xf00000 | (i1 << 16) | (x << 8) | y; - *textureRow++ = color; - } - } - - hr = IDirectDrawSurface7_Unlock(texture_levels[0][i1], NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Unlock returned: %x\n",hr); - } - - for (i1 = 0; i1 < 4; i1++) - { - memset(&ddbltfx, 0, sizeof(ddbltfx)); - ddbltfx.dwSize = sizeof(ddbltfx); - U5(ddbltfx).dwFillColor = 0; - hr = IDirectDrawSurface7_Blt(texture_levels[1][i1], NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); - ok(hr == DD_OK, "IDirectDrawSurface7_Blt failed with %08x\n", hr); - } - - loadpoint.x = loadpoint.y = 31; - loadrect.left = 30; - loadrect.top = 20; - loadrect.right = 93; - loadrect.bottom = 52; - - /* Destination mip levels are a subset of source mip levels. */ - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][0], &loadpoint, texture_levels[0][0], &loadrect, 0); - ok(hr==D3D_OK, "IDirect3DDevice7_Load returned: %x\n",hr); - - for (i1 = 0; i1 < 4; i1++) - { - diff_count = 0; - diff_count2 = 0; - - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_Lock(texture_levels[1][i1], NULL, &ddsd, DDLOCK_WAIT, NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Lock returned: %x\n",hr); - if (FAILED(hr)) goto out; - - for (y = 0 ; y < ddsd.dwHeight; y++) - { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); - - for (x = 0; x < ddsd.dwWidth; x++) - { - DWORD color = *textureRow++; - - if (x < loadpoint.x || x >= loadpoint.x + loadrect.right - loadrect.left || - y < loadpoint.y || y >= loadpoint.y + loadrect.bottom - loadrect.top) - { - if (color & 0xffffff) diff_count++; - } - else - { - DWORD r = (color & 0xff0000) >> 16; - DWORD g = (color & 0xff00) >> 8; - DWORD b = (color & 0xff); - - if (r != (0xf0 | i1) || g != x + loadrect.left - loadpoint.x || - b != y + loadrect.top - loadpoint.y) diff_count++; - } - - /* This codepath is for software RGB device. It has what looks like some weird off by one errors, but may - technically be correct as it's not precisely defined by docs. */ - if (x < loadpoint.x || x >= loadpoint.x + loadrect.right - loadrect.left || - y < loadpoint.y || y >= loadpoint.y + loadrect.bottom - loadrect.top + 1) - { - if (color & 0xffffff) diff_count2++; - } - else - { - DWORD r = (color & 0xff0000) >> 16; - DWORD g = (color & 0xff00) >> 8; - DWORD b = (color & 0xff); - - if (r != (0xf0 | i1) || !IS_VALUE_NEAR(g, x + loadrect.left - loadpoint.x) || - !IS_VALUE_NEAR(b, y + loadrect.top - loadpoint.y)) diff_count2++; - } - } - } - - hr = IDirectDrawSurface7_Unlock(texture_levels[1][i1], NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Unlock returned: %x\n",hr); - - ok(diff_count == 0 || diff_count2 == 0, "Unexpected destination texture level pixels; %u differences at %d level\n", - MIN(diff_count, diff_count2), i1); - - loadpoint.x /= 2; - loadpoint.y /= 2; - loadrect.top /= 2; - loadrect.left /= 2; - loadrect.right = (loadrect.right + 1) / 2; - loadrect.bottom = (loadrect.bottom + 1) / 2; - } - - /* Destination mip levels are a superset of source mip levels (should fail). */ - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[0][0], &loadpoint, texture_levels[1][0], &loadrect, 0); - ok(hr==DDERR_INVALIDPARAMS, "IDirect3DDevice7_Load returned: %x\n",hr); - - for (i = 0; i < 2; i++) - { - for (i1 = 7; i1 >= 0; i1--) - { - if (texture_levels[i][i1]) IDirectDrawSurface7_Release(texture_levels[i][i1]); - } - } - memset(texture_levels, 0, sizeof(texture_levels)); - - /* Test loading from mipmap texture to a regular texture that matches one sublevel in size. */ - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; - ddsd.dwWidth = 128; - ddsd.dwHeight = 128; - U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); - U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; - U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00FF0000; - U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000FF00; - U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000FF; - hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &texture_levels[0][0], NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - if (FAILED(hr)) goto out; - - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; - ddsd.dwWidth = 32; - ddsd.dwHeight = 32; - U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); - U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; - U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00FF0000; - U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000FF00; - U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000FF; - hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &texture_levels[1][0], NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - if (FAILED(hr)) goto out; - - for (i1 = 1; i1 < 8; i1++) - { - hr = IDirectDrawSurface7_GetAttachedSurface(texture_levels[0][i1 - 1], &ddsd.ddsCaps, &texture_levels[0][i1]); - ok(hr == DD_OK, "GetAttachedSurface returned %08x\n", hr); - if (FAILED(hr)) goto out; - } - - for (i1 = 0; i1 < 8; i1++) - { - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_Lock(texture_levels[0][i1], NULL, &ddsd, DDLOCK_WAIT, NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Lock returned: %x\n",hr); - if (FAILED(hr)) goto out; - - for (y = 0 ; y < ddsd.dwHeight; y++) - { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); - - for (x = 0; x < ddsd.dwWidth; x++) - { - /* x stored in green component, y in blue. */ - DWORD color = 0xf00000 | (i1 << 16) | (x << 8) | y; - *textureRow++ = color; - } - } - - hr = IDirectDrawSurface7_Unlock(texture_levels[0][i1], NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Unlock returned: %x\n",hr); - } - - memset(&ddbltfx, 0, sizeof(ddbltfx)); - ddbltfx.dwSize = sizeof(ddbltfx); - U5(ddbltfx).dwFillColor = 0; - hr = IDirectDrawSurface7_Blt(texture_levels[1][0], NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); - ok(hr == DD_OK, "IDirectDrawSurface7_Blt failed with %08x\n", hr); - - loadpoint.x = loadpoint.y = 32; - loadrect.left = 32; - loadrect.top = 32; - loadrect.right = 96; - loadrect.bottom = 96; - - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][0], &loadpoint, texture_levels[0][0], &loadrect, 0); - ok(hr==D3D_OK, "IDirect3DDevice7_Load returned: %x\n",hr); - - loadpoint.x /= 4; - loadpoint.y /= 4; - loadrect.top /= 4; - loadrect.left /= 4; - loadrect.right = (loadrect.right + 3) / 4; - loadrect.bottom = (loadrect.bottom + 3) / 4; - - /* NOTE: something in either nvidia driver or directx9 on WinXP appears to be broken: - * this kind of Load calls (to subset with smaller surface(s)) produces wrong results with - * copied subrectangles divided more than needed, without apparent logic. But it works - * as expected on qemu / Win98 / directx7 / RGB device. Some things are broken on XP, e.g. - * some games don't work that worked in Win98, so it is assumed here XP results are wrong. - * The following code attempts to detect broken results, actual tests will then be skipped - */ - load_mip_subset_broken = TRUE; - diff_count = 0; - - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_Lock(texture_levels[1][0], NULL, &ddsd, DDLOCK_WAIT, NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Lock returned: %x\n",hr); - if (FAILED(hr)) goto out; - - for (y = 0 ; y < ddsd.dwHeight; y++) - { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); - - for (x = 0; x < ddsd.dwWidth; x++) - { - DWORD color = *textureRow++; - - if (x < 2 || x >= 2 + 4 || - y < 2 || y >= 2 + 4) - { - if (color & 0xffffff) diff_count++; - } - else - { - DWORD r = (color & 0xff0000) >> 16; - - if ((r & (0xf0)) != 0xf0) diff_count++; - } - } - } - - if (diff_count) load_mip_subset_broken = FALSE; - - if (load_mip_subset_broken) { - skip("IDirect3DDevice7_Load is broken (happens on some modern Windows installations like XP). Skipping affected tests.\n"); - } else { - diff_count = 0; - - for (y = 0 ; y < ddsd.dwHeight; y++) - { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); - - for (x = 0; x < ddsd.dwWidth; x++) - { - DWORD color = *textureRow++; - - if (x < loadpoint.x || x >= loadpoint.x + loadrect.right - loadrect.left || - y < loadpoint.y || y >= loadpoint.y + loadrect.bottom - loadrect.top) - { - if (color & 0xffffff) diff_count++; - } - else - { - DWORD r = (color & 0xff0000) >> 16; - DWORD g = (color & 0xff00) >> 8; - DWORD b = (color & 0xff); - - if (r != (0xf0 | 2) || g != x + loadrect.left - loadpoint.x || - b != y + loadrect.top - loadpoint.y) diff_count++; - } - } - } - } - - hr = IDirectDrawSurface7_Unlock(texture_levels[1][0], NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Unlock returned: %x\n",hr); - - ok(diff_count == 0, "Unexpected destination texture level pixels; %u differences\n", diff_count); - - for (i = 0; i < 2; i++) - { - for (i1 = 7; i1 >= 0; i1--) - { - if (texture_levels[i][i1]) IDirectDrawSurface7_Release(texture_levels[i][i1]); - } - } - memset(texture_levels, 0, sizeof(texture_levels)); - - if (!load_mip_subset_broken) - { - /* Test loading when destination mip levels are a subset of source mip levels and start from smaller - * surface (than first source mip level) - */ - for (i = 0; i < 2; i++) - { - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; - if (i) ddsd.dwFlags |= DDSD_MIPMAPCOUNT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; - ddsd.dwWidth = i ? 32 : 128; - ddsd.dwHeight = i ? 32 : 128; - if (i) U2(ddsd).dwMipMapCount = 4; - U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); - U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB; - U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 32; - U2(U4(ddsd).ddpfPixelFormat).dwRBitMask = 0x00FF0000; - U3(U4(ddsd).ddpfPixelFormat).dwGBitMask = 0x0000FF00; - U4(U4(ddsd).ddpfPixelFormat).dwBBitMask = 0x000000FF; - hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &texture_levels[i][0], NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - if (FAILED(hr)) goto out; - - /* Check the number of created mipmaps */ - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_GetSurfaceDesc(texture_levels[i][0], &ddsd); - ok(hr==DD_OK,"IDirectDrawSurface7_GetSurfaceDesc returned: %x\n",hr); - ok(U2(ddsd).dwMipMapCount == (i ? 4 : 8), "unexpected mip count %u\n", U2(ddsd).dwMipMapCount); - if (U2(ddsd).dwMipMapCount != (i ? 4 : 8)) goto out; - - for (i1 = 1; i1 < (i ? 4 : 8); i1++) - { - hr = IDirectDrawSurface7_GetAttachedSurface(texture_levels[i][i1 - 1], &ddsd.ddsCaps, &texture_levels[i][i1]); - ok(hr == DD_OK, "GetAttachedSurface returned %08x\n", hr); - if (FAILED(hr)) goto out; - } - } - - for (i1 = 0; i1 < 8; i1++) - { - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_Lock(texture_levels[0][i1], NULL, &ddsd, DDLOCK_WAIT, NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Lock returned: %x\n",hr); - if (FAILED(hr)) goto out; - - for (y = 0 ; y < ddsd.dwHeight; y++) - { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); - - for (x = 0; x < ddsd.dwWidth; x++) - { - /* x stored in green component, y in blue. */ - DWORD color = 0xf00000 | (i1 << 16) | (x << 8) | y; - *textureRow++ = color; - } - } - - hr = IDirectDrawSurface7_Unlock(texture_levels[0][i1], NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Unlock returned: %x\n",hr); - } - - for (i1 = 0; i1 < 4; i1++) - { - memset(&ddbltfx, 0, sizeof(ddbltfx)); - ddbltfx.dwSize = sizeof(ddbltfx); - U5(ddbltfx).dwFillColor = 0; - hr = IDirectDrawSurface7_Blt(texture_levels[1][i1], NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &ddbltfx); - ok(hr == DD_OK, "IDirectDrawSurface7_Blt failed with %08x\n", hr); - } - - loadpoint.x = loadpoint.y = 0; - loadrect.left = 0; - loadrect.top = 0; - loadrect.right = 64; - loadrect.bottom = 64; - - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][0], &loadpoint, texture_levels[0][0], &loadrect, 0); - ok(hr==D3D_OK, "IDirect3DDevice7_Load returned: %x\n",hr); - - i = 0; - for (i1 = 0; i1 < 8 && i < 4; i1++) - { - DDSURFACEDESC2 ddsd2; - - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_GetSurfaceDesc(texture_levels[0][i1], &ddsd); - ok(SUCCEEDED(hr), "IDirectDrawSurface7_GetSurfaceDesc returned %#x.\n", hr); - - memset(&ddsd2, 0, sizeof(DDSURFACEDESC2)); - ddsd2.dwSize = sizeof(ddsd2); - hr = IDirectDrawSurface7_GetSurfaceDesc(texture_levels[1][i], &ddsd2); - ok(SUCCEEDED(hr), "IDirectDrawSurface7_GetSurfaceDesc returned %#x.\n", hr); - - if (ddsd.dwWidth == ddsd2.dwWidth && ddsd.dwHeight == ddsd2.dwHeight) - { - diff_count = 0; - - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_Lock(texture_levels[1][i], NULL, &ddsd, DDLOCK_WAIT, NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Lock returned: %x\n",hr); - if (FAILED(hr)) goto out; - - for (y = 0 ; y < ddsd.dwHeight; y++) - { - DWORD *textureRow = (DWORD*)((char*)ddsd.lpSurface + y * U1(ddsd).lPitch); - - for (x = 0; x < ddsd.dwWidth; x++) - { - DWORD color = *textureRow++; - - if (x < loadpoint.x || x >= loadpoint.x + loadrect.right - loadrect.left || - y < loadpoint.y || y >= loadpoint.y + loadrect.bottom - loadrect.top) - { - if (color & 0xffffff) diff_count++; - } - else - { - DWORD r = (color & 0xff0000) >> 16; - DWORD g = (color & 0xff00) >> 8; - DWORD b = (color & 0xff); - - if (r != (0xf0 | i1) || g != x + loadrect.left - loadpoint.x || - b != y + loadrect.top - loadpoint.y) diff_count++; - } - } - } - - hr = IDirectDrawSurface7_Unlock(texture_levels[1][i], NULL); - ok(hr==DD_OK, "IDirectDrawSurface7_Unlock returned: %x\n",hr); - - ok(diff_count == 0, "Unexpected destination texture level pixels; %u differences at %d level\n", diff_count, i1); - - i++; - } - - loadpoint.x /= 2; - loadpoint.y /= 2; - loadrect.top /= 2; - loadrect.left /= 2; - loadrect.right = (loadrect.right + 1) / 2; - loadrect.bottom = (loadrect.bottom + 1) / 2; - } - - for (i = 0; i < 2; i++) - { - for (i1 = 7; i1 >= 0; i1--) - { - if (texture_levels[i][i1]) IDirectDrawSurface7_Release(texture_levels[i][i1]); - } - } - memset(texture_levels, 0, sizeof(texture_levels)); - } - - /* Test palette copying. */ - for (i = 0; i < 2; i++) - { - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; - ddsd.dwWidth = 128; - ddsd.dwHeight = 128; - U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); - U4(ddsd).ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED8; - U1(U4(ddsd).ddpfPixelFormat).dwRGBBitCount = 8; - hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &texture_levels[i][0], NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - if (FAILED(hr)) goto out; - - /* Check the number of created mipmaps */ - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - hr = IDirectDrawSurface7_GetSurfaceDesc(texture_levels[i][0], &ddsd); - ok(hr==DD_OK,"IDirectDrawSurface7_GetSurfaceDesc returned: %x\n",hr); - ok(U2(ddsd).dwMipMapCount == 8, "unexpected mip count %u\n", U2(ddsd).dwMipMapCount); - if (U2(ddsd).dwMipMapCount != 8) goto out; - - for (i1 = 1; i1 < 8; i1++) - { - hr = IDirectDrawSurface7_GetAttachedSurface(texture_levels[i][i1 - 1], &ddsd.ddsCaps, &texture_levels[i][i1]); - ok(hr == DD_OK, "GetAttachedSurface returned %08x\n", hr); - if (FAILED(hr)) goto out; - } - } - - memset(table1, 0, sizeof(table1)); - for (i = 0; i < 3; i++) - { - table1[0].peBlue = i + 1; - hr = IDirectDraw7_CreatePalette(lpDD, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, table1, &palettes[i], NULL); - ok(hr == DD_OK, "CreatePalette returned %08x\n", hr); - if (FAILED(hr)) - { - skip("IDirectDraw7_CreatePalette failed; skipping further tests\n"); - goto out; - } - } - - hr = IDirectDrawSurface7_SetPalette(texture_levels[0][0], palettes[0]); - ok(hr==DD_OK, "IDirectDrawSurface7_SetPalette returned: %x\n", hr); - - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][0], NULL, texture_levels[0][0], NULL, 0); - ok(hr==D3D_OK, "IDirect3DDevice7_Load returned: %x\n",hr); - - hr = IDirectDrawSurface7_GetPalette(texture_levels[0][1], &palettes[4]); - ok(hr==DDERR_NOPALETTEATTACHED, "IDirectDrawSurface7_GetPalette returned: %x\n", hr); - - hr = IDirectDrawSurface7_GetPalette(texture_levels[1][0], &palettes[4]); - ok(hr==DDERR_NOPALETTEATTACHED, "IDirectDrawSurface7_GetPalette returned: %x\n", hr); - - hr = IDirectDrawSurface7_SetPalette(texture_levels[0][1], palettes[1]); - ok(hr==DDERR_NOTONMIPMAPSUBLEVEL, "IDirectDrawSurface7_SetPalette returned: %x\n", hr); - hr = IDirectDrawSurface7_SetPalette(texture_levels[1][0], palettes[2]); - ok(hr==DD_OK, "IDirectDrawSurface7_SetPalette returned: %x\n", hr); - - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][0], NULL, texture_levels[0][0], NULL, 0); - ok(hr==D3D_OK, "IDirect3DDevice7_Load returned: %x\n",hr); - - memset(table1, 0, sizeof(table1)); - hr = IDirectDrawSurface7_GetPalette(texture_levels[1][0], &palettes[4]); - ok(hr==DD_OK, "IDirectDrawSurface7_GetPalette returned: %x\n", hr); - if (SUCCEEDED(hr)) - { - hr = IDirectDrawPalette_GetEntries(palettes[4], 0, 0, 256, table1); - ok(hr == DD_OK, "IDirectDrawPalette_GetEntries returned %08x\n", hr); - ok(table1[0].peBlue == 1, "Unexpected palette color after load: %u\n", (unsigned)table1[0].peBlue); - } - - /* Test colorkey copying. */ - ddckey.dwColorSpaceLowValue = ddckey.dwColorSpaceHighValue = 64; - hr = IDirectDrawSurface7_SetColorKey(texture_levels[0][0], DDCKEY_SRCBLT, &ddckey); - ok(hr==DD_OK, "IDirectDrawSurface7_SetColorKey returned: %x\n", hr); - hr = IDirectDrawSurface7_SetColorKey(texture_levels[0][1], DDCKEY_SRCBLT, &ddckey); - ok(hr == DDERR_NOTONMIPMAPSUBLEVEL, "Got unexpected hr %#x.\n", hr); - - hr = IDirectDrawSurface7_GetColorKey(texture_levels[1][0], DDCKEY_SRCBLT, &ddckey); - ok(hr==DDERR_NOCOLORKEY, "IDirectDrawSurface7_GetColorKey returned: %x\n", hr); - - hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][0], NULL, texture_levels[0][0], NULL, 0); - ok(hr==D3D_OK, "IDirect3DDevice7_Load returned: %x\n",hr); - - hr = IDirectDrawSurface7_GetColorKey(texture_levels[1][0], DDCKEY_SRCBLT, &ddckey); - ok(hr==DD_OK, "IDirectDrawSurface7_GetColorKey returned: %x\n", hr); - ok(ddckey.dwColorSpaceLowValue == ddckey.dwColorSpaceHighValue && ddckey.dwColorSpaceLowValue == 64, - "Unexpected color key values: %u - %u\n", ddckey.dwColorSpaceLowValue, ddckey.dwColorSpaceHighValue); - - out: - - for (i = 0; i < 5; i++) - { - if (palettes[i]) IDirectDrawPalette_Release(palettes[i]); - } - - for (i = 0; i < 2; i++) - { - for (i1 = 7; i1 >= 0; i1--) - { - if (texture_levels[i][i1]) IDirectDrawSurface7_Release(texture_levels[i][i1]); - } - } - - for (i = 0; i < 2; i++) - for (i1 = 5; i1 >= 0; i1--) - for (i2 = 7; i2 >= 0; i2--) - { - if (cube_face_levels[i][i1][i2]) IDirectDrawSurface7_Release(cube_face_levels[i][i1][i2]); - } -} - static void SetMaterialTest(void) { HRESULT rc; @@ -3422,7 +2365,6 @@ START_TEST(d3d) SetMaterialTest(); CapsTest(); VertexBufferDescTest(); - DeviceLoadTest(); SetRenderTargetTest(); VertexBufferLockRest(); z_format_test(); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 35a45c03456..4b9d367a748 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -14267,6 +14267,487 @@ static void test_viewport(void) DestroyWindow(window); } +static unsigned int validate_loaded_surface(IDirectDrawSurface7 *surface, unsigned int face, + unsigned int level, const RECT *src_rect, const POINT *dst_point) +{ + DDSURFACEDESC2 surface_desc; + unsigned int diff, x, y; + HRESULT hr; + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface7_Lock(surface, NULL, &surface_desc, DDLOCK_WAIT, NULL); + ok(SUCCEEDED(hr), "Failed to map surface, hr %#x.\n", hr); + + for (y = 0, diff = 0; y < surface_desc.dwHeight; ++y) + { + DWORD *texture_row = (DWORD *)((char *)surface_desc.lpSurface + y * U1(surface_desc).lPitch); + + for (x = 0; x < surface_desc.dwWidth; ++x) + { + DWORD colour = texture_row[x]; + DWORD r = (colour & 0xff0000) >> 16; + DWORD g = (colour & 0xff00) >> 8; + DWORD b = (colour & 0xff); + + if (x < dst_point->x || x >= dst_point->x + src_rect->right - src_rect->left + || y < dst_point->y || y >= dst_point->y + src_rect->bottom - src_rect->top) + { + if (colour & 0xffffff) + ++diff; + } + else + { + if (r != ((face << 4) | level) + || g != x + src_rect->left - dst_point->x + || b != y + src_rect->top - dst_point->y) + ++diff; + } + } + } + + hr = IDirectDrawSurface7_Unlock(surface, NULL); + ok(SUCCEEDED(hr), "Failed to unmap surface, hr %#x.\n", hr); + + return diff; +} + +static void test_device_load(void) +{ + IDirectDrawSurface7 *src_surface, *dst_surface, *surface, *tmp; + DDSCAPS2 mip_caps = {0, DDSCAPS2_MIPMAPSUBLEVEL, 0, {0}}; + IDirectDrawPalette *src_palette, *dst_palette, *palette; + unsigned int i, j, k, l, x, y; + DDSURFACEDESC2 surface_desc; + IDirect3DDevice7 *device; + PALETTEENTRY table1[256]; + D3DDEVICEDESC7 d3d_caps; + DDCOLORKEY colour_key; + IDirectDraw7 *ddraw; + BOOL cube_support; + IDirect3D7 *d3d; + ULONG refcount; + HWND window; + DDBLTFX fx; + HRESULT hr; + +#define TEX_MIP 0x01 +#define TEX_CUBE 0x02 +#define NULL_COORDS 0x04 + + /* Creating partial cube maps (e.g. created with just + * DDSCAPS2_CUBEMAP_POSITIVEX) BSODs some Windows machines. (Radeon X1600, + * Windows XP, Catalyst 10.2 driver, 6.14.10.6925) + * + * Passing non-toplevel surfaces to IDirect3DDevice7_Load() crashes on + * native. (Windows XP / NVIDIA, Windows 98 / RGB software rasteriser) */ + static const struct + { + unsigned int src_w, src_h, src_mip_count; + RECT src_rect; + DWORD src_flags; + unsigned int dst_w, dst_h, dst_mip_count; + POINT dst_point; + DWORD dst_flags; + HRESULT hr; + } + tests[] = + { + {128, 128, 0, { 0, 0, 0, 0}, TEX_MIP, 128, 128, 0, { 0, 0}, TEX_MIP, DDERR_INVALIDPARAMS}, + {128, 128, 0, { 0, 0, 100, 100}, TEX_MIP, 128, 128, 0, {50, 50}, TEX_MIP, DDERR_INVALIDPARAMS}, + {128, 128, 0, {30, 20, 93, 52}, TEX_MIP, 128, 128, 0, {31, 31}, TEX_MIP, D3D_OK}, + {128, 128, 0, { 0, 0, 0, 0}, NULL_COORDS, 128, 128, 0, { 0, 0}, NULL_COORDS, D3D_OK}, + {128, 128, 0, { 0, 0, 0, 0}, NULL_COORDS, 256, 128, 0, { 0, 0}, NULL_COORDS, DDERR_INVALIDPARAMS}, + {256, 128, 0, { 0, 0, 0, 0}, NULL_COORDS, 128, 128, 0, { 0, 0}, NULL_COORDS, DDERR_INVALIDPARAMS}, + {128, 128, 0, {30, 20, 93, 52}, TEX_MIP | TEX_CUBE, 128, 128, 0, {10, 10}, TEX_MIP | TEX_CUBE, D3D_OK}, + {128, 128, 0, { 0, 0, 0, 0}, NULL_COORDS, 128, 128, 0, { 0, 0}, TEX_CUBE | NULL_COORDS, DDERR_INVALIDPARAMS}, + {128, 128, 0, {30, 20, 93, 52}, TEX_MIP, 128, 128, 4, {31, 31}, TEX_MIP, D3D_OK}, + {128, 128, 4, {30, 20, 93, 52}, TEX_MIP, 128, 128, 0, {31, 31}, TEX_MIP, DDERR_INVALIDPARAMS}, + {128, 128, 0, {32, 32, 96, 96}, TEX_MIP, 32, 32, 0, {32, 32}, 0, D3D_OK}, + {128, 128, 0, { 0, 0, 64, 64}, TEX_MIP, 32, 32, 4, { 0, 0}, TEX_MIP, D3D_OK}, + }; + + window = create_window(); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + 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 ddraw interface, hr %#x.\n", hr); + IDirect3D7_Release(d3d); + + memset(&d3d_caps, 0, sizeof(d3d_caps)); + hr = IDirect3DDevice7_GetCaps(device, &d3d_caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + cube_support = d3d_caps.dpcTriCaps.dwTextureCaps & D3DPTEXTURECAPS_CUBEMAP; + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + unsigned int src_count, dst_count; + POINT dst_point, dst_point_broken; + RECT src_rect, src_rect_broken; + + if ((tests[i].src_flags | tests[i].dst_flags) & TEX_CUBE && !cube_support) + { + skip("No cubemap support, skipping test %u.\n", i); + continue; + } + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + if (tests[i].src_mip_count) + surface_desc.dwFlags |= DDSD_MIPMAPCOUNT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + if (tests[i].src_flags & (TEX_MIP | TEX_CUBE)) + surface_desc.ddsCaps.dwCaps |= DDSCAPS_COMPLEX; + if (tests[i].src_flags & TEX_MIP) + surface_desc.ddsCaps.dwCaps |= DDSCAPS_MIPMAP; + if (tests[i].src_flags & TEX_CUBE) + surface_desc.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES; + surface_desc.dwWidth = tests[i].src_w; + surface_desc.dwHeight = tests[i].src_h; + U2(surface_desc).dwMipMapCount = tests[i].src_mip_count; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 32; + U2(U4(surface_desc).ddpfPixelFormat).dwRBitMask = 0x00ff0000; + U3(U4(surface_desc).ddpfPixelFormat).dwGBitMask = 0x0000ff00; + U4(U4(surface_desc).ddpfPixelFormat).dwBBitMask = 0x000000ff; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &src_surface, NULL); + ok(SUCCEEDED(hr), "Test %u: Failed to create source surface, hr %#x.\n", i, hr); + + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + if (tests[i].dst_mip_count) + surface_desc.dwFlags |= DDSD_MIPMAPCOUNT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + if (tests[i].dst_flags & (TEX_MIP | TEX_CUBE)) + surface_desc.ddsCaps.dwCaps |= DDSCAPS_COMPLEX; + if (tests[i].dst_flags & TEX_MIP) + surface_desc.ddsCaps.dwCaps |= DDSCAPS_MIPMAP; + surface_desc.ddsCaps.dwCaps2 = 0; + if (tests[i].dst_flags & TEX_CUBE) + surface_desc.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_ALLFACES; + surface_desc.dwWidth = tests[i].dst_w; + surface_desc.dwHeight = tests[i].dst_h; + U2(surface_desc).dwMipMapCount = tests[i].dst_mip_count; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &dst_surface, NULL); + ok(SUCCEEDED(hr), "Test %u: Failed to create destination surface, hr %#x.\n", i, hr); + + src_count = dst_count = 1; + if (tests[i].src_flags & TEX_MIP) + src_count = tests[i].src_mip_count ? tests[i].src_mip_count : 8; + if (tests[i].dst_flags & TEX_MIP) + dst_count = tests[i].dst_mip_count ? tests[i].dst_mip_count : 8; + + surface = src_surface; + IDirectDrawSurface7_AddRef(surface); + for (j = 0;;) + { + DDSCAPS2 face_caps = {0, 0, 0, {0}}; + + /* Check the number of created mipmaps. */ + if (tests[i].src_flags & TEX_MIP) + { + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Test %u: Failed to get surface description, hr %#x.\n", i, hr); + ok(U2(surface_desc).dwMipMapCount == src_count, + "Test %u: Got unexpected mip count %u, expected %u.\n", + i, U2(surface_desc).dwMipMapCount, src_count); + } + + for (k = 0; ; ++k) + { + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface7_Lock(surface, NULL, &surface_desc, DDLOCK_WAIT, NULL); + ok(SUCCEEDED(hr), "Test %u: Failed to map surface, hr %#x.\n", i, hr); + + for (y = 0; y < surface_desc.dwHeight; ++y) + { + DWORD *texture_row = (DWORD *)((BYTE *)surface_desc.lpSurface + y * U1(surface_desc).lPitch); + + for (x = 0; x < surface_desc.dwWidth; ++x) + { + /* The face number is stored in the high 4 bits of the + * red component, the mip-level in the low 4 bits. The + * x-coordinate is stored in the green component, and + * the y-coordinate in the blue component. */ + texture_row[x] = (j << 20) | (k << 16) | (x << 8) | y; + } + } + + hr = IDirectDrawSurface7_Unlock(surface, NULL); + ok(SUCCEEDED(hr), "Test %u: Failed to unmap surface, hr %#x.\n", i, hr); + + hr = IDirectDrawSurface7_GetAttachedSurface(surface, &mip_caps, &tmp); + IDirectDrawSurface7_Release(surface); + if (FAILED(hr)) + break; + surface = tmp; + } + + if (!(tests[i].src_flags & TEX_CUBE) || ++j >= 6) + break; + + face_caps.dwCaps2 = DDSCAPS2_CUBEMAP | (DDSCAPS2_CUBEMAP_POSITIVEX << j); + hr = IDirectDrawSurface7_GetAttachedSurface(src_surface, &face_caps, &surface); + ok(SUCCEEDED(hr), "Test %u: Failed to get face %u.\n", i, j); + } + + surface = dst_surface; + IDirectDrawSurface7_AddRef(surface); + for (j = 0;;) + { + DDSCAPS2 face_caps = {0, 0, 0, {0}}; + + /* Check the number of created mipmaps. */ + if (tests[i].dst_flags & TEX_MIP) + { + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &surface_desc); + ok(SUCCEEDED(hr), "Test %u: Failed to get surface description, hr %#x.\n", i, hr); + ok(U2(surface_desc).dwMipMapCount == dst_count, + "Test %u: Got unexpected mip count %u, expected %u.\n", + i, U2(surface_desc).dwMipMapCount, dst_count); + } + + for (;;) + { + memset(&fx, 0, sizeof(fx)); + fx.dwSize = sizeof(fx); + U5(fx).dwFillColor = 0x00000000; + hr = IDirectDrawSurface7_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); + ok(SUCCEEDED(hr), "Test %u: Failed to clear surface, hr %#x.\n", i, hr); + + hr = IDirectDrawSurface7_GetAttachedSurface(surface, &mip_caps, &tmp); + IDirectDrawSurface7_Release(surface); + if (FAILED(hr)) + break; + surface = tmp; + } + + if (!(tests[i].dst_flags & TEX_CUBE) || ++j >= 6) + break; + + face_caps.dwCaps2 = DDSCAPS2_CUBEMAP | (DDSCAPS2_CUBEMAP_POSITIVEX << j); + hr = IDirectDrawSurface7_GetAttachedSurface(dst_surface, &face_caps, &surface); + ok(SUCCEEDED(hr), "Test %u: Failed to get face %u.\n", i, j); + } + + src_rect = tests[i].src_rect; + dst_point = tests[i].dst_point; + hr = IDirect3DDevice7_Load(device, + dst_surface, tests[i].dst_flags & NULL_COORDS ? NULL : &dst_point, + src_surface, tests[i].src_flags & NULL_COORDS ? NULL : &src_rect, + tests[i].dst_flags & TEX_CUBE ? DDSCAPS2_CUBEMAP_ALLFACES : 0); + ok(hr == tests[i].hr, "Test %u: Got unexpected hr %#x.\n", i, hr); + + if (SUCCEEDED(hr)) + { + unsigned int level_offset, level_offset_broken; + + for (level_offset = 0, k = tests[i].src_w; k > tests[i].dst_w; ++level_offset, k /= 2); + level_offset_broken = src_count - dst_count; + + surface = dst_surface; + IDirectDrawSurface7_AddRef(surface); + for (j = 0;;) + { + DDSCAPS2 face_caps = {0, 0, 0, {0}}; + + if (tests[i].src_flags & NULL_COORDS) + SetRect(&src_rect, 0, 0, tests[i].src_w, tests[i].src_h); + else + src_rect = tests[i].src_rect; + + if (tests[i].dst_flags & NULL_COORDS) + dst_point.x = dst_point.y = 0; + else + dst_point = tests[i].dst_point; + + for (k = 0; k < level_offset; ++k) + { + dst_point.x /= 2; + dst_point.y /= 2; + src_rect.top /= 2; + src_rect.left /= 2; + src_rect.right = (src_rect.right + 1) / 2; + src_rect.bottom = (src_rect.bottom + 1) / 2; + } + + for (k = 0; ; ++k) + { + unsigned int diff, diff2, diff3; + + diff = validate_loaded_surface(surface, j, k + level_offset, &src_rect, &dst_point); + + /* On some newer (XP+) versions of Windows, it appears the + * source/destination coordinates are divided too often. + * This works correctly on Windows 98 with the RGB + * software rasteriser. */ + src_rect_broken = src_rect; + dst_point_broken = dst_point; + for (l = 0; l < level_offset; ++l) + { + dst_point_broken.x /= 2; + dst_point_broken.y /= 2; + src_rect_broken.top /= 2; + src_rect_broken.left /= 2; + src_rect_broken.right = (src_rect_broken.right + 1) / 2; + src_rect_broken.bottom = (src_rect_broken.bottom + 1) / 2; + } + diff2 = validate_loaded_surface(surface, j, k + level_offset, + &src_rect_broken, &dst_point_broken); + + /* On Windows 8+ things are slightly worse still. Instead + * of applying the correct level offset twice, like on + * XP+, an incorrect offset is applied in addition to the + * correct one. Additionally, on Windows 8+, this offset + * also affects the selected source mip-level, as opposed + * to Windows XP+ where it only affects the + * source/destination coordinates. */ + src_rect_broken = src_rect; + dst_point_broken = dst_point; + for (l = 0; l < level_offset_broken; ++l) + { + dst_point_broken.x /= 2; + dst_point_broken.y /= 2; + src_rect_broken.top /= 2; + src_rect_broken.left /= 2; + src_rect_broken.right = (src_rect_broken.right + 1) / 2; + src_rect_broken.bottom = (src_rect_broken.bottom + 1) / 2; + } + diff3 = validate_loaded_surface(surface, j, k + level_offset_broken, + &src_rect_broken, &dst_point_broken); + + ok(!diff || broken(!diff2 || !diff3), "Test %u, face %u, level %u: " + "Unexpected destination texture level pixels; %u/%u/%u differences.\n", + i, j, k, diff, diff2, diff3); + + hr = IDirectDrawSurface7_GetAttachedSurface(surface, &mip_caps, &tmp); + IDirectDrawSurface7_Release(surface); + if (FAILED(hr)) + break; + surface = tmp; + + dst_point.x /= 2; + dst_point.y /= 2; + src_rect.top /= 2; + src_rect.left /= 2; + src_rect.right = (src_rect.right + 1) / 2; + src_rect.bottom = (src_rect.bottom + 1) / 2; + } + + if (!(tests[i].dst_flags & TEX_CUBE) || ++j >= 6) + break; + + face_caps.dwCaps2 = DDSCAPS2_CUBEMAP | (DDSCAPS2_CUBEMAP_POSITIVEX << j); + hr = IDirectDrawSurface7_GetAttachedSurface(dst_surface, &face_caps, &surface); + ok(SUCCEEDED(hr), "Test %u: Failed to get face %u.\n", i, j); + } + } + + IDirectDrawSurface7_Release(dst_surface); + IDirectDrawSurface7_Release(src_surface); + } +#undef TEX_MIP +#undef TEX_CUBE +#undef NULL_COORDS + + memset(&surface_desc, 0, sizeof(surface_desc)); + surface_desc.dwSize = sizeof(surface_desc); + surface_desc.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT; + surface_desc.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX | DDSCAPS_MIPMAP; + surface_desc.dwWidth = 128; + surface_desc.dwHeight = 128; + U4(surface_desc).ddpfPixelFormat.dwSize = sizeof(U4(surface_desc).ddpfPixelFormat); + U4(surface_desc).ddpfPixelFormat.dwFlags = DDPF_RGB | DDPF_PALETTEINDEXED8; + U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount = 8; + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &src_surface, NULL); + ok(SUCCEEDED(hr), "Failed to create source surface, hr %#x.\n", hr); + hr = IDirectDraw7_CreateSurface(ddraw, &surface_desc, &dst_surface, NULL); + ok(SUCCEEDED(hr), "Failed to create destination surface, hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetAttachedSurface(src_surface, &mip_caps, &surface); + ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr); + + /* Test palette copying. */ + memset(table1, 0, sizeof(table1)); + table1[0].peBlue = 1; + hr = IDirectDraw7_CreatePalette(ddraw, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, table1, &src_palette, NULL); + ok(SUCCEEDED(hr), "Failed to create source palette, hr %#x.\n", hr); + table1[0].peBlue = 3; + hr = IDirectDraw7_CreatePalette(ddraw, DDPCAPS_ALLOW256 | DDPCAPS_8BIT, table1, &dst_palette, NULL); + ok(SUCCEEDED(hr), "Failed to create destination palette, hr %#x.\n", hr); + + hr = IDirectDrawSurface7_SetPalette(src_surface, src_palette); + ok(SUCCEEDED(hr), "Failed to set palette, hr %#x.\n", hr); + + hr = IDirect3DDevice7_Load(device, dst_surface, NULL, src_surface, NULL, 0); + ok(SUCCEEDED(hr), "Failed to load texture, hr %#x.\n", hr); + + hr = IDirectDrawSurface7_GetPalette(surface, &palette); + ok(hr == DDERR_NOPALETTEATTACHED, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetPalette(dst_surface, &palette); + ok(hr == DDERR_NOPALETTEATTACHED, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDrawSurface7_SetPalette(surface, src_palette); + ok(hr == DDERR_NOTONMIPMAPSUBLEVEL, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_SetPalette(dst_surface, dst_palette); + ok(SUCCEEDED(hr), "Failed to set palette, hr %#x.\n", hr); + + hr = IDirect3DDevice7_Load(device, dst_surface, NULL, src_surface, NULL, 0); + ok(SUCCEEDED(hr), "Failed to load texture, hr %#x.\n", hr); + + hr = IDirectDrawSurface7_GetPalette(dst_surface, &palette); + ok(SUCCEEDED(hr), "Failed to get palette, hr %#x.\n", hr); + ok(palette == dst_palette, "Got unexpected palette %p, expected %p.\n", palette, dst_palette); + memset(table1, 0, sizeof(table1)); + hr = IDirectDrawPalette_GetEntries(palette, 0, 0, 256, table1); + ok(SUCCEEDED(hr), "Failed to retrieve palette entries, hr %#x.\n", hr); + ok(table1[0].peBlue == 1, "Got unexpected palette colour %#x.\n", (unsigned int)table1[0].peBlue); + IDirectDrawPalette_Release(palette); + + IDirectDrawPalette_Release(dst_palette); + IDirectDrawPalette_Release(src_palette); + + /* Test colour-key copying. */ + colour_key.dwColorSpaceLowValue = 32; + colour_key.dwColorSpaceHighValue = 64; + hr = IDirectDrawSurface7_SetColorKey(src_surface, DDCKEY_SRCBLT, &colour_key); + ok(SUCCEEDED(hr), "Failed to set colour-key, hr %#x.\n", hr); + hr = IDirectDrawSurface7_SetColorKey(surface, DDCKEY_SRCBLT, &colour_key); + ok(hr == DDERR_NOTONMIPMAPSUBLEVEL, "Got unexpected hr %#x.\n", hr); + + hr = IDirectDrawSurface7_GetColorKey(dst_surface, DDCKEY_SRCBLT, &colour_key); + ok(hr == DDERR_NOCOLORKEY, "Got unexpected hr %#x.\n", hr); + + hr = IDirect3DDevice7_Load(device, dst_surface, NULL, src_surface, NULL, 0); + ok(SUCCEEDED(hr), "Failed to load texture, hr %#x.\n", hr); + + hr = IDirectDrawSurface7_GetColorKey(dst_surface, DDCKEY_SRCBLT, &colour_key); + ok(SUCCEEDED(hr), "Failed to get colour-key, hr %#x.\n", hr); + ok(colour_key.dwColorSpaceLowValue == 32, "Got unexpected value %u.\n", colour_key.dwColorSpaceLowValue); + ok(colour_key.dwColorSpaceHighValue == 32, "Got unexpected value %u.\n", colour_key.dwColorSpaceHighValue); + + IDirectDrawSurface7_Release(surface); + IDirectDrawSurface7_Release(dst_surface); + IDirectDrawSurface7_Release(src_surface); + + IDirectDraw7_Release(ddraw); + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -14402,4 +14883,5 @@ START_TEST(ddraw7) test_clear(); test_enum_surfaces(); test_viewport(); + test_device_load(); } -- 2.11.0

2 1

[PATCH 12/12] ddraw/tests: Add a test for D3DMCS_COLOR{1/2}.
by Henri Verbeet 04 Aug '18

04 Aug '18

From: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- A ddraw4 version is on my TODO list. ddraw1 and ddraw2 cannot use lighting and per-vertex colour at the same time due to the predefined D3D*VERTEX structs. ddraw4 can, and it has D3DLIGHTSTATE_COLORVERTEX, but the material source states are missing. I assume that one or more of the material properties then track the vertex colour, but I have to find out which. --- dlls/ddraw/tests/ddraw7.c | 134 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 4b9d367a748..cc1662293c0 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -14748,6 +14748,139 @@ static void test_device_load(void) DestroyWindow(window); } +static void test_color_vertex(void) +{ + IDirect3DDevice7 *device; + IDirectDrawSurface7 *rt; + D3DMATERIAL7 material; + D3DCOLOR colour; + unsigned int i; + ULONG refcount; + HWND window; + HRESULT hr; + + static struct + { + struct vec3 position; + DWORD diffuse; + DWORD specular; + } + quad_2c[] = + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000, 0xff00ff00}, + {{-1.0f, 1.0f, 0.0f}, 0xffff0000, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xffff0000, 0xff00ff00}, + {{ 1.0f, 1.0f, 0.0f}, 0xffff0000, 0xff00ff00}, + }; + static struct + { + struct vec3 position; + DWORD colour; + } + quad_1c[] = + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{-1.0f, 1.0f, 0.0f}, 0xffff0000}, + {{ 1.0f, -1.0f, 0.0f}, 0xffff0000}, + {{ 1.0f, 1.0f, 0.0f}, 0xffff0000}, + }; + static struct + { + struct vec3 position; + } + quad_0c[] = + { + {{-1.0f, -1.0f, 0.0f}}, + {{-1.0f, 1.0f, 0.0f}}, + {{ 1.0f, -1.0f, 0.0f}}, + {{ 1.0f, 1.0f, 0.0f}}, + }; + + /* The idea here is to set up ambient light parameters in a way that the + * ambient colour from the material is just passed through. The emissive + * colour is just passed through anyway. The sum of ambient + emissive + * should allow deduction of where the material colour came from. */ + static const struct + { + DWORD fvf, color_vertex, ambient, emissive, result; + void *vtx; + } + tests[] = + { + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, FALSE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x000000c0, quad_2c}, + + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x00ffff00, quad_2c}, + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_MATERIAL, D3DMCS_COLOR2, 0x0000ff80, quad_2c}, + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_MATERIAL, 0x00ff0040, quad_2c}, + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR1, 0x00ff0000, quad_2c}, + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR2, D3DMCS_COLOR2, 0x0000ff00, quad_2c}, + + {D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x00ff0080, quad_1c}, + {D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_MATERIAL, 0x000000c0, quad_1c}, + {D3DFVF_SPECULAR, TRUE, D3DMCS_MATERIAL, D3DMCS_COLOR2, 0x00ff0080, quad_1c}, + {D3DFVF_DIFFUSE, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x00ff0040, quad_1c}, + {D3DFVF_DIFFUSE, TRUE, D3DMCS_COLOR1, D3DMCS_MATERIAL, 0x00ff0040, quad_1c}, + {D3DFVF_DIFFUSE, TRUE, D3DMCS_COLOR2, D3DMCS_MATERIAL, 0x000000c0, quad_1c}, + + {0, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x000000c0, quad_0c}, + }; + + window = CreateWindowA("static", "d3d7_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create a 3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice7_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_LIGHTING, TRUE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_AMBIENT, 0xffffffff); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + memset(&material, 0, sizeof(material)); + U3(U1(material).ambient).b = 0.5f; + U3(U3(material).emissive).b = 0.25f; + hr = IDirect3DDevice7_SetMaterial(device, &material); + ok(SUCCEEDED(hr), "Failed to set material, hr %#x\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_COLORVERTEX, tests[i].color_vertex); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_AMBIENTMATERIALSOURCE, tests[i].ambient); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_EMISSIVEMATERIALSOURCE, tests[i].emissive); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice7_SetRenderState(device, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + hr = IDirect3DDevice7_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x77777777, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear depth/stencil, hr %#x.\n", hr); + + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, + D3DFVF_XYZ | tests[i].fvf, tests[i].vtx, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + colour = get_surface_color(rt, 320, 240); + ok(compare_color(colour, tests[i].result, 1), + "Expected colour 0x%08x for test %u, got 0x%08x.\n", + tests[i].result, i, colour); + } + + IDirectDrawSurface7_Release(rt); + refcount = IDirect3DDevice7_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(window); +} + START_TEST(ddraw7) { DDDEVICEIDENTIFIER2 identifier; @@ -14884,4 +15017,5 @@ START_TEST(ddraw7) test_enum_surfaces(); test_viewport(); test_device_load(); + test_color_vertex(); } -- 2.11.0

1 0

[PATCH 11/12] d3d8/tests: Add a test for D3DMCS_COLOR{1/2}.
by Henri Verbeet 04 Aug '18

04 Aug '18

From: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/tests/visual.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 3379f072cc4..24481bd0533 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -10335,6 +10335,118 @@ done: DestroyWindow(window); } +static void test_color_vertex(void) +{ + IDirect3DDevice8 *device; + D3DMATERIAL8 material; + IDirect3D8 *d3d; + D3DCOLOR colour; + unsigned int i; + ULONG refcount; + HWND window; + HRESULT hr; + + /* The idea here is to set up ambient light parameters in a way that the + * ambient colour from the material is just passed through. The emissive + * colour is just passed through anyway. The sum of ambient + emissive + * should allow deduction of where the material colour came from. + * + * Note that in cases without a D3DFVF_DIFFUSE flag the first colour value + * in the struct will be fed into the specular vertex colour slot. */ + static const struct + { + DWORD fvf, color_vertex, ambient, emissive, result; + } + tests[] = + { + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, FALSE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x000000c0}, + + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x00ffff00}, + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_MATERIAL, D3DMCS_COLOR2, 0x0000ff80}, + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_MATERIAL, 0x00ff0040}, + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR1, 0x00ff0000}, + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR2, D3DMCS_COLOR2, 0x0000ff00}, + + {D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x00ff0080}, + {D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_MATERIAL, 0x000000c0}, + {D3DFVF_SPECULAR, TRUE, D3DMCS_MATERIAL, D3DMCS_COLOR2, 0x00ff0080}, + {D3DFVF_DIFFUSE, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x00ff0040}, + {D3DFVF_DIFFUSE, TRUE, D3DMCS_COLOR1, D3DMCS_MATERIAL, 0x00ff0040}, + {D3DFVF_DIFFUSE, TRUE, D3DMCS_COLOR2, D3DMCS_MATERIAL, 0x000000c0}, + + {0, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x000000c0}, + }; + static const struct + { + struct vec3 position; + DWORD diffuse; + DWORD specular; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000, 0xff00ff00}, + {{-1.0f, 1.0f, 0.0f}, 0xffff0000, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xffff0000, 0xff00ff00}, + {{ 1.0f, 1.0f, 0.0f}, 0xffff0000, 0xff00ff00}, + }; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_LIGHTING, TRUE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_AMBIENT, 0xffffffff); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + memset(&material, 0, sizeof(material)); + material.Ambient.b = 0.5f; + material.Emissive.b = 0.25f; + hr = IDirect3DDevice8_SetMaterial(device, &material); + ok(SUCCEEDED(hr), "Failed to set material, hr %#x\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_COLORVERTEX, tests[i].color_vertex); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_AMBIENTMATERIALSOURCE, tests[i].ambient); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetRenderState(device, D3DRS_EMISSIVEMATERIALSOURCE, tests[i].emissive); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | tests[i].fvf); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x77777777, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear depth/stencil, hr %#x.\n", hr); + + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, tests[i].result, 1), + "Expected colour 0x%08x for test %u, got 0x%08x.\n", + tests[i].result, i, colour); + } + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER8 identifier; @@ -10408,4 +10520,5 @@ START_TEST(visual) test_drawindexedprimitiveup(); test_map_synchronisation(); test_viewport(); + test_color_vertex(); } -- 2.11.0

1 0

[PATCH 10/12] d3d9/tests: Add a test for D3DMCS_COLOR{1/2}.
by Henri Verbeet 04 Aug '18

04 Aug '18

From: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5567e72cef8..9c3e83d3005 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -24085,6 +24085,119 @@ done: DestroyWindow(window); } +static void test_color_vertex(void) +{ + IDirect3DDevice9 *device; + D3DMATERIAL9 material; + IDirect3D9 *d3d; + D3DCOLOR colour; + unsigned int i; + ULONG refcount; + HWND window; + HRESULT hr; + + /* The idea here is to set up ambient light parameters in a way that the + * ambient colour from the material is just passed through. The emissive + * colour is just passed through anyway. The sum of ambient + emissive + * should allow deduction of where the material colour came from. + * + * Note that in cases without a D3DFVF_DIFFUSE flag the first colour value + * in the struct will be fed into the specular vertex colour slot. */ + static const struct + { + DWORD fvf, color_vertex, ambient, emissive, result; + } + tests[] = + { + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, FALSE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x000000c0}, + + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x00ffff00}, + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_MATERIAL, D3DMCS_COLOR2, 0x0000ff80}, + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_MATERIAL, 0x00ff0040}, + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR1, 0x00ff0000}, + {D3DFVF_DIFFUSE | D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR2, D3DMCS_COLOR2, 0x0000ff00}, + + {D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x00ff0080}, + {D3DFVF_SPECULAR, TRUE, D3DMCS_COLOR1, D3DMCS_MATERIAL, 0x000000c0}, + {D3DFVF_SPECULAR, TRUE, D3DMCS_MATERIAL, D3DMCS_COLOR2, 0x00ff0080}, + {D3DFVF_DIFFUSE, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x00ff0040}, + {D3DFVF_DIFFUSE, TRUE, D3DMCS_COLOR1, D3DMCS_MATERIAL, 0x00ff0040}, + {D3DFVF_DIFFUSE, TRUE, D3DMCS_COLOR2, D3DMCS_MATERIAL, 0x000000c0}, + + {0, TRUE, D3DMCS_COLOR1, D3DMCS_COLOR2, 0x000000c0}, + }; + + static const struct + { + struct vec3 position; + DWORD diffuse; + DWORD specular; + } + quad[] = + { + {{-1.0f, -1.0f, 0.0f}, 0xffff0000, 0xff00ff00}, + {{-1.0f, 1.0f, 0.0f}, 0xffff0000, 0xff00ff00}, + {{ 1.0f, -1.0f, 0.0f}, 0xffff0000, 0xff00ff00}, + {{ 1.0f, 1.0f, 0.0f}, 0xffff0000, 0xff00ff00}, + }; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, TRUE); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_AMBIENT, 0xffffffff); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + memset(&material, 0, sizeof(material)); + material.Ambient.b = 0.5f; + material.Emissive.b = 0.25f; + hr = IDirect3DDevice9_SetMaterial(device, &material); + ok(SUCCEEDED(hr), "Failed to set material, hr %#x\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_COLORVERTEX, tests[i].color_vertex); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_AMBIENTMATERIALSOURCE, tests[i].ambient); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_EMISSIVEMATERIALSOURCE, tests[i].emissive); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | tests[i].fvf); + ok(SUCCEEDED(hr), "Failed to set render state, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x77777777, 0.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear depth/stencil, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + colour = getPixelColor(device, 320, 240); + ok(color_match(colour, tests[i].result, 1), + "Expected colour 0x%08x for test %u, got 0x%08x.\n", + tests[i].result, i, colour); + } + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + START_TEST(visual) { D3DADAPTER_IDENTIFIER9 identifier; @@ -24222,4 +24335,5 @@ START_TEST(visual) test_mvp_software_vertex_shaders(); test_null_format(); test_map_synchronisation(); + test_color_vertex(); } -- 2.11.0

1 0

[PATCH 06/12] d3d8/tests: Test DXT1 and DXT3 as well in volume_dxt5_test().
by Henri Verbeet 04 Aug '18

04 Aug '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/tests/visual.c | 160 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 108 insertions(+), 52 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index bed70d8a17c..3379f072cc4 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -4952,26 +4952,74 @@ done: DestroyWindow(window); } -static void volume_dxt5_test(void) +static void volume_dxtn_test(void) { IDirect3DVolumeTexture8 *texture; + struct surface_readback rb; IDirect3DDevice8 *device; + IDirect3DSurface8 *rt; D3DLOCKED_BOX box; + unsigned int i, j; IDirect3D8 *d3d; - unsigned int i; - D3DCOLOR color; ULONG refcount; + DWORD colour; HWND window; HRESULT hr; - static const char texture_data[] = + static const BYTE dxt1_data[] = { - /* A 8x4x2 texture consisting of 4 4x4 blocks. The colors of the blocks are red, green, blue and white. */ - 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xf8, 0x00, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, + 0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, + 0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 + }; + static const BYTE dxt3_data[] = + { + 0xff, 0xee, 0xff, 0xee, 0xff, 0xee, 0xff, 0xee, 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xdd, 0xff, 0xdd, 0xff, 0xdd, 0xff, 0xdd, 0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xcc, 0xff, 0xcc, 0xff, 0xcc, 0xff, 0xcc, 0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xbb, 0xff, 0xbb, 0xff, 0xbb, 0xff, 0xbb, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 + }; + static const BYTE dxt5_data[] = + { + /* A 8x4x2 texture consisting of 4 4x4 blocks. The colours of the + * blocks are red, green, blue and white. */ + 0xff, 0xff, 0x80, 0x0d, 0xd8, 0x80, 0x0d, 0xd8, 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }; + static const DWORD dxt1_expected_colours[] = + { + 0xffff0000, 0x00000000, 0xff00ff00, 0xff00ff00, + 0xff0000ff, 0xff0000ff, 0xffffffff, 0xffffffff, + }; + static const DWORD dxt3_expected_colours[] = + { + 0xffff0000, 0xeeff0000, 0xff00ff00, 0xdd00ff00, + 0xff0000ff, 0xcc0000ff, 0xffffffff, 0xbbffffff, + }; + static const DWORD dxt5_expected_colours[] = + { + 0xffff0000, 0x00ff0000, 0xff00ff00, 0xff00ff00, + 0xff0000ff, 0xff0000ff, 0xffffffff, 0xffffffff + }; + + static const struct + { + const char *name; + D3DFORMAT format; + const BYTE *data; + DWORD data_size; + const DWORD *expected_colours; + } + tests[] = + { + {"DXT1", D3DFMT_DXT1, dxt1_data, sizeof(dxt1_data), dxt1_expected_colours}, + {"DXT3", D3DFMT_DXT3, dxt3_data, sizeof(dxt3_data), dxt3_expected_colours}, + {"DXT5", D3DFMT_DXT5, dxt5_data, sizeof(dxt5_data), dxt5_expected_colours}, + }; + static const struct { struct vec3 position; @@ -4989,69 +5037,77 @@ static void volume_dxt5_test(void) {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, {{ 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.75f}}, }; - static const DWORD expected_colors[] = {0x00ff0000, 0x0000ff00, 0x000000ff, 0x00ffffff}; window = create_window(); d3d = Direct3DCreate8(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; } - if (FAILED(IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_DXT5))) + hr = IDirect3DDevice8_GetRenderTarget(device, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(tests); ++i) { - skip("Volume DXT5 textures are not supported, skipping test.\n"); - IDirect3DDevice8_Release(device); - goto done; - } + if (FAILED(IDirect3D8_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, tests[i].format))) + { + skip("%s volume textures are not supported, skipping test.\n", tests[i].name); + continue; + } + hr = IDirect3DDevice8_CreateVolumeTexture(device, 8, 4, 2, 1, 0, + tests[i].format, D3DPOOL_MANAGED, &texture); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); - hr = IDirect3DDevice8_CreateVolumeTexture(device, 8, 4, 2, 1, 0, D3DFMT_DXT5, - D3DPOOL_MANAGED, &texture); - ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + hr = IDirect3DVolumeTexture8_LockBox(texture, 0, &box, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); + memcpy(box.pBits, tests[i].data, tests[i].data_size); + hr = IDirect3DVolumeTexture8_UnlockBox(texture, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); - hr = IDirect3DVolumeTexture8_LockBox(texture, 0, &box, NULL, 0); - ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); - memcpy(box.pBits, texture_data, sizeof(texture_data)); - hr = IDirect3DVolumeTexture8_UnlockBox(texture, 0); - ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE3(0)); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)texture); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set colour op, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(SUCCEEDED(hr), "Failed to set colour arg, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(SUCCEEDED(hr), "Failed to set colour op, hr %#x.\n", hr); + hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MAGFILTER, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "Failed to set mag filter, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetVertexShader(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE3(0)); - ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)texture); - ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); - ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); - ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetTextureStageState(device, 0, D3DTSS_MAGFILTER, D3DTEXF_POINT); - ok(SUCCEEDED(hr), "Failed to set mag filter, hr %#x.\n", hr); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff00ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice8_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[0], sizeof(*quads)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[4], sizeof(*quads)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice8_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff00ff, 1.0f, 0); - ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); - hr = IDirect3DDevice8_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[0], sizeof(*quads)); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - hr = IDirect3DDevice8_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[4], sizeof(*quads)); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - hr = IDirect3DDevice8_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + get_rt_readback(rt, &rb); + for (j = 0; j < ARRAY_SIZE(dxt1_expected_colours); ++j) + { + colour = get_readback_color(&rb, 40 + 80 * j, 240); + ok(color_match(colour, tests[i].expected_colours[j], 1), + "Expected colour 0x%08x, got 0x%08x, case %u.\n", tests[i].expected_colours[j], colour, j); + } + release_surface_readback(&rb); - for (i = 0; i < 4; i++) - { - color = getPixelColor(device, 80 + 160 * i, 240); - ok (color_match(color, expected_colors[i], 1), - "Expected color 0x%08x, got 0x%08x, case %u.\n", expected_colors[i], color, i); + hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + IDirect3DVolumeTexture8_Release(texture); } - hr = IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); - IDirect3DVolumeTexture8_Release(texture); + IDirect3DSurface8_Release(rt); refcount = IDirect3DDevice8_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); done: @@ -10326,7 +10382,7 @@ START_TEST(visual) zenable_test(); resz_test(); fog_special_test(); - volume_dxt5_test(); + volume_dxtn_test(); volume_v16u16_test(); add_dirty_rect_test(); test_3dc_formats(); -- 2.11.0

1 0

[PATCH 05/12] d3d9/tests: Test DXT1 and DXT3 as well in volume_dxt5_test().
by Henri Verbeet 04 Aug '18

04 Aug '18

From: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d9/tests/visual.c | 162 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 110 insertions(+), 52 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b36c1890392..5567e72cef8 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -17741,26 +17741,74 @@ done: DestroyWindow(window); } -static void volume_dxt5_test(void) +static void volume_dxtn_test(void) { IDirect3DVolumeTexture9 *texture; + struct surface_readback rb; IDirect3DDevice9 *device; + IDirect3DSurface9 *rt; D3DLOCKED_BOX box; + unsigned int i, j; IDirect3D9 *d3d; - unsigned int i; ULONG refcount; - DWORD color; + DWORD colour; HWND window; HRESULT hr; - static const char texture_data[] = + static const BYTE dxt1_data[] = + { + 0x00, 0xf8, 0x00, 0xf8, 0xf0, 0xf0, 0xf0, 0xf0, + 0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, + 0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 + }; + static const BYTE dxt3_data[] = + { + 0xff, 0xee, 0xff, 0xee, 0xff, 0xee, 0xff, 0xee, 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xdd, 0xff, 0xdd, 0xff, 0xdd, 0xff, 0xdd, 0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xcc, 0xff, 0xcc, 0xff, 0xcc, 0xff, 0xcc, 0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xbb, 0xff, 0xbb, 0xff, 0xbb, 0xff, 0xbb, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 + }; + static const BYTE dxt5_data[] = { - /* A 8x4x2 texture consisting of 4 4x4 blocks. The colors of the blocks are red, green, blue and white. */ - 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, + /* A 8x4x2 texture consisting of 4 4x4 blocks. The colours of the + * blocks are red, green, blue and white. */ + 0xff, 0xff, 0x80, 0x0d, 0xd8, 0x80, 0x0d, 0xd8, 0x00, 0xf8, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x00, 0x1f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }; + static const DWORD dxt1_expected_colours[] = + { + 0xffff0000, 0x00000000, 0xff00ff00, 0xff00ff00, + 0xff0000ff, 0xff0000ff, 0xffffffff, 0xffffffff, + }; + static const DWORD dxt3_expected_colours[] = + { + 0xffff0000, 0xeeff0000, 0xff00ff00, 0xdd00ff00, + 0xff0000ff, 0xcc0000ff, 0xffffffff, 0xbbffffff, + }; + static const DWORD dxt5_expected_colours[] = + { + 0xffff0000, 0x00ff0000, 0xff00ff00, 0xff00ff00, + 0xff0000ff, 0xff0000ff, 0xffffffff, 0xffffffff + }; + + static const struct + { + const char *name; + D3DFORMAT format; + const BYTE *data; + DWORD data_size; + const DWORD *expected_colours; + } + tests[] = + { + {"DXT1", D3DFMT_DXT1, dxt1_data, sizeof(dxt1_data), dxt1_expected_colours}, + {"DXT3", D3DFMT_DXT3, dxt3_data, sizeof(dxt3_data), dxt3_expected_colours}, + {"DXT5", D3DFMT_DXT5, dxt5_data, sizeof(dxt5_data), dxt5_expected_colours}, + }; + static const struct { struct vec3 position; @@ -17778,67 +17826,77 @@ static void volume_dxt5_test(void) {{ 1.0f, -1.0f, 1.0f}, { 1.0f, 0.0f, 0.75f}}, {{ 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.75f}}, }; - static const DWORD expected_colors[] = {0x00ff0000, 0x0000ff00, 0x000000ff, 0x00ffffff}; window = create_window(); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); - if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, D3DFMT_DXT5))) - { - skip("DXT5 volume textures are not supported, skipping test.\n"); - goto done; - } + if (!(device = create_device(d3d, window, window, TRUE))) { skip("Failed to create a D3D device, skipping tests.\n"); goto done; } - hr = IDirect3DDevice9_CreateVolumeTexture(device, 8, 4, 2, 1, 0, D3DFMT_DXT5, - D3DPOOL_MANAGED, &texture, NULL); - ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &rt); + ok(SUCCEEDED(hr), "Failed to get render target, hr %#x.\n", hr); - hr = IDirect3DVolumeTexture9_LockBox(texture, 0, &box, NULL, 0); - ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); - memcpy(box.pBits, texture_data, sizeof(texture_data)); - hr = IDirect3DVolumeTexture9_UnlockBox(texture, 0); - ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, 0, D3DRTYPE_VOLUMETEXTURE, tests[i].format))) + { + skip("%s volume textures are not supported, skipping test.\n", tests[i].name); + continue; + } + hr = IDirect3DDevice9_CreateVolumeTexture(device, 8, 4, 2, 1, 0, + tests[i].format, D3DPOOL_MANAGED, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE3(0)); - ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); - ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); - ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); - ok(SUCCEEDED(hr), "Failed to set color arg, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); - ok(SUCCEEDED(hr), "Failed to set color op, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, D3DTEXF_POINT); - ok(SUCCEEDED(hr), "Failed to set mag filter, hr %#x.\n", hr); + hr = IDirect3DVolumeTexture9_LockBox(texture, 0, &box, NULL, 0); + ok(SUCCEEDED(hr), "Failed to lock volume texture, hr %#x.\n", hr); + memcpy(box.pBits, tests[i].data, tests[i].data_size); + hr = IDirect3DVolumeTexture9_UnlockBox(texture, 0); + ok(SUCCEEDED(hr), "Failed to unlock volume texture, hr %#x.\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff00ff, 1.0f, 0); - ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); - hr = IDirect3DDevice9_BeginScene(device); - ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[0], sizeof(*quads)); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[4], sizeof(*quads)); - ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); - hr = IDirect3DDevice9_EndScene(device); - ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1 | D3DFVF_TEXCOORDSIZE3(0)); + ok(SUCCEEDED(hr), "Failed to set FVF, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + ok(SUCCEEDED(hr), "Failed to set texture, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(SUCCEEDED(hr), "Failed to set colour op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_TEXTURE); + ok(SUCCEEDED(hr), "Failed to set colour arg, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(SUCCEEDED(hr), "Failed to set colour op, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, D3DTEXF_POINT); + ok(SUCCEEDED(hr), "Failed to set mag filter, hr %#x.\n", hr); - for (i = 0; i < 4; i++) - { - color = getPixelColor(device, 80 + 160 * i, 240); - ok (color_match(color, expected_colors[i], 1), - "Expected color 0x%08x, got 0x%08x, case %u.\n", expected_colors[i], color, i); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff00ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[0], sizeof(*quads)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, &quads[4], sizeof(*quads)); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + get_rt_readback(rt, &rb); + for (j = 0; j < ARRAY_SIZE(dxt1_expected_colours); ++j) + { + colour = get_readback_color(&rb, 40 + 80 * j, 240); + ok(color_match(colour, tests[i].expected_colours[j], 1), + "Expected colour 0x%08x, got 0x%08x, case %u.\n", tests[i].expected_colours[j], colour, j); + } + release_surface_readback(&rb); + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + IDirect3DVolumeTexture9_Release(texture); } - hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); - ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); - IDirect3DVolumeTexture9_Release(texture); + IDirect3DSurface9_Release(rt); refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); done: @@ -24131,7 +24189,7 @@ START_TEST(visual) zenable_test(); fog_special_test(); volume_srgb_test(); - volume_dxt5_test(); + volume_dxtn_test(); add_dirty_rect_test(); multisampled_depth_buffer_test(); resz_test(); -- 2.11.0

1 0

[PATCH 04/12] wined3d: Decompress DXTn 3D textures on upload.
by Henri Verbeet 04 Aug '18

04 Aug '18

From: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Connor McAdams <conmanx360(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/resource.c | 9 ++ dlls/wined3d/texture.c | 40 ++++-- dlls/wined3d/utils.c | 286 +++++++++++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 6 + 4 files changed, 304 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index b5dcdf012db..bf54245276a 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -477,3 +477,12 @@ void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) resource->draw_binding = WINED3D_LOCATION_TEXTURE_RGB; } } + +const struct wined3d_format *wined3d_resource_get_decompress_format(struct wined3d_resource *resource, + const struct wined3d_context *context) +{ + if (resource->format_flags & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE) + && !(context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL)) + return wined3d_get_format(context->gl_info, WINED3DFMT_B8G8R8A8_UNORM_SRGB, resource->usage); + return wined3d_get_format(context->gl_info, WINED3DFMT_B8G8R8A8_UNORM, resource->usage); +} diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c316906a957..ebdacfa2ee0 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1727,7 +1727,13 @@ void wined3d_texture_prepare_texture(struct wined3d_texture *texture, struct win if (texture->flags & alloc_flag) return; - if (format->conv_byte_count) + if (texture->resource.format_flags & WINED3DFMT_FLAG_DECOMPRESS) + { + TRACE("WINED3DFMT_FLAG_DECOMPRESS set.\n"); + texture->flags |= WINED3D_TEXTURE_CONVERTED; + format = wined3d_resource_get_decompress_format(&texture->resource, context); + } + else if (format->conv_byte_count) { texture->flags |= WINED3D_TEXTURE_CONVERTED; } @@ -1897,6 +1903,7 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s void *converted_mem = NULL; struct wined3d_format f; unsigned int level; + BOOL decompress; GLenum target; TRACE("texture %p, sub_resource_idx %u, context %p, format %s, src_box %s, data {%#x:%p}, " @@ -1948,20 +1955,31 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s bo.addr += src_box->left * format->byte_count; } - if (format->upload) + decompress = texture->resource.format_flags & WINED3DFMT_FLAG_DECOMPRESS; + if (format->upload || decompress) { + const struct wined3d_format *compressed_format = format; unsigned int dst_row_pitch, dst_slice_pitch; void *src_mem; - if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) - ERR("Converting a block-based format.\n"); + if (decompress) + { + format = wined3d_resource_get_decompress_format(&texture->resource, context); + } + else + { + if (texture->resource.format_flags & WINED3DFMT_FLAG_BLOCKS) + ERR("Converting a block-based format.\n"); - f = *format; - f.byte_count = format->conv_byte_count; - format = &f; + f = *format; + f.byte_count = format->conv_byte_count; + format = &f; + } wined3d_format_calculate_pitch(format, 1, update_w, update_h, &dst_row_pitch, &dst_slice_pitch); + /* Note that uploading 3D textures may require quite some address + * space; it may make sense to upload them per-slice instead. */ if (!(converted_mem = heap_calloc(update_d, dst_slice_pitch))) { ERR("Failed to allocate upload buffer.\n"); @@ -1970,8 +1988,12 @@ void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int s src_mem = context_map_bo_address(context, &bo, src_slice_pitch, GL_PIXEL_UNPACK_BUFFER, WINED3D_MAP_READ); - format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, - dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); + if (decompress) + compressed_format->decompress(src_mem, converted_mem, src_row_pitch, src_slice_pitch, + dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); + else + format->upload(src_mem, converted_mem, src_row_pitch, src_slice_pitch, + dst_row_pitch, dst_slice_pitch, update_w, update_h, update_d); context_unmap_bo_address(context, &bo, GL_PIXEL_UNPACK_BUFFER); bo.buffer_object = 0; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 937c1bc0df6..bac52022510 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -339,6 +339,230 @@ static const struct wined3d_format_base_flags format_base_flags[] = {WINED3DFMT_RESZ, WINED3DFMT_FLAG_EXTENSION}, }; +static void rgb888_from_rgb565(WORD rgb565, BYTE *r, BYTE *g, BYTE *b) +{ + BYTE c; + + /* (2⁸ - 1) / (2⁵ - 1) ≈ 2⁸ / (2⁵ + 2¹⁰) + * (2⁸ - 1) / (2⁶ - 1) ≈ 2⁸ / (2⁶ + 2¹²) */ + c = rgb565 >> 11; + *r = (c << 3) + (c >> 2); + c = (rgb565 >> 5) & 0x3f; + *g = (c << 2) + (c >> 4); + c = rgb565 & 0x1f; + *b = (c << 3) + (c >> 2); +} + +static void build_dxtn_colour_table(WORD colour0, WORD colour1, + DWORD colour_table[4], enum wined3d_format_id format_id) +{ + unsigned int i; + struct + { + BYTE r, g, b; + } c[4]; + + rgb888_from_rgb565(colour0, &c[0].r, &c[0].g, &c[0].b); + rgb888_from_rgb565(colour1, &c[1].r, &c[1].g, &c[1].b); + + if (format_id == WINED3DFMT_BC1_UNORM && colour0 <= colour1) + { + c[2].r = (c[0].r + c[1].r) / 2; + c[2].g = (c[0].g + c[1].g) / 2; + c[2].b = (c[0].b + c[1].b) / 2; + + c[3].r = 0; + c[3].g = 0; + c[3].b = 0; + } + else + { + for (i = 0; i < 2; ++i) + { + c[i + 2].r = (2 * c[i].r + c[1 - i].r) / 3; + c[i + 2].g = (2 * c[i].g + c[1 - i].g) / 3; + c[i + 2].b = (2 * c[i].b + c[1 - i].b) / 3; + } + } + + for (i = 0; i < 4; ++i) + { + colour_table[i] = (c[i].r << 16) | (c[i].g << 8) | c[i].b; + } +} + +static void build_dxtn_alpha_table(BYTE alpha0, BYTE alpha1, BYTE alpha_table[8]) +{ + unsigned int i; + + alpha_table[0] = alpha0; + alpha_table[1] = alpha1; + + if (alpha0 > alpha1) + { + for (i = 0; i < 6; ++i) + { + alpha_table[2 + i] = ((6 - i) * alpha0 + (i + 1) * alpha1) / 7; + } + return; + } + else + { + for (i = 0; i < 4; ++i) + { + alpha_table[2 + i] = ((4 - i) * alpha0 + (i + 1) * alpha1) / 5; + } + alpha_table[6] = 0x00; + alpha_table[7] = 0xff; + } +} + +static void decompress_dxtn_block(const BYTE *src, BYTE *dst, unsigned int width, + unsigned int height, unsigned int dst_row_pitch, enum wined3d_format_id format_id) +{ + const UINT64 *s = (const UINT64 *)src; + BOOL bc1_alpha = FALSE; + DWORD colour_table[4]; + BYTE alpha_table[8]; + UINT64 alpha_bits; + DWORD colour_bits; + unsigned int x, y; + BYTE colour_idx; + DWORD *dst_row; + BYTE alpha; + + if (format_id == WINED3DFMT_BC1_UNORM) + { + WORD colour0, colour1; + + alpha_bits = 0; + + colour0 = s[0] & 0xffff; + colour1 = (s[0] >> 16) & 0xffff; + colour_bits = (s[0] >> 32) & 0xffffffff; + build_dxtn_colour_table(colour0, colour1, colour_table, format_id); + if (colour0 <= colour1) + bc1_alpha = TRUE; + } + else + { + alpha_bits = s[0]; + if (format_id == WINED3DFMT_BC3_UNORM) + { + build_dxtn_alpha_table(alpha_bits & 0xff, (alpha_bits >> 8) & 0xff, alpha_table); + alpha_bits >>= 16; + } + + colour_bits = (s[1] >> 32) & 0xffffffff; + build_dxtn_colour_table(s[1] & 0xffff, (s[1] >> 16) & 0xffff, colour_table, format_id); + } + + for (y = 0; y < height; ++y) + { + dst_row = (DWORD *)&dst[y * dst_row_pitch]; + for (x = 0; x < width; ++x) + { + colour_idx = (colour_bits >> (y * 8 + x * 2)) & 0x3; + switch (format_id) + { + case WINED3DFMT_BC1_UNORM: + alpha = bc1_alpha && colour_idx == 3 ? 0x00 : 0xff; + break; + + case WINED3DFMT_BC2_UNORM: + alpha = (alpha_bits >> (y * 16 + x * 4)) & 0xf; + /* (2⁸ - 1) / (2⁴ - 1) ≈ 2⁸ / (2⁴ + 2⁸) */ + alpha |= alpha << 4; + break; + + case WINED3DFMT_BC3_UNORM: + alpha = alpha_table[(alpha_bits >> (y * 12 + x * 3)) & 0x7]; + break; + + default: + alpha = 0xff; + break; + } + dst_row[x] = (alpha << 24) | colour_table[colour_idx]; + } + } +} + +static void decompress_dxtn(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, + unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth, enum wined3d_format_id format_id) +{ + unsigned int block_byte_count, block_w, block_h; + const BYTE *src_row, *src_slice = src; + BYTE *dst_row, *dst_slice = dst; + unsigned int x, y, z; + + block_byte_count = format_id == WINED3DFMT_BC1_UNORM ? 8 : 16; + + for (z = 0; z < depth; ++z) + { + src_row = src_slice; + dst_row = dst_slice; + for (y = 0; y < height; y += 4) + { + for (x = 0; x < width; x += 4) + { + block_w = min(width - x, 4); + block_h = min(height - y, 4); + decompress_dxtn_block(&src_row[x * (block_byte_count / 4)], + &dst_row[x * 4], block_w, block_h, dst_row_pitch, format_id); + } + src_row += src_row_pitch; + dst_row += dst_row_pitch * 4; + } + src_slice += src_slice_pitch; + dst_slice += dst_slice_pitch; + } +} + +static void decompress_bc3(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, + unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth) +{ + decompress_dxtn(src, dst, src_row_pitch, src_slice_pitch, dst_row_pitch, + dst_slice_pitch, width, height, depth, WINED3DFMT_BC3_UNORM); +} + +static void decompress_bc2(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, + unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth) +{ + decompress_dxtn(src, dst, src_row_pitch, src_slice_pitch, dst_row_pitch, + dst_slice_pitch, width, height, depth, WINED3DFMT_BC2_UNORM); +} + +static void decompress_bc1(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, + unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth) +{ + decompress_dxtn(src, dst, src_row_pitch, src_slice_pitch, dst_row_pitch, + dst_slice_pitch, width, height, depth, WINED3DFMT_BC1_UNORM); +} + +static const struct wined3d_format_decompress_info +{ + enum wined3d_format_id id; + void (*decompress)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth); +} +format_decompress_info[] = +{ + {WINED3DFMT_DXT1, decompress_bc1}, + {WINED3DFMT_DXT2, decompress_bc2}, + {WINED3DFMT_DXT3, decompress_bc2}, + {WINED3DFMT_DXT4, decompress_bc3}, + {WINED3DFMT_DXT5, decompress_bc3}, + {WINED3DFMT_BC1_UNORM, decompress_bc1}, + {WINED3DFMT_BC2_UNORM, decompress_bc2}, + {WINED3DFMT_BC3_UNORM, decompress_bc3}, +}; + struct wined3d_format_block_info { enum wined3d_format_id id; @@ -437,6 +661,9 @@ struct wined3d_format_texture_info void (*download)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned int dst_slice_pitch, unsigned int width, unsigned int height, unsigned int depth); + void (*decompress)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth); }; static void convert_l4a4_unorm(const BYTE *src, BYTE *dst, UINT src_row_pitch, UINT src_slice_pitch, @@ -1897,6 +2124,34 @@ static BOOL init_format_block_info(struct wined3d_gl_info *gl_info) return TRUE; } +/* Most compressed formats are not supported for 3D textures by OpenGL. + * + * In the case of the S3TC/DXTn formats, NV_texture_compression_vtc provides + * these formats for 3D textures, but unfortunately the block layout is + * different from the one used by Direct3D. + * + * Since applications either don't check format availability at all before + * using these, or refuse to run without them, we decompress them on upload. + * + * Affected applications include "Heroes VI", "From Dust", "Halo Online" and + * "Eldorado". */ +static BOOL init_format_decompress_info(struct wined3d_gl_info *gl_info) +{ + struct wined3d_format *format; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(format_decompress_info); ++i) + { + if (!(format = get_format_internal(gl_info, format_decompress_info[i].id))) + return FALSE; + + format->flags[WINED3D_GL_RES_TYPE_TEX_3D] |= WINED3DFMT_FLAG_DECOMPRESS; + format->decompress = format_decompress_info[i].decompress; + } + + return TRUE; +} + static GLenum wined3d_gl_type_to_enum(enum wined3d_gl_resource_type type) { switch (type) @@ -3390,34 +3645,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ } } - /* GL_EXT_texture_compression_s3tc does not support 3D textures. Some Windows drivers - * for dx9 GPUs support it, some do not, so not supporting DXTn volumes is OK for d3d9. - * - * Note that GL_NV_texture_compression_vtc adds this functionality to OpenGL, but the - * block layout is not compatible with the one used by d3d. See volume_dxt5_test. */ - idx = get_format_idx(WINED3DFMT_DXT1); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_DXT2); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_DXT3); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_DXT4); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_DXT5); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC1_UNORM); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC1_UNORM_SRGB); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC2_UNORM); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC2_UNORM_SRGB); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC3_UNORM); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - idx = get_format_idx(WINED3DFMT_BC3_UNORM_SRGB); - gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; - /* Similarly with ATI1N / ATI2N and GL_ARB_texture_compression_rgtc. */ + /* These formats are not supported for 3D textures. See also + * WINED3DFMT_FLAG_DECOMPRESS. */ idx = get_format_idx(WINED3DFMT_ATI1N); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_ATI2N); @@ -3742,6 +3971,7 @@ BOOL wined3d_adapter_init_format_info(struct wined3d_adapter *adapter, struct wi if (!init_format_base_info(gl_info)) return FALSE; if (!init_format_block_info(gl_info)) goto fail; + if (!init_format_decompress_info(gl_info)) goto fail; if (!ctx) /* WINED3D_NO3D */ return TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ece41ebd06c..25f7cb2416e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3081,6 +3081,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * void resource_unload(struct wined3d_resource *resource) DECLSPEC_HIDDEN; BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; +const struct wined3d_format *wined3d_resource_get_decompress_format(struct wined3d_resource *resource, + const struct wined3d_context *context) DECLSPEC_HIDDEN; GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_HIDDEN; @@ -4231,6 +4233,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_EXTENSION 0x00000020 #define WINED3DFMT_FLAG_FBO_ATTACHABLE 0x00000040 #define WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB 0x00000080 +#define WINED3DFMT_FLAG_DECOMPRESS 0x00000100 #define WINED3DFMT_FLAG_FLOAT 0x00000200 #define WINED3DFMT_FLAG_BUMPMAP 0x00000400 #define WINED3DFMT_FLAG_SRGB_READ 0x00000800 @@ -4304,6 +4307,9 @@ struct wined3d_format void (*download)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, unsigned int dst_row_pitch, unsigned dst_slice_pitch, unsigned int width, unsigned int height, unsigned int depth); + void (*decompress)(const BYTE *src, BYTE *dst, unsigned int src_row_pitch, unsigned int src_slice_pitch, + unsigned int dst_row_pitch, unsigned dst_slice_pitch, + unsigned int width, unsigned int height, unsigned int depth); enum wined3d_format_id typeless_id; GLenum gl_view_class; -- 2.11.0

1 0

[PATCH 02/12] d3d11: Handle D3D_DRIVER_TYPE_WARP in D3D11CreateDevice().
by Henri Verbeet 04 Aug '18

04 Aug '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/d3d11_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 154a376b784..5d085edf2fe 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -202,6 +202,8 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t switch(driver_type) { + case D3D_DRIVER_TYPE_WARP: + FIXME("WARP driver not implemented, falling back to hardware.\n"); case D3D_DRIVER_TYPE_HARDWARE: { hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); -- 2.11.0

1 0

[PATCH 01/12] d3d10: Handle D3D10_DRIVER_TYPE_WARP in D3D10CreateDevice().
by Henri Verbeet 04 Aug '18

04 Aug '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10/d3d10_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 7c8bee7534d..4d3ed1244ed 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -63,6 +63,8 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver switch (driver_type) { + case D3D10_DRIVER_TYPE_WARP: + FIXME("WARP driver not implemented, falling back to hardware.\n"); case D3D10_DRIVER_TYPE_HARDWARE: { hr = IDXGIFactory_EnumAdapters(factory, 0, &adapter); -- 2.11.0

1 0

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

04 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msi/action.c | 12 ++++++------ dlls/msi/appsearch.c | 3 +-- dlls/msi/assembly.c | 2 +- dlls/msi/automation.c | 2 +- dlls/msi/custom.c | 8 ++++---- dlls/msi/database.c | 2 +- dlls/msi/dialog.c | 2 +- dlls/msi/msi.c | 4 ++-- dlls/msi/package.c | 2 +- dlls/msi/patch.c | 2 +- dlls/msi/registry.c | 38 +++++++++++++++++++------------------- dlls/msi/source.c | 2 +- dlls/msi/upgrade.c | 2 +- 13 files changed, 40 insertions(+), 41 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 29c6827b3f..68d479f8c8 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2148,7 +2148,7 @@ static WCHAR *create_temp_dir( MSIDATABASE *db ) if (!db->tempfolder) { WCHAR tmp[MAX_PATH]; - UINT len = sizeof(tmp)/sizeof(tmp[0]); + UINT len = ARRAY_SIZE( tmp ); if (msi_get_property( db, szTempFolder, tmp, &len ) || GetFileAttributesW( tmp ) != FILE_ATTRIBUTE_DIRECTORY) @@ -5496,9 +5496,9 @@ UINT ACTION_ForceReboot(MSIPACKAGE *package) squash_guid( package->ProductCode, squashed_pc ); - GetSystemDirectoryW(sysdir, sizeof(sysdir)/sizeof(sysdir[0])); + GetSystemDirectoryW(sysdir, ARRAY_SIZE(sysdir)); RegCreateKeyW(HKEY_LOCAL_MACHINE,RunOnce,&hkey); - snprintfW( buffer, sizeof(buffer)/sizeof(buffer[0]), msiexec_fmt, sysdir, squashed_pc ); + snprintfW(buffer, ARRAY_SIZE(buffer), msiexec_fmt, sysdir, squashed_pc); msi_reg_set_val_str( hkey, squashed_pc, buffer ); RegCloseKey(hkey); @@ -6152,7 +6152,7 @@ static LPCWSTR *msi_service_args_to_vector(LPWSTR args, DWORD *numargs) static const WCHAR separator[] = {'[','~',']',0}; *numargs = 0; - sep_len = sizeof(separator) / sizeof(WCHAR) - 1; + sep_len = ARRAY_SIZE(separator) - 1; if (!args) return NULL; @@ -7603,7 +7603,7 @@ static UINT ITERATE_RemoveExistingProducts( MSIRECORD *rec, LPVOID param ) MSIPACKAGE *package = param; const WCHAR *property = MSI_RecordGetString( rec, 7 ); int attrs = MSI_RecordGetInteger( rec, 5 ); - UINT len = sizeof(fmtW)/sizeof(fmtW[0]); + UINT len = ARRAY_SIZE( fmtW ); WCHAR *product, *features, *cmd; STARTUPINFOW si; PROCESS_INFORMATION info; @@ -7618,7 +7618,7 @@ static UINT ITERATE_RemoveExistingProducts( MSIRECORD *rec, LPVOID param ) if (features) len += strlenW( features ); else - len += sizeof(szAll) / sizeof(szAll[0]); + len += ARRAY_SIZE( szAll ); if (!(cmd = msi_alloc( len * sizeof(WCHAR) ))) { diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 693da18355..fbed073bd4 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -949,8 +949,7 @@ static UINT ACTION_SearchDirectory(MSIPACKAGE *package, MSISIGNATURE *sig, if (GetDriveTypeW(pathWithDrive) != DRIVE_FIXED) continue; - lstrcpynW(pathWithDrive + 3, path, - sizeof(pathWithDrive) / sizeof(pathWithDrive[0]) - 3); + lstrcpynW(pathWithDrive + 3, path, ARRAY_SIZE(pathWithDrive) - 3); if (sig->File) rc = ACTION_RecurseSearchDirectory(package, &val, sig, diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index bccd114b49..7b720b6062 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -344,7 +344,7 @@ static const WCHAR *clr_version[] = static const WCHAR *get_clr_version_str( enum clr_version version ) { - if (version >= sizeof(clr_version)/sizeof(clr_version[0])) return clr_version_unknown; + if (version >= ARRAY_SIZE( clr_version )) return clr_version_unknown; return clr_version[version]; } diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 06ad2f90a4..80254e6df4 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -130,7 +130,7 @@ void release_typelib(void) { unsigned i; - for (i = 0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) + for (i = 0; i < ARRAY_SIZE(typeinfos); i++) if (typeinfos[i]) ITypeInfo_Release(typeinfos[i]); diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 1a8a982e48..cea164c303 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -213,7 +213,7 @@ WCHAR *msi_create_temp_file( MSIDATABASE *db ) if (!db->tempfolder) { WCHAR tmp[MAX_PATH]; - UINT len = sizeof(tmp)/sizeof(tmp[0]); + UINT len = ARRAY_SIZE( tmp ); if (msi_get_property( db, szTempFolder, tmp, &len ) || GetFileAttributesW( tmp ) != FILE_ATTRIBUTE_DIRECTORY) @@ -611,9 +611,9 @@ static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) sizeof(GUID), 0, NULL); if (sizeof(void *) == 8 && arch == SCS_32BIT_BINARY) - GetSystemWow64DirectoryW(path, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); + GetSystemWow64DirectoryW(path, MAX_PATH - ARRAY_SIZE(msiexecW)); else - GetSystemDirectoryW(path, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); + GetSystemDirectoryW(path, MAX_PATH - ARRAY_SIZE(msiexecW)); strcatW(path, msiexecW); sprintfW(cmdline, argsW, path, GetCurrentProcessId()); @@ -946,7 +946,7 @@ static UINT HANDLE_CustomType23( MSIPACKAGE *package, const WCHAR *source, const static const WCHAR msiexecW[] = {'m','s','i','e','x','e','c',0}; static const WCHAR paramsW[] = {'/','q','b',' ','/','i',' '}; WCHAR *dir, *arg, *p; - UINT len_src, len_dir, len_tgt, len = sizeof(paramsW)/sizeof(paramsW[0]); + UINT len_src, len_dir, len_tgt, len = ARRAY_SIZE( paramsW ); HANDLE handle; if (!(dir = msi_dup_property( package->db, szOriginalDatabase ))) return ERROR_OUTOFMEMORY; diff --git a/dlls/msi/database.c b/dlls/msi/database.c index ef0221d2b8..c1fb37b583 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -451,7 +451,7 @@ static LPWSTR msi_build_createsql_prelude(LPWSTR table) static const WCHAR create_fmt[] = {'C','R','E','A','T','E',' ','T','A','B','L','E',' ','`','%','s','`',' ','(',' ',0}; - size = sizeof(create_fmt)/sizeof(create_fmt[0]) + lstrlenW(table) - 2; + size = ARRAY_SIZE(create_fmt) + lstrlenW(table) - 2; prelude = msi_alloc(size * sizeof(WCHAR)); if (!prelude) return NULL; diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index b96c44be44..68e8ab2258 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3377,7 +3377,7 @@ static UINT msi_dialog_hyperlink_handler( msi_dialog *dialog, msi_control *contr { static const WCHAR hrefW[] = {'h','r','e','f'}; static const WCHAR openW[] = {'o','p','e','n',0}; - int len, len_href = sizeof(hrefW) / sizeof(hrefW[0]); + int len, len_href = ARRAY_SIZE( hrefW ); const WCHAR *p, *q; WCHAR quote = 0; LITEM item; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 7d805afeda..ae146e626f 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1028,7 +1028,7 @@ UINT WINAPI MsiGetProductCodeW(LPCWSTR szComponent, LPWSTR szBuffer) UINT rc, index; HKEY compkey, prodkey; WCHAR squashed_comp[SQUASHED_GUID_SIZE], squashed_prod[SQUASHED_GUID_SIZE]; - DWORD sz = sizeof(squashed_prod)/sizeof(squashed_prod[0]); + DWORD sz = ARRAY_SIZE(squashed_prod); TRACE("%s %p\n", debugstr_w(szComponent), szBuffer); @@ -3482,7 +3482,7 @@ static UINT MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent, return ERROR_FILE_NOT_FOUND; } msi_free( components ); - StringFromGUID2( &guid, comp, sizeof(comp)/sizeof(comp[0]) ); + StringFromGUID2( &guid, comp, ARRAY_SIZE( comp )); } state = MSI_GetComponentPath( szProduct, comp, szAllSid, MSIINSTALLCONTEXT_ALL, lpPathBuf, pcchPathBuf ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 0d937d609d..273ca71418 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -559,7 +559,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) if (!RegCreateKeyExW(netsetup, v4client, 0, NULL, 0, KEY_QUERY_VALUE, NULL, &hkey, NULL)) { - size = sizeof(path)/sizeof(path[0]); + size = ARRAY_SIZE(path); if (!RegQueryValueExW(hkey, installpath, NULL, &type, (BYTE *)path, &size)) { len = strlenW(path) + strlenW(fusion) + 2; diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index f6ed3c1f1a..bd9b7b87df 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -1037,7 +1037,7 @@ UINT msi_apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ) TRACE("%p, %s\n", package, debugstr_w(patch_code)); - len = sizeof(patch_file) / sizeof(WCHAR); + len = ARRAY_SIZE( patch_file ); r = MsiGetPatchInfoExW( patch_code, package->ProductCode, NULL, package->Context, INSTALLPROPERTY_LOCALPACKAGEW, patch_file, &len ); if (r != ERROR_SUCCESS) diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index cbc8d8d6f0..efc72725ce 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -1297,12 +1297,12 @@ static UINT fetch_machine_component( DWORD ctx, DWORD index, DWORD *idx, WCHAR g if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, componentsW, 0, access, &key_components )) return ERROR_NO_MORE_ITEMS; - len_component = sizeof(component)/sizeof(component[0]); + len_component = ARRAY_SIZE( component ); while (!RegEnumKeyExW( key_components, i, component, &len_component, NULL, NULL, NULL, NULL )) { if (*idx == index) goto found; (*idx)++; - len_component = sizeof(component)/sizeof(component[0]); + len_component = ARRAY_SIZE( component ); i++; } RegCloseKey( key_components ); @@ -1349,14 +1349,14 @@ static UINT fetch_user_component( const WCHAR *usersid, DWORD ctx, DWORD index, if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, userdataW, 0, access, &key_users )) return ERROR_NO_MORE_ITEMS; - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); while (!RegEnumKeyExW( key_users, i, user, &len_user, NULL, NULL, NULL, NULL )) { if ((strcmpW( usersid, szAllSid ) && strcmpW( usersid, user )) || !strcmpW( szLocalSid, user )) { i++; - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); continue; } strcpyW( path, user ); @@ -1364,19 +1364,19 @@ static UINT fetch_user_component( const WCHAR *usersid, DWORD ctx, DWORD index, if (RegOpenKeyExW( key_users, path, 0, access, &key_components )) { i++; - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); continue; } - len_component = sizeof(component)/sizeof(component[0]); + len_component = ARRAY_SIZE( component ); while (!RegEnumKeyExW( key_components, j, component, &len_component, NULL, NULL, NULL, NULL )) { if (*idx == index) goto found; (*idx)++; - len_component = sizeof(component)/sizeof(component[0]); + len_component = ARRAY_SIZE( component ); j++; } RegCloseKey( key_components ); - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); i++; } RegCloseKey( key_users ); @@ -1709,7 +1709,7 @@ UINT WINAPI MsiEnumRelatedProductsW(LPCWSTR szUpgradeCode, DWORD dwReserved, UINT r; HKEY hkey; WCHAR szKeyName[SQUASHED_GUID_SIZE]; - DWORD dwSize = sizeof(szKeyName)/sizeof(szKeyName[0]); + DWORD dwSize = ARRAY_SIZE(szKeyName); TRACE("%s %u %u %p\n", debugstr_w(szUpgradeCode), dwReserved, iProductIndex, lpProductBuf); @@ -2324,18 +2324,18 @@ static UINT fetch_machine_product( const WCHAR *match, DWORD index, DWORD *idx, if (RegOpenKeyExW( HKEY_LOCAL_MACHINE, productsW, 0, access, &key )) return ERROR_NO_MORE_ITEMS; - len = sizeof(product)/sizeof(product[0]); + len = ARRAY_SIZE( product ); while (!RegEnumKeyExW( key, i, product, &len, NULL, NULL, NULL, NULL )) { if (match && strcmpW( match, product )) { i++; - len = sizeof(product)/sizeof(product[0]); + len = ARRAY_SIZE( product ); continue; } if (*idx == index) goto found; (*idx)++; - len = sizeof(product)/sizeof(product[0]); + len = ARRAY_SIZE( product ); i++; } RegCloseKey( key ); @@ -2396,13 +2396,13 @@ static UINT fetch_user_product( const WCHAR *match, const WCHAR *usersid, DWORD } else return ERROR_INVALID_PARAMETER; - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); while (!RegEnumKeyExW( key_users, i, user, &len_user, NULL, NULL, NULL, NULL )) { if (strcmpW( usersid, user ) && strcmpW( usersid, szAllSid )) { i++; - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); continue; } strcpyW( path, user ); @@ -2410,25 +2410,25 @@ static UINT fetch_user_product( const WCHAR *match, const WCHAR *usersid, DWORD if (RegOpenKeyExW( key_users, path, 0, access, &key_products )) { i++; - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); continue; } - len_product = sizeof(product)/sizeof(product[0]); + len_product = ARRAY_SIZE( product ); while (!RegEnumKeyExW( key_products, j, product, &len_product, NULL, NULL, NULL, NULL )) { if (match && strcmpW( match, product )) { j++; - len_product = sizeof(product)/sizeof(product[0]); + len_product = ARRAY_SIZE( product ); continue; } if (*idx == index) goto found; (*idx)++; - len_product = sizeof(product)/sizeof(product[0]); + len_product = ARRAY_SIZE( product ); j++; } RegCloseKey( key_products ); - len_user = sizeof(user)/sizeof(user[0]); + len_user = ARRAY_SIZE( user ); i++; } RegCloseKey( key_users ); diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 68bf9d0a22..904589e947 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -1006,7 +1006,7 @@ static UINT fill_source_list(struct list *sourcelist, HKEY sourcekey, DWORD *cou while (r == ERROR_SUCCESS) { - size = sizeof(name) / sizeof(name[0]); + size = ARRAY_SIZE(name); r = RegEnumValueW(sourcekey, index, name, &size, NULL, NULL, NULL, &val_size); if (r != ERROR_SUCCESS) return r; diff --git a/dlls/msi/upgrade.c b/dlls/msi/upgrade.c index ac58d909e0..bbc7df6eec 100644 --- a/dlls/msi/upgrade.c +++ b/dlls/msi/upgrade.c @@ -103,7 +103,7 @@ static UINT ITERATE_FindRelatedProducts(MSIRECORD *rec, LPVOID param) { MSIPACKAGE *package = param; WCHAR product[SQUASHED_GUID_SIZE]; - DWORD index = 0, attributes = 0, sz = sizeof(product)/sizeof(product[0]); + DWORD index = 0, attributes = 0, sz = ARRAY_SIZE(product); LPCWSTR upgrade_code; HKEY hkey = 0; UINT rc = ERROR_SUCCESS; -- 2.14.4

1 0

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

04 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/msinfo32/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/msinfo32/main.c b/programs/msinfo32/main.c index f64d266d43..17515275fc 100644 --- a/programs/msinfo32/main.c +++ b/programs/msinfo32/main.c @@ -34,8 +34,7 @@ int wmain(int argc, WCHAR *argv[]) WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); WINE_FIXME("\n"); - LoadStringW(GetModuleHandleW(NULL), STRING_SYSTEM_INFO, - system_info, sizeof(system_info)/sizeof(WCHAR)); + LoadStringW(GetModuleHandleW(NULL), STRING_SYSTEM_INFO, system_info, ARRAY_SIZE(system_info)); ShellAboutW(NULL, system_info, NULL, NULL); return 0; -- 2.14.4

1 0

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

04 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msdmo/dmoreg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index e4766d76b5..864cb859e6 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -316,7 +316,7 @@ HRESULT WINAPI DMOUnregister(REFCLSID dmo, REFGUID category) /* remove from all categories */ if (IsEqualGUID(category, &GUID_NULL)) { - DWORD index = 0, len = sizeof(catW)/sizeof(WCHAR); + DWORD index = 0, len = ARRAY_SIZE(catW); while (!RegEnumKeyExW(categorieskey, index++, catW, &len, NULL, NULL, NULL, NULL)) hr = unregister_dmo_from_category(dmoW, catW, categorieskey); -- 2.14.4

1 0

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

04 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/imm32/imm.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 685eb018c4..f235e228ad 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -308,7 +308,7 @@ static HMODULE load_graphics_driver(void) 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( GetDesktopWindow(), display_device_guid_propW )); if (!guid_atom) return 0; @@ -769,7 +769,7 @@ HIMC WINAPI ImmCreateContext(void) gl->dwSize = sizeof(GUIDELINE); ImmUnlockIMCC(new_context->IMC.hGuideLine); - for (i = 0; i < sizeof(new_context->IMC.cfCandForm) / sizeof(CANDIDATEFORM); i++) + for (i = 0; i < ARRAY_SIZE(new_context->IMC.cfCandForm); i++) new_context->IMC.cfCandForm[i].dwIndex = ~0u; /* Initialize the IME Private */ @@ -1013,8 +1013,7 @@ DWORD WINAPI ImmGetCandidateListA( return 0; candinfo = ImmLockIMCC(data->IMC.hCandInfo); - if ( dwIndex >= candinfo->dwCount || - dwIndex >= (sizeof(candinfo->dwOffset) / sizeof(DWORD)) ) + if (dwIndex >= candinfo->dwCount || dwIndex >= ARRAY_SIZE(candinfo->dwOffset)) goto done; candlist = (LPCANDIDATELIST)((LPBYTE)candinfo + candinfo->dwOffset[dwIndex]); @@ -1117,8 +1116,7 @@ DWORD WINAPI ImmGetCandidateListW( return 0; candinfo = ImmLockIMCC(data->IMC.hCandInfo); - if ( dwIndex >= candinfo->dwCount || - dwIndex >= (sizeof(candinfo->dwOffset) / sizeof(DWORD)) ) + if (dwIndex >= candinfo->dwCount || dwIndex >= ARRAY_SIZE(candinfo->dwOffset)) goto done; candlist = (LPCANDIDATELIST)((LPBYTE)candinfo + candinfo->dwOffset[dwIndex]); @@ -1152,7 +1150,7 @@ BOOL WINAPI ImmGetCandidateWindow( if (!data || !lpCandidate) return FALSE; - if ( dwIndex >= (sizeof(data->IMC.cfCandForm) / sizeof(CANDIDATEFORM)) ) + if (dwIndex >= ARRAY_SIZE(data->IMC.cfCandForm)) return FALSE; if (data->IMC.cfCandForm[dwIndex].dwIndex != dwIndex) @@ -1624,8 +1622,7 @@ static BOOL needs_ime_window(HWND hwnd) { WCHAR classW[8]; - if (GetClassNameW(hwnd, classW, sizeof(classW)/sizeof(classW[0])) && - !strcmpW(classW, szwIME)) + if (GetClassNameW(hwnd, classW, ARRAY_SIZE(classW)) && !strcmpW(classW, szwIME)) return FALSE; if (GetClassLongPtrW(hwnd, GCL_STYLE) & CS_IME) return FALSE; @@ -1844,7 +1841,7 @@ UINT WINAPI ImmGetIMEFileNameW(HKL hKL, LPWSTR lpszFileName, UINT uBufLen) HKEY hkey; DWORD length; DWORD rc; - WCHAR regKey[sizeof(szImeRegFmt)/sizeof(WCHAR)+8]; + WCHAR regKey[ARRAY_SIZE(szImeRegFmt)+8]; wsprintfW( regKey, szImeRegFmt, (ULONG_PTR)hKL ); rc = RegOpenKeyW( HKEY_LOCAL_MACHINE, regKey, &hkey); @@ -2062,7 +2059,7 @@ HKL WINAPI ImmInstallIMEW( HKL hkl; DWORD rc; HKEY hkey; - WCHAR regKey[sizeof(szImeRegFmt)/sizeof(WCHAR)+8]; + WCHAR regKey[ARRAY_SIZE(szImeRegFmt)+8]; TRACE ("(%s, %s):\n", debugstr_w(lpszIMEFileName), debugstr_w(lpszLayoutText)); @@ -2314,7 +2311,7 @@ BOOL WINAPI ImmSetCandidateWindow( wine_dbgstr_point(&lpCandidate->ptCurrentPos), wine_dbgstr_rect(&lpCandidate->rcArea)); - if ( lpCandidate->dwIndex >= (sizeof(data->IMC.cfCandForm) / sizeof(CANDIDATEFORM)) ) + if (lpCandidate->dwIndex >= ARRAY_SIZE(data->IMC.cfCandForm)) return FALSE; data->IMC.cfCandForm[lpCandidate->dwIndex] = *lpCandidate; -- 2.14.4

1 0

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

04 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hnetcfg/apps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c index 21e1007da9..e671e8ca8d 100644 --- a/dlls/hnetcfg/apps.c +++ b/dlls/hnetcfg/apps.c @@ -157,7 +157,7 @@ void release_typelib(void) { unsigned i; - for (i = 0; i < sizeof(typeinfo)/sizeof(*typeinfo); i++) + for (i = 0; i < ARRAY_SIZE(typeinfo); i++) if (typeinfo[i]) ITypeInfo_Release(typeinfo[i]); -- 2.14.4

1 0

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

04 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/devenum/createdevenum.c | 17 ++++++++--------- dlls/devenum/mediacatenum.c | 4 ++-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 4b2feca650..8fbf323971 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -155,7 +155,7 @@ static void DEVENUM_ReadPinTypes(HKEY hkeyPinKey, REGFILTERPINS2 *rgPin) { HKEY hkeyMajorType = NULL; WCHAR wszMajorTypeName[64]; - DWORD cName = sizeof(wszMajorTypeName) / sizeof(WCHAR); + DWORD cName = ARRAY_SIZE(wszMajorTypeName); DWORD dwMinorTypes, i1; if (RegEnumKeyExW(hkeyTypes, i, wszMajorTypeName, &cName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) continue; @@ -175,7 +175,7 @@ static void DEVENUM_ReadPinTypes(HKEY hkeyPinKey, REGFILTERPINS2 *rgPin) CLSID *clsMajorType = NULL, *clsMinorType = NULL; HRESULT hr; - cName = sizeof(wszMinorTypeName) / sizeof(WCHAR); + cName = ARRAY_SIZE(wszMinorTypeName); if (RegEnumKeyExW(hkeyMajorType, i1, wszMinorTypeName, &cName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) continue; clsMinorType = CoTaskMemAlloc(sizeof(CLSID)); @@ -261,7 +261,7 @@ static void DEVENUM_ReadPins(HKEY hkeyFilterClass, REGFILTER2 *rgf2) { HKEY hkeyPinKey = NULL; WCHAR wszPinName[MAX_PATH]; - DWORD cName = sizeof(wszPinName) / sizeof(WCHAR); + DWORD cName = ARRAY_SIZE(wszPinName); REGFILTERPINS2 *rgPin = &rgPins[rgf2->u.s2.cPins2]; DWORD value, size, Type; LONG lRet; @@ -408,7 +408,7 @@ static void register_legacy_filters(void) for (i = 0; i < dwFilterSubkeys; i++) { WCHAR wszFilterSubkeyName[64]; - DWORD cName = sizeof(wszFilterSubkeyName) / sizeof(WCHAR); + DWORD cName = ARRAY_SIZE(wszFilterSubkeyName); IPropertyBag *prop_bag = NULL; WCHAR wszRegKey[MAX_PATH]; HKEY classkey = NULL; @@ -944,7 +944,7 @@ static HRESULT DEVENUM_CreateAMCategoryKey(const CLSID * clsidCategory) strcpyW(wszRegKey, wszActiveMovieKey); - if (!StringFromGUID2(clsidCategory, wszRegKey + strlenW(wszRegKey), sizeof(wszRegKey)/sizeof(wszRegKey[0]) - strlenW(wszRegKey))) + if (!StringFromGUID2(clsidCategory, wszRegKey + strlenW(wszRegKey), ARRAY_SIZE(wszRegKey) - strlenW(wszRegKey))) res = E_INVALIDARG; if (SUCCEEDED(res)) @@ -1016,13 +1016,12 @@ static HRESULT register_codecs(void) { WCHAR szDeviceName[32], szDeviceVersion[32], szDevicePath[10]; - if (capGetDriverDescriptionW ((WORD) i, - szDeviceName, sizeof(szDeviceName)/sizeof(WCHAR), - szDeviceVersion, sizeof(szDeviceVersion)/sizeof(WCHAR))) + if (capGetDriverDescriptionW (i, szDeviceName, ARRAY_SIZE(szDeviceName), + szDeviceVersion, ARRAY_SIZE(szDeviceVersion))) { IMoniker * pMoniker = NULL; WCHAR dprintf[] = { 'v','i','d','e','o','%','d',0 }; - snprintfW(szDevicePath, sizeof(szDevicePath)/sizeof(WCHAR), dprintf, i); + snprintfW(szDevicePath, ARRAY_SIZE(szDevicePath), dprintf, i); /* The above code prevents 1 device with a different ID overwriting another */ rfp2.nMediaTypes = 1; diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 660e81c145..5fa2f008dc 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -889,7 +889,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, StringFromGUID2(&This->class, buffer + CHARS_IN_GUID - 1, CHARS_IN_GUID); } /* try DirectShow filters */ - else if (!(res = RegEnumKeyW(This->sw_key, This->sw_index, buffer, sizeof(buffer)/sizeof(WCHAR)))) + else if (!(res = RegEnumKeyW(This->sw_key, This->sw_index, buffer, ARRAY_SIZE(buffer)))) { This->sw_index++; if ((res = RegOpenKeyExW(This->sw_key, buffer, 0, KEY_QUERY_VALUE, &hkey))) @@ -908,7 +908,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, strcpyW(pMoniker->name, buffer); } /* then try codecs */ - else if (!(res = RegEnumKeyW(This->cm_key, This->cm_index, buffer, sizeof(buffer)/sizeof(WCHAR)))) + else if (!(res = RegEnumKeyW(This->cm_key, This->cm_index, buffer, ARRAY_SIZE(buffer)))) { This->cm_index++; -- 2.14.4

1 0

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

04 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi.exe16/gdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c index f0c354bb1c..006dd83947 100644 --- a/dlls/gdi.exe16/gdi.c +++ b/dlls/gdi.exe16/gdi.c @@ -3048,7 +3048,7 @@ BOOL16 WINAPI IsGDIObject16( HGDIOBJ16 handle16 ) UINT type = GetObjectType( HGDIOBJ_32( handle16 )); - if (type >= sizeof(type_map)/sizeof(type_map[0])) return FALSE; + if (type >= ARRAY_SIZE(type_map)) return FALSE; return type_map[type]; } -- 2.14.4

1 0

[PATCH] devenum: Remove an unused impl_from_ helper
by Michael Stefaniuc 04 Aug '18

04 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/devenum/createdevenum.c | 17 ++++++++--------- dlls/devenum/mediacatenum.c | 4 ++-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 4b2feca650..8fbf323971 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -155,7 +155,7 @@ static void DEVENUM_ReadPinTypes(HKEY hkeyPinKey, REGFILTERPINS2 *rgPin) { HKEY hkeyMajorType = NULL; WCHAR wszMajorTypeName[64]; - DWORD cName = sizeof(wszMajorTypeName) / sizeof(WCHAR); + DWORD cName = ARRAY_SIZE(wszMajorTypeName); DWORD dwMinorTypes, i1; if (RegEnumKeyExW(hkeyTypes, i, wszMajorTypeName, &cName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) continue; @@ -175,7 +175,7 @@ static void DEVENUM_ReadPinTypes(HKEY hkeyPinKey, REGFILTERPINS2 *rgPin) CLSID *clsMajorType = NULL, *clsMinorType = NULL; HRESULT hr; - cName = sizeof(wszMinorTypeName) / sizeof(WCHAR); + cName = ARRAY_SIZE(wszMinorTypeName); if (RegEnumKeyExW(hkeyMajorType, i1, wszMinorTypeName, &cName, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) continue; clsMinorType = CoTaskMemAlloc(sizeof(CLSID)); @@ -261,7 +261,7 @@ static void DEVENUM_ReadPins(HKEY hkeyFilterClass, REGFILTER2 *rgf2) { HKEY hkeyPinKey = NULL; WCHAR wszPinName[MAX_PATH]; - DWORD cName = sizeof(wszPinName) / sizeof(WCHAR); + DWORD cName = ARRAY_SIZE(wszPinName); REGFILTERPINS2 *rgPin = &rgPins[rgf2->u.s2.cPins2]; DWORD value, size, Type; LONG lRet; @@ -408,7 +408,7 @@ static void register_legacy_filters(void) for (i = 0; i < dwFilterSubkeys; i++) { WCHAR wszFilterSubkeyName[64]; - DWORD cName = sizeof(wszFilterSubkeyName) / sizeof(WCHAR); + DWORD cName = ARRAY_SIZE(wszFilterSubkeyName); IPropertyBag *prop_bag = NULL; WCHAR wszRegKey[MAX_PATH]; HKEY classkey = NULL; @@ -944,7 +944,7 @@ static HRESULT DEVENUM_CreateAMCategoryKey(const CLSID * clsidCategory) strcpyW(wszRegKey, wszActiveMovieKey); - if (!StringFromGUID2(clsidCategory, wszRegKey + strlenW(wszRegKey), sizeof(wszRegKey)/sizeof(wszRegKey[0]) - strlenW(wszRegKey))) + if (!StringFromGUID2(clsidCategory, wszRegKey + strlenW(wszRegKey), ARRAY_SIZE(wszRegKey) - strlenW(wszRegKey))) res = E_INVALIDARG; if (SUCCEEDED(res)) @@ -1016,13 +1016,12 @@ static HRESULT register_codecs(void) { WCHAR szDeviceName[32], szDeviceVersion[32], szDevicePath[10]; - if (capGetDriverDescriptionW ((WORD) i, - szDeviceName, sizeof(szDeviceName)/sizeof(WCHAR), - szDeviceVersion, sizeof(szDeviceVersion)/sizeof(WCHAR))) + if (capGetDriverDescriptionW (i, szDeviceName, ARRAY_SIZE(szDeviceName), + szDeviceVersion, ARRAY_SIZE(szDeviceVersion))) { IMoniker * pMoniker = NULL; WCHAR dprintf[] = { 'v','i','d','e','o','%','d',0 }; - snprintfW(szDevicePath, sizeof(szDevicePath)/sizeof(WCHAR), dprintf, i); + snprintfW(szDevicePath, ARRAY_SIZE(szDevicePath), dprintf, i); /* The above code prevents 1 device with a different ID overwriting another */ rfp2.nMediaTypes = 1; diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 660e81c145..5fa2f008dc 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -889,7 +889,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, StringFromGUID2(&This->class, buffer + CHARS_IN_GUID - 1, CHARS_IN_GUID); } /* try DirectShow filters */ - else if (!(res = RegEnumKeyW(This->sw_key, This->sw_index, buffer, sizeof(buffer)/sizeof(WCHAR)))) + else if (!(res = RegEnumKeyW(This->sw_key, This->sw_index, buffer, ARRAY_SIZE(buffer)))) { This->sw_index++; if ((res = RegOpenKeyExW(This->sw_key, buffer, 0, KEY_QUERY_VALUE, &hkey))) @@ -908,7 +908,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, strcpyW(pMoniker->name, buffer); } /* then try codecs */ - else if (!(res = RegEnumKeyW(This->cm_key, This->cm_index, buffer, sizeof(buffer)/sizeof(WCHAR)))) + else if (!(res = RegEnumKeyW(This->cm_key, This->cm_index, buffer, ARRAY_SIZE(buffer)))) { This->cm_index++; -- 2.14.4

2 1

[PATCH] gdi.exe16: Remove an unused impl_from_ helper
by Michael Stefaniuc 04 Aug '18

04 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi.exe16/gdi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c index f0c354bb1c..006dd83947 100644 --- a/dlls/gdi.exe16/gdi.c +++ b/dlls/gdi.exe16/gdi.c @@ -3048,7 +3048,7 @@ BOOL16 WINAPI IsGDIObject16( HGDIOBJ16 handle16 ) UINT type = GetObjectType( HGDIOBJ_32( handle16 )); - if (type >= sizeof(type_map)/sizeof(type_map[0])) return FALSE; + if (type >= ARRAY_SIZE(type_map)) return FALSE; return type_map[type]; } -- 2.14.4

2 1

Re: [PATCH 04/13 v3] msvcp90: Add implementation of _Concurrent_vector_Internal_reserve.
by Piotr Caban 04 Aug '18

04 Aug '18