February 2019 - Wine-Devel - list.winehq.org

[PATCH 1/5] shell32/tests: Test behavior of SHCNRF_InterruptLevel flag.
by Nigel Baillie Feb. 27, 2019

Feb. 27, 2019

On Windows, passing SHCNRF_InterruptLevel as a flag to SHChangeNotifyRegister results in shell notification messages being sent on filesystem changes, rather than on explicit SHChangeNotify calls. Wine doesn't currently implement this, resulting in some strange shell behavior when pasting or creating a new folder. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30752 Signed-off-by: Nigel Baillie <metreckk(a)gmail.com> --- dlls/shell32/tests/shlfolder.c | 158 +++++++++++++++++++++++++++++++++ 1 file changed, 158 insertions(+) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index beee31f2ca..d964d77ae4 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4978,6 +4978,163 @@ static void test_SHChangeNotify(BOOL test_new_delivery) ok(br == TRUE, "RemoveDirectory failed: %d\n", GetLastError()); } +static void test_SHCNRF_InterruptLevel() +{ + HWND wnd; + ULONG notifyID, i; + HRESULT hr; + HANDLE test_file_handle; + BOOL br, has_unicode; + SHChangeNotifyEntry entries[1]; + struct ChNotifyTest create_event = {"CREATE", 1, 1, SHCNE_CREATE, "C:\\shell32_cn_test.txt", ""}; + struct ChNotifyTest create_event2 = {"CREATE", 1, 1, SHCNE_CREATE, "C:\\shell32_cn_test_dir\\file.txt", ""}; + struct ChNotifyTest rename_event = {"RENAMEITEM", 1, 1, SHCNE_RENAMEITEM, "C:\\shell32_cn_test.txt", "C:\\shell32.txt"}; + struct ChNotifyTest delete_event = {"DELETE", 1, 1, SHCNE_DELETE, "C:\\shell32.txt", ""}; + const CHAR root_dirA[] = "C:\\"; + const WCHAR root_dirW[] = {'C',':','\\',0}; + const CHAR root_dir2A[] = "C:\\shell32_cn_test_dir"; + const WCHAR root_dir2W[] = {'C',':','\\','s','h','e','l','l','3','2','_','c','n','_','t','e','s','t','_','d','i','r',0}; + + trace("Testing SHChangeNotifyRegister with SHCNRF_InterruptLevel\n"); + + CreateDirectoryW(NULL, NULL); + has_unicode = !(GetLastError() == ERROR_CALL_NOT_IMPLEMENTED); + + exp_data = &create_event; + test_new_delivery_flag = FALSE; + + /* create test window */ + wnd = CreateWindowExA(0, testwindow_class, testwindow_class, 0, + CW_USEDEFAULT, CW_USEDEFAULT, 130, 105, + NULL, NULL, GetModuleHandleA(NULL), 0); + ok(wnd != NULL, "Failed to make a window\n"); + + /* register for notifications on C:\ */ + entries[0].pidl = NULL; + if(has_unicode) + hr = SHILCreateFromPath(root_dirW, (LPITEMIDLIST*)&entries[0].pidl, 0); + else + hr = SHILCreateFromPath((const void *)root_dirA, (LPITEMIDLIST*)&entries[0].pidl, 0); + ok(hr == S_OK, "SHILCreateFromPath failed: 0x%08x\n", hr); + entries[0].fRecursive = TRUE; + + notifyID = SHChangeNotifyRegister( + wnd, SHCNRF_InterruptLevel, SHCNE_CREATE | SHCNE_RENAMEFOLDER | SHCNE_RENAMEITEM | SHCNE_DELETE, + WM_USER_NOTIFY, 1, entries); + ok(notifyID != 0, "Failed to register a window for change notifications\n"); + + /* create test file */ + trace("creating %s\n", create_event.path_1); + test_file_handle = CreateFileA(create_event.path_1, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(test_file_handle != INVALID_HANDLE_VALUE, "CreateFile failed: %d\n", GetLastError()); + + /* see if a notification gets sent or not */ + SleepEx(1000, FALSE); + do_events(); + ok(exp_data->missing_events < 1, "%s: Expected wndproc to be called\n", exp_data->id); + + /* rename test file */ + CloseHandle(test_file_handle); + exp_data = &rename_event; + trace("renaming %s to %s\n", rename_event.path_1, rename_event.path_2); + br = MoveFileA(rename_event.path_1, rename_event.path_2); + ok(br, "failed to rename %s to %s\n", rename_event.path_1, rename_event.path_2); + + /* see if a notification gets sent or not */ + SleepEx(1000, FALSE); + do_events(); + ok(exp_data->missing_events < 1, "%s: Expected wndproc to be called\n", exp_data->id); + + /* delete test file */ + exp_data = &delete_event; + trace("deleting %s\n", delete_event.path_1); + DeleteFileA(delete_event.path_1); + + /* see if a notification gets sent or not */ + SleepEx(1000, FALSE); + do_events(); + ok(exp_data->missing_events < 1, "%s: Expected wndproc to be called\n", exp_data->id); + + /* deregister */ + SHChangeNotifyDeregister(notifyID); + ILFree((LPITEMIDLIST)entries[0].pidl); + DeleteFileA(create_event.path_1); + + /* create and listen on filename (rather than directory/drive) */ + test_file_handle = CreateFileA(create_event.path_1, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(test_file_handle != INVALID_HANDLE_VALUE, "CreateFile failed: %d\n", GetLastError()); + + entries[0].pidl = ILCreateFromPathA(create_event.path_1); + ok(entries[0].pidl != NULL, "ILCreateFromPathA failed\n"); + entries[0].fRecursive = TRUE; + + notifyID = SHChangeNotifyRegister( + wnd, SHCNRF_InterruptLevel, SHCNE_RENAMEITEM, + WM_USER_NOTIFY, 1, entries); + ok(notifyID != 0, "Failed to register a window for change notifications\n"); + + /* rename the file again */ + CloseHandle(test_file_handle); + rename_event.missing_events = rename_event.notify_count; + exp_data = &rename_event; + trace("renaming %s to %s again\n", rename_event.path_1, rename_event.path_2); + br = MoveFileA(rename_event.path_1, rename_event.path_2); + ok(br, "failed to rename %s to %s\n", rename_event.path_1, rename_event.path_2); + + /* see if a notification gets sent or not */ + SleepEx(1000, FALSE); + do_events(); + ok(exp_data->missing_events < 1, "%s: Expected wndproc to be called\n", exp_data->id); + + /* deregister */ + SHChangeNotifyDeregister(notifyID); + ILFree((LPITEMIDLIST)entries[0].pidl); + DeleteFileA(rename_event.path_2); + + /* now, listen on a directory rather than a drive letter */ + trace("creating directory %s\n", root_dir2A); + if (has_unicode) + CreateDirectoryW(root_dir2W, NULL); + else + CreateDirectoryA(root_dir2A, NULL); + + entries[0].pidl = ILCreateFromPathA(root_dir2A); + ok(entries[0].pidl != NULL, "ILCreateFromPathA failed\n"); + entries[0].fRecursive = FALSE; + + notifyID = SHChangeNotifyRegister( + wnd, SHCNRF_InterruptLevel, SHCNE_CREATE, + WM_USER_NOTIFY, 1, entries); + ok(notifyID != 0, "Failed to register a window for change notifications\n"); + + /* create a file */ + exp_data = &create_event2; + trace("creating %s\n", create_event2.path_1); + test_file_handle = CreateFileA(create_event2.path_1, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + ok(test_file_handle != INVALID_HANDLE_VALUE, "CreateFile failed: %d\n", GetLastError()); + + /* see if a notification gets sent or not */ + SleepEx(1000, FALSE); + do_events(); + ok(exp_data->missing_events < 1, "%s: Expected wndproc to be called\n", exp_data->id); + + /* delete test file */ + trace("deleting %s\n", create_event2.path_1); + DeleteFileA(create_event2.path_1); + + /* final cleanup */ + SHChangeNotifyDeregister(notifyID); + DestroyWindow(wnd); + ILFree((LPITEMIDLIST)entries[0].pidl); + RemoveDirectoryA(root_dir2A); +} + static void test_SHCreateDefaultContextMenu(void) { HKEY keys[16]; @@ -5334,6 +5491,7 @@ START_TEST(shlfolder) test_ShellItemCompare(); test_SHChangeNotify(FALSE); test_SHChangeNotify(TRUE); + test_SHCNRF_InterruptLevel(); test_ShellItemBindToHandler(); test_ShellItemGetAttributes(); test_ShellItemArrayGetAttributes(); -- 2.20.1

2 7

[PATCH] gdi.exe16: Remove an unused return variable (coccinelle)
by Michael Stefaniuc Feb. 26, 2019

Feb. 26, 2019

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi.exe16/printdrv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/gdi.exe16/printdrv.c b/dlls/gdi.exe16/printdrv.c index bd7f053b66..2e1ace8e6c 100644 --- a/dlls/gdi.exe16/printdrv.c +++ b/dlls/gdi.exe16/printdrv.c @@ -518,9 +518,8 @@ INT16 WINAPI EndSpoolPage16(HPJOB16 hJob) */ DWORD WINAPI GetSpoolJob16(int nOption, LONG param) { - DWORD retval = 0; TRACE("In GetSpoolJob param 0x%x noption %d\n",param, nOption); - return retval; + return 0; } -- 2.20.1

1 0

[PATCH] crypt32: Remove an unused return variable (coccinelle)
by Michael Stefaniuc Feb. 26, 2019

Feb. 26, 2019

returnvar.cocci from the Linux kernel. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/crypt32/oid.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/crypt32/oid.c b/dlls/crypt32/oid.c index 6dc894e60c..bf0ad3275a 100644 --- a/dlls/crypt32/oid.c +++ b/dlls/crypt32/oid.c @@ -190,7 +190,6 @@ static char *CRYPT_GetKeyName(DWORD dwEncodingType, LPCSTR pszFuncName, BOOL WINAPI CryptGetDefaultOIDDllList(HCRYPTOIDFUNCSET hFuncSet, DWORD dwEncodingType, LPWSTR pwszDllList, DWORD *pcchDllList) { - BOOL ret = TRUE; struct OIDFunctionSet *set = hFuncSet; char *keyName; HKEY key; @@ -228,7 +227,7 @@ BOOL WINAPI CryptGetDefaultOIDDllList(HCRYPTOIDFUNCSET hFuncSet, } CryptMemFree(keyName); - return ret; + return TRUE; } BOOL WINAPI CryptInstallOIDFunctionAddress(HMODULE hModule, -- 2.20.1

1 0

[PATCH 1/5] d3dtypes: Add D3D9 DF16/24 format typedefs
by Daniel Ansorregui Feb. 26, 2019

Feb. 26, 2019

Signed-off-by: Daniel Ansorregui <mailszeros(a)gmail.com> --- include/d3d9types.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/d3d9types.h b/include/d3d9types.h index 4891858b3d..2e5648a8f6 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -827,6 +827,8 @@ typedef enum _D3DFORMAT { D3DFMT_MULTI2_ARGB8 = MAKEFOURCC('M', 'E', 'T', '1'), D3DFMT_G8R8_G8B8 = MAKEFOURCC('G', 'R', 'G', 'B'), D3DFMT_R8G8_B8G8 = MAKEFOURCC('R', 'G', 'B', 'G'), + D3DFMT_DF16 = MAKEFOURCC('D', 'F', '1', '6'), + D3DFMT_DF24 = MAKEFOURCC('D', 'F', '2', '4'), D3DFMT_D16_LOCKABLE = 70, D3DFMT_D32 = 71, -- 2.17.1

6 76

[PATCH] user32: Disallow setting some of window values with mismatching size.
by Nikolay Sivov Feb. 26, 2019

Feb. 26, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46712 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/win.c | 71 +++++++++++++++++++++++++++++++++++++++++ dlls/user32/win.c | 38 +++++++++++++++++++++- 2 files changed, 108 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 3444abaf96..4fb9cc1a0c 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6330,6 +6330,75 @@ static int check_error(DWORD actual, DWORD expected) return (!sets_last_error && (actual == 0xdeadbeef)) || (actual == expected); } +static void test_set_window_long_size(void) +{ +#ifdef _WIN64 + WNDPROC old_window_procW, old_window_proc2W; + LONG_PTR retval; + HWND hwnd; + LONG ret; + + /* It's not allowed to set or get 64-bit pointer values using 32-bit functions. */ + hwnd = CreateWindowExA(0, "MainWindowClass", "Child window", WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX | WS_CHILD | + WS_MAXIMIZEBOX | WS_VISIBLE, 100, 100, 200, 200, hwndMain, 0, GetModuleHandleA(NULL), NULL); + ok(hwnd != NULL, "Failed to create test window.\n"); + + /* GWLP_WNDPROC */ + SetLastError(0xdeadbeef); + old_window_procW = (WNDPROC)(LONG_PTR)GetWindowLongA(hwnd, GWLP_WNDPROC); + ok(!old_window_procW && GetLastError() == ERROR_INVALID_INDEX, "Unexpected window proc.\n"); + + old_window_procW = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_WNDPROC); + ok(!!old_window_procW, "Unexpected window proc.\n"); + + SetLastError(0xdeadbeef); + old_window_proc2W = (WNDPROC)(LONG_PTR)SetWindowLongA(hwnd, GWLP_WNDPROC, 0xdeadbeef); + ok(!old_window_proc2W && GetLastError() == ERROR_INVALID_INDEX, "Unexpected window proc.\n"); + + old_window_proc2W = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_WNDPROC); + ok(old_window_proc2W == old_window_procW, "Unexpected window proc.\n"); + + /* GWLP_USERDATA */ + SetWindowLongPtrA(hwnd, GWLP_USERDATA, ((LONG_PTR)1 << 32) | 123); + ret = GetWindowLongA(hwnd, GWLP_USERDATA); + ok(ret == 123, "Unexpected user data %#x.\n", ret); + retval = GetWindowLongPtrA(hwnd, GWLP_USERDATA); + ok(retval > 123, "Unexpected user data.\n"); + + /* GWLP_ID */ + ret = SetWindowLongA(hwnd, GWLP_ID, 1); + ok(!ret, "Unexpected id %#x.\n", ret); + + ret = GetWindowLongA(hwnd, GWLP_ID); + ok(ret == 1, "Unexpected id %#x.\n", ret); + + SetWindowLongPtrA(hwnd, GWLP_ID, ((LONG_PTR)1 << 32) | 123); + ret = GetWindowLongA(hwnd, GWLP_ID); + ok(ret == 123, "Unexpected user data %#x.\n", ret); + retval = GetWindowLongPtrA(hwnd, GWLP_ID); + ok(retval > 123, "Unexpected user data.\n"); + + /* GWLP_HINSTANCE */ + retval = GetWindowLongPtrA(hwnd, GWLP_HINSTANCE); + ok(retval == (LONG_PTR)GetModuleHandleA(NULL), "Unexpected instance %#lx.\n", retval); + + SetLastError(0xdeadbeef); + ret = GetWindowLongA(hwnd, GWLP_HINSTANCE); + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret); + + SetLastError(0xdeadbeef); + ret = SetWindowLongA(hwnd, GWLP_HINSTANCE, 1); + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected instance %#x.\n", ret); + + /* GWLP_HWNDPARENT */ + SetLastError(0xdeadbeef); + ret = GetWindowLongA(hwnd, GWLP_HWNDPARENT); + ok(!ret && GetLastError() == ERROR_INVALID_INDEX, "Unexpected parent window %#x.\n", ret); + + DestroyWindow(hwnd); +#endif +} + static void test_SetWindowLong(void) { LONG_PTR retval; @@ -6371,6 +6440,8 @@ static void test_SetWindowLong(void) /* set it back to ANSI */ SetWindowLongPtrA(hwndMain, GWLP_WNDPROC, 0); } + + test_set_window_long_size(); } static LRESULT WINAPI check_style_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 24b2a2ffd5..d08fa67b11 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2299,6 +2299,20 @@ UINT WINAPI GetDpiForWindow( HWND hwnd ) return ret; } +static BOOL is_valid_window_value_size(INT offset, UINT size) +{ + switch (offset) + { +#ifdef _WIN64 + case GWLP_HWNDPARENT: + case GWLP_WNDPROC: + case GWLP_HINSTANCE: + return size == sizeof(LONG_PTR); +#endif + default: + return TRUE; + } +} /********************************************************************** * WIN_GetWindowLong @@ -2312,7 +2326,15 @@ static LONG_PTR WIN_GetWindowLong( HWND hwnd, INT offset, UINT size, BOOL unicod if (offset == GWLP_HWNDPARENT) { - HWND parent = GetAncestor( hwnd, GA_PARENT ); + HWND parent; + + if (!is_valid_window_value_size( offset, size )) + { + SetLastError( ERROR_INVALID_INDEX ); + return 0; + } + + parent = GetAncestor( hwnd, GA_PARENT ); if (parent == GetDesktopWindow()) parent = GetWindow( hwnd, GW_OWNER ); return (ULONG_PTR)parent; } @@ -2398,6 +2420,13 @@ static LONG_PTR WIN_GetWindowLong( HWND hwnd, INT offset, UINT size, BOOL unicod return retvalue; } + if (!is_valid_window_value_size( offset, size )) + { + SetLastError( ERROR_INVALID_INDEX ); + WIN_ReleasePtr( wndPtr ); + return 0; + } + switch(offset) { case GWLP_USERDATA: retvalue = wndPtr->userdata; break; @@ -2474,6 +2503,13 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B return SendMessageW( hwnd, WM_WINE_SETWINDOWLONG, MAKEWPARAM( offset, size ), newval ); } + if (!is_valid_window_value_size( offset, size )) + { + SetLastError( ERROR_INVALID_INDEX ); + WIN_ReleasePtr( wndPtr ); + return 0; + } + /* first some special cases */ switch( offset ) { -- 2.20.1

3 2

[PATCH 4/4] wined3d: Add a setting to turn off aggressive optimization on NVIDIA.
by Henri Verbeet Feb. 26, 2019

Feb. 26, 2019

From: Paul Gofman <gofmanp(a)gmail.com> NVIDIA drivers perform too aggressive optimization involving change of computation order (aka 'fastmath') by default. The setting helps to workaround bugs like https://bugs.winehq.org/show_bug.cgi?id=35207. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 3 +++ dlls/wined3d/wined3d_main.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 660005f57e9..4613d78f94c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2416,6 +2416,9 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont unsigned int i; DWORD map; + if (wined3d_settings.strict_shader_math) + shader_addline(buffer, "#pragma optionNV(fastmath off)\n"); + prefix = shader_glsl_get_prefix(version->type); /* Prototype the subroutines */ diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 1b64d2cf5dc..fb70b946770 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -82,6 +82,7 @@ struct wined3d_settings wined3d_settings = TRUE, /* Prefer multisample textures to multisample renderbuffers. */ ~0u, /* Don't force a specific sample count by default. */ FALSE, /* Don't range check relative addressing indices in float constants. */ + FALSE, /* No strict shader math by default. */ ~0U, /* No VS shader model limit by default. */ ~0U, /* No HS shader model limit by default. */ ~0U, /* No DS shader model limit by default. */ @@ -312,6 +313,8 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) TRACE("Checking relative addressing indices in float constants.\n"); wined3d_settings.check_float_constants = TRUE; } + if (!get_config_key_dword(hkey, appkey, "strict_shader_math", &wined3d_settings.strict_shader_math)) + ERR_(winediag)("Setting strict shader math to %#x.\n", wined3d_settings.strict_shader_math); if (!get_config_key_dword(hkey, appkey, "MaxShaderModelVS", &wined3d_settings.max_sm_vs)) TRACE("Limiting VS shader model to %u.\n", wined3d_settings.max_sm_vs); if (!get_config_key_dword(hkey, appkey, "MaxShaderModelHS", &wined3d_settings.max_sm_hs)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b3f3847045d..f2b9b5feb25 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -398,6 +398,7 @@ struct wined3d_settings unsigned int multisample_textures; unsigned int sample_count; BOOL check_float_constants; + unsigned int strict_shader_math; unsigned int max_sm_vs; unsigned int max_sm_hs; unsigned int max_sm_ds; -- 2.11.0

2 1

[PATCH 3/4] d3d10: Avoid calling D3D10CreateDevice() from D3D10CreateDeviceAndSwapChain().
by Henri Verbeet Feb. 26, 2019

Feb. 26, 2019

From: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Signed-off-by: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10/d3d10_main.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10/d3d10_main.c b/dlls/d3d10/d3d10_main.c index 4d3ed1244ed..bc90ff1df7b 100644 --- a/dlls/d3d10/d3d10_main.c +++ b/dlls/d3d10/d3d10_main.c @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); -HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, +static HRESULT d3d10_create_device(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, UINT sdk_version, ID3D10Device **device) { IDXGIFactory *factory; @@ -139,6 +139,12 @@ HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver return hr; } +HRESULT WINAPI D3D10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, + HMODULE swrast, UINT flags, UINT sdk_version, ID3D10Device **device) +{ + return d3d10_create_device(adapter, driver_type, swrast, flags, sdk_version, device); +} + HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, UINT sdk_version, DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain **swapchain, ID3D10Device **device) @@ -152,8 +158,9 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER adapter, debug_d3d10_driver_type(driver_type), swrast, flags, sdk_version, swapchain_desc, swapchain, device); - hr = D3D10CreateDevice(adapter, driver_type, swrast, flags, sdk_version, device); - if (FAILED(hr)) + /* Avoid forwarding to D3D10CreateDevice(), since it breaks applications + * hooking these entry-points. */ + if (FAILED(hr = d3d10_create_device(adapter, driver_type, swrast, flags, sdk_version, device))) { WARN("Failed to create a device, returning %#x\n", hr); *device = NULL; -- 2.11.0

2 1

[PATCH 1/6] wined3d: Rename MAX_ACTIVE_LIGHTS to WINED3D_MAX_ACTIVE_LIGHTS.
by Zebediah Figura Feb. 26, 2019

Feb. 26, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/glsl_shader.c | 12 ++++++------ dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2e87e5ff85..1a24a662e8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -181,7 +181,7 @@ struct glsl_vs_program GLint q_att; GLint cos_htheta; GLint cos_hphi; - } light_location[MAX_ACTIVE_LIGHTS]; + } light_location[WINED3D_MAX_ACTIVE_LIGHTS]; GLint pointsize_location; GLint pointsize_min_location; GLint pointsize_max_location; @@ -1892,7 +1892,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context DWORD directional_count = 0; DWORD parallel_point_count = 0; - for (i = 0; i < MAX_ACTIVE_LIGHTS; ++i) + for (i = 0; i < WINED3D_MAX_ACTIVE_LIGHTS; ++i) { if (!state->light_state.lights[i]) continue; @@ -1922,7 +1922,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context parallel_point_idx = directional_idx + directional_count; shader_glsl_ffp_vertex_lightambient_uniform(context, state, prog); - for (i = 0; i < MAX_ACTIVE_LIGHTS; ++i) + for (i = 0; i < WINED3D_MAX_ACTIVE_LIGHTS; ++i) { const struct wined3d_light_info *light_info = state->light_state.lights[i]; unsigned int idx; @@ -9185,7 +9185,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr shader_addline(buffer, " float q_att;\n"); shader_addline(buffer, " float cos_htheta;\n"); shader_addline(buffer, " float cos_hphi;\n"); - shader_addline(buffer, "} ffp_light[%u];\n", MAX_ACTIVE_LIGHTS); + shader_addline(buffer, "} ffp_light[%u];\n", WINED3D_MAX_ACTIVE_LIGHTS); if (settings->point_size) { @@ -10132,7 +10132,7 @@ static void shader_glsl_init_vs_uniform_locations(const struct wined3d_gl_info * vs->material_emissive_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.emissive")); vs->material_shininess_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_material.shininess")); vs->light_ambient_location = GL_EXTCALL(glGetUniformLocation(program_id, "ffp_light_ambient")); - for (i = 0; i < MAX_ACTIVE_LIGHTS; ++i) + for (i = 0; i < WINED3D_MAX_ACTIVE_LIGHTS; ++i) { string_buffer_sprintf(name, "ffp_light[%u].diffuse", i); vs->light_location[i].diffuse = GL_EXTCALL(glGetUniformLocation(program_id, name->buffer)); @@ -11661,7 +11661,7 @@ static void glsl_vertex_pipe_vp_get_caps(const struct wined3d_gl_info *gl_info, caps->xyzrhw = TRUE; caps->emulated_flatshading = !needs_legacy_glsl_syntax(gl_info); caps->ffp_generic_attributes = TRUE; - caps->max_active_lights = MAX_ACTIVE_LIGHTS; + caps->max_active_lights = WINED3D_MAX_ACTIVE_LIGHTS; caps->max_vertex_blend_matrices = MAX_VERTEX_BLENDS; caps->max_vertex_blend_matrix_index = 0; caps->vertex_processing_caps = WINED3DVTXPCAPS_TEXGEN diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 0194917148..50b7135fb4 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -579,7 +579,7 @@ void state_cleanup(struct wined3d_state *state) if (!(state->flags & WINED3D_STATE_NO_REF)) state_unbind_resources(state); - for (counter = 0; counter < MAX_ACTIVE_LIGHTS; ++counter) + for (counter = 0; counter < WINED3D_MAX_ACTIVE_LIGHTS; ++counter) { state->light_state.lights[counter] = NULL; } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index dd452409b8..062f8662aa 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6279,7 +6279,7 @@ void wined3d_ffp_get_vs_settings(const struct wined3d_context *context, if (d3d_info->limits.varying_count >= wined3d_max_compat_varyings(gl_info)) settings->texcoords = (1u << WINED3D_MAX_TEXTURES) - 1; - for (i = 0; i < MAX_ACTIVE_LIGHTS; ++i) + for (i = 0; i < WINED3D_MAX_ACTIVE_LIGHTS; ++i) { if (!state->light_state.lights[i]) continue; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5606a11c81..2fbcf1a522 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -263,7 +263,7 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup #define WINED3D_MAX_FRAGMENT_SAMPLERS 16 #define WINED3D_MAX_VERTEX_SAMPLERS 4 #define WINED3D_MAX_COMBINED_SAMPLERS (WINED3D_MAX_FRAGMENT_SAMPLERS + WINED3D_MAX_VERTEX_SAMPLERS) -#define MAX_ACTIVE_LIGHTS 8 +#define WINED3D_MAX_ACTIVE_LIGHTS 8 #define MAX_CLIP_DISTANCES 8 #define MAX_CONSTANT_BUFFERS 15 #define MAX_SAMPLER_OBJECTS 16 @@ -1615,9 +1615,9 @@ enum wined3d_pipeline #define STATE_LIGHT_TYPE (STATE_VIEWPORT + 1) #define STATE_IS_LIGHT_TYPE(a) ((a) == STATE_LIGHT_TYPE) #define STATE_ACTIVELIGHT(a) (STATE_LIGHT_TYPE + 1 + (a)) -#define STATE_IS_ACTIVELIGHT(a) ((a) >= STATE_ACTIVELIGHT(0) && (a) < STATE_ACTIVELIGHT(MAX_ACTIVE_LIGHTS)) +#define STATE_IS_ACTIVELIGHT(a) ((a) >= STATE_ACTIVELIGHT(0) && (a) < STATE_ACTIVELIGHT(WINED3D_MAX_ACTIVE_LIGHTS)) -#define STATE_SCISSORRECT (STATE_ACTIVELIGHT(MAX_ACTIVE_LIGHTS - 1) + 1) +#define STATE_SCISSORRECT (STATE_ACTIVELIGHT(WINED3D_MAX_ACTIVE_LIGHTS - 1) + 1) #define STATE_IS_SCISSORRECT(a) ((a) == STATE_SCISSORRECT) #define STATE_CLIPPLANE(a) (STATE_SCISSORRECT + 1 + (a)) @@ -2898,7 +2898,7 @@ struct wined3d_light_state { /* Light hashmap. Collisions are handled using linked lists. */ struct list light_map[LIGHTMAP_SIZE]; - const struct wined3d_light_info *lights[MAX_ACTIVE_LIGHTS]; + const struct wined3d_light_info *lights[WINED3D_MAX_ACTIVE_LIGHTS]; }; #define WINED3D_STATE_NO_REF 0x00000001 -- 2.20.1

5 22

[PATCH 2/4] d3d10_1: Avoid calling D3D10CreateDevice1() from D3D10CreateDeviceAndSwapChain1().
by Henri Verbeet Feb. 26, 2019

Feb. 26, 2019

From: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Signed-off-by: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10_1/d3d10_1_main.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10_1/d3d10_1_main.c b/dlls/d3d10_1/d3d10_1_main.c index e9fad3ed093..8ee5aa71f79 100644 --- a/dlls/d3d10_1/d3d10_1_main.c +++ b/dlls/d3d10_1/d3d10_1_main.c @@ -63,7 +63,7 @@ static const char *debug_d3d10_feature_level(D3D10_FEATURE_LEVEL1 feature_level) #undef WINE_D3D10_TO_STR -HRESULT WINAPI D3D10CreateDevice1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, +static HRESULT d3d10_create_device1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, D3D10_FEATURE_LEVEL1 hw_level, UINT sdk_version, ID3D10Device1 **device) { IDXGIFactory *factory; @@ -175,6 +175,12 @@ HRESULT WINAPI D3D10CreateDevice1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE drive return hr; } +HRESULT WINAPI D3D10CreateDevice1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, + UINT flags, D3D10_FEATURE_LEVEL1 hw_level, UINT sdk_version, ID3D10Device1 **device) +{ + return d3d10_create_device1(adapter, driver_type, swrast, flags, hw_level, sdk_version, device); +} + HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, D3D10_FEATURE_LEVEL1 feature_level, UINT sdk_version, DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain **swapchain, ID3D10Device1 **device) @@ -194,7 +200,9 @@ HRESULT WINAPI D3D10CreateDeviceAndSwapChain1(IDXGIAdapter *adapter, D3D10_DRIVE if (!device) return E_INVALIDARG; - if (FAILED(hr = D3D10CreateDevice1(adapter, driver_type, swrast, flags, feature_level, sdk_version, device))) + /* Avoid forwarding to D3D10CreateDevice1(), since it breaks applications + * hooking these entry-points. */ + if (FAILED(hr = d3d10_create_device1(adapter, driver_type, swrast, flags, feature_level, sdk_version, device))) { WARN("Failed to create a device, returning %#x.\n", hr); *device = NULL; -- 2.11.0

2 1

[PATCH 1/4] d3d11: Avoid calling D3D11CreateDevice() from D3D11CreateDeviceAndSwapChain().
by Henri Verbeet Feb. 26, 2019

Feb. 26, 2019

From: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Signed-off-by: Stefan Riesenberger <stefan.riesenberger(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/d3d11_main.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 9c89820f6f5..b0a32aceda7 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -136,7 +136,7 @@ HRESULT WINAPI D3D11CoreCreateDevice(IDXGIFactory *factory, IDXGIAdapter *adapte return S_OK; } -HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, +static HRESULT d3d11_create_device(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context) { @@ -278,6 +278,14 @@ HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_t return (device_out || immediate_context) ? S_OK : S_FALSE; } +HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, + const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, + D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context) +{ + return d3d11_create_device(adapter, driver_type, swrast, flags, feature_levels, + levels, sdk_version, device_out, obtained_feature_level, immediate_context); +} + HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, const DXGI_SWAP_CHAIN_DESC *swapchain_desc, IDXGISwapChain **swapchain, @@ -299,8 +307,10 @@ HRESULT WINAPI D3D11CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D_DRIVER_T if (device_out) *device_out = NULL; - if (FAILED(hr = D3D11CreateDevice(adapter, driver_type, swrast, flags, feature_levels, levels, sdk_version, - &device, obtained_feature_level, immediate_context))) + /* Avoid forwarding to D3D11CreateDevice(), since it breaks applications + * hooking these entry-points. */ + if (FAILED(hr = d3d11_create_device(adapter, driver_type, swrast, flags, feature_levels, + levels, sdk_version, &device, obtained_feature_level, immediate_context))) { WARN("Failed to create a device, returning %#x.\n", hr); return hr; -- 2.11.0

2 1