September 2014 - Wine-commits

Henri Verbeet : d3d8: Get rid of the format switching code in d3d8_device_CopyRects().
by Alexandre Julliard 29 Sep '14

29 Sep '14

Module: wine Branch: master Commit: d5365aae28255c8cc55f12d39cc7fec8428a8889 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5365aae28255c8cc55f12d39… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 29 09:11:51 2014 +0200 d3d8: Get rid of the format switching code in d3d8_device_CopyRects(). This can't possibly do anything, since we fail texture creation for WINED3DFMT_UNKNOWN. If texture creation with D3DFMT_UNKNOWN is actually supposed to work, we should probably pick an appropriate format at creation, instead of during CopyRects(). This code has existed in some form or another since the initial version in commit 850a9429dbc07c0b38e9f9f60aaec43759326d24. No tests, of course. --- dlls/d3d8/device.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 8ddb0cb..dd0b9ee 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -988,7 +988,6 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, struct wined3d_resource_desc wined3d_desc; struct wined3d_resource *wined3d_resource; UINT src_w, src_h; - HRESULT hr; TRACE("iface %p, src_surface %p, src_rects %p, rect_count %u, dst_surface %p, dst_points %p.\n", iface, src_surface, src_rects, rect_count, dst_surface, dst_points); @@ -1020,24 +1019,13 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, dst_format = wined3d_desc.format; /* Check that the source and destination formats match */ - if (src_format != dst_format && WINED3DFMT_UNKNOWN != dst_format) + if (src_format != dst_format) { WARN("Source %p format must match the destination %p format, returning D3DERR_INVALIDCALL.\n", src_surface, dst_surface); wined3d_mutex_unlock(); return D3DERR_INVALIDCALL; } - else if (WINED3DFMT_UNKNOWN == dst_format) - { - TRACE("Converting destination surface from WINED3DFMT_UNKNOWN to the source format.\n"); - if (FAILED(hr = wined3d_surface_update_desc(dst->wined3d_surface, wined3d_desc.width, wined3d_desc.height, - src_format, wined3d_desc.multisample_type, wined3d_desc.multisample_quality, NULL, 0))) - { - WARN("Failed to update surface desc, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; - } - } /* Quick if complete copy ... */ if (!rect_count && !src_rects && !dst_points)

1 0

Henri Verbeet : ddraw: Move the pitch / linear size validation from ddraw_surface_init() to ddraw_surface_create( ).
by Alexandre Julliard 29 Sep '14

29 Sep '14

Module: wine Branch: master Commit: e28800c6a41b766a61c94001c593753bcf59e519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e28800c6a41b766a61c94001c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 29 09:11:52 2014 +0200 ddraw: Move the pitch / linear size validation from ddraw_surface_init() to ddraw_surface_create(). --- dlls/ddraw/surface.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0214a7f..0006126 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5943,6 +5943,15 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ HeapFree(GetProcessHeap(), 0, texture); return DDERR_INVALIDPARAMS; } + + if ((desc->dwFlags & DDSD_LINEARSIZE) + && desc->u1.dwLinearSize < wined3d_calculate_format_pitch(ddraw->wined3d, WINED3DADAPTER_DEFAULT, + wined3d_desc.format, wined3d_desc.width) * ((desc->dwHeight + 3) / 4)) + { + WARN("Invalid linear size %u specified.\n", desc->u1.dwLinearSize); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDPARAMS; + } } else { @@ -5952,6 +5961,14 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ HeapFree(GetProcessHeap(), 0, texture); return DDERR_INVALIDPARAMS; } + + if (desc->u1.lPitch < wined3d_calculate_format_pitch(ddraw->wined3d, WINED3DADAPTER_DEFAULT, + wined3d_desc.format, wined3d_desc.width) || desc->u1.lPitch & 3) + { + WARN("Invalid pitch %u specified.\n", desc->u1.lPitch); + HeapFree(GetProcessHeap(), 0, texture); + return DDERR_INVALIDPARAMS; + } } } @@ -6177,13 +6194,6 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s { if (desc->dwFlags & DDSD_LPSURFACE) { - if ((desc->dwFlags & DDSD_LINEARSIZE) - && desc->u1.dwLinearSize < wined3d_surface_get_pitch(wined3d_surface) * ((desc->dwHeight + 3) / 4)) - { - WARN("Invalid linear size %u specified.\n", desc->u1.dwLinearSize); - return DDERR_INVALIDPARAMS; - } - if (FAILED(hr = wined3d_surface_update_desc(wined3d_surface, wined3d_desc.width, wined3d_desc.height, wined3d_desc.format, WINED3D_MULTISAMPLE_NONE, 0, desc->lpSurface, 0))) @@ -6207,13 +6217,6 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s { if (desc->dwFlags & DDSD_LPSURFACE) { - if (desc->u1.lPitch < wined3d_calculate_format_pitch(ddraw->wined3d, WINED3DADAPTER_DEFAULT, - wined3d_desc.format, wined3d_desc.width) || desc->u1.lPitch & 3) - { - WARN("Invalid pitch %u specified.\n", desc->u1.lPitch); - return DDERR_INVALIDPARAMS; - } - if (FAILED(hr = wined3d_surface_update_desc(wined3d_surface, wined3d_desc.width, wined3d_desc.height, wined3d_desc.format, WINED3D_MULTISAMPLE_NONE, 0, desc->lpSurface, desc->u1.lPitch)))

1 0

Henri Verbeet : ddraw: Set user memory in ddraw_surface_create() instead of ddraw_surface_init().
by Alexandre Julliard 29 Sep '14

29 Sep '14

Module: wine Branch: master Commit: 5000eba6d094a39f82c6814e829c0a03f2ebaf04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5000eba6d094a39f82c6814e8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 29 09:11:53 2014 +0200 ddraw: Set user memory in ddraw_surface_create() instead of ddraw_surface_init(). --- dlls/ddraw/ddraw.c | 9 +------- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/surface.c | 54 +++++++++++++++------------------------------- 3 files changed, 19 insertions(+), 46 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 18c30da..36eb679 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4726,7 +4726,6 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent { struct ddraw *ddraw = ddraw_from_device_parent(device_parent); struct ddraw_surface *ddraw_surface; - HRESULT hr; TRACE("device_parent %p, container_parent %p, surface %p, parent %p, parent_ops %p.\n", device_parent, container_parent, surface, parent, parent_ops); @@ -4746,13 +4745,7 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent return DDERR_OUTOFVIDEOMEMORY; } - if (FAILED(hr = ddraw_surface_init(ddraw_surface, ddraw, container_parent, surface, parent_ops))) - { - WARN("Failed to initialize surface, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, ddraw_surface); - return hr; - } - + ddraw_surface_init(ddraw_surface, ddraw, container_parent, surface, parent_ops); *parent = ddraw_surface; list_add_head(&ddraw->surface_list, &ddraw_surface->surface_list_entry); diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 7d028dd..a2eee1a 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -207,7 +207,7 @@ struct ddraw_texture HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_desc, struct ddraw_surface **surface, IUnknown *outer_unknown, unsigned int version) DECLSPEC_HIDDEN; struct wined3d_rendertarget_view *ddraw_surface_get_rendertarget_view(struct ddraw_surface *surface) DECLSPEC_HIDDEN; -HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct ddraw_texture *texture, +void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct ddraw_texture *texture, struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) DECLSPEC_HIDDEN; ULONG ddraw_surface_release_iface(struct ddraw_surface *This) DECLSPEC_HIDDEN; HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0006126..8c48140 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5605,6 +5605,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ DDSURFACEDESC2 *desc, *mip_desc; struct ddraw_texture *texture; UINT layers, levels, i, j; + unsigned int pitch = 0; HRESULT hr; TRACE("ddraw %p, surface_desc %p, surface %p, outer_unknown %p, version %u.\n", @@ -5969,6 +5970,8 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ HeapFree(GetProcessHeap(), 0, texture); return DDERR_INVALIDPARAMS; } + + pitch = desc->u1.lPitch; } } @@ -6073,6 +6076,14 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ } } + if ((desc->dwFlags & DDSD_LPSURFACE) && FAILED(hr = wined3d_surface_update_desc(root->wined3d_surface, + wined3d_desc.width, wined3d_desc.height, wined3d_desc.format, + WINED3D_MULTISAMPLE_NONE, 0, desc->lpSurface, pitch))) + { + ERR("Failed to set surface memory, hr %#x.\n", hr); + goto fail; + } + if (desc->dwFlags & DDSD_BACKBUFFERCOUNT) { unsigned int count = desc->dwBackBufferCount; @@ -6148,13 +6159,12 @@ fail: return hr; } -HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct ddraw_texture *texture, +void ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, struct ddraw_texture *texture, struct wined3d_surface *wined3d_surface, const struct wined3d_parent_ops **parent_ops) { DDSURFACEDESC2 *desc = &surface->surface_desc; struct wined3d_resource_desc wined3d_desc; unsigned int version = texture->version; - HRESULT hr; surface->IDirectDrawSurface7_iface.lpVtbl = &ddraw_surface7_vtbl; surface->IDirectDrawSurface4_iface.lpVtbl = &ddraw_surface4_vtbl; @@ -6193,46 +6203,18 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s if (format_is_compressed(&desc->u4.ddpfPixelFormat)) { if (desc->dwFlags & DDSD_LPSURFACE) - { - if (FAILED(hr = wined3d_surface_update_desc(wined3d_surface, wined3d_desc.width, - wined3d_desc.height, wined3d_desc.format, WINED3D_MULTISAMPLE_NONE, 0, - desc->lpSurface, 0))) - { - ERR("Failed to set surface memory, hr %#x.\n", hr); - return hr; - } - - desc->dwFlags |= DDSD_LINEARSIZE; - desc->dwFlags &= ~(DDSD_LPSURFACE | DDSD_PITCH); desc->u1.dwLinearSize = ~0u; - } else - { - desc->dwFlags |= DDSD_LINEARSIZE; - desc->dwFlags &= ~DDSD_PITCH; desc->u1.dwLinearSize = wined3d_surface_get_pitch(wined3d_surface) * ((desc->dwHeight + 3) / 4); - } + desc->dwFlags |= DDSD_LINEARSIZE; + desc->dwFlags &= ~(DDSD_LPSURFACE | DDSD_PITCH); } else { - if (desc->dwFlags & DDSD_LPSURFACE) - { - if (FAILED(hr = wined3d_surface_update_desc(wined3d_surface, wined3d_desc.width, - wined3d_desc.height, wined3d_desc.format, WINED3D_MULTISAMPLE_NONE, 0, - desc->lpSurface, desc->u1.lPitch))) - { - ERR("Failed to set surface memory, hr %#x.\n", hr); - return hr; - } - - desc->dwFlags &= ~(DDSD_LPSURFACE | DDSD_LINEARSIZE); - } - else - { - desc->dwFlags |= DDSD_PITCH; - desc->dwFlags &= ~DDSD_LINEARSIZE; + if (!(desc->dwFlags & DDSD_LPSURFACE)) desc->u1.lPitch = wined3d_surface_get_pitch(wined3d_surface); - } + desc->dwFlags |= DDSD_PITCH; + desc->dwFlags &= ~(DDSD_LPSURFACE | DDSD_LINEARSIZE); } desc->lpSurface = NULL; @@ -6241,8 +6223,6 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, s *parent_ops = &ddraw_surface_wined3d_parent_ops; wined3d_private_store_init(&surface->private_store); - - return DD_OK; } static void STDMETHODCALLTYPE view_wined3d_object_destroyed(void *parent)

1 0

Henri Verbeet : wined3d: Replace wined3d_surface_update_desc() with wined3d_texture_update_desc().
by Alexandre Julliard 29 Sep '14

29 Sep '14

Module: wine Branch: master Commit: 97856bcfee78122060e2caf80ad16804074401d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97856bcfee78122060e2caf80… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 29 09:11:54 2014 +0200 wined3d: Replace wined3d_surface_update_desc() with wined3d_texture_update_desc(). --- dlls/d3d9/device.c | 14 ++++-------- dlls/ddraw/surface.c | 4 ++-- dlls/wined3d/device.c | 6 ++--- dlls/wined3d/surface.c | 52 +++++++++++------------------------------- dlls/wined3d/texture.c | 48 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 2 ++ include/wine/wined3d.h | 8 +++---- 8 files changed, 76 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97856bcfee78122060e2c…

1 0

Henri Verbeet : wined3d: Get rid of SFLAG_DONOTFREE.
by Alexandre Julliard 29 Sep '14

29 Sep '14

Module: wine Branch: master Commit: 2d5c8aff3ccbbdcf3a8c9d6e3262d894684d1a9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d5c8aff3ccbbdcf3a8c9d6e3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 29 09:11:55 2014 +0200 wined3d: Get rid of SFLAG_DONOTFREE. --- dlls/wined3d/surface.c | 7 ++++++- dlls/wined3d/wined3d_private.h | 10 ---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index add864a..955c1b6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -587,7 +587,12 @@ void surface_prepare_map_memory(struct wined3d_surface *surface) static void surface_evict_sysmem(struct wined3d_surface *surface) { - if (surface->resource.map_count || surface->flags & SFLAG_DONOTFREE) + /* In some conditions the surface memory must not be freed: + * SFLAG_CONVERTED: Converting the data back would take too long + * SFLAG_DYNLOCK: Avoid freeing the data for performance + * SFLAG_CLIENT: OpenGL uses our memory as backup */ + if (surface->resource.map_count || surface->flags & (SFLAG_CONVERTED | SFLAG_DYNLOCK + | SFLAG_CLIENT | SFLAG_PIN_SYSMEM)) return; wined3d_resource_free_sysmem(&surface->resource); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 76ac66a..110334b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2350,16 +2350,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_ALLOCATED 0x00000800 /* A GL texture is allocated for this surface. */ #define SFLAG_SRGBALLOCATED 0x00001000 /* A sRGB GL texture is allocated for this surface. */ -/* In some conditions the surface memory must not be freed: - * SFLAG_CONVERTED: Converting the data back would take too long - * SFLAG_DYNLOCK: Avoid freeing the data for performance - * SFLAG_CLIENT: OpenGL uses our memory as backup - */ -#define SFLAG_DONOTFREE (SFLAG_CONVERTED | \ - SFLAG_DYNLOCK | \ - SFLAG_CLIENT | \ - SFLAG_PIN_SYSMEM) - enum wined3d_conversion_type { WINED3D_CT_NONE,

1 0

Akihiro Sagawa : ntdll/tests: Remove duplicated entry.
by Alexandre Julliard 29 Sep '14

29 Sep '14

Module: wine Branch: master Commit: 2be3df3c32c799b29c8a0e0c89f246ba272ca165 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2be3df3c32c799b29c8a0e0c8… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Sep 30 00:13:48 2014 +0900 ntdll/tests: Remove duplicated entry. --- dlls/ntdll/tests/reg.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 1594665..db608af 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -166,7 +166,6 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(RtlCreateUnicodeStringFromAsciiz) NTDLL_GET_PROC(RtlCreateUnicodeString) NTDLL_GET_PROC(RtlFreeUnicodeString) - NTDLL_GET_PROC(NtDeleteValueKey) NTDLL_GET_PROC(RtlQueryRegistryValues) NTDLL_GET_PROC(RtlCheckRegistryKey) NTDLL_GET_PROC(RtlOpenCurrentUser)

1 0

Akihiro Sagawa : ntdll/tests: Add KeyNameInformation tests.
by Alexandre Julliard 29 Sep '14

29 Sep '14

Module: wine Branch: master Commit: e47ff906597bf38dbc439da8e4d48b59c2334655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e47ff906597bf38dbc439da8e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Sep 30 00:13:50 2014 +0900 ntdll/tests: Add KeyNameInformation tests. --- dlls/ntdll/tests/reg.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index db608af..22048f9 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -129,11 +129,13 @@ static NTSTATUS (WINAPI * pNtDeleteKey)(HANDLE); static NTSTATUS (WINAPI * pNtCreateKey)( PHANDLE retkey, ACCESS_MASK access, const OBJECT_ATTRIBUTES *attr, ULONG TitleIndex, const UNICODE_STRING *class, ULONG options, PULONG dispos ); +static NTSTATUS (WINAPI * pNtQueryKey)(HANDLE,KEY_INFORMATION_CLASS,PVOID,ULONG,PULONG); static NTSTATUS (WINAPI * pNtQueryValueKey)(HANDLE,const UNICODE_STRING *,KEY_VALUE_INFORMATION_CLASS,void *,DWORD,DWORD *); static NTSTATUS (WINAPI * pNtSetValueKey)(HANDLE, const PUNICODE_STRING, ULONG, ULONG, const void*, ULONG ); static NTSTATUS (WINAPI * pNtQueryInformationProcess)(HANDLE,PROCESSINFOCLASS,PVOID,ULONG,PULONG); static NTSTATUS (WINAPI * pRtlFormatCurrentUserKeyPath)(PUNICODE_STRING); +static LONG (WINAPI * pRtlCompareUnicodeString)(const PUNICODE_STRING,const PUNICODE_STRING,BOOLEAN); static BOOLEAN (WINAPI * pRtlCreateUnicodeString)(PUNICODE_STRING, LPCWSTR); static LPVOID (WINAPI * pRtlReAllocateHeap)(IN PVOID, IN ULONG, IN PVOID, IN ULONG); static NTSTATUS (WINAPI * pRtlAppendUnicodeToString)(PUNICODE_STRING, PCWSTR); @@ -174,11 +176,13 @@ static BOOL InitFunctionPtrs(void) NTDLL_GET_PROC(NtCreateKey) NTDLL_GET_PROC(NtFlushKey) NTDLL_GET_PROC(NtDeleteKey) + NTDLL_GET_PROC(NtQueryKey) NTDLL_GET_PROC(NtQueryValueKey) NTDLL_GET_PROC(NtQueryInformationProcess) NTDLL_GET_PROC(NtSetValueKey) NTDLL_GET_PROC(NtOpenKey) NTDLL_GET_PROC(RtlFormatCurrentUserKeyPath) + NTDLL_GET_PROC(RtlCompareUnicodeString) NTDLL_GET_PROC(RtlReAllocateHeap) NTDLL_GET_PROC(RtlAppendUnicodeToString) NTDLL_GET_PROC(RtlUnicodeStringToAnsiString) @@ -1276,6 +1280,42 @@ static void test_long_value_name(void) pNtClose(key); } +static void test_NtQueryKey(void) +{ + HANDLE key; + NTSTATUS status; + OBJECT_ATTRIBUTES attr; + ULONG len; + KEY_NAME_INFORMATION *info = NULL; + UNICODE_STRING str; + + InitializeObjectAttributes(&attr, &winetestpath, 0, 0, 0); + status = pNtOpenKey(&key, KEY_READ, &attr); + ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); + + status = pNtQueryKey(key, KeyNameInformation, NULL, 0, &len); + if (status == STATUS_INVALID_PARAMETER) { + win_skip("KeyNameInformation is not supported\n"); + pNtClose(key); + return; + } + todo_wine ok(status == STATUS_BUFFER_TOO_SMALL, "NtQueryKey Failed: 0x%08x\n", status); + + info = HeapAlloc(GetProcessHeap(), 0, len); + status = pNtQueryKey(key, KeyNameInformation, info, len, &len); + ok(status == STATUS_SUCCESS, "NtQueryKey Failed: 0x%08x\n", status); + + str.Buffer = info->Name; + str.Length = info->NameLength; + todo_wine ok(pRtlCompareUnicodeString(&winetestpath, &str, TRUE) == 0, + "got %s, expected %s\n", + wine_dbgstr_wn(str.Buffer, str.Length/sizeof(WCHAR)), + wine_dbgstr_wn(winetestpath.Buffer, winetestpath.Length/sizeof(WCHAR))); + + HeapFree(GetProcessHeap(), 0, info); + pNtClose(key); +} + START_TEST(reg) { static const WCHAR winetest[] = {'\\','W','i','n','e','T','e','s','t',0}; @@ -1296,6 +1336,7 @@ START_TEST(reg) test_RtlQueryRegistryValues(); test_RtlpNtQueryValueKey(); test_NtFlushKey(); + test_NtQueryKey(); test_NtQueryValueKey(); test_long_value_name(); test_NtDeleteKey();

1 0

Andreas Fuchs : kernel32: Ignore flags on FindFirstFileExW.
by Alexandre Julliard 29 Sep '14

29 Sep '14

Module: wine Branch: master Commit: ddeab7e564fc302cffa5a3b17134a1fb2f3f26b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddeab7e564fc302cffa5a3b17… Author: Andreas Fuchs <anduchs(a)gmail.com> Date: Mon Sep 29 16:37:41 2014 +0200 kernel32: Ignore flags on FindFirstFileExW. --- dlls/kernel32/file.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index cf683df..512b63e 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1865,10 +1865,13 @@ HANDLE WINAPI FindFirstFileExW( LPCWSTR filename, FINDEX_INFO_LEVELS level, TRACE("%s %d %p %d %p %x\n", debugstr_w(filename), level, data, search_op, filter, flags); - if ((search_op != FindExSearchNameMatch && search_op != FindExSearchLimitToDirectories) - || flags != 0) + if (flags != 0) { - FIXME("options not implemented 0x%08x 0x%08x\n", search_op, flags ); + FIXME("flags not implemented 0x%08x\n", flags ); + } + if (search_op != FindExSearchNameMatch && search_op != FindExSearchLimitToDirectories) + { + FIXME("search_op not implemented 0x%08x\n", search_op); return INVALID_HANDLE_VALUE; } if (level != FindExInfoStandard)

1 0

Piotr Caban : user32/tests: Add initial WindowFromPoint tests.
by Alexandre Julliard 29 Sep '14

29 Sep '14

Module: wine Branch: master Commit: d137a95fda3f0aeacec98ffeb9448c9c4cf3d23e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d137a95fda3f0aeacec98ffeb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 29 18:02:13 2014 +0200 user32/tests: Add initial WindowFromPoint tests. --- dlls/user32/tests/win.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index bf9bb2c..f59c1dc 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7200,6 +7200,44 @@ todo_wine ok(ret, "UnregisterClass(my_window) failed\n"); } +static void test_window_from_point(void) +{ + HWND hwnd, child, win; + POINT pt; + + hwnd = CreateWindowExA(0, "MainWindowClass", NULL, WS_POPUP | WS_VISIBLE, + 100, 100, 200, 100, 0, 0, NULL, NULL); + ok(hwnd != 0, "CreateWindowEx failed\n"); + + pt.x = pt.y = 150; + win = WindowFromPoint(pt); + pt.x = 250; + if(win == hwnd) + win = WindowFromPoint(pt); + if(win != hwnd) { + skip("there's another window covering test window\n"); + DestroyWindow(hwnd); + return; + } + + child = CreateWindowExA(0, "static", "static", WS_CHILD | WS_VISIBLE, + 0, 0, 100, 100, hwnd, 0, NULL, NULL); + ok(child != 0, "CreateWindowEx failed\n"); + pt.x = pt.y = 150; + win = WindowFromPoint(pt); + ok(win == hwnd, "WindowFromPoint returned %p, expected %p\n", win, hwnd); + DestroyWindow(child); + + child = CreateWindowExA(0, "button", "button", WS_CHILD | WS_VISIBLE, + 0, 0, 100, 100, hwnd, 0, NULL, NULL); + ok(child != 0, "CreateWindowEx failed\n"); + win = WindowFromPoint(pt); + ok(win == child, "WindowFromPoint returned %p, expected %p\n", win, child); + DestroyWindow(child); + + DestroyWindow(hwnd); +} + static void test_map_points(void) { BOOL ret; @@ -7745,6 +7783,7 @@ START_TEST(win) /* Add the tests below this line */ test_child_window_from_point(); + test_window_from_point(); test_thick_child_size(hwndMain); test_fullscreen(); test_hwnd_message();

1 0

Piotr Caban : user32/tests: Add cross-process WindowFromPoint tests.
by Alexandre Julliard 29 Sep '14

29 Sep '14

Module: wine Branch: master Commit: c86bd676c7c5ca2c4fed82e8cc804dc23309c85d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c86bd676c7c5ca2c4fed82e8c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 29 18:02:48 2014 +0200 user32/tests: Add cross-process WindowFromPoint tests. --- dlls/user32/tests/win.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f59c1dc..1392c9b 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -103,6 +103,22 @@ static void flush_events( BOOL remove_messages ) } } +static BOOL wait_for_event(HANDLE event, int timeout) +{ + DWORD end_time = GetTickCount() + timeout; + MSG msg; + + do { + if(MsgWaitForMultipleObjects(1, &event, FALSE, timeout, QS_ALLINPUT) == WAIT_OBJECT_0) + return TRUE; + while(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessageA(&msg); + timeout = end_time - GetTickCount(); + }while(timeout > 0); + + return FALSE; +} + /* check the values returned by the various parent/owner functions on a given window */ static void check_parents( HWND hwnd, HWND ga_parent, HWND gwl_parent, HWND get_parent, HWND gw_owner, HWND ga_root, HWND ga_root_owner ) @@ -7200,10 +7216,49 @@ todo_wine ok(ret, "UnregisterClass(my_window) failed\n"); } -static void test_window_from_point(void) +static void window_from_point_proc(HWND parent) +{ + HANDLE start_event, end_event; + HANDLE win, child_static, child_button; + DWORD ret; + POINT pt; + + start_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "test_wfp_start"); + ok(start_event != 0, "OpenEvent failed\n"); + end_event = OpenEventA(EVENT_ALL_ACCESS, FALSE, "test_wfp_end"); + ok(end_event != 0, "OpenEvent failed\n"); + + child_static = CreateWindowExA(0, "static", "static", WS_CHILD | WS_VISIBLE, + 0, 0, 100, 100, parent, 0, NULL, NULL); + ok(child_static != 0, "CreateWindowEx failed\n"); + pt.x = pt.y = 150; + win = WindowFromPoint(pt); + ok(win == parent, "WindowFromPoint returned %p, expected %p\n", win, parent); + + child_button = CreateWindowExA(0, "button", "button", WS_CHILD | WS_VISIBLE, + 100, 0, 100, 100, parent, 0, NULL, NULL); + ok(child_button != 0, "CreateWindowEx failed\n"); + pt.x = 250; + win = WindowFromPoint(pt); + ok(win == child_button, "WindowFromPoint returned %p, expected %p\n", win, child_button); + + SetEvent(start_event); + + ret = WaitForSingleObject(end_event, 5000); + ok(ret == WAIT_OBJECT_0, "WaitForSingleObject returned %x\n", ret); + + CloseHandle(start_event); + CloseHandle(end_event); +} + +static void test_window_from_point(const char *argv0) { HWND hwnd, child, win; POINT pt; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + char cmd[MAX_PATH]; + HANDLE start_event, end_event; hwnd = CreateWindowExA(0, "MainWindowClass", NULL, WS_POPUP | WS_VISIBLE, 100, 100, 200, 100, 0, 0, NULL, NULL); @@ -7235,6 +7290,34 @@ static void test_window_from_point(void) ok(win == child, "WindowFromPoint returned %p, expected %p\n", win, child); DestroyWindow(child); + start_event = CreateEventA(NULL, FALSE, FALSE, "test_wfp_start"); + ok(start_event != 0, "CreateEvent failed\n"); + end_event = CreateEventA(NULL, FALSE, FALSE, "test_wfp_end"); + ok(start_event != 0, "CreateEvent failed\n"); + + sprintf(cmd, "%s win create_children %p\n", argv0, hwnd); + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + ok(CreateProcessA(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, + &startup, &info), "CreateProcess failed.\n"); + ok(wait_for_event(start_event, 1000), "didn't get start_event\n"); + + child = GetWindow(hwnd, GW_CHILD); + win = WindowFromPoint(pt); + ok(win == child, "WindowFromPoint returned %p, expected %p\n", win, child); + + child = GetWindow(child, GW_HWNDNEXT); + pt.x = 250; + win = WindowFromPoint(pt); + ok(win == child, "WindowFromPoint returned %p, expected %p\n", win, child); + + SetEvent(end_event); + winetest_wait_child_process(info.hProcess); + CloseHandle(start_event); + CloseHandle(end_event); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + DestroyWindow(hwnd); } @@ -7713,6 +7796,8 @@ static void test_smresult(void) START_TEST(win) { + char **argv; + int argc = winetest_get_mainargs( &argv ); HMODULE user32 = GetModuleHandleA( "user32.dll" ); HMODULE gdi32 = GetModuleHandleA("gdi32.dll"); pGetAncestor = (void *)GetProcAddress( user32, "GetAncestor" ); @@ -7733,6 +7818,15 @@ START_TEST(win) pSetLayout = (void *)GetProcAddress( gdi32, "SetLayout" ); pMirrorRgn = (void *)GetProcAddress( gdi32, "MirrorRgn" ); + if (argc==4 && !strcmp(argv[2], "create_children")) + { + HWND hwnd; + + sscanf(argv[3], "%p", &hwnd); + window_from_point_proc(hwnd); + return; + } + if (!RegisterWindowClasses()) assert(0); hwndMain = CreateWindowExA(/*WS_EX_TOOLWINDOW*/ 0, "MainWindowClass", "Main window", @@ -7783,7 +7877,7 @@ START_TEST(win) /* Add the tests below this line */ test_child_window_from_point(); - test_window_from_point(); + test_window_from_point(argv[0]); test_thick_child_size(hwndMain); test_fullscreen(); test_hwnd_message();

1 0