March 2018 - Wine-Devel - list.winehq.org

ntdll: fix RtlCheckRegistryKey when called with parameter path being null or empty
by Stefan Leichter March 9, 2018

March 9, 2018

Found some corner cases when testing RtlCreateRegistryKey. As RtlCheckRegistryKey is working in the same area i decided to test this function too and fix it first. Signed-off-by: Stefan Leichter <sle85276(a)gmx.de> --- dlls/ntdll/reg.c | 5 +++++ dlls/ntdll/tests/reg.c | 13 +++++++++++++ 2 files changed, 18 insertions(+)

1 0

[PATCH 4/6] wined3d: Pass a texture and sub-resource index to surface_blt_special().
by Henri Verbeet March 9, 2018

March 9, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 65 ++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 21511f0..d14a3df 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1922,19 +1922,17 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_texture *dst_texture, un wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); } -static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RECT *dst_rect, - struct wined3d_surface *src_surface, const RECT *src_rect, DWORD flags, - const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) +static HRESULT wined3d_texture_blt_special(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, + const RECT *dst_rect, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, + const RECT *src_rect, DWORD flags, const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) { - struct wined3d_texture *dst_texture = dst_surface->container; - struct wined3d_device *device = dst_texture->resource.device; - const struct wined3d_surface *rt = wined3d_rendertarget_view_get_surface(device->fb.render_targets[0]); struct wined3d_swapchain *src_swapchain, *dst_swapchain; - struct wined3d_texture *src_texture; + const struct wined3d_rendertarget_view *rtv; - TRACE("dst_surface %p, dst_rect %s, src_surface %p, src_rect %s, flags %#x, fx %p, filter %s.\n", - dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), - flags, fx, debug_d3dtexturefiltertype(filter)); + TRACE("dst_texture %p, dst_sub_resource_idx %u, dst_rect %s, src_texture %p, " + "src_sub_resource_idx %u, src_rect %s, flags %#x, fx %p, filter %s.\n", + dst_texture, dst_sub_resource_idx, wine_dbgstr_rect(dst_rect), src_texture, src_sub_resource_idx, + wine_dbgstr_rect(src_rect), flags, fx, debug_d3dtexturefiltertype(filter)); /* Get the swapchain. One of the surfaces has to be a primary surface. */ if (!(dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) @@ -1943,27 +1941,19 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE return WINED3DERR_INVALIDCALL; } - dst_swapchain = dst_texture->swapchain; - - if (src_surface) + if (!(src_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) { - src_texture = src_surface->container; - if (!(src_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) - { - WARN("Source resource is not GPU accessible, rejecting GL blit.\n"); - return WINED3DERR_INVALIDCALL; - } - - src_swapchain = src_texture->swapchain; - } - else - { - src_texture = NULL; - src_swapchain = NULL; + WARN("Source resource is not GPU accessible, rejecting GL blit.\n"); + return WINED3DERR_INVALIDCALL; } + src_swapchain = src_texture->swapchain; + dst_swapchain = dst_texture->swapchain; + /* Early sort out of cases where no render target is used */ - if (!dst_swapchain && !src_swapchain && src_surface != rt && dst_surface != rt) + if (!(rtv = dst_texture->resource.device->fb.render_targets[0]) || (!src_swapchain && !dst_swapchain + && (&src_texture->resource != rtv->resource || src_sub_resource_idx != rtv->sub_resource_idx) + && (&dst_texture->resource != rtv->resource || dst_sub_resource_idx != rtv->sub_resource_idx))) { TRACE("No surface is render target, not using hardware blit.\n"); return WINED3DERR_INVALIDCALL; @@ -1992,16 +1982,18 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE if (dst_swapchain) { /* Handled with regular texture -> swapchain blit */ - if (src_surface == rt) + if (&src_texture->resource == rtv->resource && src_sub_resource_idx == rtv->sub_resource_idx) TRACE("Blit from active render target to a swapchain\n"); } - else if (src_swapchain && dst_surface == rt) + else if (src_swapchain && &dst_texture->resource == rtv->resource + && dst_sub_resource_idx == rtv->sub_resource_idx) { FIXME("Implement blit from a swapchain to the active render target\n"); return WINED3DERR_INVALIDCALL; } - if ((src_swapchain || src_surface == rt) && !dst_swapchain) + if (!dst_swapchain && (src_swapchain || (&src_texture->resource == rtv->resource + && src_sub_resource_idx == rtv->sub_resource_idx))) { unsigned int src_level, src_width, src_height; /* Blit from render target to texture */ @@ -2037,21 +2029,21 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE * back buffer. This is slower than reading line per line, thus not used for flipping * -> If the app wants a scaled image with a dest rect that is bigger than the fb, it has to be copied * pixel by pixel. */ - src_level = surface_get_sub_resource_idx(src_surface) % src_texture->level_count; + src_level = src_sub_resource_idx % src_texture->level_count; src_width = wined3d_texture_get_level_width(src_texture, src_level); src_height = wined3d_texture_get_level_height(src_texture, src_level); if (!stretchx || dst_rect->right - dst_rect->left > src_width || dst_rect->bottom - dst_rect->top > src_height) { TRACE("No stretching in x direction, using direct framebuffer -> texture copy.\n"); - fb_copy_to_texture_direct(dst_texture, surface_get_sub_resource_idx(dst_surface), dst_rect, - src_texture, surface_get_sub_resource_idx(src_surface), src_rect, filter); + fb_copy_to_texture_direct(dst_texture, dst_sub_resource_idx, dst_rect, + src_texture, src_sub_resource_idx, src_rect, filter); } else { TRACE("Using hardware stretching to flip / stretch the texture.\n"); - fb_copy_to_texture_hwstretch(dst_texture, surface_get_sub_resource_idx(dst_surface), dst_rect, - src_texture, surface_get_sub_resource_idx(src_surface), src_rect, filter); + fb_copy_to_texture_hwstretch(dst_texture, dst_sub_resource_idx, dst_rect, + src_texture, src_sub_resource_idx, src_rect, filter); } return WINED3D_OK; @@ -3928,7 +3920,8 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const struct wi fallback: /* Special cases for render targets. */ - if (SUCCEEDED(surface_blt_special(dst_surface, &dst_rect, src_surface, &src_rect, flags, fx, filter))) + if (SUCCEEDED(wined3d_texture_blt_special(dst_texture, dst_sub_resource_idx, &dst_rect, + src_texture, src_sub_resource_idx, &src_rect, flags, fx, filter))) return WINED3D_OK; cpu: -- 2.1.4

1 0

[PATCH 3/6] wined3d: Pass a texture and sub-resource index to fb_copy_to_texture_hwstretch().
by Henri Verbeet March 9, 2018

March 9, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b5129d5..21511f0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1639,14 +1639,11 @@ static void fb_copy_to_texture_direct(struct wined3d_texture *dst_texture, unsig } /* Uses the hardware to stretch and flip the image */ -static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, struct wined3d_surface *src_surface, - const RECT *src_rect, const RECT *dst_rect_in, enum wined3d_texture_filter_type filter) +static void fb_copy_to_texture_hwstretch(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, + const RECT *dst_rect_in, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, + const RECT *src_rect, enum wined3d_texture_filter_type filter) { unsigned int src_width, src_height, src_pow2_width, src_pow2_height, src_level; - unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); - unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); - struct wined3d_texture *src_texture = src_surface->container; - struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_device *device = dst_texture->resource.device; GLenum src_target, dst_target, texture_target; GLuint src, backup = 0; @@ -1718,7 +1715,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st checkGLcall("glEnable(texture_target)"); /* For now invalidate the texture copy of the back buffer. Drawable and sysmem copy are untouched */ - surface_get_sub_resource(src_surface)->locations &= ~WINED3D_LOCATION_TEXTURE_RGB; + src_texture->sub_resources[src_sub_resource_idx].locations &= ~WINED3D_LOCATION_TEXTURE_RGB; } /* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag @@ -2053,7 +2050,8 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE else { TRACE("Using hardware stretching to flip / stretch the texture.\n"); - fb_copy_to_texture_hwstretch(dst_surface, src_surface, src_rect, dst_rect, filter); + fb_copy_to_texture_hwstretch(dst_texture, surface_get_sub_resource_idx(dst_surface), dst_rect, + src_texture, surface_get_sub_resource_idx(src_surface), src_rect, filter); } return WINED3D_OK; -- 2.1.4

1 0

[PATCH 2/6] wined3d: Pass a texture and sub-resource index to fb_copy_to_texture_direct().
by Henri Verbeet March 9, 2018

March 9, 2018

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c2b1cd5..b5129d5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1522,13 +1522,10 @@ void texture2d_load_fb_texture(struct wined3d_texture *texture, /* Does a direct frame buffer -> texture copy. Stretching is done with single * pixel copy calls. */ -static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struct wined3d_surface *src_surface, - const RECT *src_rect, const RECT *dst_rect_in, enum wined3d_texture_filter_type filter) +static void fb_copy_to_texture_direct(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, + const RECT *dst_rect_in, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, + const RECT *src_rect, enum wined3d_texture_filter_type filter) { - unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); - unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); - struct wined3d_texture *src_texture = src_surface->container; - struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_device *device = dst_texture->resource.device; unsigned int src_height, src_level, dst_level; const struct wined3d_gl_info *gl_info; @@ -2050,7 +2047,8 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE || dst_rect->bottom - dst_rect->top > src_height) { TRACE("No stretching in x direction, using direct framebuffer -> texture copy.\n"); - fb_copy_to_texture_direct(dst_surface, src_surface, src_rect, dst_rect, filter); + fb_copy_to_texture_direct(dst_texture, surface_get_sub_resource_idx(dst_surface), dst_rect, + src_texture, surface_get_sub_resource_idx(src_surface), src_rect, filter); } else { -- 2.1.4

1 0

[PATCH v3 1/3] devenum: Always scan for devices in CreateClassEnumerator().
by Zebediah Figura March 8, 2018

March 8, 2018

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/createdevenum.c | 22 ---------------------- dlls/devenum/tests/devenum.c | 2 -- 2 files changed, 24 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 7cfdbff..7c03852 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -547,12 +547,6 @@ static void register_vfw_codecs(void) RegCloseKey(basekey); } -static HANDLE DEVENUM_populate_handle; -static const WCHAR DEVENUM_populate_handle_nameW[] = - {'_','_','W','I','N','E','_', - 'D','e','v','e','n','u','m','_', - 'P','o','p','u','l','a','t','e',0}; - static HRESULT register_codecs(void) { HRESULT res; @@ -566,21 +560,6 @@ static HRESULT register_codecs(void) REGFILTERPINS2 rfp2; HKEY basekey; - if (DEVENUM_populate_handle) - return S_OK; - DEVENUM_populate_handle = CreateEventW(NULL, TRUE, FALSE, DEVENUM_populate_handle_nameW); - if (GetLastError() == ERROR_ALREADY_EXISTS) - { - /* Webcams can take some time to scan if the driver is badly written and it enables them, - * so have a 10 s timeout here - */ - if (WaitForSingleObject(DEVENUM_populate_handle, 10000) == WAIT_TIMEOUT) - WARN("Waiting for object timed out\n"); - TRACE("No need to rescan\n"); - return S_OK; - } - TRACE("Scanning for devices\n"); - /* Since devices can change between session, for example because you just plugged in a webcam * or switched from pulseaudio to alsa, delete all old devices first */ @@ -878,6 +857,5 @@ static HRESULT register_codecs(void) register_vfw_codecs(); - SetEvent(DEVENUM_populate_handle); return res; } diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 7e3270f..a08dece 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -445,11 +445,9 @@ static void test_codec(void) /* unlike DirectShow filters, these are automatically generated, so * enumerating them will destroy the key */ -todo_wine ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "codec should not be registered\n"); hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#x\n", hr); IPropertyBag_Release(prop_bag); -- 2.7.4

1 2

[PATCH] ping: Distinguish between timeouts and other failures
by Alex Henrie March 8, 2018

March 8, 2018

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- programs/ping/ping_main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/ping/ping_main.c b/programs/ping/ping_main.c index 74a1c71c65..9c4f23959e 100644 --- a/programs/ping/ping_main.c +++ b/programs/ping/ping_main.c @@ -157,6 +157,7 @@ int main(int argc, char** argv) printf("Pinging %s [%s] with %d bytes of data:\n", hostname, ip, l); for (;;) { + SetLastError(0); retval = IcmpSendEcho(icmp_file, ipaddr, send_data, l, NULL, reply_buffer, reply_size, w); if (retval != 0) @@ -177,7 +178,10 @@ int main(int argc, char** argv) } else { - printf("Request timed out.\n"); + if (GetLastError() == IP_REQ_TIMED_OUT) + puts("Request timed out."); + else + puts("PING: transmit failed. General failure."); lost++; } i++; -- 2.16.2

2 3

[PATCH 1/2 v4] kernel32: Support MOVEFILE_WRITE_THROUGH / CopyFileExW progress
by Tom Watson March 8, 2018

March 8, 2018

Signed-off-by: Tom Watson <coder(a)tommywatson.com> --- v4 Added "optional" DWORD return value for WriteFile() to stop segfaults General tidy up and temporarily removed failing tests that require updated kernel32.dll

2 1

[PATCH] user32: Add stubs for GetWindowDisplayAffinity and SetWindowDisplayAffinity.
by Alistair Leslie-Hughes March 8, 2018

March 8, 2018

From: Michael Müller <michael(a)fds-team.de> There is one failure reported on the testbot. w864 (32 bit win) win.c:2259: Test failed: expected !100 This is not caused by this patch. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- .../ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec | 4 +- .../ext-ms-win-ntuser-window-l1-1-1.spec | 4 +- dlls/user32/tests/win.c | 87 ++++++++++++++++++++++ dlls/user32/user32.spec | 2 + dlls/user32/win.c | 34 +++++++++ include/winuser.h | 5 ++ 6 files changed, 132 insertions(+), 4 deletions(-) diff --git a/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec b/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec index 4b563ff..ea155c0 100644 --- a/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec +++ b/dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0/ext-ms-win-ntuser-uicontext-ext-l1-1-0.spec @@ -24,7 +24,7 @@ @ stdcall GetPropW(long wstr) user32.GetPropW @ stdcall GetShellWindow() user32.GetShellWindow @ stdcall GetWindow(long long) user32.GetWindow -@ stub GetWindowDisplayAffinity +@ stdcall GetWindowDisplayAffinity(long ptr) user32.GetWindowDisplayAffinity @ stdcall GetWindowInfo(long ptr) user32.GetWindowInfo @ stdcall GetWindowPlacement(long ptr) user32.GetWindowPlacement @ stdcall GetWindowRect(long ptr) user32.GetWindowRect @@ -43,7 +43,7 @@ @ stdcall SetLayeredWindowAttributes(ptr long long long) user32.SetLayeredWindowAttributes @ stdcall SetParent(long long) user32.SetParent @ stdcall SetPropW(long wstr long) user32.SetPropW -@ stub SetWindowDisplayAffinity +@ stdcall SetWindowDisplayAffinity(long long) user32.SetWindowDisplayAffinity @ stdcall SetWindowPos(long long long long long long long) user32.SetWindowPos @ stdcall SetWindowTextW(long wstr) user32.SetWindowTextW @ stdcall SetWindowsHookExW(long long long long) user32.SetWindowsHookExW diff --git a/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec b/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec index 4b563ff..ea155c0 100644 --- a/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec +++ b/dlls/ext-ms-win-ntuser-window-l1-1-1/ext-ms-win-ntuser-window-l1-1-1.spec @@ -24,7 +24,7 @@ @ stdcall GetPropW(long wstr) user32.GetPropW @ stdcall GetShellWindow() user32.GetShellWindow @ stdcall GetWindow(long long) user32.GetWindow -@ stub GetWindowDisplayAffinity +@ stdcall GetWindowDisplayAffinity(long ptr) user32.GetWindowDisplayAffinity @ stdcall GetWindowInfo(long ptr) user32.GetWindowInfo @ stdcall GetWindowPlacement(long ptr) user32.GetWindowPlacement @ stdcall GetWindowRect(long ptr) user32.GetWindowRect @@ -43,7 +43,7 @@ @ stdcall SetLayeredWindowAttributes(ptr long long long) user32.SetLayeredWindowAttributes @ stdcall SetParent(long long) user32.SetParent @ stdcall SetPropW(long wstr long) user32.SetPropW -@ stub SetWindowDisplayAffinity +@ stdcall SetWindowDisplayAffinity(long long) user32.SetWindowDisplayAffinity @ stdcall SetWindowPos(long long long long long long long) user32.SetWindowPos @ stdcall SetWindowTextW(long wstr) user32.SetWindowTextW @ stdcall SetWindowsHookExW(long long long long) user32.SetWindowsHookExW diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index ab39ee8..e8d0b0f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -67,6 +67,8 @@ static BOOL (WINAPI *pFlashWindowEx)( PFLASHWINFO pfwi ); static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); static DWORD (WINAPI *pGetLayout)(HDC hdc); static BOOL (WINAPI *pMirrorRgn)(HWND hwnd, HRGN hrgn); +static BOOL (WINAPI *pGetWindowDisplayAffinity)(HWND hwnd, DWORD *affinity); +static BOOL (WINAPI *pSetWindowDisplayAffinity)(HWND hwnd, DWORD affinity); static BOOL test_lbuttondown_flag; static DWORD num_gettext_msgs; @@ -10415,6 +10417,88 @@ if (!is_wine) /* FIXME: remove once Wine is fixed */ DestroyWindow(owner); } +static void test_display_affinity( HWND win ) +{ + DWORD affinity; + BOOL ret, dwm; + LONG styleex; + + if (!pGetWindowDisplayAffinity || !pSetWindowDisplayAffinity) + { + win_skip("GetWindowDisplayAffinity or SetWindowDisplayAffinity missing\n"); + return; + } + + ret = pGetWindowDisplayAffinity(NULL, NULL); + ok(!ret, "GetWindowDisplayAffinity succeeded\n"); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "Expected ERROR_INVALID_WINDOW_HANDLE, got %u\n", GetLastError()); + + ret = pGetWindowDisplayAffinity(NULL, &affinity); + ok(!ret, "GetWindowDisplayAffinity succeeded\n"); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "Expected ERROR_INVALID_WINDOW_HANDLE, got %u\n", GetLastError()); + + ret = pGetWindowDisplayAffinity(win, NULL); + ok(!ret, "GetWindowDisplayAffinity succeeded\n"); + ok(GetLastError() == ERROR_NOACCESS, "Expected ERROR_NOACCESS, got %u\n", GetLastError()); + + styleex = GetWindowLongW(win, GWL_EXSTYLE); + SetWindowLongW(win, GWL_EXSTYLE, styleex & ~WS_EX_LAYERED); + + affinity = 0xdeadbeef; + ret = pGetWindowDisplayAffinity(win, &affinity); + ok(ret, "GetWindowDisplayAffinity failed with %u\n", GetLastError()); + ok(affinity == WDA_NONE, "Expected WDA_NONE, got 0x%x\n", affinity); + + /* Windows 7 fails with ERROR_NOT_ENOUGH_MEMORY when dwm compositing is disabled */ + ret = pSetWindowDisplayAffinity(win, WDA_MONITOR); + ok(ret || GetLastError() == ERROR_NOT_ENOUGH_MEMORY, + "SetWindowDisplayAffinity failed with %u\n", GetLastError()); + dwm = ret; + + affinity = 0xdeadbeef; + ret = pGetWindowDisplayAffinity(win, &affinity); + ok(ret, "GetWindowDisplayAffinity failed with %u\n", GetLastError()); + if (dwm) ok(affinity == WDA_MONITOR, "Expected WDA_MONITOR, got 0x%x\n", affinity); + else ok(affinity == WDA_NONE, "Expected WDA_NONE, got 0x%x\n", affinity); + + ret = pSetWindowDisplayAffinity(win, WDA_NONE); + ok(ret || GetLastError() == ERROR_NOT_ENOUGH_MEMORY, + "SetWindowDisplayAffinity failed with %u\n", GetLastError()); + + affinity = 0xdeadbeef; + ret = pGetWindowDisplayAffinity(win, &affinity); + ok(ret, "GetWindowDisplayAffinity failed with %u\n", GetLastError()); + ok(affinity == WDA_NONE, "Expected WDA_NONE, got 0x%x\n", affinity); + + SetWindowLongW(win, GWL_EXSTYLE, styleex | WS_EX_LAYERED); + + affinity = 0xdeadbeef; + ret = pGetWindowDisplayAffinity(win, &affinity); + ok(ret, "GetWindowDisplayAffinity failed with %u\n", GetLastError()); + ok(affinity == WDA_NONE, "Expected WDA_NONE, got 0x%x\n", affinity); + + ret = pSetWindowDisplayAffinity(win, WDA_MONITOR); + ok(ret || GetLastError() == ERROR_NOT_ENOUGH_MEMORY, + "SetWindowDisplayAffinity failed with %u\n", GetLastError()); + + affinity = 0xdeadbeef; + ret = pGetWindowDisplayAffinity(win, &affinity); + ok(ret, "GetWindowDisplayAffinity failed with %u\n", GetLastError()); + if (dwm) ok(affinity == WDA_MONITOR, "Expected WDA_MONITOR, got 0x%x\n", affinity); + else ok(affinity == WDA_NONE, "Expected WDA_NONE, got 0x%x\n", affinity); + + ret = pSetWindowDisplayAffinity(win, WDA_NONE); + ok(ret || GetLastError() == ERROR_NOT_ENOUGH_MEMORY, + "SetWindowDisplayAffinity failed with %u\n", GetLastError()); + + affinity = 0xdeadbeef; + ret = pGetWindowDisplayAffinity(win, &affinity); + ok(ret, "GetWindowDisplayAffinity failed with %u\n", GetLastError()); + ok(affinity == WDA_NONE, "Expected WDA_NONE, got 0x%x\n", affinity); + + SetWindowLongW(win, GWL_EXSTYLE, styleex); +} + START_TEST(win) { char **argv; @@ -10439,6 +10523,8 @@ START_TEST(win) pGetLayout = (void *)GetProcAddress( gdi32, "GetLayout" ); pSetLayout = (void *)GetProcAddress( gdi32, "SetLayout" ); pMirrorRgn = (void *)GetProcAddress( gdi32, "MirrorRgn" ); + pGetWindowDisplayAffinity = (void *)GetProcAddress( user32, "GetWindowDisplayAffinity" ); + pSetWindowDisplayAffinity = (void *)GetProcAddress( user32, "SetWindowDisplayAffinity" ); if (argc==4 && !strcmp(argv[2], "create_children")) { @@ -10563,6 +10649,7 @@ START_TEST(win) test_deferwindowpos(); test_LockWindowUpdate(hwndMain); test_desktop(); + test_display_affinity(hwndMain); test_hide_window(); test_minimize_window(hwndMain); diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index e45cafa..f601d7d 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -388,6 +388,7 @@ @ stdcall GetWindow(long long) @ stdcall GetWindowContextHelpId(long) @ stdcall GetWindowDC(long) +@ stdcall GetWindowDisplayAffinity(long ptr) @ stdcall GetWindowInfo(long ptr) @ stdcall GetWindowLongA(long long) @ stdcall -arch=win64 GetWindowLongPtrA(long long) @@ -691,6 +692,7 @@ @ stdcall SetUserObjectSecurity(long ptr ptr) @ stdcall SetWinEventHook(long long long ptr long long long) @ stdcall SetWindowContextHelpId(long long) +@ stdcall SetWindowDisplayAffinity(long long) @ stub SetWindowFullScreenState @ stdcall SetWindowLongA(long long long) @ stdcall -arch=win64 SetWindowLongPtrA(long long long) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index b13032b..794f333 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -4029,3 +4029,37 @@ BOOL WINAPI GetGestureInfo(HGESTUREINFO handle, PGESTUREINFO ptr) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +/***************************************************************************** + * GetWindowDisplayAffinity (USER32.@) + */ +BOOL WINAPI GetWindowDisplayAffinity(HWND hwnd, DWORD *affinity) +{ + FIXME("(%p, %p): stub\n", hwnd, affinity); + + if (!hwnd || !affinity) + { + SetLastError(hwnd ? ERROR_NOACCESS : ERROR_INVALID_WINDOW_HANDLE); + return FALSE; + } + + *affinity = WDA_NONE; + return TRUE; +} + +/***************************************************************************** + * SetWindowDisplayAffinity (USER32.@) + */ +BOOL WINAPI SetWindowDisplayAffinity(HWND hwnd, DWORD affinity) +{ + FIXME("(%p, %u): stub\n", hwnd, affinity); + + if (!hwnd) + { + SetLastError(ERROR_INVALID_WINDOW_HANDLE); + return FALSE; + } + + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; +} diff --git a/include/winuser.h b/include/winuser.h index 05bf590..08a0298 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -2533,6 +2533,9 @@ typedef struct tagMINIMIZEDMETRICS { int iArrange; } MINIMIZEDMETRICS, *PMINIMIZEDMETRICS, *LPMINIMIZEDMETRICS; +/* Window affinity */ +#define WDA_NONE 0x0 +#define WDA_MONITOR 0x1 /* Window scrolling */ #define SW_SCROLLCHILDREN 0x0001 @@ -3771,6 +3774,7 @@ WINUSERAPI BOOL WINAPI GetUserObjectSecurity(HANDLE,PSECURITY_INFORMATION WINUSERAPI HWND WINAPI GetWindow(HWND,UINT); WINUSERAPI DWORD WINAPI GetWindowContextHelpId(HWND); WINUSERAPI HDC WINAPI GetWindowDC(HWND); +WINUSERAPI BOOL WINAPI GetWindowDisplayAffinity(HWND,DWORD*); WINUSERAPI BOOL WINAPI GetWindowInfo(HWND, PWINDOWINFO); WINUSERAPI LONG WINAPI GetWindowLongA(HWND,INT); WINUSERAPI LONG WINAPI GetWindowLongW(HWND,INT); @@ -4073,6 +4077,7 @@ WINUSERAPI BOOL WINAPI SetUserObjectInformationW(HANDLE,INT,LPVOID,DWORD) #define SetUserObjectInformation WINELIB_NAME_AW(SetUserObjectInformation) WINUSERAPI BOOL WINAPI SetUserObjectSecurity(HANDLE,PSECURITY_INFORMATION,PSECURITY_DESCRIPTOR); WINUSERAPI BOOL WINAPI SetWindowContextHelpId(HWND,DWORD); +WINUSERAPI BOOL WINAPI SetWindowDisplayAffinity(HWND,DWORD); WINUSERAPI LONG WINAPI SetWindowLongA(HWND,INT,LONG); WINUSERAPI LONG WINAPI SetWindowLongW(HWND,INT,LONG); #define SetWindowLong WINELIB_NAME_AW(SetWindowLong) -- 1.9.1

1 0

[PATCH 4/4] dmime/tests: Add ParseDescriptor NULL pointer tests
by Michael Stefaniuc March 8, 2018

March 8, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/tests/dmime.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index cf23740905..e4a834a49c 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -781,6 +781,19 @@ static void test_parsedescriptor(void) wine_dbgstr_guid(&desc.guidClass), forms[i].class); IStream_Release(stream); + /* NULL pointers */ + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + hr = IDirectMusicObject_ParseDescriptor(dmo, NULL, &desc); + ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, NULL); + if (forms[i].needs_size) + ok(hr == E_INVALIDARG, "ParseDescriptor failed: %08x, expected E_INVALIDARG\n", hr); + else + ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + hr = IDirectMusicObject_ParseDescriptor(dmo, NULL, NULL); + ok(hr == E_POINTER, "ParseDescriptor failed: %08x, expected E_POINTER\n", hr); + /* Wrong form */ empty[1] = DMUS_FOURCC_CONTAINER_FORM; stream = gen_riff_stream(empty); -- 2.14.3

1 0

[PATCH 3/4] dmime: Reimplement ParseDescriptor for DMGraph
by Michael Stefaniuc March 8, 2018

March 8, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/graph.c | 172 ++++++++--------------------------------------- dlls/dmime/tests/dmime.c | 17 ++--- 2 files changed, 34 insertions(+), 155 deletions(-) diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index 58daf2092f..ce6b9b1ed3 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -193,153 +193,37 @@ static const IDirectMusicGraphVtbl DirectMusicGraphVtbl = DirectMusicGraph_RemoveTool }; -static HRESULT WINAPI DirectMusicObject_ParseDescriptor(IDirectMusicObject *iface, IStream *pStream, DMUS_OBJECTDESC *pDesc) +static HRESULT WINAPI IDirectMusicObjectImpl_ParseDescriptor(IDirectMusicObject *iface, + IStream *stream, DMUS_OBJECTDESC *desc) { - IDirectMusicGraphImpl *This = impl_from_IDirectMusicObject(iface); - DMUS_PRIVATE_CHUNK Chunk; - DWORD StreamSize, StreamCount, ListSize[1], ListCount[1]; - LARGE_INTEGER liMove; /* used when skipping chunks */ + struct chunk_entry riff = {0}; + HRESULT hr; - TRACE("(%p, %p, %p)\n", This, pStream, pDesc); + TRACE("(%p,%p, %p)\n", iface, stream, desc); - /* FIXME: should this be determined from stream? */ - pDesc->dwValidData |= DMUS_OBJ_CLASS; - pDesc->guidClass = CLSID_DirectMusicGraph; + if (!stream) + return E_POINTER; + if (!desc || desc->dwSize != sizeof(*desc)) + return E_INVALIDARG; + + if ((hr = chunk_read(stream, &riff)) != S_OK) + return hr; + if (riff.id != FOURCC_RIFF || riff.type != DMUS_FOURCC_TOOLGRAPH_FORM) { + TRACE("loading failed: unexpected %s\n", debugstr_chunk(&riff)); + chunk_skip(stream, &riff); + return DMUS_E_CHUNKNOTFOUND; + } - IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case FOURCC_RIFF: { - IStream_Read (pStream, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": RIFF chunk of type %s", debugstr_fourcc(Chunk.fccID)); - StreamSize = Chunk.dwSize - sizeof(FOURCC); - StreamCount = 0; - if (Chunk.fccID == DMUS_FOURCC_TOOLGRAPH_FORM) { - TRACE_(dmfile)(": graph form\n"); - do { - IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - case DMUS_FOURCC_GUID_CHUNK: { - TRACE_(dmfile)(": GUID chunk\n"); - pDesc->dwValidData |= DMUS_OBJ_OBJECT; - IStream_Read (pStream, &pDesc->guidObject, Chunk.dwSize, NULL); - break; - } - case DMUS_FOURCC_VERSION_CHUNK: { - TRACE_(dmfile)(": version chunk\n"); - pDesc->dwValidData |= DMUS_OBJ_VERSION; - IStream_Read (pStream, &pDesc->vVersion, Chunk.dwSize, NULL); - break; - } - case DMUS_FOURCC_CATEGORY_CHUNK: { - TRACE_(dmfile)(": category chunk\n"); - pDesc->dwValidData |= DMUS_OBJ_CATEGORY; - IStream_Read (pStream, pDesc->wszCategory, Chunk.dwSize, NULL); - break; - } - case FOURCC_LIST: { - IStream_Read (pStream, &Chunk.fccID, sizeof(FOURCC), NULL); - TRACE_(dmfile)(": LIST chunk of type %s", debugstr_fourcc(Chunk.fccID)); - ListSize[0] = Chunk.dwSize - sizeof(FOURCC); - ListCount[0] = 0; - switch (Chunk.fccID) { - /* evil M$ UNFO list, which can (!?) contain INFO elements */ - case DMUS_FOURCC_UNFO_LIST: { - TRACE_(dmfile)(": UNFO list\n"); - do { - IStream_Read (pStream, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); - ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; - TRACE_(dmfile)(": %s chunk (size = 0x%04x)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - switch (Chunk.fccID) { - /* don't ask me why, but M$ puts INFO elements in UNFO list sometimes - (though strings seem to be valid unicode) */ - case mmioFOURCC('I','N','A','M'): - case DMUS_FOURCC_UNAM_CHUNK: { - TRACE_(dmfile)(": name chunk\n"); - pDesc->dwValidData |= DMUS_OBJ_NAME; - IStream_Read (pStream, pDesc->wszName, Chunk.dwSize, NULL); - break; - } - case mmioFOURCC('I','A','R','T'): - case DMUS_FOURCC_UART_CHUNK: { - TRACE_(dmfile)(": artist chunk (ignored)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - case mmioFOURCC('I','C','O','P'): - case DMUS_FOURCC_UCOP_CHUNK: { - TRACE_(dmfile)(": copyright chunk (ignored)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - case mmioFOURCC('I','S','B','J'): - case DMUS_FOURCC_USBJ_CHUNK: { - TRACE_(dmfile)(": subject chunk (ignored)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - case mmioFOURCC('I','C','M','T'): - case DMUS_FOURCC_UCMT_CHUNK: { - TRACE_(dmfile)(": comment chunk (ignored)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - TRACE_(dmfile)(": ListCount[0] = %d < ListSize[0] = %d\n", ListCount[0], ListSize[0]); - } while (ListCount[0] < ListSize[0]); - break; - } - default: { - TRACE_(dmfile)(": unknown (skipping)\n"); - liMove.QuadPart = Chunk.dwSize - sizeof(FOURCC); - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - break; - } - default: { - TRACE_(dmfile)(": unknown chunk (irrelevant & skipping)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); - break; - } - } - TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); - } while (StreamCount < StreamSize); - } else { - TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); - liMove.QuadPart = StreamSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ - return E_FAIL; - } - - TRACE_(dmfile)(": reading finished\n"); - break; - } - default: { - TRACE_(dmfile)(": unexpected chunk; loading failed)\n"); - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStream, liMove, STREAM_SEEK_CUR, NULL); /* skip the rest of the chunk */ - return DMUS_E_INVALIDFILE; - } - } - - TRACE(": returning descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC (pDesc)); - - return S_OK; + hr = dmobj_parsedescriptor(stream, &riff, desc, + DMUS_OBJ_OBJECT|DMUS_OBJ_NAME|DMUS_OBJ_CATEGORY|DMUS_OBJ_VERSION); + if (FAILED(hr)) + return hr; + + desc->guidClass = CLSID_DirectMusicGraph; + desc->dwValidData |= DMUS_OBJ_CLASS; + + TRACE("returning descriptor:\n%s\n", debugstr_DMUS_OBJECTDESC (desc)); + return S_OK; } static const IDirectMusicObjectVtbl dmobject_vtbl = { @@ -348,7 +232,7 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = { dmobj_IDirectMusicObject_Release, dmobj_IDirectMusicObject_GetDescriptor, dmobj_IDirectMusicObject_SetDescriptor, - DirectMusicObject_ParseDescriptor + IDirectMusicObjectImpl_ParseDescriptor }; static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream* pStm) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index f1a7c2df56..cf23740905 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -770,13 +770,11 @@ static void test_parsedescriptor(void) memset(&desc, 0, sizeof(desc)); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); if (forms[i].needs_size) { - todo_wine_if(forms[i].form == DMUS_FOURCC_TOOLGRAPH_FORM) - ok(hr == E_INVALIDARG, "ParseDescriptor failed: %08x, expected E_INVALIDARG\n", hr); + ok(hr == E_INVALIDARG, "ParseDescriptor failed: %08x, expected E_INVALIDARG\n", hr); desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); } - todo_wine_if(forms[i].form == DMUS_FOURCC_TOOLGRAPH_FORM) - ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", desc.dwValidData); ok(IsEqualGUID(&desc.guidClass, forms[i].clsid), "Got class guid %s, expected CLSID_%s\n", @@ -790,13 +788,11 @@ static void test_parsedescriptor(void) desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); if (forms[i].needs_size) - todo_wine_if(forms[i].form == DMUS_FOURCC_TOOLGRAPH_FORM) - ok(hr == DMUS_E_CHUNKNOTFOUND, + ok(hr == DMUS_E_CHUNKNOTFOUND, "ParseDescriptor failed: %08x, expected DMUS_E_CHUNKNOTFOUND\n", hr); else ok(hr == E_FAIL, "ParseDescriptor failed: %08x, expected E_FAIL\n", hr); - todo_wine_if(forms[i].form == DMUS_FOURCC_TOOLGRAPH_FORM) - ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); + ok(!desc.dwValidData, "Got valid data %#x, expected 0\n", desc.dwValidData); /* All desc chunks */ alldesc[1] = forms[i].form; @@ -836,9 +832,8 @@ static void test_parsedescriptor(void) desc.dwSize = sizeof(desc); hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); - todo_wine_if(forms[i].form == DMUS_FOURCC_TOOLGRAPH_FORM) - ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", - desc.dwValidData); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); IStream_Release(stream); /* INFO list with INAM */ -- 2.14.3

1 0