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

Recent GIT changes to msvcp crash for me if i compile with --without-mingw
by Sveinar Søpler May 21, 2019

May 21, 2019

I found that recent GIT changes makes msvcp100.dll crash with: --- 0009:err:heap:HEAP_GetPtr Invalid heap (nil)! 0009:err:heap:HEAP_GetPtr Invalid heap (nil)! 0009:err:module:LdrInitializeThunk "msvcp100.dll" failed to initialize, aborting --- when compiling wine with the --without-mingw option. If i compile with default (ie. mingw enabled), seemingly things work. Is this intentional, and mingw is now "required" for wine compile? Or would i perhaps have gotten away with the it if jumping through some hoops with dll-overrides and winetricks usage? Git 0d175fe861826d4cf756291bd43404aba065cec6 and older seems to work as before tho. Sveinar

2 2

[PATCH v3 5/5] dxgi/tests: Add factory window association tests.
by Zhiyi Zhang May 21, 2019

May 21, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/tests/Makefile.in | 2 +- dlls/dxgi/tests/dxgi.c | 250 +++++++++++++++++++++++++++++++++++- 2 files changed, 250 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/Makefile.in b/dlls/dxgi/tests/Makefile.in index 1c99d70957..fbce9d3dd0 100644 --- a/dlls/dxgi/tests/Makefile.in +++ b/dlls/dxgi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dxgi.dll -IMPORTS = d3d10_1 dxgi user32 +IMPORTS = d3d10_1 d3d11 dxgi user32 C_SRCS = \ dxgi.c diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 79e4bc0c15..d4d0f93795 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -40,9 +40,16 @@ static PFN_D3D12_CREATE_DEVICE pD3D12CreateDevice; static PFN_D3D12_GET_DEBUG_INTERFACE pD3D12GetDebugInterface; static unsigned int use_adapter_idx; +static BOOL enable_debug_layer; static BOOL use_warp_adapter; static BOOL use_mt = TRUE; +struct device_desc +{ + const D3D_FEATURE_LEVEL *feature_level; + UINT flags; +}; + static struct test_entry { void (*test)(void); @@ -539,6 +546,56 @@ success: return dxgi_device; } +static ID3D11Device *create_d3d11_device(const struct device_desc *desc) +{ + static const D3D_FEATURE_LEVEL default_feature_level[] = + { + D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_1, + D3D_FEATURE_LEVEL_10_0, + }; + const D3D_FEATURE_LEVEL *feature_level; + UINT flags = desc ? desc->flags : 0; + unsigned int feature_level_count; + IDXGIAdapter *adapter; + ID3D11Device *device; + HRESULT hr; + + if (desc && desc->feature_level) + { + feature_level = desc->feature_level; + feature_level_count = 1; + } + else + { + feature_level = default_feature_level; + feature_level_count = ARRAY_SIZE(default_feature_level); + } + + if (enable_debug_layer) + flags |= D3D11_CREATE_DEVICE_DEBUG; + + if ((adapter = create_adapter())) + { + hr = D3D11CreateDevice(adapter, D3D_DRIVER_TYPE_UNKNOWN, NULL, flags, feature_level, feature_level_count, + D3D11_SDK_VERSION, &device, NULL, NULL); + IDXGIAdapter_Release(adapter); + return SUCCEEDED(hr) ? device : NULL; + } + + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, flags, feature_level, feature_level_count, + D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_WARP, NULL, flags, feature_level, feature_level_count, + D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_REFERENCE, NULL, flags, feature_level, feature_level_count, + D3D11_SDK_VERSION, &device, NULL, NULL))) + return device; + + return NULL; +} + static ID3D12Device *create_d3d12_device(void) { IDXGIAdapter *adapter; @@ -4985,6 +5042,197 @@ done: ok(!refcount, "Factory has %u references left.\n", refcount); } +static void test_window_association(void) +{ + DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGIFactory *factory, *factory2; + IDXGIDevice *devices[2] = {0}; + ID3D11Device *d3d11_device; + IDXGISwapChain *swapchain; + IDXGIAdapter *adapter; + HWND hwnd, hwnd2; + LONG_PTR wndproc; + BOOL fullscreen; + ULONG refcount; + HRESULT hr; + INT i, j; + + static const struct + { + UINT flag; + BOOL expect_fullscreen; + BOOL broken_d3d10; + } + tests[] = + { + /* There are two reasons why VK_TAB and VK_ESC are not tested here. + * 1. Posting them to the window doesn't exit fullscreen like Alt+Enter does. + * Alt+Tab and Alt+Esc are handled somewhere else, e.g., not calling IDXGISwapChain::Present + * will break Alt+Tab and Alt+Esc while Alt+Enter will still function. + * 2. Posting them hangs the posting thread. Another thread keep sending input is needed to avoid the hang. + * The hang is not because of flush_events. */ + {0, TRUE}, + {0, FALSE}, + {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, + {DXGI_MWA_NO_WINDOW_CHANGES, FALSE}, + {DXGI_MWA_NO_ALT_ENTER, FALSE, TRUE}, + {DXGI_MWA_NO_ALT_ENTER, FALSE}, + {DXGI_MWA_NO_PRINT_SCREEN, TRUE}, + {DXGI_MWA_NO_PRINT_SCREEN, FALSE}, + {0, TRUE}, + {0, FALSE} + }; + + /* d3d10 */ + devices[0] = create_device(0); + + /* d3d11 */ + d3d11_device = create_d3d11_device(NULL); + if (d3d11_device) + { + hr = ID3D11Device_QueryInterface(d3d11_device, &IID_IDXGIDevice, (void **)&devices[1]); + ok(SUCCEEDED(hr), "Created device does not implement IDXGIDevice\n"); + ID3D11Device_Release(d3d11_device); + } + + swapchain_desc.BufferDesc.Width = 800; + swapchain_desc.BufferDesc.Height = 600; + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 1; + swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); + swapchain_desc.Windowed = TRUE; + swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.Flags = 0; + + /* Get pointer to original WNDPROC */ + wndproc = GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC); + + hwnd2 = CreateWindowA("static", "dxgi_test2", 0, 0, 0, 400, 200, 0, 0, 0, 0); + hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory2); + ok(hr == S_OK, "Failed to create DXGI factory, hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(devices); i++) + { + if (!devices[i]) + { + skip("Create device failed. Skipping IDXGIFactory window association test.\n"); + continue; + } + + hr = IDXGIDevice_GetAdapter(devices[i], &adapter); + ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); + + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + + /* Parameter check */ + hr = IDXGIFactory_GetWindowAssociation(factory, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "GetWindowAssociation failed, hr %#x.\n", hr); + + for (j = 0; j <= DXGI_MWA_VALID; j++) + { + hr = IDXGIFactory_MakeWindowAssociation(factory, NULL, j); + ok(SUCCEEDED(hr), "MakeWindowAssociation failed, flags %#x, hr %#x.\n", j, hr); + + hr = IDXGIFactory_MakeWindowAssociation(factory, swapchain_desc.OutputWindow, j); + ok(SUCCEEDED(hr), "MakeWindowAssociation failed, flags %#x, hr %#x.\n", j, hr); + + /* Verify WNDPROC unmodified */ + ok(wndproc == GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC), + "Expect WNDPROC not modified\n"); + + hwnd = (HWND)0xdeadbeef; + hr = IDXGIFactory_GetWindowAssociation(factory, &hwnd); + ok(SUCCEEDED(hr), "GetWindowAssociation failed, flags %#x, hr %#x.\n", j, hr); + /* Yes, GetWindowAssociation always return NULL for hwnd even though MakeWindowAssociation and + * GetWindowAssociation are successfully called. I wonder why. */ + ok(!hwnd, "Expect null associated window.\n"); + } + + hr = IDXGIFactory_MakeWindowAssociation(factory, swapchain_desc.OutputWindow, DXGI_MWA_VALID + 1); + ok(hr == DXGI_ERROR_INVALID_CALL, "MakeWindowAssociation succeeded, hr %#x.\n", hr); + + /* Alt+Enter tests */ + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)devices[i], &swapchain_desc, &swapchain); + ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + + /* Verify WNDPROC unmodified */ + ok(wndproc == GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC), + "Expect WNDPROC not modified\n"); + + hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); + ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE + || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ + "SetFullscreenState failed, hr %#x.\n", hr); + if (FAILED(hr)) + skip("Could not change fullscreen state.\n"); + else + { + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + for (j = 0; j < ARRAY_SIZE(tests); j++) + { + /* Associate a window first with opposite flags */ + hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd2, (~tests[j].flag) & DXGI_MWA_VALID); + ok(SUCCEEDED(hr), "Test %d: MakeWindowAssociation failed, hr %#x.\n", j, hr); + + /* Associate current test window */ + hwnd = tests[j].flag ? swapchain_desc.OutputWindow : NULL; + hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd, tests[j].flag); + ok(SUCCEEDED(hr), "Test %d: MakeWindowAssociation failed, hr %#x.\n", j, hr); + + /* Associate a new test window doesn't override old window */ + hr = IDXGIFactory_MakeWindowAssociation(factory, hwnd2, (~tests[j].flag) & DXGI_MWA_VALID); + ok(SUCCEEDED(hr), "Test %d: MakeWindowAssociation failed, hr %#x.\n", j, hr); + + /* Wrong factory doesn't affect current test window */ + hr = IDXGIFactory_MakeWindowAssociation(factory2, hwnd, (~tests[j].flag) & DXGI_MWA_VALID); + ok(SUCCEEDED(hr), "Test %d: MakeWindowAssociation failed, hr %#x.\n", j, hr); + + /* Post synthesized Alt + VK_RETURN WM_SYSKEYDOWN */ + PostMessageA(swapchain_desc.OutputWindow, WM_SYSKEYDOWN, VK_RETURN, + (MapVirtualKeyA(VK_RETURN, MAPVK_VK_TO_VSC) << 16) | 0x20000001); + flush_events(); + hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); + ok(SUCCEEDED(hr), "Test %d: GetFullscreenState failed, hr %#x.\n", j, hr); + ok(fullscreen == tests[j].expect_fullscreen || broken(tests[j].broken_d3d10 && i == 0 && fullscreen), + "Test %d: got unexpected fullscreen %#x.\n", j, fullscreen); + + /* Verify WNDPROC unmodified. Currently Wine modifies WNPPROC during after fullscreen transition */ + todo_wine_if(tests[j].expect_fullscreen) + ok(wndproc == GetWindowLongPtrW(swapchain_desc.OutputWindow, GWLP_WNDPROC), + "Expect WNDPROC not modified\n"); + } + } + + /* Set to windowed mode before releasing resources, otherwise there might be unhandled exceptions */ + hr = IDXGISwapChain_SetFullscreenState(swapchain, FALSE, NULL); + ok(SUCCEEDED(hr), "SetFullscreenState failed, hr %#x.\n", hr); + + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); + refcount = IDXGIDevice_Release(devices[i]); + ok(!refcount, "Device has %u references left.\n", refcount); + refcount = IDXGIAdapter_Release(adapter); + ok(!refcount, "IDXGIAdapter has %u references left.\n", refcount); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); + } + + refcount = IDXGIFactory_Release(factory2); + ok(!refcount, "Factory has %u references left.\n", refcount); + DestroyWindow(hwnd2); + DestroyWindow(swapchain_desc.OutputWindow); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -5029,7 +5277,6 @@ static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) START_TEST(dxgi) { HMODULE dxgi_module, d3d12_module; - BOOL enable_debug_layer = FALSE; unsigned int argc, i; ID3D12Debug *debug; char **argv; @@ -5084,6 +5331,7 @@ START_TEST(dxgi) test_swapchain_parameters(); test_swapchain_window_messages(); test_swapchain_window_styles(); + test_window_association(); run_on_d3d10(test_swapchain_resize); run_on_d3d10(test_swapchain_present); run_on_d3d10(test_swapchain_backbuffer_index); -- 2.20.1

2 1

[PATCH v3 4/5] dxgi: Implement Alt+Enter handling.
by Zhiyi Zhang May 21, 2019

May 21, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 2 + dlls/wined3d/swapchain.c | 132 +++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 2 + dlls/wined3d/wined3d_private.h | 19 +++++ include/wine/wined3d.h | 2 + 5 files changed, 157 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 030bb67c22..4c90012b86 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -221,6 +221,7 @@ static ULONG STDMETHODCALLTYPE d3d11_swapchain_Release(IDXGISwapChain1 *iface) } if (swapchain->factory) IDXGIFactory_Release(swapchain->factory); + wined3d_swapchain_disable_window_hook(swapchain->wined3d_swapchain); wined3d_swapchain_decref(swapchain->wined3d_swapchain); if (device) IWineDXGIDevice_Release(device); @@ -849,6 +850,7 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi } } wined3d_mutex_unlock(); + wined3d_swapchain_enable_window_hook(swapchain->wined3d_swapchain); return S_OK; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 808602cb15..be0610d087 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -28,6 +28,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(fps); +static struct list hooked_swapchains = LIST_INIT(hooked_swapchains); +static struct list window_hooks = LIST_INIT(window_hooks); + static void wined3d_swapchain_destroy_object(void *object) { swapchain_destroy_contexts(object); @@ -1492,3 +1495,132 @@ HRESULT CDECL wined3d_swapchain_set_fullscreen(struct wined3d_swapchain *swapcha return WINED3D_OK; } + +static LRESULT CALLBACK window_hook_proc(int code, WPARAM wparam, LPARAM lparam) +{ + struct wined3d_window_association *association_entry; + struct wined3d_hooked_swapchain *swapchain_entry; + struct wined3d_swapchain_desc swapchain_desc; + MSG *msg = (MSG *)lparam; + BOOL handled = FALSE; + BOOL skip = FALSE; + + /* Handle Alt+Enter */ + if (code == HC_ACTION && msg->message == WM_SYSKEYDOWN && msg->wParam == VK_RETURN + && (msg->lParam & (KF_ALTDOWN << 16))) + { + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY(swapchain_entry, &hooked_swapchains, struct wined3d_hooked_swapchain, entry) + { + if (swapchain_entry->swapchain->device_window != msg->hwnd) + continue; + + LIST_FOR_EACH_ENTRY(association_entry, &window_associations, struct wined3d_window_association, entry) + { + if (association_entry->hwnd == msg->hwnd + && (association_entry->flags & (WINED3D_MWA_NO_WINDOW_CHANGES | WINED3D_MWA_NO_ALT_ENTER))) + { + skip = TRUE; + break; + } + } + + if (!skip) + { + wined3d_swapchain_get_desc(swapchain_entry->swapchain, &swapchain_desc); + swapchain_desc.windowed = !swapchain_desc.windowed; + wined3d_swapchain_set_fullscreen(swapchain_entry->swapchain, &swapchain_desc, NULL); + } + + handled = TRUE; + break; + } + wined3d_mutex_unlock(); + } + + return handled ? 1 : CallNextHookEx(0, code, wparam, lparam); +} + +void CDECL wined3d_swapchain_enable_window_hook(struct wined3d_swapchain *swapchain) +{ + struct wined3d_hooked_swapchain *swapchain_entry; + struct wined3d_swapchain_window_hook *hook_entry; + BOOL has_hook = FALSE; + + if (!(swapchain_entry = heap_alloc_zero(sizeof(*swapchain_entry)))) + return; + + swapchain_entry->swapchain = swapchain; + swapchain_entry->thread_id = GetWindowThreadProcessId(swapchain->device_window, NULL); + wined3d_mutex_lock(); + list_add_head(&hooked_swapchains, &swapchain_entry->entry); + /* Add hook for new thread if needed */ + LIST_FOR_EACH_ENTRY(hook_entry, &window_hooks, struct wined3d_swapchain_window_hook, entry) + { + if (hook_entry->thread_id == swapchain_entry->thread_id) + { + has_hook = TRUE; + break; + } + } + + if (!has_hook) + { + if (!(hook_entry = heap_alloc_zero(sizeof(*hook_entry)))) + { + list_remove(&swapchain_entry->entry); + heap_free(swapchain_entry); + wined3d_mutex_unlock(); + return; + } + + hook_entry->thread_id = swapchain_entry->thread_id; + hook_entry->hook = SetWindowsHookExW(WH_GETMESSAGE, window_hook_proc, 0, hook_entry->thread_id); + list_add_head(&window_hooks, &hook_entry->entry); + } + wined3d_mutex_unlock(); +} + +void CDECL wined3d_swapchain_disable_window_hook(struct wined3d_swapchain *swapchain) +{ + struct wined3d_hooked_swapchain *swapchain_entry, *swapchain_entry2; + struct wined3d_swapchain_window_hook *hook_entry, *hook_entry2; + BOOL hook_in_use = FALSE; + DWORD thread_id = 0; + + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY_SAFE(swapchain_entry, swapchain_entry2, &hooked_swapchains, struct wined3d_hooked_swapchain, entry) + { + if (swapchain_entry->swapchain == swapchain) + { + thread_id = swapchain_entry->thread_id; + list_remove(&swapchain_entry->entry); + heap_free(swapchain_entry); + break; + } + } + /* Check if hook is still used by other swapchains */ + LIST_FOR_EACH_ENTRY(swapchain_entry, &hooked_swapchains, struct wined3d_hooked_swapchain, entry) + { + if (swapchain_entry->thread_id == thread_id) + { + hook_in_use = TRUE; + break; + } + } + /* Remove hook if it's not longer used by any thread */ + if (!hook_in_use) + { + LIST_FOR_EACH_ENTRY_SAFE(hook_entry, hook_entry2, &window_hooks, struct wined3d_swapchain_window_hook, entry) + { + if (hook_entry->thread_id == thread_id) + { + list_remove(&hook_entry->entry); + UnhookWindowsHookEx(hook_entry->hook); + heap_free(hook_entry); + break; + } + } + } + wined3d_mutex_unlock(); +} diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 733eedb485..f93c8d38fe 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -263,6 +263,8 @@ @ cdecl wined3d_swapchain_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_swapchain_decref(ptr) +@ cdecl wined3d_swapchain_disable_window_hook(ptr) +@ cdecl wined3d_swapchain_enable_window_hook(ptr) @ cdecl wined3d_swapchain_get_back_buffer(ptr long) @ cdecl wined3d_swapchain_get_device(ptr) @ cdecl wined3d_swapchain_get_display_mode(ptr ptr ptr) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f277d898f3..ec920536c9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4177,6 +4177,25 @@ struct wined3d_swapchain HWND backup_wnd; }; +struct wined3d_hooked_swapchain +{ + struct wined3d_swapchain *swapchain; + DWORD thread_id; + struct list entry; +}; + +struct wined3d_swapchain_window_hook +{ + HHOOK hook; + DWORD thread_id; + struct list entry; +}; + +/* Equivalences of DXGI_MWA_* flags */ +#define WINED3D_MWA_NO_WINDOW_CHANGES 0x1 +#define WINED3D_MWA_NO_ALT_ENTER 0x2 +#define WINED3D_MWA_NO_PRINT_SCREEN 0x4 + void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) DECLSPEC_HIDDEN; struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void swapchain_destroy_contexts(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8514860a79..e41a9080df 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2664,6 +2664,8 @@ ULONG __cdecl wined3d_stateblock_incref(struct wined3d_stateblock *stateblock); HRESULT __cdecl wined3d_swapchain_create(struct wined3d_device *device, struct wined3d_swapchain_desc *desc, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_swapchain **swapchain); ULONG __cdecl wined3d_swapchain_decref(struct wined3d_swapchain *swapchain); +void __cdecl wined3d_swapchain_disable_window_hook(struct wined3d_swapchain *swapchain); +void __cdecl wined3d_swapchain_enable_window_hook(struct wined3d_swapchain *swapchain); struct wined3d_texture * __cdecl wined3d_swapchain_get_back_buffer(const struct wined3d_swapchain *swapchain, UINT backbuffer_idx); struct wined3d_device * __cdecl wined3d_swapchain_get_device(const struct wined3d_swapchain *swapchain); -- 2.20.1

1 0

[PATCH v3 3/5] dxgi: Retrieve fullscreen state from wined3d_swapchain.
by Zhiyi Zhang May 21, 2019

May 21, 2019

Because wined3d_swapchain may change its fullscreen state after user input. For example, user pressed Alt+Enter. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/dxgi_private.h | 1 - dlls/dxgi/swapchain.c | 14 ++++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index b6999c729a..553eacee3b 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -173,7 +173,6 @@ struct d3d11_swapchain IWineDXGIDevice *device; IDXGIFactory *factory; - BOOL fullscreen; IDXGIOutput *target; }; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index e09df4862d..030bb67c22 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -388,7 +388,6 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen if (SUCCEEDED(hr)) { - swapchain->fullscreen = fullscreen; if (swapchain->target) IDXGIOutput_Release(swapchain->target); swapchain->target = target; @@ -404,11 +403,17 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFullscreenState(IDXGISwapCha BOOL *fullscreen, IDXGIOutput **target) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); + struct wined3d_swapchain_desc swapchain_desc; TRACE("iface %p, fullscreen %p, target %p.\n", iface, fullscreen, target); if (fullscreen) - *fullscreen = swapchain->fullscreen; + { + wined3d_mutex_lock(); + wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); + wined3d_mutex_unlock(); + *fullscreen = !swapchain_desc.windowed; + } if (target) { @@ -781,6 +786,7 @@ static const struct wined3d_parent_ops d3d11_swapchain_wined3d_parent_ops = HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_device *device, struct wined3d_swapchain_desc *desc) { + BOOL fullscreen; HRESULT hr; /* A reference to the implicit swapchain is held by the wined3d device. In @@ -813,7 +819,7 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi if (!desc->windowed && (!desc->backbuffer_width || !desc->backbuffer_height)) FIXME("Fullscreen swapchain with back buffer width/height equal to 0 not supported properly.\n"); - swapchain->fullscreen = !desc->windowed; + fullscreen = !desc->windowed; desc->windowed = TRUE; if (FAILED(hr = wined3d_swapchain_create(device->wined3d_device, desc, swapchain, &d3d11_swapchain_wined3d_parent_ops, &swapchain->wined3d_swapchain))) @@ -823,7 +829,7 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi } swapchain->target = NULL; - if (swapchain->fullscreen) + if (fullscreen) { desc->windowed = FALSE; if (FAILED(hr = wined3d_swapchain_set_fullscreen(swapchain->wined3d_swapchain, -- 2.20.1

1 0

[PATCH v3 2/5] dxgi: Implement dxgi_factory_GetWindowAssociation().
by Zhiyi Zhang May 21, 2019

May 21, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/factory.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index a574090026..8e7500d933 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -192,9 +192,18 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IWineDXGIFac static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IWineDXGIFactory *iface, HWND *window) { - FIXME("iface %p, window %p stub!\n", iface, window); + TRACE("iface %p, window %p.\n", iface, window); - return E_NOTIMPL; + if (!window) + { + WARN("Invalid pointer.\n"); + return DXGI_ERROR_INVALID_CALL; + } + + /* Yes, tests show that it always return NULL for unknown reason. */ + *window = NULL; + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IWineDXGIFactory *iface, -- 2.20.1

1 0

[PATCH v3 1/5] dxgi: Implement dxgi_factory_MakeWindowAssociation().
by Zhiyi Zhang May 21, 2019

May 21, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Add tests to show that window association doesn't modify WNDPROC. v3: Move most of the code into wined3d. Supersede 163626~163629 dlls/dxgi/factory.c | 15 ++++++-- dlls/wined3d/swapchain.c | 1 + dlls/wined3d/wined3d.spec | 2 ++ dlls/wined3d/wined3d_main.c | 62 ++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 10 ++++++ include/wine/wined3d.h | 2 ++ 6 files changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 52c145bc6a..a574090026 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -174,9 +174,20 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IWineDXGIFactory *ifa static HRESULT STDMETHODCALLTYPE dxgi_factory_MakeWindowAssociation(IWineDXGIFactory *iface, HWND window, UINT flags) { - FIXME("iface %p, window %p, flags %#x stub!\n", iface, window, flags); + struct dxgi_factory *factory = impl_from_IWineDXGIFactory(iface); - return S_OK; + TRACE("iface %p, window %p, flags %#x.\n", iface, window, flags); + + if (flags > DXGI_MWA_VALID) + return DXGI_ERROR_INVALID_CALL; + + if (!window) + { + wined3d_remove_window_association(factory->wined3d); + return S_OK; + } + + return wined3d_add_window_association(factory->wined3d, window, flags); } static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IWineDXGIFactory *iface, HWND *window) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index fbedd7470d..808602cb15 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -22,6 +22,7 @@ #include "config.h" #include "wine/port.h" +#include "wine/list.h" #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 040b9fc4ac..733eedb485 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -1,6 +1,7 @@ @ stdcall wined3d_mutex_lock() @ stdcall wined3d_mutex_unlock() +@ cdecl wined3d_add_window_association(ptr ptr long) @ cdecl wined3d_calculate_format_pitch(ptr long long long) @ cdecl wined3d_check_depth_stencil_match(ptr long long long long long) @ cdecl wined3d_check_device_format(ptr long long long long long long long) @@ -20,6 +21,7 @@ @ cdecl wined3d_get_output_desc(ptr long ptr) @ cdecl wined3d_incref(ptr) @ cdecl wined3d_register_software_device(ptr ptr) +@ cdecl wined3d_remove_window_association(ptr) @ cdecl wined3d_set_adapter_display_mode(ptr long ptr) @ cdecl wined3d_blend_state_create(ptr ptr ptr ptr ptr) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 180e2d262e..9ef023dfb7 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -48,6 +48,8 @@ struct wined3d_wndproc_table static struct wined3d_wndproc_table wndproc_table; +struct list window_associations = LIST_INIT(window_associations); + static CRITICAL_SECTION wined3d_cs; static CRITICAL_SECTION_DEBUG wined3d_cs_debug = { @@ -555,6 +557,66 @@ void wined3d_unregister_window(HWND window) wined3d_wndproc_mutex_unlock(); } +HRESULT CDECL wined3d_add_window_association(struct wined3d *wined3d, HWND hwnd, UINT flags) +{ + struct wined3d_window_association *association; + BOOL found = FALSE; + HRESULT hr = S_OK; + + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY(association, &window_associations, struct wined3d_window_association, entry) + { + if (hwnd == association->hwnd) + { + found = TRUE; + break; + } + } + + if (found) + { + if(association->wined3d != wined3d) + WARN("window %p is already associated\n", hwnd); + else + association->flags = flags; + goto done; + } + else + { + association = heap_alloc_zero(sizeof(*association)); + if (!association) + { + hr = E_OUTOFMEMORY; + goto done; + } + + association->wined3d = wined3d; + association->hwnd = hwnd; + association->flags = flags; + list_add_head(&window_associations, &association->entry); + } + +done: + wined3d_mutex_unlock(); + return hr; +} + +void CDECL wined3d_remove_window_association(struct wined3d *wined3d) +{ + struct wined3d_window_association *association, *association2; + + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY_SAFE(association, association2, &window_associations, struct wined3d_window_association, entry) + { + if (wined3d == association->wined3d) + { + list_remove(&association->entry); + heap_free(association); + } + } + wined3d_mutex_unlock(); +} + /* At process attach */ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0fc56462b0..f277d898f3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -215,6 +215,16 @@ struct wined3d_d3d_info DWORD multisample_draw_location; }; +struct wined3d_window_association +{ + struct wined3d *wined3d; + HWND hwnd; + UINT flags; + struct list entry; +}; + +extern struct list window_associations DECLSPEC_HIDDEN; + static const struct color_fixup_desc COLOR_FIXUP_IDENTITY = {0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_Z, 0, CHANNEL_SOURCE_W}; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 958ade166c..8514860a79 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2172,6 +2172,7 @@ typedef HRESULT (CDECL *wined3d_device_reset_cb)(struct wined3d_resource *resour void __stdcall wined3d_mutex_lock(void); void __stdcall wined3d_mutex_unlock(void); +HRESULT __cdecl wined3d_add_window_association(struct wined3d *wined3d, HWND hwnd, UINT flags); UINT __cdecl wined3d_calculate_format_pitch(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_format_id format_id, UINT width); HRESULT __cdecl wined3d_check_depth_stencil_match(const struct wined3d *wined3d, UINT adapter_idx, @@ -2211,6 +2212,7 @@ HRESULT __cdecl wined3d_get_output_desc(const struct wined3d *wined3d, unsigned struct wined3d_output_desc *desc); ULONG __cdecl wined3d_incref(struct wined3d *wined3d); HRESULT __cdecl wined3d_register_software_device(struct wined3d *wined3d, void *init_function); +void __cdecl wined3d_remove_window_association(struct wined3d *wined3d); HRESULT __cdecl wined3d_set_adapter_display_mode(struct wined3d *wined3d, UINT adapter_idx, const struct wined3d_display_mode *mode); -- 2.20.1

1 0

[PATCH] mferror: Add some more error messages.
by Nikolay Sivov May 21, 2019

May 21, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mferror/mferror.mc | 91 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) diff --git a/dlls/mferror/mferror.mc b/dlls/mferror/mferror.mc index 826f8e562c..6934611ab4 100644 --- a/dlls/mferror/mferror.mc +++ b/dlls/mferror/mferror.mc @@ -526,6 +526,97 @@ SymbolicName=MF_E_UNSUPPORTED_CHARACTERISTICS Language=ENU Unsupported media source characteristics. . +MessageId=19000 +Severity=Error +Facility=MF +SymbolicName=MF_E_STREAMSINK_REMOVED +Language=ENU +Stream sink was removed. +. +MessageId=19002 +Severity=Error +Facility=MF +SymbolicName=MF_E_STREAMSINKS_OUT_OF_SYNC +Language=ENU +Stream sinks are out of sync. +. +MessageId=19003 +Severity=Error +Facility=MF +SymbolicName=MF_E_STREAMSINKS_FIXED +Language=ENU +Media sink stream sinks set is fixed. +. +MessageId=19004 +Severity=Error +Facility=MF +SymbolicName=MF_E_STREAMSINK_EXISTS +Language=ENU +Stream sink already exists. +. +MessageId=19005 +Severity=Error +Facility=MF +SymbolicName=MF_E_SAMPLEALLOCATOR_CANCELED +Language=ENU +Sample allocation was canceled. +. +MessageId=19006 +Severity=Error +Facility=MF +SymbolicName=MF_E_SAMPLEALLOCATOR_EMPTY +Language=ENU +Sample allocator is empty. +. +MessageId=19007 +Severity=Error +Facility=MF +SymbolicName=MF_E_SINK_ALREADYSTOPPED +Language=ENU +Sink was already stopped. +. +MessageId=19008 +Severity=Error +Facility=MF +SymbolicName=MF_E_ASF_FILESINK_BITRATE_UNKNOWN +Language=ENU +Bitrate was unknown for ASF file sink. +. +MessageId=19009 +Severity=Error +Facility=MF +SymbolicName=MF_E_SINK_NO_STREAMS +Language=ENU +No streams were selected for the sink. +. +MessageId=19010 +Severity=Success +Facility=MF +SymbolicName=MF_S_SINK_NOT_FINALIZED +Language=ENU +Sink has not been finalized. +. +MessageId=19011 +Severity=Error +Facility=MF +SymbolicName=MF_E_METADATA_TOO_LONG +Language=ENU +Metadata was too long. +. +MessageId=19012 +Severity=Error +Facility=MF +SymbolicName=MF_E_SINK_NO_SAMPLES_PROCESSED +Language=ENU +No samples were processed by the sink. +. +MessageId=19013 +Severity=Error +Facility=MF +SymbolicName=MF_E_SINK_HEADERS_NOT_FOUND +Language=ENU +Sink was not provided with required headers. +. MessageId=21006 Severity=Error Facility=MF -- 2.20.1

1 0

Supporting ext4 case-insensitive directories
by Gabriel Ivăncescu May 21, 2019

May 21, 2019

Hi, With the latest kernel release candidate, ext4 received support for native case-insensitivity on a per-directory basis. This is done using the EXT2_IOC_SETFLAGS ioctl and the EXT4_CASEFOLD_FL flag (and GETFLAGS to retrieve it) for a given directory. Note that it works only on empty directories. I'll add support for it, and retrieving it should not be a problem to add in Wine. However my question now is: should Wine, by default, attempt to create the 'drive_c' directory with this attribute on (on new prefixes)? Do we want to do that? Thankfully we don't need to apply it to other directories, because according to: https://github.com/torvalds/linux/blob/master/fs/ext4/ext4.h EXT4_FL_INHERITED contains EXT4_CASEFOLD_FL, so it is inherited on new subdirectories automatically. This means we really only need to set it when creating drive_c itself. Thoughts?

1 0

[PATCH] kernelbase: Add most of path API from shlwapi.
by Nikolay Sivov May 21, 2019

May 21, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernelbase/kernelbase.spec | 38 +-- dlls/kernelbase/path.c | 422 ++++++++++++++++++++++++++++++++ 2 files changed, 441 insertions(+), 19 deletions(-) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 46163150c1..874db20c9c 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1056,14 +1056,14 @@ @ stdcall PathCreateFromUrlA(str ptr ptr long) shlwapi.PathCreateFromUrlA @ stdcall PathCreateFromUrlAlloc(wstr ptr long) shlwapi.PathCreateFromUrlAlloc @ stdcall PathCreateFromUrlW(wstr ptr ptr long) shlwapi.PathCreateFromUrlW -@ stdcall PathFileExistsA(str) shlwapi.PathFileExistsA -@ stdcall PathFileExistsW(wstr) shlwapi.PathFileExistsW +@ stdcall PathFileExistsA(str) +@ stdcall PathFileExistsW(wstr) @ stdcall PathFindExtensionA(str) @ stdcall PathFindExtensionW(wstr) @ stdcall PathFindFileNameA(str) @ stdcall PathFindFileNameW(wstr) -@ stdcall PathFindNextComponentA(str) shlwapi.PathFindNextComponentA -@ stdcall PathFindNextComponentW(wstr) shlwapi.PathFindNextComponentW +@ stdcall PathFindNextComponentA(str) +@ stdcall PathFindNextComponentW(wstr) @ stdcall PathGetArgsA(str) @ stdcall PathGetArgsW(wstr) @ stdcall PathGetCharTypeA(long) @@ -1080,8 +1080,8 @@ @ stdcall PathIsRelativeW(wstr) @ stdcall PathIsRootA(str) @ stdcall PathIsRootW(wstr) -@ stdcall PathIsSameRootA(str str) shlwapi.PathIsSameRootA -@ stdcall PathIsSameRootW(wstr wstr) shlwapi.PathIsSameRootW +@ stdcall PathIsSameRootA(str str) +@ stdcall PathIsSameRootW(wstr wstr) @ stdcall PathIsUNCA(str) @ stdcall PathIsUNCEx(wstr ptr) @ stdcall PathIsUNCServerA(str) @@ -1093,16 +1093,16 @@ @ stdcall PathIsURLW(wstr) shlwapi.PathIsURLW @ stdcall PathIsValidCharA(long long) @ stdcall PathIsValidCharW(long long) -@ stdcall PathMatchSpecA(str str) shlwapi.PathMatchSpecA +@ stdcall PathMatchSpecA(str str) # @ stub PathMatchSpecExA # @ stub PathMatchSpecExW -@ stdcall PathMatchSpecW(wstr wstr) shlwapi.PathMatchSpecW +@ stdcall PathMatchSpecW(wstr wstr) @ stdcall PathParseIconLocationA(str) shlwapi.PathParseIconLocationA @ stdcall PathParseIconLocationW(wstr) shlwapi.PathParseIconLocationW -@ stdcall PathQuoteSpacesA(str) shlwapi.PathQuoteSpacesA -@ stdcall PathQuoteSpacesW(wstr) shlwapi.PathQuoteSpacesW -@ stdcall PathRelativePathToA(ptr str long str long) shlwapi.PathRelativePathToA -@ stdcall PathRelativePathToW(ptr wstr long wstr long) shlwapi.PathRelativePathToW +@ stdcall PathQuoteSpacesA(str) +@ stdcall PathQuoteSpacesW(wstr) +@ stdcall PathRelativePathToA(ptr str long str long) +@ stdcall PathRelativePathToW(ptr wstr long wstr long) @ stdcall PathRemoveBackslashA(str) @ stdcall PathRemoveBackslashW(wstr) @ stdcall PathRemoveBlanksA(str) @@ -1113,13 +1113,13 @@ @ stdcall PathRemoveFileSpecW(wstr) @ stdcall PathRenameExtensionA(str str) @ stdcall PathRenameExtensionW(wstr wstr) -@ stdcall PathSearchAndQualifyA(str ptr long) shlwapi.PathSearchAndQualifyA -@ stdcall PathSearchAndQualifyW(wstr ptr long) shlwapi.PathSearchAndQualifyW -@ stdcall PathSkipRootA(str) shlwapi.PathSkipRootA -@ stdcall PathSkipRootW(wstr) shlwapi.PathSkipRootW -@ stdcall PathStripPathA(str) shlwapi.PathStripPathA -@ stdcall PathStripPathW(wstr) shlwapi.PathStripPathW -@ stdcall PathStripToRootA(str) shlwapi.PathStripToRootA +@ stdcall PathSearchAndQualifyA(str ptr long) +@ stdcall PathSearchAndQualifyW(wstr ptr long) +@ stdcall PathSkipRootA(str) +@ stdcall PathSkipRootW(wstr) +@ stdcall PathStripPathA(str) +@ stdcall PathStripPathW(wstr) +@ stdcall PathStripToRootA(str) @ stdcall PathStripToRootW(wstr) @ stdcall PathUnExpandEnvStringsA(str ptr long) shlwapi.PathUnExpandEnvStringsA @ stdcall PathUnExpandEnvStringsW(wstr ptr long) shlwapi.PathUnExpandEnvStringsW diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 49af28effe..ca951cfd3f 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -2176,3 +2176,425 @@ BOOL WINAPI PathIsValidCharW(WCHAR c, DWORD class) return class & path_charclass[c]; } + +char * WINAPI PathFindNextComponentA(const char *path) +{ + char *slash; + + TRACE("%s\n", wine_dbgstr_a(path)); + + if (!path || !*path) + return NULL; + + if ((slash = StrChrA(path, '\\'))) + { + if (slash[1] == '\\') + slash++; + return slash + 1; + } + + return (char *)path + strlen(path); +} + +WCHAR * WINAPI PathFindNextComponentW(const WCHAR *path) +{ + WCHAR *slash; + + TRACE("%s\n", wine_dbgstr_w(path)); + + if (!path || !*path) + return NULL; + + if ((slash = StrChrW(path, '\\'))) + { + if (slash[1] == '\\') + slash++; + return slash + 1; + } + + return (WCHAR *)path + strlenW(path); +} + +char * WINAPI PathSkipRootA(const char *path) +{ + TRACE("%s\n", wine_dbgstr_a(path)); + + if (!path || !*path) + return NULL; + + if (*path == '\\' && path[1] == '\\') + { + /* Network share: skip share server and mount point */ + path += 2; + if ((path = StrChrA(path, '\\')) && (path = StrChrA(path + 1, '\\'))) + path++; + return (char *)path; + } + + if (IsDBCSLeadByte(*path)) + return NULL; + + /* Check x:\ */ + if (path[0] && path[1] == ':' && path[2] == '\\') + return (char *)path + 3; + + return NULL; +} + +WCHAR * WINAPI PathSkipRootW(const WCHAR *path) +{ + TRACE("%s\n", wine_dbgstr_w(path)); + + if (!path || !*path) + return NULL; + + if (*path == '\\' && path[1] == '\\') + { + /* Network share: skip share server and mount point */ + path += 2; + if ((path = StrChrW(path, '\\')) && (path = StrChrW(path + 1, '\\'))) + path++; + return (WCHAR *)path; + } + + /* Check x:\ */ + if (path[0] && path[1] == ':' && path[2] == '\\') + return (WCHAR *)path + 3; + + return NULL; +} + +void WINAPI PathStripPathA(char *path) +{ + TRACE("%s\n", wine_dbgstr_a(path)); + + if (path) + { + char *filename = PathFindFileNameA(path); + if (filename != path) + RtlMoveMemory(path, filename, strlen(filename) + 1); + } +} + +void WINAPI PathStripPathW(WCHAR *path) +{ + WCHAR *filename; + + TRACE("%s\n", wine_dbgstr_w(path)); + filename = PathFindFileNameW(path); + if (filename != path) + RtlMoveMemory(path, filename, (strlenW(filename) + 1) * sizeof(WCHAR)); +} + +BOOL WINAPI PathSearchAndQualifyA(const char *path, char *buffer, UINT length) +{ + TRACE("%s, %p, %u\n", wine_dbgstr_a(path), buffer, length); + + if (SearchPathA(NULL, path, NULL, length, buffer, NULL)) + return TRUE; + + return !!GetFullPathNameA(path, length, buffer, NULL); +} + +BOOL WINAPI PathSearchAndQualifyW(const WCHAR *path, WCHAR *buffer, UINT length) +{ + TRACE("%s, %p, %u\n", wine_dbgstr_w(path), buffer, length); + + if (SearchPathW(NULL, path, NULL, length, buffer, NULL)) + return TRUE; + return !!GetFullPathNameW(path, length, buffer, NULL); +} + +BOOL WINAPI PathRelativePathToA(char *path, const char *from, DWORD attributes_from, const char *to, + DWORD attributes_to) +{ + WCHAR pathW[MAX_PATH], fromW[MAX_PATH], toW[MAX_PATH]; + BOOL ret; + + TRACE("%p, %s, %#x, %s, %#x\n", path, wine_dbgstr_a(from), attributes_from, wine_dbgstr_a(to), attributes_to); + + if (!path || !from || !to) + return FALSE; + + MultiByteToWideChar(CP_ACP, 0, from, -1, fromW, ARRAY_SIZE(fromW)); + MultiByteToWideChar(CP_ACP, 0, to, -1, toW, ARRAY_SIZE(toW)); + ret = PathRelativePathToW(pathW, fromW, attributes_from, toW, attributes_to); + WideCharToMultiByte(CP_ACP, 0, pathW, -1, path, MAX_PATH, 0, 0); + + return ret; +} + +BOOL WINAPI PathRelativePathToW(WCHAR *path, const WCHAR *from, DWORD attributes_from, const WCHAR *to, + DWORD attributes_to) +{ + static const WCHAR szPrevDirSlash[] = { '.', '.', '\\', '\0' }; + static const WCHAR szPrevDir[] = { '.', '.', '\0' }; + WCHAR fromW[MAX_PATH], toW[MAX_PATH]; + DWORD len; + + TRACE("%p, %s, %#x, %s, %#x\n", path, wine_dbgstr_w(from), attributes_from, wine_dbgstr_w(to), attributes_to); + + if (!path || !from || !to) + return FALSE; + + *path = '\0'; + lstrcpynW(fromW, from, ARRAY_SIZE(fromW)); + lstrcpynW(toW, to, ARRAY_SIZE(toW)); + + if (!(attributes_from & FILE_ATTRIBUTE_DIRECTORY)) + PathRemoveFileSpecW(fromW); + if (!(attributes_to & FILE_ATTRIBUTE_DIRECTORY)) + PathRemoveFileSpecW(toW); + + /* Paths can only be relative if they have a common root */ + if (!(len = PathCommonPrefixW(fromW, toW, 0))) + return FALSE; + + /* Strip off 'from' components to the root, by adding "..\" */ + from = fromW + len; + if (!*from) + { + path[0] = '.'; + path[1] = '\0'; + } + if (*from == '\\') + from++; + + while (*from) + { + from = PathFindNextComponentW(from); + strcatW(path, *from ? szPrevDirSlash : szPrevDir); + } + + /* From the root add the components of 'to' */ + to += len; + /* We check to[-1] to avoid skipping end of string. See the notes for this function. */ + if (*to && to[-1]) + { + if (*to != '\\') + to--; + len = strlenW(path); + if (len + strlenW(to) >= MAX_PATH) + { + *path = '\0'; + return FALSE; + } + strcpyW(path + len, to); + } + + return TRUE; +} + +static BOOL path_match_maskA(const char *name, const char *mask) +{ + while (*name && *mask && *mask != ';') + { + if (*mask == '*') + { + do + { + if (path_match_maskA(name, mask + 1)) + return TRUE; /* try substrings */ + } while (*name++); + return FALSE; + } + + if (toupper(*mask) != toupper(*name) && *mask != '?') + return FALSE; + + name = CharNextA(name); + mask = CharNextA(mask); + } + + if (!*name) + { + while (*mask == '*') + mask++; + if (!*mask || *mask == ';') + return TRUE; + } + + return FALSE; +} + + +BOOL WINAPI PathMatchSpecA(const char *path, const char *mask) +{ + TRACE("%s, %s\n", wine_dbgstr_a(path), wine_dbgstr_a(mask)); + + if (!lstrcmpA(mask, "*.*")) + return TRUE; /* Matches every path */ + + while (*mask) + { + while (*mask == ' ') + mask++; /* Eat leading spaces */ + + if (path_match_maskA(path, mask)) + return TRUE; /* Matches the current mask */ + + while (*mask && *mask != ';') + mask = CharNextA(mask); /* masks separated by ';' */ + + if (*mask == ';') + mask++; + } + + return FALSE; +} + +static BOOL path_match_maskW(const WCHAR *name, const WCHAR *mask) +{ + while (*name && *mask && *mask != ';') + { + if (*mask == '*') + { + do + { + if (path_match_maskW(name, mask + 1)) + return TRUE; /* try substrings */ + } while (*name++); + return FALSE; + } + + if (toupperW(*mask) != toupperW(*name) && *mask != '?') + return FALSE; + + name++; + mask++; + } + + if (!*name) + { + while (*mask == '*') + mask++; + if (!*mask || *mask == ';') + return TRUE; + } + + return FALSE; +} + +BOOL WINAPI PathMatchSpecW(const WCHAR *path, const WCHAR *mask) +{ + static const WCHAR maskallW[] = {'*','.','*',0}; + + TRACE("%s, %s\n", wine_dbgstr_w(path), wine_dbgstr_w(mask)); + + if (!lstrcmpW(mask, maskallW)) + return TRUE; /* Matches every path */ + + while (*mask) + { + while (*mask == ' ') + mask++; /* Eat leading spaces */ + + if (path_match_maskW(path, mask)) + return TRUE; /* Matches the current path */ + + while (*mask && *mask != ';') + mask++; /* masks separated by ';' */ + + if (*mask == ';') + mask++; + } + + return FALSE; +} + +void WINAPI PathQuoteSpacesA(char *path) +{ + TRACE("%s\n", wine_dbgstr_a(path)); + + if (path && StrChrA(path, ' ')) + { + size_t len = strlen(path) + 1; + + if (len + 2 < MAX_PATH) + { + memmove(path + 1, path, len); + path[0] = '"'; + path[len] = '"'; + path[len + 1] = '\0'; + } + } +} + +void WINAPI PathQuoteSpacesW(WCHAR *path) +{ + TRACE("%s\n", wine_dbgstr_w(path)); + + if (path && StrChrW(path, ' ')) + { + int len = strlenW(path) + 1; + + if (len + 2 < MAX_PATH) + { + memmove(path + 1, path, len * sizeof(WCHAR)); + path[0] = '"'; + path[len] = '"'; + path[len + 1] = '\0'; + } + } +} + +BOOL WINAPI PathIsSameRootA(const char *path1, const char *path2) +{ + const char *start; + int len; + + TRACE("%s, %s\n", wine_dbgstr_a(path1), wine_dbgstr_a(path2)); + + if (!path1 || !path2 || !(start = PathSkipRootA(path1))) + return FALSE; + + len = PathCommonPrefixA(path1, path2, NULL) + 1; + return start - path1 <= len; +} + +BOOL WINAPI PathIsSameRootW(const WCHAR *path1, const WCHAR *path2) +{ + const WCHAR *start; + int len; + + TRACE("%s, %s\n", wine_dbgstr_w(path1), wine_dbgstr_w(path2)); + + if (!path1 || !path2 || !(start = PathSkipRootW(path1))) + return FALSE; + + len = PathCommonPrefixW(path1, path2, NULL) + 1; + return start - path1 <= len; +} + +BOOL WINAPI PathFileExistsA(const char *path) +{ + UINT prev_mode; + DWORD attrs; + + TRACE("%s\n", wine_dbgstr_a(path)); + + if (!path) + return FALSE; + + /* Prevent a dialog box if path is on a disk that has been ejected. */ + prev_mode = SetErrorMode(SEM_FAILCRITICALERRORS); + attrs = GetFileAttributesA(path); + SetErrorMode(prev_mode); + return attrs != INVALID_FILE_ATTRIBUTES; +} + +BOOL WINAPI PathFileExistsW(const WCHAR *path) +{ + UINT prev_mode; + DWORD attrs; + + TRACE("%s\n", wine_dbgstr_w(path)); + + if (!path) + return FALSE; + + prev_mode = SetErrorMode(SEM_FAILCRITICALERRORS); + attrs = GetFileAttributesW(path); + SetErrorMode(prev_mode); + return attrs != INVALID_FILE_ATTRIBUTES; +} -- 2.20.1

1 0

[PATCH v2] urlmon/tests: Add a test for ProtocolCF_CreateInstance not supporting aggregation.
by Dmitry Timoshkov May 21, 2019

May 21, 2019

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/urlmon/tests/protocol.c | 156 +++++++++++++++++++++++++++++------ 1 file changed, 130 insertions(+), 26 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 999b591f5f..a9698f73ef 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -104,6 +104,8 @@ DEFINE_EXPECT(OnResponse); DEFINE_EXPECT(Switch); DEFINE_EXPECT(Continue); DEFINE_EXPECT(CreateInstance); +DEFINE_EXPECT(CreateInstance_no_aggregation); +DEFINE_EXPECT(CreateInstance_no_aggregation_fail); DEFINE_EXPECT(Start); DEFINE_EXPECT(StartEx); DEFINE_EXPECT(Terminate); @@ -159,6 +161,7 @@ static DWORD prot_read, filter_state, http_post_test, thread_id; static BOOL security_problem, test_async_req, impl_protex; static BOOL async_read_pending, mimefilter_test, direct_read, wait_for_switch, emulate_prot, short_read, test_abort; static BOOL empty_file, no_mime, bind_from_cache, file_with_hash, reuse_protocol_thread; +static BOOL no_aggregation; enum { STATE_CONNECTING, @@ -1532,15 +1535,23 @@ static HRESULT WINAPI InternetPriority_QueryInterface(IInternetPriority *iface, static ULONG WINAPI InternetPriority_AddRef(IInternetPriority *iface) { Protocol *This = impl_from_IInternetPriority(iface); - This->outer_ref++; - return IUnknown_AddRef(This->outer); + if (This->outer) + { + This->outer_ref++; + return IUnknown_AddRef(This->outer); + } + return IUnknown_AddRef(&This->IUnknown_inner); } static ULONG WINAPI InternetPriority_Release(IInternetPriority *iface) { Protocol *This = impl_from_IInternetPriority(iface); - This->outer_ref--; - return IUnknown_Release(This->outer); + if (This->outer) + { + This->outer_ref--; + return IUnknown_Release(This->outer); + } + return IUnknown_Release(&This->IUnknown_inner); } static HRESULT WINAPI InternetPriority_SetPriority(IInternetPriority *iface, LONG nPriority) @@ -1621,6 +1632,12 @@ static HRESULT WINAPI ProtocolEmul_QueryInterface(IInternetProtocolEx *iface, RE static const IID unknown_iid = {0x7daf9908,0x8415,0x4005,{0x95,0xae, 0xbd,0x27,0xf6,0xe3,0xdc,0x00}}; static const IID unknown_iid2 = {0x5b7ebc0c,0xf630,0x4cea,{0x89,0xd3,0x5a,0xf0,0x38,0xed,0x05,0x5c}}; + if(IsEqualGUID(riid, &IID_IInternetProtocolEx)) { + *ppv = &This->IInternetProtocolEx_iface; + IInternetProtocolEx_AddRef(&This->IInternetProtocolEx_iface); + return S_OK; + } + /* FIXME: Why is it calling here instead of outer IUnknown? */ if(IsEqualGUID(riid, &IID_IInternetPriority)) { *ppv = &This->IInternetPriority_iface; @@ -1636,15 +1653,23 @@ static HRESULT WINAPI ProtocolEmul_QueryInterface(IInternetProtocolEx *iface, RE static ULONG WINAPI ProtocolEmul_AddRef(IInternetProtocolEx *iface) { Protocol *This = impl_from_IInternetProtocolEx(iface); - This->outer_ref++; - return IUnknown_AddRef(This->outer); + if (This->outer) + { + This->outer_ref++; + return IUnknown_AddRef(This->outer); + } + return IUnknown_AddRef(&This->IUnknown_inner); } static ULONG WINAPI ProtocolEmul_Release(IInternetProtocolEx *iface) { Protocol *This = impl_from_IInternetProtocolEx(iface); - This->outer_ref--; - return IUnknown_Release(This->outer); + if (This->outer) + { + This->outer_ref--; + return IUnknown_Release(This->outer); + } + return IUnknown_Release(&This->IUnknown_inner); } static DWORD WINAPI thread_proc(PVOID arg) @@ -2215,6 +2240,7 @@ static Protocol *impl_from_IUnknown(IUnknown *iface) static HRESULT WINAPI ProtocolUnk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { + static const IID IID_undocumentedIE10 = {0x7daf9908,0x8415,0x4005,{0x95,0xae,0xbd,0x27,0xf6,0xe3,0xdc,0x00}}; Protocol *This = impl_from_IUnknown(iface); if(IsEqualGUID(&IID_IUnknown, riid)) { @@ -2243,6 +2269,10 @@ static HRESULT WINAPI ProtocolUnk_QueryInterface(IUnknown *iface, REFIID riid, v CHECK_EXPECT(QueryInterface_IWinInetHttpInfo); *ppv = NULL; return E_NOINTERFACE; + }else if(IsEqualGUID(&IID_undocumentedIE10, riid)) { + trace("QI(%s)\n", wine_dbgstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; }else { ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); *ppv = NULL; @@ -2569,12 +2599,28 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown { Protocol *ret; - CHECK_EXPECT(CreateInstance); + trace("CF_CreateInstance(%s,%p)\n", wine_dbgstr_guid(riid), pOuter); - ok(pOuter == (IUnknown*)prot_bind_info, "pOuter != protocol_unk\n"); - ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); ok(ppv != NULL, "ppv == NULL\n"); + if (!pOuter) + { + ok(IsEqualGUID(&IID_IInternetProtocol, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); + CHECK_EXPECT(CreateInstance_no_aggregation); + } + else + { + ok(pOuter == (IUnknown*)prot_bind_info, "pOuter != protocol_unk\n"); + ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", wine_dbgstr_guid(riid)); + if (no_aggregation) + { + CHECK_EXPECT(CreateInstance_no_aggregation_fail); + *ppv = NULL; + return CLASS_E_NOAGGREGATION; + } + CHECK_EXPECT(CreateInstance); + } + ret = heap_alloc(sizeof(*ret)); ret->IUnknown_inner.lpVtbl = &ProtocolUnkVtbl; ret->IInternetProtocolEx_iface.lpVtbl = &ProtocolVtbl; @@ -2584,7 +2630,10 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown ret->outer_ref = 0; protocol_emul = ret; - *ppv = &ret->IUnknown_inner; + if (!pOuter) + *ppv = &ret->IInternetProtocolEx_iface; + else + *ppv = &ret->IUnknown_inner; return S_OK; } @@ -3763,7 +3812,7 @@ static void test_CreateBinding(void) {'t','e','s','t',':','/','/','f','i','l','e','.','h','t','m','l',0}; static const WCHAR wsz_test[] = {'t','e','s','t',0}; - trace("Testing CreateBinding...\n"); + trace("Testing CreateBinding%s...\n", no_aggregation ? "(no aggregation)" : ""); init_test(BIND_TEST, TEST_BINDING); hres = pCoInternetGetSession(0, &session, 0); @@ -3811,37 +3860,76 @@ static void test_CreateBinding(void) ok(hres == E_NOINTERFACE, "Could not get IWinInetInfo protocol: %08x\n", hres); SET_EXPECT(QueryService_InternetProtocol); - SET_EXPECT(CreateInstance); + + if(no_aggregation) { + SET_EXPECT(CreateInstance_no_aggregation_fail); + SET_EXPECT(CreateInstance_no_aggregation); + SET_EXPECT(StartEx); + } else { + SET_EXPECT(CreateInstance); + SET_EXPECT(Start); + } + SET_EXPECT(ReportProgress_PROTOCOLCLASSID); SET_EXPECT(SetPriority); - SET_EXPECT(Start); trace("Start >\n"); expect_hrResult = S_OK; hres = IInternetProtocol_Start(protocol, test_url, &protocol_sink, &bind_info, 0, 0); +todo_wine_if (no_aggregation) ok(hres == S_OK, "Start failed: %08x\n", hres); + if (hres != S_OK) goto fail; trace("Start <\n"); + if(no_aggregation) + ok(protocol_emul->outer_ref == 0, "protocol_outer_ref = %u\n", protocol_emul->outer_ref); + else + ok(protocol_emul->outer_ref == 1 || broken(protocol_emul->outer_ref == 0) /* before win7 */, "protocol_outer_ref = %u\n", protocol_emul->outer_ref); + CHECK_CALLED(QueryService_InternetProtocol); - CHECK_CALLED(CreateInstance); + + if(no_aggregation) { + ok(protocol_emul->outer_ref == 0, "protocol_outer_ref = %u\n", protocol_emul->outer_ref); + CHECK_NOT_CALLED(CreateInstance); + CHECK_CALLED(CreateInstance_no_aggregation_fail); + CHECK_CALLED(CreateInstance_no_aggregation); + } else { + ok(protocol_emul->outer_ref == 1 || broken(protocol_emul->outer_ref == 0) /* before win7 */, "protocol_outer_ref = %u\n", protocol_emul->outer_ref); + CHECK_CALLED(CreateInstance); + CHECK_NOT_CALLED(CreateInstance_no_aggregation_fail); + CHECK_NOT_CALLED(CreateInstance_no_aggregation); + } + CHECK_CALLED(ReportProgress_PROTOCOLCLASSID); CHECK_CALLED(SetPriority); - CHECK_CALLED(Start); + if(no_aggregation) + CHECK_CALLED(StartEx); + else + CHECK_CALLED(Start); SET_EXPECT(QueryInterface_IWinInetInfo); hres = IInternetProtocol_QueryInterface(protocol, &IID_IWinInetInfo, (void**)&inet_info); ok(hres == E_NOINTERFACE, "Could not get IWinInetInfo protocol: %08x\n", hres); - CHECK_CALLED(QueryInterface_IWinInetInfo); + if(no_aggregation) + CHECK_NOT_CALLED(QueryInterface_IWinInetInfo); + else + CHECK_CALLED(QueryInterface_IWinInetInfo); SET_EXPECT(QueryInterface_IWinInetInfo); hres = IInternetProtocol_QueryInterface(protocol, &IID_IWinInetInfo, (void**)&inet_info); ok(hres == E_NOINTERFACE, "Could not get IWinInetInfo protocol: %08x\n", hres); - CHECK_CALLED(QueryInterface_IWinInetInfo); + if(no_aggregation) + CHECK_NOT_CALLED(QueryInterface_IWinInetInfo); + else + CHECK_CALLED(QueryInterface_IWinInetInfo); SET_EXPECT(QueryInterface_IWinInetHttpInfo); hres = IInternetProtocol_QueryInterface(protocol, &IID_IWinInetHttpInfo, (void**)&http_info); ok(hres == E_NOINTERFACE, "Could not get IWinInetInfo protocol: %08x\n", hres); - CHECK_CALLED(QueryInterface_IWinInetHttpInfo); + if(no_aggregation) + CHECK_NOT_CALLED(QueryInterface_IWinInetHttpInfo); + else + CHECK_CALLED(QueryInterface_IWinInetHttpInfo); SET_EXPECT(Read); read = 0xdeadbeef; @@ -3865,6 +3953,11 @@ static void test_CreateBinding(void) hres = IInternetPriority_SetPriority(priority, 101); ok(hres == S_OK, "SetPriority failed: %08x\n", hres); + if(no_aggregation) + ok(protocol_emul->outer_ref == 0, "protocol_outer_ref = %u\n", protocol_emul->outer_ref); + else + ok(protocol_emul->outer_ref == 1 || broken(protocol_emul->outer_ref == 0) /* before win7 */, "protocol_outer_ref = %u\n", protocol_emul->outer_ref); + SET_EXPECT(Terminate); hres = IInternetProtocol_Terminate(protocol, 0xdeadbeef); ok(hres == S_OK, "Terminate failed: %08x\n", hres); @@ -3880,12 +3973,19 @@ static void test_CreateBinding(void) SET_EXPECT(Read); read = 0xdeadbeef; hres = IInternetProtocol_Read(protocol, expect_pv = buf, sizeof(buf), &read); - todo_wine - ok(hres == E_ABORT, "Read failed: %08x\n", hres); - todo_wine - ok(read == 0, "read = %d\n", read); - todo_wine - CHECK_NOT_CALLED(Read); + if(no_aggregation) + { + ok(hres == S_OK, "Read failed: %08x\n", hres); + ok(read == 100, "read = %d\n", read); + CHECK_CALLED(Read); + } else { + todo_wine + ok(hres == E_ABORT, "Read failed: %08x\n", hres); + todo_wine + ok(read == 0, "read = %d\n", read); + todo_wine + CHECK_NOT_CALLED(Read); + } hres = IInternetProtocolSink_ReportProgress(binding_sink, BINDSTATUS_CACHEFILENAMEAVAILABLE, expect_wsz = emptyW); @@ -3929,6 +4029,7 @@ static void test_CreateBinding(void) ok(hres == MK_E_SYNTAX, "Start failed: %08x, expected MK_E_SYNTAX\n", hres); CHECK_CALLED(QueryService_InternetProtocol); +fail: IInternetProtocol_Release(protocol); IInternetSession_Release(session); @@ -4186,6 +4287,9 @@ START_TEST(protocol) test_gopher_protocol(); test_mk_protocol(); test_CreateBinding(); + no_aggregation = TRUE; + test_CreateBinding(); + no_aggregation = FALSE; bindf &= ~BINDF_FROMURLMON; trace("Testing file binding (mime verification, emulate prot)...\n"); -- 2.20.1

2 2