- wine-devel - winehq.org

[PATCH resend 1/2] user32: Kill focus before minimizing a window.
by Zebediah Figura 31 Jan '18

31 Jan '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Initial version was dependent on some patches in my local tree; sorry for the spam. dlls/user32/tests/win.c | 31 ++++++++++++++++++++++++++++++- dlls/user32/winpos.c | 8 ++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index f492ecc..917ab61 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3113,7 +3113,6 @@ todo_wine ShowWindow(hwnd, SW_SHOWMINIMIZED); ok( GetActiveWindow() == hwnd, "parent window %p should be active\n", hwnd); ok( GetFocus() != child, "Focus should not be on child %p\n", child ); -todo_wine ok( GetFocus() != hwnd, "Focus should not be on parent %p\n", hwnd ); old_wnd_proc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)set_focus_on_activate_proc); ShowWindow(hwnd, SW_RESTORE); @@ -10071,6 +10070,13 @@ static void test_minimize_window(HWND hwndMain) ShowWindow(hwnd2, SW_RESTORE); check_active_state(hwnd2, hwnd2, hwnd2); + /* try SW_SHOWMINIMIZED */ + ShowWindow(hwnd2, SW_SHOWMINIMIZED); + check_active_state(hwnd2, hwnd2, 0); + + ShowWindow(hwnd2, SW_RESTORE); + check_active_state(hwnd2, hwnd2, hwnd2); + /* hide a non-active window */ ShowWindow(hwnd, SW_MINIMIZE); check_active_state(hwnd2, hwnd2, hwnd2); @@ -10114,6 +10120,11 @@ static void test_minimize_window(HWND hwndMain) todo_wine check_active_state(hwnd2, hwnd2, hwnd2); + /* with SW_SHOWMINIMIZED */ + ShowWindow(hwnd3, SW_RESTORE); + ShowWindow(hwnd3, SW_SHOWMINIMIZED); + check_active_state(hwnd3, hwnd3, 0); + /* hide an owner window */ ShowWindow(hwnd, SW_RESTORE); ShowWindow(hwnd2, SW_RESTORE); @@ -10123,6 +10134,24 @@ static void test_minimize_window(HWND hwndMain) check_active_state(hwnd2, hwnd2, hwnd2); DestroyWindow(hwnd3); + + /* test a child window - focus should be yielded back to the parent */ + ShowWindow(hwnd, SW_RESTORE); + hwnd3 = CreateWindowExA(0, "MainWindowClass", "Child window 3", WS_CHILD|WS_VISIBLE, + 100, 100, 200, 200, hwnd, 0, GetModuleHandleA(NULL), NULL); + SetFocus(hwnd3); + check_active_state(hwnd, hwnd, hwnd3); + ShowWindow(hwnd3, SW_MINIMIZE); + check_active_state(hwnd, hwnd, hwnd); + + /* with SW_SHOWMINIMIZED */ + ShowWindow(hwnd3, SW_RESTORE); + SetFocus(hwnd3); + check_active_state(hwnd, hwnd, hwnd3); + ShowWindow(hwnd3, SW_SHOWMINIMIZED); + check_active_state(hwnd, hwnd, hwnd); + + DestroyWindow(hwnd3); DestroyWindow(hwnd2); DestroyWindow(hwnd); } diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 10f0fd0..c1b55b5 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -983,6 +983,14 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) if (IsZoomed( hwnd )) win_set_flags( hwnd, WIN_RESTORE_MAX, 0 ); else win_set_flags( hwnd, 0, WIN_RESTORE_MAX ); + if (GetFocus() == hwnd) + { + if (GetWindowLongW(hwnd, GWL_STYLE) & WS_CHILD) + SetFocus(GetAncestor(hwnd, GA_PARENT)); + else + SetFocus(0); + } + old_style = WIN_SetStyle( hwnd, WS_MINIMIZE, WS_MAXIMIZE ); wpl.ptMinPosition = WINPOS_FindIconPos( hwnd, wpl.ptMinPosition ); -- 2.7.4

3 4

[PATCH] dbghelp: Use correct module name buffer length when doing enumeration
by Nikolay Sivov 31 Jan '18

31 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Manually tested on Windows. dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/module.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 684111c86c..f37991dacd 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -353,6 +353,7 @@ struct module { struct process* process; IMAGEHLP_MODULEW64 module; + WCHAR modulename[64]; /* used for enumeration */ struct module* next; enum module_type type : 16; unsigned short is_virtual : 1; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 6c7f2dcb6d..9f90d5e0ca 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -102,6 +102,7 @@ void module_set_module(struct module* module, const WCHAR* name) { module_fill_module(name, module->module.ModuleName, sizeof(module->module.ModuleName) / sizeof(module->module.ModuleName[0])); + module_fill_module(name, module->modulename, sizeof(module->modulename) / sizeof(module->modulename[0])); } const WCHAR *get_wine_loader_name(void) @@ -812,7 +813,7 @@ BOOL WINAPI SymEnumerateModulesW64(HANDLE hProcess, if (!(dbghelp_options & SYMOPT_WINE_WITH_NATIVE_MODULES) && (module->type == DMT_ELF || module->type == DMT_MACHO)) continue; - if (!EnumModulesCallback(module->module.ModuleName, + if (!EnumModulesCallback(module->modulename, module->module.BaseOfImage, UserContext)) break; } -- 2.15.1

1 0

[PATCH 6/6] d2d1: Use d2d_array_reserve() in d2d_clip_stack_push().
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 30 ++++++++++++++++++++++++++++-- dlls/d2d1/geometry.c | 27 --------------------------- dlls/d2d1/render_target.c | 17 ++--------------- 3 files changed, 30 insertions(+), 44 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 2c10252..07f71a0 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -62,8 +62,8 @@ extern struct d2d_settings d2d_settings DECLSPEC_HIDDEN; struct d2d_clip_stack { D2D1_RECT_F *stack; - unsigned int size; - unsigned int count; + size_t size; + size_t count; }; struct d2d_error_state @@ -486,6 +486,32 @@ static inline void *d2d_calloc(size_t count, size_t size) return heap_alloc(s); } +static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size) +{ + size_t new_capacity, max_capacity; + void *new_elements; + + if (count <= *capacity) + return TRUE; + + max_capacity = ~(SIZE_T)0 / size; + if (count > max_capacity) + return FALSE; + + new_capacity = max(4, *capacity); + while (new_capacity < count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + if (new_capacity < count) + new_capacity = max_capacity; + + if (!(new_elements = heap_realloc(*elements, new_capacity * size))) + return FALSE; + + *elements = new_elements; + *capacity = new_capacity; + return TRUE; +} + static inline void d2d_matrix_multiply(D2D_MATRIX_3X2_F *a, const D2D_MATRIX_3X2_F *b) { D2D_MATRIX_3X2_F tmp = *a; diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index c805084..4a2f7d7 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -562,33 +562,6 @@ static void d2d_rect_get_bezier_segment_bounds(D2D_RECT_F *bounds, const D2D1_PO d2d_rect_get_bezier_bounds(bounds, &q[0], &q[1], &q[2]); } -static BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t element_count, size_t element_size) -{ - size_t new_capacity, max_capacity; - void *new_elements; - - if (element_count <= *capacity) - return TRUE; - - max_capacity = ~(size_t)0 / element_size; - if (max_capacity < element_count) - return FALSE; - - new_capacity = max(*capacity, 4); - while (new_capacity < element_count && new_capacity <= max_capacity / 2) - new_capacity *= 2; - - if (new_capacity < element_count) - new_capacity = max_capacity; - - if (!(new_elements = heap_realloc(*elements, new_capacity * element_size))) - return FALSE; - - *elements = new_elements; - *capacity = new_capacity; - return TRUE; -} - static BOOL d2d_figure_insert_vertex(struct d2d_figure *figure, size_t idx, D2D1_POINT_2F vertex) { if (!d2d_array_reserve((void **)&figure->vertices, &figure->vertices_size, diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index cc820cf..a202279 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -95,21 +95,8 @@ static BOOL d2d_clip_stack_push(struct d2d_clip_stack *stack, const D2D1_RECT_F { D2D1_RECT_F r; - if (stack->count == stack->size) - { - D2D1_RECT_F *new_stack; - unsigned int new_size; - - if (stack->size > UINT_MAX / 2) - return FALSE; - - new_size = stack->size * 2; - if (!(new_stack = heap_realloc(stack->stack, new_size * sizeof(*stack->stack)))) - return FALSE; - - stack->stack = new_stack; - stack->size = new_size; - } + if (!d2d_array_reserve((void **)&stack->stack, &stack->size, stack->count + 1, sizeof(*stack->stack))) + return FALSE; r = *rect; if (stack->count) -- 2.1.4

1 0

[PATCH 4/6] wined3d: Use the resource access flags in surface_blt_special().
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 520f88c..5f91c21 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1990,10 +1990,10 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE dst_surface, wine_dbgstr_rect(dst_rect), src_surface, 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.pool == WINED3D_POOL_SYSTEM_MEM) + /* Get the swapchain. One of the surfaces has to be a primary surface. */ + if (!(dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) { - WARN("Destination is in sysmem, rejecting gl blt\n"); + WARN("Destination resource is not GPU accessible, rejecting GL blit.\n"); return WINED3DERR_INVALIDCALL; } @@ -2002,9 +2002,9 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE if (src_surface) { src_texture = src_surface->container; - if (src_texture->resource.pool == WINED3D_POOL_SYSTEM_MEM) + if (!(src_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) { - WARN("Src is in sysmem, rejecting gl blt\n"); + WARN("Source resource is not GPU accessible, rejecting GL blit.\n"); return WINED3DERR_INVALIDCALL; } -- 2.1.4

1 0

[PATCH 3/6] wined3d: Use the resource access flags in wined3d_resource_set_priority().
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 44f9f00..437261b 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -284,7 +284,7 @@ DWORD CDECL wined3d_resource_set_priority(struct wined3d_resource *resource, DWO { DWORD prev; - if (resource->pool != WINED3D_POOL_MANAGED) + if (!wined3d_resource_access_is_managed(resource->access)) { WARN("Called on non-managed resource %p, ignoring.\n", resource); return 0; -- 2.1.4

1 0

[PATCH 2/6] wined3d: Use the resource access flags in resource_cleanup().
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/resource.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 172a054..44f9f00 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -262,7 +262,7 @@ void resource_cleanup(struct wined3d_resource *resource) if (!(resource->usage & WINED3DUSAGE_PRIVATE)) { - if (resource->pool == WINED3D_POOL_DEFAULT && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) + if (!(resource->access & WINED3D_RESOURCE_ACCESS_CPU) && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) { TRACE("Decrementing device memory pool by %u.\n", resource->size); adapter_adjust_memory(resource->device->adapter, (INT64)0 - resource->size); -- 2.1.4

1 0

[PATCH 1/6] wined3d: Use the resource access flags in resource_init().
by Henri Verbeet 31 Jan '18

31 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/resource.c | 12 +++++++----- dlls/wined3d/utils.c | 16 ++++++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index cf01f93..172a054 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -83,6 +83,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * enum wined3d_gl_resource_type base_type = WINED3D_GL_RES_TYPE_COUNT; enum wined3d_gl_resource_type gl_type = WINED3D_GL_RES_TYPE_COUNT; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + DWORD access = resource_access_from_pool(pool); BOOL tex_2d_ok = FALSE; unsigned int i; @@ -104,9 +105,10 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource_check_usage(usage); - if (usage & WINED3DUSAGE_SCRATCH && pool != WINED3D_POOL_SYSTEM_MEM) + if (usage & WINED3DUSAGE_SCRATCH && access & WINED3D_RESOURCE_ACCESS_GPU) { - ERR("WINED3DUSAGE_SCRATCH used with pool %s.\n", debug_d3dpool(pool)); + ERR("Trying to create a scratch resource with access flags %s.\n", + wined3d_debug_resource_access(access)); return WINED3DERR_INVALIDCALL; } @@ -197,9 +199,9 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->multisample_quality = multisample_quality; resource->usage = usage; resource->pool = pool; - resource->access = resource_access_from_pool(pool); if (usage & WINED3DUSAGE_DYNAMIC) - resource->access |= WINED3D_RESOURCE_ACCESS_MAP; + access |= WINED3D_RESOURCE_ACCESS_MAP; + resource->access = access; resource->width = width; resource->height = height; resource->depth = depth; @@ -226,7 +228,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * if (!(usage & WINED3DUSAGE_PRIVATE)) { /* Check that we have enough video ram left */ - if (pool == WINED3D_POOL_DEFAULT && device->wined3d->flags & WINED3D_VIDMEM_ACCOUNTING) + if (!(access & WINED3D_RESOURCE_ACCESS_CPU) && device->wined3d->flags & WINED3D_VIDMEM_ACCOUNTING) { if (size > wined3d_device_get_available_texture_mem(device)) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index bd8aa06..a79c3af 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4129,6 +4129,22 @@ const char *debug_d3ddevicetype(enum wined3d_device_type device_type) } } +const char *wined3d_debug_resource_access(DWORD access) +{ + char buf[91]; + + buf[0] = '\0'; +#define ACCESS_TO_STR(x) if (access & x) { strcat(buf, " | "#x); access &= ~x; } + ACCESS_TO_STR(WINED3D_RESOURCE_ACCESS_GPU); + ACCESS_TO_STR(WINED3D_RESOURCE_ACCESS_CPU); + ACCESS_TO_STR(WINED3D_RESOURCE_ACCESS_MAP); +#undef ACCESS_TO_STR + if (access) + FIXME("Unrecognised access flag(s) %#x.\n", access); + + return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; +} + const char *debug_d3dusage(DWORD usage) { char buf[552]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f95330f..8006f3a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2965,6 +2965,8 @@ static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD sta #define WINED3D_RESOURCE_ACCESS_CPU 0x2u #define WINED3D_RESOURCE_ACCESS_MAP 0x4u +const char *wined3d_debug_resource_access(DWORD access) DECLSPEC_HIDDEN; + static inline BOOL wined3d_resource_access_is_managed(unsigned int access) { return !(~access & (WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU)); -- 2.1.4

1 0

[PATCH 04/13] secur32: Implement InitializeSecurityContext in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Partially based on Hans Leidekker's work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index ad3223c166..fe7ccb418d 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -396,6 +396,76 @@ static SECURITY_STATUS WINAPI lsa_FreeCredentialsHandle(CredHandle *credential) return lsa_package->lsa_api->FreeCredentialsHandle(lsa_credential); } +static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextW( + CredHandle *credential, CtxtHandle *context, SEC_WCHAR *target_name, ULONG context_req, + ULONG reserved1, ULONG target_data_rep, SecBufferDesc *input, ULONG reserved2, + CtxtHandle *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status; + struct lsa_package *lsa_package = NULL; + LSA_SEC_HANDLE lsa_credential = 0, lsa_context = 0, new_lsa_context; + UNICODE_STRING target_name_us; + BOOLEAN mapped_context; + + TRACE("%p %p %s %#x %d %d %p %d %p %p %p %p\n", credential, context, + debugstr_w(target_name), context_req, reserved1, target_data_rep, input, + reserved2, new_context, output, context_attr, ts_expiry); + + if (credential) + { + lsa_package = (struct lsa_package *)credential->dwUpper; + lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; + } + else if (context) + { + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + } + + if (!lsa_package || !new_context) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->InitLsaModeContext) + return SEC_E_UNSUPPORTED_FUNCTION; + + if (target_name) + RtlInitUnicodeString(&target_name_us, target_name); + + status = lsa_package->lsa_api->InitLsaModeContext(lsa_credential, lsa_context, + target_name ? &target_name_us : NULL, context_req, target_data_rep, input, + &new_lsa_context, output, context_attr, ts_expiry, &mapped_context, NULL /* FIXME */); + if (status == SEC_E_OK) + { + new_context->dwLower = (ULONG_PTR)new_lsa_context; + new_context->dwUpper = (ULONG_PTR)lsa_package; + } + return status; +} + +static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextA( + CredHandle *credential, CtxtHandle *context, SEC_CHAR *target_name, ULONG context_req, + ULONG reserved1, ULONG target_data_rep, SecBufferDesc *input, ULONG reserved2, + CtxtHandle *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status; + SEC_WCHAR *targetW = NULL; + + TRACE("%p %p %s %#x %d %d %p %d %p %p %p %p\n", credential, context, + debugstr_a(target_name), context_req, reserved1, target_data_rep, input, + reserved2, new_context, output, context_attr, ts_expiry); + + if (target_name) + { + int len = MultiByteToWideChar( CP_ACP, 0, target_name, -1, NULL, 0 ); + if (!(targetW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(SEC_WCHAR) ))) return SEC_E_INSUFFICIENT_MEMORY; + MultiByteToWideChar( CP_ACP, 0, target_name, -1, targetW, len ); + } + + status = lsa_InitializeSecurityContextW( credential, context, targetW, context_req, reserved1, target_data_rep, + input, reserved2, new_context, output, context_attr, ts_expiry ); + HeapFree( GetProcessHeap(), 0, targetW ); + return status; +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -404,7 +474,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_AcquireCredentialsHandleW, lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ - NULL, /* InitializeSecurityContextW */ + lsa_InitializeSecurityContextW, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ NULL, /* DeleteSecurityContext */ @@ -436,7 +506,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_AcquireCredentialsHandleA, lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ - NULL, /* InitializeSecurityContextA */ + lsa_InitializeSecurityContextA, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ NULL, /* DeleteSecurityContext */ -- 2.15.1

2 2

[PATCH 13/13] secur32: Add support for switching between Kerberos and NTLM in Negotiate provider.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Based on generic wrapper.c implementation. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/negotiate.c | 330 ++++++++++++++++++++++++++++++++++++-------- dlls/secur32/ntlm.c | 4 +- dlls/secur32/secur32_priv.h | 19 +-- dlls/secur32/wrapper.c | 2 +- 4 files changed, 277 insertions(+), 78 deletions(-) diff --git a/dlls/secur32/negotiate.c b/dlls/secur32/negotiate.c index bf16258fc2..c7ab97ef79 100644 --- a/dlls/secur32/negotiate.c +++ b/dlls/secur32/negotiate.c @@ -62,20 +62,41 @@ static SECURITY_STATUS SEC_ENTRY nego_AcquireCredentialsHandleW( PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry ) { static SEC_WCHAR ntlmW[] = {'N','T','L','M',0}; + static SEC_WCHAR kerberosW[] = {'K','e','r','b','e','r','o','s',0}; SECURITY_STATUS ret; + SecurePackage *package; + CredHandle myCred; TRACE("%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); - FIXME("forwarding to NTLM\n"); - ret = ntlm_AcquireCredentialsHandleW( pszPrincipal, ntlmW, fCredentialUse, - pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, - phCredential, ptsExpiry ); + if (!pszPackage) + return SEC_E_SECPKG_NOT_FOUND; + + package = SECUR32_findPackageW(kerberosW); + if (!package || !package->provider) + { + package = SECUR32_findPackageW(ntlmW); + if (!package || !package->provider) + return SEC_E_SECPKG_NOT_FOUND; + } + + if (!package->provider->fnTableW.AcquireCredentialsHandleW) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + ret = package->provider->fnTableW.AcquireCredentialsHandleW( + pszPrincipal, package->infoW.Name, fCredentialUse, pLogonID, + pAuthData, pGetKeyFn, pGetKeyArgument, &myCred, + ptsExpiry); if (ret == SEC_E_OK) { - NtlmCredentials *cred = (NtlmCredentials *)phCredential->dwLower; - cred->no_cached_credentials = (pAuthData == NULL); + ret = SECUR32_makeSecHandle(phCredential, package, &myCred); + if (ret != SEC_E_OK) + package->provider->fnTableW.FreeCredentialsHandle(&myCred); } return ret; } @@ -173,15 +194,56 @@ static SECURITY_STATUS SEC_ENTRY nego_InitializeSecurityContextW( PSecBufferDesc pInput, ULONG Reserved2, PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry ) { + SECURITY_STATUS ret; + SecurePackage *package = NULL; + PCredHandle cred = NULL; + PCredHandle ctxt = NULL; + CtxtHandle myCtxt; + TRACE("%p, %p, %s, 0x%08x, %u, %u, %p, %u, %p, %p, %p, %p\n", phCredential, phContext, debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); - return ntlm_InitializeSecurityContextW( phCredential, phContext, pszTargetName, - fContextReq, Reserved1, TargetDataRep, - pInput, Reserved2, phNewContext, - pOutput, pfContextAttr, ptsExpiry ); + if (phContext) + { + package = (SecurePackage *)phContext->dwUpper; + ctxt = (PCtxtHandle)phContext->dwLower; + } + if (phCredential) + { + package = (SecurePackage *)phCredential->dwUpper; + cred = (PCredHandle)phCredential->dwLower; + } + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.InitializeSecurityContextW) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + if (phContext) + { + PCtxtHandle realCtxt = (PCtxtHandle)phContext->dwLower; + myCtxt.dwUpper = realCtxt->dwUpper; + myCtxt.dwLower = realCtxt->dwLower; + } + + ret = package->provider->fnTableW.InitializeSecurityContextW( + cred, ctxt, pszTargetName, fContextReq, + Reserved1, TargetDataRep, pInput, Reserved2, phNewContext ? &myCtxt : NULL, + pOutput, pfContextAttr, ptsExpiry); + if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && + phNewContext && phNewContext != phContext) + { + if (SECUR32_makeSecHandle(phNewContext, package, &myCtxt) != SEC_E_OK) + package->provider->fnTableW.DeleteSecurityContext(&myCtxt); + } + + return ret; } /*********************************************************************** @@ -223,13 +285,49 @@ static SECURITY_STATUS SEC_ENTRY nego_AcceptSecurityContext( ULONG fContextReq, ULONG TargetDataRep, PCtxtHandle phNewContext, PSecBufferDesc pOutput, ULONG *pfContextAttr, PTimeStamp ptsExpiry) { + SecurePackage *package; + PCredHandle cred; + CtxtHandle myCtxt; + SECURITY_STATUS ret; + TRACE("%p, %p, %p, 0x%08x, %u, %p, %p, %p, %p\n", phCredential, phContext, pInput, fContextReq, TargetDataRep, phNewContext, pOutput, pfContextAttr, ptsExpiry); - return ntlm_AcceptSecurityContext( phCredential, phContext, pInput, - fContextReq, TargetDataRep, phNewContext, - pOutput, pfContextAttr, ptsExpiry ); + if (!phCredential) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phCredential->dwUpper; + cred = (PCredHandle)phCredential->dwLower; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.AcceptSecurityContext) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + if(phContext) + { + PCtxtHandle realCtxt = (PCtxtHandle)phContext->dwLower; + TRACE("realCtx: %p\n", realCtxt); + myCtxt.dwUpper = realCtxt->dwUpper; + myCtxt.dwLower = realCtxt->dwLower; + } + + ret = package->provider->fnTableW.AcceptSecurityContext( + cred, phContext ? &myCtxt : NULL, pInput, fContextReq, + TargetDataRep, &myCtxt, pOutput, pfContextAttr, ptsExpiry); + if ((ret == SEC_E_OK || ret == SEC_I_CONTINUE_NEEDED) && + phNewContext && phNewContext != phContext) + { + if (SECUR32_makeSecHandle(phNewContext, package, &myCtxt) != SEC_E_OK) + package->provider->fnTableW.DeleteSecurityContext(&myCtxt); + } + + return ret; } /*********************************************************************** @@ -257,9 +355,31 @@ static SECURITY_STATUS SEC_ENTRY nego_CompleteAuthToken(PCtxtHandle phContext, */ static SECURITY_STATUS SEC_ENTRY nego_DeleteSecurityContext(PCtxtHandle phContext) { + SecurePackage *package; + PCtxtHandle ctxt; + SECURITY_STATUS ret; + TRACE("%p\n", phContext); + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.DeleteSecurityContext) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + ctxt = (PCtxtHandle)phContext->dwLower; - return ntlm_DeleteSecurityContext( phContext ); + ret = package->provider->fnTableW.DeleteSecurityContext(ctxt); + HeapFree(GetProcessHeap(), 0, ctxt); + + return ret; } /*********************************************************************** @@ -288,29 +408,28 @@ static SECURITY_STATUS SEC_ENTRY nego_ApplyControlToken(PCtxtHandle phContext, static SECURITY_STATUS SEC_ENTRY nego_QueryContextAttributesW( PCtxtHandle phContext, ULONG ulAttribute, void *pBuffer) { + SecurePackage *package; + PCtxtHandle ctxt; + TRACE("%p, %u, %p\n", phContext, ulAttribute, pBuffer); - switch (ulAttribute) - { - case SECPKG_ATTR_SIZES: - { - SecPkgContext_Sizes *sizes = (SecPkgContext_Sizes *)pBuffer; - sizes->cbMaxToken = 2888; - sizes->cbMaxSignature = 16; - sizes->cbSecurityTrailer = 16; - sizes->cbBlockSize = 0; - return SEC_E_OK; - } - case SECPKG_ATTR_NEGOTIATION_INFO: + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.QueryContextAttributesW) { - SecPkgContext_NegotiationInfoW *info = (SecPkgContext_NegotiationInfoW *)pBuffer; - info->PackageInfo = ntlm_package_infoW; - info->NegotiationState = SECPKG_NEGOTIATION_COMPLETE; - return SEC_E_OK; - } - default: - return ntlm_QueryContextAttributesW( phContext, ulAttribute, pBuffer ); + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; } + + ctxt = (PCtxtHandle)phContext->dwLower; + + return package->provider->fnTableW.QueryContextAttributesW(ctxt, ulAttribute, pBuffer); } /*********************************************************************** @@ -319,29 +438,28 @@ static SECURITY_STATUS SEC_ENTRY nego_QueryContextAttributesW( static SECURITY_STATUS SEC_ENTRY nego_QueryContextAttributesA(PCtxtHandle phContext, ULONG ulAttribute, void *pBuffer) { + SecurePackage *package; + PCtxtHandle ctxt; + TRACE("%p, %u, %p\n", phContext, ulAttribute, pBuffer); - switch (ulAttribute) - { - case SECPKG_ATTR_SIZES: - { - SecPkgContext_Sizes *sizes = (SecPkgContext_Sizes *)pBuffer; - sizes->cbMaxToken = 2888; - sizes->cbMaxSignature = 16; - sizes->cbSecurityTrailer = 16; - sizes->cbBlockSize = 0; - return SEC_E_OK; - } - case SECPKG_ATTR_NEGOTIATION_INFO: + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableA.QueryContextAttributesA) { - SecPkgContext_NegotiationInfoA *info = (SecPkgContext_NegotiationInfoA *)pBuffer; - info->PackageInfo = ntlm_package_infoA; - info->NegotiationState = SECPKG_NEGOTIATION_COMPLETE; - return SEC_E_OK; - } - default: - return ntlm_QueryContextAttributesA( phContext, ulAttribute, pBuffer ); + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; } + + ctxt = (PCtxtHandle)phContext->dwLower; + + return package->provider->fnTableA.QueryContextAttributesA(ctxt, ulAttribute, pBuffer); } /*********************************************************************** @@ -388,9 +506,28 @@ static SECURITY_STATUS SEC_ENTRY nego_RevertSecurityContext(PCtxtHandle phContex static SECURITY_STATUS SEC_ENTRY nego_MakeSignature(PCtxtHandle phContext, ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) { + SecurePackage *package; + PCtxtHandle ctxt; + TRACE("%p, 0x%08x, %p, %u\n", phContext, fQOP, pMessage, MessageSeqNo); - return ntlm_MakeSignature( phContext, fQOP, pMessage, MessageSeqNo ); + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.MakeSignature) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + ctxt = (PCtxtHandle)phContext->dwLower; + + return package->provider->fnTableW.MakeSignature(ctxt, fQOP, pMessage, MessageSeqNo); } /*********************************************************************** @@ -399,9 +536,28 @@ static SECURITY_STATUS SEC_ENTRY nego_MakeSignature(PCtxtHandle phContext, static SECURITY_STATUS SEC_ENTRY nego_VerifySignature(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) { + SecurePackage *package; + PCtxtHandle ctxt; + TRACE("%p, %p, %u, %p\n", phContext, pMessage, MessageSeqNo, pfQOP); - return ntlm_VerifySignature( phContext, pMessage, MessageSeqNo, pfQOP ); + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.VerifySignature) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + ctxt = (PCtxtHandle)phContext->dwLower; + + return package->provider->fnTableW.VerifySignature(ctxt, pMessage, MessageSeqNo, pfQOP); } /*********************************************************************** @@ -409,9 +565,31 @@ static SECURITY_STATUS SEC_ENTRY nego_VerifySignature(PCtxtHandle phContext, */ static SECURITY_STATUS SEC_ENTRY nego_FreeCredentialsHandle(PCredHandle phCredential) { + SecurePackage *package; + PCredHandle cred; + SECURITY_STATUS ret; + TRACE("%p\n", phCredential); - return ntlm_FreeCredentialsHandle( phCredential ); + if (!phCredential) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phCredential->dwUpper; + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.FreeCredentialsHandle) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + cred = (PCredHandle)phCredential->dwLower; + + ret = package->provider->fnTableW.FreeCredentialsHandle(cred); + HeapFree(GetProcessHeap(), 0, cred); + + return ret; } /*********************************************************************** @@ -420,9 +598,28 @@ static SECURITY_STATUS SEC_ENTRY nego_FreeCredentialsHandle(PCredHandle phCreden static SECURITY_STATUS SEC_ENTRY nego_EncryptMessage(PCtxtHandle phContext, ULONG fQOP, PSecBufferDesc pMessage, ULONG MessageSeqNo) { + SecurePackage *package; + PCtxtHandle ctxt; + TRACE("%p, 0x%08x, %p, %u\n", phContext, fQOP, pMessage, MessageSeqNo); - return ntlm_EncryptMessage( phContext, fQOP, pMessage, MessageSeqNo ); + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.EncryptMessage) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + ctxt = (PCtxtHandle)phContext->dwLower; + + return package->provider->fnTableW.EncryptMessage(ctxt, fQOP, pMessage, MessageSeqNo); } /*********************************************************************** @@ -431,9 +628,28 @@ static SECURITY_STATUS SEC_ENTRY nego_EncryptMessage(PCtxtHandle phContext, static SECURITY_STATUS SEC_ENTRY nego_DecryptMessage(PCtxtHandle phContext, PSecBufferDesc pMessage, ULONG MessageSeqNo, PULONG pfQOP) { + SecurePackage *package; + PCtxtHandle ctxt; + TRACE("%p, %p, %u, %p\n", phContext, pMessage, MessageSeqNo, pfQOP); - return ntlm_DecryptMessage( phContext, pMessage, MessageSeqNo, pfQOP ); + if (!phContext) + return SEC_E_INVALID_HANDLE; + + package = (SecurePackage *)phContext->dwUpper; + + if (!package || !package->provider) + return SEC_E_INVALID_HANDLE; + + if (!package->provider->fnTableW.DecryptMessage) + { + FIXME("Package doesn't support this API\n"); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + ctxt = (PCtxtHandle)phContext->dwLower; + + return package->provider->fnTableW.DecryptMessage(ctxt, pMessage, MessageSeqNo, pfQOP); } static const SecurityFunctionTableA negoTableA = { diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 94b94f48ce..2d0557b200 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -151,7 +151,7 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( ntlm_cred->domain_arg = NULL; ntlm_cred->password = NULL; ntlm_cred->pwlen = 0; - ntlm_cred->no_cached_credentials = 0; + ntlm_cred->no_cached_credentials = (pAuthData == NULL); phCredential->dwUpper = fCredentialUse; phCredential->dwLower = (ULONG_PTR)ntlm_cred; @@ -172,7 +172,7 @@ SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW( ntlm_cred->domain_arg = NULL; ntlm_cred->password = NULL; ntlm_cred->pwlen = 0; - ntlm_cred->no_cached_credentials = 0; + ntlm_cred->no_cached_credentials = (pAuthData == NULL); if(pAuthData != NULL) { diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 973b75c699..e029ea12c4 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -189,24 +189,7 @@ void SECUR32_arc4Cleanup(arc4_info *a4i) DECLSPEC_HIDDEN; #define NTLMSSP_NEGOTIATE_KEY_EXCHANGE 0x40000000 #define NTLMSSP_NEGOTIATE_56 0x80000000 -SECURITY_STATUS SEC_ENTRY ntlm_AcquireCredentialsHandleW(SEC_WCHAR *, SEC_WCHAR *, - ULONG, PLUID, PVOID, SEC_GET_KEY_FN, PVOID, PCredHandle, PTimeStamp) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_InitializeSecurityContextW(PCredHandle, PCtxtHandle, - SEC_WCHAR *, ULONG fContextReq, ULONG, ULONG, PSecBufferDesc, ULONG, PCtxtHandle, - PSecBufferDesc, ULONG *, PTimeStamp) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_AcceptSecurityContext(PCredHandle, PCtxtHandle, PSecBufferDesc, - ULONG, ULONG, PCtxtHandle, PSecBufferDesc, ULONG *, PTimeStamp) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesA(PCtxtHandle, ULONG, void *) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle, ULONG, void *) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_EncryptMessage(PCtxtHandle, ULONG, PSecBufferDesc, ULONG) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_DecryptMessage(PCtxtHandle, PSecBufferDesc, ULONG, PULONG) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_FreeCredentialsHandle(PCredHandle) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_DeleteSecurityContext(PCtxtHandle) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_MakeSignature(PCtxtHandle, ULONG, PSecBufferDesc, ULONG) DECLSPEC_HIDDEN; -SECURITY_STATUS SEC_ENTRY ntlm_VerifySignature(PCtxtHandle, PSecBufferDesc, ULONG, PULONG) DECLSPEC_HIDDEN; - -SecPkgInfoW *ntlm_package_infoW DECLSPEC_HIDDEN; -SecPkgInfoA *ntlm_package_infoA DECLSPEC_HIDDEN; +SECURITY_STATUS SECUR32_makeSecHandle(PSecHandle phSec, SecurePackage *package, PSecHandle realHandle) DECLSPEC_HIDDEN; /* schannel internal interface */ typedef struct schan_imp_session_opaque *schan_imp_session; diff --git a/dlls/secur32/wrapper.c b/dlls/secur32/wrapper.c index dba675422d..85941d0361 100644 --- a/dlls/secur32/wrapper.c +++ b/dlls/secur32/wrapper.c @@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); * and stored in phSec->dwLower). SecHandle is equivalent to both a * CredHandle and a CtxtHandle. */ -static SECURITY_STATUS SECUR32_makeSecHandle(PSecHandle phSec, +SECURITY_STATUS SECUR32_makeSecHandle(PSecHandle phSec, SecurePackage *package, PSecHandle realHandle) { SECURITY_STATUS ret; -- 2.15.1

2 1

[PATCH 12/13] secur32: Remove Kerberos SSPI stubs.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/Makefile.in | 1 - dlls/secur32/kerberos.c | 323 -------------------------------------------- dlls/secur32/secur32.c | 3 +- dlls/secur32/secur32_priv.h | 2 +- 4 files changed, 3 insertions(+), 326 deletions(-) delete mode 100644 dlls/secur32/kerberos.c diff --git a/dlls/secur32/Makefile.in b/dlls/secur32/Makefile.in index 6548521f53..c9acdee457 100644 --- a/dlls/secur32/Makefile.in +++ b/dlls/secur32/Makefile.in @@ -9,7 +9,6 @@ C_SRCS = \ base64_codec.c \ dispatcher.c \ hmac_md5.c \ - kerberos.c \ lsa.c \ negotiate.c \ ntlm.c \ diff --git a/dlls/secur32/kerberos.c b/dlls/secur32/kerberos.c deleted file mode 100644 index 753e9748d2..0000000000 --- a/dlls/secur32/kerberos.c +++ /dev/null @@ -1,323 +0,0 @@ -/* - * Copyright 2005, 2006 Kai Blin - * Copyright 2016 Jacek Caban for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <assert.h> -#include <stdarg.h> -#include <stdio.h> - -#include "windef.h" -#include "winbase.h" -#include "rpc.h" -#include "sspi.h" - -#include "secur32_priv.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(secur32); - -#define KERBEROS_MAX_BUF 12000 - -/*********************************************************************** - * QueryCredentialsAttributesA - */ -static SECURITY_STATUS SEC_ENTRY kerberos_QueryCredentialsAttributesA(CredHandle *phCredential, ULONG ulAttribute, void *pBuffer) -{ - FIXME("(%p %d %p)\n", phCredential, ulAttribute, pBuffer); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * QueryCredentialsAttributesW - */ -static SECURITY_STATUS SEC_ENTRY kerberos_QueryCredentialsAttributesW(CredHandle *phCredential, ULONG ulAttribute, void *pBuffer) -{ - FIXME("(%p, %d, %p)\n", phCredential, ulAttribute, pBuffer); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * AcquireCredentialsHandleW - */ -static SECURITY_STATUS SEC_ENTRY kerberos_AcquireCredentialsHandleW(SEC_WCHAR *pszPrincipal, SEC_WCHAR *pszPackage, ULONG fCredentialUse, - LUID *pLogonID, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pGetKeyArgument, CredHandle *phCredential, TimeStamp *ptsExpiry) -{ - FIXME("(%s %s 0x%08x %p %p %p %p %p %p)\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, - pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); - return SEC_E_NO_CREDENTIALS; -} - -/*********************************************************************** - * AcquireCredentialsHandleA - */ -static SECURITY_STATUS SEC_ENTRY kerberos_AcquireCredentialsHandleA(SEC_CHAR *pszPrincipal, SEC_CHAR *pszPackage, ULONG fCredentialUse, - LUID *pLogonID, void *pAuthData, SEC_GET_KEY_FN pGetKeyFn, void *pGetKeyArgument, CredHandle *phCredential, TimeStamp *ptsExpiry) -{ - FIXME("(%s %s 0x%08x %p %p %p %p %p %p)\n", debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialUse, - pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * InitializeSecurityContextW - */ -static SECURITY_STATUS SEC_ENTRY kerberos_InitializeSecurityContextW(CredHandle *phCredential, CtxtHandle *phContext, SEC_WCHAR *pszTargetName, - ULONG fContextReq, ULONG Reserved1, ULONG TargetDataRep, SecBufferDesc *pInput, ULONG Reserved2, CtxtHandle *phNewContext, - SecBufferDesc *pOutput, ULONG *pfContextAttr, TimeStamp *ptsExpiry) -{ - FIXME("(%p %p %s 0x%08x %d %d %p %d %p %p %p %p)\n", phCredential, phContext, debugstr_w(pszTargetName), - fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * InitializeSecurityContextA - */ -static SECURITY_STATUS SEC_ENTRY kerberos_InitializeSecurityContextA(CredHandle *phCredential, CtxtHandle *phContext, SEC_CHAR *pszTargetName, - ULONG fContextReq, ULONG Reserved1, ULONG TargetDataRep, SecBufferDesc *pInput, ULONG Reserved2, CtxtHandle *phNewContext, - SecBufferDesc *pOutput, ULONG *pfContextAttr, TimeStamp *ptsExpiry) -{ - FIXME("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext, debugstr_a(pszTargetName), fContextReq, - Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * AcceptSecurityContext - */ -static SECURITY_STATUS SEC_ENTRY kerberos_AcceptSecurityContext(CredHandle *phCredential, CtxtHandle *phContext, SecBufferDesc *pInput, - ULONG fContextReq, ULONG TargetDataRep, CtxtHandle *phNewContext, SecBufferDesc *pOutput, ULONG *pfContextAttr, TimeStamp *ptsExpiry) -{ - FIXME("(%p %p %p %d %d %p %p %p %p)\n", phCredential, phContext, pInput, fContextReq, TargetDataRep, phNewContext, pOutput, - pfContextAttr, ptsExpiry); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * CompleteAuthToken - */ -static SECURITY_STATUS SEC_ENTRY kerberos_CompleteAuthToken(CtxtHandle *phContext, SecBufferDesc *pToken) -{ - FIXME("(%p %p)\n", phContext, pToken); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * DeleteSecurityContext - */ -static SECURITY_STATUS SEC_ENTRY kerberos_DeleteSecurityContext(CtxtHandle *phContext) -{ - FIXME("(%p)\n", phContext); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * QueryContextAttributesW - */ -static SECURITY_STATUS SEC_ENTRY kerberos_QueryContextAttributesW(CtxtHandle *phContext, ULONG ulAttribute, void *pBuffer) -{ - FIXME("(%p %d %p)\n", phContext, ulAttribute, pBuffer); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * QueryContextAttributesA - */ -static SECURITY_STATUS SEC_ENTRY kerberos_QueryContextAttributesA(CtxtHandle *phContext, ULONG ulAttribute, void *pBuffer) -{ - FIXME("(%p %d %p)\n", phContext, ulAttribute, pBuffer); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * ImpersonateSecurityContext - */ -static SECURITY_STATUS SEC_ENTRY kerberos_ImpersonateSecurityContext(CtxtHandle *phContext) -{ - FIXME("(%p)\n", phContext); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * RevertSecurityContext - */ -static SECURITY_STATUS SEC_ENTRY kerberos_RevertSecurityContext(CtxtHandle *phContext) -{ - FIXME("(%p)\n", phContext); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * MakeSignature - */ -static SECURITY_STATUS SEC_ENTRY kerberos_MakeSignature(CtxtHandle *phContext, ULONG fQOP, SecBufferDesc *pMessage, ULONG MessageSeqNo) -{ - FIXME("(%p %d %p %d)\n", phContext, fQOP, pMessage, MessageSeqNo); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * VerifySignature - */ -static SECURITY_STATUS SEC_ENTRY kerberos_VerifySignature(CtxtHandle *phContext, SecBufferDesc *pMessage, ULONG MessageSeqNo, PULONG pfQOP) -{ - FIXME("(%p %p %d %p)\n", phContext, pMessage, MessageSeqNo, pfQOP); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * FreeCredentialsHandle - */ -static SECURITY_STATUS SEC_ENTRY kerberos_FreeCredentialsHandle(PCredHandle phCredential) -{ - FIXME("(%p)\n", phCredential); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * EncryptMessage - */ -static SECURITY_STATUS SEC_ENTRY kerberos_EncryptMessage(CtxtHandle *phContext, ULONG fQOP, SecBufferDesc *pMessage, ULONG MessageSeqNo) -{ - FIXME("(%p %d %p %d)\n", phContext, fQOP, pMessage, MessageSeqNo); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -/*********************************************************************** - * DecryptMessage - */ -static SECURITY_STATUS SEC_ENTRY kerberos_DecryptMessage(CtxtHandle *phContext, SecBufferDesc *pMessage, ULONG MessageSeqNo, PULONG pfQOP) -{ - FIXME("(%p %p %d %p)\n", phContext, pMessage, MessageSeqNo, pfQOP); - return SEC_E_UNSUPPORTED_FUNCTION; -} - -static const SecurityFunctionTableA kerberosTableA = { - 1, - NULL, /* EnumerateSecurityPackagesA */ - kerberos_QueryCredentialsAttributesA, /* QueryCredentialsAttributesA */ - kerberos_AcquireCredentialsHandleA, /* AcquireCredentialsHandleA */ - kerberos_FreeCredentialsHandle, /* FreeCredentialsHandle */ - NULL, /* Reserved2 */ - kerberos_InitializeSecurityContextA, /* InitializeSecurityContextA */ - kerberos_AcceptSecurityContext, /* AcceptSecurityContext */ - kerberos_CompleteAuthToken, /* CompleteAuthToken */ - kerberos_DeleteSecurityContext, /* DeleteSecurityContext */ - NULL, /* ApplyControlToken */ - kerberos_QueryContextAttributesA, /* QueryContextAttributesA */ - kerberos_ImpersonateSecurityContext, /* ImpersonateSecurityContext */ - kerberos_RevertSecurityContext, /* RevertSecurityContext */ - kerberos_MakeSignature, /* MakeSignature */ - kerberos_VerifySignature, /* VerifySignature */ - FreeContextBuffer, /* FreeContextBuffer */ - NULL, /* QuerySecurityPackageInfoA */ - NULL, /* Reserved3 */ - NULL, /* Reserved4 */ - NULL, /* ExportSecurityContext */ - NULL, /* ImportSecurityContextA */ - NULL, /* AddCredentialsA */ - NULL, /* Reserved8 */ - NULL, /* QuerySecurityContextToken */ - kerberos_EncryptMessage, /* EncryptMessage */ - kerberos_DecryptMessage, /* DecryptMessage */ - NULL, /* SetContextAttributesA */ -}; - -static const SecurityFunctionTableW kerberosTableW = { - 1, - NULL, /* EnumerateSecurityPackagesW */ - kerberos_QueryCredentialsAttributesW, /* QueryCredentialsAttributesW */ - kerberos_AcquireCredentialsHandleW, /* AcquireCredentialsHandleW */ - kerberos_FreeCredentialsHandle, /* FreeCredentialsHandle */ - NULL, /* Reserved2 */ - kerberos_InitializeSecurityContextW, /* InitializeSecurityContextW */ - kerberos_AcceptSecurityContext, /* AcceptSecurityContext */ - kerberos_CompleteAuthToken, /* CompleteAuthToken */ - kerberos_DeleteSecurityContext, /* DeleteSecurityContext */ - NULL, /* ApplyControlToken */ - kerberos_QueryContextAttributesW, /* QueryContextAttributesW */ - kerberos_ImpersonateSecurityContext, /* ImpersonateSecurityContext */ - kerberos_RevertSecurityContext, /* RevertSecurityContext */ - kerberos_MakeSignature, /* MakeSignature */ - kerberos_VerifySignature, /* VerifySignature */ - FreeContextBuffer, /* FreeContextBuffer */ - NULL, /* QuerySecurityPackageInfoW */ - NULL, /* Reserved3 */ - NULL, /* Reserved4 */ - NULL, /* ExportSecurityContext */ - NULL, /* ImportSecurityContextW */ - NULL, /* AddCredentialsW */ - NULL, /* Reserved8 */ - NULL, /* QuerySecurityContextToken */ - kerberos_EncryptMessage, /* EncryptMessage */ - kerberos_DecryptMessage, /* DecryptMessage */ - NULL, /* SetContextAttributesW */ -}; - -#define KERBEROS_COMMENT \ - {'M','i','c','r','o','s','o','f','t',' ','K','e','r','b','e','r','o','s',' ','V','1','.','0',0} -static CHAR kerberos_comment_A[] = KERBEROS_COMMENT; -static WCHAR kerberos_comment_W[] = KERBEROS_COMMENT; - -#define KERBEROS_NAME {'K','e','r','b','e','r','o','s',0} -static char kerberos_name_A[] = KERBEROS_NAME; -static WCHAR kerberos_name_W[] = KERBEROS_NAME; - -#define CAPS \ - ( SECPKG_FLAG_INTEGRITY \ - | SECPKG_FLAG_PRIVACY \ - | SECPKG_FLAG_TOKEN_ONLY \ - | SECPKG_FLAG_DATAGRAM \ - | SECPKG_FLAG_CONNECTION \ - | SECPKG_FLAG_MULTI_REQUIRED \ - | SECPKG_FLAG_EXTENDED_ERROR \ - | SECPKG_FLAG_IMPERSONATION \ - | SECPKG_FLAG_ACCEPT_WIN32_NAME \ - | SECPKG_FLAG_NEGOTIABLE \ - | SECPKG_FLAG_GSS_COMPATIBLE \ - | SECPKG_FLAG_LOGON \ - | SECPKG_FLAG_MUTUAL_AUTH \ - | SECPKG_FLAG_DELEGATION \ - | SECPKG_FLAG_READONLY_WITH_CHECKSUM \ - | SECPKG_FLAG_RESTRICTED_TOKENS \ - | SECPKG_FLAG_APPCONTAINER_CHECKS) - -static const SecPkgInfoW infoW = { - CAPS, - 1, - RPC_C_AUTHN_GSS_KERBEROS, - KERBEROS_MAX_BUF, - kerberos_name_W, - kerberos_comment_W -}; - -static const SecPkgInfoA infoA = { - CAPS, - 1, - RPC_C_AUTHN_GSS_KERBEROS, - KERBEROS_MAX_BUF, - kerberos_name_A, - kerberos_comment_A -}; - -void SECUR32_initKerberosSP(void) -{ - SecureProvider *provider = SECUR32_addProvider(&kerberosTableA, &kerberosTableW, NULL); - SECUR32_addPackages(provider, 1, &infoA, &infoW); -} diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 1e12f3c543..f7b1ec2d98 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -564,7 +564,8 @@ static void SECUR32_initializeProviders(void) /* First load built-in providers */ SECUR32_initSchannelSP(); SECUR32_initNTLMSP(); - SECUR32_initKerberosSP(); + /* Load SSP/AP packages (Kerberos and others) */ + load_auth_packages(); /* Load the Negotiate provider last so apps stumble over the working NTLM * provider first. Attempting to fix bug #16905 while keeping the * application reported on wine-users on 2006-09-12 working. */ diff --git a/dlls/secur32/secur32_priv.h b/dlls/secur32/secur32_priv.h index 9a60d65788..973b75c699 100644 --- a/dlls/secur32/secur32_priv.h +++ b/dlls/secur32/secur32_priv.h @@ -136,7 +136,7 @@ PSTR SECUR32_AllocMultiByteFromWide(PCWSTR str) DECLSPEC_HIDDEN; void SECUR32_initSchannelSP(void) DECLSPEC_HIDDEN; void SECUR32_initNegotiateSP(void) DECLSPEC_HIDDEN; void SECUR32_initNTLMSP(void) DECLSPEC_HIDDEN; -void SECUR32_initKerberosSP(void) DECLSPEC_HIDDEN; +void load_auth_packages(void) DECLSPEC_HIDDEN; /* Cleanup functions for built-in providers */ void SECUR32_deinitSchannelSP(void) DECLSPEC_HIDDEN; -- 2.15.1

2 1

[PATCH 11/13] secur32: Implement DecryptMessage in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 548aff4576..e8939a2d6e 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -643,6 +643,27 @@ static SECURITY_STATUS WINAPI lsa_EncryptMessage(CtxtHandle *context, ULONG qual return lsa_package->user_api->SealMessage(lsa_context, quality_of_protection, message, message_seq_no); } +static SECURITY_STATUS WINAPI lsa_DecryptMessage(CtxtHandle *context, SecBufferDesc *message, + ULONG message_seq_no, ULONG *quality_of_protection) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %p %u %p)\n", context, message, message_seq_no, quality_of_protection); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->user_api->UnsealMessage) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->UnsealMessage(lsa_context, message, message_seq_no, quality_of_protection); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -671,7 +692,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ lsa_EncryptMessage, - NULL, /* DecryptMessage */ + lsa_DecryptMessage, NULL, /* SetContextAttributesW */ }; @@ -703,7 +724,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ lsa_EncryptMessage, - NULL, /* DecryptMessage */ + lsa_DecryptMessage, NULL, /* SetContextAttributesA */ }; -- 2.15.1

2 1

[PATCH 10/13] secur32: Implement EncryptMessage in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 374f0b1010..548aff4576 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -622,6 +622,27 @@ static SECURITY_STATUS WINAPI lsa_VerifySignature(CtxtHandle *context, SecBuffer return lsa_package->user_api->VerifySignature(lsa_context, message, message_seq_no, quality_of_protection); } +static SECURITY_STATUS WINAPI lsa_EncryptMessage(CtxtHandle *context, ULONG quality_of_protection, + SecBufferDesc *message, ULONG message_seq_no) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %#x %p %u)\n", context, quality_of_protection, message, message_seq_no); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->user_api->SealMessage) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->SealMessage(lsa_context, quality_of_protection, message, message_seq_no); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -649,7 +670,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* AddCredentialsW */ NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ - NULL, /* EncryptMessage */ + lsa_EncryptMessage, NULL, /* DecryptMessage */ NULL, /* SetContextAttributesW */ }; @@ -681,7 +702,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* AddCredentialsA */ NULL, /* Reserved8 */ NULL, /* QuerySecurityContextToken */ - NULL, /* EncryptMessage */ + lsa_EncryptMessage, NULL, /* DecryptMessage */ NULL, /* SetContextAttributesA */ }; -- 2.15.1

2 1

[PATCH 09/13] secur32: Implement VerifySignature in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 4991e6ec32..374f0b1010 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -601,6 +601,27 @@ static SECURITY_STATUS WINAPI lsa_MakeSignature(CtxtHandle *context, ULONG quali return lsa_package->user_api->MakeSignature(lsa_context, quality_of_protection, message, message_seq_no); } +static SECURITY_STATUS WINAPI lsa_VerifySignature(CtxtHandle *context, SecBufferDesc *message, + ULONG message_seq_no, ULONG *quality_of_protection) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %p %u %p)\n", context, message, message_seq_no, quality_of_protection); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->user_api->VerifySignature) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->VerifySignature(lsa_context, message, message_seq_no, quality_of_protection); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -618,7 +639,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ lsa_MakeSignature, - NULL, /* VerifySignature */ + lsa_VerifySignature, NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoW */ NULL, /* Reserved3 */ @@ -650,7 +671,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ lsa_MakeSignature, - NULL, /* VerifySignature */ + lsa_VerifySignature, NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoA */ NULL, /* Reserved3 */ -- 2.15.1

2 1

[PATCH 08/13] secur32: Implement MakeSignature in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index c255bd2b96..4991e6ec32 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -580,6 +580,27 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, U return SEC_E_UNSUPPORTED_FUNCTION; } +static SECURITY_STATUS WINAPI lsa_MakeSignature(CtxtHandle *context, ULONG quality_of_protection, + SecBufferDesc *message, ULONG message_seq_no) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %#x %p %u)\n", context, quality_of_protection, message, message_seq_no); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->user_api->MakeSignature) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->user_api->MakeSignature(lsa_context, quality_of_protection, message, message_seq_no); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -596,7 +617,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_QueryContextAttributesW, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ - NULL, /* MakeSignature */ + lsa_MakeSignature, NULL, /* VerifySignature */ NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoW */ @@ -628,7 +649,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_QueryContextAttributesA, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ - NULL, /* MakeSignature */ + lsa_MakeSignature, NULL, /* VerifySignature */ NULL, /* FreeContextBuffer */ NULL, /* QuerySecurityPackageInfoA */ -- 2.15.1

2 1

[PATCH 07/13] secur32: Implement QueryContextAttributes in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 09eff78bbe..c255bd2b96 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -526,6 +526,60 @@ static SECURITY_STATUS WINAPI lsa_DeleteSecurityContext(CtxtHandle *context) return lsa_package->lsa_api->DeleteContext(lsa_context); } +static SECURITY_STATUS WINAPI lsa_QueryContextAttributesW(CtxtHandle *context, ULONG attribute, void *buffer) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p %d %p\n", context, attribute, buffer); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->SpQueryContextAttributes) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->lsa_api->SpQueryContextAttributes(lsa_context, attribute, buffer); +} + +static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, ULONG attribute, void *buffer) +{ + TRACE("%p %d %p\n", context, attribute, buffer); + + if (!context) return SEC_E_INVALID_HANDLE; + + switch (attribute) + { + case SECPKG_ATTR_SIZES: + return lsa_QueryContextAttributesW( context, attribute, buffer ); + +#define X(x) case (x) : FIXME(#x" stub\n"); break + X(SECPKG_ATTR_ACCESS_TOKEN); + X(SECPKG_ATTR_AUTHORITY); + X(SECPKG_ATTR_DCE_INFO); + X(SECPKG_ATTR_KEY_INFO); + X(SECPKG_ATTR_LIFESPAN); + X(SECPKG_ATTR_NAMES); + X(SECPKG_ATTR_NATIVE_NAMES); + X(SECPKG_ATTR_PACKAGE_INFO); + X(SECPKG_ATTR_PASSWORD_EXPIRY); + X(SECPKG_ATTR_SESSION_KEY); + X(SECPKG_ATTR_STREAM_SIZES); + X(SECPKG_ATTR_TARGET_INFORMATION); + X(SECPKG_ATTR_NEGOTIATION_INFO); +#undef X + default: + FIXME( "unknown attribute %u\n", attribute ); + break; + } + + return SEC_E_UNSUPPORTED_FUNCTION; +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -539,7 +593,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ - NULL, /* QueryContextAttributesW */ + lsa_QueryContextAttributesW, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ NULL, /* MakeSignature */ @@ -571,7 +625,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ - NULL, /* QueryContextAttributesA */ + lsa_QueryContextAttributesA, NULL, /* ImpersonateSecurityContext */ NULL, /* RevertSecurityContext */ NULL, /* MakeSignature */ -- 2.15.1

2 1

[PATCH 06/13] secur32: Implement AcceptSecurityContext in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 6cc55f4b34..09eff78bbe 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -466,6 +466,46 @@ static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextA( return status; } +static SECURITY_STATUS WINAPI lsa_AcceptSecurityContext( + CredHandle *credential, CtxtHandle *context, SecBufferDesc *input, + ULONG context_req, ULONG target_data_rep, CtxtHandle *new_context, + SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status; + struct lsa_package *lsa_package = NULL; + LSA_SEC_HANDLE lsa_credential = 0, lsa_context = 0, new_lsa_context; + BOOLEAN mapped_context; + + TRACE("%p %p %p %#x %#x %p %p %p %p\n", credential, context, input, + context_req, target_data_rep, new_context, output, context_attr, ts_expiry); + + if (credential) + { + lsa_package = (struct lsa_package *)credential->dwUpper; + lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; + } + else if (context) + { + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + } + + if (!lsa_package || !new_context) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->AcceptLsaModeContext) + return SEC_E_UNSUPPORTED_FUNCTION; + + status = lsa_package->lsa_api->AcceptLsaModeContext(lsa_credential, lsa_context, + input, context_req, target_data_rep, &new_lsa_context, output, context_attr, + ts_expiry, &mapped_context, NULL /* FIXME */); + if (status == SEC_E_OK) + { + new_context->dwLower = (ULONG_PTR)new_lsa_context; + new_context->dwUpper = (ULONG_PTR)lsa_package; + } + return status; +} + static SECURITY_STATUS WINAPI lsa_DeleteSecurityContext(CtxtHandle *context) { struct lsa_package *lsa_package; @@ -495,7 +535,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ lsa_InitializeSecurityContextW, - NULL, /* AcceptSecurityContext */ + lsa_AcceptSecurityContext, NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ @@ -527,7 +567,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ lsa_InitializeSecurityContextA, - NULL, /* AcceptSecurityContext */ + lsa_AcceptSecurityContext, NULL, /* CompleteAuthToken */ lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ -- 2.15.1

2 1

[PATCH 05/13] secur32: Implement DeleteSecurityContext in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index fe7ccb418d..6cc55f4b34 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -466,6 +466,26 @@ static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextA( return status; } +static SECURITY_STATUS WINAPI lsa_DeleteSecurityContext(CtxtHandle *context) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_context; + + TRACE("%p\n", context); + + if (!context) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)context->dwUpper; + lsa_context = (LSA_SEC_HANDLE)context->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->DeleteContext) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->lsa_api->DeleteContext(lsa_context); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, @@ -477,7 +497,7 @@ static const SecurityFunctionTableW lsa_sspi_tableW = lsa_InitializeSecurityContextW, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ - NULL, /* DeleteSecurityContext */ + lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ NULL, /* QueryContextAttributesW */ NULL, /* ImpersonateSecurityContext */ @@ -509,7 +529,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = lsa_InitializeSecurityContextA, NULL, /* AcceptSecurityContext */ NULL, /* CompleteAuthToken */ - NULL, /* DeleteSecurityContext */ + lsa_DeleteSecurityContext, NULL, /* ApplyControlToken */ NULL, /* QueryContextAttributesA */ NULL, /* ImpersonateSecurityContext */ -- 2.15.1

2 1

[PATCH 03/13] secur32: Implement FreeCredentialsHandle in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 8e676fd3a9..ad3223c166 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -377,13 +377,32 @@ done: return status; } +static SECURITY_STATUS WINAPI lsa_FreeCredentialsHandle(CredHandle *credential) +{ + struct lsa_package *lsa_package; + LSA_SEC_HANDLE lsa_credential; + + TRACE("%p\n", credential); + if (!credential) return SEC_E_INVALID_HANDLE; + + lsa_package = (struct lsa_package *)credential->dwUpper; + lsa_credential = (LSA_SEC_HANDLE)credential->dwLower; + + if (!lsa_package) return SEC_E_INVALID_HANDLE; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->FreeCredentialsHandle) + return SEC_E_UNSUPPORTED_FUNCTION; + + return lsa_package->lsa_api->FreeCredentialsHandle(lsa_credential); +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, NULL, /* EnumerateSecurityPackagesW */ NULL, /* QueryCredentialsAttributesW */ lsa_AcquireCredentialsHandleW, - NULL, /* FreeCredentialsHandle */ + lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ NULL, /* InitializeSecurityContextW */ NULL, /* AcceptSecurityContext */ @@ -415,7 +434,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = NULL, /* EnumerateSecurityPackagesA */ NULL, /* QueryCredentialsAttributesA */ lsa_AcquireCredentialsHandleA, - NULL, /* FreeCredentialsHandle */ + lsa_FreeCredentialsHandle, NULL, /* Reserved2 */ NULL, /* InitializeSecurityContextA */ NULL, /* AcceptSecurityContext */ -- 2.15.1

2 1

[PATCH 02/13] secur32: Implement AcquireCredentialsHandle in the SSP/AP wrapper.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Partially based on Hans Leidekker's work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 136 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index a683fcb25f..8e676fd3a9 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -243,12 +243,146 @@ static SECPKG_DLL_FUNCTIONS lsa_dll_dispatch = lsa_RegisterCallback }; +static SECURITY_STATUS lsa_lookup_package(SEC_WCHAR *nameW, struct lsa_package **lsa_package) +{ + ULONG i; + UNICODE_STRING package_name, name; + + for (i = 0; i < loaded_packages_count; i++) + { + if (RtlAnsiStringToUnicodeString(&package_name, loaded_packages[i].name, TRUE)) + return SEC_E_INSUFFICIENT_MEMORY; + + RtlInitUnicodeString(&name, nameW); + + if (RtlEqualUnicodeString(&package_name, &name, TRUE)) + { + RtlFreeUnicodeString(&package_name); + *lsa_package = &loaded_packages[i]; + return SEC_E_OK; + } + + RtlFreeUnicodeString(&package_name); + } + + return SEC_E_SECPKG_NOT_FOUND; +} + +static SECURITY_STATUS WINAPI lsa_AcquireCredentialsHandleW( + SEC_WCHAR *principal, SEC_WCHAR *package, ULONG credentials_use, + LUID *logon_id, void *auth_data, SEC_GET_KEY_FN get_key_fn, + void *get_key_arg, CredHandle *credential, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status; + struct lsa_package *lsa_package; + UNICODE_STRING principal_us; + LSA_SEC_HANDLE lsa_credential; + + TRACE("%s %s %#x %p %p %p %p %p\n", debugstr_w(principal), debugstr_w(package), + credentials_use, auth_data, get_key_fn, get_key_arg, credential, ts_expiry); + + if (!credential) return SEC_E_INVALID_HANDLE; + if (!package) return SEC_E_SECPKG_NOT_FOUND; + + status = lsa_lookup_package(package, &lsa_package); + if (status != SEC_E_OK) return status; + + if (!lsa_package->lsa_api || !lsa_package->lsa_api->SpAcquireCredentialsHandle) + return SEC_E_UNSUPPORTED_FUNCTION; + + if (principal) + RtlInitUnicodeString(&principal_us, principal); + + status = lsa_package->lsa_api->SpAcquireCredentialsHandle(principal ? &principal_us : NULL, + credentials_use, logon_id, auth_data, get_key_fn, get_key_arg, &lsa_credential, ts_expiry); + if (status == SEC_E_OK) + { + credential->dwLower = (ULONG_PTR)lsa_credential; + credential->dwUpper = (ULONG_PTR)lsa_package; + } + return status; +} + +static SECURITY_STATUS WINAPI lsa_AcquireCredentialsHandleA( + SEC_CHAR *principal, SEC_CHAR *package, ULONG credentials_use, + LUID *logon_id, void *auth_data, SEC_GET_KEY_FN get_key_fn, + void *get_key_arg, CredHandle *credential, TimeStamp *ts_expiry) +{ + SECURITY_STATUS status = SEC_E_INSUFFICIENT_MEMORY; + int len_user = 0, len_domain = 0, len_passwd = 0; + SEC_WCHAR *principalW = NULL, *packageW = NULL, *user = NULL, *domain = NULL, *passwd = NULL; + SEC_WINNT_AUTH_IDENTITY_W *auth_dataW = NULL; + SEC_WINNT_AUTH_IDENTITY_A *id = NULL; + + TRACE("%s %s %#x %p %p %p %p %p\n", debugstr_a(principal), debugstr_a(package), + credentials_use, auth_data, get_key_fn, get_key_arg, credential, ts_expiry); + + if (principal) + { + int len = MultiByteToWideChar( CP_ACP, 0, principal, -1, NULL, 0 ); + if (!(principalW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, principal, -1, principalW, len ); + } + if (package) + { + int len = MultiByteToWideChar( CP_ACP, 0, package, -1, NULL, 0 ); + if (!(packageW = HeapAlloc( GetProcessHeap(), 0, len * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, package, -1, packageW, len ); + } + if (auth_data) + { + id = (PSEC_WINNT_AUTH_IDENTITY_A)auth_data; + + if (id->Flags == SEC_WINNT_AUTH_IDENTITY_ANSI) + { + if (!(auth_dataW = HeapAlloc( GetProcessHeap(), 0, sizeof(SEC_WINNT_AUTH_IDENTITY_W) ))) goto done; + if (id->UserLength) + { + len_user = MultiByteToWideChar( CP_ACP, 0, (char *)id->User, id->UserLength, NULL, 0 ); + if (!(user = HeapAlloc( GetProcessHeap(), 0, len_user * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (char *)id->User, id->UserLength, user, len_user ); + } + if (id->DomainLength) + { + len_domain = MultiByteToWideChar( CP_ACP, 0, (char *)id->Domain, id->DomainLength, NULL, 0 ); + if (!(domain = HeapAlloc( GetProcessHeap(), 0, len_domain * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (char *)id->Domain, id->DomainLength, domain, len_domain ); + } + if (id->PasswordLength) + { + len_passwd = MultiByteToWideChar( CP_ACP, 0, (char *)id->Password, id->PasswordLength, NULL, 0 ); + if (!(passwd = HeapAlloc( GetProcessHeap(), 0, len_passwd * sizeof(SEC_WCHAR) ))) goto done; + MultiByteToWideChar( CP_ACP, 0, (char *)id->Password, id->PasswordLength, passwd, len_passwd ); + } + auth_dataW->Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE; + auth_dataW->User = user; + auth_dataW->UserLength = len_user; + auth_dataW->Domain = domain; + auth_dataW->DomainLength = len_domain; + auth_dataW->Password = passwd; + auth_dataW->PasswordLength = len_passwd; + } + else auth_dataW = (PSEC_WINNT_AUTH_IDENTITY_W)auth_data; + } + + status = lsa_AcquireCredentialsHandleW( principalW, packageW, credentials_use, logon_id, auth_dataW, get_key_fn, + get_key_arg, credential, ts_expiry ); +done: + if (auth_dataW != (SEC_WINNT_AUTH_IDENTITY_W *)id) HeapFree( GetProcessHeap(), 0, auth_dataW ); + HeapFree( GetProcessHeap(), 0, packageW ); + HeapFree( GetProcessHeap(), 0, principalW ); + HeapFree( GetProcessHeap(), 0, user ); + HeapFree( GetProcessHeap(), 0, domain ); + HeapFree( GetProcessHeap(), 0, passwd ); + return status; +} + static const SecurityFunctionTableW lsa_sspi_tableW = { 1, NULL, /* EnumerateSecurityPackagesW */ NULL, /* QueryCredentialsAttributesW */ - NULL, /* AcquireCredentialsHandleW */ + lsa_AcquireCredentialsHandleW, NULL, /* FreeCredentialsHandle */ NULL, /* Reserved2 */ NULL, /* InitializeSecurityContextW */ @@ -280,7 +414,7 @@ static const SecurityFunctionTableA lsa_sspi_tableA = 1, NULL, /* EnumerateSecurityPackagesA */ NULL, /* QueryCredentialsAttributesA */ - NULL, /* AcquireCredentialsHandleA */ + lsa_AcquireCredentialsHandleA, NULL, /* FreeCredentialsHandle */ NULL, /* Reserved2 */ NULL, /* InitializeSecurityContextA */ -- 2.15.1

2 1

[PATCH 01/13] secur32: Add support for loading SSP/AP dll as an SSPI provider.
by Dmitry Timoshkov 31 Jan '18

31 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/lsa.c | 154 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 135 insertions(+), 19 deletions(-) diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index 1028c18e71..a683fcb25f 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2004 Juan Lang * Copyright (C) 2007 Kai Blin - * Copyright (C) 2017 Dmitry Timoshkov + * Copyright (C) 2017,2018 Dmitry Timoshkov * * Local Security Authority functions, as far as secur32 has them. * @@ -31,10 +31,12 @@ #include "ntsecapi.h" #include "ntsecpkg.h" #include "winternl.h" +#include "rpc.h" +#include "secur32_priv.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(lsa); +WINE_DEFAULT_DEBUG_CHANNEL(secur32); #define LSA_MAGIC ('L' << 24 | 'S' << 16 | 'A' << 8 | ' ') @@ -42,10 +44,10 @@ struct lsa_package { ULONG package_id; HMODULE mod; - ULONG version; LSA_STRING *name; - SECPKG_FUNCTION_TABLE *api; - ULONG table_count; + ULONG lsa_api_version, lsa_table_count, user_api_version, user_table_count; + SECPKG_FUNCTION_TABLE *lsa_api; + SECPKG_USER_FUNCTION_TABLE *user_api; }; static struct lsa_package *loaded_packages; @@ -69,8 +71,8 @@ NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE lsa_handle, ULONG package_id { if (loaded_packages[i].package_id == package_id) { - if (loaded_packages[i].api->CallPackageUntrusted) - return loaded_packages[i].api->CallPackageUntrusted(NULL /* FIXME*/, + if (loaded_packages[i].lsa_api->CallPackageUntrusted) + return loaded_packages[i].lsa_api->CallPackageUntrusted(NULL /* FIXME*/, in_buffer, NULL, in_buffer_length, out_buffer, out_buffer_length, status); return SEC_E_UNSUPPORTED_FUNCTION; @@ -228,6 +230,83 @@ static LSA_DISPATCH_TABLE lsa_dispatch = lsa_CopyFromClientBuffer }; +static NTSTATUS NTAPI lsa_RegisterCallback(ULONG callback_id, PLSA_CALLBACK_FUNCTION callback) +{ + FIXME("%u,%p: stub\n", callback_id, callback); + return STATUS_NOT_IMPLEMENTED; +} + +static SECPKG_DLL_FUNCTIONS lsa_dll_dispatch = +{ + lsa_AllocateLsaHeap, + lsa_FreeLsaHeap, + lsa_RegisterCallback +}; + +static const SecurityFunctionTableW lsa_sspi_tableW = +{ + 1, + NULL, /* EnumerateSecurityPackagesW */ + NULL, /* QueryCredentialsAttributesW */ + NULL, /* AcquireCredentialsHandleW */ + NULL, /* FreeCredentialsHandle */ + NULL, /* Reserved2 */ + NULL, /* InitializeSecurityContextW */ + NULL, /* AcceptSecurityContext */ + NULL, /* CompleteAuthToken */ + NULL, /* DeleteSecurityContext */ + NULL, /* ApplyControlToken */ + NULL, /* QueryContextAttributesW */ + NULL, /* ImpersonateSecurityContext */ + NULL, /* RevertSecurityContext */ + NULL, /* MakeSignature */ + NULL, /* VerifySignature */ + NULL, /* FreeContextBuffer */ + NULL, /* QuerySecurityPackageInfoW */ + NULL, /* Reserved3 */ + NULL, /* Reserved4 */ + NULL, /* ExportSecurityContext */ + NULL, /* ImportSecurityContextW */ + NULL, /* AddCredentialsW */ + NULL, /* Reserved8 */ + NULL, /* QuerySecurityContextToken */ + NULL, /* EncryptMessage */ + NULL, /* DecryptMessage */ + NULL, /* SetContextAttributesW */ +}; + +static const SecurityFunctionTableA lsa_sspi_tableA = +{ + 1, + NULL, /* EnumerateSecurityPackagesA */ + NULL, /* QueryCredentialsAttributesA */ + NULL, /* AcquireCredentialsHandleA */ + NULL, /* FreeCredentialsHandle */ + NULL, /* Reserved2 */ + NULL, /* InitializeSecurityContextA */ + NULL, /* AcceptSecurityContext */ + NULL, /* CompleteAuthToken */ + NULL, /* DeleteSecurityContext */ + NULL, /* ApplyControlToken */ + NULL, /* QueryContextAttributesA */ + NULL, /* ImpersonateSecurityContext */ + NULL, /* RevertSecurityContext */ + NULL, /* MakeSignature */ + NULL, /* VerifySignature */ + NULL, /* FreeContextBuffer */ + NULL, /* QuerySecurityPackageInfoA */ + NULL, /* Reserved3 */ + NULL, /* Reserved4 */ + NULL, /* ExportSecurityContext */ + NULL, /* ImportSecurityContextA */ + NULL, /* AddCredentialsA */ + NULL, /* Reserved8 */ + NULL, /* QuerySecurityContextToken */ + NULL, /* EncryptMessage */ + NULL, /* DecryptMessage */ + NULL, /* SetContextAttributesA */ +}; + static void add_package(struct lsa_package *package) { struct lsa_package *new_loaded_packages; @@ -247,26 +326,41 @@ static void add_package(struct lsa_package *package) static BOOL load_package(const WCHAR *name, struct lsa_package *package, ULONG package_id) { - NTSTATUS (NTAPI *lsa_mode_init)(ULONG,PULONG,PSECPKG_FUNCTION_TABLE *, PULONG); + NTSTATUS (NTAPI *pSpLsaModeInitialize)(ULONG, PULONG, PSECPKG_FUNCTION_TABLE *, PULONG); + NTSTATUS (NTAPI *pSpUserModeInitialize)(ULONG, PULONG, PSECPKG_USER_FUNCTION_TABLE *, PULONG); + + memset(package, 0, sizeof(*package)); package->mod = LoadLibraryW(name); if (!package->mod) return FALSE; - lsa_mode_init = (void *)GetProcAddress(package->mod, "SpLsaModeInitialize"); - if (lsa_mode_init) + pSpLsaModeInitialize = (void *)GetProcAddress(package->mod, "SpLsaModeInitialize"); + if (pSpLsaModeInitialize) { NTSTATUS status; - status = lsa_mode_init(SECPKG_INTERFACE_VERSION, &package->version, &package->api, &package->table_count); + status = pSpLsaModeInitialize(SECPKG_INTERFACE_VERSION, &package->lsa_api_version, &package->lsa_api, &package->lsa_table_count); if (status == STATUS_SUCCESS) { - status = package->api->InitializePackage(package_id, &lsa_dispatch, NULL, NULL, &package->name); + status = package->lsa_api->InitializePackage(package_id, &lsa_dispatch, NULL, NULL, &package->name); if (status == STATUS_SUCCESS) { TRACE("%s => %p, name %s, version %#x, api table %p, table count %u\n", debugstr_w(name), package->mod, debugstr_an(package->name->Buffer, package->name->Length), - package->version, package->api, package->table_count); + package->lsa_api_version, package->lsa_api, package->lsa_table_count); package->package_id = package_id; + + status = package->lsa_api->Initialize(package_id, NULL /* FIXME: params */, NULL); + if (status == STATUS_SUCCESS) + { + pSpUserModeInitialize = (void *)GetProcAddress(package->mod, "SpUserModeInitialize"); + if (pSpUserModeInitialize) + { + status = pSpUserModeInitialize(SECPKG_INTERFACE_VERSION, &package->user_api_version, &package->user_api, &package->user_table_count); + if (status == STATUS_SUCCESS) + package->user_api->InstanceInit(SECPKG_INTERFACE_VERSION, &lsa_dll_dispatch, NULL); + } + } return TRUE; } } @@ -278,16 +372,17 @@ static BOOL load_package(const WCHAR *name, struct lsa_package *package, ULONG p #define MAX_SERVICE_NAME 260 -static BOOL WINAPI load_auth_packages(INIT_ONCE *init_once, void *param, void **context) +void load_auth_packages(void) { static const WCHAR LSA_KEY[] = { 'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', 'C','o','n','t','r','o','l','\\','L','s','a',0 }; DWORD err, i; HKEY root; + SecureProvider *provider; err = RegOpenKeyExW(HKEY_LOCAL_MACHINE, LSA_KEY, 0, KEY_READ, &root); - if (err != ERROR_SUCCESS) return FALSE; + if (err != ERROR_SUCCESS) return; i = 0; for (;;) @@ -310,19 +405,40 @@ static BOOL WINAPI load_auth_packages(INIT_ONCE *init_once, void *param, void ** RegCloseKey(root); - return TRUE; + if (!loaded_packages_count) return; + + provider = SECUR32_addProvider(&lsa_sspi_tableA, &lsa_sspi_tableW, NULL); + if (!provider) + { + ERR("Failed to add SSP/AP provider\n"); + return; + } + + for (i = 0; i < loaded_packages_count; i++) + { + SecPkgInfoW *info; + + info = HeapAlloc(GetProcessHeap(), 0, loaded_packages[i].lsa_table_count * sizeof(*info)); + if (info) + { + NTSTATUS status; + + status = loaded_packages[i].lsa_api->GetInfo(info); + if (status == STATUS_SUCCESS) + SECUR32_addPackages(provider, loaded_packages[i].lsa_table_count, NULL, info); + + HeapFree(GetProcessHeap(), 0, info); + } + } } NTSTATUS WINAPI LsaLookupAuthenticationPackage(HANDLE lsa_handle, PLSA_STRING package_name, PULONG package_id) { - static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; ULONG i; TRACE("%p %p %p\n", lsa_handle, package_name, package_id); - InitOnceExecuteOnce(&init_once, load_auth_packages, NULL, NULL); - for (i = 0; i < loaded_packages_count; i++) { if (!RtlCompareString(loaded_packages[i].name, package_name, FALSE)) -- 2.15.1

2 1

[PATCH] ole32: Return error from IStream Clone.
by Daniel Lehman 31 Jan '18

31 Jan '18

2 1

[PATCH] ole32/tests: Move stream creation to test function that's using it
by Nikolay Sivov 31 Jan '18

31 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/hglobalstream.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index e20d81b8b0..6a0498aa60 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -43,16 +43,20 @@ do { \ } \ } while(0) -static void test_streamonhglobal(IStream *pStream) +static void test_streamonhglobal(void) { const char data[] = "Test String"; ULARGE_INTEGER ull; + IStream *pStream; LARGE_INTEGER ll; char buffer[128]; ULONG read; STATSTG statstg; HRESULT hr; + hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); + ull.QuadPart = sizeof(data); hr = IStream_SetSize(pStream, ull); ok_ole_success(hr, "IStream_SetSize"); @@ -293,6 +297,8 @@ static void test_streamonhglobal(IStream *pStream) hr = IStream_SetSize(pStream, ull); ok(hr == E_OUTOFMEMORY || broken(hr == S_OK), /* win9x */ "IStream_SetSize with large size should have returned E_OUTOFMEMORY instead of 0x%08x\n", hr); + + IStream_Release(pStream); } static HRESULT WINAPI TestStream_QueryInterface(IStream *iface, REFIID riid, void **ppv) @@ -510,14 +516,7 @@ static void test_freed_hglobal(void) START_TEST(hglobalstream) { - HRESULT hr; - IStream *pStream; - - hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); - ok_ole_success(hr, "CreateStreamOnHGlobal"); - - test_streamonhglobal(pStream); - IStream_Release(pStream); + test_streamonhglobal(); test_copyto(); test_freed_hglobal(); } -- 2.15.1

2 1

[PATCH] ole32/tests: Add a trailing '\n' to ok() calls.
by Francois Gouget 31 Jan '18

31 Jan '18

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ole32/tests/compobj.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index aef10376d1c..f1e0134731c 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2795,7 +2795,7 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) ok(hr == S_OK, "CoInitializeEx failed with error 0x%08x\n", hr); hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "CreateStreamOnHGlobal failed: %08x", hr); + ok(hr == S_OK, "CreateStreamOnHGlobal failed: %08x\n", hr); hr = CoMarshalInterface(stream, &IID_IUnknown, &Test_Unknown, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); ok(hr == S_OK, "CoMarshalInterface should have returned S_OK instead of 0x%08x\n", hr); @@ -2806,7 +2806,7 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) PostThreadMessageW(GetCurrentThreadId(), WM_QUIT, 0, 0); hr = CoRegisterMessageFilter(&MessageFilter, NULL); - ok(hr == S_OK, "CoRegisterMessageFilter failed: %08x", hr); + ok(hr == S_OK, "CoRegisterMessageFilter failed: %08x\n", hr); thread = CreateThread(NULL, 0, cowait_unmarshal_thread, stream, 0, &tid); ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); @@ -2817,7 +2817,7 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) CloseHandle(thread); hr = CoRegisterMessageFilter(NULL, NULL); - ok(hr == S_OK, "CoRegisterMessageFilter failed: %08x", hr); + ok(hr == S_OK, "CoRegisterMessageFilter failed: %08x\n", hr); IStream_Release(stream); -- 2.15.1

2 1

[PATCH] gdi32/tests: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 31 Jan '18

31 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdi32/tests/font.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 117a14f153..70e44f3822 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -28,6 +28,7 @@ #include "winuser.h" #include "winnls.h" +#include "wine/heap.h" #include "wine/test.h" static inline BOOL match_off_by_n(int a, int b, unsigned int n) @@ -109,22 +110,6 @@ static void init(void) system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); } -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - if (!mem) return heap_alloc(size); - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static INT CALLBACK is_truetype_font_installed_proc(const LOGFONTA *elf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) { if (type != TRUETYPE_FONTTYPE) return 1; -- 2.14.3

2 1

[PATCH] dwrite/tests: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 31 Jan '18

31 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwrite/tests/font.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 24e8e73b2c..c226dba19f 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -30,6 +30,7 @@ #include "initguid.h" #include "d2d1.h" +#include "wine/heap.h" #include "wine/test.h" #define MS_CMAP_TAG DWRITE_MAKE_OPENTYPE_TAG('c','m','a','p') @@ -121,16 +122,6 @@ static void _expect_ref_broken(IUnknown* obj, ULONG ref, ULONG brokenref, int li ok_(__FILE__,line)(rc == ref || broken(rc == brokenref), "expected refcount %d, got %d\n", ref, rc); } -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static const WCHAR test_fontfile[] = {'w','i','n','e','_','t','e','s','t','_','f','o','n','t','.','t','t','f',0}; static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; static const WCHAR arialW[] = {'A','r','i','a','l',0}; -- 2.14.3

2 1

[PATCH] d3dx9: Added D3DXCreateKeyframedAnimationSet stub
by Alistair Leslie-Hughes 31 Jan '18

31 Jan '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/animation.c | 12 ++++++++++++ dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- 21 files changed, 32 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec index d816fd8..0b9626f 100644 --- a/dlls/d3dx9_24/d3dx9_24.spec +++ b/dlls/d3dx9_24/d3dx9_24.spec @@ -64,7 +64,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec index e15230d..a957005 100644 --- a/dlls/d3dx9_25/d3dx9_25.spec +++ b/dlls/d3dx9_25/d3dx9_25.spec @@ -64,7 +64,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec index ac25d06..1caa9ea 100644 --- a/dlls/d3dx9_26/d3dx9_26.spec +++ b/dlls/d3dx9_26/d3dx9_26.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec index ac25d06..1caa9ea 100644 --- a/dlls/d3dx9_27/d3dx9_27.spec +++ b/dlls/d3dx9_27/d3dx9_27.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec index a6378d8..8b46ac9 100644 --- a/dlls/d3dx9_28/d3dx9_28.spec +++ b/dlls/d3dx9_28/d3dx9_28.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec index a6378d8..8b46ac9 100644 --- a/dlls/d3dx9_29/d3dx9_29.spec +++ b/dlls/d3dx9_29/d3dx9_29.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec index f122583..d4eee10 100644 --- a/dlls/d3dx9_30/d3dx9_30.spec +++ b/dlls/d3dx9_30/d3dx9_30.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec index a0a74a5..b6ba5a7 100644 --- a/dlls/d3dx9_31/d3dx9_31.spec +++ b/dlls/d3dx9_31/d3dx9_31.spec @@ -67,7 +67,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec index e4e4fc6..983dabb 100644 --- a/dlls/d3dx9_32/d3dx9_32.spec +++ b/dlls/d3dx9_32/d3dx9_32.spec @@ -67,7 +67,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec index e4e4fc6..983dabb 100644 --- a/dlls/d3dx9_33/d3dx9_33.spec +++ b/dlls/d3dx9_33/d3dx9_33.spec @@ -67,7 +67,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec index e4e4fc6..983dabb 100644 --- a/dlls/d3dx9_34/d3dx9_34.spec +++ b/dlls/d3dx9_34/d3dx9_34.spec @@ -67,7 +67,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec index e4e4fc6..983dabb 100644 --- a/dlls/d3dx9_35/d3dx9_35.spec +++ b/dlls/d3dx9_35/d3dx9_35.spec @@ -67,7 +67,7 @@ @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_36/animation.c b/dlls/d3dx9_36/animation.c index 818bd7a..420ecc6 100644 --- a/dlls/d3dx9_36/animation.c +++ b/dlls/d3dx9_36/animation.c @@ -469,3 +469,15 @@ HRESULT WINAPI D3DXCreateAnimationController(UINT max_outputs, UINT max_sets, return D3D_OK; } + +HRESULT WINAPI D3DXCreateKeyframedAnimationSet(const char *name, double ticks_per_second, + D3DXPLAYBACK_TYPE playback_type, UINT animation_count, UINT callback_key_count, + const D3DXKEY_CALLBACK *callback_keys, ID3DXKeyframedAnimationSet **animation_set) +{ + FIXME("name %s, ticks_per_second %.16e, playback_type %u, animation_count %u, " + "callback_key_count %u, callback_keys %p, animation_set %p stub.\n", + debugstr_a(name), ticks_per_second, playback_type, animation_count, + callback_key_count, callback_keys, animation_set); + + return E_NOTIMPL; +} diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 0d9fdab..80c6ba5 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) @ stdcall D3DXCreateFragmentLinkerEx(ptr long long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec index 0d9fdab..80c6ba5 100644 --- a/dlls/d3dx9_37/d3dx9_37.spec +++ b/dlls/d3dx9_37/d3dx9_37.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) @ stdcall D3DXCreateFragmentLinkerEx(ptr long long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec index 0d9fdab..80c6ba5 100644 --- a/dlls/d3dx9_38/d3dx9_38.spec +++ b/dlls/d3dx9_38/d3dx9_38.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) @ stdcall D3DXCreateFragmentLinkerEx(ptr long long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec index 0d9fdab..80c6ba5 100644 --- a/dlls/d3dx9_39/d3dx9_39.spec +++ b/dlls/d3dx9_39/d3dx9_39.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) @ stdcall D3DXCreateFragmentLinkerEx(ptr long long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec index 0d9fdab..80c6ba5 100644 --- a/dlls/d3dx9_40/d3dx9_40.spec +++ b/dlls/d3dx9_40/d3dx9_40.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) @ stdcall D3DXCreateFragmentLinkerEx(ptr long long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec index 0d9fdab..80c6ba5 100644 --- a/dlls/d3dx9_41/d3dx9_41.spec +++ b/dlls/d3dx9_41/d3dx9_41.spec @@ -68,7 +68,7 @@ @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) @ stdcall D3DXCreateFragmentLinker(ptr long ptr) @ stdcall D3DXCreateFragmentLinkerEx(ptr long long ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec index 086d0b5..ca07eda 100644 --- a/dlls/d3dx9_42/d3dx9_42.spec +++ b/dlls/d3dx9_42/d3dx9_42.spec @@ -66,7 +66,7 @@ @ stdcall D3DXCreateFontIndirectA(ptr ptr ptr) @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec index 086d0b5..ca07eda 100644 --- a/dlls/d3dx9_43/d3dx9_43.spec +++ b/dlls/d3dx9_43/d3dx9_43.spec @@ -66,7 +66,7 @@ @ stdcall D3DXCreateFontIndirectA(ptr ptr ptr) @ stdcall D3DXCreateFontIndirectW(ptr ptr ptr) @ stdcall D3DXCreateFontW(ptr long long long long long long long long long wstr ptr) -@ stub D3DXCreateKeyframedAnimationSet(ptr long long long long ptr ptr) +@ stdcall D3DXCreateKeyframedAnimationSet(str long long long long ptr ptr) @ stdcall D3DXCreateLine(ptr ptr) @ stdcall D3DXCreateMatrixStack(long ptr) @ stdcall D3DXCreateMesh(long long long ptr ptr ptr) -- 1.9.1

2 1

[PATCH 1/2] user32: Kill focus before minimizing a window.
by Zebediah Figura 31 Jan '18

31 Jan '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/win.c | 31 ++++++++++++++++++++++++++++++- dlls/user32/winpos.c | 8 ++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d95b831..e134d54 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3113,7 +3113,6 @@ todo_wine ShowWindow(hwnd, SW_SHOWMINIMIZED); ok( GetActiveWindow() == hwnd, "parent window %p should be active\n", hwnd); ok( GetFocus() != child, "Focus should not be on child %p\n", child ); -todo_wine ok( GetFocus() != hwnd, "Focus should not be on parent %p\n", hwnd ); old_wnd_proc = (WNDPROC)SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)set_focus_on_activate_proc); ShowWindow(hwnd, SW_RESTORE); @@ -10273,6 +10272,13 @@ static void test_minimize_window(HWND hwndMain) ShowWindow(hwnd2, SW_RESTORE); check_active_state(hwnd2, hwnd2, hwnd2); + /* try SW_SHOWMINIMIZED */ + ShowWindow(hwnd2, SW_SHOWMINIMIZED); + check_active_state(hwnd2, hwnd2, 0); + + ShowWindow(hwnd2, SW_RESTORE); + check_active_state(hwnd2, hwnd2, hwnd2); + /* hide a non-active window */ ShowWindow(hwnd, SW_MINIMIZE); check_active_state(hwnd2, hwnd2, hwnd2); @@ -10316,6 +10322,11 @@ static void test_minimize_window(HWND hwndMain) todo_wine check_active_state(hwnd2, hwnd2, hwnd2); + /* with SW_SHOWMINIMIZED */ + ShowWindow(hwnd3, SW_RESTORE); + ShowWindow(hwnd3, SW_SHOWMINIMIZED); + check_active_state(hwnd3, hwnd3, 0); + /* hide an owner window */ ShowWindow(hwnd, SW_RESTORE); ShowWindow(hwnd2, SW_RESTORE); @@ -10325,6 +10336,24 @@ static void test_minimize_window(HWND hwndMain) check_active_state(hwnd2, hwnd2, hwnd2); DestroyWindow(hwnd3); + + /* test a child window - focus should be yielded back to the parent */ + ShowWindow(hwnd, SW_RESTORE); + hwnd3 = CreateWindowExA(0, "MainWindowClass", "Child window 3", WS_CHILD|WS_VISIBLE, + 100, 100, 200, 200, hwnd, 0, GetModuleHandleA(NULL), NULL); + SetFocus(hwnd3); + check_active_state(hwnd, hwnd, hwnd3); + ShowWindow(hwnd3, SW_MINIMIZE); + check_active_state(hwnd, hwnd, hwnd); + + /* with SW_SHOWMINIMIZED */ + ShowWindow(hwnd3, SW_RESTORE); + SetFocus(hwnd3); + check_active_state(hwnd, hwnd, hwnd3); + ShowWindow(hwnd3, SW_SHOWMINIMIZED); + check_active_state(hwnd, hwnd, hwnd); + + DestroyWindow(hwnd3); DestroyWindow(hwnd2); DestroyWindow(hwnd); diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 5579de4..f68227a 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -928,6 +928,14 @@ UINT WINPOS_MinMaximize( HWND hwnd, UINT cmd, LPRECT rect ) if (IsZoomed( hwnd )) win_set_flags( hwnd, WIN_RESTORE_MAX, 0 ); else win_set_flags( hwnd, 0, WIN_RESTORE_MAX ); + if (GetFocus() == hwnd) + { + if (GetWindowLongW(hwnd, GWL_STYLE) & WS_CHILD) + SetFocus(GetAncestor(hwnd, GA_PARENT)); + else + SetFocus(0); + } + old_style = WIN_SetStyle( hwnd, WS_MINIMIZE, WS_MAXIMIZE ); wpl.ptMinPosition = WINPOS_GetMinimizedPos( hwnd, wpl.ptMinPosition ); -- 2.7.4

2 3

[PATCH] iccvid: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 30 Jan '18

30 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/iccvid/iccvid.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index e5d514703e..89d282ba78 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -51,6 +51,7 @@ #include "iccvid_private.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(iccvid); @@ -81,16 +82,6 @@ typedef struct _ICCVID_Info cinepak_info *cvinfo; } ICCVID_Info; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - /* ------------------------------------------------------------------------ */ static unsigned char *in_buffer, uiclip[1024], *uiclp = NULL; -- 2.14.3

1 0

[PATCH] hhctrl.ocx: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 30 Jan '18

30 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/hhctrl.ocx/hhctrl.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 5318b5f06f..b358f54378 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -40,6 +40,7 @@ #include "wine/itss.h" #include "wine/unicode.h" +#include "wine/heap.h" #include "wine/list.h" #define WB_GOBACK 0 @@ -244,31 +245,11 @@ HHInfo *find_window(const WCHAR *window) DECLSPEC_HIDDEN; /* memory allocation functions */ -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t len) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); -} - -static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, len); -} - static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t len) { return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len); } -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR strdupW(LPCWSTR str) { LPWSTR ret; -- 2.14.3

1 0

[PATCH] dnsapi: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 30 Jan '18

30 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dnsapi/dnsapi.h | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index 8a025211af..0b679731e9 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -22,20 +22,7 @@ # error You must include config.h to use this header #endif -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} +#include "wine/heap.h" static inline LPSTR dns_strdup_a( LPCSTR src ) { -- 2.14.3

1 0

[PATCH] explorerframe: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 30 Jan '18

30 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/explorerframe/explorerframe_main.h | 10 ---------- dlls/explorerframe/taskbarlist.c | 1 + 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/explorerframe/explorerframe_main.h b/dlls/explorerframe/explorerframe_main.h index ec8b3634c4..14e551c48d 100644 --- a/dlls/explorerframe/explorerframe_main.h +++ b/dlls/explorerframe/explorerframe_main.h @@ -34,14 +34,4 @@ static inline void EFRAME_UnlockModule(void) { InterlockedDecrement( &EFRAME_ref HRESULT NamespaceTreeControl_Constructor(IUnknown *pUnkOuter, REFIID riid, void **ppv) DECLSPEC_HIDDEN; HRESULT TaskbarList_Constructor(IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - #endif /* __WINE_EXPLORERFRAME_H */ diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index 26a2c1a487..a50f8a97d3 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -21,6 +21,7 @@ #include "explorerframe_main.h" #include "wine/debug.h" +#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(explorerframe); -- 2.14.3

1 0

[PATCH 1/5] wined3d: Enable the multi-threaded command stream by default.
by Henri Verbeet 30 Jan '18

30 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/wined3d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 28a34a7..6c23d0b 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -72,7 +72,7 @@ static CRITICAL_SECTION wined3d_wndproc_cs = {&wined3d_wndproc_cs_debug, -1, 0, * where appropriate. */ struct wined3d_settings wined3d_settings = { - FALSE, /* No multithreaded CS by default. */ + TRUE, /* Multithreaded CS by default. */ FALSE, /* explicit_gl_version */ MAKEDWORD_VERSION(1, 0), /* Default to legacy OpenGL */ TRUE, /* Use of GLSL enabled by default */ -- 2.1.4

3 2

[PATCH] kernel32: add QueryProcessCycleTime stub (try 2)
by Austin English 30 Jan '18

30 Jan '18

Try 2: remove accidental double pointer (Thanks Nikolay) Signed-off-by: Austin English <austinenglish(a)gmail.com> --- .../api-ms-win-core-realtime-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/time.c | 12 ++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec b/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec index 9c70db1f6f..0def2d7b3a 100644 --- a/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec +++ b/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec @@ -1,5 +1,5 @@ @ stub QueryIdleProcessorCycleTime @ stub QueryIdleProcessorCycleTimeEx -@ stub QueryProcessCycleTime +@ stdcall QueryProcessCycleTime(long ptr) kernel32.QueryProcessCycleTime @ stdcall QueryThreadCycleTime(long ptr) kernel32.QueryThreadCycleTime @ stdcall QueryUnbiasedInterruptTime(ptr) kernel32.QueryUnbiasedInterruptTime diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2c719d437e..5ce637233a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1171,7 +1171,7 @@ @ stdcall QueryPerformanceCounter(ptr) @ stdcall QueryPerformanceFrequency(ptr) # @ stub QueryProcessAffinityUpdateMode -# @ stub QueryProcessCycleTime +@ stdcall QueryProcessCycleTime(long ptr) @ stdcall QueryThreadCycleTime(long ptr) # @ stub QueryThreadProfiling # @ stub QueryThreadpoolStackInformation diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index fbe58118fd..b0b866967c 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1408,6 +1408,18 @@ DWORD WINAPI GetDynamicTimeZoneInformation(DYNAMIC_TIME_ZONE_INFORMATION *tzinfo } /*********************************************************************** + * QueryProcessCycleTime (KERNEL32.@) + */ +BOOL WINAPI QueryProcessCycleTime(HANDLE process, PULONG64 cycle) +{ + static int once; + if (!once++) + FIXME("(%p,%p): stub!\n", process, cycle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * QueryThreadCycleTime (KERNEL32.@) */ BOOL WINAPI QueryThreadCycleTime(HANDLE thread, PULONG64 cycle) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index b9eb4fcf87..ca33bfdce7 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1206,7 +1206,7 @@ @ stdcall QueryPerformanceCounter(ptr) kernel32.QueryPerformanceCounter @ stdcall QueryPerformanceFrequency(ptr) kernel32.QueryPerformanceFrequency @ stub QueryProcessAffinityUpdateMode -# @ stub QueryProcessCycleTime +@ stdcall QueryProcessCycleTime(long ptr) kernel32.QueryProcessCycleTime # @ stub QueryProtectedPolicy @ stub QuerySecurityAccessMask # @ stub QueryStateAtomValueInfo -- 2.13.6

1 0

[PATCH 1/2] include: Add CertRegisterSystemStore and CertUnregisterSystemStore
by Alex Henrie 30 Jan '18

30 Jan '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/crypt32/store.c | 2 +- include/wincrypt.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 91a3cbc0dc..bc4ebde5f6 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1414,7 +1414,7 @@ BOOL WINAPI CertRegisterSystemStore(const void *pvSystemStore, DWORD dwFlags, return FALSE; } -BOOL WINAPI CertUnregisterSystemStore(void *pvSystemStore, DWORD dwFlags) +BOOL WINAPI CertUnregisterSystemStore(const void *pvSystemStore, DWORD dwFlags) { HCERTSTORE hstore; diff --git a/include/wincrypt.h b/include/wincrypt.h index 6986bd819e..a793e8ad22 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -4084,6 +4084,11 @@ BOOL WINAPI CertEnumSystemStoreLocation(DWORD dwFlags, void *pvArg, BOOL WINAPI CertEnumSystemStore(DWORD dwFlags, void *pvSystemStoreLocationPara, void *pvArg, PFN_CERT_ENUM_SYSTEM_STORE pfnEnum); +BOOL WINAPI CertRegisterSystemStore(const void *store, DWORD flags, + CERT_SYSTEM_STORE_INFO *info, void *reserved); + +BOOL WINAPI CertUnregisterSystemStore(const void *store, DWORD flags); + BOOL WINAPI CertEnumPhysicalStore(const void *pvSystemStore, DWORD dwFlags, void *pvArg, PFN_CERT_ENUM_PHYSICAL_STORE pfnEnum); -- 2.16.1

1 1

[PATCH 0/7] Minimal headless WMP implementation
by Anton Romanov 30 Jan '18

30 Jan '18

This series implement enough of WMP for WPF's MediaPlayer class to be mostly functional and makes "Magic The Gathering: Online" have sound. Anton Romanov (7): wmp: Add IWMPPlayer interface wmp: Implement IConnectionPoint[Container] and add _WMPOCXEvents wmp: add IWMPControls stub implementation wmp: Add wmp defs wmp: Add IWMPMedia stub wmp: Add IWMPNetwork stub wmp: Implement minimal headless WMP dlls/wmp/Makefile.in | 3 +- dlls/wmp/events.c | 388 ++++++++++++++++++ dlls/wmp/oleobj.c | 81 +--- dlls/wmp/player.c | 1013 +++++++++++++++++++++++++++++++++++++++++++++-- dlls/wmp/tests/oleobj.c | 2 +- dlls/wmp/wmp_main.c | 2 + dlls/wmp/wmp_private.h | 59 ++- dlls/wmp/wmpids.h | 437 ++++++++++++++++++++ include/wmp.idl | 27 +- 9 files changed, 1924 insertions(+), 88 deletions(-) create mode 100644 dlls/wmp/events.c create mode 100644 dlls/wmp/wmpids.h -- 2.15.1

1 7

[PATCH 1/6] dxgi: Add FIXME messages for unhandled DXGI_SWAP_CHAIN_FULLSCREEN_DESC fields.
by Józef Kucia 30 Jan '18

30 Jan '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/factory.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 3f8816b3c23b..aa9cdb88fb6c 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -254,8 +254,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IDXGIFactor IWineDXGIDevice *dxgi_device; HRESULT hr; - FIXME("iface %p, device %p, window %p, swapchain_desc %p, fullscreen_desc %p, " - "output %p, swapchain %p partial stub!\n", + TRACE("iface %p, device %p, window %p, swapchain_desc %p, fullscreen_desc %p, " + "output %p, swapchain %p.\n", iface, device, window, swapchain_desc, fullscreen_desc, output, swapchain); if (!device || !swapchain_desc || !swapchain) @@ -309,6 +309,10 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IDXGIFactor FIXME("Ignoring swap effect %#x.\n", swapchain_desc->SwapEffect); if (swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode); + if (fullscreen_desc && fullscreen_desc->ScanlineOrdering) + FIXME("Unhandled scanline ordering %#x.\n", fullscreen_desc->ScanlineOrdering); + if (fullscreen_desc && fullscreen_desc->Scaling) + FIXME("Unhandled mode scaling %#x.\n", fullscreen_desc->Scaling); wined3d_desc.backbuffer_width = swapchain_desc->Width; wined3d_desc.backbuffer_height = swapchain_desc->Height; -- 2.13.6

2 11

[PATCH 1/4] wined3d: Simplify code paths in wined3d_cs_exec_update_sub_resource().
by Józef Kucia 30 Jan '18

30 Jan '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/cs.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 78443d174a27..bb9b915a5980 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2170,31 +2170,31 @@ void wined3d_cs_emit_blt_sub_resource(struct wined3d_cs *cs, struct wined3d_reso static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_update_sub_resource *op = data; + struct wined3d_resource *resource = op->resource; const struct wined3d_box *box = &op->box; unsigned int width, height, depth, level; struct wined3d_const_bo_address addr; struct wined3d_context *context; struct wined3d_texture *texture; - if (op->resource->type == WINED3D_RTYPE_BUFFER) + context = context_acquire(cs->device, NULL, 0); + + if (resource->type == WINED3D_RTYPE_BUFFER) { - struct wined3d_buffer *buffer = buffer_from_resource(op->resource); + struct wined3d_buffer *buffer = buffer_from_resource(resource); - context = context_acquire(op->resource->device, NULL, 0); if (!wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER)) { ERR("Failed to load buffer location.\n"); - context_release(context); goto done; } wined3d_buffer_upload_data(buffer, context, box, op->data.data); wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER); - context_release(context); goto done; } - texture = wined3d_texture_from_resource(op->resource); + texture = wined3d_texture_from_resource(resource); level = op->sub_resource_idx % texture->level_count; width = wined3d_texture_get_level_width(texture, level); @@ -2204,8 +2204,6 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi addr.buffer_object = 0; addr.addr = op->data.data; - context = context_acquire(op->resource->device, NULL, 0); - /* Only load the sub-resource for partial updates. */ if (!box->left && !box->top && !box->front && box->right == width && box->bottom == height && box->back == depth) @@ -2217,13 +2215,13 @@ static void wined3d_cs_exec_update_sub_resource(struct wined3d_cs *cs, const voi wined3d_texture_upload_data(texture, op->sub_resource_idx, context, box, &addr, op->data.row_pitch, op->data.slice_pitch); - context_release(context); - wined3d_texture_validate_location(texture, op->sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(texture, op->sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); done: - wined3d_resource_release(op->resource); + context_release(context); + + wined3d_resource_release(resource); } void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *resource, -- 2.13.6

3 7

[v2 PATCH] winedbg: Remove some unnecessary pointer casts
by Nikolay Sivov 30 Jan '18

30 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: missed one changed file programs/winedbg/info.c | 2 +- programs/winedbg/winedbg.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index e521252ec3..89a2dc43fa 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -218,7 +218,7 @@ void info_win32_module(DWORD64 base) * enumeration */ SymSetOptions((opt = SymGetOptions()) | 0x40000000); - SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, (void*)&im); + SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, &im); SymSetOptions(opt); qsort(im.mi, im.num_used, sizeof(im.mi[0]), module_compare); diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 11782fea97..e0ad4d8751 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -425,7 +425,7 @@ BOOL dbg_get_debuggee_info(HANDLE hProcess, IMAGEHLP_MODULE64* imh_mod) * enumeration */ SymSetOptions((opt = SymGetOptions()) | 0x40000000); - SymEnumerateModules64(hProcess, mod_loader_cb, (void*)&mli); + SymEnumerateModules64(hProcess, mod_loader_cb, &mli); SymSetOptions(opt); return imh_mod->BaseOfImage != 0; -- 2.15.1

1 0

[PATCH] winedbg: Remove some unnecessary pointer casts
by Nikolay Sivov 30 Jan '18

30 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/winedbg/info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index e521252ec3..89a2dc43fa 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -218,7 +218,7 @@ void info_win32_module(DWORD64 base) * enumeration */ SymSetOptions((opt = SymGetOptions()) | 0x40000000); - SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, (void*)&im); + SymEnumerateModules64(dbg_curr_process->handle, info_mod_cb, &im); SymSetOptions(opt); qsort(im.mi, im.num_used, sizeof(im.mi[0]), module_compare); -- 2.15.1

1 0

[PATCH 1/3] dbghelp: Preserve caller supplied structure size member in SymGetModuleInfo() functions
by Nikolay Sivov 30 Jan '18

30 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dbghelp/module.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index c6c9d5eb19..765a7235a1 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -934,7 +934,7 @@ BOOL WINAPI SymGetModuleInfo(HANDLE hProcess, DWORD dwAddr, miw64.SizeOfStruct = sizeof(miw64); if (!SymGetModuleInfoW64(hProcess, dwAddr, &miw64)) return FALSE; - mi.SizeOfStruct = miw64.SizeOfStruct; + mi.SizeOfStruct = ModuleInfo->SizeOfStruct; mi.BaseOfImage = miw64.BaseOfImage; mi.ImageSize = miw64.ImageSize; mi.TimeDateStamp = miw64.TimeDateStamp; @@ -968,7 +968,7 @@ BOOL WINAPI SymGetModuleInfoW(HANDLE hProcess, DWORD dwAddr, miw64.SizeOfStruct = sizeof(miw64); if (!SymGetModuleInfoW64(hProcess, dwAddr, &miw64)) return FALSE; - miw.SizeOfStruct = miw64.SizeOfStruct; + miw.SizeOfStruct = ModuleInfo->SizeOfStruct; miw.BaseOfImage = miw64.BaseOfImage; miw.ImageSize = miw64.ImageSize; miw.TimeDateStamp = miw64.TimeDateStamp; @@ -1003,7 +1003,7 @@ BOOL WINAPI SymGetModuleInfo64(HANDLE hProcess, DWORD64 dwAddr, miw64.SizeOfStruct = sizeof(miw64); if (!SymGetModuleInfoW64(hProcess, dwAddr, &miw64)) return FALSE; - mi64.SizeOfStruct = miw64.SizeOfStruct; + mi64.SizeOfStruct = ModuleInfo->SizeOfStruct; mi64.BaseOfImage = miw64.BaseOfImage; mi64.ImageSize = miw64.ImageSize; mi64.TimeDateStamp = miw64.TimeDateStamp; -- 2.15.1

1 2

[PATCH 5/5] d2d1: Use the global memory allocation helpers.
by Henri Verbeet 30 Jan '18

30 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/bitmap.c | 14 +++++----- dlls/d2d1/bitmap_render_target.c | 2 +- dlls/d2d1/brush.c | 29 ++++++++++---------- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/dc_render_target.c | 2 +- dlls/d2d1/factory.c | 32 +++++++++++----------- dlls/d2d1/geometry.c | 57 ++++++++++++++++++---------------------- dlls/d2d1/hwnd_render_target.c | 2 +- dlls/d2d1/layer.c | 4 +-- dlls/d2d1/mesh.c | 4 +-- dlls/d2d1/render_target.c | 20 +++++++------- dlls/d2d1/state_block.c | 2 +- dlls/d2d1/stroke.c | 6 ++--- dlls/d2d1/wic_render_target.c | 2 +- include/wine/heap.h | 2 +- 15 files changed, 88 insertions(+), 91 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index b03482a..43ed094 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -70,7 +70,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_Release(ID2D1Bitmap *iface) { ID3D10ShaderResourceView_Release(bitmap->view); ID2D1Factory_Release(bitmap->factory); - HeapFree(GetProcessHeap(), 0, bitmap); + heap_free(bitmap); } return refcount; @@ -286,7 +286,7 @@ HRESULT d2d_bitmap_create(ID2D1Factory *factory, ID3D10Device *device, D2D1_SIZE return hr; } - if ((*bitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**bitmap)))) + if ((*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { d2d_bitmap_init(*bitmap, factory, view, size, desc); TRACE("Created bitmap %p.\n", *bitmap); @@ -340,7 +340,7 @@ HRESULT d2d_bitmap_create_shared(ID2D1RenderTarget *render_target, ID3D10Device goto failed; } - if (!(*bitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**bitmap)))) + if (!(*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { hr = E_OUTOFMEMORY; goto failed; @@ -386,7 +386,7 @@ HRESULT d2d_bitmap_create_shared(ID2D1RenderTarget *render_target, ID3D10Device return hr; } - if (!(*bitmap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**bitmap)))) + if (!(*bitmap = heap_alloc_zero(sizeof(**bitmap)))) { ID3D10ShaderResourceView_Release(view); return E_OUTOFMEMORY; @@ -510,7 +510,7 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *d pitch = ((bpp * size.width) + 15) & ~15; data_size = pitch * size.height; - if (!(data = HeapAlloc(GetProcessHeap(), 0, data_size))) + if (!(data = heap_alloc(data_size))) return E_OUTOFMEMORY; rect.X = 0; @@ -520,13 +520,13 @@ HRESULT d2d_bitmap_create_from_wic_bitmap(ID2D1Factory *factory, ID3D10Device *d if (FAILED(hr = IWICBitmapSource_CopyPixels(bitmap_source, &rect, pitch, data_size, data))) { WARN("Failed to copy bitmap pixels, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, data); + heap_free(data); return hr; } hr = d2d_bitmap_create(factory, device, size, data, pitch, &bitmap_desc, bitmap); - HeapFree(GetProcessHeap(), 0, data); + heap_free(data); return hr; } diff --git a/dlls/d2d1/bitmap_render_target.c b/dlls/d2d1/bitmap_render_target.c index 105caa9..de58872 100644 --- a/dlls/d2d1/bitmap_render_target.c +++ b/dlls/d2d1/bitmap_render_target.c @@ -75,7 +75,7 @@ static ULONG STDMETHODCALLTYPE d2d_bitmap_render_target_Release(ID2D1BitmapRende { ID2D1RenderTarget_Release(render_target->dxgi_target); ID2D1Bitmap_Release(render_target->bitmap); - HeapFree(GetProcessHeap(), 0, render_target); + heap_free(render_target); } return refcount; diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index ba07006..6759019 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -67,10 +67,10 @@ static ULONG STDMETHODCALLTYPE d2d_gradient_Release(ID2D1GradientStopCollection if (!refcount) { - HeapFree(GetProcessHeap(), 0, gradient->stops); + heap_free(gradient->stops); ID3D10ShaderResourceView_Release(gradient->view); ID2D1Factory_Release(gradient->factory); - HeapFree(GetProcessHeap(), 0, gradient); + heap_free(gradient); } return refcount; @@ -142,7 +142,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D unsigned int i; HRESULT hr; - if (!(data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, 2 * stop_count * sizeof(*data)))) + if (!(data = heap_alloc_zero(2 * stop_count * sizeof(*data)))) { ERR("Failed to allocate data.\n"); return E_OUTOFMEMORY; @@ -168,7 +168,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D buffer_data.SysMemSlicePitch = 0; hr = ID3D10Device_CreateBuffer(device, &buffer_desc, &buffer_data, &buffer); - HeapFree(GetProcessHeap(), 0, data); + heap_free(data); if (FAILED(hr)) { ERR("Failed to create buffer, hr %#x.\n", hr); @@ -188,7 +188,7 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D return hr; } - if (!(*gradient = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**gradient)))) + if (!(*gradient = heap_alloc_zero(sizeof(**gradient)))) { ID3D10ShaderResourceView_Release(view); return E_OUTOFMEMORY; @@ -205,10 +205,10 @@ HRESULT d2d_gradient_create(ID2D1Factory *factory, ID3D10Device *device, const D (*gradient)->view = view; (*gradient)->stop_count = stop_count; - if (!((*gradient)->stops = HeapAlloc(GetProcessHeap(), 0, stop_count * sizeof(*stops)))) + if (!((*gradient)->stops = heap_alloc(stop_count * sizeof(*stops)))) { ID3D10ShaderResourceView_Release(view); - HeapFree(GetProcessHeap(), 0, *gradient); + heap_free(*gradient); return E_OUTOFMEMORY; } memcpy((*gradient)->stops, stops, stop_count * sizeof(*stops)); @@ -233,7 +233,7 @@ static void d2d_gradient_bind(struct d2d_gradient *gradient, ID3D10Device *devic static void d2d_brush_destroy(struct d2d_brush *brush) { ID2D1Factory_Release(brush->factory); - HeapFree(GetProcessHeap(), 0, brush); + heap_free(brush); } static void d2d_brush_init(struct d2d_brush *brush, ID2D1Factory *factory, @@ -386,7 +386,7 @@ static const struct ID2D1SolidColorBrushVtbl d2d_solid_color_brush_vtbl = HRESULT d2d_solid_color_brush_create(ID2D1Factory *factory, const D2D1_COLOR_F *color, const D2D1_BRUSH_PROPERTIES *desc, struct d2d_brush **brush) { - if (!(*brush = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**brush)))) + if (!(*brush = heap_alloc_zero(sizeof(**brush)))) return E_OUTOFMEMORY; d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_SOLID, desc, @@ -566,10 +566,11 @@ static const struct ID2D1LinearGradientBrushVtbl d2d_linear_gradient_brush_vtbl d2d_linear_gradient_brush_GetGradientStopCollection, }; -HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory, const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, - const D2D1_BRUSH_PROPERTIES *brush_desc, ID2D1GradientStopCollection *gradient, struct d2d_brush **brush) +HRESULT d2d_linear_gradient_brush_create(ID2D1Factory *factory, + const D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES *gradient_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, + ID2D1GradientStopCollection *gradient, struct d2d_brush **brush) { - if (!(*brush = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**brush)))) + if (!(*brush = heap_alloc_zero(sizeof(**brush)))) return E_OUTOFMEMORY; d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_LINEAR, brush_desc, @@ -798,7 +799,7 @@ HRESULT d2d_radial_gradient_brush_create(ID2D1Factory *factory, { struct d2d_brush *b; - if (!(b = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*b)))) + if (!(b = heap_alloc_zero(sizeof(*b)))) return E_OUTOFMEMORY; d2d_brush_init(b, factory, D2D_BRUSH_TYPE_RADIAL, brush_desc, (ID2D1BrushVtbl *)&d2d_radial_gradient_brush_vtbl); @@ -1034,7 +1035,7 @@ static const struct ID2D1BitmapBrushVtbl d2d_bitmap_brush_vtbl = HRESULT d2d_bitmap_brush_create(ID2D1Factory *factory, ID2D1Bitmap *bitmap, const D2D1_BITMAP_BRUSH_PROPERTIES *bitmap_brush_desc, const D2D1_BRUSH_PROPERTIES *brush_desc, struct d2d_brush **brush) { - if (!(*brush = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**brush)))) + if (!(*brush = heap_alloc_zero(sizeof(**brush)))) return E_OUTOFMEMORY; d2d_brush_init(*brush, factory, D2D_BRUSH_TYPE_BITMAP, diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index f876cbf..caeb4b9 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -20,6 +20,7 @@ #define __WINE_D2D1_PRIVATE_H #include "wine/debug.h" +#include "wine/heap.h" #include <assert.h> #include <limits.h> diff --git a/dlls/d2d1/dc_render_target.c b/dlls/d2d1/dc_render_target.c index cdd43b12..d5e4f47 100644 --- a/dlls/d2d1/dc_render_target.c +++ b/dlls/d2d1/dc_render_target.c @@ -94,7 +94,7 @@ static ULONG STDMETHODCALLTYPE d2d_dc_render_target_Release(ID2D1DCRenderTarget { ID2D1RenderTarget_Release(render_target->dxgi_target); IDXGISurface1_Release(render_target->dxgi_surface); - HeapFree(GetProcessHeap(), 0, render_target); + heap_free(render_target); } return refcount; diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index f202332..9bacc85 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -104,7 +104,7 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory1 *iface) { if (factory->device) ID3D10Device1_Release(factory->device); - HeapFree(GetProcessHeap(), 0, factory); + heap_free(factory); } return refcount; @@ -137,13 +137,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factor TRACE("iface %p, rect %s, geometry %p.\n", iface, debug_d2d_rect_f(rect), geometry); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d2d_rectangle_geometry_init(object, (ID2D1Factory *)iface, rect))) { WARN("Failed to initialize rectangle geometry, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -187,7 +187,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Fact TRACE("iface %p, src_geometry %p, transform %p, transformed_geometry %p.\n", iface, src_geometry, transform, transformed_geometry); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; d2d_transformed_geometry_init(object, (ID2D1Factory *)iface, src_geometry, transform); @@ -204,7 +204,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory1 *i TRACE("iface %p, geometry %p.\n", iface, geometry); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; d2d_path_geometry_init(object, (ID2D1Factory *)iface); @@ -225,13 +225,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory1 *if TRACE("iface %p, desc %p, dashes %p, dash_count %u, stroke_style %p.\n", iface, desc, dashes, dash_count, stroke_style); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d2d_stroke_style_init(object, (ID2D1Factory *)iface, desc, dashes, dash_count))) { WARN("Failed to initialize stroke style, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -250,7 +250,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factor TRACE("iface %p, desc %p, text_rendering_params %p, state_block %p.\n", iface, desc, text_rendering_params, state_block); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; d2d_state_block_init(object, (ID2D1Factory *)iface, desc, text_rendering_params); @@ -283,19 +283,19 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Fa TRACE("iface %p, target %p, desc %p, render_target %p.\n", iface, target, desc, render_target); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d2d_factory_get_device(factory, &device))) { - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } if (FAILED(hr = d2d_wic_render_target_init(object, (ID2D1Factory *)iface, device, target, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -319,13 +319,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory if (FAILED(hr = d2d_factory_get_device(factory, &device))) return hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d2d_hwnd_render_target_init(object, (ID2D1Factory *)iface, device, desc, hwnd_rt_desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -356,13 +356,13 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory1 if (FAILED(hr = d2d_factory_get_device(factory, &device))) return hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d2d_dc_render_target_init(object, (ID2D1Factory *)iface, device, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -512,7 +512,7 @@ HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, TRACE("factory_type %#x, iid %s, factory_options %p, factory %p.\n", factory_type, debugstr_guid(iid), factory_options, factory); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; d2d_factory_init(object, factory_type, factory_options); diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c index ab5a0b5..88beee2 100644 --- a/dlls/d2d1/geometry.c +++ b/dlls/d2d1/geometry.c @@ -581,12 +581,7 @@ static BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t element_ if (new_capacity < element_count) new_capacity = max_capacity; - if (*elements) - new_elements = HeapReAlloc(GetProcessHeap(), 0, *elements, new_capacity * element_size); - else - new_elements = HeapAlloc(GetProcessHeap(), 0, new_capacity * element_size); - - if (!new_elements) + if (!(new_elements = heap_realloc(*elements, new_capacity * element_size))) return FALSE; *elements = new_elements; @@ -1438,7 +1433,7 @@ static BOOL d2d_cdt_generate_faces(const struct d2d_cdt *cdt, struct d2d_geometr return TRUE; fail: - HeapFree(GetProcessHeap(), 0, geometry->fill.faces); + heap_free(geometry->fill.faces); geometry->fill.faces = NULL; geometry->fill.faces_size = 0; geometry->fill.face_count = 0; @@ -2035,7 +2030,7 @@ static BOOL d2d_geometry_intersect_self(struct d2d_geometry *geometry) ret = d2d_geometry_apply_intersections(geometry, &intersections); done: - HeapFree(GetProcessHeap(), 0, intersections.intersections); + heap_free(intersections.intersections); return ret; } @@ -2057,7 +2052,7 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry) return S_OK; } - if (!(vertices = HeapAlloc(GetProcessHeap(), 0, vertex_count * sizeof(*vertices)))) + if (!(vertices = heap_alloc(vertex_count * sizeof(*vertices)))) return E_OUTOFMEMORY; for (i = 0, j = 0; i < geometry->u.path.figure_count; ++i) @@ -2091,14 +2086,14 @@ static HRESULT d2d_path_geometry_triangulate(struct d2d_geometry *geometry) if (!d2d_cdt_generate_faces(&cdt, geometry)) goto fail; - HeapFree(GetProcessHeap(), 0, cdt.edges); + heap_free(cdt.edges); return S_OK; fail: geometry->fill.vertices = NULL; geometry->fill.vertex_count = 0; - HeapFree(GetProcessHeap(), 0, vertices); - HeapFree(GetProcessHeap(), 0, cdt.edges); + heap_free(vertices); + heap_free(cdt.edges); return E_FAIL; } @@ -2368,13 +2363,13 @@ static BOOL d2d_geometry_add_figure_outline(struct d2d_geometry *geometry, static void d2d_geometry_cleanup(struct d2d_geometry *geometry) { - HeapFree(GetProcessHeap(), 0, geometry->outline.bezier_faces); - HeapFree(GetProcessHeap(), 0, geometry->outline.beziers); - HeapFree(GetProcessHeap(), 0, geometry->outline.faces); - HeapFree(GetProcessHeap(), 0, geometry->outline.vertices); - HeapFree(GetProcessHeap(), 0, geometry->fill.bezier_vertices); - HeapFree(GetProcessHeap(), 0, geometry->fill.faces); - HeapFree(GetProcessHeap(), 0, geometry->fill.vertices); + heap_free(geometry->outline.bezier_faces); + heap_free(geometry->outline.beziers); + heap_free(geometry->outline.faces); + heap_free(geometry->outline.vertices); + heap_free(geometry->fill.bezier_vertices); + heap_free(geometry->fill.faces); + heap_free(geometry->fill.vertices); ID2D1Factory_Release(geometry->factory); } @@ -2604,11 +2599,11 @@ static void d2d_path_geometry_free_figures(struct d2d_geometry *geometry) for (i = 0; i < geometry->u.path.figure_count; ++i) { - HeapFree(GetProcessHeap(), 0, geometry->u.path.figures[i].bezier_controls); - HeapFree(GetProcessHeap(), 0, geometry->u.path.figures[i].original_bezier_controls); - HeapFree(GetProcessHeap(), 0, geometry->u.path.figures[i].vertices); + heap_free(geometry->u.path.figures[i].bezier_controls); + heap_free(geometry->u.path.figures[i].original_bezier_controls); + heap_free(geometry->u.path.figures[i].vertices); } - HeapFree(GetProcessHeap(), 0, geometry->u.path.figures); + heap_free(geometry->u.path.figures); geometry->u.path.figures = NULL; geometry->u.path.figures_size = 0; } @@ -2824,8 +2819,8 @@ static HRESULT d2d_geometry_resolve_beziers(struct d2d_geometry *geometry) geometry->fill.bezier_vertex_count += 3 * geometry->u.path.figures[i].bezier_control_count; } - if (!(geometry->fill.bezier_vertices = HeapAlloc(GetProcessHeap(), 0, - geometry->fill.bezier_vertex_count * sizeof(*geometry->fill.bezier_vertices)))) + if (!(geometry->fill.bezier_vertices = heap_alloc(geometry->fill.bezier_vertex_count + * sizeof(*geometry->fill.bezier_vertices)))) { ERR("Failed to allocate bezier vertices array.\n"); geometry->fill.bezier_vertex_count = 0; @@ -2889,7 +2884,7 @@ static HRESULT STDMETHODCALLTYPE d2d_geometry_sink_Close(ID2D1GeometrySink *ifac { struct d2d_figure *figure = &geometry->u.path.figures[i]; size_t size = figure->bezier_control_count * sizeof(*figure->original_bezier_controls); - if (!(figure->original_bezier_controls = HeapAlloc(GetProcessHeap(), 0, size))) + if (!(figure->original_bezier_controls = heap_alloc(size))) goto done; memcpy(figure->original_bezier_controls, figure->bezier_controls, size); } @@ -2904,7 +2899,7 @@ static HRESULT STDMETHODCALLTYPE d2d_geometry_sink_Close(ID2D1GeometrySink *ifac done: if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, geometry->fill.bezier_vertices); + heap_free(geometry->fill.bezier_vertices); geometry->fill.bezier_vertex_count = 0; d2d_path_geometry_free_figures(geometry); geometry->u.path.state = D2D_GEOMETRY_STATE_ERROR; @@ -3063,7 +3058,7 @@ static ULONG STDMETHODCALLTYPE d2d_path_geometry_Release(ID2D1PathGeometry *ifac { d2d_path_geometry_free_figures(geometry); d2d_geometry_cleanup(geometry); - HeapFree(GetProcessHeap(), 0, geometry); + heap_free(geometry); } return refcount; @@ -3579,7 +3574,7 @@ static ULONG STDMETHODCALLTYPE d2d_rectangle_geometry_Release(ID2D1RectangleGeom if (!refcount) { d2d_geometry_cleanup(geometry); - HeapFree(GetProcessHeap(), 0, geometry); + heap_free(geometry); } return refcount; @@ -3821,7 +3816,7 @@ HRESULT d2d_rectangle_geometry_init(struct d2d_geometry *geometry, ID2D1Factory d2d_geometry_init(geometry, factory, &identity, (ID2D1GeometryVtbl *)&d2d_rectangle_geometry_vtbl); geometry->u.rectangle.rect = *rect; - if (!(geometry->fill.vertices = HeapAlloc(GetProcessHeap(), 0, 4 * sizeof(*geometry->fill.vertices)))) + if (!(geometry->fill.vertices = heap_alloc(4 * sizeof(*geometry->fill.vertices)))) goto fail; if (!d2d_array_reserve((void **)&geometry->fill.faces, &geometry->fill.faces_size, 2, sizeof(*geometry->fill.faces))) @@ -3923,7 +3918,7 @@ static ULONG STDMETHODCALLTYPE d2d_transformed_geometry_Release(ID2D1Transformed geometry->fill.vertices = NULL; ID2D1Geometry_Release(geometry->u.transformed.src_geometry); d2d_geometry_cleanup(geometry); - HeapFree(GetProcessHeap(), 0, geometry); + heap_free(geometry); } return refcount; diff --git a/dlls/d2d1/hwnd_render_target.c b/dlls/d2d1/hwnd_render_target.c index 7cbbbaa..04d3353 100644 --- a/dlls/d2d1/hwnd_render_target.c +++ b/dlls/d2d1/hwnd_render_target.c @@ -83,7 +83,7 @@ static ULONG STDMETHODCALLTYPE d2d_hwnd_render_target_Release(ID2D1HwndRenderTar { ID2D1RenderTarget_Release(render_target->dxgi_target); IDXGISwapChain_Release(render_target->swapchain); - HeapFree(GetProcessHeap(), 0, render_target); + heap_free(render_target); } return refcount; diff --git a/dlls/d2d1/layer.c b/dlls/d2d1/layer.c index 25a331b..0f7ade2 100644 --- a/dlls/d2d1/layer.c +++ b/dlls/d2d1/layer.c @@ -67,7 +67,7 @@ static ULONG STDMETHODCALLTYPE d2d_layer_Release(ID2D1Layer *iface) if (!refcount) { ID2D1Factory_Release(layer->factory); - HeapFree(GetProcessHeap(), 0, layer); + heap_free(layer); } return refcount; @@ -103,7 +103,7 @@ static const struct ID2D1LayerVtbl d2d_layer_vtbl = HRESULT d2d_layer_create(ID2D1Factory *factory, const D2D1_SIZE_F *size, struct d2d_layer **layer) { - if (!(*layer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**layer)))) + if (!(*layer = heap_alloc_zero(sizeof(**layer)))) return E_OUTOFMEMORY; (*layer)->ID2D1Layer_iface.lpVtbl = &d2d_layer_vtbl; diff --git a/dlls/d2d1/mesh.c b/dlls/d2d1/mesh.c index eb223ad..ee53c69 100644 --- a/dlls/d2d1/mesh.c +++ b/dlls/d2d1/mesh.c @@ -67,7 +67,7 @@ static ULONG STDMETHODCALLTYPE d2d_mesh_Release(ID2D1Mesh *iface) if (!refcount) { ID2D1Factory_Release(mesh->factory); - HeapFree(GetProcessHeap(), 0, mesh); + heap_free(mesh); } return refcount; @@ -100,7 +100,7 @@ static const struct ID2D1MeshVtbl d2d_mesh_vtbl = HRESULT d2d_mesh_create(ID2D1Factory *factory, struct d2d_mesh **mesh) { - if (!(*mesh = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(**mesh)))) + if (!(*mesh = heap_alloc_zero(sizeof(**mesh)))) return E_OUTOFMEMORY; (*mesh)->ID2D1Mesh_iface.lpVtbl = &d2d_mesh_vtbl; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 0c44014..73f15f7 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -77,7 +77,7 @@ static void d2d_size_set(D2D1_SIZE_U *dst, float width, float height) static BOOL d2d_clip_stack_init(struct d2d_clip_stack *stack) { - if (!(stack->stack = HeapAlloc(GetProcessHeap(), 0, INITIAL_CLIP_STACK_SIZE * sizeof(*stack->stack)))) + if (!(stack->stack = heap_alloc(INITIAL_CLIP_STACK_SIZE * sizeof(*stack->stack)))) return FALSE; stack->size = INITIAL_CLIP_STACK_SIZE; @@ -88,7 +88,7 @@ static BOOL d2d_clip_stack_init(struct d2d_clip_stack *stack) static void d2d_clip_stack_cleanup(struct d2d_clip_stack *stack) { - HeapFree(GetProcessHeap(), 0, stack->stack); + heap_free(stack->stack); } static BOOL d2d_clip_stack_push(struct d2d_clip_stack *stack, const D2D1_RECT_F *rect) @@ -104,7 +104,7 @@ static BOOL d2d_clip_stack_push(struct d2d_clip_stack *stack, const D2D1_RECT_F return FALSE; new_size = stack->size * 2; - if (!(new_stack = HeapReAlloc(GetProcessHeap(), 0, stack->stack, new_size * sizeof(*stack->stack)))) + if (!(new_stack = heap_realloc(stack->stack, new_size * sizeof(*stack->stack)))) return FALSE; stack->stack = new_stack; @@ -272,7 +272,7 @@ static ULONG STDMETHODCALLTYPE d2d_d3d_render_target_Release(ID2D1RenderTarget * ID3D10RenderTargetView_Release(render_target->view); ID3D10Device_Release(render_target->device); ID2D1Factory_Release(render_target->factory); - HeapFree(GetProcessHeap(), 0, render_target); + heap_free(render_target); } return refcount; @@ -434,14 +434,14 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_CreateCompatibleRenderTar TRACE("iface %p, size %p, pixel_size %p, format %p, options %#x, render_target %p.\n", iface, size, pixel_size, format, options, rt); - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d2d_bitmap_render_target_init(object, render_target, size, pixel_size, format, options))) { WARN("Failed to initialize render target, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } @@ -1176,7 +1176,7 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta if (texture_type == DWRITE_TEXTURE_CLEARTYPE_3x1) bitmap_size.width *= 3; opacity_values_size = bitmap_size.width * bitmap_size.height; - if (!(opacity_values = HeapAlloc(GetProcessHeap(), 0, opacity_values_size))) + if (!(opacity_values = heap_alloc(opacity_values_size))) { ERR("Failed to allocate opacity values.\n"); goto done; @@ -1237,7 +1237,7 @@ done: ID2D1BitmapBrush_Release(opacity_brush); if (opacity_bitmap) ID2D1Bitmap_Release(opacity_bitmap); - HeapFree(GetProcessHeap(), 0, opacity_values); + heap_free(opacity_values); IDWriteGlyphRunAnalysis_Release(analysis); } @@ -3243,13 +3243,13 @@ HRESULT d2d_d3d_create_render_target(ID2D1Factory *factory, IDXGISurface *surfac struct d2d_d3d_render_target *object; HRESULT hr; - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; if (FAILED(hr = d2d_d3d_render_target_init(object, factory, surface, outer_unknown, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + heap_free(object); return hr; } diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c index 90195fe..3a3cb2e 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c @@ -69,7 +69,7 @@ static ULONG STDMETHODCALLTYPE d2d_state_block_Release(ID2D1DrawingStateBlock *i if (state_block->text_rendering_params) IDWriteRenderingParams_Release(state_block->text_rendering_params); ID2D1Factory_Release(state_block->factory); - HeapFree(GetProcessHeap(), 0, state_block); + heap_free(state_block); } return refcount; diff --git a/dlls/d2d1/stroke.c b/dlls/d2d1/stroke.c index c5a1d50..a0830e3 100644 --- a/dlls/d2d1/stroke.c +++ b/dlls/d2d1/stroke.c @@ -68,8 +68,8 @@ static ULONG STDMETHODCALLTYPE d2d_stroke_style_Release(ID2D1StrokeStyle *iface) { ID2D1Factory_Release(style->factory); if (style->desc.dashStyle == D2D1_DASH_STYLE_CUSTOM) - HeapFree(GetProcessHeap(), 0, style->dashes); - HeapFree(GetProcessHeap(), 0, style); + heap_free(style->dashes); + heap_free(style); } return refcount; @@ -212,7 +212,7 @@ HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *fact if (!dashes || !dash_count) return E_INVALIDARG; - if (!(style->dashes = HeapAlloc(GetProcessHeap(), 0, dash_count * sizeof(*style->dashes)))) + if (!(style->dashes = heap_alloc(dash_count * sizeof(*style->dashes)))) return E_OUTOFMEMORY; memcpy(style->dashes, dashes, dash_count * sizeof(*style->dashes)); style->dash_count = dash_count; diff --git a/dlls/d2d1/wic_render_target.c b/dlls/d2d1/wic_render_target.c index ef8b356..5642fd4 100644 --- a/dlls/d2d1/wic_render_target.c +++ b/dlls/d2d1/wic_render_target.c @@ -144,7 +144,7 @@ static ULONG STDMETHODCALLTYPE d2d_wic_render_target_Release(ID2D1RenderTarget * ID3D10Texture2D_Release(render_target->readback_texture); ID2D1RenderTarget_Release(render_target->dxgi_target); IDXGISurface_Release(render_target->dxgi_surface); - HeapFree(GetProcessHeap(), 0, render_target); + heap_free(render_target); } return refcount; diff --git a/include/wine/heap.h b/include/wine/heap.h index 014ef61..681887b 100644 --- a/include/wine/heap.h +++ b/include/wine/heap.h @@ -22,7 +22,7 @@ #ifndef __WINE_WINE_HEAP_H #define __WINE_WINE_HEAP_H -#include <windef.h> +#include <winbase.h> static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(SIZE_T len) { -- 2.1.4

1 0

[PATCH 4/5] wined3d: Use the resource access flags in wined3d_device_evict_managed_resources().
by Henri Verbeet 30 Jan '18

30 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6a642c9..3ad0d97 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4651,7 +4651,7 @@ void CDECL wined3d_device_evict_managed_resources(struct wined3d_device *device) { TRACE("Checking resource %p for eviction.\n", resource); - if (resource->pool == WINED3D_POOL_MANAGED && !resource->map_count) + if (wined3d_resource_access_is_managed(resource->access) && !resource->map_count) { TRACE("Evicting %p.\n", resource); wined3d_cs_emit_unload_resource(device->cs, resource); -- 2.1.4

1 0

[PATCH 3/5] wined3d: Use the resource access flags in wined3d_device_update_texture().
by Henri Verbeet 30 Jan '18

30 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 67c1855..6a642c9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3768,14 +3768,15 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - if (src_texture->resource.pool != WINED3D_POOL_SYSTEM_MEM || src_texture->resource.usage & WINED3DUSAGE_SCRATCH) + if (src_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU + || src_texture->resource.usage & WINED3DUSAGE_SCRATCH) { - WARN("Source texture not in WINED3D_POOL_SYSTEM_MEM, returning WINED3DERR_INVALIDCALL.\n"); + WARN("Source resource is GPU accessible or a scratch resource.\n"); return WINED3DERR_INVALIDCALL; } - if (dst_texture->resource.pool != WINED3D_POOL_DEFAULT) + if (dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_CPU) { - WARN("Destination texture not in WINED3D_POOL_DEFAULT, returning WINED3DERR_INVALIDCALL.\n"); + WARN("Destination resource is CPU accessible.\n"); return WINED3DERR_INVALIDCALL; } -- 2.1.4

1 0

[PATCH 2/5] wined3d: Use the resource access flags in buffer_init().
by Henri Verbeet 30 Jan '18

30 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 7 ++++--- dlls/wined3d/wined3d_private.h | 5 +++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 49b189e..fd26611 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1365,7 +1365,8 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device buffer, buffer->resource.size, buffer->resource.usage, debug_d3dformat(buffer->resource.format->id), buffer->resource.heap_memory); - if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING || pool == WINED3D_POOL_MANAGED) + if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING + || wined3d_resource_access_is_managed(buffer->resource.access)) { /* SWvp and managed buffers always return the same pointer in buffer * maps and retain data in DISCARD maps. Keep a system memory copy of @@ -1383,9 +1384,9 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device { TRACE("Not creating a BO because GL_ARB_vertex_buffer is not supported.\n"); } - else if (buffer->resource.pool == WINED3D_POOL_SYSTEM_MEM) + else if (!(buffer->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) { - TRACE("Not creating a BO because the buffer is in system memory.\n"); + TRACE("Not creating a BO because the buffer is not GPU accessible.\n"); } else if (!dynamic_buffer_ok && (buffer->resource.usage & WINED3DUSAGE_DYNAMIC)) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 082c1ec..f95330f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2965,6 +2965,11 @@ static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD sta #define WINED3D_RESOURCE_ACCESS_CPU 0x2u #define WINED3D_RESOURCE_ACCESS_MAP 0x4u +static inline BOOL wined3d_resource_access_is_managed(unsigned int access) +{ + return !(~access & (WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU)); +} + struct wined3d_resource_ops { ULONG (*resource_incref)(struct wined3d_resource *resource); -- 2.1.4

1 0

[PATCH 4/4] localspl: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 30 Jan '18

30 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/localspl/localmon.c | 1 + dlls/localspl/localspl_private.h | 23 ----------------------- dlls/localspl/provider.c | 3 ++- 3 files changed, 3 insertions(+), 24 deletions(-) diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 4ee3efb8cd..4be1ad6101 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -33,6 +33,7 @@ #include "localspl_private.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" diff --git a/dlls/localspl/localspl_private.h b/dlls/localspl/localspl_private.h index 8c49623622..f27005c16d 100644 --- a/dlls/localspl/localspl_private.h +++ b/dlls/localspl/localspl_private.h @@ -51,27 +51,4 @@ void setup_provider(void) DECLSPEC_HIDDEN; #define PORT_IS_LPR 8 -/* ## Memory allocation functions ## */ - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), 0, len ); -} - -static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); -} - -static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_zero( void * mem, size_t len ) -{ - return HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, mem, len ); -} - -static inline BOOL heap_free( void *mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); -} - - #endif /* __WINE_LOCALSPL_PRIVATE__ */ diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 4f6bac376e..3538947281 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -31,8 +31,9 @@ #include "ddk/winddiui.h" #include "ddk/winsplp.h" -#include "wine/list.h" #include "wine/debug.h" +#include "wine/heap.h" +#include "wine/list.h" #include "wine/unicode.h" #include "localspl_private.h" -- 2.14.3

2 1

[PATCH] kerberos: Add support for KerbQueryTicketCacheMessage. (v3)
by Dmitry Timoshkov 30 Jan '18

30 Jan '18

Based on the code written by George Popoff. v2: Copy full ticket info (including Realm/Server name) to flat buffer. v3: Fix compilation without libkrb5. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 417 +++++++++++++++++++++++++++++++++++++++++++++++- include/ntsecapi.h | 105 ++++++++++++ 2 files changed, 519 insertions(+), 3 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index b4a37f754f..78e4e932c1 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1,5 +1,6 @@ /* * Copyright 2017 Dmitry Timoshkov + * Copyright 2017 George Popoff * Copyright 2008 Robert Shearman for CodeWeavers * Copyright 2017 Hans Leidekker for CodeWeavers * @@ -36,6 +37,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "rpc.h" #include "sspi.h" #include "ntsecapi.h" @@ -88,8 +90,37 @@ static void *libkrb5_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p_##f MAKE_FUNCPTR(krb5_init_context); +MAKE_FUNCPTR(krb5_free_context); +MAKE_FUNCPTR(krb5_free_ticket); +MAKE_FUNCPTR(krb5_cccol_cursor_new); +MAKE_FUNCPTR(krb5_cccol_cursor_next); +MAKE_FUNCPTR(krb5_cccol_cursor_free); +MAKE_FUNCPTR(krb5_cc_close); +MAKE_FUNCPTR(krb5_cc_start_seq_get); +MAKE_FUNCPTR(krb5_cc_end_seq_get); +MAKE_FUNCPTR(krb5_cc_next_cred); +MAKE_FUNCPTR(krb5_is_config_principal); +MAKE_FUNCPTR(krb5_decode_ticket); +MAKE_FUNCPTR(krb5_unparse_name_flags); +MAKE_FUNCPTR(krb5_free_unparsed_name); +MAKE_FUNCPTR(krb5_free_cred_contents); #undef MAKE_FUNCPTR +static inline void *heap_alloc(SIZE_T size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +static inline void *heap_realloc(void *p, SIZE_T size) +{ + return HeapReAlloc(GetProcessHeap(), 0, p, size); +} + +static inline void heap_free(void *p) +{ + HeapFree(GetProcessHeap(), 0, p); +} + static void load_krb5(void) { if (!(libkrb5_handle = wine_dlopen(SONAME_LIBKRB5, RTLD_NOW, NULL, 0))) @@ -106,6 +137,20 @@ static void load_krb5(void) } LOAD_FUNCPTR(krb5_init_context) + LOAD_FUNCPTR(krb5_free_context) + LOAD_FUNCPTR(krb5_free_ticket) + LOAD_FUNCPTR(krb5_cccol_cursor_new) + LOAD_FUNCPTR(krb5_cccol_cursor_next) + LOAD_FUNCPTR(krb5_cccol_cursor_free) + LOAD_FUNCPTR(krb5_cc_close) + LOAD_FUNCPTR(krb5_cc_start_seq_get) + LOAD_FUNCPTR(krb5_cc_end_seq_get) + LOAD_FUNCPTR(krb5_cc_next_cred) + LOAD_FUNCPTR(krb5_is_config_principal) + LOAD_FUNCPTR(krb5_decode_ticket) + LOAD_FUNCPTR(krb5_unparse_name_flags) + LOAD_FUNCPTR(krb5_free_unparsed_name) + LOAD_FUNCPTR(krb5_free_cred_contents) #undef LOAD_FUNCPTR return; @@ -157,15 +202,381 @@ static NTSTATUS NTAPI kerberos_LsaApInitializePackage(ULONG package_id, PLSA_DIS return STATUS_SUCCESS; } +#ifdef SONAME_LIBKRB5 + +struct ticket_info +{ + ULONG count, allocated; + KERB_TICKET_CACHE_INFO *info; +}; + +static NTSTATUS krb5_error_to_status(krb5_error_code error) +{ + switch (error) + { + case 0: return STATUS_SUCCESS; + default: + /* FIXME */ + return STATUS_UNSUCCESSFUL; + } +} + +static void free_ticket_info(struct ticket_info *info) +{ + ULONG i; + + for (i = 0; i < info->count; i++) + { + heap_free(info->info[i].RealmName.Buffer); + heap_free(info->info[i].ServerName.Buffer); + } + + heap_free(info->info); +} + +static WCHAR *utf8_to_wstr(const char *utf8) +{ + int len; + WCHAR *wstr; + + len = MultiByteToWideChar(CP_UTF8, 0, utf8, -1, NULL, 0); + wstr = heap_alloc(len * sizeof(WCHAR)); + if (wstr) + MultiByteToWideChar(CP_UTF8, 0, utf8, -1, wstr, len); + + return wstr; +} + +static NTSTATUS copy_tickets_from_cache(krb5_context context, krb5_ccache cache, struct ticket_info *info) +{ + NTSTATUS status; + krb5_cc_cursor cursor; + krb5_error_code error; + krb5_creds credentials; + krb5_ticket *ticket; + char *name_with_realm, *name_without_realm, *realm_name; + WCHAR *realm_nameW, *name_without_realmW; + + error = p_krb5_cc_start_seq_get(context, cache, &cursor); + if (error) return krb5_error_to_status(error); + + for (;;) + { + error = p_krb5_cc_next_cred(context, cache, &cursor, &credentials); + if (error) + { + if (error == KRB5_CC_END) + status = STATUS_SUCCESS; + else + status = krb5_error_to_status(error); + break; + } + + if (p_krb5_is_config_principal(context, credentials.server)) + { + p_krb5_free_cred_contents(context, &credentials); + continue; + } + + if (info->count == info->allocated) + { + KERB_TICKET_CACHE_INFO *new_info; + ULONG new_allocated; + + if (info->allocated) + { + new_allocated = info->allocated * 2; + new_info = heap_realloc(info->info, sizeof(*new_info) * new_allocated); + } + else + { + new_allocated = 16; + new_info = heap_alloc(sizeof(*new_info) * new_allocated); + } + if (!new_info) + { + p_krb5_free_cred_contents(context, &credentials); + status = STATUS_NO_MEMORY; + break; + } + + info->info = new_info; + info->allocated = new_allocated; + } + + error = p_krb5_unparse_name_flags(context, credentials.server, 0, &name_with_realm); + if (error) + { + p_krb5_free_cred_contents(context, &credentials); + status = krb5_error_to_status(error); + break; + } + + TRACE("name_with_realm: %s\n", debugstr_a(name_with_realm)); + + error = p_krb5_unparse_name_flags(context, credentials.server, + KRB5_PRINCIPAL_UNPARSE_NO_REALM, &name_without_realm); + if (error) + { + p_krb5_free_unparsed_name(context, name_with_realm); + p_krb5_free_cred_contents(context, &credentials); + status = krb5_error_to_status(error); + break; + } + + TRACE("name_without_realm: %s\n", debugstr_a(name_without_realm)); + + name_without_realmW = utf8_to_wstr(name_without_realm); + RtlInitUnicodeString(&info->info[info->count].ServerName, name_without_realmW); + + realm_name = strchr(name_with_realm, '@'); + if (!realm_name) + { + ERR("wrong name with realm %s\n", debugstr_a(name_with_realm)); + realm_name = name_with_realm; + } + else + realm_name++; + + /* realm_name - now contains only realm! */ + + realm_nameW = utf8_to_wstr(realm_name); + RtlInitUnicodeString(&info->info[info->count].RealmName, realm_nameW); + + if (!credentials.times.starttime) + credentials.times.starttime = credentials.times.authtime; + + /* TODO: if krb5_is_config_principal = true */ + RtlSecondsSince1970ToTime(credentials.times.starttime, &info->info[info->count].StartTime); + RtlSecondsSince1970ToTime(credentials.times.endtime, &info->info[info->count].EndTime); + RtlSecondsSince1970ToTime(credentials.times.renew_till, &info->info[info->count].RenewTime); + + info->info[info->count].TicketFlags = credentials.ticket_flags; + + error = p_krb5_decode_ticket(&credentials.ticket, &ticket); + + p_krb5_free_unparsed_name(context, name_with_realm); + p_krb5_free_unparsed_name(context, name_without_realm); + p_krb5_free_cred_contents(context, &credentials); + + if (error) + { + status = krb5_error_to_status(error); + break; + } + + info->info[info->count].EncryptionType = ticket->enc_part.enctype; + + p_krb5_free_ticket(context, ticket); + + info->count++; + } + + p_krb5_cc_end_seq_get(context, cache, &cursor); + + return status; +} + +static inline void init_client_us(UNICODE_STRING *dst, void *client_ws, const UNICODE_STRING *src) +{ + dst->Buffer = client_ws; + dst->Length = src->Length; + dst->MaximumLength = src->MaximumLength; +} + +static NTSTATUS copy_to_client(PLSA_CLIENT_REQUEST lsa_req, struct ticket_info *info, void **out, ULONG *out_size) +{ + NTSTATUS status; + ULONG i; + SIZE_T size, client_str_off; + char *client_resp, *client_ticket, *client_str; + KERB_QUERY_TKT_CACHE_RESPONSE resp; + + size = sizeof(KERB_QUERY_TKT_CACHE_RESPONSE); + if (info->count != 0) + size += (info->count - 1) * sizeof(KERB_TICKET_CACHE_INFO); + + client_str_off = size; + + for (i = 0; i < info->count; i++) + { + size += info->info[i].RealmName.MaximumLength; + size += info->info[i].ServerName.MaximumLength; + } + + status = lsa_dispatch.AllocateClientBuffer(lsa_req, size, (void **)&client_resp); + if (status != STATUS_SUCCESS) return status; + + resp.MessageType = KerbQueryTicketCacheMessage; + resp.CountOfTickets = info->count; + size = FIELD_OFFSET(KERB_QUERY_TKT_CACHE_RESPONSE, Tickets); + status = lsa_dispatch.CopyToClientBuffer(lsa_req, size, client_resp, &resp); + if (status != STATUS_SUCCESS) goto fail; + + if (!info->count) + { + *out = client_resp; + *out_size = sizeof(resp); + return STATUS_SUCCESS; + } + + *out_size = size; + + client_ticket = client_resp + size; + client_str = client_resp + client_str_off; + + for (i = 0; i < info->count; i++) + { + KERB_TICKET_CACHE_INFO ticket; + + ticket = info->info[i]; + + init_client_us(&ticket.RealmName, client_str, &info->info[i].RealmName); + + size = info->info[i].RealmName.MaximumLength; + status = lsa_dispatch.CopyToClientBuffer(lsa_req, size, client_str, info->info[i].RealmName.Buffer); + if (status != STATUS_SUCCESS) goto fail; + client_str += size; + *out_size += size; + + init_client_us(&ticket.ServerName, client_str, &info->info[i].ServerName); + + size = info->info[i].ServerName.MaximumLength; + status = lsa_dispatch.CopyToClientBuffer(lsa_req, size, client_str, info->info[i].ServerName.Buffer); + if (status != STATUS_SUCCESS) goto fail; + client_str += size; + *out_size += size; + + status = lsa_dispatch.CopyToClientBuffer(lsa_req, sizeof(ticket), client_ticket, &ticket); + if (status != STATUS_SUCCESS) goto fail; + + client_ticket += sizeof(ticket); + *out_size += sizeof(ticket); + } + + *out = client_resp; + return STATUS_SUCCESS; + +fail: + lsa_dispatch.FreeClientBuffer(lsa_req, client_resp); + return status; +} + +static NTSTATUS query_ticket_cache(PLSA_CLIENT_REQUEST lsa_req, void *in, ULONG in_len, void **out, ULONG *out_len) +{ + NTSTATUS status; + KERB_QUERY_TKT_CACHE_REQUEST *query; + struct ticket_info info; + krb5_error_code error; + krb5_context context = NULL; + krb5_cccol_cursor cursor = NULL; + krb5_ccache cache; + + if (!in || in_len != sizeof(KERB_QUERY_TKT_CACHE_REQUEST) || !out || !out_len) + return STATUS_INVALID_PARAMETER; + + query = (KERB_QUERY_TKT_CACHE_REQUEST *)in; + + if (query->LogonId.HighPart != 0 || query->LogonId.LowPart != 0) + return STATUS_ACCESS_DENIED; + + info.count = 0; + info.allocated = 0; + info.info = NULL; + + error = p_krb5_init_context(&context); + if (error) + { + status = krb5_error_to_status(error); + goto done; + } + + error = p_krb5_cccol_cursor_new(context, &cursor); + if (error) + { + status = krb5_error_to_status(error); + goto done; + } + + for (;;) + { + error = p_krb5_cccol_cursor_next(context, cursor, &cache); + if (error) + { + status = krb5_error_to_status(error); + goto done; + } + if (!cache) break; + + status = copy_tickets_from_cache(context, cache, &info); + + p_krb5_cc_close(context, cache); + + if (status != STATUS_SUCCESS) + goto done; + } + + status = copy_to_client(lsa_req, &info, out, out_len); + +done: + if (cursor) + p_krb5_cccol_cursor_free(context, &cursor); + + if (context) + p_krb5_free_context(context); + + free_ticket_info(&info); + + return status; +} + +#else /* SONAME_LIBKRB5 */ + +static NTSTATUS query_ticket_cache(PLSA_CLIENT_REQUEST lsa_req, void *in, ULONG in_len, void **out, ULONG *out_len) +{ + FIXME("%p,%p,%u,%p,%p: stub\n", lsa_req, in, in_len, out, out_len); + return STATUS_NOT_IMPLEMENTED; +} + +#endif /* SONAME_LIBKRB5 */ + static NTSTATUS NTAPI kerberos_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST request, PVOID in_buffer, PVOID client_buffer_base, ULONG in_buffer_length, PVOID *out_buffer, PULONG out_buffer_length, PNTSTATUS status) { - FIXME("%p,%p,%p,%u,%p,%p,%p: stub\n", request, in_buffer, client_buffer_base, + KERB_PROTOCOL_MESSAGE_TYPE msg; + + TRACE("%p,%p,%p,%u,%p,%p,%p\n", request, in_buffer, client_buffer_base, in_buffer_length, out_buffer, out_buffer_length, status); - *status = STATUS_NOT_IMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + if (!in_buffer || in_buffer_length < sizeof(msg)) + return STATUS_INVALID_PARAMETER; + + msg = *(KERB_PROTOCOL_MESSAGE_TYPE *)in_buffer; + + switch (msg) + { + case KerbQueryTicketCacheMessage: + *status = query_ticket_cache(request, in_buffer, in_buffer_length, out_buffer, out_buffer_length); + break; + + case KerbRetrieveTicketMessage: + FIXME("KerbRetrieveTicketMessage stub\n"); + *status = STATUS_NOT_IMPLEMENTED; + break; + + case KerbPurgeTicketCacheMessage: + FIXME("KerbPurgeTicketCacheMessage stub\n"); + *status = STATUS_NOT_IMPLEMENTED; + break; + + default: /* All other requests should call LsaApCallPackage */ + WARN("%u => access denied\n", msg); + *status = STATUS_ACCESS_DENIED; + break; + } + + return *status; } static NTSTATUS NTAPI kerberos_SpGetInfo(SecPkgInfoW *info) diff --git a/include/ntsecapi.h b/include/ntsecapi.h index d0339a97ef..6d5e01d675 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -169,6 +169,15 @@ typedef struct _OBJECT_ATTRIBUTES { } OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES; #endif +#ifndef __SECHANDLE_DEFINED__ +#define __SECHANDLE_DEFINED__ +typedef struct _SecHandle +{ + ULONG_PTR dwLower; + ULONG_PTR dwUpper; +} SecHandle, *PSecHandle; +#endif + typedef UNICODE_STRING LSA_UNICODE_STRING, *PLSA_UNICODE_STRING; typedef STRING LSA_STRING, *PLSA_STRING; typedef OBJECT_ATTRIBUTES LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES; @@ -349,6 +358,102 @@ typedef enum _POLICY_NOTIFICATION_INFORMATION_CLASS static const WCHAR MICROSOFT_KERBEROS_NAME_W[] = { 'K','e','r','b','e','r','o','s',0 }; #endif +#define KERB_TICKET_FLAGS_reserved 0x80000000 +#define KERB_TICKET_FLAGS_forwardable 0x40000000 +#define KERB_TICKET_FLAGS_forwarded 0x20000000 +#define KERB_TICKET_FLAGS_proxiable 0x10000000 +#define KERB_TICKET_FLAGS_proxy 0x08000000 +#define KERB_TICKET_FLAGS_may_postdate 0x04000000 +#define KERB_TICKET_FLAGS_postdated 0x02000000 +#define KERB_TICKET_FLAGS_invalid 0x01000000 +#define KERB_TICKET_FLAGS_renewable 0x00800000 +#define KERB_TICKET_FLAGS_initial 0x00400000 +#define KERB_TICKET_FLAGS_pre_authent 0x00200000 +#define KERB_TICKET_FLAGS_hw_authent 0x00100000 +#define KERB_TICKET_FLAGS_ok_as_delegate 0x00040000 +#define KERB_TICKET_FLAGS_name_canonicalize 0x00010000 +#define KERB_TICKET_FLAGS_cname_in_pa_data 0x00040000 +#define KERB_TICKET_FLAGS_reserved1 0x00000001 + +typedef enum _KERB_PROTOCOL_MESSAGE_TYPE +{ + KerbDebugRequestMessage = 0, + KerbQueryTicketCacheMessage, + KerbChangeMachinePasswordMessage, + KerbVerifyPacMessage, + KerbRetrieveTicketMessage, + KerbUpdateAddressesMessage, + KerbPurgeTicketCacheMessage, + KerbChangePasswordMessage, + KerbRetrieveEncodedTicketMessage, + KerbDecryptDataMessage, + KerbAddBindingCacheEntryMessage, + KerbSetPasswordMessage, + KerbSetPasswordExMessage, + KerbVerifyCredentialsMessage, + KerbQueryTicketCacheExMessage, + KerbPurgeTicketCacheExMessage, + KerbRefreshSmartcardCredentialsMessage, + KerbAddExtraCredentialsMessage, + KerbQuerySupplementalCredentialsMessage, + KerbTransferCredentialsMessage, + KerbQueryTicketCacheEx2Message, + KerbSubmitTicketMessage, + KerbAddExtraCredentialsExMessage, + KerbQueryKdcProxyCacheMessage, + KerbPurgeKdcProxyCacheMessage, + KerbQueryTicketCacheEx3Message, + KerbCleanupMachinePkinitCredsMessage, + KerbAddBindingCacheEntryExMessage, + KerbQueryBindingCacheMessage, + KerbPurgeBindingCacheMessage, + KerbQueryDomainExtendedPoliciesMessage, + KerbQueryS4U2ProxyCacheMessage +} KERB_PROTOCOL_MESSAGE_TYPE, *PKERB_PROTOCOL_MESSAGE_TYPE; + +typedef struct _KERB_TICKET_CACHE_INFO +{ + UNICODE_STRING ServerName; + UNICODE_STRING RealmName; + LARGE_INTEGER StartTime; + LARGE_INTEGER EndTime; + LARGE_INTEGER RenewTime; + LONG EncryptionType; + ULONG TicketFlags; +} KERB_TICKET_CACHE_INFO, *PKERB_TICKET_CACHE_INFO; + +typedef struct _KERB_QUERY_TKT_CACHE_REQUEST +{ + KERB_PROTOCOL_MESSAGE_TYPE MessageType; + LUID LogonId; +} KERB_QUERY_TKT_CACHE_REQUEST, *PKERB_QUERY_TKT_CACHE_REQUEST; + +typedef struct _KERB_QUERY_TKT_CACHE_RESPONSE +{ + KERB_PROTOCOL_MESSAGE_TYPE MessageType; + ULONG CountOfTickets; + KERB_TICKET_CACHE_INFO Tickets[ANYSIZE_ARRAY]; +} KERB_QUERY_TKT_CACHE_RESPONSE, *PKERB_QUERY_TKT_CACHE_RESPONSE; + +typedef struct _KERB_RETRIEVE_TKT_REQUEST +{ + KERB_PROTOCOL_MESSAGE_TYPE MessageType; + LUID LogonId; + UNICODE_STRING TargetName; + ULONG TicketFlags; + ULONG CacheOptions; + LONG EncryptionType; + SecHandle CredentialsHandle; +} KERB_RETRIEVE_TKT_REQUEST, *PKERB_RETRIEVE_TKT_REQUEST; + +typedef struct _KERB_PURGE_TKT_CACHE_REQUEST +{ + KERB_PROTOCOL_MESSAGE_TYPE MessageType; + LUID LogonId; + UNICODE_STRING ServerName; + UNICODE_STRING RealmName; +} KERB_PURGE_TKT_CACHE_REQUEST, *PKERB_PURGE_TKT_CACHE_REQUEST; + #define RtlGenRandom SystemFunction036 #define RtlEncryptMemory SystemFunction040 #define RtlDecryptMemory SystemFunction041 -- 2.15.1

2 1

[PATCH 1/2] include: Add activation.idl with IActivationFactory interface.
by Nikolay Sivov 30 Jan '18

30 Jan '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/Makefile.in | 1 + include/activation.idl | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 include/activation.idl diff --git a/include/Makefile.in b/include/Makefile.in index b975dd585e..fdf736e4eb 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -1,5 +1,6 @@ IDL_SRCS = \ access.idl \ + activation.idl \ activaut.idl \ activdbg.idl \ activscp.idl \ diff --git a/include/activation.idl b/include/activation.idl new file mode 100644 index 0000000000..b86c9f6b6f --- /dev/null +++ b/include/activation.idl @@ -0,0 +1,31 @@ +/* + * Copyright 2016 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef DO_NO_IMPORTS +import "inspectable.idl"; +#endif + +[ + object, + uuid(00000035-0000-0000-c000-000000000046), + pointer_default(unique) +] +interface IActivationFactory : IInspectable +{ + HRESULT ActivateInstance([out] IInspectable **instance); +} -- 2.15.1

1 1

[PATCH 1/2] comctl32/tests: Enable IP address control tests on version 6
by Nikolay Sivov 30 Jan '18

30 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/ipaddress.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index 6d8e9ccf4b..52581899a7 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -22,6 +22,7 @@ #include <commctrl.h> #include "wine/test.h" +#include "v6util.h" #define expect(expected, got) ok(expected == got, "expected %d, got %d\n", expected,got) @@ -63,5 +64,15 @@ static void test_get_set_text(void) START_TEST(ipaddress) { + ULONG_PTR cookie; + HANDLE ctxt; + + test_get_set_text(); + + if (!load_v6_module(&cookie, &ctxt)) + return; + test_get_set_text(); + + unload_v6_module(cookie, ctxt); } -- 2.15.1

1 1

[PATCH 3/4] dwrite: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 30 Jan '18

30 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 457d863d7b..31b977a159 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -20,6 +20,7 @@ #include "d2d1.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" @@ -30,31 +31,6 @@ static const DWRITE_MATRIX identity = 0.0f, 0.0f }; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc_zero(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(const WCHAR *str) { LPWSTR ret = NULL; -- 2.14.3

2 1

[PATCH] advapi32: Support WinLogonIdsSid in IsWellKnownSid
by Alistair Leslie-Hughes 29 Jan '18

29 Jan '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/advapi32/security.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index e666062..84aa2f1 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -104,6 +104,7 @@ static const WELLKNOWNSID WellKnownSids[] = { {'R','C'}, WinRestrictedCodeSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_RESTRICTED_CODE_RID } } }, { {0,0}, WinTerminalServerSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_TERMINAL_SERVER_RID } } }, { {0,0}, WinRemoteLogonIdSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_REMOTE_LOGON_RID } } }, + { {0,0}, WinLogonIdsSid, { SID_REVISION, SECURITY_LOGON_IDS_RID_COUNT, { SECURITY_NT_AUTHORITY }, { SECURITY_LOGON_IDS_RID } } }, { {'S','Y'}, WinLocalSystemSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SYSTEM_RID } } }, { {'L','S'}, WinLocalServiceSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_LOCAL_SERVICE_RID } } }, { {'N','S'}, WinNetworkServiceSid, { SID_REVISION, 1, { SECURITY_NT_AUTHORITY }, { SECURITY_NETWORK_SERVICE_RID } } }, -- 1.9.1

1 0

[PATCH] dpnet: Use the global HeapAlloc() wrappers
by Alistair Leslie-Hughes 29 Jan '18

29 Jan '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dpnet/dpnet_private.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 44ff289d..2e72360 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -25,6 +25,7 @@ # error You must include config.h to use this header #endif +#include "wine/heap.h" #include <wine/list.h> #include "winsock2.h" #include "wine/unicode.h" @@ -154,21 +155,6 @@ typedef struct { #define FE(x) { x, #x } #define GE(x) { &x, #x } -static inline void __WINE_ALLOC_SIZE(1) *heap_alloc( size_t len ) -{ - return HeapAlloc( GetProcessHeap(), 0, len ); -} - -static inline void __WINE_ALLOC_SIZE(2) *heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc( GetProcessHeap(), 0, mem, len); -} - -static inline BOOL heap_free( void *mem ) -{ - return HeapFree( GetProcessHeap(), 0, mem ); -} - static inline WCHAR *heap_strdupW( const WCHAR *src ) { WCHAR *dst; -- 1.9.1

1 0

[PATCH resend 1/2] user32/tests: Add a helper to check clipboard sequence and messages.
by Zebediah Figura 29 Jan '18

29 Jan '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/clipboard.c | 390 ++++++------------------------------------ 1 file changed, 51 insertions(+), 339 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index aa3bd04..4fd37fa 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -995,13 +995,41 @@ static void get_clipboard_data_process(void) ok(r, "CloseClipboard failed: %d\n", GetLastError()); } +static UINT old_seq; + +static void check_messages_(int line, HWND win, UINT seq_diff, UINT draw, UINT update, UINT destroy, UINT render) +{ + MSG msg; + UINT count, fmt, seq; + + seq = GetClipboardSequenceNumber(); + ok_(__FILE__, line)(seq - old_seq == seq_diff, "sequence diff %d\n", seq - old_seq); + old_seq = seq; + + if (!cross_thread) + { + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); + } + + count = SendMessageA( win, WM_USER + 1, 0, 0 ); + ok_(__FILE__, line)(count == draw, "WM_DRAWCLIPBOARD %sreceived\n", draw ? "not " : ""); + count = SendMessageA( win, WM_USER + 2, 0, 0 ); + ok_(__FILE__, line)(count == update || broken(!pAddClipboardFormatListener), + "WM_CLIPBOARDUPDATE %sreceived\n", update ? "not " : ""); + count = SendMessageA( win, WM_USER + 3, 0, 0 ); + ok_(__FILE__, line)(count == destroy, "WM_DESTROYCLIPBOARD %sreceived\n", destroy ? "not " : ""); + fmt = SendMessageA( win, WM_USER + 4, 0, 0 ); + ok_(__FILE__, line)(fmt == render, "WM_RENDERFORMAT received %04x, expected %04x\n", fmt, render); +} +#define check_messages(a,b,c,d,e,f) check_messages_(__LINE__,a,b,c,d,e,f) + static DWORD WINAPI clipboard_thread(void *param) { HWND ret, win = param; BOOL r; MSG msg; HANDLE handle; - UINT count, fmt, formats, old_seq = 0, seq; + UINT count, fmt, formats; cross_thread = (GetWindowThreadProcessId( win, NULL ) != GetCurrentThreadId()); trace( "%s-threaded test\n", cross_thread ? "multi" : "single" ); @@ -1045,21 +1073,7 @@ static DWORD WINAPI clipboard_thread(void *param) ok( r, "RemoveClipboardFormatListener failed err %d\n", GetLastError()); } - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER + 1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 0, 0, 0); SetLastError( 0xdeadbeef ); r = OpenClipboard( (HWND)0xdead ); @@ -1069,125 +1083,32 @@ static DWORD WINAPI clipboard_thread(void *param) r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 0, 0, 0, 0); r = EmptyClipboard(); ok(r, "EmptyClipboard failed: %d\n", GetLastError()); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( !count, "WM_DESTROYCLIPBOARD received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); r = EmptyClipboard(); ok(r, "EmptyClipboard failed: %d\n", GetLastError()); /* sequence changes again, even though it was already empty */ - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( count, "WM_DESTROYCLIPBOARD not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 1, 0); count = SendMessageA( win, WM_USER+5, 0, 0 ); ok( !count, "wrong format count %u on WM_DESTROYCLIPBOARD\n", count ); handle = SetClipboardData( CF_TEXT, create_textA() ); ok(handle != 0, "SetClipboardData failed: %d\n", GetLastError()); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); SetClipboardData( CF_UNICODETEXT, 0 ); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); SetClipboardData( CF_UNICODETEXT, 0 ); /* same data again */ - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); ok( IsClipboardFormatAvailable( CF_TEXT ), "CF_TEXT available\n" ); ok( IsClipboardFormatAvailable( CF_UNICODETEXT ), "CF_UNICODETEXT available\n" ); @@ -1198,40 +1119,12 @@ static DWORD WINAPI clipboard_thread(void *param) ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 2, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 2, 1, 1, 0, 0); r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 0, 0, 0, 0); ok( IsClipboardFormatAvailable( CF_TEXT ), "CF_TEXT available\n" ); ok( IsClipboardFormatAvailable( CF_UNICODETEXT ), "CF_UNICODETEXT available\n" ); @@ -1251,65 +1144,19 @@ static DWORD WINAPI clipboard_thread(void *param) do_render_format = FALSE; SetClipboardData( CF_WAVE, 0 ); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 1, 0, 0, 0, 0); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); /* no synthesized format, so CloseClipboard doesn't change the sequence */ - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 0, 1, 1, 0, 0); r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); /* nothing changed */ - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( !count, "WM_DESTROYCLIPBOARD received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 0, 0, 0, 0, 0); formats = CountClipboardFormats(); r = OpenClipboard(0); @@ -1319,195 +1166,67 @@ static DWORD WINAPI clipboard_thread(void *param) r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( count == 1, "WM_DESTROYCLIPBOARD not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 1, 1, 1, 1, 0); count = SendMessageA( win, WM_USER+5, 0, 0 ); ok( count == formats, "wrong format count %u on WM_DESTROYCLIPBOARD\n", count ); r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_FIXED, 1 )); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 2, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( !count, "WM_DESTROYCLIPBOARD received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 1, 0, 0, 0, 0); EnterCriticalSection(&clipboard_cs); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 1, 0, 0); run_process( "grab_clipboard 0" ); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; if (!cross_thread) { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); /* in this case we get a cross-thread WM_DRAWCLIPBOARD */ cross_thread = TRUE; while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); cross_thread = FALSE; } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 1, 1, 0, 0); r = OpenClipboard(0); ok(r, "OpenClipboard failed: %d\n", GetLastError()); SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_FIXED, 1 )); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); EnterCriticalSection(&clipboard_cs); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 1, 0, 0); run_process( "grab_clipboard 1" ); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 2, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; if (!cross_thread) { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); /* in this case we get a cross-thread WM_DRAWCLIPBOARD */ cross_thread = TRUE; while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); cross_thread = FALSE; } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 2, 1, 1, 0, 0); r = OpenClipboard(0); ok(r, "OpenClipboard failed: %d\n", GetLastError()); SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_FIXED, 1 )); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); EnterCriticalSection(&clipboard_cs); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 1, 0, 0); if (cross_thread) { @@ -1522,16 +1241,9 @@ static DWORD WINAPI clipboard_thread(void *param) do_render_format = TRUE; old_seq = GetClipboardSequenceNumber(); run_process( "get_clipboard_data" ); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); do_render_format = FALSE; - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener) /* < Vista */, "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( fmt == CF_TEXT, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 1, 0, CF_TEXT); } r = PostMessageA(win, WM_USER, 0, 0); -- 2.7.4

1 1

[PATCH 1/2] user32/tests: Add a helper to check clipboard sequence and messages.
by Zebediah Figura 29 Jan '18

29 Jan '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/tests/clipboard.c | 390 ++++++------------------------------------ 1 file changed, 51 insertions(+), 339 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index aa3bd04..4fd37fa 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -995,13 +995,41 @@ static void get_clipboard_data_process(void) ok(r, "CloseClipboard failed: %d\n", GetLastError()); } +static UINT old_seq; + +static void check_messages_(int line, HWND win, UINT seq_diff, UINT draw, UINT update, UINT destroy, UINT render) +{ + MSG msg; + UINT count, fmt, seq; + + seq = GetClipboardSequenceNumber(); + ok_(__FILE__, line)(seq - old_seq == seq_diff, "sequence diff %d\n", seq - old_seq); + old_seq = seq; + + if (!cross_thread) + { + while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); + } + + count = SendMessageA( win, WM_USER + 1, 0, 0 ); + ok_(__FILE__, line)(count == draw, "WM_DRAWCLIPBOARD %sreceived\n", draw ? "not " : ""); + count = SendMessageA( win, WM_USER + 2, 0, 0 ); + ok_(__FILE__, line)(count == update || broken(!pAddClipboardFormatListener), + "WM_CLIPBOARDUPDATE %sreceived\n", update ? "not " : ""); + count = SendMessageA( win, WM_USER + 3, 0, 0 ); + ok_(__FILE__, line)(count == destroy, "WM_DESTROYCLIPBOARD %sreceived\n", destroy ? "not " : ""); + fmt = SendMessageA( win, WM_USER + 4, 0, 0 ); + ok_(__FILE__, line)(fmt == render, "WM_RENDERFORMAT received %04x, expected %04x\n", fmt, render); +} +#define check_messages(a,b,c,d,e,f) check_messages_(__LINE__,a,b,c,d,e,f) + static DWORD WINAPI clipboard_thread(void *param) { HWND ret, win = param; BOOL r; MSG msg; HANDLE handle; - UINT count, fmt, formats, old_seq = 0, seq; + UINT count, fmt, formats; cross_thread = (GetWindowThreadProcessId( win, NULL ) != GetCurrentThreadId()); trace( "%s-threaded test\n", cross_thread ? "multi" : "single" ); @@ -1045,21 +1073,7 @@ static DWORD WINAPI clipboard_thread(void *param) ok( r, "RemoveClipboardFormatListener failed err %d\n", GetLastError()); } - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER + 1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 0, 0, 0); SetLastError( 0xdeadbeef ); r = OpenClipboard( (HWND)0xdead ); @@ -1069,125 +1083,32 @@ static DWORD WINAPI clipboard_thread(void *param) r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 0, 0, 0, 0); r = EmptyClipboard(); ok(r, "EmptyClipboard failed: %d\n", GetLastError()); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( !count, "WM_DESTROYCLIPBOARD received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); r = EmptyClipboard(); ok(r, "EmptyClipboard failed: %d\n", GetLastError()); /* sequence changes again, even though it was already empty */ - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( count, "WM_DESTROYCLIPBOARD not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 1, 0); count = SendMessageA( win, WM_USER+5, 0, 0 ); ok( !count, "wrong format count %u on WM_DESTROYCLIPBOARD\n", count ); handle = SetClipboardData( CF_TEXT, create_textA() ); ok(handle != 0, "SetClipboardData failed: %d\n", GetLastError()); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); SetClipboardData( CF_UNICODETEXT, 0 ); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); SetClipboardData( CF_UNICODETEXT, 0 ); /* same data again */ - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); ok( IsClipboardFormatAvailable( CF_TEXT ), "CF_TEXT available\n" ); ok( IsClipboardFormatAvailable( CF_UNICODETEXT ), "CF_UNICODETEXT available\n" ); @@ -1198,40 +1119,12 @@ static DWORD WINAPI clipboard_thread(void *param) ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 2, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 2, 1, 1, 0, 0); r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 0, 0, 0, 0); ok( IsClipboardFormatAvailable( CF_TEXT ), "CF_TEXT available\n" ); ok( IsClipboardFormatAvailable( CF_UNICODETEXT ), "CF_UNICODETEXT available\n" ); @@ -1251,65 +1144,19 @@ static DWORD WINAPI clipboard_thread(void *param) do_render_format = FALSE; SetClipboardData( CF_WAVE, 0 ); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 1, 0, 0, 0, 0); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); /* no synthesized format, so CloseClipboard doesn't change the sequence */ - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 0, 1, 1, 0, 0); r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); /* nothing changed */ - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( !count, "WM_DESTROYCLIPBOARD received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 0, 0, 0, 0, 0); formats = CountClipboardFormats(); r = OpenClipboard(0); @@ -1319,195 +1166,67 @@ static DWORD WINAPI clipboard_thread(void *param) r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( count == 1, "WM_DESTROYCLIPBOARD not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 1, 1, 1, 1, 0); count = SendMessageA( win, WM_USER+5, 0, 0 ); ok( count == formats, "wrong format count %u on WM_DESTROYCLIPBOARD\n", count ); r = OpenClipboard(win); ok(r, "OpenClipboard failed: %d\n", GetLastError()); SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_FIXED, 1 )); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 2, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - count = SendMessageA( win, WM_USER+3, 0, 0 ); - ok( !count, "WM_DESTROYCLIPBOARD received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received %04x\n", fmt ); + check_messages(win, 1, 0, 0, 0, 0); EnterCriticalSection(&clipboard_cs); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 1, 0, 0); run_process( "grab_clipboard 0" ); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; if (!cross_thread) { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); /* in this case we get a cross-thread WM_DRAWCLIPBOARD */ cross_thread = TRUE; while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); cross_thread = FALSE; } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 1, 1, 0, 0); r = OpenClipboard(0); ok(r, "OpenClipboard failed: %d\n", GetLastError()); SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_FIXED, 1 )); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); EnterCriticalSection(&clipboard_cs); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 1, 0, 0); run_process( "grab_clipboard 1" ); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 2, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; if (!cross_thread) { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); /* in this case we get a cross-thread WM_DRAWCLIPBOARD */ cross_thread = TRUE; while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); cross_thread = FALSE; } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 2, 1, 1, 0, 0); r = OpenClipboard(0); ok(r, "OpenClipboard failed: %d\n", GetLastError()); SetClipboardData( CF_WAVE, GlobalAlloc( GMEM_FIXED, 1 )); - seq = GetClipboardSequenceNumber(); - ok( (int)(seq - old_seq) == 1, "sequence diff %d\n", seq - old_seq ); - old_seq = seq; - if (!cross_thread) - { - ok( !wm_drawclipboard, "WM_DRAWCLIPBOARD received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( !count, "WM_DRAWCLIPBOARD received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( !count, "WM_CLIPBOARDUPDATE received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 1, 0, 0, 0, 0); EnterCriticalSection(&clipboard_cs); r = CloseClipboard(); ok(r, "CloseClipboard failed: %d\n", GetLastError()); LeaveCriticalSection(&clipboard_cs); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); - old_seq = seq; - if (!cross_thread) - { - ok( wm_drawclipboard == 1, "WM_DRAWCLIPBOARD not received\n" ); - ok( !wm_clipboardupdate, "WM_CLIPBOARDUPDATE received\n" ); - ok( !wm_renderformat, "WM_RENDERFORMAT received\n" ); - while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); - } - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener), "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( !fmt, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 1, 0, 0); if (cross_thread) { @@ -1522,16 +1241,9 @@ static DWORD WINAPI clipboard_thread(void *param) do_render_format = TRUE; old_seq = GetClipboardSequenceNumber(); run_process( "get_clipboard_data" ); - seq = GetClipboardSequenceNumber(); - ok( seq == old_seq, "sequence changed\n" ); do_render_format = FALSE; - count = SendMessageA( win, WM_USER+1, 0, 0 ); - ok( count == 1, "WM_DRAWCLIPBOARD not received\n" ); - count = SendMessageA( win, WM_USER+2, 0, 0 ); - ok( count == 1 || broken(!pAddClipboardFormatListener) /* < Vista */, "WM_CLIPBOARDUPDATE not received\n" ); - fmt = SendMessageA( win, WM_USER+4, 0, 0 ); - ok( fmt == CF_TEXT, "WM_RENDERFORMAT received\n" ); + check_messages(win, 0, 1, 1, 0, CF_TEXT); } r = PostMessageA(win, WM_USER, 0, 0); -- 2.7.4

1 1

[PATCH] browseui: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 29 Jan '18

29 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/browseui/aclmulti.c | 1 + dlls/browseui/aclsource.c | 1 + dlls/browseui/browseui.h | 21 --------------------- dlls/browseui/browseui_main.c | 1 + dlls/browseui/compcatcachedaemon.c | 1 + dlls/browseui/progressdlg.c | 1 + 6 files changed, 5 insertions(+), 21 deletions(-) diff --git a/dlls/browseui/aclmulti.c b/dlls/browseui/aclmulti.c index 3a6525fc7a..412a18d3ab 100644 --- a/dlls/browseui/aclmulti.c +++ b/dlls/browseui/aclmulti.c @@ -36,6 +36,7 @@ #include "shlguid.h" #include "shlobj.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "browseui.h" diff --git a/dlls/browseui/aclsource.c b/dlls/browseui/aclsource.c index 71e9d39a71..0ade9cce55 100644 --- a/dlls/browseui/aclsource.c +++ b/dlls/browseui/aclsource.c @@ -36,6 +36,7 @@ #include "shlguid.h" #include "shlobj.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "browseui.h" diff --git a/dlls/browseui/browseui.h b/dlls/browseui/browseui.h index 27691a1cce..73780f1ce2 100644 --- a/dlls/browseui/browseui.h +++ b/dlls/browseui/browseui.h @@ -31,25 +31,4 @@ extern HRESULT ACLShellSource_Constructor(IUnknown *punkOuter, IUnknown **ppOut) extern const GUID CLSID_CompCatCacheDaemon; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - if (!mem) return heap_alloc(size); - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - #endif /* __WINE_BROWSEUI_H */ diff --git a/dlls/browseui/browseui_main.c b/dlls/browseui/browseui_main.c index 1b3cecc996..2e31b37fc8 100644 --- a/dlls/browseui/browseui_main.c +++ b/dlls/browseui/browseui_main.c @@ -34,6 +34,7 @@ #include "shlguid.h" #include "rpcproxy.h" +#include "wine/heap.h" #include "browseui.h" #include "initguid.h" diff --git a/dlls/browseui/compcatcachedaemon.c b/dlls/browseui/compcatcachedaemon.c index a5c97e9507..1f62441727 100644 --- a/dlls/browseui/compcatcachedaemon.c +++ b/dlls/browseui/compcatcachedaemon.c @@ -36,6 +36,7 @@ #include "shlguid.h" #include "shlobj.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "browseui.h" diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 24183bdc04..09c1996a59 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -36,6 +36,7 @@ #include "shlguid.h" #include "shlobj.h" +#include "wine/heap.h" #include "wine/unicode.h" #include "browseui.h" -- 2.14.3

1 0

[PATCH] atl: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 29 Jan '18

29 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/atl/atl.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/atl/atl.c b/dlls/atl/atl.c index 0e48a391d9..e753429327 100644 --- a/dlls/atl/atl.c +++ b/dlls/atl/atl.c @@ -23,6 +23,7 @@ #include "atlcom.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(atl); @@ -33,16 +34,6 @@ HINSTANCE atl_instance; typedef unsigned char cpp_bool; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static ICatRegister *catreg; /*********************************************************************** -- 2.14.3

1 0

[PATCH] appwiz.cpl: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 29 Jan '18

29 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/appwiz.cpl/appwiz.h | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.h b/dlls/appwiz.cpl/appwiz.h index 1e60daf6c3..2165ce11b1 100644 --- a/dlls/appwiz.cpl/appwiz.h +++ b/dlls/appwiz.cpl/appwiz.h @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "wine/heap.h" #include "wine/unicode.h" typedef enum { @@ -27,21 +28,6 @@ BOOL install_addon(addon_t) DECLSPEC_HIDDEN; extern HINSTANCE hInst DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) -{ - return HeapAlloc(GetProcessHeap(), 0, len); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t len) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, len); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *heap_strdupW(const WCHAR *str) { WCHAR *ret; -- 2.14.3

1 0

[PATCH] advpack: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 29 Jan '18

29 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advpack/advpack_private.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/advpack/advpack_private.h b/dlls/advpack/advpack_private.h index 252974f8ea..fc3b26f393 100644 --- a/dlls/advpack/advpack_private.h +++ b/dlls/advpack/advpack_private.h @@ -21,22 +21,14 @@ #ifndef __ADVPACK_PRIVATE_H #define __ADVPACK_PRIVATE_H +#include "wine/heap.h" + HRESULT do_ocx_reg(HMODULE hocx, BOOL do_reg, const WCHAR *flags, const WCHAR *param) DECLSPEC_HIDDEN; LPWSTR get_parameter(LPWSTR *params, WCHAR separator, BOOL quoted) DECLSPEC_HIDDEN; void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) DECLSPEC_HIDDEN; HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline char *heap_strdupWtoA(const WCHAR *str) { char *ret = NULL; -- 2.14.3

1 0

[PATCH] advapi32: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 29 Jan '18

29 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advapi32/advapi32_misc.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index 7fc02a4a2e..4ced1e8a64 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -23,6 +23,7 @@ #include "ntsecapi.h" #include "winsvc.h" #include "winnls.h" +#include "wine/heap.h" const char * debugstr_sid(PSID sid) DECLSPEC_HIDDEN; BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName) DECLSPEC_HIDDEN; @@ -38,26 +39,6 @@ const WCHAR *get_wellknown_privilege_name(const LUID *) DECLSPEC_HIDDEN; /* memory allocation functions */ -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline WCHAR *strdupAW( const char *src ) { WCHAR *dst = NULL; -- 2.14.3

1 0

[PATCH] comctl32/toolbar: Fix a TRACE
by Mark Jansen 29 Jan '18

29 Jan '18

Fix a TRACE that tries to print -1 as string.

1 0

[PATCH] user32/tests: Add more A/W message data conversion tests
by Nikolay Sivov 29 Jan '18

29 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/dialog.c | 63 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 55 insertions(+), 8 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index cbe4b2b1d8..19f220d8b3 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1237,8 +1237,17 @@ static INT_PTR CALLBACK TestControlStyleDlgProc(HWND hdlg, UINT msg, } static const WCHAR testtextW[] = {'W','n','d','T','e','x','t',0}; + +enum defdlgproc_text +{ + DLGPROCTEXT_CONTEXT = 0, + DLGPROCTEXT_A, + DLGPROCTEXT_W, +}; + static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { + int mode = (int)GetPropA(hdlg, "test_mode"); WCHAR *text = (WCHAR *)lparam; char *textA = (char *)lparam; @@ -1251,12 +1260,28 @@ static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM case LB_DIR: case LB_ADDFILE: case EM_REPLACESEL: - if (IsWindowUnicode(hdlg)) - todo_wine - ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); - else - todo_wine + switch (mode) + { + case DLGPROCTEXT_A: + todo_wine_if(!IsWindowUnicode(hdlg)) ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); + break; + case DLGPROCTEXT_W: + if (msg == WM_SETTEXT && !IsWindowUnicode(hdlg)) + todo_wine + ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); + else + todo_wine_if(IsWindowUnicode(hdlg)) + ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); + break; + default: + if (IsWindowUnicode(hdlg)) + todo_wine + ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); + else + todo_wine + ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); + } break; }; @@ -1265,6 +1290,7 @@ static INT_PTR CALLBACK test_aw_conversion_dlgprocA(HWND hdlg, UINT msg, WPARAM static INT_PTR CALLBACK test_aw_conversion_dlgprocW(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) { + int mode = (int)GetPropA(hdlg, "test_mode"); WCHAR *text = (WCHAR *)lparam; char *textA = (char *)lparam; @@ -1277,10 +1303,22 @@ static INT_PTR CALLBACK test_aw_conversion_dlgprocW(HWND hdlg, UINT msg, WPARAM case LB_DIR: case LB_ADDFILE: case EM_REPLACESEL: - if (IsWindowUnicode(hdlg)) - ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); - else + switch (mode) + { + case DLGPROCTEXT_A: + todo_wine_if(IsWindowUnicode(hdlg)) ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); + break; + case DLGPROCTEXT_W: + todo_wine_if(!IsWindowUnicode(hdlg)) + ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); + break; + default: + if (IsWindowUnicode(hdlg)) + ok(!lstrcmpW(text, testtextW), "Unexpected text %s.\n", wine_dbgstr_w(text)); + else + ok(!strcmp(textA, "WndText"), "Unexpected text %s.\n", textA); + } break; } @@ -1291,11 +1329,20 @@ static void dlg_test_aw_message(HWND hdlg, UINT msg) { LRESULT ret; + SetPropA(hdlg, "test_mode", DLGPROCTEXT_CONTEXT); ret = SendMessageA(hdlg, msg, 0, (LPARAM)"WndText"); ok(ret == 0, "Unexpected retval %ld.\n", ret); ret = SendMessageW(hdlg, msg, 0, (LPARAM)testtextW); ok(ret == 0, "Unexpected retval %ld.\n", ret); + + SetPropA(hdlg, "test_mode", (void *)DLGPROCTEXT_A); + ret = DefDlgProcA(hdlg, msg, 0, (LPARAM)"WndText"); + ok(ret == 0, "Unexpected retval %ld.\n", ret); + + SetPropA(hdlg, "test_mode", (void *)DLGPROCTEXT_W); + ret = DefDlgProcW(hdlg, msg, 0, (LPARAM)testtextW); + ok(ret == 0, "Unexpected retval %ld.\n", ret); } static INT_PTR CALLBACK test_aw_conversion_dlgproc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) -- 2.15.1

1 0

[PATCH 1/5] dxgi: Allow wrapping adapter objects.
by Józef Kucia 29 Jan '18

29 Jan '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- For RenderDoc in Wine. --- dlls/dxgi/adapter.c | 18 +++++++++++++++--- include/wine/winedxgi.idl | 9 +++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 5440f2a64517..2ebf24e9b48e 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -33,7 +33,8 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_QueryInterface(IDXGIAdapter1 *ifac { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - if (IsEqualGUID(iid, &IID_IDXGIAdapter1) + if (IsEqualGUID(iid, &IID_IWineDXGIAdapter) + || IsEqualGUID(iid, &IID_IDXGIAdapter1) || IsEqualGUID(iid, &IID_IDXGIAdapter) || IsEqualGUID(iid, &IID_IDXGIObject) || IsEqualGUID(iid, &IID_IUnknown)) @@ -260,10 +261,21 @@ static const struct IDXGIAdapter1Vtbl dxgi_adapter_vtbl = struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter1(IDXGIAdapter1 *iface) { + IWineDXGIAdapter *wine_adapter; + struct dxgi_adapter *adapter; + HRESULT hr; + if (!iface) return NULL; - assert(iface->lpVtbl == &dxgi_adapter_vtbl); - return CONTAINING_RECORD(iface, struct dxgi_adapter, IDXGIAdapter1_iface); + if (FAILED(hr = IDXGIAdapter1_QueryInterface(iface, &IID_IWineDXGIAdapter, (void **)&wine_adapter))) + { + ERR("Failed to get IWineDXGIAdapter interface, hr %#x.\n", hr); + return NULL; + } + assert(wine_adapter->lpVtbl == (void *)&dxgi_adapter_vtbl); + adapter = CONTAINING_RECORD(wine_adapter, struct dxgi_adapter, IDXGIAdapter1_iface); + IWineDXGIAdapter_Release(wine_adapter); + return adapter; } static void dxgi_adapter_init(struct dxgi_adapter *adapter, struct dxgi_factory *factory, UINT ordinal) diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index a4f715b60766..983cdba68d14 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -50,3 +50,12 @@ interface IWineDXGIDeviceParent : IUnknown { struct wined3d_device_parent *get_wined3d_device_parent(); } + +[ + object, + local, + uuid(17399d75-964e-4c03-99f8-9d4fd196dd62) +] +interface IWineDXGIAdapter : IDXGIAdapter1 +{ +} -- 2.13.6

4 8

[PATCH] crypt32: Added support for szOID_NIST_sha* OIDs.
by Jacek Caban 29 Jan '18

29 Jan '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/crypt32/oid.c | 7 +++++++ dlls/crypt32/tests/oid.c | 25 ++++++++++++++++++++----- include/wincrypt.h | 3 +++ 3 files changed, 30 insertions(+), 5 deletions(-)

1 0

[PATCH 5/5] wined3d: Use the resource access flags in ffp_blit_supported().
by Henri Verbeet 29 Jan '18

29 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index fb28117..520f88c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2664,18 +2664,19 @@ static void ffp_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_ HeapFree(GetProcessHeap(), 0, blitter); } -static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, - const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, - DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, DWORD src_location, - DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format, DWORD dst_location) +static BOOL ffp_blit_supported(enum wined3d_blit_op blit_op, const struct wined3d_context *context, + const struct wined3d_resource *src_resource, DWORD src_location, + const struct wined3d_resource *dst_resource, DWORD dst_location) { + const struct wined3d_format *src_format = src_resource->format; + const struct wined3d_format *dst_format = dst_resource->format; BOOL decompress; decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); - if (!decompress && (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM)) + if (!decompress && !(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) { - TRACE("Source or destination is in system memory.\n"); + TRACE("Source or destination resource is not GPU accessible.\n"); return FALSE; } @@ -2690,14 +2691,14 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, switch (blit_op) { case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: - if (d3d_info->shader_color_key) + if (context->d3d_info->shader_color_key) { TRACE("Color keying requires converted textures.\n"); return FALSE; } case WINED3D_BLIT_OP_COLOR_BLIT: case WINED3D_BLIT_OP_COLOR_BLIT_ALPHATEST: - if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + if (!context->gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) return FALSE; if (TRACE_ON(d3d)) @@ -2722,7 +2723,7 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, } } - if (!(dst_usage & WINED3DUSAGE_RENDERTARGET)) + if (!(dst_resource->usage & WINED3DUSAGE_RENDERTARGET)) { TRACE("Can only blit to render targets.\n"); return FALSE; @@ -2821,9 +2822,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit dst_resource = &dst_texture->resource; device = dst_resource->device; - if (!ffp_blit_supported(&device->adapter->gl_info, &device->adapter->d3d_info, op, - src_resource->usage, src_resource->pool, src_resource->format, src_location, - dst_resource->usage, dst_resource->pool, dst_resource->format, dst_location)) + if (!ffp_blit_supported(op, context, src_resource, src_location, dst_resource, dst_location)) { if ((next = blitter->next)) return next->ops->blitter_blit(next, op, context, src_surface, src_location, -- 2.1.4

1 0

[PATCH 4/5] wined3d: Use the resource access flags in fbo_blitter_supported().
by Henri Verbeet 29 Jan '18

29 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4e5940a..fb28117 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -484,25 +484,28 @@ static void surface_blt_fbo(const struct wined3d_device *device, context_restore(context, restore_rt); } -static BOOL fbo_blitter_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op, - DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, DWORD src_location, - DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format, DWORD dst_location) +static BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct wined3d_gl_info *gl_info, + const struct wined3d_resource *src_resource, DWORD src_location, + const struct wined3d_resource *dst_resource, DWORD dst_location) { + const struct wined3d_format *src_format = src_resource->format; + const struct wined3d_format *dst_format = dst_resource->format; + if ((wined3d_settings.offscreen_rendering_mode != ORM_FBO) || !gl_info->fbo_ops.glBlitFramebuffer) return FALSE; /* Source and/or destination need to be on the GL side */ - if (src_pool == WINED3D_POOL_SYSTEM_MEM || dst_pool == WINED3D_POOL_SYSTEM_MEM) + if (!(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) return FALSE; switch (blit_op) { case WINED3D_BLIT_OP_COLOR_BLIT: if (!((src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FBO_ATTACHABLE) - || (src_usage & WINED3DUSAGE_RENDERTARGET))) + || (src_resource->usage & WINED3DUSAGE_RENDERTARGET))) return FALSE; if (!((dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_FBO_ATTACHABLE) - || (dst_usage & WINED3DUSAGE_RENDERTARGET))) + || (dst_resource->usage & WINED3DUSAGE_RENDERTARGET))) return FALSE; if ((src_format->id != dst_format->id || dst_location == WINED3D_LOCATION_DRAWABLE) && (!is_identity_fixup(src_format->color_fixup) || !is_identity_fixup(dst_format->color_fixup))) @@ -2229,11 +2232,9 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, if (!depth && sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) && (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) - && fbo_blitter_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, - texture->resource.usage, texture->resource.pool, - texture->resource.format, WINED3D_LOCATION_TEXTURE_RGB, - texture->resource.usage, texture->resource.pool, - texture->resource.format, WINED3D_LOCATION_TEXTURE_SRGB)) + && fbo_blitter_supported(WINED3D_BLIT_OP_COLOR_BLIT, gl_info, + &texture->resource, WINED3D_LOCATION_TEXTURE_RGB, + &texture->resource, WINED3D_LOCATION_TEXTURE_SRGB)) { if (srgb) surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, WINED3D_LOCATION_TEXTURE_RGB, @@ -2252,9 +2253,8 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, WINED3D_LOCATION_RB_RESOLVED : WINED3D_LOCATION_RB_MULTISAMPLE; DWORD dst_location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; - if (fbo_blitter_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, - texture->resource.usage, texture->resource.pool, texture->resource.format, src_location, - texture->resource.usage, texture->resource.pool, texture->resource.format, dst_location)) + if (fbo_blitter_supported(WINED3D_BLIT_OP_COLOR_BLIT, gl_info, + &texture->resource, src_location, &texture->resource, dst_location)) surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, src_location, &src_rect, surface, dst_location, &src_rect); @@ -2470,9 +2470,8 @@ static DWORD fbo_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit blit_op = WINED3D_BLIT_OP_COLOR_BLIT; } - if (!fbo_blitter_supported(&device->adapter->gl_info, blit_op, - src_resource->usage, src_resource->pool, src_resource->format, src_location, - src_resource->usage, dst_resource->pool, dst_resource->format, dst_location)) + if (!fbo_blitter_supported(blit_op, context->gl_info, + src_resource, src_location, dst_resource, dst_location)) { if ((next = blitter->next)) return next->ops->blitter_blit(next, op, context, src_surface, src_location, -- 2.1.4

1 0

[PATCH 3/5] wined3d: Use the resource access flags in arbfp_blit_supported().
by Henri Verbeet 29 Jan '18

29 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 11141b6..a8c4abb 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7695,15 +7695,16 @@ static void arbfp_blit_unset(const struct wined3d_gl_info *gl_info) checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); } -static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, - const struct wined3d_d3d_info *d3d_info, enum wined3d_blit_op blit_op, - enum wined3d_pool src_pool, const struct wined3d_format *src_format, DWORD src_location, - enum wined3d_pool dst_pool, const struct wined3d_format *dst_format, DWORD dst_location) +static BOOL arbfp_blit_supported(enum wined3d_blit_op blit_op, const struct wined3d_context *context, + const struct wined3d_resource *src_resource, DWORD src_location, + const struct wined3d_resource *dst_resource, DWORD dst_location) { + const struct wined3d_format *src_format = src_resource->format; + const struct wined3d_format *dst_format = dst_resource->format; enum complex_fixup src_fixup; BOOL decompress; - if (!gl_info->supported[ARB_FRAGMENT_PROGRAM]) + if (!context->gl_info->supported[ARB_FRAGMENT_PROGRAM]) return FALSE; if (blit_op == WINED3D_BLIT_OP_RAW_BLIT && dst_format->id == src_format->id) @@ -7717,7 +7718,7 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, switch (blit_op) { case WINED3D_BLIT_OP_COLOR_BLIT_CKEY: - if (!d3d_info->shader_color_key) + if (!context->d3d_info->shader_color_key) { /* The conversion modifies the alpha channel so the color key might no longer match. */ TRACE("Color keying not supported with converted textures.\n"); @@ -7734,7 +7735,7 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, decompress = src_format && (src_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED) && !(dst_format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_COMPRESSED); - if (!decompress && (dst_pool == WINED3D_POOL_SYSTEM_MEM || src_pool == WINED3D_POOL_SYSTEM_MEM)) + if (!decompress && !(src_resource->access & dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) return FALSE; src_fixup = get_complex_fixup(src_format->color_fixup); @@ -7800,9 +7801,8 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl struct wined3d_blitter *next; RECT s, d; - if (!arbfp_blit_supported(&device->adapter->gl_info, &device->adapter->d3d_info, op, - src_texture->resource.pool, src_texture->resource.format, src_location, - dst_texture->resource.pool, dst_texture->resource.format, dst_location)) + if (!arbfp_blit_supported(op, context, &src_texture->resource, src_location, + &dst_texture->resource, dst_location)) { if ((next = blitter->next)) return next->ops->blitter_blit(next, op, context, src_surface, src_location, -- 2.1.4

1 0

[PATCH 2/5] wined3d: Get rid of WINED3D_POOL_SCRATCH.
by Henri Verbeet 29 Jan '18

29 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d8/buffer.c | 38 +++++++++++++++++++++++++++++--------- dlls/d3d8/d3d8_private.h | 12 ++++++++++++ dlls/d3d8/device.c | 6 ++++++ dlls/d3d8/surface.c | 4 ++-- dlls/d3d8/texture.c | 30 ++++++++++++++++++++++++------ dlls/d3d8/volume.c | 4 ++-- dlls/d3d9/buffer.c | 40 ++++++++++++++++++++++++++++++---------- dlls/d3d9/d3d9_private.h | 12 ++++++++++++ dlls/d3d9/device.c | 6 ++++++ dlls/d3d9/surface.c | 4 ++-- dlls/d3d9/texture.c | 30 ++++++++++++++++++++++++------ dlls/d3d9/volume.c | 4 ++-- dlls/wined3d/buffer.c | 4 ++-- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/resource.c | 10 ++++++++-- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/texture.c | 6 +++--- dlls/wined3d/utils.c | 1 - include/wine/wined3d.h | 2 +- 19 files changed, 169 insertions(+), 52 deletions(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 8116c1b..d0eaf83 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -227,12 +227,12 @@ static HRESULT WINAPI d3d8_vertexbuffer_GetDesc(IDirect3DVertexBuffer8 *iface, wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); wined3d_mutex_unlock(); + desc->Format = D3DFMT_VERTEXDATA; desc->Type = D3DRTYPE_VERTEXBUFFER; - desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; - desc->Pool = wined3d_desc.pool; + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Pool = d3dpool_from_wined3dpool(wined3d_desc.pool, wined3d_desc.usage); desc->Size = wined3d_desc.size; desc->FVF = buffer->fvf; - desc->Format = D3DFMT_VERTEXDATA; return D3D_OK; } @@ -273,15 +273,25 @@ static const struct wined3d_parent_ops d3d8_vertexbuffer_wined3d_parent_ops = HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device *device, UINT size, DWORD usage, DWORD fvf, D3DPOOL pool) { + enum wined3d_pool wined3d_pool; + DWORD wined3d_usage; HRESULT hr; + wined3d_pool = pool; + wined3d_usage = usage & WINED3DUSAGE_MASK; + if (pool == D3DPOOL_SCRATCH) + { + wined3d_pool = WINED3D_POOL_SYSTEM_MEM; + wined3d_usage |= WINED3DUSAGE_SCRATCH; + } + buffer->IDirect3DVertexBuffer8_iface.lpVtbl = &Direct3DVertexBuffer8_Vtbl; d3d8_resource_init(&buffer->resource); buffer->fvf = fvf; wined3d_mutex_lock(); - hr = wined3d_buffer_create_vb(device->wined3d_device, size, usage & WINED3DUSAGE_MASK, - (enum wined3d_pool)pool, buffer, &d3d8_vertexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); + hr = wined3d_buffer_create_vb(device->wined3d_device, size, wined3d_usage, wined3d_pool, + buffer, &d3d8_vertexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); wined3d_mutex_unlock(); if (FAILED(hr)) { @@ -512,8 +522,8 @@ static HRESULT WINAPI d3d8_indexbuffer_GetDesc(IDirect3DIndexBuffer8 *iface, desc->Format = d3dformat_from_wined3dformat(buffer->format); desc->Type = D3DRTYPE_INDEXBUFFER; - desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; - desc->Pool = wined3d_desc.pool; + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Pool = d3dpool_from_wined3dpool(wined3d_desc.pool, wined3d_desc.usage); desc->Size = wined3d_desc.size; return D3D_OK; @@ -555,15 +565,25 @@ static const struct wined3d_parent_ops d3d8_indexbuffer_wined3d_parent_ops = HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *device, UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) { + enum wined3d_pool wined3d_pool; + DWORD wined3d_usage; HRESULT hr; + wined3d_pool = pool; + wined3d_usage = usage & WINED3DUSAGE_MASK; + if (pool == D3DPOOL_SCRATCH) + { + wined3d_pool = WINED3D_POOL_SYSTEM_MEM; + wined3d_usage |= WINED3DUSAGE_SCRATCH; + } + buffer->IDirect3DIndexBuffer8_iface.lpVtbl = &d3d8_indexbuffer_vtbl; d3d8_resource_init(&buffer->resource); buffer->format = wined3dformat_from_d3dformat(format); wined3d_mutex_lock(); - hr = wined3d_buffer_create_ib(device->wined3d_device, size, usage & WINED3DUSAGE_MASK, - (enum wined3d_pool)pool, buffer, &d3d8_indexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); + hr = wined3d_buffer_create_ib(device->wined3d_device, size, wined3d_usage, wined3d_pool, + buffer, &d3d8_indexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); wined3d_mutex_unlock(); if (FAILED(hr)) { diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index e7dea35..bb739a3 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -275,4 +275,16 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_H void load_local_constants(const DWORD *d3d8_elements, struct wined3d_shader *wined3d_vertex_shader) DECLSPEC_HIDDEN; size_t parse_token(const DWORD *pToken) DECLSPEC_HIDDEN; +static inline DWORD d3dusage_from_wined3dusage(unsigned int usage) +{ + return usage & WINED3DUSAGE_MASK; +} + +static inline D3DPOOL d3dpool_from_wined3dpool(enum wined3d_pool pool, unsigned int usage) +{ + if (pool == WINED3D_POOL_SYSTEM_MEM && usage & WINED3DUSAGE_SCRATCH) + return D3DPOOL_SCRATCH; + return pool; +} + #endif /* __WINE_D3DX8_PRIVATE_H */ diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e7577d7..60e6e31 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1027,6 +1027,12 @@ static HRESULT d3d8_device_create_surface(struct d3d8_device *device, UINT width desc.depth = 1; desc.size = 0; + if (pool == D3DPOOL_SCRATCH) + { + desc.pool = WINED3D_POOL_SYSTEM_MEM; + desc.usage |= WINED3DUSAGE_SCRATCH; + } + wined3d_mutex_lock(); if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &desc, diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index 9b6b425..f71f4c3 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -191,8 +191,8 @@ static HRESULT WINAPI d3d8_surface_GetDesc(IDirect3DSurface8 *iface, D3DSURFACE_ desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_SURFACE; - desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; - desc->Pool = wined3d_desc.pool; + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Pool = d3dpool_from_wined3dpool(wined3d_desc.pool, wined3d_desc.usage); desc->Size = wined3d_desc.size; desc->MultiSampleType = wined3d_desc.multisample_type; desc->Width = wined3d_desc.width; diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index cb877dc..7be4046 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -253,8 +253,8 @@ static HRESULT WINAPI d3d8_texture_2d_GetLevelDesc(IDirect3DTexture8 *iface, UIN { desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_SURFACE; - desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; - desc->Pool = wined3d_desc.pool; + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Pool = d3dpool_from_wined3dpool(wined3d_desc.pool, wined3d_desc.usage); desc->Size = wined3d_desc.size; desc->MultiSampleType = wined3d_desc.multisample_type; desc->Width = wined3d_desc.width; @@ -600,8 +600,8 @@ static HRESULT WINAPI d3d8_texture_cube_GetLevelDesc(IDirect3DCubeTexture8 *ifac { desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_SURFACE; - desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; - desc->Pool = wined3d_desc.pool; + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Pool = d3dpool_from_wined3dpool(wined3d_desc.pool, wined3d_desc.usage); desc->Size = wined3d_desc.size; desc->MultiSampleType = wined3d_desc.multisample_type; desc->Width = wined3d_desc.width; @@ -945,8 +945,8 @@ static HRESULT WINAPI d3d8_texture_3d_GetLevelDesc(IDirect3DVolumeTexture8 *ifac { desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_VOLUME; - desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; - desc->Pool = wined3d_desc.pool; + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Pool = d3dpool_from_wined3dpool(wined3d_desc.pool, wined3d_desc.usage); desc->Size = wined3d_desc.size; desc->Width = wined3d_desc.width; desc->Height = wined3d_desc.height; @@ -1114,6 +1114,12 @@ HRESULT texture_init(struct d3d8_texture *texture, struct d3d8_device *device, desc.depth = 1; desc.size = 0; + if (pool == D3DPOOL_SCRATCH) + { + desc.pool = WINED3D_POOL_SYSTEM_MEM; + desc.usage |= WINED3DUSAGE_SCRATCH; + } + if (pool != D3DPOOL_DEFAULT || (usage & D3DUSAGE_DYNAMIC)) flags |= WINED3D_TEXTURE_CREATE_MAPPABLE; @@ -1159,6 +1165,12 @@ HRESULT cubetexture_init(struct d3d8_texture *texture, struct d3d8_device *devic desc.depth = 1; desc.size = 0; + if (pool == D3DPOOL_SCRATCH) + { + desc.pool = WINED3D_POOL_SYSTEM_MEM; + desc.usage |= WINED3DUSAGE_SCRATCH; + } + if (pool != D3DPOOL_DEFAULT || (usage & D3DUSAGE_DYNAMIC)) flags |= WINED3D_TEXTURE_CREATE_MAPPABLE; @@ -1203,6 +1215,12 @@ HRESULT volumetexture_init(struct d3d8_texture *texture, struct d3d8_device *dev desc.depth = depth; desc.size = 0; + if (pool == D3DPOOL_SCRATCH) + { + desc.pool = WINED3D_POOL_SYSTEM_MEM; + desc.usage |= WINED3DUSAGE_SCRATCH; + } + if (!levels) levels = wined3d_log2i(max(max(width, height), depth)) + 1; diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index fb3afb3..ad78ea7 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -125,8 +125,8 @@ static HRESULT WINAPI d3d8_volume_GetDesc(IDirect3DVolume8 *iface, D3DVOLUME_DES desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_VOLUME; - desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; - desc->Pool = wined3d_desc.pool; + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Pool = d3dpool_from_wined3dpool(wined3d_desc.pool, wined3d_desc.usage); desc->Size = wined3d_desc.size; desc->Width = wined3d_desc.width; desc->Height = wined3d_desc.height; diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index dc52d93..422dda0 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -229,10 +229,10 @@ static HRESULT WINAPI d3d9_vertexbuffer_GetDesc(IDirect3DVertexBuffer9 *iface, wined3d_mutex_unlock(); desc->Format = D3DFMT_VERTEXDATA; - desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; - desc->Pool = wined3d_desc.pool; - desc->Size = wined3d_desc.size; desc->Type = D3DRTYPE_VERTEXBUFFER; + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Pool = d3dpool_from_wined3dpool(wined3d_desc.pool, wined3d_desc.usage); + desc->Size = wined3d_desc.size; desc->FVF = buffer->fvf; return D3D_OK; @@ -274,15 +274,25 @@ static const struct wined3d_parent_ops d3d9_vertexbuffer_wined3d_parent_ops = HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device *device, UINT size, UINT usage, DWORD fvf, D3DPOOL pool) { + enum wined3d_pool wined3d_pool; + DWORD wined3d_usage; HRESULT hr; + wined3d_pool = pool; + wined3d_usage = usage & WINED3DUSAGE_MASK; + if (pool == D3DPOOL_SCRATCH) + { + wined3d_pool = WINED3D_POOL_SYSTEM_MEM; + wined3d_usage |= WINED3DUSAGE_SCRATCH; + } + buffer->IDirect3DVertexBuffer9_iface.lpVtbl = &d3d9_vertexbuffer_vtbl; buffer->fvf = fvf; d3d9_resource_init(&buffer->resource); wined3d_mutex_lock(); - hr = wined3d_buffer_create_vb(device->wined3d_device, size, usage & WINED3DUSAGE_MASK, - (enum wined3d_pool)pool, buffer, &d3d9_vertexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); + hr = wined3d_buffer_create_vb(device->wined3d_device, size, wined3d_usage, wined3d_pool, + buffer, &d3d9_vertexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); wined3d_mutex_unlock(); if (FAILED(hr)) { @@ -510,10 +520,10 @@ static HRESULT WINAPI d3d9_indexbuffer_GetDesc(IDirect3DIndexBuffer9 *iface, D3D wined3d_mutex_unlock(); desc->Format = d3dformat_from_wined3dformat(buffer->format); - desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; - desc->Pool = wined3d_desc.pool; - desc->Size = wined3d_desc.size; desc->Type = D3DRTYPE_INDEXBUFFER; + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Pool = d3dpool_from_wined3dpool(wined3d_desc.pool, wined3d_desc.usage); + desc->Size = wined3d_desc.size; return D3D_OK; } @@ -554,15 +564,25 @@ static const struct wined3d_parent_ops d3d9_indexbuffer_wined3d_parent_ops = HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *device, UINT size, DWORD usage, D3DFORMAT format, D3DPOOL pool) { + enum wined3d_pool wined3d_pool; + DWORD wined3d_usage; HRESULT hr; + wined3d_pool = pool; + wined3d_usage = usage & WINED3DUSAGE_MASK; + if (pool == D3DPOOL_SCRATCH) + { + wined3d_pool = WINED3D_POOL_SYSTEM_MEM; + wined3d_usage |= WINED3DUSAGE_SCRATCH; + } + buffer->IDirect3DIndexBuffer9_iface.lpVtbl = &d3d9_indexbuffer_vtbl; buffer->format = wined3dformat_from_d3dformat(format); d3d9_resource_init(&buffer->resource); wined3d_mutex_lock(); - hr = wined3d_buffer_create_ib(device->wined3d_device, size, usage & WINED3DUSAGE_MASK, - (enum wined3d_pool)pool, buffer, &d3d9_indexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); + hr = wined3d_buffer_create_ib(device->wined3d_device, size, wined3d_usage, wined3d_pool, + buffer, &d3d9_indexbuffer_wined3d_parent_ops, &buffer->wined3d_buffer); wined3d_mutex_unlock(); if (FAILED(hr)) { diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 7cbb540..aade880 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -278,4 +278,16 @@ static inline struct d3d9_device *impl_from_IDirect3DDevice9Ex(IDirect3DDevice9E return CONTAINING_RECORD(iface, struct d3d9_device, IDirect3DDevice9Ex_iface); } +static inline DWORD d3dusage_from_wined3dusage(unsigned int usage) +{ + return usage & WINED3DUSAGE_MASK; +} + +static inline D3DPOOL d3dpool_from_wined3dpool(enum wined3d_pool pool, unsigned int usage) +{ + if (pool == WINED3D_POOL_SYSTEM_MEM && usage & WINED3DUSAGE_SCRATCH) + return D3DPOOL_SCRATCH; + return pool; +} + #endif /* __WINE_D3D9_PRIVATE_H */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0a76227..c5348a4 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1283,6 +1283,12 @@ static HRESULT d3d9_device_create_surface(struct d3d9_device *device, UINT width desc.depth = 1; desc.size = 0; + if (pool == D3DPOOL_SCRATCH) + { + desc.pool = WINED3D_POOL_SYSTEM_MEM; + desc.usage |= WINED3DUSAGE_SCRATCH; + } + if (is_gdi_compat_wined3dformat(desc.format)) flags |= WINED3D_TEXTURE_CREATE_GET_DC; diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 3c01efc..a5b1b08 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -223,8 +223,8 @@ static HRESULT WINAPI d3d9_surface_GetDesc(IDirect3DSurface9 *iface, D3DSURFACE_ desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_SURFACE; - desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; - desc->Pool = wined3d_desc.pool; + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Pool = d3dpool_from_wined3dpool(wined3d_desc.pool, wined3d_desc.usage); desc->MultiSampleType = wined3d_desc.multisample_type; desc->MultiSampleQuality = wined3d_desc.multisample_quality; desc->Width = wined3d_desc.width; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 96c8bc3..bdbaa25 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -289,8 +289,8 @@ static HRESULT WINAPI d3d9_texture_2d_GetLevelDesc(IDirect3DTexture9 *iface, UIN { desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_SURFACE; - desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; - desc->Pool = wined3d_desc.pool; + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Pool = d3dpool_from_wined3dpool(wined3d_desc.pool, wined3d_desc.usage); desc->MultiSampleType = wined3d_desc.multisample_type; desc->MultiSampleQuality = wined3d_desc.multisample_quality; desc->Width = wined3d_desc.width; @@ -676,8 +676,8 @@ static HRESULT WINAPI d3d9_texture_cube_GetLevelDesc(IDirect3DCubeTexture9 *ifac { desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_SURFACE; - desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; - desc->Pool = wined3d_desc.pool; + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Pool = d3dpool_from_wined3dpool(wined3d_desc.pool, wined3d_desc.usage); desc->MultiSampleType = wined3d_desc.multisample_type; desc->MultiSampleQuality = wined3d_desc.multisample_quality; desc->Width = wined3d_desc.width; @@ -1059,8 +1059,8 @@ static HRESULT WINAPI d3d9_texture_3d_GetLevelDesc(IDirect3DVolumeTexture9 *ifac { desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_VOLUME; - desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; - desc->Pool = wined3d_desc.pool; + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Pool = d3dpool_from_wined3dpool(wined3d_desc.pool, wined3d_desc.usage); desc->Width = wined3d_desc.width; desc->Height = wined3d_desc.height; desc->Depth = wined3d_desc.depth; @@ -1226,6 +1226,12 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device, desc.depth = 1; desc.size = 0; + if (pool == D3DPOOL_SCRATCH) + { + desc.pool = WINED3D_POOL_SYSTEM_MEM; + desc.usage |= WINED3DUSAGE_SCRATCH; + } + if (pool != D3DPOOL_DEFAULT || (usage & D3DUSAGE_DYNAMIC)) flags |= WINED3D_TEXTURE_CREATE_MAPPABLE; @@ -1279,6 +1285,12 @@ HRESULT cubetexture_init(struct d3d9_texture *texture, struct d3d9_device *devic desc.depth = 1; desc.size = 0; + if (pool == D3DPOOL_SCRATCH) + { + desc.pool = WINED3D_POOL_SYSTEM_MEM; + desc.usage |= WINED3DUSAGE_SCRATCH; + } + if (pool != D3DPOOL_DEFAULT || (usage & D3DUSAGE_DYNAMIC)) flags |= WINED3D_TEXTURE_CREATE_MAPPABLE; @@ -1331,6 +1343,12 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev desc.depth = depth; desc.size = 0; + if (pool == D3DPOOL_SCRATCH) + { + desc.pool = WINED3D_POOL_SYSTEM_MEM; + desc.usage |= WINED3DUSAGE_SCRATCH; + } + if (!levels) { if (usage & D3DUSAGE_AUTOGENMIPMAP) diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 0346f98..795da2f 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -126,8 +126,8 @@ static HRESULT WINAPI d3d9_volume_GetDesc(IDirect3DVolume9 *iface, D3DVOLUME_DES desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format); desc->Type = D3DRTYPE_VOLUME; - desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK; - desc->Pool = wined3d_desc.pool; + desc->Usage = d3dusage_from_wined3dusage(wined3d_desc.usage); + desc->Pool = d3dpool_from_wined3dpool(wined3d_desc.pool, wined3d_desc.usage); desc->Width = wined3d_desc.width; desc->Height = wined3d_desc.height; desc->Depth = wined3d_desc.depth; diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e953e9a..49b189e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1453,11 +1453,11 @@ HRESULT CDECL wined3d_buffer_create_vb(struct wined3d_device *device, UINT size, TRACE("device %p, size %u, usage %#x, pool %#x, parent %p, parent_ops %p, buffer %p.\n", device, size, usage, pool, parent, parent_ops, buffer); - if (pool == WINED3D_POOL_SCRATCH) + if (usage & WINED3DUSAGE_SCRATCH) { /* The d3d9 tests shows that this is not allowed. It doesn't make much * sense anyway, SCRATCH buffers wouldn't be usable anywhere. */ - WARN("Vertex buffer in WINED3D_POOL_SCRATCH requested, returning WINED3DERR_INVALIDCALL.\n"); + WARN("Vertex buffer with WINED3DUSAGE_SCRATCH requested, returning WINED3DERR_INVALIDCALL.\n"); *buffer = NULL; return WINED3DERR_INVALIDCALL; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5bd8804..67c1855 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3427,7 +3427,7 @@ HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device, return WINED3D_OK; } - if (texture && texture->resource.pool == WINED3D_POOL_SCRATCH) + if (texture && texture->resource.usage & WINED3DUSAGE_SCRATCH) { WARN("Rejecting attempt to set scratch texture.\n"); return WINED3DERR_INVALIDCALL; @@ -3768,7 +3768,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - if (src_texture->resource.pool != WINED3D_POOL_SYSTEM_MEM) + if (src_texture->resource.pool != WINED3D_POOL_SYSTEM_MEM || src_texture->resource.usage & WINED3DUSAGE_SCRATCH) { WARN("Source texture not in WINED3D_POOL_SYSTEM_MEM, returning WINED3DERR_INVALIDCALL.\n"); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 7817f85..cf01f93 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -38,7 +38,6 @@ static DWORD resource_access_from_pool(enum wined3d_pool pool) case WINED3D_POOL_MANAGED: return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; - case WINED3D_POOL_SCRATCH: case WINED3D_POOL_SYSTEM_MEM: return WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; @@ -57,6 +56,7 @@ static void resource_check_usage(DWORD usage) | WINED3DUSAGE_AUTOGENMIPMAP | WINED3DUSAGE_STATICDECL | WINED3DUSAGE_OVERLAY + | WINED3DUSAGE_SCRATCH | WINED3DUSAGE_PRIVATE | WINED3DUSAGE_LEGACY_CUBEMAP | WINED3DUSAGE_TEXTURE; @@ -104,6 +104,12 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource_check_usage(usage); + if (usage & WINED3DUSAGE_SCRATCH && pool != WINED3D_POOL_SYSTEM_MEM) + { + ERR("WINED3DUSAGE_SCRATCH used with pool %s.\n", debug_d3dpool(pool)); + return WINED3DERR_INVALIDCALL; + } + for (i = 0; i < ARRAY_SIZE(resource_types); ++i) { if (resource_types[i].type != type @@ -157,7 +163,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * * Use 2D textures, the texture code will pad to a power of 2 size. */ gl_type = WINED3D_GL_RES_TYPE_TEX_2D; } - else if (pool == WINED3D_POOL_SCRATCH) + else if (usage & WINED3DUSAGE_SCRATCH) { /* Needed for proper format information. */ gl_type = base_type; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2a90c12..4e5940a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1317,8 +1317,8 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr desc.format = dst_format->id; desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; - desc.usage = WINED3DUSAGE_PRIVATE; - desc.pool = WINED3D_POOL_SCRATCH; + desc.usage = WINED3DUSAGE_SCRATCH | WINED3DUSAGE_PRIVATE; + desc.pool = WINED3D_POOL_SYSTEM_MEM; desc.width = wined3d_texture_get_level_width(src_texture, texture_level); desc.height = wined3d_texture_get_level_height(src_texture, texture_level); desc.depth = 1; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 36d46ad..101f9ad 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2078,7 +2078,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 /* level_count == 0 returns an error as well. */ if (level_count != 1 || layer_count != 1) { - if (desc->pool != WINED3D_POOL_SCRATCH) + if (!(desc->usage & WINED3DUSAGE_SCRATCH)) { WARN("Attempted to create a mipmapped/cube/array NPOT texture without unconditional NPOT support.\n"); return WINED3DERR_INVALIDCALL; @@ -2595,7 +2595,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct } if (desc->usage & WINED3DUSAGE_DYNAMIC && (desc->pool == WINED3D_POOL_MANAGED - || desc->pool == WINED3D_POOL_SCRATCH)) + || desc->usage & WINED3DUSAGE_SCRATCH)) { WARN("Attempted to create a DYNAMIC texture in pool %s.\n", debug_d3dpool(desc->pool)); return WINED3DERR_INVALIDCALL; @@ -2616,7 +2616,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct if (pow2_w != desc->width || pow2_h != desc->height || pow2_d != desc->depth) { - if (desc->pool == WINED3D_POOL_SCRATCH) + if (desc->usage & WINED3DUSAGE_SCRATCH) { WARN("Creating a scratch NPOT volume texture despite lack of HW support.\n"); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8a96a20..bd8aa06 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4654,7 +4654,6 @@ const char *debug_d3dpool(enum wined3d_pool pool) POOL_TO_STR(WINED3D_POOL_DEFAULT); POOL_TO_STR(WINED3D_POOL_MANAGED); POOL_TO_STR(WINED3D_POOL_SYSTEM_MEM); - POOL_TO_STR(WINED3D_POOL_SCRATCH); #undef POOL_TO_STR default: FIXME("Unrecognized pool %#x.\n", pool); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8c27492..02c168e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -681,7 +681,6 @@ enum wined3d_pool WINED3D_POOL_DEFAULT = 0, WINED3D_POOL_MANAGED = 1, WINED3D_POOL_SYSTEM_MEM = 2, - WINED3D_POOL_SCRATCH = 3, }; enum wined3d_query_type @@ -896,6 +895,7 @@ enum wined3d_shader_byte_code_format #define WINED3DUSAGE_TEXTAPI 0x10000000 #define WINED3DUSAGE_MASK 0x10007fff +#define WINED3DUSAGE_SCRATCH 0x00200000 #define WINED3DUSAGE_PRIVATE 0x00400000 #define WINED3DUSAGE_LEGACY_CUBEMAP 0x00800000 #define WINED3DUSAGE_TEXTURE 0x01000000 -- 2.1.4

1 0

[PATCH 1/5] wined3d: Introduce WINED3D_RESOURCE_ACCESS_MAP.
by Henri Verbeet 29 Jan '18

29 Jan '18

In order to distinguish between resources that exist purely in CPU memory and resources that exist in GPU memory but can be mapped. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/resource.c | 8 ++++---- dlls/wined3d/texture.c | 10 +++++----- dlls/wined3d/wined3d_private.h | 7 ++++--- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index dcaa072..7817f85 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -36,11 +36,11 @@ static DWORD resource_access_from_pool(enum wined3d_pool pool) return WINED3D_RESOURCE_ACCESS_GPU; case WINED3D_POOL_MANAGED: - return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU; + return WINED3D_RESOURCE_ACCESS_GPU | WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; case WINED3D_POOL_SCRATCH: case WINED3D_POOL_SYSTEM_MEM: - return WINED3D_RESOURCE_ACCESS_CPU; + return WINED3D_RESOURCE_ACCESS_CPU | WINED3D_RESOURCE_ACCESS_MAP; default: FIXME("Unhandled pool %#x.\n", pool); @@ -191,9 +191,9 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * resource->multisample_quality = multisample_quality; resource->usage = usage; resource->pool = pool; - resource->access_flags = resource_access_from_pool(pool); + resource->access = resource_access_from_pool(pool); if (usage & WINED3DUSAGE_DYNAMIC) - resource->access_flags |= WINED3D_RESOURCE_ACCESS_CPU; + resource->access |= WINED3D_RESOURCE_ACCESS_MAP; resource->width = width; resource->height = height; resource->depth = depth; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 4dc739c..36d46ad 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -33,7 +33,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); static BOOL wined3d_texture_use_pbo(const struct wined3d_texture *texture, const struct wined3d_gl_info *gl_info) { return texture->resource.pool == WINED3D_POOL_DEFAULT - && texture->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU + && texture->resource.access & WINED3D_RESOURCE_ACCESS_MAP && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] && !texture->resource.format->conv_byte_count && !(texture->flags & (WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_COND_NP2_EMULATED)); @@ -243,9 +243,9 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, if (WARN_ON(d3d)) { DWORD required_access = wined3d_resource_access_from_location(location); - if ((texture->resource.access_flags & required_access) != required_access) + if ((texture->resource.access & required_access) != required_access) WARN("Operation requires %#x access, but texture only has %#x.\n", - required_access, texture->resource.access_flags); + required_access, texture->resource.access); } if (current & WINED3D_LOCATION_DISCARDED) @@ -369,7 +369,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc } wined3d_resource_update_draw_binding(&texture->resource); if ((flags & WINED3D_TEXTURE_CREATE_MAPPABLE) || desc->format == WINED3DFMT_D16_LOCKABLE) - texture->resource.access_flags |= WINED3D_RESOURCE_ACCESS_CPU; + texture->resource.access |= WINED3D_RESOURCE_ACCESS_MAP; texture->texture_ops = texture_ops; @@ -1874,7 +1874,7 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour return WINED3DERR_INVALIDCALL; } - if (!(resource->access_flags & WINED3D_RESOURCE_ACCESS_CPU)) + if (!(resource->access & WINED3D_RESOURCE_ACCESS_MAP)) { WARN("Trying to map unmappable texture.\n"); if (resource->type != WINED3D_RTYPE_TEXTURE_2D) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9f68b0a..082c1ec 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2961,8 +2961,9 @@ static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD sta return context->isStateDirty[idx] & (1u << shift); } -#define WINED3D_RESOURCE_ACCESS_GPU 0x1 -#define WINED3D_RESOURCE_ACCESS_CPU 0x2 +#define WINED3D_RESOURCE_ACCESS_GPU 0x1u +#define WINED3D_RESOURCE_ACCESS_CPU 0x2u +#define WINED3D_RESOURCE_ACCESS_MAP 0x4u struct wined3d_resource_ops { @@ -2990,7 +2991,7 @@ struct wined3d_resource UINT multisample_quality; DWORD usage; enum wined3d_pool pool; - DWORD access_flags; + unsigned int access; WORD draw_binding; WORD map_binding; UINT width; -- 2.1.4

1 0

[PATCH 2/4] vbscript: Use the global HeapAlloc() wrappers
by Michael Stefaniuc 29 Jan '18

29 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/vbscript.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index ec41737083..5e935ff76a 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -28,6 +28,7 @@ #include "vbscript_classes.h" +#include "wine/heap.h" #include "wine/list.h" #include "wine/unicode.h" @@ -430,26 +431,6 @@ HRESULT create_safearray_iter(SAFEARRAY *sa, IEnumVARIANT **ev) DECLSPEC_HIDDEN; HRESULT WINAPI VBScriptFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; HRESULT WINAPI VBScriptRegExpFactory_CreateInstance(IClassFactory*,IUnknown*,REFIID,void**) DECLSPEC_HIDDEN; -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} - static inline LPWSTR heap_strdupW(LPCWSTR str) { LPWSTR ret = NULL; -- 2.14.3

2 1

[PATCH] shobjidl.idl: Fix some typo's.
by Mark Jansen 29 Jan '18

29 Jan '18

Some typo's found while trying to to compile objects created from this IDL against Microsoft's SDK.

2 1

[PATCH v3] include: Add generic HeapAlloc() wrappers
by Michael Stefaniuc 29 Jan '18

29 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- version 3: - Removed 'extern "C"' as it isn't needed even for ReactOS - Fixed the missing space in the Copyright (thx Matteo) - Style fix in HeapReAlloc as that is my prefered style too (thx Henri) version 2: Just use the non-controversial parts. Basically the stuff we already have with following changes: heap_realloc - Passing NULL as memory pointer will allocate new memory. no heap_realloc_zero() - few uses - some defined but not used heap_free() returns void: - No existing use of the heap_free() return value. - There are a few "return HeapFree()" statements but more than half of those are just in heap_free() wrappers. include/Makefile.in | 1 + include/wine/heap.h | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 include/wine/heap.h diff --git a/include/Makefile.in b/include/Makefile.in index b975dd585e..748b64165f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -680,6 +680,7 @@ HEADER_SRCS = \ windowsx.h \ wine/debug.h \ wine/exception.h \ + wine/heap.h \ wine/library.h \ wine/unicode.h \ winerror.h \ diff --git a/include/wine/heap.h b/include/wine/heap.h new file mode 100644 index 0000000000..014ef6129d --- /dev/null +++ b/include/wine/heap.h @@ -0,0 +1,49 @@ +/* + * Wine heap memory allocation wrappers + * + * Copyright 2006 Jacek Caban for CodeWeavers + * Copyright 2013, 2018 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINE_HEAP_H +#define __WINE_WINE_HEAP_H + +#include <windef.h> + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, SIZE_T len) +{ + if (!mem) + return HeapAlloc(GetProcessHeap(), 0, len); + return HeapReAlloc(GetProcessHeap(), 0, mem, len); +} + +static inline void heap_free(void *mem) +{ + HeapFree(GetProcessHeap(), 0, mem); +} + +#endif /* __WINE_WINE_HEAP_H */ -- 2.14.3

2 1

[PATCH 1/6] comctl32/tests: Enable more ListView tests
by Nikolay Sivov 29 Jan '18

29 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/listview.c | 165 ++++++++++++++++++++++------------------- 1 file changed, 90 insertions(+), 75 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 72367c67b3..ea7ad569f5 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -718,6 +718,21 @@ static HWND create_listview_controlW(DWORD style, HWND parent) return hwnd; } +static BOOL is_win_xp(void) +{ + HWND hwnd, header; + BOOL ret; + + hwnd = create_listview_control(LVS_ICON); + SendMessageA(hwnd, LVM_SETEXTENDEDLISTVIEWSTYLE, LVS_EX_HEADERINALLVIEWS, LVS_EX_HEADERINALLVIEWS); + header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0); + ret = !IsWindow(header); + + DestroyWindow(hwnd); + + return ret; +} + static LRESULT WINAPI header_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); @@ -1536,7 +1551,28 @@ static LRESULT CALLBACK create_test_wndproc(HWND hwnd, UINT uMsg, WPARAM wParam, return ret; } -static void test_create(void) +/* Header creation is delayed in classic implementation. */ +#define TEST_NO_HEADER(a) test_header_presence_(a, FALSE, __LINE__) +#define TEST_HEADER_EXPECTED(a) test_header_presence_(a, TRUE, __LINE__) +#define TEST_NO_HEADER2(a, b) test_header_presence_(a, b, __LINE__) +static void test_header_presence_(HWND hwnd, BOOL present, int line) +{ + HWND header = (HWND)SendMessageA(hwnd, LVM_GETHEADER, 0, 0); + + if (present) + { + ok_(__FILE__, line)(IsWindow(header), "Header should have been created.\n"); + if (header) /* FIXME: remove when todo's are fixed */ + ok_(__FILE__, line)(header == GetDlgItem(hwnd, 0), "Dialog item expected.\n"); + } + else + { + ok_(__FILE__, line)(!IsWindow(header), "Header shouldn't be created.\n"); + ok_(__FILE__, line)(NULL == GetDlgItem(hwnd, 0), "NULL dialog item expected.\n"); + } +} + +static void test_create(BOOL is_version_6) { static const WCHAR testtextW[] = {'t','e','s','t',' ','t','e','x','t',0}; char buff[16]; @@ -1548,13 +1584,22 @@ static void test_create(void) RECT rect; WNDCLASSEXA cls; DWORD style; + ATOM class; + + if (is_win_xp() && is_version_6) + { + win_skip("Skipping some tests on XP.\n"); + return; + } cls.cbSize = sizeof(WNDCLASSEXA); - ok(GetClassInfoExA(GetModuleHandleA(NULL), "SysListView32", &cls), "GetClassInfoEx failed\n"); + r = GetClassInfoExA(GetModuleHandleA(NULL), WC_LISTVIEWA, &cls); + ok(r, "Failed to get class info.\n"); listviewWndProc = cls.lpfnWndProc; cls.lpfnWndProc = create_test_wndproc; cls.lpszClassName = "MyListView32"; - ok(RegisterClassExA(&cls), "RegisterClassEx failed\n"); + class = RegisterClassExA(&cls); + ok(class, "Failed to register class.\n"); test_create_imagelist = pImageList_Create(16, 16, 0, 5, 10); hList = CreateWindowA("MyListView32", "Test", WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); @@ -1565,38 +1610,31 @@ static void test_create(void) DestroyWindow(hList); /* header isn't created on LVS_ICON and LVS_LIST styles */ - hList = CreateWindowA("SysListView32", "Test", WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, - GetModuleHandleA(NULL), 0); - hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); - ok(!IsWindow(hHeader), "Header shouldn't be created\n"); - ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + hList = CreateWindowA("SysListView32", "Test", WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); + TEST_NO_HEADER(hList); + /* insert column */ memset(&col, 0, sizeof(LVCOLUMNA)); col.mask = LVCF_WIDTH; col.cx = 100; r = SendMessageA(hList, LVM_INSERTCOLUMNA, 0, (LPARAM)&col); expect(0, r); + TEST_HEADER_EXPECTED(hList); hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); - ok(IsWindow(hHeader), "Header should be created\n"); - ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); style = GetWindowLongA(hHeader, GWL_STYLE); ok(!(style & HDS_HIDDEN), "Not expected HDS_HIDDEN\n"); DestroyWindow(hList); hList = CreateWindowA("SysListView32", "Test", WS_VISIBLE|LVS_LIST, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); - hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); - ok(!IsWindow(hHeader), "Header shouldn't be created\n"); - ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + TEST_NO_HEADER(hList); /* insert column */ memset(&col, 0, sizeof(LVCOLUMNA)); col.mask = LVCF_WIDTH; col.cx = 100; r = SendMessageA(hList, LVM_INSERTCOLUMNA, 0, (LPARAM)&col); expect(0, r); - hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); - ok(IsWindow(hHeader), "Header should be created\n"); - ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); + TEST_HEADER_EXPECTED(hList); DestroyWindow(hList); /* try to switch LVS_ICON -> LVS_REPORT and back LVS_ICON -> LVS_REPORT */ @@ -1604,13 +1642,10 @@ static void test_create(void) GetModuleHandleA(NULL), 0); ret = SetWindowLongPtrA(hList, GWL_STYLE, GetWindowLongPtrA(hList, GWL_STYLE) | LVS_REPORT); ok(ret & WS_VISIBLE, "Style wrong, should have WS_VISIBLE\n"); - hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); - ok(IsWindow(hHeader), "Header should be created\n"); + TEST_HEADER_EXPECTED(hList); ret = SetWindowLongPtrA(hList, GWL_STYLE, GetWindowLongA(hList, GWL_STYLE) & ~LVS_REPORT); ok((ret & WS_VISIBLE) && (ret & LVS_REPORT), "Style wrong, should have WS_VISIBLE|LVS_REPORT\n"); - hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); - ok(IsWindow(hHeader), "Header should be created\n"); - ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); + TEST_HEADER_EXPECTED(hList); DestroyWindow(hList); /* try to switch LVS_LIST -> LVS_REPORT and back LVS_LIST -> LVS_REPORT */ @@ -1619,52 +1654,43 @@ static void test_create(void) ret = SetWindowLongPtrA(hList, GWL_STYLE, (GetWindowLongPtrA(hList, GWL_STYLE) & ~LVS_LIST) | LVS_REPORT); ok(((ret & WS_VISIBLE) && (ret & LVS_LIST)), "Style wrong, should have WS_VISIBLE|LVS_LIST\n"); - hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); - ok(IsWindow(hHeader), "Header should be created\n"); - ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); - ret = SetWindowLongPtrA(hList, GWL_STYLE, - (GetWindowLongPtrA(hList, GWL_STYLE) & ~LVS_REPORT) | LVS_LIST); + TEST_HEADER_EXPECTED(hList); + ret = SetWindowLongPtrA(hList, GWL_STYLE, (GetWindowLongPtrA(hList, GWL_STYLE) & ~LVS_REPORT) | LVS_LIST); ok(((ret & WS_VISIBLE) && (ret & LVS_REPORT)), "Style wrong, should have WS_VISIBLE|LVS_REPORT\n"); - hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); - ok(IsWindow(hHeader), "Header should be created\n"); - ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); + TEST_HEADER_EXPECTED(hList); DestroyWindow(hList); /* LVS_REPORT without WS_VISIBLE */ hList = CreateWindowA("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); - ok(!IsWindow(hHeader), "Header shouldn't be created\n"); - ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); +todo_wine_if(is_version_6) + TEST_NO_HEADER2(hList, is_version_6); + /* insert column */ memset(&col, 0, sizeof(LVCOLUMNA)); col.mask = LVCF_WIDTH; col.cx = 100; r = SendMessageA(hList, LVM_INSERTCOLUMNA, 0, (LPARAM)&col); expect(0, r); - hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); - ok(IsWindow(hHeader), "Header should be created\n"); - ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); + TEST_HEADER_EXPECTED(hList); DestroyWindow(hList); /* LVS_REPORT without WS_VISIBLE, try to show it */ hList = CreateWindowA("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); - hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); - ok(!IsWindow(hHeader), "Header shouldn't be created\n"); - ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); +todo_wine_if(is_version_6) + TEST_NO_HEADER2(hList, is_version_6); + ShowWindow(hList, SW_SHOW); - hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); - ok(IsWindow(hHeader), "Header should be created\n"); - ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); + TEST_HEADER_EXPECTED(hList); DestroyWindow(hList); /* LVS_REPORT with LVS_NOCOLUMNHEADER */ hList = CreateWindowA("SysListView32", "Test", LVS_REPORT|LVS_NOCOLUMNHEADER|WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); + TEST_HEADER_EXPECTED(hList); hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); - ok(IsWindow(hHeader), "Header should be created\n"); - ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); /* HDS_DRAGDROP set by default */ ok(GetWindowLongPtrA(hHeader, GWL_STYLE) & HDS_DRAGDROP, "Expected header to have HDS_DRAGDROP\n"); DestroyWindow(hList); @@ -1672,43 +1698,30 @@ static void test_create(void) /* setting LVS_EX_HEADERDRAGDROP creates header */ hList = CreateWindowA("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); - hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); - ok(!IsWindow(hHeader), "Header shouldn't be created\n"); - ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); +todo_wine_if(is_version_6) + TEST_NO_HEADER2(hList, is_version_6); + SendMessageA(hList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_HEADERDRAGDROP); - hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); - ok(IsWindow(hHeader) || - broken(!IsWindow(hHeader)), /* 4.7x common controls */ - "Header should be created\n"); - ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); + TEST_HEADER_EXPECTED(hList); DestroyWindow(hList); /* setting LVS_EX_GRIDLINES creates header */ hList = CreateWindowA("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); - hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); - ok(!IsWindow(hHeader), "Header shouldn't be created\n"); - ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); +todo_wine_if(is_version_6) + TEST_NO_HEADER2(hList, is_version_6); + SendMessageA(hList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_GRIDLINES); - hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); - ok(IsWindow(hHeader) || - broken(!IsWindow(hHeader)), /* 4.7x common controls */ - "Header should be created\n"); - ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); + TEST_HEADER_EXPECTED(hList); DestroyWindow(hList); /* setting LVS_EX_FULLROWSELECT creates header */ hList = CreateWindowA("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); - hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); - ok(!IsWindow(hHeader), "Header shouldn't be created\n"); - ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); +todo_wine_if(is_version_6) + TEST_NO_HEADER2(hList, is_version_6); SendMessageA(hList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); - hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); - ok(IsWindow(hHeader) || - broken(!IsWindow(hHeader)), /* 4.7x common controls */ - "Header should be created\n"); - ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); + TEST_HEADER_EXPECTED(hList); DestroyWindow(hList); /* not report style accepts LVS_EX_HEADERDRAGDROP too */ @@ -1721,19 +1734,17 @@ static void test_create(void) /* requesting header info with LVM_GETSUBITEMRECT doesn't create it */ hList = CreateWindowA("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); - ok(!IsWindow(hHeader), "Header shouldn't be created\n"); - ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); +todo_wine_if(is_version_6) + TEST_NO_HEADER2(hList, is_version_6); SetRect(&rect, LVIR_BOUNDS, 1, -10, -10); r = SendMessageA(hList, LVM_GETSUBITEMRECT, -1, (LPARAM)&rect); + ok(r == 1, "Unexpected ret value %d.\n", r); /* right value contains garbage, probably because header columns are not set up */ - expect(0, rect.bottom); - expect(1, r); - - hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); - ok(!IsWindow(hHeader), "Header shouldn't be created\n"); - ok(GetDlgItem(hList, 0) == NULL, "NULL dialog item expected\n"); + ok(rect.bottom >= 0, "Unexpected rectangle.\n"); +todo_wine_if(is_version_6) + TEST_NO_HEADER2(hList, is_version_6); DestroyWindow(hList); /* WM_MEASUREITEM should be sent when created with LVS_OWNERDRAWFIXED */ @@ -1759,6 +1770,9 @@ static void test_create(void) GetWindowTextA(hList, buff, sizeof(buff)); ok(!strcmp(buff, "test text"), "Unexpected window text %s.\n", buff); DestroyWindow(hList); + + r = UnregisterClassA("MyListView32", NULL); + ok(r, "Failed to unregister test class.\n"); } static void test_redraw(void) @@ -6275,7 +6289,7 @@ START_TEST(listview) test_images(); test_checkboxes(); test_items(); - test_create(); + test_create(FALSE); test_redraw(); test_customdraw(); test_icon_spacing(); @@ -6339,6 +6353,7 @@ START_TEST(listview) test_images(); test_checkboxes(); test_items(); + test_create(TRUE); test_color(); test_columns(); test_sorting(); -- 2.15.1

1 5

Automating analysis of behaioural differences between Wine and Windows?
by Daniel Santos 29 Jan '18

29 Jan '18

Some time back I had investigated a concept for a tool to aid in discovering behavioral differences between Wine and Windows. I have most of the technological issues figured out -- it would be a bit of an undertaking, but can be developed iteratively so that it could begin to pay for its self fairly soon. However, I need advise on rather or not it would create tort. Put simply, it would be a layer built into Wine that records win32/64 API calls and their results and another layer on Windows that does the same. The two results can then be analyzed to discover behavioral differences. Of course, this is a heavily over-simplified explanation as there are many gory details of how to make this work, perform acceptably, produce useful information, remove noise, etc., but could this produce a legal problem? I would hope to be able to use such a tool on a typical piece of commercial software with a typical EULA. To me, it doesn't seem differ much from what antivirus software does. Thanks, Daniel

3 2

Avoid crash in CURSORICON_GetFileEntry due to invalid memory access.
by Bernhard Übelacker 28 Jan '18

28 Jan '18

https://bugs.winehq.org/show_bug.cgi?id=42789 For some reason Qemu or Gtk tries to LoadImageW for "X11 cursor" share/icons/Adwaita/cursors/00008160000006810000408080010102. Mapped file has just a size of 69120 bytes. Unfortunately in function CURSORICON_GetFileEntry entry->dwDIBOffset contains 1638397. info = (const BITMAPINFOHEADER *)((const char *)dir + entry->dwDIBOffset); That way the info variable points to memory outside of the mapped file while qemu manages to have that memory not available. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- dlls/user32/cursoricon.c | 2 ++ dlls/user32/tests/cursoricon.c | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 1203250565..1ea1523b61 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -678,6 +678,8 @@ static BOOL CURSORICON_GetFileEntry( LPCVOID dir, DWORD size, int n, if ((const char *)&filedir->idEntries[n + 1] - (const char *)dir > size) return FALSE; entry = &filedir->idEntries[n]; + if (entry->dwDIBOffset + FIELD_OFFSET( BITMAPINFOHEADER, biSize ) + sizeof(info->biSize) > size) + return FALSE; info = (const BITMAPINFOHEADER *)((const char *)dir + entry->dwDIBOffset); if (info->biSize != sizeof(BITMAPCOREHEADER)) { diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 211376b180..5099c08d70 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1031,6 +1031,12 @@ static const unsigned char gif4pixel[42] = { 0x02,0x00,0x00,0x02,0x03,0x14,0x16,0x05,0x00,0x3b }; +/* An invalid cursor with an invalid dwDIBOffset */ +static const unsigned char invalid_dwDIBOffset[] = { + 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00 +}; + static const DWORD biSize_tests[] = { 0, sizeof(BITMAPCOREHEADER) - 1, @@ -1320,6 +1326,8 @@ static void test_LoadImage(void) test_LoadImageFile("BMP (broken biSize)", bmpimage, sizeof(bmpimage), "bmp", 0); } bitmap_header->biSize = sizeof(BITMAPINFOHEADER); + + test_LoadImageFile("Cursor (invalid dwDIBOffset)", invalid_dwDIBOffset, sizeof(invalid_dwDIBOffset), "cur", 0); } #undef ARRAY_SIZE -- 2.15.1

1 0

[PATCH] cmd: Change parsing of the if command to avoid parsing the operators.
by Bernhard Übelacker 28 Jan '18

28 Jan '18

https://bugs.winehq.org/show_bug.cgi?id=44338 Found while trying to look into #44236. A batch script is executed containing a line like this: --- if (%1)==(p) start /W " " "%SFDIR%WSFplot" wr2300.t35 3 --- This returns an error like this: --- Syntax error Can't recognize 'p' as an internal or external command, or batch script. --- It looks like native does handle the brackets differently when contained inside the condition part of the if command. Therefore this patch tries to skip the parsing in WCMD_ReadAndParseLine of that part. Therefore it moves most of the content of WCMD_if into a helper and calls that to estimate how long the condition part is. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- programs/cmd/builtins.c | 75 +++++++++++++++++++------------- programs/cmd/tests/test_builtins.cmd | 20 +++++++++ programs/cmd/tests/test_builtins.cmd.exp | 4 ++ programs/cmd/wcmd.h | 2 + programs/cmd/wcmdmain.c | 30 +++++++++++-- 5 files changed, 96 insertions(+), 35 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 14961d7922..519fd435da 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2765,25 +2765,9 @@ static int evaluate_if_comparison(const WCHAR *leftOperand, const WCHAR *operato return -1; } -/**************************************************************************** - * WCMD_if - * - * Batch file conditional. - * - * On entry, cmdlist will point to command containing the IF, and optionally - * the first command to execute (if brackets not found) - * If &&'s were found, this may be followed by a record flagged as isAmpersand - * If ('s were found, execute all within that bracket - * Command may optionally be followed by an ELSE - need to skip instructions - * in the else using the same logic - * - * FIXME: Much more syntax checking needed! - */ -void WCMD_if (WCHAR *p, CMD_LIST **cmdList) +int evaluate_if_condition(WCHAR *p, WCHAR **command, int *test, int *negate) { - int negate; /* Negate condition */ - int test; /* Condition evaluation result */ - WCHAR condition[MAX_PATH], *command; + WCHAR condition[MAX_PATH]; static const WCHAR notW[] = {'n','o','t','\0'}; static const WCHAR errlvlW[] = {'e','r','r','o','r','l','e','v','e','l','\0'}; static const WCHAR existW[] = {'e','x','i','s','t','\0'}; @@ -2791,33 +2775,33 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) static const WCHAR parmI[] = {'/','I','\0'}; int caseInsensitive = (strstrW(quals, parmI) != NULL); - negate = !lstrcmpiW(param1,notW); - strcpyW(condition, (negate ? param2 : param1)); + *negate = !lstrcmpiW(param1,notW); + strcpyW(condition, (*negate ? param2 : param1)); WINE_TRACE("Condition: %s\n", wine_dbgstr_w(condition)); if (!lstrcmpiW (condition, errlvlW)) { - WCHAR *param = WCMD_parameter(p, 1+negate, NULL, FALSE, FALSE); + WCHAR *param = WCMD_parameter(p, 1+(*negate), NULL, FALSE, FALSE); WCHAR *endptr; long int param_int = strtolW(param, &endptr, 10); if (*endptr) goto syntax_err; - test = ((long int)errorlevel >= param_int); - WCMD_parameter(p, 2+negate, &command, FALSE, FALSE); + *test = ((long int)errorlevel >= param_int); + WCMD_parameter(p, 2+(*negate), command, FALSE, FALSE); } else if (!lstrcmpiW (condition, existW)) { - test = (GetFileAttributesW(WCMD_parameter(p, 1+negate, NULL, FALSE, FALSE)) + *test = (GetFileAttributesW(WCMD_parameter(p, 1+(*negate), NULL, FALSE, FALSE)) != INVALID_FILE_ATTRIBUTES); - WCMD_parameter(p, 2+negate, &command, FALSE, FALSE); + WCMD_parameter(p, 2+(*negate), command, FALSE, FALSE); } else if (!lstrcmpiW (condition, defdW)) { - test = (GetEnvironmentVariableW(WCMD_parameter(p, 1+negate, NULL, FALSE, FALSE), + *test = (GetEnvironmentVariableW(WCMD_parameter(p, 1+(*negate), NULL, FALSE, FALSE), NULL, 0) > 0); - WCMD_parameter(p, 2+negate, &command, FALSE, FALSE); + WCMD_parameter(p, 2+(*negate), command, FALSE, FALSE); } else { /* comparison operation */ WCHAR leftOperand[MAXSTRING], rightOperand[MAXSTRING], operator[MAXSTRING]; WCHAR *paramStart; - strcpyW(leftOperand, WCMD_parameter(p, negate+caseInsensitive, &paramStart, TRUE, FALSE)); + strcpyW(leftOperand, WCMD_parameter(p, (*negate)+caseInsensitive, &paramStart, TRUE, FALSE)); if (!*leftOperand) goto syntax_err; @@ -2838,14 +2822,43 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) if (!*rightOperand) goto syntax_err; - test = evaluate_if_comparison(leftOperand, operator, rightOperand, caseInsensitive); - if (test == -1) + *test = evaluate_if_comparison(leftOperand, operator, rightOperand, caseInsensitive); + if (*test == -1) goto syntax_err; p = paramStart + strlenW(rightOperand); - WCMD_parameter(p, 0, &command, FALSE, FALSE); + WCMD_parameter(p, 0, command, FALSE, FALSE); } + return 1; + +syntax_err: + return -1; +} + +/**************************************************************************** + * WCMD_if + * + * Batch file conditional. + * + * On entry, cmdlist will point to command containing the IF, and optionally + * the first command to execute (if brackets not found) + * If &&'s were found, this may be followed by a record flagged as isAmpersand + * If ('s were found, execute all within that bracket + * Command may optionally be followed by an ELSE - need to skip instructions + * in the else using the same logic + * + * FIXME: Much more syntax checking needed! + */ +void WCMD_if (WCHAR *p, CMD_LIST **cmdList) +{ + int negate; /* Negate condition */ + int test; /* Condition evaluation result */ + WCHAR *command; + + if (evaluate_if_condition(p, &command, &test, &negate) == -1) + goto syntax_err; + /* Process rest of IF statement which is on the same line Note: This may process all or some of the cmdList (eg a GOTO) */ WCMD_part_execute(cmdList, command, TRUE, (test != negate)); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 62334b17b6..6060c15fa7 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -907,6 +907,26 @@ if %elseIF% == 1 ( ) else ( echo else if seems to be broken ) +if ()==() ( + echo comparison operators surrounded by brackets seem to work +) else ( + echo comparison operators surrounded by brackets seem to be broken +) +if 1(==1( ( + echo comparison operators surrounded by brackets seem to work +) else ( + echo comparison operators surrounded by brackets seem to be broken +) +if )==) ( + echo comparison operators surrounded by brackets seem to work +) else ( + echo comparison operators surrounded by brackets seem to be broken +) +if /i not (a)==(b) ( + echo comparison operators surrounded by brackets seem to work +) else ( + echo comparison operators surrounded by brackets seem to be broken +) echo --- case sensitivity with and without /i option if bar==BAR echo if does not default to case sensitivity if not bar==BAR echo if seems to default to case sensitivity diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 796550e57e..7654f20694 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -657,6 +657,10 @@ if seems not to detect /c as parameter else if seems to work else if seems to work else if seems to work +comparison operators surrounded by brackets seem to work +comparison operators surrounded by brackets seem to work +comparison operators surrounded by brackets seem to work +comparison operators surrounded by brackets seem to work --- case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index d4d97a0067..4937d16f00 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -154,6 +154,8 @@ static inline BOOL ends_with_backslash( const WCHAR *path ) return path[0] && path[strlenW(path) - 1] == '\\'; } +int evaluate_if_condition(WCHAR *p, WCHAR **command, int *test, int *negate); + /* Data structure to hold context when executing batch files */ typedef struct _BATCH_CONTEXT { diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 827ddd2121..62b6c5832f 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1916,13 +1916,35 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* If command starts with 'if ' or 'else ', handle ('s mid line. We should ensure this is only true in the command portion of the IF statement, but this - should suffice for now - FIXME: Silly syntax like "if 1(==1( ( - echo they equal - )" will be parsed wrong */ + should suffice for now. + To be able to handle ('s in the condition part take as much as evaluate_if_condition + would take and skip parsing it here. */ } else if (WCMD_keyword_ws_found(ifCmd, sizeof(ifCmd)/sizeof(ifCmd[0]), curPos)) { + static const WCHAR parmI[] = {'/','I','\0'}; + static const WCHAR notW[] = {'n','o','t','\0'}; + int negate; /* Negate condition */ + int test; /* Condition evaluation result */ + WCHAR *p, *command; + inIf = TRUE; + p = curPos+(sizeof(ifCmd)/sizeof(*ifCmd)); + while (*p == ' ' || *p == '\t') { + p++; + if (lstrcmpiW(WCMD_parameter(p, 0, NULL, TRUE, FALSE), notW) == 0) + p += strlenW(notW); + if (lstrcmpiW(WCMD_parameter(p, 0, NULL, TRUE, FALSE), parmI) == 0) + p += strlenW(parmI); + } + + if (evaluate_if_condition(p, &command, &test, &negate) != -1) + { + int if_condition_len = command - curPos; + memcpy(&curCopyTo[*curLen], curPos, if_condition_len*sizeof(WCHAR)); + (*curLen)+=if_condition_len; + curPos+=if_condition_len; + } + } else if (WCMD_keyword_ws_found(ifElse, sizeof(ifElse)/sizeof(ifElse[0]), curPos)) { const int keyw_len = sizeof(ifElse)/sizeof(ifElse[0]) + 1; inElse = TRUE; -- 2.15.1

1 0

[PATCH] hlink: Directly check for S_OK from IHlinkBrowseContext_GetObject().
by Zebediah Figura 27 Jan '18

27 Jan '18

Fixes a regression introduced by 00aca1476efd573cbf9d31a45c3d484f6fa6055b Fixes bug #44423. Any value other than S_OK should trigger this codepath. In particular, the system browse context object returns MK_E_UNAVAILABLE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/hlink/link.c | 2 +- dlls/hlink/tests/hlink.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/hlink/link.c b/dlls/hlink/link.c index 983765c..25ee45d 100644 --- a/dlls/hlink/link.c +++ b/dlls/hlink/link.c @@ -493,7 +493,7 @@ static HRESULT WINAPI IHlink_fnNavigate(IHlink* iface, DWORD grfHLNF, LPBC pbc, if (phbc) { r = IHlinkBrowseContext_GetObject(phbc, mon, TRUE, &unk); - if (r == S_FALSE) + if (r != S_OK) { CreateBindCtx(0, &bcxt); RegisterBindStatusCallback(bcxt, pbsc, NULL, 0); diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index e40807c..3525c44 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -891,7 +891,7 @@ static HRESULT WINAPI HlinkBrowseContext_GetObject(IHlinkBrowseContext *iface, ok(fBindIfRootRegistered == 1, "fBindIfRootRegistered = %x\n", fBindIfRootRegistered); *ppiunk = HBC_object; - return HBC_object ? S_OK : S_FALSE; + return HBC_object ? S_OK : 0xdeadbeef; } static HRESULT WINAPI HlinkBrowseContext_Revoke(IHlinkBrowseContext *iface, DWORD dwRegister) -- 2.7.4

1 0

[PATCH] kernel32: Fix failure reporting in WritePrivateProfile* and add tests
by Paul Graham 27 Jan '18

27 Jan '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=44310 The following functions have been fixed to correctly report failure when they're unable to create the requested file: WritePrivateProfileStringA WritePrivateProfileStringW WritePrivateProfileSectionA WritePrivateProfileSectionW WritePrivateProfileStructA WritePrivateProfileStructW Tested on Ubuntu 16.04. Conformance tests based on work by Fabian Maurer, with some adaptations. Signed-off-by: Paul Graham <development(a)omega-software.com> --- dlls/kernel32/profile.c | 15 ++++++++++----- dlls/kernel32/tests/profile.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/profile.c b/dlls/kernel32/profile.c index aad3ba3..4d6c016 100644 --- a/dlls/kernel32/profile.c +++ b/dlls/kernel32/profile.c @@ -1391,7 +1391,8 @@ BOOL WINAPI WritePrivateProfileStringW( LPCWSTR section, LPCWSTR entry, SetLastError(ERROR_FILE_NOT_FOUND); } else { ret = PROFILE_SetString( section, entry, string, FALSE); - PROFILE_FlushFile(); + if (ret) + ret = PROFILE_FlushFile(); } } @@ -1447,7 +1448,8 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, else if (PROFILE_Open( filename, TRUE )) { if (!string) {/* delete the named section*/ ret = PROFILE_SetString(section,NULL,NULL, FALSE); - PROFILE_FlushFile(); + if (ret) + ret = PROFILE_FlushFile(); } else { PROFILE_DeleteAllKeys(section); ret = TRUE; @@ -1456,12 +1458,14 @@ BOOL WINAPI WritePrivateProfileSectionW( LPCWSTR section, strcpyW( buf, string ); if((p = strchrW( buf, '='))) { *p='\0'; - ret = PROFILE_SetString( section, buf, p+1, TRUE); + if (ret) + ret = PROFILE_SetString( section, buf, p+1, TRUE); } HeapFree( GetProcessHeap(), 0, buf ); string += strlenW(string)+1; } - PROFILE_FlushFile(); + if (ret) + ret = PROFILE_FlushFile(); } } @@ -1744,7 +1748,8 @@ BOOL WINAPI WritePrivateProfileStructW (LPCWSTR section, LPCWSTR key, if (PROFILE_Open( filename, TRUE )) { ret = PROFILE_SetString( section, key, outstring, FALSE); - PROFILE_FlushFile(); + if (ret) + ret = PROFILE_FlushFile(); } RtlLeaveCriticalSection( &PROFILE_CritSect ); diff --git a/dlls/kernel32/tests/profile.c b/dlls/kernel32/tests/profile.c index 2eb90a8..17ba124 100644 --- a/dlls/kernel32/tests/profile.c +++ b/dlls/kernel32/tests/profile.c @@ -25,6 +25,7 @@ #include "windef.h" #include "winbase.h" #include "windows.h" +#include "sddl.h" #define KEY "ProfileInt" #define SECTION "Test" @@ -534,6 +535,41 @@ static BOOL emptystr_ok(CHAR emptystr[MAX_PATH]) return TRUE; } +static void test_profile_directory_readonly(void) +{ + BOOL ret; + CHAR path_folder[MAX_PATH]; + CHAR path_file[MAX_PATH]; + const char *sddl_string_everyone_readonly = "D:PAI(A;;0x1200a9;;;WD)"; + SECURITY_ATTRIBUTES attributes = {0}; + char lpStruct[] = { 's', 't', 'r', 'i', 'n', 'g' }; + + attributes.nLength = sizeof(attributes); + ret = ConvertStringSecurityDescriptorToSecurityDescriptorA(sddl_string_everyone_readonly, SDDL_REVISION_1, &attributes.lpSecurityDescriptor, NULL); + ok(ret == TRUE, "ConvertStringSecurityDescriptorToSecurityDescriptor failed: %d\n", GetLastError()); + + GetTempPathA(MAX_PATH, path_folder); + lstrcatA(path_folder, "wine-test"); + + strcpy(path_file, path_folder); + lstrcatA(path_file, "\\tmp.ini"); + + ret = CreateDirectoryA(path_folder, &attributes); + ok(ret == TRUE, "CreateDirectoryA failed: %d\n", GetLastError()); + + ret = WritePrivateProfileStringA("App", "key", "string", path_file); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + + ret = WritePrivateProfileSectionA("App", "key=string", path_file); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + + ret = WritePrivateProfileStructA("App", "key", lpStruct, sizeof(lpStruct), path_file); + ok(ret == FALSE, "Expected FALSE, got %d\n", ret); + + ret = RemoveDirectoryA(path_folder); + ok(ret == TRUE, "RemoveDirectoryA failed: %d\n", GetLastError()); +} + static void test_GetPrivateProfileString(const char *content, const char *descript) { DWORD ret, len; @@ -1132,6 +1168,7 @@ START_TEST(profile) test_profile_existing(); test_profile_delete_on_close(); test_profile_refresh(); + test_profile_directory_readonly(); test_GetPrivateProfileString( "[section1]\r\n" "name1=val1\r\n" -- 2.7.4

1 0

[PATCH] RFC: Tests for sxs window classes
by Fabian Maurer 27 Jan '18

27 Jan '18

This is a WIP patch, feedback appreciated. This is a bunch of tests on how sxs window classes work. It basically proves that on windows, sxs classes are registered using RegisterClassNameW, although this is only used for native comctl32 AFAIK. I currently don't know about any other application having this behavior, but I figured knowing the way it works on windows would be nice - it might be useful for mimicking native comctl32 behavior. The tests are pretty extensive, hope you don't mind. Since I don't know of a way to properly unload sxs dlls, I split the test into multiple test runs: run 0: Test dll without RegisterClassNameW run 1: Show that sxs classes are registered by calling CreateWindowA run 2: Show that sxs classes are registered by calling GetClassInfoExA run 3: Test what version is used when registering own classes, then loading sxs classes. This is pretty straight forward. run 4: Test what version is used when activation context is created, but no sxs classes are registered yet, then own classes are registered. Added that since the results are unexpected. Right now, the test dlls must be precompiled so they can be embedded as resources. I still need a better way to build the test dlls, best would be an integration in the normal test build process. It doesn't work on WinXP or earlier, so I needed to check the system version and then skip the tests if needed. --- dlls/kernel32/tests/Makefile.in | 1 + dlls/kernel32/tests/resource.rc | 12 ++ dlls/kernel32/tests/sxs.c | 359 +++++++++++++++++++++++++++++++++++ dlls/kernel32/tests/sxs_dll.manifest | 8 + dlls/kernel32/tests/sxs_dll_1.c | 67 +++++++ dlls/kernel32/tests/sxs_dll_1.dll | Bin 0 -> 268734 bytes dlls/kernel32/tests/sxs_dll_2.c | 52 +++++ dlls/kernel32/tests/sxs_dll_2.dll | Bin 0 -> 267928 bytes dlls/kernel32/tests/sxs_exe.manifest | 8 + 9 files changed, 507 insertions(+) create mode 100644 dlls/kernel32/tests/sxs.c create mode 100644 dlls/kernel32/tests/sxs_dll.manifest create mode 100644 dlls/kernel32/tests/sxs_dll_1.c create mode 100755 dlls/kernel32/tests/sxs_dll_1.dll create mode 100644 dlls/kernel32/tests/sxs_dll_2.c create mode 100755 dlls/kernel32/tests/sxs_dll_2.dll create mode 100644 dlls/kernel32/tests/sxs_exe.manifest diff --git a/dlls/kernel32/tests/Makefile.in b/dlls/kernel32/tests/Makefile.in index 2f2ac5f8c3..19678dbf27 100644 --- a/dlls/kernel32/tests/Makefile.in +++ b/dlls/kernel32/tests/Makefile.in @@ -26,6 +26,7 @@ C_SRCS = \ process.c \ profile.c \ resource.c \ + sxs.c \ sync.c \ thread.c \ time.c \ diff --git a/dlls/kernel32/tests/resource.rc b/dlls/kernel32/tests/resource.rc index f40a87819e..a1ad332405 100644 --- a/dlls/kernel32/tests/resource.rc +++ b/dlls/kernel32/tests/resource.rc @@ -24,3 +24,15 @@ { MENUITEM "foo", 1 } + +/* @makedep: sxs_dll_1.dll */ +sxs_dll_1.dll RCDATA sxs_dll_1.dll + +/* @makedep: sxs_dll_2.dll */ +sxs_dll_2.dll RCDATA sxs_dll_2.dll + +/* @makedep: sxs_dll.manifest */ +sxs_dll.manifest RCDATA sxs_dll.manifest + +/* @makedep: sxs_exe.manifest */ +sxs_exe.manifest RCDATA sxs_exe.manifest diff --git a/dlls/kernel32/tests/sxs.c b/dlls/kernel32/tests/sxs.c new file mode 100644 index 0000000000..ed0a3b325a --- /dev/null +++ b/dlls/kernel32/tests/sxs.c @@ -0,0 +1,359 @@ +/* + * Side by side tests + * + * Copyright 2017 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/test.h" +#include <winbase.h> +#include <windef.h> +#include "winuser.h" +#include <stdio.h> + +#define WM_TESTVERSION WM_USER +#define VERSION_EXE (WM_TESTVERSION + 0) +#define VERSION_DLL (WM_TESTVERSION + 1) + +void WINAPI (*GetRegisterStatus)(BOOL *sidebyside, BOOL *sidebyside_second); + +static LRESULT WINAPI WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + if(message == WM_TESTVERSION) + return VERSION_EXE; + return DefWindowProcA(hwnd, message, wParam, lParam); +} + +static void register_classes(void) +{ + WNDCLASSA cls = {0}; + cls.lpfnWndProc = WndProc; + cls.hInstance = GetModuleHandleA(0); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.lpszClassName = "sidebyside"; + RegisterClassA(&cls); +} + +static BOOL write_resource_file(const char *path_tmp, const char *name_res, const char *name_file, char *path_file) +{ + HRSRC rsrc; + void *rsrc_data; + DWORD rsrc_size; + BOOL ret; + HANDLE hfile; + + rsrc = FindResourceA(GetModuleHandleA(NULL), name_res, (LPCSTR)RT_RCDATA); + if (!rsrc) return FALSE; + + rsrc_data = LockResource(LoadResource(GetModuleHandleA(NULL), rsrc)); + if (!rsrc_data) return FALSE; + + rsrc_size = SizeofResource(GetModuleHandleA(NULL), rsrc); + if (!rsrc_size) return FALSE; + + sprintf(path_file, "%s%s", path_tmp, name_file); + hfile = CreateFileA(path_file, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); + if (hfile == INVALID_HANDLE_VALUE) return FALSE; + + ret = WriteFile(hfile, rsrc_data, rsrc_size, &rsrc_size, NULL); + + CloseHandle(hfile); + return ret; +} + +void check_register_status(int run, BOOL expected_registered_sidebyside, BOOL expected_registered_sidebyside_second) +{ + BOOL is_registered_sidebyside; + BOOL is_registered_sidebyside_second; + + GetRegisterStatus(&is_registered_sidebyside, &is_registered_sidebyside_second); + + ok(is_registered_sidebyside == expected_registered_sidebyside, "run %d: Expected %d, got %d\n", + run, expected_registered_sidebyside, is_registered_sidebyside); + ok(is_registered_sidebyside_second == expected_registered_sidebyside_second, "run %d: Expected %d, got %d\n", + run, expected_registered_sidebyside_second, is_registered_sidebyside_second); +} + +void _expect_class_version(int line, int run, const char *class_name, DWORD version_expected) +{ + HWND hwnd; + LRESULT message_result; + + hwnd = CreateWindowA(class_name, "Test", WS_OVERLAPPED | WS_VISIBLE, 10, 10, 300, 300, NULL, NULL, NULL, 0); + ok_(__FILE__, line)(hwnd != NULL, "run %d: CreateWindowA failed: %d\n", run, GetLastError()); + + message_result = SendMessageA(hwnd, WM_TESTVERSION, 0, 0); + ok_(__FILE__, line)(version_expected == message_result, "run: %d, Expected %x, got %lx\n", + run, version_expected, message_result); + + DestroyWindow(hwnd); +} + +#define expect_class_version(run, class_name, version_expected)\ + _expect_class_version(__LINE__, run, class_name, version_expected) + +void run_sxs_test(int run, const char *dll) +{ + char path_tmp[MAX_PATH] = {0}; + char path_dll[MAX_PATH] = {0}; + char path_manifest_dll[MAX_PATH] = {0}; + char path_manifest_exe[MAX_PATH] = {0}; + BOOL success; + ACTCTXA context = {0}; + ULONG_PTR cookie; + HANDLE handle_context; + HWND hwnd_window; + WNDCLASSEXA classinfo; + + GetTempPathA(MAX_PATH, path_tmp); + + if (!write_resource_file(path_tmp, dll, "sxs_dll.dll", path_dll)) + { + skip("run %d: Failed to create file for testing\n", run); + goto cleanup; + } + + if (!write_resource_file(path_tmp, "sxs_exe.manifest", "sxs_exe.manifest", path_manifest_exe)) + { + skip("run %d: Failed to create file for testing\n", run); + goto cleanup; + } + + if (!write_resource_file(path_tmp, "sxs_dll.manifest", "sxs_dll.manifest", path_manifest_dll)) + { + skip("run %d: Failed to create file for testing\n", run); + goto cleanup; + } + + /* Tests without activation context, must fail */ + success = GetClassInfoExA(GetModuleHandleA(NULL), "sidebyside", &classinfo); + ok(!success || GetLastError() != ERROR_CLASS_DOES_NOT_EXIST, "run %d: Expected GetClassInfoExW to fail with ERROR_CLASS_DOES_NOT_EXIST\n", run); + + hwnd_window = CreateWindowA("sidebyside", "Test", WS_OVERLAPPED | WS_VISIBLE, 10, 10, 300, 300, NULL, NULL, NULL, 0); + todo_wine + ok(hwnd_window == NULL && GetLastError() == ERROR_CANNOT_FIND_WND_CLASS, + "run %d: Expected CreateWindowExW to fail with ERROR_CANNOT_FIND_WND_CLASS, got %d.\n", run, GetLastError()); + DestroyWindow(hwnd_window); + + GetRegisterStatus = (void *)GetProcAddress(LoadLibraryA(path_dll), "GetRegisterStatus"); + + if(run == 3) + { + register_classes(); + } + + context.cbSize = sizeof(ACTCTXA); + context.lpSource = path_manifest_exe; + context.lpAssemblyDirectory = path_tmp; + context.dwFlags = ACTCTX_FLAG_ASSEMBLY_DIRECTORY_VALID; + + handle_context = CreateActCtxA(&context); + todo_wine + ok(handle_context != NULL && handle_context != INVALID_HANDLE_VALUE, "run %d: CreateActCtxA failed: %d\n", run, GetLastError()); + + if(handle_context == NULL || handle_context == INVALID_HANDLE_VALUE) + { + skip("Failed to create activation context\n"); + return; + } + + success = ActivateActCtx(handle_context, &cookie); + ok(success, "run %d: ActivateActCtx failed: %d\n", run, GetLastError()); + + switch(run) + { + case 0: + /* Test with dll that doesn't have RegisterClassNameW */ + hwnd_window = CreateWindowA("sidebyside", "Test", WS_OVERLAPPED | WS_VISIBLE, 10, 10, 300, 300, NULL, NULL, NULL, 0); + ok(hwnd_window == NULL && GetLastError() == ERROR_PROC_NOT_FOUND, + "run %d: CreateWindowA should have failed with ERROR_PROC_NOT_FOUND, but we got %d\n", run, GetLastError()); + break; + case 1: + case 2: + /* It seems you can't use versioned names right away because they are not loaded */ + hwnd_window = CreateWindowA("1.0.1.2!sidebyside", "Test", WS_OVERLAPPED | WS_VISIBLE, 10, 10, 300, 300, NULL, NULL, NULL, 0); + ok(hwnd_window == NULL, "run %d: CreateWindowA should have failed for versioned name\n", run); + DestroyWindow(hwnd_window); + + check_register_status(run, FALSE, FALSE); + + success = GetClassInfoExA(GetModuleHandleA(NULL), "1.0.1.2!sidebyside", &classinfo); + ok(!success, "run %d: GetClassInfoExW should have failed for versioned name\n", run); + + if(run == 1) + { + /* Calling CreateWindow essentially triggers registration of versioned names */ + hwnd_window = CreateWindowA("sidebyside", "Test", WS_OVERLAPPED | WS_VISIBLE, 10, 10, 300, 300, NULL, NULL, NULL, 0); + ok(hwnd_window != NULL, "run %d: CreateWindowA failed: %d\n", run, GetLastError()); + DestroyWindow(hwnd_window); + } + else /* run == 2 */ + { + success = GetClassInfoExA(GetModuleHandleA(NULL), "sidebyside", &classinfo); + ok(success, "run %d: GetClassInfoExW failed: %d\n", run, GetLastError()); + } + + check_register_status(run, TRUE, FALSE); + + success = GetClassInfoExA(GetModuleHandleA(NULL), "1.0.1.2!sidebyside", &classinfo); + ok(success, "run %d: GetClassInfoExW failed for versioned name: %d\n", run, GetLastError()); + + /* Second class should not be registered yet */ + success = GetClassInfoExA(GetModuleHandleA(NULL), "1.0.1.2!sidebyside_second", &classinfo); + ok(!success, "run %d: GetClassInfoExW should have failed for versioned name\n", run); + + if(run == 1) + { + /* Calling CreateWindow essentially triggers registration of versioned names */ + hwnd_window = CreateWindowA("sidebyside_second", "Test", WS_OVERLAPPED | WS_VISIBLE, 10, 10, 300, 300, NULL, NULL, NULL, 0); + ok(hwnd_window != NULL, "run %d: CreateWindowA failed: %d\n", run, GetLastError()); + DestroyWindow(hwnd_window); + } + else /* run == 2 */ + { + success = GetClassInfoExA(GetModuleHandleA(NULL), "sidebyside_second", &classinfo); + ok(success, "run %d: GetClassInfoExW failed: %d\n", run, GetLastError()); + } + /* Second class should be registered now */ + check_register_status(run, TRUE, TRUE); + + success = GetClassInfoExA(GetModuleHandleA(NULL), "1.0.1.2!sidebyside_second", &classinfo); + ok(success, "run %d: GetClassInfoExW failed for versioned name: %d\n", run, GetLastError()); + + /* Now register own classes */ + register_classes(); + + expect_class_version(run, "sidebyside", VERSION_DLL); + break; + case 3: /* own classes registered before sxs classes */ + check_register_status(run, FALSE, FALSE); + expect_class_version(run, "sidebyside", VERSION_DLL); + check_register_status(run, TRUE, FALSE); + expect_class_version(run, "1.0.1.2!sidebyside", VERSION_DLL); + break; + case 4: /* sxs context created before registering own classes + * For some reason the dll classes are not used */ + register_classes(); + expect_class_version(run, "sidebyside", VERSION_EXE); + check_register_status(run, FALSE, FALSE); + expect_class_version(run, "1.0.1.2!sidebyside", VERSION_EXE); + check_register_status(run, FALSE, FALSE); + + success = GetClassInfoExA(GetModuleHandleA(NULL), "sidebyside", &classinfo); + ok(success, "run %d: GetClassInfoExW failed: %d\n", run, GetLastError()); + + expect_class_version(run, "1.0.1.2!sidebyside", VERSION_EXE); + check_register_status(run, FALSE, FALSE); + break; + } + +cleanup: + if(handle_context) + { + success = DeactivateActCtx(0, cookie); + ok(success, "run %d: DeactivateActCtx failed: %d\n", run, GetLastError()); + ReleaseActCtx(handle_context); + } + if(*path_manifest_exe) + { + success = DeleteFileA(path_manifest_exe); + ok(success, "run %d: DeleteFileA failed: %d\n", run, GetLastError()); + } + if(*path_manifest_dll) + { + success = DeleteFileA(path_manifest_dll); + ok(success, "run %d: DeleteFileA failed: %d\n", run, GetLastError()); + } + /* dll cleanup is handled by the parent, because it might still be used by the child */ +} + +void cleanup_sxs_test(int run) +{ + char path_tmp[MAX_PATH] = {0}; + char path_dll[MAX_PATH] = {0}; + BOOL success; + + GetTempPathA(MAX_PATH, path_tmp); + sprintf(path_dll, "%s%s", path_tmp, "sxs_dll.dll"); + + success = DeleteFileA(path_dll); + ok(success, "run %d: DeleteFileA failed: %d\n", run, GetLastError()); +} + +static void run_child_process(int run, const char *dll) +{ + char cmdline[MAX_PATH]; + char exe[MAX_PATH]; + char **argv; + PROCESS_INFORMATION pi; + STARTUPINFOA si = { 0 }; + BOOL ret; + + winetest_get_mainargs( &argv ); + + if(strstr(argv[0], ".exe")) + sprintf(exe, "%s", argv[0]); + else + sprintf(exe, "%s.exe", argv[0]); + sprintf(cmdline, "\"%s\" %s %d %s", argv[0], argv[1], run, dll); + + si.cb = sizeof(si); + ret = CreateProcessA(exe, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); + ok(ret, "Could not create process: %u\n", GetLastError()); + + winetest_wait_child_process( pi.hProcess ); + + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); + + /* Cleanup dll, because it might still have been used by the child */ + cleanup_sxs_test(run); +} + +static BOOL is_vista_or_newer(void) +{ + OSVERSIONINFOA version; + version.dwOSVersionInfoSize = sizeof(version); + GetVersionExA(&version); + return version.dwMajorVersion > 5; +} + +START_TEST(sxs) +{ + int argc; + char **argv; + + argc = winetest_get_mainargs(&argv); + if(argc > 2) + { + int run = atoi(argv[2]); + const char *dll = argv[3]; + run_sxs_test(run, dll); + return; + } + + if( !is_vista_or_newer()) + { + win_skip("OS doesn't support private manifests outside of DLL.\n"); + return; + } + + run_child_process(0, "sxs_dll_2.dll"); + run_child_process(1, "sxs_dll_1.dll"); + run_child_process(2, "sxs_dll_1.dll"); + run_child_process(3, "sxs_dll_1.dll"); + run_child_process(4, "sxs_dll_1.dll"); +} diff --git a/dlls/kernel32/tests/sxs_dll.manifest b/dlls/kernel32/tests/sxs_dll.manifest new file mode 100644 index 0000000000..e4ec376734 --- /dev/null +++ b/dlls/kernel32/tests/sxs_dll.manifest @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v3" manifestVersion="1.0"> + <assemblyIdentity type="win32" name="sxs_dll" version="1.0.1.2" processorArchitecture="x86" publicKeyToken="0000000000000000"/> + <file name="sxs_dll.dll"> + <windowClass>sidebyside</windowClass> + <windowClass>sidebyside_second</windowClass> + </file> +</assembly> diff --git a/dlls/kernel32/tests/sxs_dll_1.c b/dlls/kernel32/tests/sxs_dll_1.c new file mode 100644 index 0000000000..6c79195970 --- /dev/null +++ b/dlls/kernel32/tests/sxs_dll_1.c @@ -0,0 +1,67 @@ +/* + * Side by side tests + * + * Copyright 2017 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* i686-w64-mingw32-gcc -static -shared -Wall -Wl,--kill-at -o sxs_dll_1.dll sxs_dll_1.c */ + +#include <windows.h> + +#define WM_TESTVERSION WM_USER +#define VERSION_EXE (WM_TESTVERSION + 0) +#define VERSION_DLL (WM_TESTVERSION + 1) + +static BOOL is_registered_sidebyside = FALSE; +static BOOL is_registered_sidebyside_second = FALSE; + +static LRESULT WINAPI wnd_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) +{ + if(message == WM_TESTVERSION) + return VERSION_DLL; + return DefWindowProcA(hwnd, message, wparam, lparam); +} + +__declspec(dllexport) void WINAPI GetRegisterStatus(BOOL *sidebyside, BOOL *sidebyside_second) +{ + *sidebyside = is_registered_sidebyside; + *sidebyside_second = is_registered_sidebyside_second; +} + +__declspec(dllexport) BOOLEAN WINAPI RegisterClassNameW(PCWSTR lpClassName) +{ + const WCHAR sidebyside[] = {'s', 'i', 'd', 'e', 'b', 'y', 's', 'i', 'd', 'e', 0}; + const WCHAR sidebyside_second[] = {'s', 'i', 'd', 'e', 'b', 'y', 's', 'i', 'd', 'e', '_', 's', 'e', 'c', 'o', 'n', 'd', 0}; + + WNDCLASSW cls = {0}; + cls.lpfnWndProc = wnd_proc; + cls.hInstance = GetModuleHandleW(0); + cls.lpszClassName = lpClassName; + RegisterClassW(&cls); + + if(lstrcmpW(lpClassName, sidebyside) == 0) + is_registered_sidebyside = TRUE; + if(lstrcmpW(lpClassName, sidebyside_second) == 0) + is_registered_sidebyside_second = TRUE; + + return TRUE; +} + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + return TRUE; +} diff --git a/dlls/kernel32/tests/sxs_dll_1.dll b/dlls/kernel32/tests/sxs_dll_1.dll new file mode 100755 index 0000000000000000000000000000000000000000..c611a5fab63ee17158779f7c9adeb6e2ce03d0c9 GIT binary patch literal 268734 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 UaH#=Hi(E5>z$P|Q^`!j&1HywbT>t<8 literal 0 HcmV?d00001 diff --git a/dlls/kernel32/tests/sxs_dll_2.c b/dlls/kernel32/tests/sxs_dll_2.c new file mode 100644 index 0000000000..abd1438204 --- /dev/null +++ b/dlls/kernel32/tests/sxs_dll_2.c @@ -0,0 +1,52 @@ +/* + * Side by side tests + * + * Copyright 2017 Fabian Maurer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* i686-w64-mingw32-gcc -static -shared -Wall -Wl,--kill-at -o sxs_dll_2.dll sxs_dll_2.c */ + +#include <windows.h> + +static LRESULT WINAPI wnd_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) +{ + return DefWindowProcA(hwnd, message, wparam, lparam); +} + +void register_classes(void) +{ + WNDCLASSA cls = {0}; + cls.lpfnWndProc = wnd_proc; + cls.hInstance = GetModuleHandleA(0); + cls.lpszClassName = "sidebyside"; + RegisterClassA(&cls); + + cls.lpszClassName = "sidebyside_unused"; + RegisterClassA(&cls); +} + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + register_classes(); + break; + } + + return TRUE; +} diff --git a/dlls/kernel32/tests/sxs_dll_2.dll b/dlls/kernel32/tests/sxs_dll_2.dll new file mode 100755 index 0000000000000000000000000000000000000000..adc587756cde2a0368de81c85aaf7561a30c7ae6 GIT binary patch literal 267928 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 K*oLXDN&gp0_3j-2 literal 0 HcmV?d00001 diff --git a/dlls/kernel32/tests/sxs_exe.manifest b/dlls/kernel32/tests/sxs_exe.manifest new file mode 100644 index 0000000000..25c4d3dd5d --- /dev/null +++ b/dlls/kernel32/tests/sxs_exe.manifest @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <dependency> + <dependentAssembly> + <assemblyIdentity type="win32" name="sxs_dll" version="1.0.1.2" processorArchitecture="x86" publicKeyToken="0000000000000000" language="*"/> + </dependentAssembly> + </dependency> +</assembly> -- 2.16.1

3 4

[PATCH] cmd: Avoid having first parameter to start.exe ignored.
by Bernhard Übelacker 27 Jan '18

27 Jan '18

https://bugs.winehq.org/show_bug.cgi?id=44334 Found while trying to look into #44236. A batch script is executed but the start commands do not wait until the started process ends. Example line: --- start /W " " "%SFDIR%automesh" wr2300 --- As far as I see this happens when WCMD_start encounters an title parameter. Then it removes the executable from the cmdline parameter to CreateProcessW. --- start /W "" notepad 002f:trace:process:create_process_impl app L"C:\\windows\\command\\start.exe" cmdline L"/W \"\\\"\\\"\" notepad" --- This get not recognized much, because usually the title is the first parameter and is therefore ignored by start.exe. This patch tries to maintain the executable as first parameter in the cmdline parameter to CreateProcessW. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> --- programs/cmd/builtins.c | 14 ++++++++------ programs/cmd/tests/test_builtins.cmd | 4 ++++ programs/cmd/tests/test_builtins.cmd.exp | 2 ++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 14961d7922..257a948506 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4323,6 +4323,7 @@ void WCMD_start(WCHAR *args) int have_title; WCHAR file[MAX_PATH]; WCHAR *cmdline; + WCHAR *cmdline_params; STARTUPINFOW st; PROCESS_INFORMATION pi; @@ -4331,6 +4332,7 @@ void WCMD_start(WCHAR *args) cmdline = heap_alloc( (strlenW(file) + strlenW(args) + 8) * sizeof(WCHAR) ); strcpyW( cmdline, file ); strcatW( cmdline, spaceW ); + cmdline_params = cmdline + strlenW(file) + strlenW(spaceW); /* The start built-in has some special command-line parsing properties * which will be outlined here. @@ -4382,17 +4384,17 @@ void WCMD_start(WCHAR *args) have_title = TRUE; /* Copy all of the cmdline processed */ - memcpy(cmdline, args, sizeof(WCHAR) * (argN - args)); - cmdline[argN - args] = '\0'; + memcpy(cmdline_params, args, sizeof(WCHAR) * (argN - args)); + cmdline_params[argN - args] = '\0'; /* Add quoted title */ - strcatW(cmdline, prefixQuote); - strcatW(cmdline, thisArg); - strcatW(cmdline, postfixQuote); + strcatW(cmdline_params, prefixQuote); + strcatW(cmdline_params, thisArg); + strcatW(cmdline_params, postfixQuote); /* Concatenate remaining command-line */ thisArg = WCMD_parameter_with_delims(args, argno, &argN, TRUE, FALSE, startDelims); - strcatW(cmdline, argN + strlenW(thisArg)); + strcatW(cmdline_params, argN + strlenW(thisArg)); break; } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 62334b17b6..b8b2a7a6b8 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -2978,6 +2978,10 @@ path set path=%WINE_backup_path% set WINE_backup_path= +echo ------------ Testing start /W ------------ +echo start /W failed to wait>foobar.txt +start /W "" cmd /C "ping -n1 & echo start /W seems to really wait>foobar.txt"& type foobar.txt& del foobar.txt + echo ------------ Testing combined CALLs/GOTOs ------------ echo @echo off>foo.cmd echo goto :eof>>foot.cmd diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 796550e57e..a32c8fe25e 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -1571,6 +1571,8 @@ Correctly ignored trailing information PATH=original PATH=try2 PATH=try3 +------------ Testing start /W ------------ +start /W seems to really wait ------------ Testing combined CALLs/GOTOs ------------ world cheball -- 2.15.1

1 0

[PATCH 3/3] kerberos: Add support for KerbQueryTicketCacheMessage. (v2)
by Dmitry Timoshkov 26 Jan '18

26 Jan '18

Based on the code written by George Popoff. v2: Copy full ticket info (including Realm/Server name) to flat buffer. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 405 +++++++++++++++++++++++++++++++++++++++++++++++- include/ntsecapi.h | 105 +++++++++++++ 2 files changed, 507 insertions(+), 3 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index b4a37f754f..dc97b1cc04 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1,5 +1,6 @@ /* * Copyright 2017 Dmitry Timoshkov + * Copyright 2017 George Popoff * Copyright 2008 Robert Shearman for CodeWeavers * Copyright 2017 Hans Leidekker for CodeWeavers * @@ -36,6 +37,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "rpc.h" #include "sspi.h" #include "ntsecapi.h" @@ -88,8 +90,43 @@ static void *libkrb5_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p_##f MAKE_FUNCPTR(krb5_init_context); +MAKE_FUNCPTR(krb5_free_context); +MAKE_FUNCPTR(krb5_free_ticket); +MAKE_FUNCPTR(krb5_cccol_cursor_new); +MAKE_FUNCPTR(krb5_cccol_cursor_next); +MAKE_FUNCPTR(krb5_cccol_cursor_free); +MAKE_FUNCPTR(krb5_cc_close); +MAKE_FUNCPTR(krb5_cc_start_seq_get); +MAKE_FUNCPTR(krb5_cc_end_seq_get); +MAKE_FUNCPTR(krb5_cc_next_cred); +MAKE_FUNCPTR(krb5_is_config_principal); +MAKE_FUNCPTR(krb5_decode_ticket); +MAKE_FUNCPTR(krb5_unparse_name_flags); +MAKE_FUNCPTR(krb5_free_unparsed_name); +MAKE_FUNCPTR(krb5_free_cred_contents); #undef MAKE_FUNCPTR +static void *heap_alloc(SIZE_T size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +static void *heap_realloc(void *p, SIZE_T size) +{ + return HeapReAlloc(GetProcessHeap(), 0, p, size); +} + +static void heap_free(void *p) +{ + HeapFree(GetProcessHeap(), 0, p); +} + +struct ticket_info +{ + ULONG count, allocated; + KERB_TICKET_CACHE_INFO *info; +}; + static void load_krb5(void) { if (!(libkrb5_handle = wine_dlopen(SONAME_LIBKRB5, RTLD_NOW, NULL, 0))) @@ -106,6 +143,20 @@ static void load_krb5(void) } LOAD_FUNCPTR(krb5_init_context) + LOAD_FUNCPTR(krb5_free_context) + LOAD_FUNCPTR(krb5_free_ticket) + LOAD_FUNCPTR(krb5_cccol_cursor_new) + LOAD_FUNCPTR(krb5_cccol_cursor_next) + LOAD_FUNCPTR(krb5_cccol_cursor_free) + LOAD_FUNCPTR(krb5_cc_close) + LOAD_FUNCPTR(krb5_cc_start_seq_get) + LOAD_FUNCPTR(krb5_cc_end_seq_get) + LOAD_FUNCPTR(krb5_cc_next_cred) + LOAD_FUNCPTR(krb5_is_config_principal) + LOAD_FUNCPTR(krb5_decode_ticket) + LOAD_FUNCPTR(krb5_unparse_name_flags) + LOAD_FUNCPTR(krb5_free_unparsed_name) + LOAD_FUNCPTR(krb5_free_cred_contents) #undef LOAD_FUNCPTR return; @@ -157,15 +208,363 @@ static NTSTATUS NTAPI kerberos_LsaApInitializePackage(ULONG package_id, PLSA_DIS return STATUS_SUCCESS; } +static NTSTATUS krb5_error_to_status(krb5_error_code error) +{ + switch (error) + { + case 0: return STATUS_SUCCESS; + default: + /* FIXME */ + return STATUS_UNSUCCESSFUL; + } +} + +static void free_ticket_info(struct ticket_info *info) +{ + ULONG i; + + for (i = 0; i < info->count; i++) + { + heap_free(info->info[i].RealmName.Buffer); + heap_free(info->info[i].ServerName.Buffer); + } + + heap_free(info->info); +} + +static WCHAR *utf8_to_wstr(const char *utf8) +{ + int len; + WCHAR *wstr; + + len = MultiByteToWideChar(CP_UTF8, 0, utf8, -1, NULL, 0); + wstr = heap_alloc(len * sizeof(WCHAR)); + if (wstr) + MultiByteToWideChar(CP_UTF8, 0, utf8, -1, wstr, len); + + return wstr; +} + +static NTSTATUS copy_tickets_from_cache(krb5_context context, krb5_ccache cache, struct ticket_info *info) +{ + NTSTATUS status; + krb5_cc_cursor cursor; + krb5_error_code error; + krb5_creds credentials; + krb5_ticket *ticket; + char *name_with_realm, *name_without_realm, *realm_name; + WCHAR *realm_nameW, *name_without_realmW; + + error = p_krb5_cc_start_seq_get(context, cache, &cursor); + if (error) return krb5_error_to_status(error); + + for (;;) + { + error = p_krb5_cc_next_cred(context, cache, &cursor, &credentials); + if (error) + { + if (error == KRB5_CC_END) + status = STATUS_SUCCESS; + else + status = krb5_error_to_status(error); + break; + } + + if (p_krb5_is_config_principal(context, credentials.server)) + { + p_krb5_free_cred_contents(context, &credentials); + continue; + } + + if (info->count == info->allocated) + { + KERB_TICKET_CACHE_INFO *new_info; + ULONG new_allocated; + + if (info->allocated) + { + new_allocated = info->allocated * 2; + new_info = heap_realloc(info->info, sizeof(*new_info) * new_allocated); + } + else + { + new_allocated = 16; + new_info = heap_alloc(sizeof(*new_info) * new_allocated); + } + if (!new_info) + { + p_krb5_free_cred_contents(context, &credentials); + status = STATUS_NO_MEMORY; + break; + } + + info->info = new_info; + info->allocated = new_allocated; + } + + error = p_krb5_unparse_name_flags(context, credentials.server, 0, &name_with_realm); + if (error) + { + p_krb5_free_cred_contents(context, &credentials); + status = krb5_error_to_status(error); + break; + } + + TRACE("name_with_realm: %s\n", debugstr_a(name_with_realm)); + + error = p_krb5_unparse_name_flags(context, credentials.server, + KRB5_PRINCIPAL_UNPARSE_NO_REALM, &name_without_realm); + if (error) + { + p_krb5_free_unparsed_name(context, name_with_realm); + p_krb5_free_cred_contents(context, &credentials); + status = krb5_error_to_status(error); + break; + } + + TRACE("name_without_realm: %s\n", debugstr_a(name_without_realm)); + + name_without_realmW = utf8_to_wstr(name_without_realm); + RtlInitUnicodeString(&info->info[info->count].ServerName, name_without_realmW); + + realm_name = strchr(name_with_realm, '@'); + if (!realm_name) + { + ERR("wrong name with realm %s\n", debugstr_a(name_with_realm)); + realm_name = name_with_realm; + } + else + realm_name++; + + /* realm_name - now contains only realm! */ + + realm_nameW = utf8_to_wstr(realm_name); + RtlInitUnicodeString(&info->info[info->count].RealmName, realm_nameW); + + if (!credentials.times.starttime) + credentials.times.starttime = credentials.times.authtime; + + /* TODO: if krb5_is_config_principal = true */ + RtlSecondsSince1970ToTime(credentials.times.starttime, &info->info[info->count].StartTime); + RtlSecondsSince1970ToTime(credentials.times.endtime, &info->info[info->count].EndTime); + RtlSecondsSince1970ToTime(credentials.times.renew_till, &info->info[info->count].RenewTime); + + info->info[info->count].TicketFlags = credentials.ticket_flags; + + error = p_krb5_decode_ticket(&credentials.ticket, &ticket); + + p_krb5_free_unparsed_name(context, name_with_realm); + p_krb5_free_unparsed_name(context, name_without_realm); + p_krb5_free_cred_contents(context, &credentials); + + if (error) + { + status = krb5_error_to_status(error); + break; + } + + info->info[info->count].EncryptionType = ticket->enc_part.enctype; + + p_krb5_free_ticket(context, ticket); + + info->count++; + } + + p_krb5_cc_end_seq_get(context, cache, &cursor); + + return status; +} + +static inline void init_client_us(UNICODE_STRING *dst, void *client_ws, const UNICODE_STRING *src) +{ + dst->Buffer = client_ws; + dst->Length = src->Length; + dst->MaximumLength = src->MaximumLength; +} + +static NTSTATUS copy_to_client(PLSA_CLIENT_REQUEST lsa_req, struct ticket_info *info, void **out, ULONG *out_size) +{ + NTSTATUS status; + ULONG i; + SIZE_T size, client_str_off; + char *client_resp, *client_ticket, *client_str; + KERB_QUERY_TKT_CACHE_RESPONSE resp; + + size = sizeof(KERB_QUERY_TKT_CACHE_RESPONSE); + if (info->count != 0) + size += (info->count - 1) * sizeof(KERB_TICKET_CACHE_INFO); + + client_str_off = size; + + for (i = 0; i < info->count; i++) + { + size += info->info[i].RealmName.MaximumLength; + size += info->info[i].ServerName.MaximumLength; + } + + status = lsa_dispatch.AllocateClientBuffer(lsa_req, size, (void **)&client_resp); + if (status != STATUS_SUCCESS) return status; + + resp.MessageType = KerbQueryTicketCacheMessage; + resp.CountOfTickets = info->count; + size = FIELD_OFFSET(KERB_QUERY_TKT_CACHE_RESPONSE, Tickets); + status = lsa_dispatch.CopyToClientBuffer(lsa_req, size, client_resp, &resp); + if (status != STATUS_SUCCESS) goto fail; + + if (!info->count) + { + *out = client_resp; + *out_size = sizeof(resp); + return STATUS_SUCCESS; + } + + *out_size = size; + + client_ticket = client_resp + size; + client_str = client_resp + client_str_off; + + for (i = 0; i < info->count; i++) + { + KERB_TICKET_CACHE_INFO ticket; + + ticket = info->info[i]; + + init_client_us(&ticket.RealmName, client_str, &info->info[i].RealmName); + + size = info->info[i].RealmName.MaximumLength; + status = lsa_dispatch.CopyToClientBuffer(lsa_req, size, client_str, info->info[i].RealmName.Buffer); + if (status != STATUS_SUCCESS) goto fail; + client_str += size; + *out_size += size; + + init_client_us(&ticket.ServerName, client_str, &info->info[i].ServerName); + + size = info->info[i].ServerName.MaximumLength; + status = lsa_dispatch.CopyToClientBuffer(lsa_req, size, client_str, info->info[i].ServerName.Buffer); + if (status != STATUS_SUCCESS) goto fail; + client_str += size; + *out_size += size; + + status = lsa_dispatch.CopyToClientBuffer(lsa_req, sizeof(ticket), client_ticket, &ticket); + if (status != STATUS_SUCCESS) goto fail; + + client_ticket += sizeof(ticket); + *out_size += sizeof(ticket); + } + + *out = client_resp; + return STATUS_SUCCESS; + +fail: + lsa_dispatch.FreeClientBuffer(lsa_req, client_resp); + return status; +} + +static NTSTATUS query_ticket_cache(PLSA_CLIENT_REQUEST lsa_req, void *in, ULONG in_len, void **out, ULONG *out_len) +{ + NTSTATUS status; + KERB_QUERY_TKT_CACHE_REQUEST *query; + struct ticket_info info; + krb5_error_code error; + krb5_context context = NULL; + krb5_cccol_cursor cursor = NULL; + krb5_ccache cache; + + if (!in || in_len != sizeof(KERB_QUERY_TKT_CACHE_REQUEST) || !out || !out_len) + return STATUS_INVALID_PARAMETER; + + query = (KERB_QUERY_TKT_CACHE_REQUEST *)in; + + if (query->LogonId.HighPart != 0 || query->LogonId.LowPart != 0) + return STATUS_ACCESS_DENIED; + + info.count = 0; + info.allocated = 0; + info.info = NULL; + + error = p_krb5_init_context(&context); + if (error) + { + status = krb5_error_to_status(error); + goto done; + } + + error = p_krb5_cccol_cursor_new(context, &cursor); + if (error) + { + status = krb5_error_to_status(error); + goto done; + } + + for (;;) + { + error = p_krb5_cccol_cursor_next(context, cursor, &cache); + if (error) + { + status = krb5_error_to_status(error); + goto done; + } + if (!cache) break; + + status = copy_tickets_from_cache(context, cache, &info); + + p_krb5_cc_close(context, cache); + + if (status != STATUS_SUCCESS) + goto done; + } + + status = copy_to_client(lsa_req, &info, out, out_len); + +done: + if (cursor) + p_krb5_cccol_cursor_free(context, &cursor); + + if (context) + p_krb5_free_context(context); + + free_ticket_info(&info); + + return status; +} + static NTSTATUS NTAPI kerberos_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST request, PVOID in_buffer, PVOID client_buffer_base, ULONG in_buffer_length, PVOID *out_buffer, PULONG out_buffer_length, PNTSTATUS status) { - FIXME("%p,%p,%p,%u,%p,%p,%p: stub\n", request, in_buffer, client_buffer_base, + KERB_PROTOCOL_MESSAGE_TYPE msg; + + TRACE("%p,%p,%p,%u,%p,%p,%p\n", request, in_buffer, client_buffer_base, in_buffer_length, out_buffer, out_buffer_length, status); - *status = STATUS_NOT_IMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + if (!in_buffer || in_buffer_length < sizeof(msg)) + return STATUS_INVALID_PARAMETER; + + msg = *(KERB_PROTOCOL_MESSAGE_TYPE *)in_buffer; + + switch (msg) + { + case KerbQueryTicketCacheMessage: + *status = query_ticket_cache(request, in_buffer, in_buffer_length, out_buffer, out_buffer_length); + break; + + case KerbRetrieveTicketMessage: + FIXME("KerbRetrieveTicketMessage stub\n"); + *status = STATUS_NOT_IMPLEMENTED; + break; + + case KerbPurgeTicketCacheMessage: + FIXME("KerbPurgeTicketCacheMessage stub\n"); + *status = STATUS_NOT_IMPLEMENTED; + break; + + default: /* All other requests should call LsaApCallPackage */ + WARN("%u => access denied\n", msg); + *status = STATUS_ACCESS_DENIED; + break; + } + + return *status; } static NTSTATUS NTAPI kerberos_SpGetInfo(SecPkgInfoW *info) diff --git a/include/ntsecapi.h b/include/ntsecapi.h index d0339a97ef..6d5e01d675 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -169,6 +169,15 @@ typedef struct _OBJECT_ATTRIBUTES { } OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES; #endif +#ifndef __SECHANDLE_DEFINED__ +#define __SECHANDLE_DEFINED__ +typedef struct _SecHandle +{ + ULONG_PTR dwLower; + ULONG_PTR dwUpper; +} SecHandle, *PSecHandle; +#endif + typedef UNICODE_STRING LSA_UNICODE_STRING, *PLSA_UNICODE_STRING; typedef STRING LSA_STRING, *PLSA_STRING; typedef OBJECT_ATTRIBUTES LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES; @@ -349,6 +358,102 @@ typedef enum _POLICY_NOTIFICATION_INFORMATION_CLASS static const WCHAR MICROSOFT_KERBEROS_NAME_W[] = { 'K','e','r','b','e','r','o','s',0 }; #endif +#define KERB_TICKET_FLAGS_reserved 0x80000000 +#define KERB_TICKET_FLAGS_forwardable 0x40000000 +#define KERB_TICKET_FLAGS_forwarded 0x20000000 +#define KERB_TICKET_FLAGS_proxiable 0x10000000 +#define KERB_TICKET_FLAGS_proxy 0x08000000 +#define KERB_TICKET_FLAGS_may_postdate 0x04000000 +#define KERB_TICKET_FLAGS_postdated 0x02000000 +#define KERB_TICKET_FLAGS_invalid 0x01000000 +#define KERB_TICKET_FLAGS_renewable 0x00800000 +#define KERB_TICKET_FLAGS_initial 0x00400000 +#define KERB_TICKET_FLAGS_pre_authent 0x00200000 +#define KERB_TICKET_FLAGS_hw_authent 0x00100000 +#define KERB_TICKET_FLAGS_ok_as_delegate 0x00040000 +#define KERB_TICKET_FLAGS_name_canonicalize 0x00010000 +#define KERB_TICKET_FLAGS_cname_in_pa_data 0x00040000 +#define KERB_TICKET_FLAGS_reserved1 0x00000001 + +typedef enum _KERB_PROTOCOL_MESSAGE_TYPE +{ + KerbDebugRequestMessage = 0, + KerbQueryTicketCacheMessage, + KerbChangeMachinePasswordMessage, + KerbVerifyPacMessage, + KerbRetrieveTicketMessage, + KerbUpdateAddressesMessage, + KerbPurgeTicketCacheMessage, + KerbChangePasswordMessage, + KerbRetrieveEncodedTicketMessage, + KerbDecryptDataMessage, + KerbAddBindingCacheEntryMessage, + KerbSetPasswordMessage, + KerbSetPasswordExMessage, + KerbVerifyCredentialsMessage, + KerbQueryTicketCacheExMessage, + KerbPurgeTicketCacheExMessage, + KerbRefreshSmartcardCredentialsMessage, + KerbAddExtraCredentialsMessage, + KerbQuerySupplementalCredentialsMessage, + KerbTransferCredentialsMessage, + KerbQueryTicketCacheEx2Message, + KerbSubmitTicketMessage, + KerbAddExtraCredentialsExMessage, + KerbQueryKdcProxyCacheMessage, + KerbPurgeKdcProxyCacheMessage, + KerbQueryTicketCacheEx3Message, + KerbCleanupMachinePkinitCredsMessage, + KerbAddBindingCacheEntryExMessage, + KerbQueryBindingCacheMessage, + KerbPurgeBindingCacheMessage, + KerbQueryDomainExtendedPoliciesMessage, + KerbQueryS4U2ProxyCacheMessage +} KERB_PROTOCOL_MESSAGE_TYPE, *PKERB_PROTOCOL_MESSAGE_TYPE; + +typedef struct _KERB_TICKET_CACHE_INFO +{ + UNICODE_STRING ServerName; + UNICODE_STRING RealmName; + LARGE_INTEGER StartTime; + LARGE_INTEGER EndTime; + LARGE_INTEGER RenewTime; + LONG EncryptionType; + ULONG TicketFlags; +} KERB_TICKET_CACHE_INFO, *PKERB_TICKET_CACHE_INFO; + +typedef struct _KERB_QUERY_TKT_CACHE_REQUEST +{ + KERB_PROTOCOL_MESSAGE_TYPE MessageType; + LUID LogonId; +} KERB_QUERY_TKT_CACHE_REQUEST, *PKERB_QUERY_TKT_CACHE_REQUEST; + +typedef struct _KERB_QUERY_TKT_CACHE_RESPONSE +{ + KERB_PROTOCOL_MESSAGE_TYPE MessageType; + ULONG CountOfTickets; + KERB_TICKET_CACHE_INFO Tickets[ANYSIZE_ARRAY]; +} KERB_QUERY_TKT_CACHE_RESPONSE, *PKERB_QUERY_TKT_CACHE_RESPONSE; + +typedef struct _KERB_RETRIEVE_TKT_REQUEST +{ + KERB_PROTOCOL_MESSAGE_TYPE MessageType; + LUID LogonId; + UNICODE_STRING TargetName; + ULONG TicketFlags; + ULONG CacheOptions; + LONG EncryptionType; + SecHandle CredentialsHandle; +} KERB_RETRIEVE_TKT_REQUEST, *PKERB_RETRIEVE_TKT_REQUEST; + +typedef struct _KERB_PURGE_TKT_CACHE_REQUEST +{ + KERB_PROTOCOL_MESSAGE_TYPE MessageType; + LUID LogonId; + UNICODE_STRING ServerName; + UNICODE_STRING RealmName; +} KERB_PURGE_TKT_CACHE_REQUEST, *PKERB_PURGE_TKT_CACHE_REQUEST; + #define RtlGenRandom SystemFunction036 #define RtlEncryptMemory SystemFunction040 #define RtlDecryptMemory SystemFunction041 -- 2.15.1

3 3

[PATCH] mshtml: Avoid using a global display DC.
by Alexandre Julliard 26 Jan '18

26 Jan '18

This is not thread-safe. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlscreen.c | 8 +++++--- dlls/mshtml/main.c | 18 ------------------ dlls/mshtml/mshtml_private.h | 1 - 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/dlls/mshtml/htmlscreen.c b/dlls/mshtml/htmlscreen.c index 2ddaad23185c..5c52e4c43741 100644 --- a/dlls/mshtml/htmlscreen.c +++ b/dlls/mshtml/htmlscreen.c @@ -123,10 +123,12 @@ static HRESULT WINAPI HTMLScreen_Invoke(IHTMLScreen *iface, DISPID dispIdMember, static HRESULT WINAPI HTMLScreen_get_colorDepth(IHTMLScreen *iface, LONG *p) { HTMLScreen *This = impl_from_IHTMLScreen(iface); + HDC hdc = GetDC(0); TRACE("(%p)->(%p)\n", This, p); - *p = GetDeviceCaps(get_display_dc(), BITSPIXEL); + *p = GetDeviceCaps(hdc, BITSPIXEL); + ReleaseDC(0, hdc); return S_OK; } @@ -150,7 +152,7 @@ static HRESULT WINAPI HTMLScreen_get_width(IHTMLScreen *iface, LONG *p) TRACE("(%p)->(%p)\n", This, p); - *p = GetDeviceCaps(get_display_dc(), HORZRES); + *p = GetSystemMetrics(SM_CXSCREEN); return S_OK; } @@ -160,7 +162,7 @@ static HRESULT WINAPI HTMLScreen_get_height(IHTMLScreen *iface, LONG *p) TRACE("(%p)->(%p)\n", This, p); - *p = GetDeviceCaps(get_display_dc(), VERTRES); + *p = GetSystemMetrics(SM_CYSCREEN); return S_OK; } diff --git a/dlls/mshtml/main.c b/dlls/mshtml/main.c index af716d16806c..0227cccf3497 100644 --- a/dlls/mshtml/main.c +++ b/dlls/mshtml/main.c @@ -51,7 +51,6 @@ HINSTANCE hInst; DWORD mshtml_tls = TLS_OUT_OF_INDEXES; static HINSTANCE shdoclc = NULL; -static HDC display_dc; static WCHAR *status_strings[IDS_STATUS_LAST-IDS_STATUS_FIRST+1]; static IMultiLanguage2 *mlang; @@ -140,8 +139,6 @@ static void process_detach(void) FreeLibrary(shdoclc); if(mshtml_tls != TLS_OUT_OF_INDEXES) TlsFree(mshtml_tls); - if(display_dc) - DeleteObject(display_dc); if(mlang) IMultiLanguage2_Release(mlang); @@ -210,21 +207,6 @@ HINSTANCE get_shdoclc(void) return shdoclc = LoadLibraryExW(wszShdoclc, NULL, LOAD_LIBRARY_AS_DATAFILE); } -HDC get_display_dc(void) -{ - static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; - - if(!display_dc) { - HDC hdc; - - hdc = CreateICW(displayW, NULL, NULL, NULL); - if(InterlockedCompareExchangePointer((void**)&display_dc, hdc, NULL)) - DeleteObject(hdc); - } - - return display_dc; -} - BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID reserved) { switch(fdwReason) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index aef82cd18b55..51a1addaf269 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1348,7 +1348,6 @@ extern void *call_thiscall_func; UINT cp_from_charset_string(BSTR) DECLSPEC_HIDDEN; BSTR charset_string_from_cp(UINT) DECLSPEC_HIDDEN; -HDC get_display_dc(void) DECLSPEC_HIDDEN; HINSTANCE get_shdoclc(void) DECLSPEC_HIDDEN; void set_statustext(HTMLDocumentObj*,INT,LPCWSTR) DECLSPEC_HIDDEN; -- 2.15.1

2 1

[PATCH] msvcrt: Optimize the aarch64 setjmp/longjmp using stp/ldp
by Martin Storsjo 26 Jan '18

26 Jan '18

stp/ldp don't require any more alignment than the normal str/ldr. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/msvcrt/except_arm64.c | 74 +++++++++++++++++----------------------------- 1 file changed, 27 insertions(+), 47 deletions(-) diff --git a/dlls/msvcrt/except_arm64.c b/dlls/msvcrt/except_arm64.c index 904d006..2576928 100644 --- a/dlls/msvcrt/except_arm64.c +++ b/dlls/msvcrt/except_arm64.c @@ -141,65 +141,45 @@ __ASM_GLOBAL_FUNC(MSVCRT__setjmp, * _setjmpex (MSVCRT.@) */ __ASM_GLOBAL_FUNC(MSVCRT__setjmpex, - "str x1, [x0]\n\t" /* jmp_buf->Frame */ - "str x19, [x0, #0x10]\n\t" /* jmp_buf->X19 */ - "str x20, [x0, #0x18]\n\t" /* jmp_buf->X20 */ - "str x21, [x0, #0x20]\n\t" /* jmp_buf->X21 */ - "str x22, [x0, #0x28]\n\t" /* jmp_buf->X22 */ - "str x23, [x0, #0x30]\n\t" /* jmp_buf->X23 */ - "str x24, [x0, #0x38]\n\t" /* jmp_buf->X24 */ - "str x25, [x0, #0x40]\n\t" /* jmp_buf->X25 */ - "str x26, [x0, #0x48]\n\t" /* jmp_buf->X26 */ - "str x27, [x0, #0x50]\n\t" /* jmp_buf->X27 */ - "str x28, [x0, #0x58]\n\t" /* jmp_buf->X28 */ - "str x29, [x0, #0x60]\n\t" /* jmp_buf->Fp */ - "str x30, [x0, #0x68]\n\t" /* jmp_buf->Lr */ + "str x1, [x0]\n\t" /* jmp_buf->Frame */ + "stp x19, x20, [x0, #0x10]\n\t" /* jmp_buf->X19, X20 */ + "stp x21, x22, [x0, #0x20]\n\t" /* jmp_buf->X21, X22 */ + "stp x23, x24, [x0, #0x30]\n\t" /* jmp_buf->X23, X24 */ + "stp x25, x26, [x0, #0x40]\n\t" /* jmp_buf->X25, X26 */ + "stp x27, x28, [x0, #0x50]\n\t" /* jmp_buf->X27, X28 */ + "stp x29, x30, [x0, #0x60]\n\t" /* jmp_buf->Fp, Lr */ "mov x2, sp\n\t" - "str x2, [x0, #0x70]\n\t" /* jmp_buf->Sp */ + "str x2, [x0, #0x70]\n\t" /* jmp_buf->Sp */ "mrs x2, fpcr\n\t" - "str w2, [x0, #0x78]\n\t" /* jmp_buf->Fpcr */ + "str w2, [x0, #0x78]\n\t" /* jmp_buf->Fpcr */ "mrs x2, fpsr\n\t" - "str w2, [x0, #0x7c]\n\t" /* jmp_buf->Fpsr */ - "str d8, [x0, #0x80]\n\t" /* jmp_buf->D[0] */ - "str d9, [x0, #0x88]\n\t" /* jmp_buf->D[1] */ - "str d10, [x0, #0x90]\n\t" /* jmp_buf->D[2] */ - "str d11, [x0, #0x98]\n\t" /* jmp_buf->D[3] */ - "str d12, [x0, #0xa0]\n\t" /* jmp_buf->D[4] */ - "str d13, [x0, #0xa8]\n\t" /* jmp_buf->D[5] */ - "str d14, [x0, #0xb0]\n\t" /* jmp_buf->D[6] */ - "str d15, [x0, #0xb8]\n\t" /* jmp_buf->D[7] */ + "str w2, [x0, #0x7c]\n\t" /* jmp_buf->Fpsr */ + "stp d8, d9, [x0, #0x80]\n\t" /* jmp_buf->D[0-1] */ + "stp d10, d11, [x0, #0x90]\n\t" /* jmp_buf->D[2-3] */ + "stp d12, d13, [x0, #0xa0]\n\t" /* jmp_buf->D[4-5] */ + "stp d14, d15, [x0, #0xb0]\n\t" /* jmp_buf->D[6-7] */ "mov x0, #0\n\t" "ret"); extern void DECLSPEC_NORETURN CDECL longjmp_set_regs(struct MSVCRT___JUMP_BUFFER *jmp, int retval); __ASM_GLOBAL_FUNC(longjmp_set_regs, - "ldr x19, [x0, #0x10]\n\t" /* jmp_buf->X19 */ - "ldr x20, [x0, #0x18]\n\t" /* jmp_buf->X20 */ - "ldr x21, [x0, #0x20]\n\t" /* jmp_buf->X21 */ - "ldr x22, [x0, #0x28]\n\t" /* jmp_buf->X22 */ - "ldr x23, [x0, #0x30]\n\t" /* jmp_buf->X23 */ - "ldr x24, [x0, #0x38]\n\t" /* jmp_buf->X24 */ - "ldr x25, [x0, #0x40]\n\t" /* jmp_buf->X25 */ - "ldr x26, [x0, #0x48]\n\t" /* jmp_buf->X26 */ - "ldr x27, [x0, #0x50]\n\t" /* jmp_buf->X27 */ - "ldr x28, [x0, #0x58]\n\t" /* jmp_buf->X28 */ - "ldr x29, [x0, #0x60]\n\t" /* jmp_buf->Fp */ - "ldr x30, [x0, #0x68]\n\t" /* jmp_buf->Lr */ - "ldr x2, [x0, #0x70]\n\t" /* jmp_buf->Sp */ + "ldp x19, x20, [x0, #0x10]\n\t" /* jmp_buf->X19, X20 */ + "ldp x21, x22, [x0, #0x20]\n\t" /* jmp_buf->X21, X22 */ + "ldp x23, x24, [x0, #0x30]\n\t" /* jmp_buf->X23, X24 */ + "ldp x25, x26, [x0, #0x40]\n\t" /* jmp_buf->X25, X26 */ + "ldp x27, x28, [x0, #0x50]\n\t" /* jmp_buf->X27, X28 */ + "ldp x29, x30, [x0, #0x60]\n\t" /* jmp_buf->Fp, Lr */ + "ldr x2, [x0, #0x70]\n\t" /* jmp_buf->Sp */ "mov sp, x2\n\t" - "ldr w2, [x0, #0x78]\n\t" /* jmp_buf->Fpcr */ + "ldr w2, [x0, #0x78]\n\t" /* jmp_buf->Fpcr */ "msr fpcr, x2\n\t" - "ldr w2, [x0, #0x7c]\n\t" /* jmp_buf->Fpsr */ + "ldr w2, [x0, #0x7c]\n\t" /* jmp_buf->Fpsr */ "msr fpsr, x2\n\t" - "ldr d8, [x0, #0x80]\n\t" /* jmp_buf->D[0] */ - "ldr d9, [x0, #0x88]\n\t" /* jmp_buf->D[1] */ - "ldr d10, [x0, #0x90]\n\t" /* jmp_buf->D[2] */ - "ldr d11, [x0, #0x98]\n\t" /* jmp_buf->D[3] */ - "ldr d12, [x0, #0xa0]\n\t" /* jmp_buf->D[4] */ - "ldr d13, [x0, #0xa8]\n\t" /* jmp_buf->D[5] */ - "ldr d14, [x0, #0xb0]\n\t" /* jmp_buf->D[6] */ - "ldr d15, [x0, #0xb8]\n\t" /* jmp_buf->D[7] */ + "ldp d8, d9, [x0, #0x80]\n\t" /* jmp_buf->D[0-1] */ + "ldp d10, d11, [x0, #0x90]\n\t" /* jmp_buf->D[2-3] */ + "ldp d12, d13, [x0, #0xa0]\n\t" /* jmp_buf->D[4-5] */ + "ldp d14, d15, [x0, #0xb0]\n\t" /* jmp_buf->D[6-7] */ "mov x0, x1\n\t" /* retval */ "ret"); -- 2.7.4

2 1

[PATCH 2/3] kerberos: Print verbose traces on gssapi failures.
by Dmitry Timoshkov 26 Jan '18

26 Jan '18

This patch proved to be very useful to track down gssapi failures in addition to diagnostic libkrb5 (KRB5_TRACE=/dev/stdout) output. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 56b78fc22b..b4a37f754f 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -189,6 +189,7 @@ static void *libgssapi_krb5_handle; MAKE_FUNCPTR(gss_accept_sec_context); MAKE_FUNCPTR(gss_acquire_cred); MAKE_FUNCPTR(gss_delete_sec_context); +MAKE_FUNCPTR(gss_display_status); MAKE_FUNCPTR(gss_get_mic); MAKE_FUNCPTR(gss_import_name); MAKE_FUNCPTR(gss_init_sec_context); @@ -219,6 +220,7 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_accept_sec_context) LOAD_FUNCPTR(gss_acquire_cred) LOAD_FUNCPTR(gss_delete_sec_context) + LOAD_FUNCPTR(gss_display_status) LOAD_FUNCPTR(gss_get_mic) LOAD_FUNCPTR(gss_import_name) LOAD_FUNCPTR(gss_init_sec_context) @@ -293,6 +295,37 @@ static SECURITY_STATUS status_gss_to_sspi( OM_uint32 status ) } } +static void trace_gss_status_ex( OM_uint32 code, int type ) +{ + OM_uint32 ret, minor_status; + gss_buffer_desc buf; + OM_uint32 message_context = 0; + + for (;;) + { + ret = pgss_display_status( &minor_status, code, type, GSS_C_NULL_OID, &message_context, &buf ); + if (GSS_ERROR(ret)) + { + TRACE( "gss_display_status(0x%08x,%d) returned %08x minor status %08x\n", + code, type, ret, minor_status ); + return; + } + TRACE( "GSS-API error: 0x%08x: %s\n", code, debugstr_an(buf.value, buf.length) ); + pgss_release_buffer( &minor_status, &buf ); + + if (!message_context) return; + } +} + +static void trace_gss_status( OM_uint32 major_status, OM_uint32 minor_status ) +{ + if (TRACE_ON(kerberos)) + { + trace_gss_status_ex( major_status, GSS_C_GSS_CODE ); + trace_gss_status_ex( minor_status, GSS_C_MECH_CODE ); + } +} + static void expirytime_gss_to_sspi( OM_uint32 expirytime, TimeStamp *timestamp ) { SYSTEMTIME time; @@ -319,6 +352,7 @@ static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_nam ret = pgss_import_name( &minor_status, &buf, type, name ); TRACE( "gss_import_name returned %08x minor status %08x\n", ret, minor_status ); + if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); HeapFree( GetProcessHeap(), 0, buf.value ); return status_gss_to_sspi( ret ); @@ -414,6 +448,7 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( ret = pgss_acquire_cred( &minor_status, principal, GSS_C_INDEFINITE, GSS_C_NULL_OID_SET, cred_usage, &cred_handle, NULL, &expiry_time ); TRACE( "gss_acquire_cred returned %08x minor status %08x\n", ret, minor_status ); + if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) { credhandle_gss_to_sspi( cred_handle, credential ); @@ -444,6 +479,7 @@ static NTSTATUS NTAPI kerberos_SpFreeCredentialsHandle( LSA_SEC_HANDLE credentia ret = pgss_release_cred( &minor_status, &cred_handle ); TRACE( "gss_release_cred returned %08x minor status %08x\n", ret, minor_status ); + if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); return status_gss_to_sspi( ret ); #else @@ -495,6 +531,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, GSS_C_NO_CHANNEL_BINDINGS, &input_token, NULL, &output_token, &ret_flags, &expiry_time ); TRACE( "gss_init_sec_context returned %08x minor status %08x ret_flags %08x\n", ret, minor_status, ret_flags ); + if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) { if (output_token.length > output->pBuffers[idx].cbBuffer) /* FIXME: check if larger buffer exists */ @@ -564,6 +601,7 @@ static NTSTATUS NTAPI kerberos_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential ret = pgss_accept_sec_context( &minor_status, &ctxt_handle, cred_handle, &input_token, GSS_C_NO_CHANNEL_BINDINGS, &target, NULL, &output_token, &ret_flags, &expiry_time, NULL ); TRACE( "gss_accept_sec_context returned %08x minor status %08x ctxt_handle %p\n", ret, minor_status, ctxt_handle ); + if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) { if (output_token.length > output->pBuffers[idx].cbBuffer) /* FIXME: check if larger buffer exists */ @@ -607,6 +645,7 @@ static NTSTATUS NTAPI kerberos_SpDeleteContext( LSA_SEC_HANDLE context ) ret = pgss_delete_sec_context( &minor_status, &ctxt_handle, GSS_C_NO_BUFFER ); TRACE( "gss_delete_sec_context returned %08x minor status %08x\n", ret, minor_status ); + if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); return status_gss_to_sspi( ret ); #else @@ -770,6 +809,7 @@ static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULON ret = pgss_get_mic( &minor_status, ctxt_handle, GSS_C_QOP_DEFAULT, &data_buffer, &token_buffer ); TRACE( "gss_get_mic returned %08x minor status %08x\n", ret, minor_status ); + if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE) { memcpy( message->pBuffers[token_idx].pvBuffer, token_buffer.value, token_buffer.length ); @@ -809,6 +849,7 @@ static SECURITY_STATUS SEC_ENTRY kerberos_SpVerifySignature( LSA_SEC_HANDLE cont ret = pgss_verify_mic( &minor_status, ctxt_handle, &data_buffer, &token_buffer, NULL ); TRACE( "gss_verify_mic returned %08x minor status %08x\n", ret, minor_status ); + if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE && quality_of_protection) *quality_of_protection = 0; return status_gss_to_sspi( ret ); @@ -860,6 +901,7 @@ static NTSTATUS NTAPI kerberos_SpSealMessage( LSA_SEC_HANDLE context, ULONG qual ret = pgss_wrap_iov( &minor_status, ctxt_handle, 1, GSS_C_QOP_DEFAULT, &conf_state, iov, 4 ); TRACE( "gss_wrap_iov returned %08x minor status %08x\n", ret, minor_status ); + if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE) { memcpy( message->pBuffers[token_idx].pvBuffer, iov[3].buffer.value, iov[3].buffer.length ); @@ -910,6 +952,7 @@ static NTSTATUS NTAPI kerberos_SpUnsealMessage( LSA_SEC_HANDLE context, SecBuffe ret = pgss_unwrap_iov( &minor_status, ctxt_handle, &conf_state, NULL, iov, 4 ); TRACE( "gss_unwrap_iov returned %08x minor status %08x\n", ret, minor_status ); + if (GSS_ERROR(ret)) trace_gss_status( ret, minor_status ); if (ret == GSS_S_COMPLETE && quality_of_protection) *quality_of_protection = (conf_state ? 0 : SECQOP_WRAP_NO_ENCRYPT); return status_gss_to_sspi( ret ); -- 2.15.1

2 1

[PATCH 1/3] kerberos: Fix printing of the sequence message number.
by Dmitry Timoshkov 26 Jan '18

26 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 2d3b60115b..56b78fc22b 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -754,7 +754,7 @@ static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULON TRACE( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); if (quality_of_protection) FIXME( "ignoring quality_of_protection 0x%08x\n", quality_of_protection ); - if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no ); if (!context) return SEC_E_INVALID_HANDLE; ctxt_handle = ctxthandle_sspi_to_gss( context ); @@ -794,7 +794,7 @@ static SECURITY_STATUS SEC_ENTRY kerberos_SpVerifySignature( LSA_SEC_HANDLE cont int data_idx, token_idx; TRACE( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); - if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no ); if (!context) return SEC_E_INVALID_HANDLE; ctxt_handle = ctxthandle_sspi_to_gss( context ); @@ -833,7 +833,7 @@ static NTSTATUS NTAPI kerberos_SpSealMessage( LSA_SEC_HANDLE context, ULONG qual FIXME( "flags %08x not supported\n", quality_of_protection ); return SEC_E_UNSUPPORTED_FUNCTION; } - if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no ); if (!context) return SEC_E_INVALID_HANDLE; ctxt_handle = ctxthandle_sspi_to_gss( context ); @@ -884,7 +884,7 @@ static NTSTATUS NTAPI kerberos_SpUnsealMessage( LSA_SEC_HANDLE context, SecBuffe int token_idx, data_idx, conf_state; TRACE( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); - if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + if (message_seq_no) FIXME( "ignoring message_seq_no %u\n", message_seq_no ); if (context) return SEC_E_INVALID_HANDLE; ctxt_handle = ctxthandle_sspi_to_gss( context ); -- 2.15.1

2 1

[PATCH] wevtapi: Add EvtNext() stub
by Nikolay Sivov 26 Jan '18

26 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Simplified version of what's attached to https://bugs.winehq.org/show_bug.cgi?id=42170, by Michael Müller. dlls/wevtapi/main.c | 7 +++++++ dlls/wevtapi/wevtapi.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index 5b9949bad6..a97843712f 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -115,3 +115,10 @@ BOOL WINAPI EvtClose(EVT_HANDLE handle) FIXME("(%p) stub\n", handle); return TRUE; } + +BOOL WINAPI EvtNext(EVT_HANDLE result_set, DWORD size, EVT_HANDLE *array, DWORD timeout, DWORD flags, DWORD *ret_count) +{ + FIXME("(%p %u %p %u %#x %p) stub!\n", result_set, size, array, timeout, flags, ret_count); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index e2bec570b2..ddd2f329d3 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -25,7 +25,7 @@ @ stub EvtIntRetractConfig @ stub EvtIntSysprepCleanup @ stub EvtIntWriteXmlEventToLocalLogfile -@ stub EvtNext +@ stdcall EvtNext(ptr long ptr long long ptr) @ stdcall EvtNextChannelPath(ptr long ptr ptr) @ stub EvtNextEventMetadata @ stub EvtNextPublisherId -- 2.15.1

1 0

[PATCH] user32: Enable window class redirection
by Nikolay Sivov 26 Jan '18

26 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/class.c | 79 +++++++++++++++++++++++++++++++++++++++++------ dlls/user32/tests/class.c | 9 ------ 2 files changed, 69 insertions(+), 19 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index fae88f20b3..8aa568dde3 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -161,6 +161,32 @@ static BOOL is_comctl32_class( const WCHAR *name ) return FALSE; } +static BOOL is_builtin_class( const WCHAR *name ) +{ + static const WCHAR classesW[][20] = + { + {'B','u','t','t','o','n',0}, + {'C','o','m','b','o','B','o','x',0}, + {'C','o','m','b','o','L','B','o','x',0}, + {'E','d','i','t',0}, + {'I','M','E',0}, + {'L','i','s','t','B','o','x',0}, + {'M','D','I','C','l','i','e','n','t',0}, + {'S','c','r','o','l','l','b','a','r',0}, + {'S','t','a','t','i','c',0}, + }; + + int min = 0, max = (sizeof(classesW) / sizeof(classesW[0])) - 1; + + while (min <= max) + { + int res, pos = (min + max) / 2; + if (!(res = strcmpiW( name, classesW[pos] ))) return TRUE; + if (res < 0) max = pos - 1; + else min = pos + 1; + } + return FALSE; +} /*********************************************************************** * set_server_info @@ -299,6 +325,32 @@ static void CLASS_FreeClass( CLASS *classPtr ) USER_Unlock(); } +static const WCHAR *CLASS_GetVersionedName( const WCHAR *name ) +{ + ACTCTX_SECTION_KEYED_DATA data; + struct wndclass_redirect_data + { + ULONG size; + DWORD res; + ULONG name_len; + ULONG name_offset; + ULONG module_len; + ULONG module_offset; + } *wndclass; + + if (IS_INTRESOURCE( name )) + return name; + + if (is_comctl32_class( name ) || is_builtin_class( name )) + return name; + + data.cbSize = sizeof(data); + if (!FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, name, &data)) + return name; + + wndclass = (struct wndclass_redirect_data *)data.lpData; + return (const WCHAR *)((BYTE *)wndclass + wndclass->name_offset); +} /*********************************************************************** * CLASS_FindClass @@ -315,6 +367,8 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) if (!name) return NULL; + name = CLASS_GetVersionedName( name ); + for (;;) { USER_Lock(); @@ -561,6 +615,8 @@ ATOM WINAPI RegisterClassW( const WNDCLASSW* wc ) */ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) { + const WCHAR *classname = NULL; + WCHAR name[MAX_ATOM_LEN + 1]; ATOM atom; CLASS *classPtr; HINSTANCE instance; @@ -577,10 +633,9 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) if (!IS_INTRESOURCE(wc->lpszClassName)) { - WCHAR name[MAX_ATOM_LEN + 1]; - if (!MultiByteToWideChar( CP_ACP, 0, wc->lpszClassName, -1, name, MAX_ATOM_LEN + 1 )) return 0; - classPtr = CLASS_RegisterClass( name, instance, !(wc->style & CS_GLOBALCLASS), + classname = CLASS_GetVersionedName( name ); + classPtr = CLASS_RegisterClass( classname, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); } else @@ -592,9 +647,9 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) if (!classPtr) return 0; atom = classPtr->atomName; - TRACE("name=%s atom=%04x wndproc=%p hinst=%p bg=%p style=%08x clsExt=%d winExt=%d class=%p\n", - debugstr_a(wc->lpszClassName), atom, wc->lpfnWndProc, instance, wc->hbrBackground, - wc->style, wc->cbClsExtra, wc->cbWndExtra, classPtr ); + TRACE("name=%s%s%s atom=%04x wndproc=%p hinst=%p bg=%p style=%08x clsExt=%d winExt=%d class=%p\n", + debugstr_a(wc->lpszClassName), classname != name ? "->" : "", classname != name ? debugstr_w(classname) : "", + atom, wc->lpfnWndProc, instance, wc->hbrBackground, wc->style, wc->cbClsExtra, wc->cbWndExtra, classPtr ); classPtr->hIcon = wc->hIcon; classPtr->hIconSm = wc->hIconSm; @@ -617,6 +672,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) */ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) { + const WCHAR *classname; ATOM atom; CLASS *classPtr; HINSTANCE instance; @@ -631,15 +687,17 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) } if (!(instance = wc->hInstance)) instance = GetModuleHandleW( NULL ); - if (!(classPtr = CLASS_RegisterClass( wc->lpszClassName, instance, !(wc->style & CS_GLOBALCLASS), + classname = CLASS_GetVersionedName( wc->lpszClassName ); + if (!(classPtr = CLASS_RegisterClass( classname, instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ))) return 0; atom = classPtr->atomName; - TRACE("name=%s atom=%04x wndproc=%p hinst=%p bg=%p style=%08x clsExt=%d winExt=%d class=%p\n", - debugstr_w(wc->lpszClassName), atom, wc->lpfnWndProc, instance, wc->hbrBackground, - wc->style, wc->cbClsExtra, wc->cbWndExtra, classPtr ); + TRACE("name=%s%s%s atom=%04x wndproc=%p hinst=%p bg=%p style=%08x clsExt=%d winExt=%d class=%p\n", + debugstr_w(wc->lpszClassName), classname != wc->lpszClassName ? "->" : "", + classname != wc->lpszClassName ? debugstr_w(classname) : "", atom, wc->lpfnWndProc, instance, + wc->hbrBackground, wc->style, wc->cbClsExtra, wc->cbWndExtra, classPtr ); classPtr->hIcon = wc->hIcon; classPtr->hIconSm = wc->hIconSm; @@ -682,6 +740,7 @@ BOOL WINAPI UnregisterClassW( LPCWSTR className, HINSTANCE hInstance ) GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ + className = CLASS_GetVersionedName( className ); SERVER_START_REQ( destroy_class ) { req->instance = wine_server_client_ptr( hInstance ); diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index dd8f266217..88e4bfcfa4 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1243,7 +1243,6 @@ static void test_actctx_classes(void) ok(ret, "Failed to get class info.\n"); ret = GetClassInfoA(hinst, "4.3.2.1!MyTestClass", &wc); -todo_wine ok(ret, "Failed to get class info.\n"); ret = UnregisterClassA("MyTestClass", hinst); @@ -1262,7 +1261,6 @@ todo_wine wc.lpszClassName = "MyTestClass"; class = RegisterClassA(&wc); -todo_wine ok(class == 0, "Expected failure.\n"); ret = DeactivateActCtx(0, cookie); @@ -1277,28 +1275,23 @@ todo_wine wc.lpszClassName = "MyTestClass"; class = RegisterClassA(&wc); -todo_wine ok(class != 0, "Failed to register class\n"); ret = DeactivateActCtx(0, cookie); ok(ret, "Failed to deactivate context.\n"); ret = GetClassInfoA(hinst, "MyTestClass", &wc); -todo_wine ok(!ret, "Expected failure.\n"); ret = GetClassInfoA(hinst, "4.3.2.1!MyTestClass", &wc); -todo_wine ok(ret, "Failed to get class info.\n"); ret = UnregisterClassA("4.3.2.1!MyTestClass", hinst); -todo_wine ok(ret, "Failed to unregister class.\n"); /* Register regular name first, it's not considered when versioned name is registered. */ wc.lpszClassName = "MyTestClass"; class = RegisterClassA(&wc); -todo_wine ok(class != 0, "Failed to register class.\n"); ret = ActivateActCtx(context, &cookie); @@ -1306,14 +1299,12 @@ todo_wine wc.lpszClassName = "MyTestClass"; class = RegisterClassA(&wc); -todo_wine ok(class != 0, "Failed to register class.\n"); ret = DeactivateActCtx(0, cookie); ok(ret, "Failed to deactivate context.\n"); ret = UnregisterClassA("4.3.2.1!MyTestClass", hinst); -todo_wine ok(ret, "Failed to unregister class.\n"); ret = UnregisterClassA("MyTestClass", hinst); -- 2.15.1

1 0

[PATCH 1/4] include: Add generic HeapAlloc() wrappers
by Michael Stefaniuc 26 Jan '18

26 Jan '18

version 2: Just use the non-controversial parts. Basically the stuff we already have with following changes: heap_realloc - Passing NULL as memory pointer will allocate new memory. no heap_realloc_zero() - few uses - some defined but not used heap_free() returns void: - No existing use of the heap_free() return value. - There are a few "return HeapFree()" statements but more than half of those are just in heap_free() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/Makefile.in | 1 + include/wine/heap.h | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 include/wine/heap.h diff --git a/include/Makefile.in b/include/Makefile.in index b975dd585e..748b64165f 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -680,6 +680,7 @@ HEADER_SRCS = \ windowsx.h \ wine/debug.h \ wine/exception.h \ + wine/heap.h \ wine/library.h \ wine/unicode.h \ winerror.h \ diff --git a/include/wine/heap.h b/include/wine/heap.h new file mode 100644 index 0000000000..2ae5aff578 --- /dev/null +++ b/include/wine/heap.h @@ -0,0 +1,58 @@ +/* + * Wine heap memory allocation wrappers + * + * Copyright 2006 Jacek Caban for CodeWeavers + * Copyright 2013,2018 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINE_HEAP_H +#define __WINE_WINE_HEAP_H + +#include <windef.h> + +#ifdef __cplusplus +extern "C" { +#endif + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_zero(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, SIZE_T len) +{ + if (mem) + return HeapReAlloc(GetProcessHeap(), 0, mem, len); + else + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void heap_free(void *mem) +{ + HeapFree(GetProcessHeap(), 0, mem); +} + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_WINE_HEAP_H */ -- 2.14.3

3 2

[PATCH 1/5] comctl32/tests: A test for TCN_SELCHANGING handling
by Nikolay Sivov 25 Jan '18

25 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/tab.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 0bfbb38a58..9823915724 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -79,6 +79,7 @@ static void TabCheckSetSize(HWND hwnd, INT set_width, INT set_height, INT exp_wi static HFONT hFont; static DRAWITEMSTRUCT g_drawitem; static HWND parent_wnd; +static LRESULT tcn_selchanging_result; static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; @@ -264,6 +265,22 @@ static const struct message rbuttonup_seq[] = { { 0 } }; +static const struct message full_selchange_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, TCN_SELCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, TCN_SELCHANGE }, + { 0 } +}; + +static const struct message selchanging_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, TCN_SELCHANGING }, + { 0 } +}; + +static const struct message selchange_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, TCN_SELCHANGE }, + { 0 } +}; + static HWND create_tabcontrol (DWORD style, DWORD mask) { @@ -322,6 +339,8 @@ static LRESULT WINAPI parentWindowProcess(HWND hwnd, UINT message, WPARAM wParam if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + if (message == WM_NOTIFY && lParam) + msg.id = ((NMHDR*)lParam)->code; add_message(sequences, PARENT_SEQ_INDEX, &msg); } @@ -329,6 +348,13 @@ static LRESULT WINAPI parentWindowProcess(HWND hwnd, UINT message, WPARAM wParam if (message == WM_DRAWITEM) g_drawitem = *(DRAWITEMSTRUCT*)lParam; + if (message == WM_NOTIFY) + { + NMHDR *nmhdr = (NMHDR *)lParam; + if (nmhdr && nmhdr->code == TCN_SELCHANGING) + return tcn_selchanging_result; + } + defwndproc_counter++; ret = DefWindowProcA(hwnd, message, wParam, lParam); defwndproc_counter--; @@ -1443,6 +1469,73 @@ static void init_functions(void) #undef X } +static void test_TCN_SELCHANGING(void) +{ + const INT nTabs = 5; + HWND hTab; + INT ret; + + hTab = createFilledTabControl(parent_wnd, WS_CHILD|TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE, nTabs); + ok(hTab != NULL, "Failed to create tab control\n"); + + /* Initially first tab is focused. */ + ret = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); + ok(ret == 0, "Unexpected tab focus %d.\n", ret); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + /* Setting focus to currently focused item should do nothing. */ + ret = SendMessageA(hTab, TCM_SETCURFOCUS, 0, 0); + ok(ret == 0, "Unexpected ret value %d.\n", ret); + + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_sequence, "Set focus to focused tab sequence", FALSE); + + /* Allow selection change. */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + tcn_selchanging_result = 0; + ret = SendMessageA(hTab, TCM_SETCURFOCUS, nTabs - 1, 0); + ok(ret == 0, "Unexpected ret value %d.\n", ret); + + ok_sequence(sequences, PARENT_SEQ_INDEX, full_selchange_parent_seq, "Focus change allowed sequence", FALSE); + + ret = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); + ok(ret == nTabs - 1, "Unexpected focused tab %d.\n", ret); + ret = SendMessageA(hTab, TCM_GETCURSEL, 0, 0); + ok(ret == nTabs - 1, "Unexpected selected tab %d.\n", ret); + + /* Forbid selection change. */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + tcn_selchanging_result = 1; + ret = SendMessageA(hTab, TCM_SETCURFOCUS, 0, 0); + ok(ret == 0, "Unexpected ret value %d.\n", ret); + + ok_sequence(sequences, PARENT_SEQ_INDEX, selchanging_parent_seq, "Focus change disallowed sequence", FALSE); + + ret = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); +todo_wine + ok(ret == nTabs - 1, "Unexpected focused tab %d.\n", ret); + ret = SendMessageA(hTab, TCM_GETCURSEL, 0, 0); +todo_wine + ok(ret == nTabs - 1, "Unexpected selected tab %d.\n", ret); + + /* Removing focus sends only TCN_SELCHANGE */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ret = SendMessageA(hTab, TCM_SETCURFOCUS, -1, 0); + ok(ret == 0, "Unexpected ret value %d.\n", ret); + + ok_sequence(sequences, PARENT_SEQ_INDEX, selchange_parent_seq, "Remove focus sequence", FALSE); + + ret = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); + ok(ret == -1, "Unexpected focused tab %d.\n", ret); + + tcn_selchanging_result = 0; + + DestroyWindow(hTab); +} + START_TEST(tab) { LOGFONTA logfont; @@ -1481,6 +1574,7 @@ START_TEST(tab) test_TCS_OWNERDRAWFIXED(); test_WM_CONTEXTMENU(); test_create(); + test_TCN_SELCHANGING(); DestroyWindow(parent_wnd); } -- 2.15.1

1 4

[PATCH 1/5] dxgi: Add stub implementation for DXGI_PRESENT_TEST.
by Józef Kucia 25 Jan '18

25 Jan '18

From: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Rebased and modified. Avoids excessive buffer swaps. --- dlls/dxgi/swapchain.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 8e7dccbf9618..2983ec59438c 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -532,10 +532,16 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_Present1(IDXGISwapChain1 *iface, TRACE("iface %p, sync_interval %u, flags %#x, present_parameters %p.\n", iface, sync_interval, flags, present_parameters); + if (flags & ~DXGI_PRESENT_TEST) + FIXME("Unimplemented flags %#x.\n", flags); + if (flags & DXGI_PRESENT_TEST) + { + WARN("Returning S_OK for DXGI_PRESENT_TEST.\n"); + return S_OK; + } + if (sync_interval) FIXME("Unimplemented sync interval %u.\n", sync_interval); - if (flags) - FIXME("Unimplemented flags %#x.\n", flags); if (present_parameters) FIXME("Ignored present parameters %p.\n", present_parameters); -- 2.13.6

3 11

[PATCH vkd3d 1/2] libs/vkd3d-shader: Adjust barrier emission.
by Józef Kucia 25 Jan '18

25 Jan '18

From: Józef Kucia <jkucia(a)codeweavers.com> Aligns with glsang changes which are based on Khronos recommendations. https://github.com/KhronosGroup/glslang/commit/8297936dd6eb32163991899c31dd… https://github.com/KhronosGroup/glslang/commit/838d7afc61c0f5909514c20cd0ed… https://github.com/KhronosGroup/glslang/commit/2505057af8f446981afc63768a97… Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 202c18d61924..50803af1f69f 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5393,7 +5393,9 @@ static void vkd3d_dxbc_compiler_emit_sync(struct vkd3d_dxbc_compiler *compiler, unsigned int flags = instruction->flags; SpvScope execution_scope = SpvScopeMax; SpvScope memory_scope = SpvScopeDevice; - unsigned int memory_semantics = 0; + unsigned int memory_semantics; + + memory_semantics = SpvMemorySemanticsAcquireReleaseMask; if (flags & VKD3DSSF_GROUP_SHARED_MEMORY) { @@ -5413,8 +5415,7 @@ static void vkd3d_dxbc_compiler_emit_sync(struct vkd3d_dxbc_compiler *compiler, FIXME("Unhandled sync flags %#x.\n", flags); memory_scope = SpvScopeDevice; execution_scope = SpvScopeWorkgroup; - memory_semantics |= SpvMemorySemanticsSequentiallyConsistentMask - | SpvMemorySemanticsUniformMemoryMask + memory_semantics |= SpvMemorySemanticsUniformMemoryMask | SpvMemorySemanticsSubgroupMemoryMask | SpvMemorySemanticsWorkgroupMemoryMask | SpvMemorySemanticsCrossWorkgroupMemoryMask -- 2.13.6

2 3

[PATCH 9/9] kerberos: Don't fail InitializeSecurityContext if there are unsupported flags.
by Dmitry Timoshkov 25 Jan '18

25 Jan '18

Kerberos Authentication Tester passes ISC_REQ_CONNECTION along with some other flags that currently lead InitializeSecurityContext to fail. With this patch applied, and the patch that implements switch between NTLM and Kerberos in Negotiate provider Kerberos Authentication Tester works in the real Kerberos environment. This is another fix to make Kerberos Authentication Tester work. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 66c795c377..5fa6783011 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -471,10 +471,7 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, context_req, target_data_rep, input, new_context, output, context_attr, ts_expiry, mapped_context, context_data ); if (context_req & ~supported) - { FIXME( "flags 0x%08x not supported\n", context_req & ~supported ); - return SEC_E_UNSUPPORTED_FUNCTION; - } if (!context && !input && !credential) return SEC_E_INVALID_HANDLE; cred_handle = credhandle_sspi_to_gss( credential ); -- 2.15.1

2 1

[PATCH 7/9] kerberos: Implement SpUnsealMessage.
by Dmitry Timoshkov 25 Jan '18

25 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 75003ccf7b..ba89806957 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -196,6 +196,7 @@ MAKE_FUNCPTR(gss_release_buffer); MAKE_FUNCPTR(gss_release_cred); MAKE_FUNCPTR(gss_release_iov_buffer); MAKE_FUNCPTR(gss_release_name); +MAKE_FUNCPTR(gss_unwrap_iov); MAKE_FUNCPTR(gss_verify_mic); MAKE_FUNCPTR(gss_wrap_iov); #undef MAKE_FUNCPTR @@ -225,6 +226,7 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_release_cred) LOAD_FUNCPTR(gss_release_iov_buffer) LOAD_FUNCPTR(gss_release_name) + LOAD_FUNCPTR(gss_unwrap_iov) LOAD_FUNCPTR(gss_verify_mic) LOAD_FUNCPTR(gss_wrap_iov) #undef LOAD_FUNCPTR @@ -875,6 +877,52 @@ static NTSTATUS NTAPI kerberos_SpSealMessage( LSA_SEC_HANDLE context, ULONG qual #endif } +static NTSTATUS NTAPI kerberos_SpUnsealMessage( LSA_SEC_HANDLE context, SecBufferDesc *message, + ULONG message_seq_no, ULONG *quality_of_protection ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + gss_ctx_id_t ctxt_handle; + gss_iov_buffer_desc iov[4]; + OM_uint32 ret, minor_status; + int token_idx, data_idx, conf_state; + + TRACE( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); + if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + + if (context) return SEC_E_INVALID_HANDLE; + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + + iov[0].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY; + iov[0].buffer.length = 0; + iov[0].buffer.value = NULL; + + iov[1].type = GSS_IOV_BUFFER_TYPE_DATA; + iov[1].buffer.length = message->pBuffers[data_idx].cbBuffer; + iov[1].buffer.value = message->pBuffers[data_idx].pvBuffer; + + iov[2].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY; + iov[2].buffer.length = 0; + iov[2].buffer.value = NULL; + + iov[3].type = GSS_IOV_BUFFER_TYPE_HEADER; + iov[3].buffer.length = message->pBuffers[token_idx].cbBuffer; + iov[3].buffer.value = message->pBuffers[token_idx].pvBuffer; + + ret = pgss_unwrap_iov( &minor_status, ctxt_handle, &conf_state, NULL, iov, 4 ); + TRACE( "gss_unwrap_iov returned %08x minor status %08x\n", ret, minor_status ); + if (ret == GSS_S_COMPLETE && quality_of_protection) *quality_of_protection = (conf_state ? 0 : SECQOP_WRAP_NO_ENCRYPT); + + return status_gss_to_sspi( ret ); + +#else + FIXME( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { kerberos_SpInstanceInit, @@ -882,7 +930,7 @@ static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = kerberos_SpMakeSignature, kerberos_SpVerifySignature, kerberos_SpSealMessage, - NULL, /* SpUnsealMessage */ + kerberos_SpUnsealMessage, NULL, /* SpGetContextToken */ NULL, /* SpQueryContextAttributes */ NULL, /* SpCompleteAuthToken */ -- 2.15.1

2 1

[PATCH 6/9] kerberos: Implement SpSealMessage.
by Dmitry Timoshkov 25 Jan '18

25 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 62 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 43bbbae7e2..75003ccf7b 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -194,8 +194,10 @@ MAKE_FUNCPTR(gss_import_name); MAKE_FUNCPTR(gss_init_sec_context); MAKE_FUNCPTR(gss_release_buffer); MAKE_FUNCPTR(gss_release_cred); +MAKE_FUNCPTR(gss_release_iov_buffer); MAKE_FUNCPTR(gss_release_name); MAKE_FUNCPTR(gss_verify_mic); +MAKE_FUNCPTR(gss_wrap_iov); #undef MAKE_FUNCPTR static BOOL load_gssapi_krb5(void) @@ -221,8 +223,10 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_init_sec_context) LOAD_FUNCPTR(gss_release_buffer) LOAD_FUNCPTR(gss_release_cred) + LOAD_FUNCPTR(gss_release_iov_buffer) LOAD_FUNCPTR(gss_release_name) LOAD_FUNCPTR(gss_verify_mic) + LOAD_FUNCPTR(gss_wrap_iov) #undef LOAD_FUNCPTR return TRUE; @@ -815,13 +819,69 @@ static SECURITY_STATUS SEC_ENTRY kerberos_SpVerifySignature( LSA_SEC_HANDLE cont #endif } +static NTSTATUS NTAPI kerberos_SpSealMessage( LSA_SEC_HANDLE context, ULONG quality_of_protection, + SecBufferDesc *message, ULONG message_seq_no ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + gss_ctx_id_t ctxt_handle; + gss_iov_buffer_desc iov[4]; + OM_uint32 ret, minor_status; + int token_idx, data_idx, conf_state; + + TRACE( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); + if (quality_of_protection) + { + FIXME( "flags %08x not supported\n", quality_of_protection ); + return SEC_E_UNSUPPORTED_FUNCTION; + } + if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + + if (!context) return SEC_E_INVALID_HANDLE; + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + /* FIXME: multiple data buffers, read-only buffers */ + if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + + iov[0].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY | GSS_IOV_BUFFER_FLAG_ALLOCATE; + iov[0].buffer.length = 0; + iov[0].buffer.value = NULL; + + iov[1].type = GSS_IOV_BUFFER_TYPE_DATA; + iov[1].buffer.length = message->pBuffers[data_idx].cbBuffer; + iov[1].buffer.value = message->pBuffers[data_idx].pvBuffer; + + iov[2].type = GSS_IOV_BUFFER_TYPE_SIGN_ONLY | GSS_IOV_BUFFER_FLAG_ALLOCATE; + iov[2].buffer.length = 0; + iov[2].buffer.value = NULL; + + iov[3].type = GSS_IOV_BUFFER_TYPE_HEADER | GSS_IOV_BUFFER_FLAG_ALLOCATE; + iov[3].buffer.length = 0; + iov[3].buffer.value = NULL; + + ret = pgss_wrap_iov( &minor_status, ctxt_handle, 1, GSS_C_QOP_DEFAULT, &conf_state, iov, 4 ); + TRACE( "gss_wrap_iov returned %08x minor status %08x\n", ret, minor_status ); + if (ret == GSS_S_COMPLETE) + { + memcpy( message->pBuffers[token_idx].pvBuffer, iov[3].buffer.value, iov[3].buffer.length ); + message->pBuffers[token_idx].cbBuffer = iov[3].buffer.length; + pgss_release_iov_buffer( &minor_status, iov, 4 ); + } + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { kerberos_SpInstanceInit, NULL, /* SpInitUserModeContext */ kerberos_SpMakeSignature, kerberos_SpVerifySignature, - NULL, /* SpSealMessage */ + kerberos_SpSealMessage, NULL, /* SpUnsealMessage */ NULL, /* SpGetContextToken */ NULL, /* SpQueryContextAttributes */ -- 2.15.1

2 1

[PATCH 5/9] kerberos: Implement SpVerifySignature.
by Dmitry Timoshkov 25 Jan '18

25 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 38 +++++++++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 451e08508b..43bbbae7e2 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -195,6 +195,7 @@ MAKE_FUNCPTR(gss_init_sec_context); MAKE_FUNCPTR(gss_release_buffer); MAKE_FUNCPTR(gss_release_cred); MAKE_FUNCPTR(gss_release_name); +MAKE_FUNCPTR(gss_verify_mic); #undef MAKE_FUNCPTR static BOOL load_gssapi_krb5(void) @@ -221,6 +222,7 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_release_buffer) LOAD_FUNCPTR(gss_release_cred) LOAD_FUNCPTR(gss_release_name) + LOAD_FUNCPTR(gss_verify_mic) #undef LOAD_FUNCPTR return TRUE; @@ -779,12 +781,46 @@ static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULON #endif } +static SECURITY_STATUS SEC_ENTRY kerberos_SpVerifySignature( LSA_SEC_HANDLE context, SecBufferDesc *message, + ULONG message_seq_no, ULONG *quality_of_protection ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + OM_uint32 ret, minor_status; + gss_buffer_desc data_buffer, token_buffer; + gss_ctx_id_t ctxt_handle; + int data_idx, token_idx; + + TRACE( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); + if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + + if (!context) return SEC_E_INVALID_HANDLE; + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + data_buffer.length = message->pBuffers[data_idx].cbBuffer; + data_buffer.value = message->pBuffers[data_idx].pvBuffer; + + if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + token_buffer.length = message->pBuffers[token_idx].cbBuffer; + token_buffer.value = message->pBuffers[token_idx].pvBuffer; + + ret = pgss_verify_mic( &minor_status, ctxt_handle, &data_buffer, &token_buffer, NULL ); + TRACE( "gss_verify_mic returned %08x minor status %08x\n", ret, minor_status ); + if (ret == GSS_S_COMPLETE && quality_of_protection) *quality_of_protection = 0; + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx %p %u %p)\n", context, message, message_seq_no, quality_of_protection ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { kerberos_SpInstanceInit, NULL, /* SpInitUserModeContext */ kerberos_SpMakeSignature, - NULL, /* SpVerifySignature */ + kerberos_SpVerifySignature, NULL, /* SpSealMessage */ NULL, /* SpUnsealMessage */ NULL, /* SpGetContextToken */ -- 2.15.1

2 1

[PATCH 4/9] kerberos: Implement SpMakeSignature.
by Dmitry Timoshkov 25 Jan '18

25 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index dcf3386675..451e08508b 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -189,6 +189,7 @@ static void *libgssapi_krb5_handle; MAKE_FUNCPTR(gss_accept_sec_context); MAKE_FUNCPTR(gss_acquire_cred); MAKE_FUNCPTR(gss_delete_sec_context); +MAKE_FUNCPTR(gss_get_mic); MAKE_FUNCPTR(gss_import_name); MAKE_FUNCPTR(gss_init_sec_context); MAKE_FUNCPTR(gss_release_buffer); @@ -214,6 +215,7 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_accept_sec_context) LOAD_FUNCPTR(gss_acquire_cred) LOAD_FUNCPTR(gss_delete_sec_context) + LOAD_FUNCPTR(gss_get_mic) LOAD_FUNCPTR(gss_import_name) LOAD_FUNCPTR(gss_init_sec_context) LOAD_FUNCPTR(gss_release_buffer) @@ -736,11 +738,52 @@ static NTSTATUS NTAPI kerberos_SpInstanceInit(ULONG version, SECPKG_DLL_FUNCTION return STATUS_SUCCESS; } +static NTSTATUS SEC_ENTRY kerberos_SpMakeSignature( LSA_SEC_HANDLE context, ULONG quality_of_protection, + SecBufferDesc *message, ULONG message_seq_no ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + OM_uint32 ret, minor_status; + gss_buffer_desc data_buffer, token_buffer; + gss_ctx_id_t ctxt_handle; + int data_idx, token_idx; + + TRACE( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); + if (quality_of_protection) FIXME( "ignoring quality_of_protection 0x%08x\n", quality_of_protection ); + if (message_seq_no) FIXME( "ignoring message_seq_no %0x08x\n", message_seq_no ); + + if (!context) return SEC_E_INVALID_HANDLE; + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + /* FIXME: multiple data buffers, read-only buffers */ + if ((data_idx = get_buffer_index( message, SECBUFFER_DATA )) == -1) return SEC_E_INVALID_TOKEN; + data_buffer.length = message->pBuffers[data_idx].cbBuffer; + data_buffer.value = message->pBuffers[data_idx].pvBuffer; + + if ((token_idx = get_buffer_index( message, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + token_buffer.length = 0; + token_buffer.value = NULL; + + ret = pgss_get_mic( &minor_status, ctxt_handle, GSS_C_QOP_DEFAULT, &data_buffer, &token_buffer ); + TRACE( "gss_get_mic returned %08x minor status %08x\n", ret, minor_status ); + if (ret == GSS_S_COMPLETE) + { + memcpy( message->pBuffers[token_idx].pvBuffer, token_buffer.value, token_buffer.length ); + message->pBuffers[token_idx].cbBuffer = token_buffer.length; + pgss_release_buffer( &minor_status, &token_buffer ); + } + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx 0x%08x %p %u)\n", context, quality_of_protection, message, message_seq_no ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { kerberos_SpInstanceInit, NULL, /* SpInitUserModeContext */ - NULL, /* SpMakeSignature */ + kerberos_SpMakeSignature, NULL, /* SpVerifySignature */ NULL, /* SpSealMessage */ NULL, /* SpUnsealMessage */ -- 2.15.1

2 1

[PATCH 3/9] kerberos: Add SpInstanceInit stub.
by Dmitry Timoshkov 25 Jan '18

25 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 4667205b61..dcf3386675 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -729,9 +729,16 @@ NTSTATUS NTAPI SpLsaModeInitialize(ULONG lsa_version, PULONG package_version, return STATUS_SUCCESS; } +static NTSTATUS NTAPI kerberos_SpInstanceInit(ULONG version, SECPKG_DLL_FUNCTIONS *dll_function_table, void **user_functions) +{ + FIXME("%u,%p,%p: stub\n", version, dll_function_table, user_functions); + + return STATUS_SUCCESS; +} + static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = { - NULL, /* SpInstanceInit */ + kerberos_SpInstanceInit, NULL, /* SpInitUserModeContext */ NULL, /* SpMakeSignature */ NULL, /* SpVerifySignature */ -- 2.15.1

2 1

[PATCH 2/9] kerberos: Add SpUserModeInitialize implementation.
by Dmitry Timoshkov 25 Jan '18

25 Jan '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/kerberos.spec | 2 +- dlls/kerberos/krb5_ap.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/kerberos.spec b/dlls/kerberos/kerberos.spec index c41b830e46..7f765b1206 100644 --- a/dlls/kerberos/kerberos.spec +++ b/dlls/kerberos/kerberos.spec @@ -1,7 +1,7 @@ 1 stub SpInitialize 2 stub KerbDomainChangeCallback 3 stdcall SpLsaModeInitialize(long ptr ptr ptr) -4 stub SpUserModeInitialize +4 stdcall SpUserModeInitialize(long ptr ptr ptr) 32 stub SpInstanceInit @ stdcall -private DllMain(long long ptr) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index ca4bf0a236..4667205b61 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -728,3 +728,33 @@ NTSTATUS NTAPI SpLsaModeInitialize(ULONG lsa_version, PULONG package_version, return STATUS_SUCCESS; } + +static SECPKG_USER_FUNCTION_TABLE kerberos_user_table = +{ + NULL, /* SpInstanceInit */ + NULL, /* SpInitUserModeContext */ + NULL, /* SpMakeSignature */ + NULL, /* SpVerifySignature */ + NULL, /* SpSealMessage */ + NULL, /* SpUnsealMessage */ + NULL, /* SpGetContextToken */ + NULL, /* SpQueryContextAttributes */ + NULL, /* SpCompleteAuthToken */ + NULL, /* SpDeleteContext */ + NULL, /* SpFormatCredentialsFn */ + NULL, /* SpMarshallSupplementalCreds */ + NULL, /* SpExportSecurityContext */ + NULL /* SpImportSecurityContext */ +}; + +NTSTATUS NTAPI SpUserModeInitialize(ULONG lsa_version, PULONG package_version, + PSECPKG_USER_FUNCTION_TABLE *table, PULONG table_count) +{ + TRACE("%#x,%p,%p,%p\n", lsa_version, package_version, table, table_count); + + *package_version = SECPKG_INTERFACE_VERSION; + *table = &kerberos_user_table; + *table_count = 1; + + return STATUS_SUCCESS; +} -- 2.15.1

2 1

[PATCH 1/9] kerberos: Implement SpQueryContextAttributes.
by Dmitry Timoshkov 25 Jan '18

25 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 72 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 59 insertions(+), 13 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index b467119363..ca4bf0a236 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -67,6 +67,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(kerberos); | SECPKG_FLAG_RESTRICTED_TOKENS \ | SECPKG_FLAG_APPCONTAINER_CHECKS) +static WCHAR kerberos_name_W[] = {'K','e','r','b','e','r','o','s',0}; +static WCHAR kerberos_comment_W[] = {'M','i','c','r','o','s','o','f','t',' ','K','e','r','b','e','r','o','s',' ','V','1','.','0',0}; +static const SecPkgInfoW infoW = +{ + KERBEROS_CAPS, + 1, + RPC_C_AUTHN_GSS_KERBEROS, + KERBEROS_MAX_BUF, + kerberos_name_W, + kerberos_comment_W +}; + static ULONG kerberos_package_id; static LSA_DISPATCH_TABLE lsa_dispatch; @@ -158,18 +170,6 @@ static NTSTATUS NTAPI kerberos_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST req static NTSTATUS NTAPI kerberos_SpGetInfo(SecPkgInfoW *info) { - static WCHAR kerberos_name_W[] = {'K','e','r','b','e','r','o','s',0}; - static WCHAR kerberos_comment_W[] = {'M','i','c','r','o','s','o','f','t',' ','K','e','r','b','e','r','o','s',' ','V','1','.','0',0}; - static const SecPkgInfoW infoW = - { - KERBEROS_CAPS, - 1, - RPC_C_AUTHN_GSS_KERBEROS, - KERBEROS_MAX_BUF, - kerberos_name_W, - kerberos_comment_W - }; - TRACE("%p\n", info); /* LSA will make a copy before forwarding the structure, so @@ -608,6 +608,52 @@ static NTSTATUS NTAPI kerberos_SpDeleteContext( LSA_SEC_HANDLE context ) #endif } +static NTSTATUS NTAPI kerberos_SpQueryContextAttributes( LSA_SEC_HANDLE context, ULONG attribute, void *buffer ) +{ + TRACE( "(%lx %u %p)\n", context, attribute, buffer ); + + if (!context) return SEC_E_INVALID_HANDLE; + + switch (attribute) + { +#define X(x) case (x) : FIXME(#x" stub\n"); break + X(SECPKG_ATTR_ACCESS_TOKEN); + X(SECPKG_ATTR_AUTHORITY); + X(SECPKG_ATTR_DCE_INFO); + X(SECPKG_ATTR_KEY_INFO); + X(SECPKG_ATTR_LIFESPAN); + X(SECPKG_ATTR_NAMES); + X(SECPKG_ATTR_NATIVE_NAMES); + X(SECPKG_ATTR_PACKAGE_INFO); + X(SECPKG_ATTR_PASSWORD_EXPIRY); + X(SECPKG_ATTR_SESSION_KEY); + X(SECPKG_ATTR_STREAM_SIZES); + X(SECPKG_ATTR_TARGET_INFORMATION); + case SECPKG_ATTR_SIZES: + { + SecPkgContext_Sizes *sizes = (SecPkgContext_Sizes *)buffer; + sizes->cbMaxToken = KERBEROS_MAX_BUF; + sizes->cbMaxSignature = 37; + sizes->cbBlockSize = 1; + sizes->cbSecurityTrailer = 49; + return SEC_E_OK; + } + case SECPKG_ATTR_NEGOTIATION_INFO: + { + SecPkgContext_NegotiationInfoW *info = (SecPkgContext_NegotiationInfoW *)buffer; + info->PackageInfo = (SecPkgInfoW *)&infoW; + info->NegotiationState = SECPKG_NEGOTIATION_COMPLETE; + return SEC_E_OK; + } +#undef X + default: + FIXME( "unknown attribute %u\n", attribute ); + break; + } + + return SEC_E_UNSUPPORTED_FUNCTION; +} + static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) { @@ -657,7 +703,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* ApplyControlToken */ NULL, /* GetUserInfo */ NULL, /* GetExtendedInformation */ - NULL, /* SpQueryContextAttributes */ + kerberos_SpQueryContextAttributes, NULL, /* SpAddCredentials */ NULL, /* SetExtendedInformation */ NULL, /* SetContextAttributes */ -- 2.15.1

2 1

[PATCH] ole32: Allow caching of icon aspects for static class caches.
by Huw Davies 25 Jan '18

25 Jan '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/datacache.c | 2 +- dlls/ole32/tests/ole2.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index c07633d960..325a98b33b 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2398,7 +2398,7 @@ static HRESULT WINAPI DataCache_Cache( return CACHE_S_SAMECACHE; } - if (This->clsid_static) return DV_E_FORMATETC; + if (This->clsid_static && fmt_cpy.dwAspect != DVASPECT_ICON) return DV_E_FORMATETC; hr = DataCache_CreateEntry(This, &fmt_cpy, advf, FALSE, &cache_entry); diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 1a4fce5b06..3bd4acce92 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2441,13 +2441,24 @@ static void test_data_cache_cache(void) hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); ok( FAILED(hr), "got %08x\n", hr ); + fmt.dwAspect = DVASPECT_DOCPRINT; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( FAILED(hr), "got %08x\n", hr ); + /* try caching another clip format */ - fmt.dwAspect = DVASPECT_CONTENT; fmt.cfFormat = CF_METAFILEPICT; + fmt.dwAspect = DVASPECT_CONTENT; fmt.tymed = TYMED_MFPICT; hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); ok( FAILED(hr), "got %08x\n", hr ); + /* As an exception, it's possible to add an icon aspect */ + fmt.cfFormat = CF_METAFILEPICT; + fmt.dwAspect = DVASPECT_ICON; + fmt.tymed = TYMED_MFPICT; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == S_OK, "got %08x\n", hr ); + IOleCache2_Release( cache ); } -- 2.12.0

1 0

[PATCH 1/2] ntdll: Add RtlAddGrowableFunctionTable stub
by Alex Henrie 25 Jan '18

25 Jan '18

From: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Copied from https://bugs.winehq.org/show_bug.cgi?id=42255 with minor changes. Xenia needs this function to return S_OK. However, if I understand correctly, faking success is fine because Xenia only needs these function tables for debug backtraces, which are not produced during the normal operation of the program. Fixes https://bugs.winehq.org/show_bug.cgi?id=42255 dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/signal_arm.c | 10 ++++++++++ dlls/ntdll/signal_x86_64.c | 12 ++++++++++++ 3 files changed, 23 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 035fad2058..3813e43707 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -428,6 +428,7 @@ @ stdcall RtlAddMandatoryAce(ptr long long long long ptr) # @ stub RtlAddRange @ cdecl -arch=arm,x86_64 RtlAddFunctionTable(ptr long long) +@ cdecl -arch=arm,x86_64 RtlAddGrowableFunctionTable(ptr ptr long long long long) @ stdcall RtlAddRefActivationContext(ptr) # @ stub RtlAddRefMemoryStream @ stdcall RtlAddVectoredContinueHandler(long ptr) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index d60c2a9dc2..1bd9b766d4 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -1043,6 +1043,16 @@ BOOLEAN CDECL RtlAddFunctionTable( RUNTIME_FUNCTION *table, DWORD count, DWORD a return TRUE; } +/************************************************************************* + * RtlAddGrowableFunctionTable (NTDLL.@) + */ +DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functions, DWORD count, DWORD max_count, + ULONG_PTR base, ULONG_PTR end ) +{ + FIXME( "(%p, %p, %d, %d, %ld, %ld) stub!\n", table, functions, count, max_count, base, end ); + if (table) *table = NULL; + return S_OK; +} /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index abd3174f22..872452eb35 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -3201,6 +3201,18 @@ BOOLEAN CDECL RtlInstallFunctionTableCallback( DWORD64 table, DWORD64 base, DWOR } +/************************************************************************* + * RtlAddGrowableFunctionTable (NTDLL.@) + */ +DWORD WINAPI RtlAddGrowableFunctionTable( void **table, RUNTIME_FUNCTION *functions, DWORD count, DWORD max_count, + ULONG_PTR base, ULONG_PTR end ) +{ + FIXME( "(%p, %p, %d, %d, %ld, %ld) stub!\n", table, functions, count, max_count, base, end ); + if (table) *table = NULL; + return S_OK; +} + + /********************************************************************** * RtlDeleteFunctionTable (NTDLL.@) */ -- 2.16.1

2 2

[PATCH] testbot/Janitor: Use filters to get old Jobs, Patches and RecordGroups.
by Francois Gouget 25 Jan '18

25 Jan '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 47 +++++++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 0f126e87..382408d1 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -57,19 +57,16 @@ delete $ENV{ENV}; # Delete obsolete Jobs if ($JobPurgeDays != 0) { - my $DeleteBefore = time() - $JobPurgeDays * 86400; my $Jobs = CreateJobs(); + $Jobs->AddFilter("Submitted", [time() - $JobPurgeDays * 86400], "<"); foreach my $Job (@{$Jobs->GetItems()}) { - if ($Job->Submitted < $DeleteBefore) + LogMsg "Deleting job ", $Job->Id, "\n"; + $Job->RmTree(); + my $ErrMessage = $Jobs->DeleteItem($Job); + if (defined($ErrMessage)) { - LogMsg "Deleting job ", $Job->Id, "\n"; - $Job->RmTree(); - my $ErrMessage = $Jobs->DeleteItem($Job); - if (defined($ErrMessage)) - { - LogMsg $ErrMessage, "\n"; - } + LogMsg $ErrMessage, "\n"; } } } @@ -102,23 +99,20 @@ foreach my $Set (@{$Sets->GetItems()}) # Delete obsolete Patches now that no Job references them if ($JobPurgeDays != 0) { - $DeleteBefore = time() - $JobPurgeDays * 86400; my $Patches = CreatePatches(); + $Patches->AddFilter("Received", [time() - $JobPurgeDays * 86400], "<"); foreach my $Patch (@{$Patches->GetItems()}) { - if ($Patch->Received < $DeleteBefore) + my $Jobs = CreateJobs(); + $Jobs->AddFilter("Patch", [$Patch]); + if ($Jobs->IsEmpty()) { - my $Jobs = CreateJobs(); - $Jobs->AddFilter("Patch", [$Patch]); - if ($Jobs->IsEmpty()) + LogMsg "Deleting patch ", $Patch->Id, "\n"; + unlink("$DataDir/patches/" . $Patch->Id); + my $ErrMessage = $Patches->DeleteItem($Patch); + if (defined($ErrMessage)) { - LogMsg "Deleting patch ", $Patch->Id, "\n"; - unlink("$DataDir/patches/" . $Patch->Id); - my $ErrMessage = $Patches->DeleteItem($Patch); - if (defined($ErrMessage)) - { - LogMsg $ErrMessage, "\n"; - } + LogMsg $ErrMessage, "\n"; } } } @@ -270,17 +264,14 @@ else # Delete obsolete record groups if ($JobPurgeDays != 0) { - $DeleteBefore = time() - $JobPurgeDays * 86400; my $RecordGroups = CreateRecordGroups(); + $RecordGroups->AddFilter("Timestamp", [time() - $JobPurgeDays * 86400], "<"); foreach my $RecordGroup (@{$RecordGroups->GetItems()}) { - if ($RecordGroup->Timestamp < $DeleteBefore) + my $ErrMessage = $RecordGroups->DeleteItem($RecordGroup); + if (defined($ErrMessage)) { - my $ErrMessage = $RecordGroups->DeleteItem($RecordGroup); - if (defined($ErrMessage)) - { - LogMsg $ErrMessage, "\n"; - } + LogMsg $ErrMessage, "\n"; } } } -- 2.15.1

1 0

[PATCH] testbot: Link statistics to the corresponding activity page row.
by Francois Gouget 25 Jan '18

25 Jan '18

More specifically, this makes it possible to see where the maximum revert times and others come from, and what else was happening at that time. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Activity.pm | 25 ++++++++++++++----------- testbot/web/Activity.pl | 3 ++- testbot/web/Stats.pl | 19 +++++++++++++------ 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/testbot/lib/WineTestBot/Activity.pm b/testbot/lib/WineTestBot/Activity.pm index fb2cee52..2c21d9fd 100644 --- a/testbot/lib/WineTestBot/Activity.pm +++ b/testbot/lib/WineTestBot/Activity.pm @@ -51,6 +51,7 @@ Each entry contains a structure grouping all the state and event information for the specified timestamp. Entries have the following structure: { + id => <RecordGroupId>, start => <StartTimestamp>, end => <EndTimestamp>, runnable => <RunnableTasksCount>, @@ -105,7 +106,8 @@ sub GetActivity($;$) $Counters->{recordgroups} = $RecordGroups->GetItemsCount(); foreach my $RecordGroup (sort CompareRecordGroups @{$RecordGroups->GetItems()}) { - my $Group = { start => $RecordGroup->Timestamp }; + my $Group = { id => $RecordGroup->Id, + start => $RecordGroup->Timestamp }; $ActivityHash->{$RecordGroup->Id} = $Group; push @$Activity, $Group; $MinId = $RecordGroup->Id if (!defined $MinId or $RecordGroup->Id < $MinId); @@ -305,9 +307,9 @@ sub GetActivity($;$) return ($Activity, $Counters); } -sub _AddFullStat($$$;$) +sub _AddFullStat($$$$;$) { - my ($Stats, $StatKey, $Value, $Source) = @_; + my ($Stats, $StatKey, $Value, $GroupId, $Source) = @_; $Stats->{"$StatKey.count"}++; $Stats->{$StatKey} += $Value; @@ -315,6 +317,7 @@ sub _AddFullStat($$$;$) if (!exists $Stats->{$MaxKey} or $Stats->{$MaxKey} < $Value) { $Stats->{$MaxKey} = $Value; + $Stats->{"$MaxKey.groupid"} = $GroupId if (defined $GroupId); $Stats->{"$MaxKey.source"} = $Source if ($Source); } } @@ -346,7 +349,7 @@ sub GetStatistics($) $Task->Status !~ /^(?:queued|running|canceled)$/) { my $Time = $Task->Ended - $Task->Started; - _AddFullStat($GlobalStats, "$StepType.time", $Time, $Task); + _AddFullStat($GlobalStats, "$StepType.time", $Time, undef, $Task); } if ($IsSpecialJob) { @@ -354,11 +357,11 @@ sub GetStatistics($) if (-f $ReportFileName) { my $ReportSize = -s $ReportFileName; - _AddFullStat($GlobalStats, "$StepType.size", $ReportSize, $Task); + _AddFullStat($GlobalStats, "$StepType.size", $ReportSize, undef, $Task); if ($VMs->ItemExists($Task->VM->GetKey())) { my $VMStats = ($VMsStats->{items}->{$Task->VM->Name} ||= {}); - _AddFullStat($VMStats, "report.size", $ReportSize, $Task); + _AddFullStat($VMStats, "report.size", $ReportSize, undef, $Task); } } } @@ -369,7 +372,7 @@ sub GetStatistics($) $Job->Status !~ /^(?:queued|running|canceled)$/) { my $Time = $Job->Ended - $Job->Submitted; - _AddFullStat($GlobalStats, "jobs.time", $Time, $Job); + _AddFullStat($GlobalStats, "jobs.time", $Time, undef, $Job); push @JobTimes, $Time; if (!exists $GlobalStats->{start} or $GlobalStats->{start} > $Job->Submitted) @@ -421,8 +424,8 @@ sub GetStatistics($) my $Status = $VMStatus->{status}; my $Time = $VMStatus->{end} - $VMStatus->{start}; - _AddFullStat($VMStats, "$Status.time", $Time); - _AddFullStat($HostStats, "$Status.time", $Time); + _AddFullStat($VMStats, "$Status.time", $Time, $Group->{id}); + _AddFullStat($HostStats, "$Status.time", $Time, $Group->{id}); if ($Status =~ /^(?:reverting|sleeping|running|dirty)$/) { $VMStats->{"busy.elapsed"} += $Time; @@ -439,8 +442,8 @@ sub GetStatistics($) $VMStatus->{result} eq "failed")) { my $StepType = $VMStatus->{step}->Type; - _AddFullStat($VMStats, "$StepType.time", $Time, $VMStatus->{task}); - _AddFullStat($HostStats, "$StepType.time", $Time, $VMStatus->{task}); + _AddFullStat($VMStats, "$StepType.time", $Time, $Group->{id}, $VMStatus->{task}); + _AddFullStat($HostStats, "$StepType.time", $Time, $Group->{id}, $VMStatus->{task}); } } diff --git a/testbot/web/Activity.pl b/testbot/web/Activity.pl index 0b92299a..6ca3199a 100644 --- a/testbot/web/Activity.pl +++ b/testbot/web/Activity.pl @@ -153,7 +153,8 @@ EOF my $Group = $Activity->[$Index]; next if (!$Group->{statusvms}); - print "<tr><td>", _GetHtmlTime($Group->{start}), "</td>"; + my $GroupId = $Group->{id}; + print "<tr><td id='g$GroupId'>", _GetHtmlTime($Group->{start}), "</td>"; if ($Group->{engine}) { print "<td class='Record RecordEngine'>$Group->{engine}</td>\n"; diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index d9f43814..d9a3ce50 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -140,16 +140,23 @@ sub _GetStatHtml($$;$$) my ($Stats, $StatKey, $AllStats, $Flags) = @_; my $Value = _GetStatStr($Stats, $StatKey, $AllStats, $Flags); - return $Value if (!$Stats->{"$StatKey.source"}); my $SrcObj = $Stats->{"$StatKey.source"}; - my ($JobId, $StepNo, $TaskNo) = ObjectModel::Collection::SplitKey(undef, $SrcObj->GetFullKey()); - if (defined $TaskNo) + if ($SrcObj) { - my $Key = "$JobId#k". ($StepNo * 100 + $TaskNo); - return "<a href='/JobDetails.pl?Key=$Key'>$Value</a>"; + my ($JobId, $StepNo, $TaskNo) = ObjectModel::Collection::SplitKey(undef, $SrcObj->GetFullKey()); + if (defined $TaskNo) + { + my $Key = "$JobId#k". ($StepNo * 100 + $TaskNo); + return "<a href='/JobDetails.pl?Key=$Key'>$Value</a>"; + } + return "<a href='/index.pl#job$JobId'>$Value</a>"; } - return "<a href='/index.pl#job$JobId'>$Value</a>"; + + my $GroupId = $Stats->{"$StatKey.groupid"}; + return "<a href='/Activity.pl?Hours=0#g$GroupId'>$Value</a>" if ($GroupId); + + return $Value; } sub _GenGlobalLine($$$;$$) -- 2.15.1

1 0

[PATCH v2 1/4] shcore: Add DLL and GetProcessDpiAwareness stub
by Alex Henrie 24 Jan '18

24 Jan '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Patch adapted from Wine Staging. I couldn't figure out why you're getting test failures on your machine (`make test` works as well as can be expected here), but hopefully adding a stub for GetProcessDpiAwareness at the same time (also copied from Wine Staging) will fix the problem. configure.ac | 1 + dlls/shcore/Makefile.in | 4 +++ dlls/shcore/main.c | 50 +++++++++++++++++++++++++++++ dlls/shcore/shcore.spec | 83 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/make_specfiles | 7 ++++- 5 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 dlls/shcore/Makefile.in create mode 100644 dlls/shcore/main.c create mode 100644 dlls/shcore/shcore.spec diff --git a/configure.ac b/configure.ac index 3942e15e9a..b09a0babf7 100644 --- a/configure.ac +++ b/configure.ac @@ -3530,6 +3530,7 @@ WINE_CONFIG_TEST(dlls/setupapi/tests) WINE_CONFIG_DLL(setupx.dll16,enable_win16) WINE_CONFIG_DLL(sfc,,[implib]) WINE_CONFIG_DLL(sfc_os,,[implib]) +WINE_CONFIG_DLL(shcore) WINE_CONFIG_DLL(shdoclc,,[clean]) WINE_CONFIG_DLL(shdocvw,,[clean,implib]) WINE_CONFIG_TEST(dlls/shdocvw/tests) diff --git a/dlls/shcore/Makefile.in b/dlls/shcore/Makefile.in new file mode 100644 index 0000000000..ec2e95f526 --- /dev/null +++ b/dlls/shcore/Makefile.in @@ -0,0 +1,4 @@ +MODULE = shcore.dll + +C_SRCS = \ + main.c diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c new file mode 100644 index 0000000000..9075a38e1b --- /dev/null +++ b/dlls/shcore/main.c @@ -0,0 +1,50 @@ +/* + * Copyright 2016 Sebastian Lackner + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "shellscalingapi.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(shcore); + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} + +HRESULT WINAPI GetProcessDpiAwareness(HANDLE process, PROCESS_DPI_AWARENESS *value) +{ + FIXME("(%p, %p): stub\n", process, value); + if (value) *value = PROCESS_DPI_UNAWARE; + return S_OK; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec new file mode 100644 index 0000000000..ae647a5598 --- /dev/null +++ b/dlls/shcore/shcore.spec @@ -0,0 +1,83 @@ +@ stdcall CommandLineToArgvW(wstr ptr) shell32.CommandLineToArgvW +@ stub CreateRandomAccessStreamOnFile +@ stub CreateRandomAccessStreamOverStream +@ stub CreateStreamOverRandomAccessStream +@ stdcall -private DllCanUnloadNow() shell32.DllCanUnloadNow +@ stub DllGetActivationFactory +@ stdcall -private DllGetClassObject(ptr ptr ptr) shell32.DllGetClassObject +@ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) shell32.GetCurrentProcessExplicitAppUserModelID +@ stub GetDpiForMonitor +@ stub GetDpiForShellUIComponent +@ stdcall GetProcessDpiAwareness(long ptr) +@ stub GetProcessReference +@ stub GetScaleFactorForDevice +@ stub GetScaleFactorForMonitor +@ stub IStream_Copy +@ stdcall IStream_Read(ptr ptr long) shlwapi.IStream_Read +@ stub IStream_ReadStr +@ stdcall IStream_Reset(ptr) shlwapi.IStream_Reset +@ stdcall IStream_Size(ptr ptr) shlwapi.IStream_Size +@ stdcall IStream_Write(ptr ptr long) shlwapi.IStream_Write +@ stub IStream_WriteStr +@ stdcall IUnknown_AtomicRelease(long) shlwapi.IUnknown_AtomicRelease +@ stdcall IUnknown_GetSite(ptr ptr ptr) shlwapi.IUnknown_GetSite +@ stdcall IUnknown_QueryService(ptr ptr ptr ptr) shlwapi.IUnknown_QueryService +@ stdcall IUnknown_Set(ptr ptr) shlwapi.IUnknown_Set +@ stdcall IUnknown_SetSite(ptr ptr) shlwapi.IUnknown_SetSite +@ stdcall IsOS(long) shlwapi.IsOS +@ stub RegisterScaleChangeEvent +@ stub RegisterScaleChangeNotifications +@ stub RevokeScaleChangeNotifications +@ stdcall SHAnsiToAnsi(str ptr long) shlwapi.SHAnsiToAnsi +@ stdcall SHAnsiToUnicode(str ptr long) shlwapi.SHAnsiToUnicode +@ stdcall SHCopyKeyA(long str long long) shlwapi.SHCopyKeyA +@ stdcall SHCopyKeyW(long wstr long long) shlwapi.SHCopyKeyW +@ stdcall SHCreateMemStream(ptr long) shlwapi.SHCreateMemStream +@ stdcall SHCreateStreamOnFileA(str long ptr) shlwapi.SHCreateStreamOnFileA +@ stdcall SHCreateStreamOnFileEx(wstr long long long ptr ptr) shlwapi.SHCreateStreamOnFileEx +@ stdcall SHCreateStreamOnFileW(wstr long ptr) shlwapi.SHCreateStreamOnFileW +@ stdcall SHCreateThread(ptr ptr long ptr) shlwapi.SHCreateThread +@ stdcall SHCreateThreadRef(ptr ptr) shlwapi.SHCreateThreadRef +@ stub SHCreateThreadWithHandle +@ stdcall SHDeleteEmptyKeyA(long ptr) shlwapi.SHDeleteEmptyKeyA +@ stdcall SHDeleteEmptyKeyW(long ptr) shlwapi.SHDeleteEmptyKeyW +@ stdcall SHDeleteKeyA(long str) shlwapi.SHDeleteKeyA +@ stdcall SHDeleteKeyW(long wstr) shlwapi.SHDeleteKeyW +@ stdcall SHDeleteValueA(long str str) shlwapi.SHDeleteValueA +@ stdcall SHDeleteValueW(long wstr wstr) shlwapi.SHDeleteValueW +@ stdcall SHEnumKeyExA(long long str ptr) shlwapi.SHEnumKeyExA +@ stdcall SHEnumKeyExW(long long wstr ptr) shlwapi.SHEnumKeyExW +@ stdcall SHEnumValueA(long long str ptr ptr ptr ptr) shlwapi.SHEnumValueA +@ stdcall SHEnumValueW(long long wstr ptr ptr ptr ptr) shlwapi.SHEnumValueW +@ stdcall SHGetThreadRef(ptr) shlwapi.SHGetThreadRef +@ stdcall SHGetValueA( long str str ptr ptr ptr ) shlwapi.SHGetValueA +@ stdcall SHGetValueW( long wstr wstr ptr ptr ptr ) shlwapi.SHGetValueW +@ stdcall SHOpenRegStream2A(long str str long) shlwapi.SHOpenRegStream2A +@ stdcall SHOpenRegStream2W(long wstr wstr long) shlwapi.SHOpenRegStream2W +@ stdcall SHOpenRegStreamA(long str str long) shlwapi.SHOpenRegStreamA +@ stdcall SHOpenRegStreamW(long wstr wstr long) shlwapi.SHOpenRegStreamW +@ stdcall SHQueryInfoKeyA(long ptr ptr ptr ptr) shlwapi.SHQueryInfoKeyA +@ stdcall SHQueryInfoKeyW(long ptr ptr ptr ptr) shlwapi.SHQueryInfoKeyW +@ stdcall SHQueryValueExA(long str ptr ptr ptr ptr) shlwapi.SHQueryValueExA +@ stdcall SHQueryValueExW(long wstr ptr ptr ptr ptr) shlwapi.SHQueryValueExW +@ stdcall SHRegDuplicateHKey(long) shlwapi.SHRegDuplicateHKey +@ stdcall SHRegGetIntW(ptr wstr long) shlwapi.SHRegGetIntW +@ stdcall SHRegGetPathA(long str str ptr long) shlwapi.SHRegGetPathA +@ stdcall SHRegGetPathW(long wstr wstr ptr long) shlwapi.SHRegGetPathW +@ stdcall SHRegGetValueA( long str str long ptr ptr ptr ) shlwapi.SHRegGetValueA +@ stub SHRegGetValueFromHKCUHKLM +@ stdcall SHRegGetValueW( long wstr wstr long ptr ptr ptr ) shlwapi.SHRegGetValueW +@ stdcall SHRegSetPathA(long str str str long) shlwapi.SHRegSetPathA +@ stdcall SHRegSetPathW(long wstr wstr wstr long) shlwapi.SHRegSetPathW +@ stdcall SHReleaseThreadRef() shlwapi.SHReleaseThreadRef +@ stdcall SHSetThreadRef(ptr) shlwapi.SHSetThreadRef +@ stdcall SHSetValueA(long str str long ptr long) shlwapi.SHSetValueA +@ stdcall SHSetValueW(long wstr wstr long ptr long) shlwapi.SHSetValueW +@ stdcall SHStrDupA(str ptr) shlwapi.SHStrDupA +@ stdcall SHStrDupW(wstr ptr) shlwapi.SHStrDupW +@ stdcall SHUnicodeToAnsi(wstr ptr ptr) shlwapi.SHUnicodeToAnsi +@ stdcall SHUnicodeToUnicode(wstr ptr long) shlwapi.SHUnicodeToUnicode +@ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) shell32.SetCurrentProcessExplicitAppUserModelID +@ stub SetProcessDpiAwareness +@ stub SetProcessReference +@ stub UnregisterScaleChangeEvent diff --git a/tools/make_specfiles b/tools/make_specfiles index 1833cb6d1b..417cf50ac3 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -322,9 +322,14 @@ my @dll_groups = "api-ms-win-core-shlwapi-legacy-l1-1-0", "api-ms-win-core-shlwapi-obsolete-l1-1-0", "api-ms-win-core-shlwapi-obsolete-l1-2-0", - "api-ms-win-shcore-scaling-l1-1-1", "api-ms-win-core-url-l1-1-0", ], + [ + "shell32", + "shlwapi", + "shcore", + "api-ms-win-shcore-scaling-l1-1-1", + ], [ "user32", "api-ms-win-core-stringansi-l1-1-0", -- 2.16.1

2 4

[PATCH] kernel32: Add stub for ReOpenFile
by Fabian Maurer 24 Jan '18

24 Jan '18

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- .../api-ms-win-core-file-l2-1-0.spec | 2 +- .../api-ms-win-core-file-l2-1-1.spec | 2 +- .../api-ms-win-core-file-l2-1-2.spec | 2 +- dlls/kernel32/file.c | 10 ++++++++++ dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec b/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec index 3c1e59ca95..5272d4c3bd 100644 --- a/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec +++ b/dlls/api-ms-win-core-file-l2-1-0/api-ms-win-core-file-l2-1-0.spec @@ -6,6 +6,6 @@ @ stdcall GetFileInformationByHandleEx(long long ptr long) kernel32.GetFileInformationByHandleEx @ stdcall MoveFileExW(wstr wstr long) kernel32.MoveFileExW @ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) kernel32.MoveFileWithProgressW -@ stub ReOpenFile +@ stdcall ReOpenFile(ptr long long long) kernel32.ReOpenFile @ stdcall ReadDirectoryChangesW(long ptr long long long ptr ptr ptr) kernel32.ReadDirectoryChangesW @ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) kernel32.ReplaceFileW diff --git a/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec b/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec index 6bfcb0895e..9cd8689e94 100644 --- a/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec +++ b/dlls/api-ms-win-core-file-l2-1-1/api-ms-win-core-file-l2-1-1.spec @@ -7,6 +7,6 @@ @ stdcall MoveFileExW(wstr wstr long) kernel32.MoveFileExW @ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) kernel32.MoveFileWithProgressW @ stdcall OpenFileById(long ptr long long ptr long) kernel32.OpenFileById -@ stub ReOpenFile +@ stdcall ReOpenFile(ptr long long long) kernel32.ReOpenFile @ stdcall ReadDirectoryChangesW(long ptr long long long ptr ptr ptr) kernel32.ReadDirectoryChangesW @ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) kernel32.ReplaceFileW diff --git a/dlls/api-ms-win-core-file-l2-1-2/api-ms-win-core-file-l2-1-2.spec b/dlls/api-ms-win-core-file-l2-1-2/api-ms-win-core-file-l2-1-2.spec index bee3c053a6..ab6f303a2d 100644 --- a/dlls/api-ms-win-core-file-l2-1-2/api-ms-win-core-file-l2-1-2.spec +++ b/dlls/api-ms-win-core-file-l2-1-2/api-ms-win-core-file-l2-1-2.spec @@ -10,5 +10,5 @@ @ stdcall MoveFileWithProgressW(wstr wstr ptr ptr long) kernel32.MoveFileWithProgressW @ stdcall OpenFileById(long ptr long long ptr long) kernel32.OpenFileById @ stdcall ReadDirectoryChangesW(long ptr long long long ptr ptr ptr) kernel32.ReadDirectoryChangesW -@ stub ReOpenFile +@ stdcall ReOpenFile(ptr long long long) kernel32.ReOpenFile @ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) kernel32.ReplaceFileW diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 7196aff670..e114440296 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -2820,6 +2820,16 @@ HANDLE WINAPI OpenFileById( HANDLE handle, LPFILE_ID_DESCRIPTOR id, DWORD access return result; } +/*********************************************************************** + * ReOpenFile (KERNEL32.@) + */ +HANDLE WINAPI ReOpenFile(HANDLE handle_original, DWORD access, DWORD sharing, DWORD flags) +{ + FIXME("(%p, %d, %d, %d): stub\n", handle_original, access, sharing, flags); + + return NULL; +} + /*********************************************************************** * K32EnumDeviceDrivers (KERNEL32.@) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2c719d437e..6e4d75a546 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1267,7 +1267,7 @@ # @ stub RemoveLocalAlternateComputerNameW @ stdcall RemoveVectoredContinueHandler(ptr) ntdll.RtlRemoveVectoredContinueHandler @ stdcall RemoveVectoredExceptionHandler(ptr) ntdll.RtlRemoveVectoredExceptionHandler -# @ stub ReOpenFile +@ stdcall ReOpenFile(ptr long long long) ReOpenFile @ stdcall ReplaceFile(wstr wstr wstr long ptr ptr) ReplaceFileW @ stdcall ReplaceFileA(str str str long ptr ptr) @ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index b9eb4fcf87..c1e4eab3a7 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1233,7 +1233,7 @@ # @ stub QuirkIsEnabledForProcess @ stdcall RaiseException(long long long ptr) kernel32.RaiseException # @ stub RaiseFailFastException -# @ stub ReOpenFile +@ stdcall ReOpenFile(ptr long long long) kernel32.ReOpenFile @ stdcall ReadConsoleA(long ptr long ptr ptr) kernel32.ReadConsoleA @ stdcall ReadConsoleInputA(long ptr long ptr) kernel32.ReadConsoleInputA @ stub ReadConsoleInputExA -- 2.16.0

2 2

[PATCH] mshtml: Added IDOMEvent::get_srcElement implementation.
by Jacek Caban 24 Jan '18

24 Jan '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 20 ++++++++++++++------ dlls/mshtml/tests/events.js | 3 +++ 2 files changed, 17 insertions(+), 6 deletions(-)

1 0

[PATCH] winex11: Implement WGL_ARB_create_context_no_error.
by Henri Verbeet 24 Jan '18

24 Jan '18

Mostly because it's easy, and we'd like to use this from wined3d at some point. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Note that this requires an update of the OpenGL extension list to build. --- dlls/opengl32/make_opengl | 1 + dlls/winex11.drv/opengl.c | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/dlls/opengl32/make_opengl b/dlls/opengl32/make_opengl index d5d614b6138..ebdca671757 100755 --- a/dlls/opengl32/make_opengl +++ b/dlls/opengl32/make_opengl @@ -369,6 +369,7 @@ my %remapped_wgl_functions = my %supported_wgl_extensions = ( "WGL_ARB_create_context" => 1, + "WGL_ARB_create_context_no_error" => 1, "WGL_ARB_create_context_profile" => 1, "WGL_ARB_extensions_string" => 1, "WGL_ARB_make_current_read" => 1, diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index e6652867800..e976ad7067b 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -163,6 +163,8 @@ typedef XID GLXPbuffer; #define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091 #define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092 #define GLX_CONTEXT_FLAGS_ARB 0x2094 +/** GLX_ARB_create_context_no_error */ +#define GLX_CONTEXT_OPENGL_NO_ERROR_ARB 0x31B3 /** GLX_ARB_create_context_profile */ #define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126 /** GLX_ATI_pixel_format_float */ @@ -2118,6 +2120,12 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg pContextAttribList += 2; ret->numAttribs++; break; + case WGL_CONTEXT_OPENGL_NO_ERROR_ARB: + pContextAttribList[0] = GLX_CONTEXT_OPENGL_NO_ERROR_ARB; + pContextAttribList[1] = attribList[1]; + pContextAttribList += 2; + ret->numAttribs++; + break; case WGL_CONTEXT_PROFILE_MASK_ARB: pContextAttribList[0] = GLX_CONTEXT_PROFILE_MASK_ARB; pContextAttribList[1] = attribList[1]; @@ -3179,6 +3187,8 @@ static void X11DRV_WineGL_LoadExtensions(void) register_extension( "WGL_ARB_create_context" ); opengl_funcs.ext.p_wglCreateContextAttribsARB = X11DRV_wglCreateContextAttribsARB; + if (has_extension( WineGLInfo.glxExtensions, "GLX_ARB_create_context_no_error" )) + register_extension( "WGL_ARB_create_context_no_error" ); if (has_extension( WineGLInfo.glxExtensions, "GLX_ARB_create_context_profile")) register_extension("WGL_ARB_create_context_profile"); } -- 2.11.0

1 0

[PATCH 1/5] dxgi/tests: Introduce check_interface() function.
by Józef Kucia 24 Jan '18

24 Jan '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/device.c | 62 +++++++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 24 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 899a06383ae0..dfbbab42f5ea 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -39,6 +39,35 @@ static ULONG get_refcount(IUnknown *iface) return IUnknown_Release(iface); } +#define check_interface(a, b, c, d) check_interface_(__LINE__, a, b, c, d) +static HRESULT check_interface_(unsigned int line, void *iface, REFIID iid, + BOOL supported, BOOL is_broken) +{ + HRESULT hr, expected_hr, broken_hr; + IUnknown *unknown = iface, *out; + + if (supported) + { + expected_hr = S_OK; + broken_hr = E_NOINTERFACE; + } + else + { + expected_hr = E_NOINTERFACE; + broken_hr = S_OK; + } + + out = (IUnknown *)0xdeadbeef; + hr = IUnknown_QueryInterface(unknown, iid, (void **)&out); + ok_(__FILE__, line)(hr == expected_hr || broken(is_broken && hr == broken_hr), + "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(out); + else + ok_(__FILE__, line)(!out, "Got unexpected pointer %p.\n", out); + return hr; +} + #define MODE_DESC_IGNORE_RESOLUTION 0x00000001u #define MODE_DESC_IGNORE_REFRESH_RATE 0x00000002u #define MODE_DESC_IGNORE_FORMAT 0x00000004u @@ -458,8 +487,6 @@ static void test_create_surface(void) DXGI_SURFACE_DESC desc; IDXGISurface *surface; IDXGIDevice *device; - IUnknown *surface1; - IUnknown *texture; ULONG refcount; HRESULT hr; @@ -478,19 +505,11 @@ static void test_create_surface(void) hr = IDXGIDevice_CreateSurface(device, &desc, 1, DXGI_USAGE_RENDER_TARGET_OUTPUT, NULL, &surface); ok(SUCCEEDED(hr), "Failed to create a dxgi surface, hr %#x\n", hr); - hr = IDXGISurface_QueryInterface(surface, &IID_ID3D10Texture2D, (void **)&texture); - ok(SUCCEEDED(hr), "Surface should implement ID3D10Texture2D\n"); - IUnknown_Release(texture); - - hr = IDXGISurface_QueryInterface(surface, &IID_ID3D11Texture2D, (void **)&texture); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Surface should implement ID3D11Texture2D.\n"); - if (SUCCEEDED(hr)) IUnknown_Release(texture); - - hr = IDXGISurface_QueryInterface(surface, &IID_IDXGISurface1, (void **)&surface1); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Surface should implement IDXGISurface1.\n"); - if (SUCCEEDED(hr)) IUnknown_Release(surface1); + check_interface(surface, &IID_ID3D10Texture2D, TRUE, FALSE); + /* Not available on all Windows versions. */ + check_interface(surface, &IID_ID3D11Texture2D, TRUE, TRUE); + /* Not available on all Windows versions. */ + check_interface(surface, &IID_IDXGISurface1, TRUE, TRUE); IDXGISurface_Release(surface); refcount = IDXGIDevice_Release(device); @@ -2341,7 +2360,6 @@ done: static void test_create_factory(void) { - IDXGIFactory1 *factory; IUnknown *iface; ULONG refcount; HRESULT hr; @@ -2359,12 +2377,9 @@ static void test_create_factory(void) ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIObject, hr %#x.\n", hr); IUnknown_Release(iface); - factory = (void *)0xdeadbeef; hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&iface); ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory, hr %#x.\n", hr); - hr = IUnknown_QueryInterface(iface, &IID_IDXGIFactory1, (void **)&factory); - ok(hr == E_NOINTERFACE, "Got unexpected hr %#x.\n", hr); - ok(!factory, "Got unexpected factory %p.\n", factory); + check_interface(iface, &IID_IDXGIFactory1, FALSE, FALSE); IUnknown_Release(iface); iface = (void *)0xdeadbeef; @@ -2403,10 +2418,9 @@ static void test_create_factory(void) hr = pCreateDXGIFactory1(&IID_IDXGIFactory, (void **)&iface); ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory, hr %#x.\n", hr); - hr = IUnknown_QueryInterface(iface, &IID_IDXGIFactory1, (void **)&factory); - ok(SUCCEEDED(hr), "Failed to query IDXGIFactory1 interface, hr %#x.\n", hr); - IDXGIFactory1_Release(factory); - IUnknown_Release(iface); + check_interface(iface, &IID_IDXGIFactory1, TRUE, FALSE); + refcount = IUnknown_Release(iface); + ok(!refcount, "Factory has %u references left.\n", refcount); hr = pCreateDXGIFactory1(&IID_IDXGIFactory1, (void **)&iface); ok(SUCCEEDED(hr), "Failed to create factory with IID_IDXGIFactory1, hr %#x.\n", hr); -- 2.13.6

2 9

[PATCH vkd3d 1/5] libs/vkd3d: Allow library user to enable additional device extensions.
by Józef Kucia 24 Jan '18

24 Jan '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d.h | 3 +++ libs/vkd3d/device.c | 52 +++++++++++++++++++++++++++++++++++----------------- 2 files changed, 38 insertions(+), 17 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index 033017e78f2f..de75ee3a3894 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -66,6 +66,9 @@ struct vkd3d_device_create_info VkPhysicalDevice vk_physical_device; + const char * const *device_extensions; + uint32_t device_extension_count; + LUID adapter_luid; }; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index e6210fc4dc9d..bec8f354c3d2 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -50,9 +50,6 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = {VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME, offsetof(struct vkd3d_vulkan_info, KHR_push_descriptor)}, }; -#define MAX_DEVICE_EXTENSION_COUNT \ - (ARRAY_SIZE(required_device_extensions) + ARRAY_SIZE(optional_device_extensions)) - static bool is_extension_disabled(const char *extension_name) { const char *disabled_extensions; @@ -673,8 +670,9 @@ static void vkd3d_check_feature_level_11_requirements(const VkPhysicalDeviceLimi #undef CHECK_FEATURE } -static void vkd3d_init_device_caps(struct d3d12_device *device, - const VkPhysicalDeviceFeatures *features) +static HRESULT vkd3d_init_device_caps(struct d3d12_device *device, + const struct vkd3d_device_create_info *create_info, + const VkPhysicalDeviceFeatures *features, uint32_t *device_extension_count) { const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; VkPhysicalDevice physical_device = device->vk_physical_device; @@ -684,6 +682,8 @@ static void vkd3d_init_device_caps(struct d3d12_device *device, uint32_t count; VkResult vr; + *device_extension_count = 0; + VK_CALL(vkGetPhysicalDeviceProperties(physical_device, &device_properties)); vulkan_info->device_limits = device_properties.limits; vulkan_info->sparse_properties = device_properties.sparseProperties; @@ -729,13 +729,13 @@ static void vkd3d_init_device_caps(struct d3d12_device *device, &count, NULL))) < 0) { ERR("Failed to enumerate device extensions, vr %d.\n", vr); - return; + return hresult_from_vk_result(vr); } if (!count) - return; + return S_OK; if (!(vk_extensions = vkd3d_calloc(count, sizeof(*vk_extensions)))) - return; + return E_OUTOFMEMORY; TRACE("Enumerating %u device extensions.\n", count); if ((vr = VK_CALL(vkEnumerateDeviceExtensionProperties(physical_device, NULL, @@ -743,15 +743,17 @@ static void vkd3d_init_device_caps(struct d3d12_device *device, { ERR("Failed to enumerate device extensions, vr %d.\n", vr); vkd3d_free(vk_extensions); - return; + return hresult_from_vk_result(vr); } - vkd3d_check_extensions(vk_extensions, count, + *device_extension_count = vkd3d_check_extensions(vk_extensions, count, required_device_extensions, ARRAY_SIZE(required_device_extensions), optional_device_extensions, ARRAY_SIZE(optional_device_extensions), - NULL, 0, vulkan_info, "device"); + create_info->device_extensions, create_info->device_extension_count, + vulkan_info, "device"); vkd3d_free(vk_extensions); + return S_OK; } static HRESULT vkd3d_select_physical_device(struct vkd3d_instance *instance, @@ -855,24 +857,28 @@ static HRESULT d3d12_device_create_vkd3d_queues(struct d3d12_device *device, return S_OK; } -static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VkPhysicalDevice physical_device) +static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, + const struct vkd3d_device_create_info *create_info) { uint32_t direct_queue_timestamp_bits, copy_queue_timestamp_bits, compute_queue_timestamp_bits; unsigned int direct_queue_family_index, copy_queue_family_index, compute_queue_family_index; const struct vkd3d_vk_instance_procs *vk_procs = &device->vkd3d_instance->vk_procs; - const char *extensions[MAX_DEVICE_EXTENSION_COUNT]; VkQueueFamilyProperties *queue_properties; VkPhysicalDeviceFeatures device_features; VkDeviceQueueCreateInfo *queue_info; + VkPhysicalDevice physical_device; VkDeviceCreateInfo device_info; uint32_t queue_family_count; + uint32_t extension_count; + const char **extensions; VkDevice vk_device; unsigned int i; VkResult vr; HRESULT hr; - TRACE("device %p, physical_device %p.\n", device, physical_device); + TRACE("device %p, create_info %p.\n", device, create_info); + physical_device = create_info->vk_physical_device; if (!physical_device && FAILED(hr = vkd3d_select_physical_device(device->vkd3d_instance, &physical_device))) return hr; @@ -954,7 +960,17 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VkPhysicalDev VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &device_features)); device->vk_physical_device = physical_device; - vkd3d_init_device_caps(device, &device_features); + if (FAILED(hr = vkd3d_init_device_caps(device, create_info, &device_features, &extension_count))) + { + vkd3d_free(queue_info); + return E_FAIL; + } + + if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) + { + vkd3d_free(queue_info); + return E_OUTOFMEMORY; + } /* Create device */ device_info.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO; @@ -967,11 +983,13 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VkPhysicalDev device_info.enabledExtensionCount = vkd3d_enable_extensions(extensions, required_device_extensions, ARRAY_SIZE(required_device_extensions), optional_device_extensions, ARRAY_SIZE(optional_device_extensions), - NULL, 0, &device->vk_info); + create_info->device_extensions, create_info->device_extension_count, + &device->vk_info); device_info.ppEnabledExtensionNames = extensions; device_info.pEnabledFeatures = &device_features; vr = VK_CALL(vkCreateDevice(physical_device, &device_info, NULL, &vk_device)); + vkd3d_free(extensions); vkd3d_free(queue_info); if (vr < 0) { @@ -2137,7 +2155,7 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, device->adapter_luid = create_info->adapter_luid; - if (FAILED(hr = vkd3d_create_vk_device(device, create_info->vk_physical_device))) + if (FAILED(hr = vkd3d_create_vk_device(device, create_info))) { vkd3d_instance_decref(device->vkd3d_instance); return hr; -- 2.13.6

2 9

[PATCH 12/20] kerberos: Implement SpQueryContextAttributes.
by Dmitry Timoshkov 24 Jan '18

24 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 72 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 59 insertions(+), 13 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 563ac47509..ddd48df5d1 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -67,6 +67,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(kerberos); | SECPKG_FLAG_RESTRICTED_TOKENS \ | SECPKG_FLAG_APPCONTAINER_CHECKS) +static WCHAR kerberos_name_W[] = MICROSOFT_KERBEROS_NAME_W; +static WCHAR kerberos_comment_W[] = {'M','i','c','r','o','s','o','f','t',' ','K','e','r','b','e','r','o','s',' ','V','1','.','0',0}; +static const SecPkgInfoW infoW = +{ + KERBEROS_CAPS, + 1, + RPC_C_AUTHN_GSS_KERBEROS, + KERBEROS_MAX_BUF, + kerberos_name_W, + kerberos_comment_W +}; + static ULONG kerberos_package_id; static LSA_DISPATCH_TABLE lsa_dispatch; @@ -158,18 +170,6 @@ static NTSTATUS NTAPI kerberos_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST req static NTSTATUS NTAPI kerberos_SpGetInfo(SecPkgInfoW *info) { - static WCHAR kerberos_name_W[] = MICROSOFT_KERBEROS_NAME_W; - static WCHAR kerberos_comment_W[] = {'M','i','c','r','o','s','o','f','t',' ','K','e','r','b','e','r','o','s',' ','V','1','.','0',0}; - static const SecPkgInfoW infoW = - { - KERBEROS_CAPS, - 1, - RPC_C_AUTHN_GSS_KERBEROS, - KERBEROS_MAX_BUF, - kerberos_name_W, - kerberos_comment_W - }; - TRACE("%p\n", info); /* LSA will make a copy before forwarding the structure, so @@ -608,6 +608,52 @@ static NTSTATUS NTAPI kerberos_SpDeleteContext( LSA_SEC_HANDLE context ) #endif } +static NTSTATUS NTAPI kerberos_SpQueryContextAttributes( LSA_SEC_HANDLE context, ULONG attribute, void *buffer ) +{ + TRACE( "(%lx %u %p)\n", context, attribute, buffer ); + + if (!context) return SEC_E_INVALID_HANDLE; + + switch (attribute) + { +#define X(x) case (x) : FIXME(#x" stub\n"); break + X(SECPKG_ATTR_ACCESS_TOKEN); + X(SECPKG_ATTR_AUTHORITY); + X(SECPKG_ATTR_DCE_INFO); + X(SECPKG_ATTR_KEY_INFO); + X(SECPKG_ATTR_LIFESPAN); + X(SECPKG_ATTR_NAMES); + X(SECPKG_ATTR_NATIVE_NAMES); + X(SECPKG_ATTR_PACKAGE_INFO); + X(SECPKG_ATTR_PASSWORD_EXPIRY); + X(SECPKG_ATTR_SESSION_KEY); + X(SECPKG_ATTR_STREAM_SIZES); + X(SECPKG_ATTR_TARGET_INFORMATION); + case SECPKG_ATTR_SIZES: + { + SecPkgContext_Sizes *sizes = (SecPkgContext_Sizes *)buffer; + sizes->cbMaxToken = KERBEROS_MAX_BUF; + sizes->cbMaxSignature = 37; + sizes->cbBlockSize = 1; + sizes->cbSecurityTrailer = 49; + return SEC_E_OK; + } + case SECPKG_ATTR_NEGOTIATION_INFO: + { + SecPkgContext_NegotiationInfoW *info = (SecPkgContext_NegotiationInfoW *)buffer; + info->PackageInfo = (SecPkgInfoW *)&infoW; + info->NegotiationState = SECPKG_NEGOTIATION_COMPLETE; + return SEC_E_OK; + } +#undef X + default: + FIXME( "unknown attribute %u\n", attribute ); + break; + } + + return SEC_E_UNSUPPORTED_FUNCTION; +} + static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) { @@ -657,7 +703,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* ApplyControlToken */ NULL, /* GetUserInfo */ NULL, /* GetExtendedInformation */ - NULL, /* SpQueryContextAttributes */ + kerberos_SpQueryContextAttributes, NULL, /* SpAddCredentials */ NULL, /* SetExtendedInformation */ NULL, /* SetContextAttributes */ -- 2.15.1

2 1

[PATCH 11/20] kerberos: Implement SpFreeCredentialsHandle.
by Dmitry Timoshkov 24 Jan '18

24 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 3e282a630e..563ac47509 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -192,6 +192,7 @@ MAKE_FUNCPTR(gss_delete_sec_context); MAKE_FUNCPTR(gss_import_name); MAKE_FUNCPTR(gss_init_sec_context); MAKE_FUNCPTR(gss_release_buffer); +MAKE_FUNCPTR(gss_release_cred); MAKE_FUNCPTR(gss_release_name); #undef MAKE_FUNCPTR @@ -216,6 +217,7 @@ static BOOL load_gssapi_krb5(void) LOAD_FUNCPTR(gss_import_name) LOAD_FUNCPTR(gss_init_sec_context) LOAD_FUNCPTR(gss_release_buffer) + LOAD_FUNCPTR(gss_release_cred) LOAD_FUNCPTR(gss_release_name) #undef LOAD_FUNCPTR @@ -419,6 +421,27 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( #endif } +static NTSTATUS NTAPI kerberos_SpFreeCredentialsHandle( LSA_SEC_HANDLE credential ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + OM_uint32 ret, minor_status; + gss_cred_id_t cred_handle; + + TRACE( "(%lx)\n", credential ); + + if (!credential) return SEC_E_INVALID_HANDLE; + if (!(cred_handle = credhandle_sspi_to_gss( credential ))) return SEC_E_OK; + + ret = pgss_release_cred( &minor_status, &cred_handle ); + TRACE( "gss_release_cred returned %08x minor status %08x\n", ret, minor_status ); + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx)\n", credential ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE context, UNICODE_STRING *target_name, ULONG context_req, ULONG target_data_rep, SecBufferDesc *input, LSA_SEC_HANDLE *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry, @@ -624,7 +647,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* AcceptCredentials */ kerberos_SpAcquireCredentialsHandle, NULL, /* SpQueryCredentialsAttributes */ - NULL, /* FreeCredentialsHandle */ + kerberos_SpFreeCredentialsHandle, NULL, /* SaveCredentials */ NULL, /* GetCredentials */ NULL, /* DeleteCredentials */ -- 2.15.1

2 1

[PATCH 10/20] kerberos: Implement SpDeleteContext.
by Dmitry Timoshkov 24 Jan '18

24 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 8b2926ff15..3e282a630e 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -565,6 +565,26 @@ static NTSTATUS NTAPI kerberos_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential #endif } +static NTSTATUS NTAPI kerberos_SpDeleteContext( LSA_SEC_HANDLE context ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + OM_uint32 ret, minor_status; + gss_ctx_id_t ctxt_handle; + + TRACE( "(%lx)\n", context ); + if (!context) return SEC_E_INVALID_HANDLE; + if (!(ctxt_handle = ctxthandle_sspi_to_gss( context ))) return SEC_E_OK; + + ret = pgss_delete_sec_context( &minor_status, &ctxt_handle, GSS_C_NO_BUFFER ); + TRACE( "gss_delete_sec_context returned %08x minor status %08x\n", ret, minor_status ); + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx)\n", context ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) { @@ -610,7 +630,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* DeleteCredentials */ kerberos_SpInitLsaModeContext, kerberos_SpAcceptLsaModeContext, - NULL, /* DeleteContext */ + kerberos_SpDeleteContext, NULL, /* ApplyControlToken */ NULL, /* GetUserInfo */ NULL, /* GetExtendedInformation */ -- 2.15.1

2 1

[PATCH 09/20] keberos: Implement SpAcceptLsaModeContext.
by Dmitry Timoshkov 24 Jan '18

24 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 204a0d8965..8b2926ff15 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -186,6 +186,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); static void *libgssapi_krb5_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(gss_accept_sec_context); MAKE_FUNCPTR(gss_acquire_cred); MAKE_FUNCPTR(gss_delete_sec_context); MAKE_FUNCPTR(gss_import_name); @@ -209,6 +210,7 @@ static BOOL load_gssapi_krb5(void) goto fail; \ } + LOAD_FUNCPTR(gss_accept_sec_context) LOAD_FUNCPTR(gss_acquire_cred) LOAD_FUNCPTR(gss_delete_sec_context) LOAD_FUNCPTR(gss_import_name) @@ -336,6 +338,19 @@ static ULONG flags_gss_to_isc_ret( ULONG flags ) return ret; } +static ULONG flags_gss_to_asc_ret( ULONG flags ) +{ + ULONG ret = 0; + if (flags & GSS_C_DELEG_FLAG) ret |= ASC_RET_DELEGATE; + if (flags & GSS_C_MUTUAL_FLAG) ret |= ASC_RET_MUTUAL_AUTH; + if (flags & GSS_C_REPLAY_FLAG) ret |= ASC_RET_REPLAY_DETECT; + if (flags & GSS_C_SEQUENCE_FLAG) ret |= ASC_RET_SEQUENCE_DETECT; + if (flags & GSS_C_CONF_FLAG) ret |= ASC_RET_CONFIDENTIALITY; + if (flags & GSS_C_INTEG_FLAG) ret |= ASC_RET_INTEGRITY; + if (flags & GSS_C_ANON_FLAG) ret |= ASC_RET_NULL_SESSION; + return ret; +} + static int get_buffer_index( SecBufferDesc *desc, DWORD type ) { UINT i; @@ -483,6 +498,73 @@ static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, #endif } +static NTSTATUS NTAPI kerberos_SpAcceptLsaModeContext( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE context, + SecBufferDesc *input, ULONG context_req, ULONG target_data_rep, LSA_SEC_HANDLE *new_context, + SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry, BOOLEAN *mapped_context, SecBuffer *context_data ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + OM_uint32 ret, minor_status, ret_flags, expiry_time; + gss_cred_id_t cred_handle; + gss_ctx_id_t ctxt_handle; + gss_buffer_desc input_token, output_token; + gss_name_t target = GSS_C_NO_NAME; + int idx; + + TRACE( "(%lx %lx 0x%08x %u %p %p %p %p %p %p %p)\n", credential, context, context_req, + target_data_rep, input, new_context, output, context_attr, ts_expiry, + mapped_context, context_data ); + if (context_req) FIXME( "ignoring flags 0x%08x\n", context_req ); + + if (!context && !input && !credential) return SEC_E_INVALID_HANDLE; + cred_handle = credhandle_sspi_to_gss( credential ); + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + if (!input) input_token.length = 0; + else + { + if ((idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + input_token.length = input->pBuffers[idx].cbBuffer; + input_token.value = input->pBuffers[idx].pvBuffer; + } + + if ((idx = get_buffer_index( output, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + output_token.length = 0; + output_token.value = NULL; + + ret = pgss_accept_sec_context( &minor_status, &ctxt_handle, cred_handle, &input_token, GSS_C_NO_CHANNEL_BINDINGS, + &target, NULL, &output_token, &ret_flags, &expiry_time, NULL ); + TRACE( "gss_accept_sec_context returned %08x minor status %08x ctxt_handle %p\n", ret, minor_status, ctxt_handle ); + if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) + { + if (output_token.length > output->pBuffers[idx].cbBuffer) /* FIXME: check if larger buffer exists */ + { + TRACE( "buffer too small %u > %u\n", output_token.length, output->pBuffers[idx].cbBuffer ); + pgss_release_buffer( &minor_status, &output_token ); + pgss_delete_sec_context( &minor_status, &ctxt_handle, GSS_C_NO_BUFFER ); + return SEC_E_BUFFER_TOO_SMALL; + } + output->pBuffers[idx].cbBuffer = output_token.length; + memcpy( output->pBuffers[idx].pvBuffer, output_token.value, output_token.length ); + pgss_release_buffer( &minor_status, &output_token ); + + ctxthandle_gss_to_sspi( ctxt_handle, new_context ); + if (context_attr) *context_attr = flags_gss_to_asc_ret( ret_flags ); + expirytime_gss_to_sspi( expiry_time, ts_expiry ); + } + + /* we do support user mode SSP/AP functions */ + *mapped_context = TRUE; + /* FIXME: initialize context_data */ + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx %lx 0x%08x %u %p %p %p %p %p %p %p)\n", credential, context, context_req, + target_data_rep, input, new_context, output, context_attr, ts_expiry, + mapped_context, context_data ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) { @@ -527,7 +609,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* GetCredentials */ NULL, /* DeleteCredentials */ kerberos_SpInitLsaModeContext, - NULL, /* AcceptLsaModeContext */ + kerberos_SpAcceptLsaModeContext, NULL, /* DeleteContext */ NULL, /* ApplyControlToken */ NULL, /* GetUserInfo */ -- 2.15.1

2 1

[PATCH 08/20] kerberos: Implement SpInitLsaModeContext.
by Dmitry Timoshkov 24 Jan '18

24 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 141 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 140 insertions(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index a314f7030c..204a0d8965 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -187,7 +187,10 @@ static void *libgssapi_krb5_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p##f MAKE_FUNCPTR(gss_acquire_cred); +MAKE_FUNCPTR(gss_delete_sec_context); MAKE_FUNCPTR(gss_import_name); +MAKE_FUNCPTR(gss_init_sec_context); +MAKE_FUNCPTR(gss_release_buffer); MAKE_FUNCPTR(gss_release_name); #undef MAKE_FUNCPTR @@ -207,7 +210,10 @@ static BOOL load_gssapi_krb5(void) } LOAD_FUNCPTR(gss_acquire_cred) + LOAD_FUNCPTR(gss_delete_sec_context) LOAD_FUNCPTR(gss_import_name) + LOAD_FUNCPTR(gss_init_sec_context) + LOAD_FUNCPTR(gss_release_buffer) LOAD_FUNCPTR(gss_release_name) #undef LOAD_FUNCPTR @@ -225,11 +231,28 @@ static void unload_gssapi_krb5(void) libgssapi_krb5_handle = NULL; } +static inline gss_cred_id_t credhandle_sspi_to_gss( LSA_SEC_HANDLE cred ) +{ + if (!cred) return GSS_C_NO_CREDENTIAL; + return (gss_cred_id_t)cred; +} + static inline void credhandle_gss_to_sspi( gss_cred_id_t handle, LSA_SEC_HANDLE *cred ) { *cred = (LSA_SEC_HANDLE)handle; } +static inline gss_ctx_id_t ctxthandle_sspi_to_gss( LSA_SEC_HANDLE ctxt ) +{ + if (!ctxt) return GSS_C_NO_CONTEXT; + return (gss_ctx_id_t)ctxt; +} + +static inline void ctxthandle_gss_to_sspi( gss_ctx_id_t handle, LSA_SEC_HANDLE *ctxt ) +{ + *ctxt = (LSA_SEC_HANDLE)handle; +} + static SECURITY_STATUS status_gss_to_sspi( OM_uint32 status ) { switch (status) @@ -286,6 +309,43 @@ static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_nam HeapFree( GetProcessHeap(), 0, buf.value ); return status_gss_to_sspi( ret ); } + +static ULONG flags_isc_req_to_gss( ULONG flags ) +{ + ULONG ret = GSS_C_DCE_STYLE; + if (flags & ISC_REQ_DELEGATE) ret |= GSS_C_DELEG_FLAG; + if (flags & ISC_REQ_MUTUAL_AUTH) ret |= GSS_C_MUTUAL_FLAG; + if (flags & ISC_REQ_REPLAY_DETECT) ret |= GSS_C_REPLAY_FLAG; + if (flags & ISC_REQ_SEQUENCE_DETECT) ret |= GSS_C_SEQUENCE_FLAG; + if (flags & ISC_REQ_CONFIDENTIALITY) ret |= GSS_C_CONF_FLAG; + if (flags & ISC_REQ_INTEGRITY) ret |= GSS_C_INTEG_FLAG; + if (flags & ISC_REQ_NULL_SESSION) ret |= GSS_C_ANON_FLAG; + return ret; +} + +static ULONG flags_gss_to_isc_ret( ULONG flags ) +{ + ULONG ret = 0; + if (flags & GSS_C_DELEG_FLAG) ret |= ISC_RET_DELEGATE; + if (flags & GSS_C_MUTUAL_FLAG) ret |= ISC_RET_MUTUAL_AUTH; + if (flags & GSS_C_REPLAY_FLAG) ret |= ISC_RET_REPLAY_DETECT; + if (flags & GSS_C_SEQUENCE_FLAG) ret |= ISC_RET_SEQUENCE_DETECT; + if (flags & GSS_C_CONF_FLAG) ret |= ISC_RET_CONFIDENTIALITY; + if (flags & GSS_C_INTEG_FLAG) ret |= ISC_RET_INTEGRITY; + if (flags & GSS_C_ANON_FLAG) ret |= ISC_RET_NULL_SESSION; + return ret; +} + +static int get_buffer_index( SecBufferDesc *desc, DWORD type ) +{ + UINT i; + if (!desc) return -1; + for (i = 0; i < desc->cBuffers; i++) + { + if (desc->pBuffers[i].BufferType == type) return i; + } + return -1; +} #endif /* SONAME_LIBGSSAPI_KRB5 */ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( @@ -344,6 +404,85 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( #endif } +static NTSTATUS NTAPI kerberos_SpInitLsaModeContext( LSA_SEC_HANDLE credential, LSA_SEC_HANDLE context, + UNICODE_STRING *target_name, ULONG context_req, ULONG target_data_rep, SecBufferDesc *input, + LSA_SEC_HANDLE *new_context, SecBufferDesc *output, ULONG *context_attr, TimeStamp *ts_expiry, + BOOLEAN *mapped_context, SecBuffer *context_data ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + static const ULONG supported = ISC_REQ_CONFIDENTIALITY | ISC_REQ_INTEGRITY | ISC_REQ_SEQUENCE_DETECT | + ISC_REQ_REPLAY_DETECT | ISC_REQ_MUTUAL_AUTH; + OM_uint32 ret, minor_status, ret_flags, expiry_time, req_flags = flags_isc_req_to_gss( context_req ); + gss_cred_id_t cred_handle; + gss_ctx_id_t ctxt_handle; + gss_buffer_desc input_token, output_token; + gss_name_t target = GSS_C_NO_NAME; + int idx; + + TRACE( "(%lx %lx %s 0x%08x %u %p %p %p %p %p %p %p)\n", credential, context, debugstr_us(target_name), + context_req, target_data_rep, input, new_context, output, context_attr, ts_expiry, + mapped_context, context_data ); + if (context_req & ~supported) + { + FIXME( "flags 0x%08x not supported\n", context_req & ~supported ); + return SEC_E_UNSUPPORTED_FUNCTION; + } + + if (!context && !input && !credential) return SEC_E_INVALID_HANDLE; + cred_handle = credhandle_sspi_to_gss( credential ); + ctxt_handle = ctxthandle_sspi_to_gss( context ); + + if (!input) input_token.length = 0; + else + { + if ((idx = get_buffer_index( input, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + input_token.length = input->pBuffers[idx].cbBuffer; + input_token.value = input->pBuffers[idx].pvBuffer; + } + + if ((idx = get_buffer_index( output, SECBUFFER_TOKEN )) == -1) return SEC_E_INVALID_TOKEN; + output_token.length = 0; + output_token.value = NULL; + + if (target_name && ((ret = name_sspi_to_gss( target_name, &target )) != SEC_E_OK)) return ret; + + ret = pgss_init_sec_context( &minor_status, cred_handle, &ctxt_handle, target, GSS_C_NO_OID, req_flags, 0, + GSS_C_NO_CHANNEL_BINDINGS, &input_token, NULL, &output_token, &ret_flags, + &expiry_time ); + TRACE( "gss_init_sec_context returned %08x minor status %08x ret_flags %08x\n", ret, minor_status, ret_flags ); + if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) + { + if (output_token.length > output->pBuffers[idx].cbBuffer) /* FIXME: check if larger buffer exists */ + { + TRACE( "buffer too small %u > %u\n", output_token.length, output->pBuffers[idx].cbBuffer ); + pgss_release_buffer( &minor_status, &output_token ); + pgss_delete_sec_context( &minor_status, &ctxt_handle, GSS_C_NO_BUFFER ); + return SEC_E_INCOMPLETE_MESSAGE; + } + output->pBuffers[idx].cbBuffer = output_token.length; + memcpy( output->pBuffers[idx].pvBuffer, output_token.value, output_token.length ); + pgss_release_buffer( &minor_status, &output_token ); + + ctxthandle_gss_to_sspi( ctxt_handle, new_context ); + if (context_attr) *context_attr = flags_gss_to_isc_ret( ret_flags ); + expirytime_gss_to_sspi( expiry_time, ts_expiry ); + } + + if (target != GSS_C_NO_NAME) pgss_release_name( &minor_status, &target ); + + /* we do support user mode SSP/AP functions */ + *mapped_context = TRUE; + /* FIXME: initialize context_data */ + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%lx %lx %s 0x%08x %u %p %p %p %p %p %p %p)\n", credential, context, debugstr_us(target_name), + context_req, target_data_rep, input, new_context, output, context_attr, ts_expiry, + mapped_context, context_data ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) { @@ -387,7 +526,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* SaveCredentials */ NULL, /* GetCredentials */ NULL, /* DeleteCredentials */ - NULL, /* InitLsaModeContext */ + kerberos_SpInitLsaModeContext, NULL, /* AcceptLsaModeContext */ NULL, /* DeleteContext */ NULL, /* ApplyControlToken */ -- 2.15.1

2 1

[PATCH 07/20] kerberos: Implement SpAcquireCredentialsHandle.
by Dmitry Timoshkov 24 Jan '18

24 Jan '18

From: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- configure | 195 ++++++++++++++++++++++++++++++++++------- configure.ac | 18 ++++ dlls/kerberos/Makefile.in | 2 +- dlls/kerberos/krb5_ap.c | 216 ++++++++++++++++++++++++++++++++++++++++++---- include/config.h.in | 9 ++ 5 files changed, 394 insertions(+), 46 deletions(-) diff --git a/configure.ac b/configure.ac index 9aa32280f4..b04d210410 100644 --- a/configure.ac +++ b/configure.ac @@ -54,6 +54,7 @@ AC_ARG_WITH(glu, AS_HELP_STRING([--without-glu],[do not use the GLU librar AC_ARG_WITH(gnutls, AS_HELP_STRING([--without-gnutls],[do not use GnuTLS (schannel support)])) AC_ARG_WITH(gsm, AS_HELP_STRING([--without-gsm],[do not use libgsm (GSM 06.10 codec support)]), [if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi]) +AC_ARG_WITH(gssapi, AS_HELP_STRING([--without-gssapi],[do not use GSSAPI (Kerberos SSP support)])) AC_ARG_WITH(gstreamer, AS_HELP_STRING([--without-gstreamer],[do not use GStreamer (codecs support)])) AC_ARG_WITH(hal, AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)])) AC_ARG_WITH(jpeg, AS_HELP_STRING([--without-jpeg],[do not use JPEG])) @@ -1665,6 +1666,23 @@ fi WINE_NOTICE_WITH(krb5,[test "x$ac_cv_lib_soname_krb5" = "x"], [libkrb5 ${notice_platform}development files not found, Kerberos won't be supported.]) +dnl **** Check for gssapi **** +if test "x$with_gssapi" != "xno" +then + WINE_PACKAGE_FLAGS(GSSAPI,[krb5-gssapi],, + [`${KRB5_CONFIG:-krb5-config} --cflags gssapi 2>/dev/null`], + [`${KRB5_CONFIG:-krb5-config} --libs gssapi 2>/dev/null`], + [AC_CHECK_HEADERS([gssapi/gssapi.h gssapi/gssapi_ext.h]) + if test "$ac_cv_header_gssapi_gssapi_h" = "yes" -a "$ac_cv_header_gssapi_gssapi_ext_h" = "yes" + then + WINE_CHECK_SONAME(gssapi_krb5, gss_init_sec_context,,[GSSAPI_LIBS=""],[$GSSAPI_LIBS]) + else + GSSAPI_CFLAGS="" + fi]) +fi +WINE_WARNING_WITH(gssapi,[test "x$ac_cv_lib_soname_gssapi_krb5" = "x"], + [libgssapi_krb5 ${notice_platform}development files not found (or too old), no Kerberos SSP support.]) + dnl **** Check for libjpeg **** if test "x$with_jpeg" != "xno" then diff --git a/dlls/kerberos/Makefile.in b/dlls/kerberos/Makefile.in index 253e944716..f67ba567fb 100644 --- a/dlls/kerberos/Makefile.in +++ b/dlls/kerberos/Makefile.in @@ -1,5 +1,5 @@ MODULE = kerberos.dll -EXTRAINCL = $(KRB5_CFLAGS) +EXTRAINCL = $(KRB5_CFLAGS) $(GSSAPI_CFLAGS) C_SRCS = \ krb5_ap.c diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 72c7027428..a314f7030c 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1,5 +1,7 @@ /* * Copyright 2017 Dmitry Timoshkov + * Copyright 2008 Robert Shearman for CodeWeavers + * Copyright 2017 Hans Leidekker for CodeWeavers * * Kerberos5 Authentication Package * @@ -25,6 +27,10 @@ #ifdef HAVE_KRB5_KRB5_H #include <krb5/krb5.h> #endif +#ifdef SONAME_LIBGSSAPI_KRB5 +# include <gssapi/gssapi.h> +# include <gssapi/gssapi_ext.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -106,6 +112,12 @@ static void load_krb5(void) #endif /* SONAME_LIBKRB5 */ +static const char *debugstr_us( const UNICODE_STRING *us ) +{ + if (!us) return "<null>"; + return debugstr_wn( us->Buffer, us->Length / sizeof(WCHAR) ); +} + static NTSTATUS NTAPI kerberos_LsaApInitializePackage(ULONG package_id, PLSA_DISPATCH_TABLE dispatch, PLSA_STRING database, PLSA_STRING confidentiality, PLSA_STRING *package_name) { @@ -144,21 +156,6 @@ static NTSTATUS NTAPI kerberos_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST req return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, - LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) -{ - FIXME("%lu,%p,%p: stub\n", package_id, params, lsa_function_table); - - return STATUS_SUCCESS; -} - -static NTSTATUS NTAPI kerberos_SpShutdown(void) -{ - TRACE("\n"); - - return STATUS_SUCCESS; -} - static NTSTATUS NTAPI kerberos_SpGetInfo(SecPkgInfoW *info) { static WCHAR kerberos_name_W[] = MICROSOFT_KERBEROS_NAME_W; @@ -183,6 +180,193 @@ static NTSTATUS NTAPI kerberos_SpGetInfo(SecPkgInfoW *info) return STATUS_SUCCESS; } +#ifdef SONAME_LIBGSSAPI_KRB5 + +WINE_DECLARE_DEBUG_CHANNEL(winediag); +static void *libgssapi_krb5_handle; + +#define MAKE_FUNCPTR(f) static typeof(f) * p##f +MAKE_FUNCPTR(gss_acquire_cred); +MAKE_FUNCPTR(gss_import_name); +MAKE_FUNCPTR(gss_release_name); +#undef MAKE_FUNCPTR + +static BOOL load_gssapi_krb5(void) +{ + if (!(libgssapi_krb5_handle = wine_dlopen( SONAME_LIBGSSAPI_KRB5, RTLD_NOW, NULL, 0 ))) + { + ERR_(winediag)( "Failed to load libgssapi_krb5, Kerberos SSP support will not be available.\n" ); + return FALSE; + } + +#define LOAD_FUNCPTR(f) \ + if (!(p##f = wine_dlsym( libgssapi_krb5_handle, #f, NULL, 0 ))) \ + { \ + ERR( "Failed to load %s\n", #f ); \ + goto fail; \ + } + + LOAD_FUNCPTR(gss_acquire_cred) + LOAD_FUNCPTR(gss_import_name) + LOAD_FUNCPTR(gss_release_name) +#undef LOAD_FUNCPTR + + return TRUE; + +fail: + wine_dlclose( libgssapi_krb5_handle, NULL, 0 ); + libgssapi_krb5_handle = NULL; + return FALSE; +} + +static void unload_gssapi_krb5(void) +{ + wine_dlclose( libgssapi_krb5_handle, NULL, 0 ); + libgssapi_krb5_handle = NULL; +} + +static inline void credhandle_gss_to_sspi( gss_cred_id_t handle, LSA_SEC_HANDLE *cred ) +{ + *cred = (LSA_SEC_HANDLE)handle; +} + +static SECURITY_STATUS status_gss_to_sspi( OM_uint32 status ) +{ + switch (status) + { + case GSS_S_COMPLETE: return SEC_E_OK; + case GSS_S_BAD_MECH: return SEC_E_SECPKG_NOT_FOUND; + case GSS_S_BAD_SIG: return SEC_E_MESSAGE_ALTERED; + case GSS_S_NO_CRED: return SEC_E_NO_CREDENTIALS; + case GSS_S_NO_CONTEXT: return SEC_E_INVALID_HANDLE; + case GSS_S_DEFECTIVE_TOKEN: return SEC_E_INVALID_TOKEN; + case GSS_S_DEFECTIVE_CREDENTIAL: return SEC_E_NO_CREDENTIALS; + case GSS_S_CREDENTIALS_EXPIRED: return SEC_E_CONTEXT_EXPIRED; + case GSS_S_CONTEXT_EXPIRED: return SEC_E_CONTEXT_EXPIRED; + case GSS_S_BAD_QOP: return SEC_E_QOP_NOT_SUPPORTED; + case GSS_S_CONTINUE_NEEDED: return SEC_I_CONTINUE_NEEDED; + case GSS_S_DUPLICATE_TOKEN: return SEC_E_INVALID_TOKEN; + case GSS_S_OLD_TOKEN: return SEC_E_INVALID_TOKEN; + case GSS_S_UNSEQ_TOKEN: return SEC_E_OUT_OF_SEQUENCE; + case GSS_S_GAP_TOKEN: return SEC_E_OUT_OF_SEQUENCE; + + default: + FIXME( "couldn't convert status 0x%08x to SECURITY_STATUS\n", status ); + return SEC_E_INTERNAL_ERROR; + } +} + +static void expirytime_gss_to_sspi( OM_uint32 expirytime, TimeStamp *timestamp ) +{ + SYSTEMTIME time; + FILETIME filetime; + ULARGE_INTEGER tmp; + + GetLocalTime( &time ); + SystemTimeToFileTime( &time, &filetime ); + tmp.QuadPart = ((ULONGLONG)filetime.dwLowDateTime | (ULONGLONG)filetime.dwHighDateTime << 32) + expirytime; + timestamp->LowPart = tmp.QuadPart; + timestamp->HighPart = tmp.QuadPart >> 32; +} + +static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_name_t *name ) +{ + OM_uint32 ret, minor_status; + gss_OID type = GSS_C_NO_OID; /* FIXME: detect the appropriate value for this ourselves? */ + gss_buffer_desc buf; + + buf.length = WideCharToMultiByte( CP_UNIXCP, 0, name_str->Buffer, name_str->Length / sizeof(WCHAR), NULL, 0, NULL, NULL ) + 1; + if (!(buf.value = HeapAlloc( GetProcessHeap(), 0, buf.length ))) return SEC_E_INSUFFICIENT_MEMORY; + WideCharToMultiByte( CP_UNIXCP, 0, name_str->Buffer, name_str->Length / sizeof(WCHAR), buf.value, buf.length, NULL, NULL ); + buf.length--; + + ret = pgss_import_name( &minor_status, &buf, type, name ); + TRACE( "gss_import_name returned %08x minor status %08x\n", ret, minor_status ); + + HeapFree( GetProcessHeap(), 0, buf.value ); + return status_gss_to_sspi( ret ); +} +#endif /* SONAME_LIBGSSAPI_KRB5 */ + +static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( + UNICODE_STRING *principal_us, ULONG credential_use, LUID *logon_id, void *auth_data, + void *get_key_fn, void *get_key_arg, LSA_SEC_HANDLE *credential, TimeStamp *ts_expiry ) +{ +#ifdef SONAME_LIBGSSAPI_KRB5 + OM_uint32 ret, minor_status, expiry_time; + gss_name_t principal = GSS_C_NO_NAME; + gss_cred_usage_t cred_usage; + gss_cred_id_t cred_handle; + + TRACE( "(%s 0x%08x %p %p %p %p %p %p)\n", debugstr_us(principal_us), credential_use, + logon_id, auth_data, get_key_fn, get_key_arg, credential, ts_expiry ); + + if (auth_data) + { + FIXME( "specific credentials not supported\n" ); + return SEC_E_UNKNOWN_CREDENTIALS; + } + + switch (credential_use) + { + case SECPKG_CRED_INBOUND: + cred_usage = GSS_C_ACCEPT; + break; + case SECPKG_CRED_OUTBOUND: + cred_usage = GSS_C_INITIATE; + break; + case SECPKG_CRED_BOTH: + cred_usage = GSS_C_BOTH; + break; + default: + return SEC_E_UNKNOWN_CREDENTIALS; + } + + if (principal_us && ((ret = name_sspi_to_gss( principal_us, &principal )) != SEC_E_OK)) return ret; + + ret = pgss_acquire_cred( &minor_status, principal, GSS_C_INDEFINITE, GSS_C_NULL_OID_SET, cred_usage, + &cred_handle, NULL, &expiry_time ); + TRACE( "gss_acquire_cred returned %08x minor status %08x\n", ret, minor_status ); + if (ret == GSS_S_COMPLETE || ret == GSS_S_CONTINUE_NEEDED) + { + credhandle_gss_to_sspi( cred_handle, credential ); + expirytime_gss_to_sspi( expiry_time, ts_expiry ); + } + + if (principal != GSS_C_NO_NAME) pgss_release_name( &minor_status, &principal ); + + return status_gss_to_sspi( ret ); +#else + FIXME( "(%s 0x%08x %p %p %p %p %p %p)\n", debugstr_us(principal_us), credential_use, + logon_id, auth_data, get_key_fn, get_key_arg, credential, ts_expiry ); + FIXME( "Wine was built without Kerberos support.\n" ); + return SEC_E_UNSUPPORTED_FUNCTION; +#endif +} + +static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, + LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) +{ + TRACE("%lu,%p,%p\n", package_id, params, lsa_function_table); + +#ifdef SONAME_LIBGSSAPI_KRB5 + if (load_gssapi_krb5()) return STATUS_SUCCESS; +#endif + + return STATUS_UNSUCCESSFUL; +} + +static NTSTATUS NTAPI kerberos_SpShutdown(void) +{ + TRACE("\n"); + +#ifdef SONAME_LIBGSSAPI_KRB5 + unload_gssapi_krb5(); +#endif + + return STATUS_SUCCESS; +} + static SECPKG_FUNCTION_TABLE kerberos_table = { kerberos_LsaApInitializePackage, /* InitializePackage */ @@ -197,7 +381,7 @@ static SECPKG_FUNCTION_TABLE kerberos_table = kerberos_SpShutdown, kerberos_SpGetInfo, NULL, /* AcceptCredentials */ - NULL, /* SpAcquireCredentialsHandle */ + kerberos_SpAcquireCredentialsHandle, NULL, /* SpQueryCredentialsAttributes */ NULL, /* FreeCredentialsHandle */ NULL, /* SaveCredentials */ -- 2.15.1

2 7

[PATCH 6/6] webervices/tests: Add tests for out of range string IDs.
by Hans Leidekker 24 Jan '18

24 Jan '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/tests/reader.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 9879fac4cf..7064cf0f82 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -5612,6 +5612,10 @@ static void test_dictionary(void) {0x40,0x01,'t',0x0a,0x0a,0x01}; static const char test8[] = {0x40,0x01,'t',0x0b,0x01,'p',0x0a,0x01}; + static const char test9[] = + {0x42,0x0c,0x01}; + static const char test10[] = + {0x42,0x04,0xab,0x0c,0x01}; const WS_XML_NODE *node; const WS_XML_ELEMENT_NODE *elem; const WS_XML_ATTRIBUTE *attr; @@ -5940,6 +5944,23 @@ static void test_dictionary(void) ok( hr == S_OK, "got %08x\n", hr ); ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); + /* element name string id out of range */ + hr = set_input_bin( reader, test9, sizeof(test9), &dict ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsReadNode( reader, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + /* text string id out of range */ + hr = set_input_bin( reader, test10, sizeof(test10), &dict ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + hr = WsReadNode( reader, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + hr = WsGetDictionary( 0, NULL, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); -- 2.11.0

1 0

[PATCH 5/6] webservices: Also set localname and value for xmlns attributes.
by Hans Leidekker 24 Jan '18

24 Jan '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 39 +++++++++++ dlls/webservices/tests/reader.c | 142 ++++++++++++++++++++++++++++++++++++---- 2 files changed, 169 insertions(+), 12 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index bdf950ec29..4c121d9f4a 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1706,8 +1706,15 @@ static inline BOOL is_attribute_type( unsigned char type ) return (type >= RECORD_SHORT_ATTRIBUTE && type <= RECORD_PREFIX_ATTRIBUTE_Z); } +static WS_XML_STRING *get_xmlns_localname( struct reader *reader, const WS_XML_STRING *prefix ) +{ + if (!get_namespace( reader, prefix )) return alloc_xml_string( NULL, 0 ); + return alloc_xml_string( prefix->bytes, prefix->length ); +} + static HRESULT read_attribute_bin( struct reader *reader, WS_XML_ATTRIBUTE **ret ) { + WS_XML_UTF8_TEXT *utf8; WS_XML_ATTRIBUTE *attr; unsigned char type = 0; HRESULT hr; @@ -1780,6 +1787,11 @@ static HRESULT read_attribute_bin( struct reader *reader, WS_XML_ATTRIBUTE **ret hr = E_OUTOFMEMORY; goto error; } + if (!(attr->localName = get_xmlns_localname( reader, attr->prefix ))) + { + hr = E_OUTOFMEMORY; + goto error; + } if ((hr = read_string( reader, &attr->ns )) != S_OK) goto error; if ((hr = bind_prefix( reader, attr->prefix, attr->ns )) != S_OK) goto error; attr->isXmlNs = 1; @@ -1787,6 +1799,11 @@ static HRESULT read_attribute_bin( struct reader *reader, WS_XML_ATTRIBUTE **ret case RECORD_XMLNS_ATTRIBUTE: if ((hr = read_string( reader, &attr->prefix )) != S_OK) goto error; + if (!(attr->localName = get_xmlns_localname( reader, attr->prefix ))) + { + hr = E_OUTOFMEMORY; + goto error; + } if ((hr = read_string( reader, &attr->ns )) != S_OK) goto error; if ((hr = bind_prefix( reader, attr->prefix, attr->ns )) != S_OK) goto error; attr->isXmlNs = 1; @@ -1798,14 +1815,36 @@ static HRESULT read_attribute_bin( struct reader *reader, WS_XML_ATTRIBUTE **ret hr = E_OUTOFMEMORY; goto error; } + if (!(attr->localName = get_xmlns_localname( reader, attr->prefix ))) + { + hr = E_OUTOFMEMORY; + goto error; + } if ((hr = read_dict_string( reader, &attr->ns )) != S_OK) goto error; + if (!(utf8 = alloc_utf8_text( NULL, 0 ))) + { + hr = E_OUTOFMEMORY; + goto error; + } + attr->value = &utf8->text; if ((hr = bind_prefix( reader, attr->prefix, attr->ns )) != S_OK) goto error; attr->isXmlNs = 1; break; case RECORD_DICTIONARY_XMLNS_ATTRIBUTE: if ((hr = read_string( reader, &attr->prefix )) != S_OK) goto error; + if (!(attr->localName = get_xmlns_localname( reader, attr->prefix ))) + { + hr = E_OUTOFMEMORY; + goto error; + } if ((hr = read_dict_string( reader, &attr->ns )) != S_OK) goto error; + if (!(utf8 = alloc_utf8_text( NULL, 0 ))) + { + hr = E_OUTOFMEMORY; + goto error; + } + attr->value = &utf8->text; if ((hr = bind_prefix( reader, attr->prefix, attr->ns )) != S_OK) goto error; attr->isXmlNs = 1; break; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index fce34ed037..9879fac4cf 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -4873,6 +4873,10 @@ static void test_binary_encoding(void) {0x40,0x01,'t',0xb1,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; static const char test29[] = {0x40,0x01,'t',0xb3,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; + static const char test30[] = + {0x40,0x01,'t',0x08,0x02,'n','s',0x01}; + static const char test31[] = + {0x40,0x01,'t',0x09,0x01,'p',0x02,'n','s',0x01}; static const char test100[] = {0x40,0x01,'t',0x04,0x01,'t',0x98,0x00,0x01}; static const char test101[] = @@ -5285,6 +5289,58 @@ static void test_binary_encoding(void) uint64_text = (WS_XML_UINT64_TEXT *)text_node->text; ok( uint64_text->value == 1, "got %s\n", wine_dbgstr_longlong(uint64_text->value) ); + /* short xmlns attribute */ + hr = set_input_bin( reader, test30, sizeof(test30), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + elem = (const WS_XML_ELEMENT_NODE *)node; + ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); + ok( elem->prefix->bytes == NULL, "bytes set\n" ); + ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); + ok( elem->ns->length == 2, "got %u\n", elem->ns->length ); + ok( !memcmp( elem->ns->bytes, "ns", 2 ), "wrong namespace\n" ); + ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( !elem->isEmpty, "empty\n" ); + attr = elem->attributes[0]; + ok( !attr->singleQuote, "single quote\n" ); + ok( attr->isXmlNs, "not xmlns\n" ); + ok( !attr->prefix->length, "got %u\n", attr->prefix->length ); + ok( attr->prefix->bytes == NULL, "bytes set\n" ); + ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); + + /* xmlns attribute */ + hr = set_input_bin( reader, test31, sizeof(test31), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + elem = (const WS_XML_ELEMENT_NODE *)node; + ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); + ok( elem->prefix->bytes == NULL, "bytes set\n" ); + ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); + ok( !elem->ns->length, "got %u\n", elem->ns->length ); + ok( elem->ns->bytes != NULL, "bytes not set\n" ); + ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( !elem->isEmpty, "empty\n" ); + attr = elem->attributes[0]; + ok( !attr->singleQuote, "single quote\n" ); + ok( attr->isXmlNs, "not xmlns\n" ); + ok( attr->prefix->length == 1, "got %u\n", attr->prefix->length ); + ok( !memcmp( attr->prefix->bytes, "p", 1 ), "wrong prefix\n" ); + ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); + /* short attribute */ hr = set_input_bin( reader, test100, sizeof(test100), NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -5540,18 +5596,22 @@ static void test_dictionary(void) { static const GUID dict_static = {0xf93578f8,0x5852,0x4eb7,{0xa6,0xfc,0xe7,0x2b,0xb7,0x1d,0xb6,0x22}}; - static const char res[] = + static const char test[] = {0x42,0x04,0x01}; - static const char res2[] = + static const char test2[] = {0x53,0x06,0x0b,0x01,'p',0x0a,0x01}; - static const char res3[] = + static const char test3[] = {0x43,0x02,'p','2',0x06,0x0b,0x02,'p','2',0x0a,0x01}; - static const char res4[] = + static const char test4[] = {0x42,0x06,0x06,0x06,0x98,0x00,0x01}; - static const char res5[] = + static const char test5[] = {0x42,0x06,0x1b,0x06,0x98,0x00,0x0b,0x01,'p',0x0a,0x01}; - static const char res6[] = + static const char test6[] = {0x42,0x06,0x07,0x02,'p','2',0x06,0x98,0x00,0x0b,0x02,'p','2',0x0a,0x01}; + static const char test7[] = + {0x40,0x01,'t',0x0a,0x0a,0x01}; + static const char test8[] = + {0x40,0x01,'t',0x0b,0x01,'p',0x0a,0x01}; const WS_XML_NODE *node; const WS_XML_ELEMENT_NODE *elem; const WS_XML_ATTRIBUTE *attr; @@ -5595,7 +5655,7 @@ static void test_dictionary(void) dict.isConst = TRUE; /* short dictionary element */ - hr = set_input_bin( reader, res, sizeof(res), &dict ); + hr = set_input_bin( reader, test, sizeof(test), &dict ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsReadNode( reader, NULL ); @@ -5622,7 +5682,7 @@ static void test_dictionary(void) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* single character prefix dictionary element */ - hr = set_input_bin( reader, res2, sizeof(res2), &dict ); + hr = set_input_bin( reader, test2, sizeof(test2), &dict ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsReadNode( reader, NULL ); @@ -5656,7 +5716,7 @@ static void test_dictionary(void) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* dictionary element */ - hr = set_input_bin( reader, res3, sizeof(res3), &dict ); + hr = set_input_bin( reader, test3, sizeof(test3), &dict ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsReadNode( reader, NULL ); @@ -5690,7 +5750,7 @@ static void test_dictionary(void) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* short dictionary attribute */ - hr = set_input_bin( reader, res4, sizeof(res4), &dict ); + hr = set_input_bin( reader, test4, sizeof(test4), &dict ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsReadNode( reader, NULL ); @@ -5729,7 +5789,7 @@ static void test_dictionary(void) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* single character prefix dictionary attribute */ - hr = set_input_bin( reader, res5, sizeof(res5), &dict ); + hr = set_input_bin( reader, test5, sizeof(test5), &dict ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsReadNode( reader, NULL ); @@ -5776,7 +5836,7 @@ static void test_dictionary(void) ok( node->nodeType == WS_XML_NODE_TYPE_END_ELEMENT, "got %u\n", node->nodeType ); /* dictionary attribute */ - hr = set_input_bin( reader, res6, sizeof(res6), &dict ); + hr = set_input_bin( reader, test6, sizeof(test6), &dict ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsReadNode( reader, NULL ); @@ -5816,6 +5876,64 @@ static void test_dictionary(void) ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); + /* short dictionary xmlns attribute */ + hr = set_input_bin( reader, test7, sizeof(test7), &dict ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + elem = (const WS_XML_ELEMENT_NODE *)node; + ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); + ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); + ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( !elem->isEmpty, "empty\n" ); + attr = elem->attributes[0]; + ok( !attr->singleQuote, "single quote\n" ); + ok( attr->isXmlNs, "not xmlns\n" ); + ok( !attr->prefix->length, "got %u\n", attr->prefix->length ); + ok( attr->prefix->bytes == NULL, "bytes set\n" ); + ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); + ok( attr->ns->dictionary == &dict, "unexpected dict\n" ); + ok( attr->ns->id == 5, "unexpected id %08x\n", attr->ns->id ); + utf8 = (const WS_XML_UTF8_TEXT *)attr->value; + ok( utf8->text.textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", utf8->text.textType ); + ok( !utf8->value.length, "got %u\n", utf8->value.length ); + todo_wine ok( utf8->value.bytes != NULL, "bytes not set\n" ); + + /* dictionary xmlns attribute */ + hr = set_input_bin( reader, test8, sizeof(test8), &dict ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsReadNode( reader, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetReaderNode( reader, &node, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( node->nodeType == WS_XML_NODE_TYPE_ELEMENT, "got %u\n", node->nodeType ); + elem = (const WS_XML_ELEMENT_NODE *)node; + ok( !elem->prefix->length, "got %u\n", elem->prefix->length ); + ok( elem->localName->length == 1, "got %u\n", elem->localName->length ); + ok( !memcmp( elem->localName->bytes, "t", 1 ), "wrong name\n" ); + ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( !elem->isEmpty, "empty\n" ); + attr = elem->attributes[0]; + ok( !attr->singleQuote, "single quote\n" ); + ok( attr->isXmlNs, "not xmlns\n" ); + ok( attr->prefix->length == 1, "got %u\n", attr->prefix->length ); + ok( !memcmp( attr->prefix->bytes, "p", 1 ), "wrong prefix\n" ); + ok( attr->ns->length == 2, "got %u\n", attr->ns->length ); + ok( !memcmp( attr->ns->bytes, "ns", 2 ), "wrong namespace\n" ); + ok( attr->ns->dictionary == &dict, "unexpected dict\n" ); + ok( attr->ns->id == 5, "unexpected id %08x\n", attr->ns->id ); + utf8 = (const WS_XML_UTF8_TEXT *)attr->value; + ok( utf8->text.textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", utf8->text.textType ); + ok( !utf8->value.length, "got %u\n", utf8->value.length ); + todo_wine ok( utf8->value.bytes != NULL, "bytes not set\n" ); + hr = WsReadNode( reader, NULL ); ok( hr == S_OK, "got %08x\n", hr ); hr = WsGetReaderNode( reader, &node, NULL ); -- 2.11.0

1 0

[PATCH 4/6] webservices: Simplify write_dict_string.
by Hans Leidekker 24 Jan '18

24 Jan '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/writer.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index b7dab3a930..75cf7b4e64 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -648,10 +648,8 @@ static HRESULT write_string( struct writer *writer, const BYTE *bytes, ULONG len static HRESULT write_dict_string( struct writer *writer, ULONG id ) { - HRESULT hr; if (id > 0x7fffffff) return E_INVALIDARG; - if ((hr = write_int31( writer, id )) != S_OK) return hr; - return S_OK; + return write_int31( writer, id ); } static enum record_type get_attr_text_record_type( const WS_XML_TEXT *text, BOOL use_dict ) -- 2.11.0

1 0

[PATCH 3/6] webservices: Don't write a colon for namespace attributes with empty prefix.
by Hans Leidekker 24 Jan '18

24 Jan '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/writer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 08b341034e..b7dab3a930 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1482,11 +1482,11 @@ static HRESULT write_namespace_attribute_text( struct writer *writer, const WS_X /* ' xmlns:prefix="namespace"' */ size = attr->ns->length + 9 /* ' xmlns=""' */; - if (attr->prefix) size += attr->prefix->length + 1 /* ':' */; + if (attr->prefix && attr->prefix->length) size += attr->prefix->length + 1 /* ':' */; if ((hr = write_grow_buffer( writer, size )) != S_OK) return hr; write_bytes( writer, (const BYTE *)" xmlns", 6 ); - if (attr->prefix) + if (attr->prefix && attr->prefix->length) { write_char( writer, ':' ); write_bytes( writer, attr->prefix->bytes, attr->prefix->length ); -- 2.11.0

1 0

[PATCH 2/6] webservices: Take the output encoding into account in WsCopyNode.
by Hans Leidekker 24 Jan '18

24 Jan '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 95 +++++++++++++++++++++------------- dlls/webservices/webservices_private.h | 5 +- dlls/webservices/writer.c | 8 +-- 3 files changed, 65 insertions(+), 43 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 3e5434cf64..bdf950ec29 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -143,29 +143,36 @@ void destroy_nodes( struct node *node ) free_node( node ); } -static WS_XML_ATTRIBUTE *dup_attribute( const WS_XML_ATTRIBUTE *src ) +static WS_XML_ATTRIBUTE *dup_attribute( const WS_XML_ATTRIBUTE *src, WS_XML_WRITER_ENCODING_TYPE enc ) { WS_XML_ATTRIBUTE *dst; - const WS_XML_STRING *prefix = src->prefix; - const WS_XML_STRING *localname = src->localName; - const WS_XML_STRING *ns = src->localName; - const WS_XML_TEXT *text = src->value; + HRESULT hr; - if (!(dst = heap_alloc( sizeof(*dst) ))) return NULL; + if (!(dst = heap_alloc_zero( sizeof(*dst) ))) return NULL; dst->singleQuote = src->singleQuote; dst->isXmlNs = src->isXmlNs; - if (!prefix) dst->prefix = NULL; - else if (!(dst->prefix = dup_xml_string( prefix, FALSE ))) goto error; - if (!(dst->localName = dup_xml_string( localname, FALSE ))) goto error; - if (!(dst->ns = dup_xml_string( ns, FALSE ))) goto error; + if (src->prefix && !(dst->prefix = dup_xml_string( src->prefix, FALSE ))) goto error; + if (src->localName && !(dst->localName = dup_xml_string( src->localName, FALSE ))) goto error; + if (src->ns && !(dst->ns = dup_xml_string( src->ns, FALSE ))) goto error; - if (text) + if (src->value) { - WS_XML_UTF8_TEXT *utf8; - const WS_XML_UTF8_TEXT *utf8_src = (const WS_XML_UTF8_TEXT *)text; - if (!(utf8 = alloc_utf8_text( utf8_src->value.bytes, utf8_src->value.length ))) goto error; - dst->value = &utf8->text; + switch (enc) + { + case WS_XML_WRITER_ENCODING_TYPE_BINARY: + if ((hr = text_to_text( src->value, NULL, NULL, &dst->value )) != S_OK) goto error; + break; + + case WS_XML_WRITER_ENCODING_TYPE_TEXT: + if ((hr = text_to_utf8text( src->value, NULL, NULL, (WS_XML_UTF8_TEXT **)&dst->value )) != S_OK) + goto error; + break; + + default: + ERR( "unhandled encoding %u\n", enc ); + goto error; + } } return dst; @@ -175,7 +182,8 @@ error: return NULL; } -static WS_XML_ATTRIBUTE **dup_attributes( WS_XML_ATTRIBUTE * const *src, ULONG count ) +static WS_XML_ATTRIBUTE **dup_attributes( WS_XML_ATTRIBUTE * const *src, ULONG count, + WS_XML_WRITER_ENCODING_TYPE enc ) { WS_XML_ATTRIBUTE **dst; ULONG i; @@ -183,7 +191,7 @@ static WS_XML_ATTRIBUTE **dup_attributes( WS_XML_ATTRIBUTE * const *src, ULONG c if (!(dst = heap_alloc( sizeof(*dst) * count ))) return NULL; for (i = 0; i < count; i++) { - if (!(dst[i] = dup_attribute( src[i] ))) + if (!(dst[i] = dup_attribute( src[i], enc ))) { for (; i > 0; i--) free_attribute( dst[i - 1] ); heap_free( dst ); @@ -193,7 +201,7 @@ static WS_XML_ATTRIBUTE **dup_attributes( WS_XML_ATTRIBUTE * const *src, ULONG c return dst; } -static struct node *dup_element_node( const WS_XML_ELEMENT_NODE *src ) +static struct node *dup_element_node( const WS_XML_ELEMENT_NODE *src, WS_XML_WRITER_ENCODING_TYPE enc ) { struct node *node; WS_XML_ELEMENT_NODE *dst; @@ -206,7 +214,7 @@ static struct node *dup_element_node( const WS_XML_ELEMENT_NODE *src ) if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) return NULL; dst = &node->hdr; - if (count && !(dst->attributes = dup_attributes( attrs, count ))) goto error; + if (count && !(dst->attributes = dup_attributes( attrs, count, enc ))) goto error; dst->attributeCount = count; if (prefix && !(dst->prefix = dup_xml_string( prefix, FALSE ))) goto error; @@ -219,25 +227,38 @@ error: return NULL; } -static struct node *dup_text_node( const WS_XML_TEXT_NODE *src ) +static struct node *dup_text_node( const WS_XML_TEXT_NODE *src, WS_XML_WRITER_ENCODING_TYPE enc ) { struct node *node; WS_XML_TEXT_NODE *dst; + HRESULT hr; if (!(node = alloc_node( WS_XML_NODE_TYPE_TEXT ))) return NULL; dst = (WS_XML_TEXT_NODE *)node; + if (!src->text) return node; - if (src->text) + switch (enc) { - WS_XML_UTF8_TEXT *utf8; - const WS_XML_UTF8_TEXT *utf8_src = (const WS_XML_UTF8_TEXT *)src->text; - if (!(utf8 = alloc_utf8_text( utf8_src->value.bytes, utf8_src->value.length ))) - { - free_node( node ); - return NULL; - } - dst->text = &utf8->text; + case WS_XML_WRITER_ENCODING_TYPE_BINARY: + hr = text_to_text( src->text, NULL, NULL, &dst->text ); + break; + + case WS_XML_WRITER_ENCODING_TYPE_TEXT: + hr = text_to_utf8text( src->text, NULL, NULL, (WS_XML_UTF8_TEXT **)&dst->text ); + break; + + default: + ERR( "unhandled encoding %u\n", enc ); + free_node( node ); + return NULL; } + + if (hr != S_OK) + { + free_node( node ); + return NULL; + } + return node; } @@ -259,15 +280,15 @@ static struct node *dup_comment_node( const WS_XML_COMMENT_NODE *src ) return node; } -static struct node *dup_node( const struct node *src ) +static struct node *dup_node( const struct node *src, WS_XML_WRITER_ENCODING_TYPE enc ) { switch (node_type( src )) { case WS_XML_NODE_TYPE_ELEMENT: - return dup_element_node( &src->hdr ); + return dup_element_node( &src->hdr, enc ); case WS_XML_NODE_TYPE_TEXT: - return dup_text_node( (const WS_XML_TEXT_NODE *)src ); + return dup_text_node( (const WS_XML_TEXT_NODE *)src, enc ); case WS_XML_NODE_TYPE_COMMENT: return dup_comment_node( (const WS_XML_COMMENT_NODE *)src ); @@ -286,12 +307,12 @@ static struct node *dup_node( const struct node *src ) return NULL; } -static HRESULT dup_tree( struct node **dst, const struct node *src ) +static HRESULT dup_tree( const struct node *src, WS_XML_WRITER_ENCODING_TYPE enc, struct node **dst ) { struct node *parent; const struct node *child; - if (!*dst && !(*dst = dup_node( src ))) return E_OUTOFMEMORY; + if (!*dst && !(*dst = dup_node( src, enc ))) return E_OUTOFMEMORY; parent = *dst; LIST_FOR_EACH_ENTRY( child, &src->children, struct node, entry ) @@ -299,7 +320,7 @@ static HRESULT dup_tree( struct node **dst, const struct node *src ) HRESULT hr = E_OUTOFMEMORY; struct node *new_child; - if (!(new_child = dup_node( child )) || (hr = dup_tree( &new_child, child )) != S_OK) + if (!(new_child = dup_node( child, enc )) || (hr = dup_tree( child, enc, &new_child )) != S_OK) { destroy_nodes( *dst ); return hr; @@ -2970,7 +2991,7 @@ static HRESULT read_node( struct reader *reader ) } } -HRESULT copy_node( WS_XML_READER *handle, struct node **node ) +HRESULT copy_node( WS_XML_READER *handle, WS_XML_WRITER_ENCODING_TYPE enc, struct node **node ) { struct reader *reader = (struct reader *)handle; const struct list *ptr; @@ -3001,7 +3022,7 @@ HRESULT copy_node( WS_XML_READER *handle, struct node **node ) start = LIST_ENTRY( ptr, struct node, entry ); if (node_type( start ) == WS_XML_NODE_TYPE_EOF) hr = WS_E_INVALID_OPERATION; - else hr = dup_tree( node, start ); + else hr = dup_tree( start, enc, node ); done: LeaveCriticalSection( &reader->cs ); diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index e477e0fc3f..3f6d2f4492 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -66,7 +66,8 @@ ULONG get_type_size( WS_TYPE, const void * ) DECLSPEC_HIDDEN; HRESULT read_header( WS_XML_READER *, const WS_XML_STRING *, const WS_XML_STRING *, WS_TYPE, const void *, WS_READ_OPTION, WS_HEAP *, void *, ULONG ) DECLSPEC_HIDDEN; HRESULT create_header_buffer( WS_XML_READER *, WS_HEAP *, WS_XML_BUFFER ** ) DECLSPEC_HIDDEN; - +HRESULT text_to_text( const WS_XML_TEXT *, const WS_XML_TEXT *, ULONG *, WS_XML_TEXT ** ) DECLSPEC_HIDDEN; +HRESULT text_to_utf8text( const WS_XML_TEXT *, const WS_XML_UTF8_TEXT *, ULONG *, WS_XML_UTF8_TEXT ** ) DECLSPEC_HIDDEN; WS_XML_UTF8_TEXT *alloc_utf8_text( const BYTE *, ULONG ) DECLSPEC_HIDDEN; WS_XML_UTF16_TEXT *alloc_utf16_text( const BYTE *, ULONG ) DECLSPEC_HIDDEN; WS_XML_BASE64_TEXT *alloc_base64_text( const BYTE *, ULONG ) DECLSPEC_HIDDEN; @@ -105,7 +106,7 @@ struct node struct node *alloc_node( WS_XML_NODE_TYPE ) DECLSPEC_HIDDEN; void free_node( struct node * ) DECLSPEC_HIDDEN; void destroy_nodes( struct node * ) DECLSPEC_HIDDEN; -HRESULT copy_node( WS_XML_READER *, struct node ** ) DECLSPEC_HIDDEN; +HRESULT copy_node( WS_XML_READER *, WS_XML_WRITER_ENCODING_TYPE, struct node ** ) DECLSPEC_HIDDEN; static inline WS_XML_NODE_TYPE node_type( const struct node *node ) { diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index be2994af83..08b341034e 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1034,8 +1034,8 @@ static ULONG encode_base64( const unsigned char *bin, ULONG len, unsigned char * return i; } -static HRESULT text_to_utf8text( const WS_XML_TEXT *text, const WS_XML_UTF8_TEXT *old, ULONG *offset, - WS_XML_UTF8_TEXT **ret ) +HRESULT text_to_utf8text( const WS_XML_TEXT *text, const WS_XML_UTF8_TEXT *old, ULONG *offset, + WS_XML_UTF8_TEXT **ret ) { ULONG len_old = old ? old->value.length : 0; if (offset) *offset = len_old; @@ -2254,7 +2254,7 @@ HRESULT WINAPI WsWriteStartElement( WS_XML_WRITER *handle, const WS_XML_STRING * return hr; } -static HRESULT text_to_text( const WS_XML_TEXT *text, const WS_XML_TEXT *old, ULONG *offset, WS_XML_TEXT **ret ) +HRESULT text_to_text( const WS_XML_TEXT *text, const WS_XML_TEXT *old, ULONG *offset, WS_XML_TEXT **ret ) { if (offset) *offset = 0; switch (text->textType) @@ -4758,7 +4758,7 @@ HRESULT WINAPI WsCopyNode( WS_XML_WRITER *handle, WS_XML_READER *reader, WS_ERRO return WS_E_INVALID_FORMAT; } - if ((hr = copy_node( reader, &node )) != S_OK) goto done; + if ((hr = copy_node( reader, writer->output_enc, &node )) != S_OK) goto done; current = writer->current; write_insert_node( writer, parent, node ); -- 2.11.0

1 0

[PATCH 1/6] webservices: Fix is_nil_element in binary mode.
by Hans Leidekker 24 Jan '18

24 Jan '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index a05b1edb33..3e5434cf64 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -6458,6 +6458,27 @@ static HRESULT end_mapping( struct reader *reader, WS_TYPE_MAPPING mapping ) } } +static BOOL is_true_text( const WS_XML_TEXT *text ) +{ + switch (text->textType) + { + case WS_XML_TEXT_TYPE_UTF8: + { + const WS_XML_UTF8_TEXT *text_utf8 = (const WS_XML_UTF8_TEXT *)text; + if (text_utf8->value.length == 4 && !memcmp( text_utf8->value.bytes, "true", 4 )) return TRUE; + return FALSE; + } + case WS_XML_TEXT_TYPE_BOOL: + { + const WS_XML_BOOL_TEXT *text_bool = (const WS_XML_BOOL_TEXT *)text; + return text_bool->value; + } + default: + ERR( "unhandled text type %u\n", text->textType ); + return FALSE; + } +} + static HRESULT is_nil_element( const WS_XML_ELEMENT_NODE *elem ) { static const WS_XML_STRING localname = {3, (BYTE *)"nil"}; @@ -6466,12 +6487,10 @@ static HRESULT is_nil_element( const WS_XML_ELEMENT_NODE *elem ) for (i = 0; i < elem->attributeCount; i++) { - const WS_XML_UTF8_TEXT *text = (WS_XML_UTF8_TEXT *)elem->attributes[i]->value; - if (elem->attributes[i]->isXmlNs) continue; if (WsXmlStringEquals( elem->attributes[i]->localName, &localname, NULL ) == S_OK && WsXmlStringEquals( elem->attributes[i]->ns, &ns, NULL ) == S_OK && - text->value.length == 4 && !memcmp( text->value.bytes, "true", 4 )) return TRUE; + is_true_text( elem->attributes[i]->value )) return TRUE; } return FALSE; } -- 2.11.0

1 0

[v2 PATCH] comctl32/tests: Link to comctl32.dll dynamically
by Nikolay Sivov 24 Jan '18

24 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: fixed test failures on WinXP dlls/comctl32/tests/Makefile.in | 2 +- dlls/comctl32/tests/animate.c | 22 +---------- dlls/comctl32/tests/combo.c | 29 +++++++------- dlls/comctl32/tests/datetime.c | 22 ++++++----- dlls/comctl32/tests/dpa.c | 67 +++++++++++++------------------- dlls/comctl32/tests/header.c | 38 +++++++++--------- dlls/comctl32/tests/imagelist.c | 36 ++++++++--------- dlls/comctl32/tests/ipaddress.c | 25 ------------ dlls/comctl32/tests/listview.c | 74 +++++++++++++++++++---------------- dlls/comctl32/tests/monthcal.c | 25 ++++++------ dlls/comctl32/tests/mru.c | 30 +++++++------- dlls/comctl32/tests/pager.c | 1 - dlls/comctl32/tests/progress.c | 34 +++++++++------- dlls/comctl32/tests/propsheet.c | 86 +++++++++++++++++++++++++---------------- dlls/comctl32/tests/rebar.c | 35 ++++++++--------- dlls/comctl32/tests/status.c | 21 +++++++++- dlls/comctl32/tests/subclass.c | 2 +- dlls/comctl32/tests/tab.c | 42 ++++++++++++++------ dlls/comctl32/tests/toolbar.c | 63 +++++++++++++++++++----------- dlls/comctl32/tests/tooltips.c | 2 +- dlls/comctl32/tests/trackbar.c | 3 +- dlls/comctl32/tests/treeview.c | 34 ++++++++-------- dlls/comctl32/tests/updown.c | 21 +++++++--- 23 files changed, 378 insertions(+), 336 deletions(-) diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index f93ff2585d..4669efcf2b 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = comctl32.dll -IMPORTS = comctl32 ole32 user32 gdi32 advapi32 +IMPORTS = ole32 user32 gdi32 advapi32 C_SRCS = \ animate.c \ diff --git a/dlls/comctl32/tests/animate.c b/dlls/comctl32/tests/animate.c index fab345bb47..400de55b5e 100644 --- a/dlls/comctl32/tests/animate.c +++ b/dlls/comctl32/tests/animate.c @@ -108,26 +108,6 @@ static void create_animate(DWORD parent_style, DWORD animate_style) update_window(hAnimateParentWnd); } -static void init(void) -{ - HMODULE hComctl32; - BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); - - hComctl32 = GetModuleHandleA("comctl32.dll"); - pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); - if (pInitCommonControlsEx) - { - INITCOMMONCONTROLSEX iccex; - iccex.dwSize = sizeof(iccex); - iccex.dwICC = ICC_ANIMATE_CLASS; - pInitCommonControlsEx(&iccex); - } - else - InitCommonControls(); - - shell32 = LoadLibraryA("Shell32.dll"); -} - static void destroy_animate(void) { MSG msg; @@ -175,7 +155,7 @@ static void test_play(void) START_TEST(animate) { - init(); + shell32 = LoadLibraryA("Shell32.dll"); test_play(); diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index ef7c3f796b..895d9429b4 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -480,25 +480,20 @@ static LRESULT CALLBACK ComboExTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, L return 0L; } -static BOOL init(void) +static void init_functions(void) { - HMODULE hComctl32; - BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); - WNDCLASSA wc; - INITCOMMONCONTROLSEX iccex; + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); - hComctl32 = GetModuleHandleA("comctl32.dll"); - pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); - if (!pInitCommonControlsEx) - { - win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); - return FALSE; - } - iccex.dwSize = sizeof(iccex); - iccex.dwICC = ICC_USEREX_CLASSES; - pInitCommonControlsEx(&iccex); +#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); +#define X2(f, ord) p##f = (void*)GetProcAddress(hComCtl32, (const char *)ord); + X2(SetWindowSubclass, 410); +#undef X +#undef X2 +} - pSetWindowSubclass = (void*)GetProcAddress(hComctl32, (LPSTR)410); +static BOOL init(void) +{ + WNDCLASSA wc; wc.style = CS_HREDRAW | CS_VREDRAW; wc.cbClsExtra = 0; @@ -1161,6 +1156,8 @@ START_TEST(combo) ULONG_PTR ctx_cookie; HANDLE hCtx; + init_functions(); + if (!init()) return; diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index c9407bef61..4036e9defd 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -30,6 +30,8 @@ #define NUM_MSG_SEQUENCES 1 #define DATETIME_SEQ_INDEX 0 +static BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); + static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; static const struct message test_dtm_set_format_seq[] = { @@ -777,19 +779,21 @@ static void test_dts_shownone(void) DestroyWindow(hwnd); } +static void init_functions(void) +{ + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); + X(InitCommonControlsEx); +#undef X +} + START_TEST(datetime) { - HMODULE hComctl32; - BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); INITCOMMONCONTROLSEX iccex; - hComctl32 = GetModuleHandleA("comctl32.dll"); - pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); - if (!pInitCommonControlsEx) - { - win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); - return; - } + init_functions(); + iccex.dwSize = sizeof(iccex); iccex.dwICC = ICC_DATE_CLASSES; pInitCommonControlsEx(&iccex); diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index 4eb32a4187..c795c14f4e 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -59,38 +59,33 @@ static INT (WINAPI *pDPA_Search)(HDPA,PVOID,INT,PFNDPACOMPARE,LPARAM,UINT); static BOOL (WINAPI *pDPA_SetPtr)(HDPA,INT,PVOID); static BOOL (WINAPI *pDPA_Sort)(HDPA,PFNDPACOMPARE,LPARAM); -#define COMCTL32_GET_PROC(func, ord) \ - ((p ## func = (PVOID)GetProcAddress(hcomctl32,(LPCSTR)ord)) ? 1 \ - : (trace( #func " not exported\n"), 0)) - -static BOOL InitFunctionPtrs(HMODULE hcomctl32) +static void init_functions(void) { - /* 4.00+ */ - if(COMCTL32_GET_PROC(DPA_Clone, 331) && - COMCTL32_GET_PROC(DPA_Create, 328) && - COMCTL32_GET_PROC(DPA_CreateEx, 340) && - COMCTL32_GET_PROC(DPA_DeleteAllPtrs, 337) && - COMCTL32_GET_PROC(DPA_DeletePtr, 336) && - COMCTL32_GET_PROC(DPA_Destroy, 329) && - COMCTL32_GET_PROC(DPA_GetPtr, 332) && - COMCTL32_GET_PROC(DPA_GetPtrIndex, 333) && - COMCTL32_GET_PROC(DPA_Grow, 330) && - COMCTL32_GET_PROC(DPA_InsertPtr, 334) && - COMCTL32_GET_PROC(DPA_Search, 339) && - COMCTL32_GET_PROC(DPA_SetPtr, 335) && - COMCTL32_GET_PROC(DPA_Sort, 338)) - { - /* 4.71+ */ - COMCTL32_GET_PROC(DPA_DestroyCallback, 386) && - COMCTL32_GET_PROC(DPA_EnumCallback, 385) && - COMCTL32_GET_PROC(DPA_LoadStream, 9) && - COMCTL32_GET_PROC(DPA_Merge, 11) && - COMCTL32_GET_PROC(DPA_SaveStream, 10); - - return TRUE; - } + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); - return FALSE; +#define X2(f, ord) p##f = (void*)GetProcAddress(hComCtl32, (const char *)ord); + /* 4.00+ */ + X2(DPA_Clone, 331); + X2(DPA_Create, 328); + X2(DPA_CreateEx, 340); + X2(DPA_DeleteAllPtrs, 337); + X2(DPA_DeletePtr, 336); + X2(DPA_Destroy, 329); + X2(DPA_GetPtr, 332); + X2(DPA_GetPtrIndex, 333); + X2(DPA_Grow, 330); + X2(DPA_InsertPtr, 334); + X2(DPA_Search, 339); + X2(DPA_SetPtr, 335); + X2(DPA_Sort, 338); + + /* 4.71+ */ + X2(DPA_DestroyCallback, 386); + X2(DPA_EnumCallback, 385); + X2(DPA_LoadStream, 9); + X2(DPA_Merge, 11); + X2(DPA_SaveStream, 10); +#undef X2 } /* Callbacks */ @@ -628,7 +623,7 @@ static void test_DPA_LoadStream(void) dpa = NULL; hRes = pDPA_LoadStream(&dpa, CB_Load, pStm, NULL); expect(S_OK, hRes); - DPA_Destroy(dpa); + pDPA_Destroy(dpa); /* try with altered dwData2 field */ header.dwSize = sizeof(header); @@ -742,15 +737,7 @@ if (0) { START_TEST(dpa) { - HMODULE hcomctl32; - - hcomctl32 = GetModuleHandleA("comctl32.dll"); - - if(!InitFunctionPtrs(hcomctl32)) - { - win_skip("Needed functions are not available\n"); - return; - } + init_functions(); test_dpa(); test_DPA_Merge(); diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index ae75199be2..31610f0c9a 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -26,6 +26,9 @@ #include "v6util.h" #include "msg.h" +static HIMAGELIST (WINAPI *pImageList_Create)(int, int, UINT, int, int); +static BOOL (WINAPI *pImageList_Destroy)(HIMAGELIST); + typedef struct tagEXPECTEDNOTIFY { INT iCode; @@ -953,7 +956,7 @@ static void test_hdm_sethotdivider(HWND hParent) static void test_hdm_imageMessages(HWND hParent) { - HIMAGELIST hImageList = ImageList_Create (4, 4, 0, 1, 0); + HIMAGELIST hImageList = pImageList_Create (4, 4, 0, 1, 0); HIMAGELIST hIml; BOOL wasValid; HWND hChild; @@ -973,13 +976,13 @@ static void test_hdm_imageMessages(HWND hParent) hIml = (HIMAGELIST) SendMessageA(hChild, HDM_CREATEDRAGIMAGE, 0, 0); ok(hIml != NULL, "Expected non-NULL handle, got %p\n", hIml); - ImageList_Destroy(hIml); + pImageList_Destroy(hIml); ok_sequence(sequences, HEADER_SEQ_INDEX, imageMessages_seq, "imageMessages sequence testing", FALSE); DestroyWindow(hChild); - wasValid = ImageList_Destroy(hImageList); + wasValid = pImageList_Destroy(hImageList); ok(wasValid, "Header must not free image list at destruction!\n"); } @@ -1644,28 +1647,23 @@ static LRESULT CALLBACK HeaderTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LP return 0L; } +static void init_functions(void) +{ + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); + X(ImageList_Create); + X(ImageList_Destroy); +#undef X +} + static BOOL init(void) { - HMODULE hComctl32; - BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); WNDCLASSA wc; - INITCOMMONCONTROLSEX iccex; TEXTMETRICA tm; HFONT hOldFont; HDC hdc; - hComctl32 = GetModuleHandleA("comctl32.dll"); - pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); - if (!pInitCommonControlsEx) - { - win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); - return FALSE; - } - - iccex.dwSize = sizeof(iccex); - iccex.dwICC = ICC_USEREX_CLASSES; - pInitCommonControlsEx(&iccex); - wc.style = CS_HREDRAW | CS_VREDRAW; wc.cbClsExtra = 0; wc.cbWndExtra = 0; @@ -1821,6 +1819,8 @@ START_TEST(header) ULONG_PTR ctx_cookie; HANDLE hCtx; + init_functions(); + if (!init()) return; @@ -1852,6 +1852,8 @@ START_TEST(header) return; } + init_functions(); + /* comctl32 version 6 tests start here */ test_hdf_fixedwidth(parent_hwnd); test_hds_nosizing(parent_hwnd); diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 653467c999..3838563c38 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -85,6 +85,7 @@ static BOOL (WINAPI *pImageList_Write)(HIMAGELIST, IStream *); static HIMAGELIST (WINAPI *pImageList_Read)(IStream *); static BOOL (WINAPI *pImageList_Copy)(HIMAGELIST, int, HIMAGELIST, int, UINT); static HIMAGELIST (WINAPI *pImageList_LoadImageW)(HINSTANCE, LPCWSTR, int, int, COLORREF, UINT, UINT); +static BOOL (WINAPI *pImageList_Draw)(HIMAGELIST,INT,HDC,INT,INT,UINT); static HINSTANCE hinst; @@ -205,7 +206,7 @@ static HDC show_image(HWND hwnd, HIMAGELIST himl, int idx, int size, SetWindowTextA(hwnd, loc); hdc = GetDC(hwnd); - ImageList_Draw(himl, idx, hdc, 0, 0, ILD_TRANSPARENT); + pImageList_Draw(himl, idx, hdc, 0, 0, ILD_TRANSPARENT); force_redraw(hwnd); @@ -504,8 +505,8 @@ static void test_DrawIndirect(void) ok(hbm3 != 0, "no bitmap 3\n"); /* add three */ - ok(0 == ImageList_Add(himl, hbm1, 0),"failed to add bitmap 1\n"); - ok(1 == ImageList_Add(himl, hbm2, 0),"failed to add bitmap 2\n"); + ok(0 == pImageList_Add(himl, hbm1, 0),"failed to add bitmap 1\n"); + ok(1 == pImageList_Add(himl, hbm2, 0),"failed to add bitmap 2\n"); if (pImageList_SetImageCount) { @@ -1576,7 +1577,7 @@ cleanup: if(himl) { - ret = ImageList_Destroy(himl); + ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); } } @@ -1599,21 +1600,21 @@ static void test_iimagelist(void) imgl = (IImageList*)createImageList(32, 32); ret = IImageList_AddRef(imgl); ok(ret == 2, "Expected 2, got %d\n", ret); - ret = ImageList_Destroy((HIMAGELIST)imgl); + ret = pImageList_Destroy((HIMAGELIST)imgl); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - ret = ImageList_Destroy((HIMAGELIST)imgl); + ret = pImageList_Destroy((HIMAGELIST)imgl); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - ret = ImageList_Destroy((HIMAGELIST)imgl); + ret = pImageList_Destroy((HIMAGELIST)imgl); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); imgl = (IImageList*)createImageList(32, 32); ret = IImageList_AddRef(imgl); ok(ret == 2, "Expected 2, got %d\n", ret); - ret = ImageList_Destroy((HIMAGELIST)imgl); + ret = pImageList_Destroy((HIMAGELIST)imgl); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); ret = IImageList_Release(imgl); ok(ret == 0, "Expected 0, got %d\n", ret); - ret = ImageList_Destroy((HIMAGELIST)imgl); + ret = pImageList_Destroy((HIMAGELIST)imgl); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); /* ref counting, HIMAGELIST_QueryInterface adds a reference */ @@ -1674,7 +1675,7 @@ static void test_IImageList_Add_Remove(void) int ret; /* create an imagelist to play with */ - himl = ImageList_Create(84, 84, ILC_COLOR16, 0, 3); + himl = pImageList_Create(84, 84, ILC_COLOR16, 0, 3); ok(himl != 0,"failed to create imagelist\n"); imgl = (IImageList *) himl; @@ -1728,7 +1729,7 @@ static void test_IImageList_Get_SetImageCount(void) INT ret; /* create an imagelist to play with */ - himl = ImageList_Create(84, 84, ILC_COLOR16, 0, 3); + himl = pImageList_Create(84, 84, ILC_COLOR16, 0, 3); ok(himl != 0,"failed to create imagelist\n"); imgl = (IImageList *) himl; @@ -1773,7 +1774,7 @@ static void test_IImageList_Draw(void) ok(hdc!=NULL, "couldn't get DC\n"); /* create an imagelist to play with */ - himl = ImageList_Create(48, 48, ILC_COLOR16, 0, 3); + himl = pImageList_Create(48, 48, ILC_COLOR16, 0, 3); ok(himl!=0,"failed to create imagelist\n"); imgl = (IImageList *) himl; @@ -1850,10 +1851,10 @@ static void test_IImageList_Merge(void) HRESULT hr; int ret; - himl1 = ImageList_Create(32,32,0,0,3); + himl1 = pImageList_Create(32,32,0,0,3); ok(himl1 != NULL,"failed to create himl1\n"); - himl2 = ImageList_Create(32,32,0,0,3); + himl2 = pImageList_Create(32,32,0,0,3); ok(himl2 != NULL,"failed to create himl2\n"); hicon1 = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); @@ -1887,7 +1888,7 @@ if (0) /* Same happens if himl2 is empty */ IImageList_Release(imgl2); - himl2 = ImageList_Create(32,32,0,0,3); + himl2 = pImageList_Create(32,32,0,0,3); ok(himl2 != NULL,"failed to recreate himl2\n"); imgl2 = (IImageList *) himl2; @@ -2385,7 +2386,7 @@ static void test_IImageList_GetIconSize(void) static void init_functions(void) { - HMODULE hComCtl32 = GetModuleHandleA("comctl32.dll"); + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); #define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); #define X2(f, ord) p##f = (void*)GetProcAddress(hComCtl32, (const char *)ord); @@ -2414,6 +2415,7 @@ static void init_functions(void) X(ImageList_LoadImageW); X(ImageList_CoCreateInstance); X(HIMAGELIST_QueryInterface); + X(ImageList_Draw); #undef X #undef X2 } @@ -2427,8 +2429,6 @@ START_TEST(imagelist) hinst = GetModuleHandleA(NULL); - InitCommonControls(); - test_create_destroy(); test_begindrag(); test_hotspot(); diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index 093f649c9e..6d8e9ccf4b 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -61,32 +61,7 @@ static void test_get_set_text(void) DestroyWindow(hwnd); } -static BOOL init(void) -{ - HMODULE hComctl32; - BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); - INITCOMMONCONTROLSEX iccex; - - hComctl32 = GetModuleHandleA("comctl32.dll"); - pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); - if (!pInitCommonControlsEx) - { - win_skip("InitCommonControlsEx() is missing.\n"); - return FALSE; - } - - iccex.dwSize = sizeof(iccex); - /* W2K and below need ICC_INTERNET_CLASSES for the IP Address Control */ - iccex.dwICC = ICC_INTERNET_CLASSES; - pInitCommonControlsEx(&iccex); - - return TRUE; -} - START_TEST(ipaddress) { - if (!init()) - return; - test_get_set_text(); } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 18e874a00f..72367c67b3 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -28,6 +28,11 @@ #include "v6util.h" #include "msg.h" +static HIMAGELIST (WINAPI *pImageList_Create)(int, int, UINT, int, int); +static BOOL (WINAPI *pImageList_Destroy)(HIMAGELIST); +static int (WINAPI *pImageList_Add)(HIMAGELIST, HBITMAP, HBITMAP); +static BOOL (WINAPI *p_TrackMouseEvent)(TRACKMOUSEEVENT *); + enum seq_index { PARENT_SEQ_INDEX, PARENT_FULL_SEQ_INDEX, @@ -73,6 +78,18 @@ static BOOL g_focus_test_LVN_DELETEITEM; static HWND subclass_editbox(HWND hwndListview); +static void init_functions(void) +{ + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); + X(ImageList_Create); + X(ImageList_Destroy); + X(ImageList_Add); + X(_TrackMouseEvent); +#undef X +} + static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; static const struct message create_ownerdrawfixed_parent_seq[] = { @@ -848,13 +865,13 @@ static void test_images(void) RECT r1, r2; static CHAR hello[] = "hello"; - himl = ImageList_Create(40, 40, 0, 4, 4); + himl = pImageList_Create(40, 40, 0, 4, 4); ok(himl != NULL, "failed to create imagelist\n"); hbmp = CreateBitmap(40, 40, 1, 1, NULL); ok(hbmp != NULL, "failed to create bitmap\n"); - r = ImageList_Add(himl, hbmp, 0); + r = pImageList_Add(himl, hbmp, 0); ok(r == 0, "should be zero\n"); hwnd = CreateWindowExA(0, "SysListView32", "foo", LVS_OWNERDRAWFIXED, @@ -1539,7 +1556,7 @@ static void test_create(void) cls.lpszClassName = "MyListView32"; ok(RegisterClassExA(&cls), "RegisterClassEx failed\n"); - test_create_imagelist = ImageList_Create(16, 16, 0, 5, 10); + test_create_imagelist = pImageList_Create(16, 16, 0, 5, 10); hList = CreateWindowA("MyListView32", "Test", WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); ok((HIMAGELIST)SendMessageA(hList, LVM_GETIMAGELIST, 0, 0) == test_create_imagelist, "Image list not obtained\n"); hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); @@ -3732,15 +3749,15 @@ static void test_hittest(void) test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, 0, FALSE, TRUE); test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, FALSE); /* try with icons, state icons index is 1 based so at least 2 bitmaps needed */ - himl = ImageList_Create(16, 16, 0, 4, 4); + himl = pImageList_Create(16, 16, 0, 4, 4); ok(himl != NULL, "failed to create imagelist\n"); hbmp = CreateBitmap(16, 16, 1, 1, NULL); ok(hbmp != NULL, "failed to create bitmap\n"); - r = ImageList_Add(himl, hbmp, 0); + r = pImageList_Add(himl, hbmp, 0); ok(r == 0, "should be zero\n"); hbmp = CreateBitmap(16, 16, 1, 1, NULL); ok(hbmp != NULL, "failed to create bitmap\n"); - r = ImageList_Add(himl, hbmp, 0); + r = pImageList_Add(himl, hbmp, 0); ok(r == 1, "should be one\n"); r = SendMessageA(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)himl); @@ -4022,15 +4039,15 @@ todo_wine expect(TRUE, r); /* state icons */ - himl = ImageList_Create(16, 16, 0, 2, 2); + himl = pImageList_Create(16, 16, 0, 2, 2); ok(himl != NULL, "failed to create imagelist\n"); hbm = CreateBitmap(16, 16, 1, 1, NULL); ok(hbm != NULL, "failed to create bitmap\n"); - r = ImageList_Add(himl, hbm, 0); + r = pImageList_Add(himl, hbm, 0); expect(0, r); hbm = CreateBitmap(16, 16, 1, 1, NULL); ok(hbm != NULL, "failed to create bitmap\n"); - r = ImageList_Add(himl, hbm, 0); + r = pImageList_Add(himl, hbm, 0); expect(1, r); r = SendMessageA(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)himl); @@ -4702,9 +4719,9 @@ static void test_getitemspacing(void) expect(cy, HIWORD(ret)); /* now try with icons */ - himl40 = ImageList_Create(40, 40, 0, 4, 4); + himl40 = pImageList_Create(40, 40, 0, 4, 4); ok(himl40 != NULL, "failed to create imagelist\n"); - himl80 = ImageList_Create(80, 80, 0, 4, 4); + himl80 = pImageList_Create(80, 80, 0, 4, 4); ok(himl80 != NULL, "failed to create imagelist\n"); ret = SendMessageA(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl40); expect(0, ret); @@ -4772,7 +4789,7 @@ static void test_getitemspacing(void) expect(cy + 40, HIWORD(ret)); SendMessageA(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, 0); - ImageList_Destroy(himl80); + pImageList_Destroy(himl80); DestroyWindow(hwnd); /* LVS_SMALLICON */ hwnd = create_listview_control(LVS_SMALLICON); @@ -4790,7 +4807,7 @@ static void test_getitemspacing(void) expect(cy + 40, HIWORD(ret)); SendMessageA(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, 0); - ImageList_Destroy(himl40); + pImageList_Destroy(himl40); DestroyWindow(hwnd); /* LVS_REPORT */ hwnd = create_listview_control(LVS_REPORT); @@ -4973,11 +4990,11 @@ static void test_approximate_viewrect(void) /* LVS_ICON */ hwnd = create_listview_control(LVS_ICON); - himl = ImageList_Create(40, 40, 0, 4, 4); + himl = pImageList_Create(40, 40, 0, 4, 4); ok(himl != NULL, "failed to create imagelist\n"); hbmp = CreateBitmap(40, 40, 1, 1, NULL); ok(hbmp != NULL, "failed to create bitmap\n"); - ret = ImageList_Add(himl, hbmp, 0); + ret = pImageList_Add(himl, hbmp, 0); expect(0, ret); ret = SendMessageA(hwnd, LVM_SETIMAGELIST, 0, (LPARAM)himl); expect(0, ret); @@ -5594,7 +5611,7 @@ static void test_createdragimage(void) himl = (HIMAGELIST)SendMessageA(list, LVM_CREATEDRAGIMAGE, 0, (LPARAM)&pt); ok(himl != NULL, "got %p\n", himl); - ImageList_Destroy(himl); + pImageList_Destroy(himl); DestroyWindow(list); } @@ -5709,9 +5726,9 @@ static void test_imagelists(void) HIMAGELIST himl1, himl2, himl3; LRESULT ret; - himl1 = ImageList_Create(40, 40, 0, 4, 4); - himl2 = ImageList_Create(40, 40, 0, 4, 4); - himl3 = ImageList_Create(40, 40, 0, 4, 4); + himl1 = pImageList_Create(40, 40, 0, 4, 4); + himl2 = pImageList_Create(40, 40, 0, 4, 4); + himl3 = pImageList_Create(40, 40, 0, 4, 4); ok(himl1 != NULL, "Failed to create imagelist\n"); ok(himl2 != NULL, "Failed to create imagelist\n"); ok(himl3 != NULL, "Failed to create imagelist\n"); @@ -5977,7 +5994,7 @@ static void test_oneclickactivate(void) track.cbSize = sizeof(track); track.dwFlags = TME_QUERY; - _TrackMouseEvent(&track); + p_TrackMouseEvent(&track); ok(track.hwndTrack == hwnd, "hwndTrack != hwnd\n"); ok(track.dwFlags == TME_LEAVE, "dwFlags = %x\n", track.dwFlags); @@ -6241,23 +6258,10 @@ static void test_state_image(void) START_TEST(listview) { - HMODULE hComctl32; - BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); - ULONG_PTR ctx_cookie; HANDLE hCtx; - hComctl32 = GetModuleHandleA("comctl32.dll"); - pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); - if (pInitCommonControlsEx) - { - INITCOMMONCONTROLSEX iccex; - iccex.dwSize = sizeof(iccex); - iccex.dwICC = ICC_LISTVIEW_CLASSES; - pInitCommonControlsEx(&iccex); - } - else - InitCommonControls(); + init_functions(); init_msg_sequences(sequences, NUM_MSG_SEQUENCES); @@ -6319,6 +6323,8 @@ START_TEST(listview) return; } + init_functions(); + /* comctl32 version 6 tests start here */ test_get_set_view(); test_canceleditlabel(); diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 4216fd5e67..85822a320c 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -42,6 +42,8 @@ #define SEL_NOTIFY_TEST_ID 100 +static BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); + static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; static HWND parent_wnd; @@ -598,8 +600,6 @@ static HWND create_parent_window(void) { HWND hwnd; - InitCommonControls(); - /* flush message sequences, so we can check the new sequence by the end of function */ flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -2039,22 +2039,23 @@ static void test_sel_notify(void) } } +static void init_functions(void) +{ + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); + X(InitCommonControlsEx); +#undef X +} + START_TEST(monthcal) { - BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); INITCOMMONCONTROLSEX iccex; - HMODULE hComctl32; - ULONG_PTR ctx_cookie; HANDLE hCtx; - hComctl32 = GetModuleHandleA("comctl32.dll"); - pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); - if (!pInitCommonControlsEx) - { - win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); - return; - } + init_functions(); + iccex.dwSize = sizeof(iccex); iccex.dwICC = ICC_DATE_CLASSES; pInitCommonControlsEx(&iccex); diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index af49aba213..664f7a54f4 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -76,18 +76,22 @@ static INT (WINAPI *pFindMRUData)(HANDLE, LPCVOID, DWORD, LPINT); static INT (WINAPI *pAddMRUData)(HANDLE, LPCVOID, DWORD); static HANDLE (WINAPI *pCreateMRUListW)(MRUINFOW*); -static void InitPointers(void) +static void init_functions(void) { - pCreateMRUListA = (void*)GetProcAddress(hComctl32,(LPCSTR)151); - pFreeMRUList = (void*)GetProcAddress(hComctl32,(LPCSTR)152); - pAddMRUStringA = (void*)GetProcAddress(hComctl32,(LPCSTR)153); - pEnumMRUListA = (void*)GetProcAddress(hComctl32,(LPCSTR)154); - pCreateMRUListLazyA = (void*)GetProcAddress(hComctl32,(LPCSTR)157); - pAddMRUData = (void*)GetProcAddress(hComctl32,(LPCSTR)167); - pFindMRUData = (void*)GetProcAddress(hComctl32,(LPCSTR)169); - pCreateMRUListW = (void*)GetProcAddress(hComctl32,(LPCSTR)400); - pEnumMRUListW = (void*)GetProcAddress(hComctl32,(LPCSTR)403); - pCreateMRUListLazyW = (void*)GetProcAddress(hComctl32,(LPCSTR)404); + hComctl32 = LoadLibraryA("comctl32.dll"); + +#define X2(f, ord) p##f = (void*)GetProcAddress(hComctl32, (const char *)ord); + X2(CreateMRUListA, 151); + X2(FreeMRUList, 152); + X2(AddMRUStringA, 153); + X2(EnumMRUListA, 154); + X2(CreateMRUListLazyA, 157); + X2(AddMRUData, 167); + X2(FindMRUData, 169); + X2(CreateMRUListW, 400); + X2(EnumMRUListW, 403); + X2(CreateMRUListLazyW, 404); +#undef X2 } /* Based on RegDeleteTreeW from dlls/advapi32/registry.c */ @@ -705,13 +709,11 @@ static void test_CreateMRUListLazyW(void) START_TEST(mru) { - hComctl32 = GetModuleHandleA("comctl32.dll"); - delete_reg_entries(); if (!create_reg_entries()) return; - InitPointers(); + init_functions(); test_MRUListA(); test_CreateMRUListLazyA(); diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index a9409eac08..0da396cdd1 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -339,7 +339,6 @@ START_TEST(pager) pSetWindowSubclass = (void*)GetProcAddress(mod, (LPSTR)410); - InitCommonControls(); init_msg_sequences(sequences, NUM_MSG_SEQUENCES); parent_wnd = create_parent_window(); diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c index 7f69c35232..9dd4b55202 100644 --- a/dlls/comctl32/tests/progress.c +++ b/dlls/comctl32/tests/progress.c @@ -30,6 +30,7 @@ static HWND hProgressParentWnd, hProgressWnd; static const char progressTestClass[] = "ProgressBarTestClass"; +static BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); static HWND create_progress(DWORD style) { @@ -94,24 +95,10 @@ static void update_window(HWND hWnd) static void init(void) { - HMODULE hComctl32; - BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); WNDCLASSA wc; RECT rect; BOOL ret; - hComctl32 = GetModuleHandleA("comctl32.dll"); - pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); - if (pInitCommonControlsEx) - { - INITCOMMONCONTROLSEX iccex; - iccex.dwSize = sizeof(iccex); - iccex.dwICC = ICC_PROGRESS_CLASS; - pInitCommonControlsEx(&iccex); - } - else - InitCommonControls(); - wc.style = CS_HREDRAW | CS_VREDRAW; wc.cbClsExtra = 0; wc.cbWndExtra = 0; @@ -135,7 +122,7 @@ static void init(void) GetClientRect(hProgressParentWnd, &rect); hProgressWnd = CreateWindowExA(0, PROGRESS_CLASSA, "", WS_CHILD | WS_VISIBLE, 0, 0, rect.right, rect.bottom, hProgressParentWnd, NULL, GetModuleHandleA(NULL), 0); - ok(hProgressWnd != NULL, "failed to create parent wnd\n"); + ok(hProgressWnd != NULL, "Failed to create progress bar.\n"); progress_wndproc = (WNDPROC)SetWindowLongPtrA(hProgressWnd, GWLP_WNDPROC, (LPARAM)progress_subclass_proc); ShowWindow(hProgressParentWnd, SW_SHOWNORMAL); @@ -250,8 +237,25 @@ static void test_setcolors(void) DestroyWindow(progress); } +static void init_functions(void) +{ + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); + X(InitCommonControlsEx); +#undef X +} + START_TEST(progress) { + INITCOMMONCONTROLSEX iccex; + + init_functions(); + + iccex.dwSize = sizeof(iccex); + iccex.dwICC = ICC_PROGRESS_CLASS; + pInitCommonControlsEx(&iccex); + init(); test_redraw(); diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index ec53e6bc7c..2a4afaa51e 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -34,6 +34,10 @@ static LONG active_page = -1; #define IDC_APPLY_BUTTON 12321 +static HPROPSHEETPAGE (WINAPI *pCreatePropertySheetPageA)(const PROPSHEETPAGEA *desc); +static HPROPSHEETPAGE (WINAPI *pCreatePropertySheetPageW)(const PROPSHEETPAGEW *desc); +static BOOL (WINAPI *pDestroyPropertySheetPage)(HPROPSHEETPAGE proppage); +static INT_PTR (WINAPI *pPropertySheetA)(const PROPSHEETHEADERA *header); static void detect_locale(void) { @@ -141,7 +145,7 @@ static void test_title(void) psp.pfnDlgProc = page_dlg_proc; psp.lParam = 0; - hpsp[0] = CreatePropertySheetPageA(&psp); + hpsp[0] = pCreatePropertySheetPageA(&psp); memset(&psh, 0, sizeof(psh)); psh.dwSize = PROPSHEETHEADERA_V1_SIZE; @@ -152,7 +156,7 @@ static void test_title(void) U3(psh).phpage = hpsp; psh.pfnCallback = sheet_callback; - hdlg = (HWND)PropertySheetA(&psh); + hdlg = (HWND)pPropertySheetA(&psh); ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle value %p\n", hdlg); style = GetWindowLongA(hdlg, GWL_STYLE); @@ -180,7 +184,7 @@ static void test_nopage(void) psp.pfnDlgProc = page_dlg_proc; psp.lParam = 0; - hpsp[0] = CreatePropertySheetPageA(&psp); + hpsp[0] = pCreatePropertySheetPageA(&psp); memset(&psh, 0, sizeof(psh)); psh.dwSize = PROPSHEETHEADERA_V1_SIZE; @@ -191,7 +195,7 @@ static void test_nopage(void) U3(psh).phpage = hpsp; psh.pfnCallback = sheet_callback; - hdlg = (HWND)PropertySheetA(&psh); + hdlg = (HWND)pPropertySheetA(&psh); ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle value %p\n", hdlg); ShowWindow(hdlg,SW_NORMAL); @@ -260,7 +264,7 @@ static void test_disableowner(void) psp.pfnDlgProc = NULL; psp.lParam = 0; - hpsp[0] = CreatePropertySheetPageA(&psp); + hpsp[0] = pCreatePropertySheetPageA(&psp); memset(&psh, 0, sizeof(psh)); psh.dwSize = PROPSHEETHEADERA_V1_SIZE; @@ -271,7 +275,7 @@ static void test_disableowner(void) U3(psh).phpage = hpsp; psh.pfnCallback = disableowner_callback; - p = PropertySheetA(&psh); + p = pPropertySheetA(&psh); todo_wine ok(p == 0, "Expected 0, got %ld\n", p); ok(IsWindowEnabled(parenthwnd) != 0, "parent window should be enabled\n"); @@ -357,25 +361,25 @@ static void test_wiznavigation(void) psp[0].hInstance = GetModuleHandleA(NULL); U(psp[0]).pszTemplate = (LPCSTR)MAKEINTRESOURCE(IDD_PROP_PAGE_INTRO); psp[0].pfnDlgProc = nav_page_proc; - hpsp[0] = CreatePropertySheetPageA(&psp[0]); + hpsp[0] = pCreatePropertySheetPageA(&psp[0]); psp[1].dwSize = sizeof(PROPSHEETPAGEA); psp[1].hInstance = GetModuleHandleA(NULL); U(psp[1]).pszTemplate = (LPCSTR)MAKEINTRESOURCE(IDD_PROP_PAGE_EDIT); psp[1].pfnDlgProc = nav_page_proc; - hpsp[1] = CreatePropertySheetPageA(&psp[1]); + hpsp[1] = pCreatePropertySheetPageA(&psp[1]); psp[2].dwSize = sizeof(PROPSHEETPAGEA); psp[2].hInstance = GetModuleHandleA(NULL); U(psp[2]).pszTemplate = (LPCSTR)MAKEINTRESOURCE(IDD_PROP_PAGE_RADIO); psp[2].pfnDlgProc = nav_page_proc; - hpsp[2] = CreatePropertySheetPageA(&psp[2]); + hpsp[2] = pCreatePropertySheetPageA(&psp[2]); psp[3].dwSize = sizeof(PROPSHEETPAGEA); psp[3].hInstance = GetModuleHandleA(NULL); U(psp[3]).pszTemplate = (LPCSTR)MAKEINTRESOURCE(IDD_PROP_PAGE_EXIT); psp[3].pfnDlgProc = nav_page_proc; - hpsp[3] = CreatePropertySheetPageA(&psp[3]); + hpsp[3] = pCreatePropertySheetPageA(&psp[3]); /* set up the property sheet dialog */ memset(&psh, 0, sizeof(psh)); @@ -385,7 +389,7 @@ static void test_wiznavigation(void) psh.nPages = 4; psh.hwndParent = GetDesktopWindow(); U3(psh).phpage = hpsp; - hdlg = (HWND)PropertySheetA(&psh); + hdlg = (HWND)pPropertySheetA(&psh); ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle %p\n", hdlg); ok(active_page == 0, "Active page should be 0. Is: %d\n", active_page); @@ -480,7 +484,7 @@ static void test_buttons(void) psp.pfnDlgProc = page_dlg_proc; psp.lParam = 0; - hpsp[0] = CreatePropertySheetPageA(&psp); + hpsp[0] = pCreatePropertySheetPageA(&psp); memset(&psh, 0, sizeof(psh)); psh.dwSize = PROPSHEETHEADERA_V1_SIZE; @@ -491,7 +495,7 @@ static void test_buttons(void) U3(psh).phpage = hpsp; psh.pfnCallback = sheet_callback; - hdlg = (HWND)PropertySheetA(&psh); + hdlg = (HWND)pPropertySheetA(&psh); ok(hdlg != INVALID_HANDLE_VALUE, "got null handle\n"); /* OK button */ @@ -587,7 +591,7 @@ static void test_custom_default_button(void) add_button_has_been_pressed = FALSE; /* Create the modeless property sheet. */ - hdlg = (HWND)PropertySheetA(&psh); + hdlg = (HWND)pPropertySheetA(&psh); ok(hdlg != INVALID_HANDLE_VALUE, "Cannot create the property sheet\n"); /* Set the Add button as the default button. */ @@ -798,7 +802,7 @@ static void test_messages(void) psp.pfnDlgProc = page_dlg_proc_messages; psp.lParam = 0; - hpsp[0] = CreatePropertySheetPageA(&psp); + hpsp[0] = pCreatePropertySheetPageA(&psp); memset(&psh, 0, sizeof(psh)); psh.dwSize = PROPSHEETHEADERA_V1_SIZE; @@ -810,7 +814,7 @@ static void test_messages(void) U3(psh).phpage = hpsp; psh.pfnCallback = sheet_callback_messages; - hdlg = (HWND)PropertySheetA(&psh); + hdlg = (HWND)pPropertySheetA(&psh); ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle %p\n", hdlg); ShowWindow(hdlg,SW_NORMAL); @@ -839,15 +843,15 @@ static void test_PSM_ADDPAGE(void) psp.lParam = 0; /* multiple pages with the same data */ - hpsp[0] = CreatePropertySheetPageA(&psp); - hpsp[1] = CreatePropertySheetPageA(&psp); - hpsp[2] = CreatePropertySheetPageA(&psp); + hpsp[0] = pCreatePropertySheetPageA(&psp); + hpsp[1] = pCreatePropertySheetPageA(&psp); + hpsp[2] = pCreatePropertySheetPageA(&psp); U(psp).pszTemplate = (LPCSTR)MAKEINTRESOURCE(IDD_PROP_PAGE_ERROR); - hpsp[3] = CreatePropertySheetPageA(&psp); + hpsp[3] = pCreatePropertySheetPageA(&psp); psp.dwFlags = PSP_PREMATURE; - hpsp[4] = CreatePropertySheetPageA(&psp); + hpsp[4] = pCreatePropertySheetPageA(&psp); memset(&psh, 0, sizeof(psh)); psh.dwSize = PROPSHEETHEADERA_V1_SIZE; @@ -857,7 +861,7 @@ static void test_PSM_ADDPAGE(void) psh.hwndParent = GetDesktopWindow(); U3(psh).phpage = hpsp; - hdlg = (HWND)PropertySheetA(&psh); + hdlg = (HWND)pPropertySheetA(&psh); ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle %p\n", hdlg); /* add pages one by one */ @@ -906,7 +910,7 @@ if (0) r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); ok(r == 3, "got %d\n", r); - DestroyPropertySheetPage(hpsp[4]); + pDestroyPropertySheetPage(hpsp[4]); DestroyWindow(hdlg); } @@ -929,15 +933,15 @@ static void test_PSM_INSERTPAGE(void) psp.lParam = 0; /* multiple pages with the same data */ - hpsp[0] = CreatePropertySheetPageA(&psp); - hpsp[1] = CreatePropertySheetPageA(&psp); - hpsp[2] = CreatePropertySheetPageA(&psp); + hpsp[0] = pCreatePropertySheetPageA(&psp); + hpsp[1] = pCreatePropertySheetPageA(&psp); + hpsp[2] = pCreatePropertySheetPageA(&psp); U(psp).pszTemplate = (LPCSTR)MAKEINTRESOURCE(IDD_PROP_PAGE_ERROR); - hpsp[3] = CreatePropertySheetPageA(&psp); + hpsp[3] = pCreatePropertySheetPageA(&psp); psp.dwFlags = PSP_PREMATURE; - hpsp[4] = CreatePropertySheetPageA(&psp); + hpsp[4] = pCreatePropertySheetPageA(&psp); memset(&psh, 0, sizeof(psh)); psh.dwSize = PROPSHEETHEADERA_V1_SIZE; @@ -947,7 +951,7 @@ static void test_PSM_INSERTPAGE(void) psh.hwndParent = GetDesktopWindow(); U3(psh).phpage = hpsp; - hdlg = (HWND)PropertySheetA(&psh); + hdlg = (HWND)pPropertySheetA(&psh); ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle %p\n", hdlg); /* add pages one by one */ @@ -1000,7 +1004,7 @@ if (0) r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); ok(r == 3, "got %d\n", r); - DestroyPropertySheetPage(hpsp[4]); + pDestroyPropertySheetPage(hpsp[4]); DestroyWindow(hdlg); } @@ -1090,7 +1094,7 @@ static void test_CreatePropertySheetPage(void) for (page.u.pageA.dwSize = PROPSHEETPAGEA_V1_SIZE - 1; page.u.pageA.dwSize <= PROPSHEETPAGEA_V4_SIZE + 1; page.u.pageA.dwSize++) { page.addref_called = 0; - hpsp = CreatePropertySheetPageA(&page.u.pageA); + hpsp = pCreatePropertySheetPageA(&page.u.pageA); if (page.u.pageA.dwSize < PROPSHEETPAGEA_V1_SIZE) ok(hpsp == NULL, "Expected failure, size %u\n", page.u.pageA.dwSize); @@ -1103,7 +1107,7 @@ static void test_CreatePropertySheetPage(void) if (hpsp) { page.release_called = 0; - ret = DestroyPropertySheetPage(hpsp); + ret = pDestroyPropertySheetPage(hpsp); ok(ret, "Failed to destroy a page\n"); ok(page.release_called == 1, "Expected RELEASE callback message\n"); } @@ -1119,7 +1123,7 @@ static void test_CreatePropertySheetPage(void) for (page.u.pageW.dwSize = PROPSHEETPAGEW_V1_SIZE - 1; page.u.pageW.dwSize <= PROPSHEETPAGEW_V4_SIZE + 1; page.u.pageW.dwSize++) { page.addref_called = 0; - hpsp = CreatePropertySheetPageW(&page.u.pageW); + hpsp = pCreatePropertySheetPageW(&page.u.pageW); if (page.u.pageW.dwSize < PROPSHEETPAGEW_V1_SIZE) ok(hpsp == NULL, "Expected failure, size %u\n", page.u.pageW.dwSize); @@ -1132,13 +1136,25 @@ static void test_CreatePropertySheetPage(void) if (hpsp) { page.release_called = 0; - ret = DestroyPropertySheetPage(hpsp); + ret = pDestroyPropertySheetPage(hpsp); ok(ret, "Failed to destroy a page\n"); ok(page.release_called == 1, "Expected RELEASE callback message\n"); } } } +static void init_functions(void) +{ + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); + X(CreatePropertySheetPageA); + X(CreatePropertySheetPageW); + X(DestroyPropertySheetPage); + X(PropertySheetA); +#undef X +} + START_TEST(propsheet) { detect_locale(); @@ -1150,6 +1166,8 @@ START_TEST(propsheet) SetProcessDefaultLayout(LAYOUT_RTL); } + init_functions(); + test_title(); test_nopage(); test_disableowner(); diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 6430ba2b61..2ff4cebdf9 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -30,6 +30,9 @@ #include "wine/test.h" +static BOOL (WINAPI *pImageList_Destroy)(HIMAGELIST); +static HIMAGELIST (WINAPI *pImageList_LoadImageA)(HINSTANCE, LPCSTR, int, int, COLORREF, UINT, UINT); + static RECT height_change_notify_rect; static HWND hMainWnd; static int system_font_height; @@ -577,7 +580,7 @@ static void test_layout(void) check_sizes(); /* an image will increase the band height */ - himl = ImageList_LoadImageA(GetModuleHandleA("comctl32"), MAKEINTRESOURCEA(121), 24, 2, + himl = pImageList_LoadImageA(GetModuleHandleA("comctl32"), MAKEINTRESOURCEA(121), 24, 2, CLR_NONE, IMAGE_BITMAP, LR_DEFAULTCOLOR); ri.cbSize = sizeof(ri); ri.fMask = RBIM_IMAGELIST; @@ -658,7 +661,7 @@ static void test_layout(void) rbsize_results_free(); DestroyWindow(hRebar); - ImageList_Destroy(himl); + pImageList_Destroy(himl); } #if 0 /* use this to generate more tests */ @@ -1125,26 +1128,22 @@ static void test_notification(void) DestroyWindow(rebar); } +static void init_functions(void) +{ + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); + X(ImageList_Destroy); + X(ImageList_LoadImageA); +#undef X +} + START_TEST(rebar) { - HMODULE hComctl32; - BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); - INITCOMMONCONTROLSEX iccex; MSG msg; init_system_font_height(); - - /* LoadLibrary is needed. This file has no reference to functions in comctl32 */ - hComctl32 = LoadLibraryA("comctl32.dll"); - pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); - if (!pInitCommonControlsEx) - { - win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); - return; - } - iccex.dwSize = sizeof(iccex); - iccex.dwICC = ICC_COOL_CLASSES; - pInitCommonControlsEx(&iccex); + init_functions(); hMainWnd = create_parent_window(); @@ -1169,6 +1168,4 @@ out: DispatchMessageA(&msg); } DestroyWindow(hMainWnd); - - FreeLibrary(hComctl32); } diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index a394beb42a..f2fe1abf98 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -43,6 +43,8 @@ static INT g_dpisize; static int g_wmdrawitm_ctr; static WNDPROC g_wndproc_saved; +static BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); + static HWND create_status_control(DWORD style, DWORD exstyle) { HWND hWndStatus; @@ -584,17 +586,32 @@ static void test_notify(void) ok(g_got_contextmenu, "WM_RBUTTONUP did not activate the context menu!\n"); } +static void init_functions(void) +{ + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); + X(InitCommonControlsEx); +#undef X +} + START_TEST(status) { + INITCOMMONCONTROLSEX iccex; + + init_functions(); + hinst = GetModuleHandleA(NULL); + iccex.dwSize = sizeof(iccex); + iccex.dwICC = ICC_BAR_CLASSES; + pInitCommonControlsEx(&iccex); + g_hMainWnd = CreateWindowExA(0, "static", "", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 672+2*GetSystemMetrics(SM_CXSIZEFRAME), 226+GetSystemMetrics(SM_CYCAPTION)+2*GetSystemMetrics(SM_CYSIZEFRAME), NULL, NULL, GetModuleHandleA(NULL), 0); - InitCommonControls(); - register_subclass(); test_status_control(); diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c index 720c68e28d..abe63a1547 100644 --- a/dlls/comctl32/tests/subclass.c +++ b/dlls/comctl32/tests/subclass.c @@ -286,7 +286,7 @@ static BOOL init_function_pointers(void) HMODULE hmod; void *ptr; - hmod = GetModuleHandleA("comctl32.dll"); + hmod = LoadLibraryA("comctl32.dll"); ok(hmod != NULL, "got %p\n", hmod); /* Functions have to be loaded by ordinal. Only XP and W2K3 export diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 72165c8100..0bfbb38a58 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -40,6 +40,11 @@ #define TabWidthPadded(padd_x, num) (DEFAULT_MIN_TAB_WIDTH - (TAB_PADDING_X - (padd_x)) * num) +static HIMAGELIST (WINAPI *pImageList_Create)(INT,INT,UINT,INT,INT); +static BOOL (WINAPI *pImageList_Destroy)(HIMAGELIST); +static INT (WINAPI *pImageList_GetImageCount)(HIMAGELIST); +static INT (WINAPI *pImageList_ReplaceIcon)(HIMAGELIST,INT,HICON); + static void CheckSize(HWND hwnd, INT width, INT height, const char *msg, int line) { RECT r; @@ -470,7 +475,7 @@ static void test_tab(INT nMinTabWidth) { HWND hwTab; RECT rTab; - HIMAGELIST himl = ImageList_Create(21, 21, ILC_COLOR, 3, 4); + HIMAGELIST himl = pImageList_Create(21, 21, ILC_COLOR, 3, 4); SIZE size; HDC hdc; HFONT hOldFont; @@ -608,7 +613,7 @@ static void test_tab(INT nMinTabWidth) DestroyWindow (hwTab); - ImageList_Destroy(himl); + pImageList_Destroy(himl); } static void test_width(void) @@ -1165,12 +1170,12 @@ static void test_removeimage(void) INT i; TCITEMA item; HICON hicon; - HIMAGELIST himl = ImageList_Create(16, 16, ILC_COLOR, 3, 4); + HIMAGELIST himl = pImageList_Create(16, 16, ILC_COLOR, 3, 4); hicon = CreateIcon(NULL, 16, 16, 1, 1, bits, bits); - ImageList_AddIcon(himl, hicon); - ImageList_AddIcon(himl, hicon); - ImageList_AddIcon(himl, hicon); + pImageList_ReplaceIcon(himl, -1, hicon); + pImageList_ReplaceIcon(himl, -1, hicon); + pImageList_ReplaceIcon(himl, -1, hicon); hwTab = create_tabcontrol(TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE); SendMessageA(hwTab, TCM_SETIMAGELIST, 0, (LPARAM)himl); @@ -1185,7 +1190,8 @@ static void test_removeimage(void) /* remove image middle image */ SendMessageA(hwTab, TCM_REMOVEIMAGE, 1, 0); - expect(2, ImageList_GetImageCount(himl)); + i = pImageList_GetImageCount(himl); + ok(i == 2, "Unexpected image count %d.\n", i); item.iImage = -1; SendMessageA(hwTab, TCM_GETITEMA, 0, (LPARAM)&item); expect(0, item.iImage); @@ -1197,7 +1203,8 @@ static void test_removeimage(void) expect(1, item.iImage); /* remove first image */ SendMessageA(hwTab, TCM_REMOVEIMAGE, 0, 0); - expect(1, ImageList_GetImageCount(himl)); + i = pImageList_GetImageCount(himl); + ok(i == 1, "Unexpected image count %d.\n", i); item.iImage = 0; SendMessageA(hwTab, TCM_GETITEMA, 0, (LPARAM)&item); expect(-1, item.iImage); @@ -1209,7 +1216,8 @@ static void test_removeimage(void) expect(0, item.iImage); /* remove the last one */ SendMessageA(hwTab, TCM_REMOVEIMAGE, 0, 0); - expect(0, ImageList_GetImageCount(himl)); + i = pImageList_GetImageCount(himl); + ok(i == 0, "Unexpected image count %d.\n", i); for(i = 0; i < 3; i++) { item.iImage = 0; SendMessageA(hwTab, TCM_GETITEMA, i, (LPARAM)&item); @@ -1217,7 +1225,7 @@ static void test_removeimage(void) } DestroyWindow(hwTab); - ImageList_Destroy(himl); + pImageList_Destroy(himl); DestroyIcon(hicon); } @@ -1423,6 +1431,18 @@ static void test_create(void) } } +static void init_functions(void) +{ + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); + X(ImageList_Create); + X(ImageList_Destroy); + X(ImageList_GetImageCount); + X(ImageList_ReplaceIcon); +#undef X +} + START_TEST(tab) { LOGFONTA logfont; @@ -1434,7 +1454,7 @@ START_TEST(tab) logfont.lfCharSet = ANSI_CHARSET; hFont = CreateFontIndirectA(&logfont); - InitCommonControls(); + init_functions(); test_width(); diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 2c1b789484..38b8339378 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -37,6 +37,13 @@ #define PARENT_SEQ_INDEX 0 #define NUM_MSG_SEQUENCES 1 +static HWND (WINAPI *pCreateToolbarEx)(HWND, DWORD, UINT, INT, HINSTANCE, UINT_PTR, const TBBUTTON *, + INT, INT, INT, INT, INT, UINT); +static BOOL (WINAPI *pImageList_Destroy)(HIMAGELIST); +static INT (WINAPI *pImageList_GetImageCount)(HIMAGELIST); +static BOOL (WINAPI *pImageList_GetIconSize)(HIMAGELIST, int *, int *); +static HIMAGELIST (WINAPI *pImageList_LoadImageA)(HINSTANCE, LPCSTR, int, int, COLORREF, UINT, UINT); + static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; static HWND hMainWnd; @@ -376,7 +383,7 @@ static void basic_test(void) MakeButton(buttons+3, 1003, TBSTYLE_SEP|TBSTYLE_GROUP, 0); MakeButton(buttons+6, 1006, TBSTYLE_SEP, 0); - hToolbar = CreateToolbarEx(hMainWnd, + hToolbar = pCreateToolbarEx(hMainWnd, WS_VISIBLE | WS_CLIPCHILDREN | CCS_TOP | WS_CHILD | TBSTYLE_LIST, 100, @@ -482,8 +489,8 @@ static void add_128x15_bitmap(HWND hToolbar, int nCmds) HIMAGELIST himl = (HIMAGELIST)SendMessageA(hToolbar, TB_GETIMAGELIST, 0, 0); \ ok(himl != NULL, "No image list\n"); \ if (himl != NULL) {\ - ok(ImageList_GetImageCount(himl) == count, "Images count mismatch - %d vs %d\n", count, ImageList_GetImageCount(himl)); \ - ImageList_GetIconSize(himl, &cx, &cy); \ + ok(pImageList_GetImageCount(himl) == count, "Images count mismatch - %d vs %d\n", count, pImageList_GetImageCount(himl)); \ + pImageList_GetIconSize(himl, &cx, &cy); \ ok(cx == dx && cy == dy, "Icon size mismatch - %dx%d vs %dx%d\n", dx, dy, cx, cy); \ } \ } @@ -515,11 +522,11 @@ static void test_add_bitmap(void) himl = (HIMAGELIST)SendMessageA(hToolbar, TB_GETIMAGELIST, 0, 0); ok(himl != NULL, "Got %p\n", himl); - ret = ImageList_GetIconSize(himl, &cx, &cy); + ret = pImageList_GetIconSize(himl, &cx, &cy); ok(ret, "Got %d\n", ret); ok(cx == cy, "Got %d x %d\n", cx, cy); - count = ImageList_GetImageCount(himl); + count = pImageList_GetImageCount(himl); /* Image count */ switch (id) @@ -688,7 +695,7 @@ static void test_add_bitmap(void) /* the control can add bitmaps to an existing image list */ rebuild_toolbar(&hToolbar); - himl = ImageList_LoadImageA(GetModuleHandleA(NULL), (LPCSTR)MAKEINTRESOURCE(IDB_BITMAP_80x15), + himl = pImageList_LoadImageA(GetModuleHandleA(NULL), (LPCSTR)MAKEINTRESOURCE(IDB_BITMAP_80x15), 20, 2, CLR_NONE, IMAGE_BITMAP, LR_DEFAULTCOLOR); ok(himl != NULL, "failed to create imagelist\n"); ok(SendMessageA(hToolbar, TB_SETIMAGELIST, 0, (LPARAM)himl) == 0, "TB_SETIMAGELIST failed\n"); @@ -709,7 +716,7 @@ static void test_add_bitmap(void) addbmp.hInst = HINST_COMMCTRL; addbmp.nID = IDB_STD_SMALL_COLOR; rebuild_toolbar(&hToolbar); - ImageList_Destroy(himl); + pImageList_Destroy(himl); ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&addbmp) == 0, "TB_ADDBITMAP - unexpected return\n"); CHECK_IMAGELIST(15, 16, 16); @@ -1506,14 +1513,14 @@ static void test_sizes(void) /* TB_SETIMAGELIST always changes the height but the width only if necessary */ SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(100, 100)); - himl = ImageList_LoadImageA(GetModuleHandleA(NULL), (LPCSTR)MAKEINTRESOURCE(IDB_BITMAP_80x15), + himl = pImageList_LoadImageA(GetModuleHandleA(NULL), (LPCSTR)MAKEINTRESOURCE(IDB_BITMAP_80x15), 20, 2, CLR_NONE, IMAGE_BITMAP, LR_DEFAULTCOLOR); ok(SendMessageA(hToolbar, TB_SETIMAGELIST, 0, (LPARAM)himl) == 0, "TB_SETIMAGELIST failed\n"); check_button_size(hToolbar, 100, 21); SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(100, 100)); check_button_size(hToolbar, 100, 100); /* But there are no update when we change imagelist, and image sizes are the same */ - himl2 = ImageList_LoadImageA(GetModuleHandleA(NULL), (LPCSTR)MAKEINTRESOURCE(IDB_BITMAP_128x15), + himl2 = pImageList_LoadImageA(GetModuleHandleA(NULL), (LPCSTR)MAKEINTRESOURCE(IDB_BITMAP_128x15), 20, 2, CLR_NONE, IMAGE_BITMAP, LR_DEFAULTCOLOR); ok(SendMessageA(hToolbar, TB_SETIMAGELIST, 0, (LRESULT)himl2) == (LRESULT)himl, "TB_SETIMAGELIST failed\n"); check_button_size(hToolbar, 100, 100); @@ -1538,8 +1545,8 @@ static void test_sizes(void) check_sizes_todo(0x30); /* some small problems with BTNS_AUTOSIZE button sizes */ rebuild_toolbar(&hToolbar); - ImageList_Destroy(himl); - ImageList_Destroy(himl2); + pImageList_Destroy(himl); + pImageList_Destroy(himl2); SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons3[3]); check_button_size(hToolbar, 7 + string_width(STRING2), 23 + fontheight); @@ -1823,43 +1830,43 @@ static void test_createtoolbarex(void) TBBUTTON btns[3]; ZeroMemory(&btns, sizeof(btns)); - hToolbar = CreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, + hToolbar = pCreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, 3, 20, 20, 16, 16, sizeof(TBBUTTON)); CHECK_IMAGELIST(16, 20, 20); compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), 0x1a001b, "%x"); DestroyWindow(hToolbar); - hToolbar = CreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, + hToolbar = pCreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, 3, 4, 4, 16, 16, sizeof(TBBUTTON)); CHECK_IMAGELIST(32, 4, 4); compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), 0xa000b, "%x"); DestroyWindow(hToolbar); - hToolbar = CreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, + hToolbar = pCreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, 3, 0, 8, 12, 12, sizeof(TBBUTTON)); CHECK_IMAGELIST(16, 12, 12); compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), 0x120013, "%x"); DestroyWindow(hToolbar); - hToolbar = CreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, + hToolbar = pCreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, 3, -1, 8, 12, 12, sizeof(TBBUTTON)); CHECK_IMAGELIST(16, 12, 8); compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), 0xe0013, "%x"); DestroyWindow(hToolbar); - hToolbar = CreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, + hToolbar = pCreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, 3, -1, 8, -1, 12, sizeof(TBBUTTON)); CHECK_IMAGELIST(16, 16, 8); compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), 0xe0017, "%x"); DestroyWindow(hToolbar); - hToolbar = CreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, + hToolbar = pCreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, 3, 0, 0, 12, -1, sizeof(TBBUTTON)); CHECK_IMAGELIST(16, 12, 16); compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), 0x160013, "%x"); DestroyWindow(hToolbar); - hToolbar = CreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, + hToolbar = pCreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, 3, 0, 0, 0, 12, sizeof(TBBUTTON)); CHECK_IMAGELIST(16, 16, 16); compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), 0x160017, "%x"); @@ -1928,7 +1935,7 @@ static void test_setrows(void) MakeButton(buttons+i, 1000+i, TBSTYLE_FLAT | TBSTYLE_CHECKGROUP, 0); /* Test 1 - 9 buttons */ - hToolbar = CreateToolbarEx(hMainWnd, + hToolbar = pCreateToolbarEx(hMainWnd, WS_VISIBLE | WS_CLIPCHILDREN | WS_CHILD | CCS_NORESIZE | CCS_NOPARENTALIGN | CCS_NOMOVEY | CCS_TOP, 0, @@ -2047,7 +2054,7 @@ static void test_get_set_style(void) MakeButton(buttons+3, 1003, TBSTYLE_SEP|TBSTYLE_GROUP, 0); MakeButton(buttons+6, 1006, TBSTYLE_SEP, 0); - hToolbar = CreateToolbarEx(hMainWnd, + hToolbar = pCreateToolbarEx(hMainWnd, WS_VISIBLE | WS_CLIPCHILDREN | CCS_TOP | WS_CHILD | TBSTYLE_LIST, 100, @@ -2507,6 +2514,19 @@ static void test_imagelist(void) DestroyWindow(hwnd); } +static void init_functions(void) +{ + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); + X(CreateToolbarEx); + X(ImageList_GetIconSize); + X(ImageList_GetImageCount); + X(ImageList_LoadImageA); + X(ImageList_Destroy); +#undef X +} + START_TEST(toolbar) { WNDCLASSA wc; @@ -2514,9 +2534,8 @@ START_TEST(toolbar) RECT rc; init_msg_sequences(sequences, NUM_MSG_SEQUENCES); + init_functions(); - InitCommonControls(); - wc.style = CS_HREDRAW | CS_VREDRAW; wc.cbClsExtra = 0; wc.cbWndExtra = 0; diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index be6ab400a0..7e82604376 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -1057,7 +1057,7 @@ static void test_margin(void) START_TEST(tooltips) { - InitCommonControls(); + LoadLibraryA("comctl32.dll"); test_create_tooltip(); test_customdraw(); diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 9cc8b277ee..31845d10e0 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -1296,8 +1296,9 @@ static void test_create(void) START_TEST(trackbar) { + LoadLibraryA("comctl32.dll"); + init_msg_sequences(sequences, NUM_MSG_SEQUENCE); - InitCommonControls(); /* create parent window */ hWndParent = create_parent_window(); diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index a014625a0a..51404af089 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -33,6 +33,7 @@ #include "v6util.h" #include "msg.h" +static BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); static const char *TEST_CALLBACK_TEXT = "callback_text"; static TVITEMA g_item_expanding, g_item_expanded; @@ -2666,27 +2667,28 @@ static void test_right_click(void) DestroyWindow(hTree); } +static void init_functions(void) +{ + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); + X(InitCommonControlsEx); +#undef X +} + START_TEST(treeview) { - HMODULE hComctl32; - BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); + INITCOMMONCONTROLSEX iccex; + ULONG_PTR ctx_cookie; + HANDLE hCtx; WNDCLASSA wc; MSG msg; - ULONG_PTR ctx_cookie; - HANDLE hCtx; - - hComctl32 = GetModuleHandleA("comctl32.dll"); - pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); - if (pInitCommonControlsEx) - { - INITCOMMONCONTROLSEX iccex; - iccex.dwSize = sizeof(iccex); - iccex.dwICC = ICC_TREEVIEW_CLASSES; - pInitCommonControlsEx(&iccex); - } - else - InitCommonControls(); + init_functions(); + + iccex.dwSize = sizeof(iccex); + iccex.dwICC = ICC_TREEVIEW_CLASSES; + pInitCommonControlsEx(&iccex); init_msg_sequences(sequences, NUM_MSG_SEQUENCES); init_msg_sequences(item_sequence, 1); diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 639e7802a9..f549c41583 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -63,6 +63,8 @@ static HWND parent_wnd, g_edit; +static HWND (WINAPI *pCreateUpDownControl)(DWORD, INT, INT, INT, INT, + HWND, INT, HINSTANCE, HWND, INT, INT, INT); static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; @@ -882,7 +884,7 @@ static void test_CreateUpDownControl(void) RECT rect; GetClientRect(parent_wnd, &rect); - updown = CreateUpDownControl(WS_CHILD | WS_BORDER | WS_VISIBLE, + updown = pCreateUpDownControl(WS_CHILD | WS_BORDER | WS_VISIBLE, 0, 0, rect.right, rect.bottom, parent_wnd, 1, GetModuleHandleA(NULL), g_edit, 100, 10, 50); ok(updown != NULL, "Failed to create control.\n"); @@ -898,13 +900,22 @@ static void test_CreateUpDownControl(void) DestroyWindow(updown); } -START_TEST(updown) +static void init_functions(void) { - HMODULE mod = GetModuleHandleA("comctl32.dll"); + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); +#define X2(f, ord) p##f = (void*)GetProcAddress(hComCtl32, (const char *)ord); + X(CreateUpDownControl); + X2(SetWindowSubclass, 410); +#undef X +#undef X2 +} - pSetWindowSubclass = (void*)GetProcAddress(mod, (LPSTR)410); +START_TEST(updown) +{ + init_functions(); - InitCommonControls(); init_msg_sequences(sequences, NUM_MSG_SEQUENCES); parent_wnd = create_parent_window(); -- 2.15.1

1 0

[PATCH] comctl32/tests: Link to comctl32.dll dynamically
by Nikolay Sivov 24 Jan '18

24 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/Makefile.in | 2 +- dlls/comctl32/tests/animate.c | 22 +---------- dlls/comctl32/tests/combo.c | 29 +++++++------- dlls/comctl32/tests/datetime.c | 15 ------- dlls/comctl32/tests/dpa.c | 67 +++++++++++++------------------- dlls/comctl32/tests/header.c | 38 +++++++++--------- dlls/comctl32/tests/imagelist.c | 36 ++++++++--------- dlls/comctl32/tests/ipaddress.c | 25 ------------ dlls/comctl32/tests/listview.c | 74 +++++++++++++++++++---------------- dlls/comctl32/tests/monthcal.c | 17 -------- dlls/comctl32/tests/mru.c | 30 +++++++------- dlls/comctl32/tests/pager.c | 1 - dlls/comctl32/tests/progress.c | 14 ------- dlls/comctl32/tests/propsheet.c | 86 +++++++++++++++++++++++++---------------- dlls/comctl32/tests/rebar.c | 35 ++++++++--------- dlls/comctl32/tests/status.c | 2 - dlls/comctl32/tests/subclass.c | 2 +- dlls/comctl32/tests/tab.c | 42 ++++++++++++++------ dlls/comctl32/tests/toolbar.c | 63 +++++++++++++++++++----------- dlls/comctl32/tests/tooltips.c | 2 +- dlls/comctl32/tests/trackbar.c | 3 +- dlls/comctl32/tests/treeview.c | 14 ------- dlls/comctl32/tests/updown.c | 21 +++++++--- 23 files changed, 296 insertions(+), 344 deletions(-) diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index f93ff2585d..4669efcf2b 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = comctl32.dll -IMPORTS = comctl32 ole32 user32 gdi32 advapi32 +IMPORTS = ole32 user32 gdi32 advapi32 C_SRCS = \ animate.c \ diff --git a/dlls/comctl32/tests/animate.c b/dlls/comctl32/tests/animate.c index fab345bb47..400de55b5e 100644 --- a/dlls/comctl32/tests/animate.c +++ b/dlls/comctl32/tests/animate.c @@ -108,26 +108,6 @@ static void create_animate(DWORD parent_style, DWORD animate_style) update_window(hAnimateParentWnd); } -static void init(void) -{ - HMODULE hComctl32; - BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); - - hComctl32 = GetModuleHandleA("comctl32.dll"); - pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); - if (pInitCommonControlsEx) - { - INITCOMMONCONTROLSEX iccex; - iccex.dwSize = sizeof(iccex); - iccex.dwICC = ICC_ANIMATE_CLASS; - pInitCommonControlsEx(&iccex); - } - else - InitCommonControls(); - - shell32 = LoadLibraryA("Shell32.dll"); -} - static void destroy_animate(void) { MSG msg; @@ -175,7 +155,7 @@ static void test_play(void) START_TEST(animate) { - init(); + shell32 = LoadLibraryA("Shell32.dll"); test_play(); diff --git a/dlls/comctl32/tests/combo.c b/dlls/comctl32/tests/combo.c index ef7c3f796b..895d9429b4 100644 --- a/dlls/comctl32/tests/combo.c +++ b/dlls/comctl32/tests/combo.c @@ -480,25 +480,20 @@ static LRESULT CALLBACK ComboExTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, L return 0L; } -static BOOL init(void) +static void init_functions(void) { - HMODULE hComctl32; - BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); - WNDCLASSA wc; - INITCOMMONCONTROLSEX iccex; + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); - hComctl32 = GetModuleHandleA("comctl32.dll"); - pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); - if (!pInitCommonControlsEx) - { - win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); - return FALSE; - } - iccex.dwSize = sizeof(iccex); - iccex.dwICC = ICC_USEREX_CLASSES; - pInitCommonControlsEx(&iccex); +#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); +#define X2(f, ord) p##f = (void*)GetProcAddress(hComCtl32, (const char *)ord); + X2(SetWindowSubclass, 410); +#undef X +#undef X2 +} - pSetWindowSubclass = (void*)GetProcAddress(hComctl32, (LPSTR)410); +static BOOL init(void) +{ + WNDCLASSA wc; wc.style = CS_HREDRAW | CS_VREDRAW; wc.cbClsExtra = 0; @@ -1161,6 +1156,8 @@ START_TEST(combo) ULONG_PTR ctx_cookie; HANDLE hCtx; + init_functions(); + if (!init()) return; diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index c9407bef61..691eac9813 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -779,21 +779,6 @@ static void test_dts_shownone(void) START_TEST(datetime) { - HMODULE hComctl32; - BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); - INITCOMMONCONTROLSEX iccex; - - hComctl32 = GetModuleHandleA("comctl32.dll"); - pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); - if (!pInitCommonControlsEx) - { - win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); - return; - } - iccex.dwSize = sizeof(iccex); - iccex.dwICC = ICC_DATE_CLASSES; - pInitCommonControlsEx(&iccex); - init_msg_sequences(sequences, NUM_MSG_SEQUENCES); test_dtm_set_format(); diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index 4eb32a4187..c795c14f4e 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -59,38 +59,33 @@ static INT (WINAPI *pDPA_Search)(HDPA,PVOID,INT,PFNDPACOMPARE,LPARAM,UINT); static BOOL (WINAPI *pDPA_SetPtr)(HDPA,INT,PVOID); static BOOL (WINAPI *pDPA_Sort)(HDPA,PFNDPACOMPARE,LPARAM); -#define COMCTL32_GET_PROC(func, ord) \ - ((p ## func = (PVOID)GetProcAddress(hcomctl32,(LPCSTR)ord)) ? 1 \ - : (trace( #func " not exported\n"), 0)) - -static BOOL InitFunctionPtrs(HMODULE hcomctl32) +static void init_functions(void) { - /* 4.00+ */ - if(COMCTL32_GET_PROC(DPA_Clone, 331) && - COMCTL32_GET_PROC(DPA_Create, 328) && - COMCTL32_GET_PROC(DPA_CreateEx, 340) && - COMCTL32_GET_PROC(DPA_DeleteAllPtrs, 337) && - COMCTL32_GET_PROC(DPA_DeletePtr, 336) && - COMCTL32_GET_PROC(DPA_Destroy, 329) && - COMCTL32_GET_PROC(DPA_GetPtr, 332) && - COMCTL32_GET_PROC(DPA_GetPtrIndex, 333) && - COMCTL32_GET_PROC(DPA_Grow, 330) && - COMCTL32_GET_PROC(DPA_InsertPtr, 334) && - COMCTL32_GET_PROC(DPA_Search, 339) && - COMCTL32_GET_PROC(DPA_SetPtr, 335) && - COMCTL32_GET_PROC(DPA_Sort, 338)) - { - /* 4.71+ */ - COMCTL32_GET_PROC(DPA_DestroyCallback, 386) && - COMCTL32_GET_PROC(DPA_EnumCallback, 385) && - COMCTL32_GET_PROC(DPA_LoadStream, 9) && - COMCTL32_GET_PROC(DPA_Merge, 11) && - COMCTL32_GET_PROC(DPA_SaveStream, 10); - - return TRUE; - } + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); - return FALSE; +#define X2(f, ord) p##f = (void*)GetProcAddress(hComCtl32, (const char *)ord); + /* 4.00+ */ + X2(DPA_Clone, 331); + X2(DPA_Create, 328); + X2(DPA_CreateEx, 340); + X2(DPA_DeleteAllPtrs, 337); + X2(DPA_DeletePtr, 336); + X2(DPA_Destroy, 329); + X2(DPA_GetPtr, 332); + X2(DPA_GetPtrIndex, 333); + X2(DPA_Grow, 330); + X2(DPA_InsertPtr, 334); + X2(DPA_Search, 339); + X2(DPA_SetPtr, 335); + X2(DPA_Sort, 338); + + /* 4.71+ */ + X2(DPA_DestroyCallback, 386); + X2(DPA_EnumCallback, 385); + X2(DPA_LoadStream, 9); + X2(DPA_Merge, 11); + X2(DPA_SaveStream, 10); +#undef X2 } /* Callbacks */ @@ -628,7 +623,7 @@ static void test_DPA_LoadStream(void) dpa = NULL; hRes = pDPA_LoadStream(&dpa, CB_Load, pStm, NULL); expect(S_OK, hRes); - DPA_Destroy(dpa); + pDPA_Destroy(dpa); /* try with altered dwData2 field */ header.dwSize = sizeof(header); @@ -742,15 +737,7 @@ if (0) { START_TEST(dpa) { - HMODULE hcomctl32; - - hcomctl32 = GetModuleHandleA("comctl32.dll"); - - if(!InitFunctionPtrs(hcomctl32)) - { - win_skip("Needed functions are not available\n"); - return; - } + init_functions(); test_dpa(); test_DPA_Merge(); diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index ae75199be2..31610f0c9a 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -26,6 +26,9 @@ #include "v6util.h" #include "msg.h" +static HIMAGELIST (WINAPI *pImageList_Create)(int, int, UINT, int, int); +static BOOL (WINAPI *pImageList_Destroy)(HIMAGELIST); + typedef struct tagEXPECTEDNOTIFY { INT iCode; @@ -953,7 +956,7 @@ static void test_hdm_sethotdivider(HWND hParent) static void test_hdm_imageMessages(HWND hParent) { - HIMAGELIST hImageList = ImageList_Create (4, 4, 0, 1, 0); + HIMAGELIST hImageList = pImageList_Create (4, 4, 0, 1, 0); HIMAGELIST hIml; BOOL wasValid; HWND hChild; @@ -973,13 +976,13 @@ static void test_hdm_imageMessages(HWND hParent) hIml = (HIMAGELIST) SendMessageA(hChild, HDM_CREATEDRAGIMAGE, 0, 0); ok(hIml != NULL, "Expected non-NULL handle, got %p\n", hIml); - ImageList_Destroy(hIml); + pImageList_Destroy(hIml); ok_sequence(sequences, HEADER_SEQ_INDEX, imageMessages_seq, "imageMessages sequence testing", FALSE); DestroyWindow(hChild); - wasValid = ImageList_Destroy(hImageList); + wasValid = pImageList_Destroy(hImageList); ok(wasValid, "Header must not free image list at destruction!\n"); } @@ -1644,28 +1647,23 @@ static LRESULT CALLBACK HeaderTestWndProc(HWND hWnd, UINT msg, WPARAM wParam, LP return 0L; } +static void init_functions(void) +{ + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); + X(ImageList_Create); + X(ImageList_Destroy); +#undef X +} + static BOOL init(void) { - HMODULE hComctl32; - BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); WNDCLASSA wc; - INITCOMMONCONTROLSEX iccex; TEXTMETRICA tm; HFONT hOldFont; HDC hdc; - hComctl32 = GetModuleHandleA("comctl32.dll"); - pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); - if (!pInitCommonControlsEx) - { - win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); - return FALSE; - } - - iccex.dwSize = sizeof(iccex); - iccex.dwICC = ICC_USEREX_CLASSES; - pInitCommonControlsEx(&iccex); - wc.style = CS_HREDRAW | CS_VREDRAW; wc.cbClsExtra = 0; wc.cbWndExtra = 0; @@ -1821,6 +1819,8 @@ START_TEST(header) ULONG_PTR ctx_cookie; HANDLE hCtx; + init_functions(); + if (!init()) return; @@ -1852,6 +1852,8 @@ START_TEST(header) return; } + init_functions(); + /* comctl32 version 6 tests start here */ test_hdf_fixedwidth(parent_hwnd); test_hds_nosizing(parent_hwnd); diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 653467c999..3838563c38 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -85,6 +85,7 @@ static BOOL (WINAPI *pImageList_Write)(HIMAGELIST, IStream *); static HIMAGELIST (WINAPI *pImageList_Read)(IStream *); static BOOL (WINAPI *pImageList_Copy)(HIMAGELIST, int, HIMAGELIST, int, UINT); static HIMAGELIST (WINAPI *pImageList_LoadImageW)(HINSTANCE, LPCWSTR, int, int, COLORREF, UINT, UINT); +static BOOL (WINAPI *pImageList_Draw)(HIMAGELIST,INT,HDC,INT,INT,UINT); static HINSTANCE hinst; @@ -205,7 +206,7 @@ static HDC show_image(HWND hwnd, HIMAGELIST himl, int idx, int size, SetWindowTextA(hwnd, loc); hdc = GetDC(hwnd); - ImageList_Draw(himl, idx, hdc, 0, 0, ILD_TRANSPARENT); + pImageList_Draw(himl, idx, hdc, 0, 0, ILD_TRANSPARENT); force_redraw(hwnd); @@ -504,8 +505,8 @@ static void test_DrawIndirect(void) ok(hbm3 != 0, "no bitmap 3\n"); /* add three */ - ok(0 == ImageList_Add(himl, hbm1, 0),"failed to add bitmap 1\n"); - ok(1 == ImageList_Add(himl, hbm2, 0),"failed to add bitmap 2\n"); + ok(0 == pImageList_Add(himl, hbm1, 0),"failed to add bitmap 1\n"); + ok(1 == pImageList_Add(himl, hbm2, 0),"failed to add bitmap 2\n"); if (pImageList_SetImageCount) { @@ -1576,7 +1577,7 @@ cleanup: if(himl) { - ret = ImageList_Destroy(himl); + ret = pImageList_Destroy(himl); ok(ret, "ImageList_Destroy failed\n"); } } @@ -1599,21 +1600,21 @@ static void test_iimagelist(void) imgl = (IImageList*)createImageList(32, 32); ret = IImageList_AddRef(imgl); ok(ret == 2, "Expected 2, got %d\n", ret); - ret = ImageList_Destroy((HIMAGELIST)imgl); + ret = pImageList_Destroy((HIMAGELIST)imgl); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - ret = ImageList_Destroy((HIMAGELIST)imgl); + ret = pImageList_Destroy((HIMAGELIST)imgl); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); - ret = ImageList_Destroy((HIMAGELIST)imgl); + ret = pImageList_Destroy((HIMAGELIST)imgl); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); imgl = (IImageList*)createImageList(32, 32); ret = IImageList_AddRef(imgl); ok(ret == 2, "Expected 2, got %d\n", ret); - ret = ImageList_Destroy((HIMAGELIST)imgl); + ret = pImageList_Destroy((HIMAGELIST)imgl); ok(ret == TRUE, "Expected TRUE, got %d\n", ret); ret = IImageList_Release(imgl); ok(ret == 0, "Expected 0, got %d\n", ret); - ret = ImageList_Destroy((HIMAGELIST)imgl); + ret = pImageList_Destroy((HIMAGELIST)imgl); ok(ret == FALSE, "Expected FALSE, got %d\n", ret); /* ref counting, HIMAGELIST_QueryInterface adds a reference */ @@ -1674,7 +1675,7 @@ static void test_IImageList_Add_Remove(void) int ret; /* create an imagelist to play with */ - himl = ImageList_Create(84, 84, ILC_COLOR16, 0, 3); + himl = pImageList_Create(84, 84, ILC_COLOR16, 0, 3); ok(himl != 0,"failed to create imagelist\n"); imgl = (IImageList *) himl; @@ -1728,7 +1729,7 @@ static void test_IImageList_Get_SetImageCount(void) INT ret; /* create an imagelist to play with */ - himl = ImageList_Create(84, 84, ILC_COLOR16, 0, 3); + himl = pImageList_Create(84, 84, ILC_COLOR16, 0, 3); ok(himl != 0,"failed to create imagelist\n"); imgl = (IImageList *) himl; @@ -1773,7 +1774,7 @@ static void test_IImageList_Draw(void) ok(hdc!=NULL, "couldn't get DC\n"); /* create an imagelist to play with */ - himl = ImageList_Create(48, 48, ILC_COLOR16, 0, 3); + himl = pImageList_Create(48, 48, ILC_COLOR16, 0, 3); ok(himl!=0,"failed to create imagelist\n"); imgl = (IImageList *) himl; @@ -1850,10 +1851,10 @@ static void test_IImageList_Merge(void) HRESULT hr; int ret; - himl1 = ImageList_Create(32,32,0,0,3); + himl1 = pImageList_Create(32,32,0,0,3); ok(himl1 != NULL,"failed to create himl1\n"); - himl2 = ImageList_Create(32,32,0,0,3); + himl2 = pImageList_Create(32,32,0,0,3); ok(himl2 != NULL,"failed to create himl2\n"); hicon1 = CreateIcon(hinst, 32, 32, 1, 1, icon_bits, icon_bits); @@ -1887,7 +1888,7 @@ if (0) /* Same happens if himl2 is empty */ IImageList_Release(imgl2); - himl2 = ImageList_Create(32,32,0,0,3); + himl2 = pImageList_Create(32,32,0,0,3); ok(himl2 != NULL,"failed to recreate himl2\n"); imgl2 = (IImageList *) himl2; @@ -2385,7 +2386,7 @@ static void test_IImageList_GetIconSize(void) static void init_functions(void) { - HMODULE hComCtl32 = GetModuleHandleA("comctl32.dll"); + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); #define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); #define X2(f, ord) p##f = (void*)GetProcAddress(hComCtl32, (const char *)ord); @@ -2414,6 +2415,7 @@ static void init_functions(void) X(ImageList_LoadImageW); X(ImageList_CoCreateInstance); X(HIMAGELIST_QueryInterface); + X(ImageList_Draw); #undef X #undef X2 } @@ -2427,8 +2429,6 @@ START_TEST(imagelist) hinst = GetModuleHandleA(NULL); - InitCommonControls(); - test_create_destroy(); test_begindrag(); test_hotspot(); diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index 093f649c9e..6d8e9ccf4b 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -61,32 +61,7 @@ static void test_get_set_text(void) DestroyWindow(hwnd); } -static BOOL init(void) -{ - HMODULE hComctl32; - BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); - INITCOMMONCONTROLSEX iccex; - - hComctl32 = GetModuleHandleA("comctl32.dll"); - pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); - if (!pInitCommonControlsEx) - { - win_skip("InitCommonControlsEx() is missing.\n"); - return FALSE; - } - - iccex.dwSize = sizeof(iccex); - /* W2K and below need ICC_INTERNET_CLASSES for the IP Address Control */ - iccex.dwICC = ICC_INTERNET_CLASSES; - pInitCommonControlsEx(&iccex); - - return TRUE; -} - START_TEST(ipaddress) { - if (!init()) - return; - test_get_set_text(); } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 18e874a00f..72367c67b3 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -28,6 +28,11 @@ #include "v6util.h" #include "msg.h" +static HIMAGELIST (WINAPI *pImageList_Create)(int, int, UINT, int, int); +static BOOL (WINAPI *pImageList_Destroy)(HIMAGELIST); +static int (WINAPI *pImageList_Add)(HIMAGELIST, HBITMAP, HBITMAP); +static BOOL (WINAPI *p_TrackMouseEvent)(TRACKMOUSEEVENT *); + enum seq_index { PARENT_SEQ_INDEX, PARENT_FULL_SEQ_INDEX, @@ -73,6 +78,18 @@ static BOOL g_focus_test_LVN_DELETEITEM; static HWND subclass_editbox(HWND hwndListview); +static void init_functions(void) +{ + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); + X(ImageList_Create); + X(ImageList_Destroy); + X(ImageList_Add); + X(_TrackMouseEvent); +#undef X +} + static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; static const struct message create_ownerdrawfixed_parent_seq[] = { @@ -848,13 +865,13 @@ static void test_images(void) RECT r1, r2; static CHAR hello[] = "hello"; - himl = ImageList_Create(40, 40, 0, 4, 4); + himl = pImageList_Create(40, 40, 0, 4, 4); ok(himl != NULL, "failed to create imagelist\n"); hbmp = CreateBitmap(40, 40, 1, 1, NULL); ok(hbmp != NULL, "failed to create bitmap\n"); - r = ImageList_Add(himl, hbmp, 0); + r = pImageList_Add(himl, hbmp, 0); ok(r == 0, "should be zero\n"); hwnd = CreateWindowExA(0, "SysListView32", "foo", LVS_OWNERDRAWFIXED, @@ -1539,7 +1556,7 @@ static void test_create(void) cls.lpszClassName = "MyListView32"; ok(RegisterClassExA(&cls), "RegisterClassEx failed\n"); - test_create_imagelist = ImageList_Create(16, 16, 0, 5, 10); + test_create_imagelist = pImageList_Create(16, 16, 0, 5, 10); hList = CreateWindowA("MyListView32", "Test", WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, GetModuleHandleA(NULL), 0); ok((HIMAGELIST)SendMessageA(hList, LVM_GETIMAGELIST, 0, 0) == test_create_imagelist, "Image list not obtained\n"); hHeader = (HWND)SendMessageA(hList, LVM_GETHEADER, 0, 0); @@ -3732,15 +3749,15 @@ static void test_hittest(void) test_lvm_hittest(hwnd, x, y, -1, LVHT_TORIGHT, 0, FALSE, TRUE); test_lvm_subitemhittest(hwnd, x, y, -1, -1, LVHT_NOWHERE, FALSE, FALSE, FALSE); /* try with icons, state icons index is 1 based so at least 2 bitmaps needed */ - himl = ImageList_Create(16, 16, 0, 4, 4); + himl = pImageList_Create(16, 16, 0, 4, 4); ok(himl != NULL, "failed to create imagelist\n"); hbmp = CreateBitmap(16, 16, 1, 1, NULL); ok(hbmp != NULL, "failed to create bitmap\n"); - r = ImageList_Add(himl, hbmp, 0); + r = pImageList_Add(himl, hbmp, 0); ok(r == 0, "should be zero\n"); hbmp = CreateBitmap(16, 16, 1, 1, NULL); ok(hbmp != NULL, "failed to create bitmap\n"); - r = ImageList_Add(himl, hbmp, 0); + r = pImageList_Add(himl, hbmp, 0); ok(r == 1, "should be one\n"); r = SendMessageA(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)himl); @@ -4022,15 +4039,15 @@ todo_wine expect(TRUE, r); /* state icons */ - himl = ImageList_Create(16, 16, 0, 2, 2); + himl = pImageList_Create(16, 16, 0, 2, 2); ok(himl != NULL, "failed to create imagelist\n"); hbm = CreateBitmap(16, 16, 1, 1, NULL); ok(hbm != NULL, "failed to create bitmap\n"); - r = ImageList_Add(himl, hbm, 0); + r = pImageList_Add(himl, hbm, 0); expect(0, r); hbm = CreateBitmap(16, 16, 1, 1, NULL); ok(hbm != NULL, "failed to create bitmap\n"); - r = ImageList_Add(himl, hbm, 0); + r = pImageList_Add(himl, hbm, 0); expect(1, r); r = SendMessageA(hwnd, LVM_SETIMAGELIST, LVSIL_STATE, (LPARAM)himl); @@ -4702,9 +4719,9 @@ static void test_getitemspacing(void) expect(cy, HIWORD(ret)); /* now try with icons */ - himl40 = ImageList_Create(40, 40, 0, 4, 4); + himl40 = pImageList_Create(40, 40, 0, 4, 4); ok(himl40 != NULL, "failed to create imagelist\n"); - himl80 = ImageList_Create(80, 80, 0, 4, 4); + himl80 = pImageList_Create(80, 80, 0, 4, 4); ok(himl80 != NULL, "failed to create imagelist\n"); ret = SendMessageA(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, (LPARAM)himl40); expect(0, ret); @@ -4772,7 +4789,7 @@ static void test_getitemspacing(void) expect(cy + 40, HIWORD(ret)); SendMessageA(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, 0); - ImageList_Destroy(himl80); + pImageList_Destroy(himl80); DestroyWindow(hwnd); /* LVS_SMALLICON */ hwnd = create_listview_control(LVS_SMALLICON); @@ -4790,7 +4807,7 @@ static void test_getitemspacing(void) expect(cy + 40, HIWORD(ret)); SendMessageA(hwnd, LVM_SETIMAGELIST, LVSIL_NORMAL, 0); - ImageList_Destroy(himl40); + pImageList_Destroy(himl40); DestroyWindow(hwnd); /* LVS_REPORT */ hwnd = create_listview_control(LVS_REPORT); @@ -4973,11 +4990,11 @@ static void test_approximate_viewrect(void) /* LVS_ICON */ hwnd = create_listview_control(LVS_ICON); - himl = ImageList_Create(40, 40, 0, 4, 4); + himl = pImageList_Create(40, 40, 0, 4, 4); ok(himl != NULL, "failed to create imagelist\n"); hbmp = CreateBitmap(40, 40, 1, 1, NULL); ok(hbmp != NULL, "failed to create bitmap\n"); - ret = ImageList_Add(himl, hbmp, 0); + ret = pImageList_Add(himl, hbmp, 0); expect(0, ret); ret = SendMessageA(hwnd, LVM_SETIMAGELIST, 0, (LPARAM)himl); expect(0, ret); @@ -5594,7 +5611,7 @@ static void test_createdragimage(void) himl = (HIMAGELIST)SendMessageA(list, LVM_CREATEDRAGIMAGE, 0, (LPARAM)&pt); ok(himl != NULL, "got %p\n", himl); - ImageList_Destroy(himl); + pImageList_Destroy(himl); DestroyWindow(list); } @@ -5709,9 +5726,9 @@ static void test_imagelists(void) HIMAGELIST himl1, himl2, himl3; LRESULT ret; - himl1 = ImageList_Create(40, 40, 0, 4, 4); - himl2 = ImageList_Create(40, 40, 0, 4, 4); - himl3 = ImageList_Create(40, 40, 0, 4, 4); + himl1 = pImageList_Create(40, 40, 0, 4, 4); + himl2 = pImageList_Create(40, 40, 0, 4, 4); + himl3 = pImageList_Create(40, 40, 0, 4, 4); ok(himl1 != NULL, "Failed to create imagelist\n"); ok(himl2 != NULL, "Failed to create imagelist\n"); ok(himl3 != NULL, "Failed to create imagelist\n"); @@ -5977,7 +5994,7 @@ static void test_oneclickactivate(void) track.cbSize = sizeof(track); track.dwFlags = TME_QUERY; - _TrackMouseEvent(&track); + p_TrackMouseEvent(&track); ok(track.hwndTrack == hwnd, "hwndTrack != hwnd\n"); ok(track.dwFlags == TME_LEAVE, "dwFlags = %x\n", track.dwFlags); @@ -6241,23 +6258,10 @@ static void test_state_image(void) START_TEST(listview) { - HMODULE hComctl32; - BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); - ULONG_PTR ctx_cookie; HANDLE hCtx; - hComctl32 = GetModuleHandleA("comctl32.dll"); - pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); - if (pInitCommonControlsEx) - { - INITCOMMONCONTROLSEX iccex; - iccex.dwSize = sizeof(iccex); - iccex.dwICC = ICC_LISTVIEW_CLASSES; - pInitCommonControlsEx(&iccex); - } - else - InitCommonControls(); + init_functions(); init_msg_sequences(sequences, NUM_MSG_SEQUENCES); @@ -6319,6 +6323,8 @@ START_TEST(listview) return; } + init_functions(); + /* comctl32 version 6 tests start here */ test_get_set_view(); test_canceleditlabel(); diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 4216fd5e67..10bad66da6 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -598,8 +598,6 @@ static HWND create_parent_window(void) { HWND hwnd; - InitCommonControls(); - /* flush message sequences, so we can check the new sequence by the end of function */ flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -2041,24 +2039,9 @@ static void test_sel_notify(void) START_TEST(monthcal) { - BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); - INITCOMMONCONTROLSEX iccex; - HMODULE hComctl32; - ULONG_PTR ctx_cookie; HANDLE hCtx; - hComctl32 = GetModuleHandleA("comctl32.dll"); - pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); - if (!pInitCommonControlsEx) - { - win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); - return; - } - iccex.dwSize = sizeof(iccex); - iccex.dwICC = ICC_DATE_CLASSES; - pInitCommonControlsEx(&iccex); - test_monthcal(); init_msg_sequences(sequences, NUM_MSG_SEQUENCES); diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index af49aba213..664f7a54f4 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -76,18 +76,22 @@ static INT (WINAPI *pFindMRUData)(HANDLE, LPCVOID, DWORD, LPINT); static INT (WINAPI *pAddMRUData)(HANDLE, LPCVOID, DWORD); static HANDLE (WINAPI *pCreateMRUListW)(MRUINFOW*); -static void InitPointers(void) +static void init_functions(void) { - pCreateMRUListA = (void*)GetProcAddress(hComctl32,(LPCSTR)151); - pFreeMRUList = (void*)GetProcAddress(hComctl32,(LPCSTR)152); - pAddMRUStringA = (void*)GetProcAddress(hComctl32,(LPCSTR)153); - pEnumMRUListA = (void*)GetProcAddress(hComctl32,(LPCSTR)154); - pCreateMRUListLazyA = (void*)GetProcAddress(hComctl32,(LPCSTR)157); - pAddMRUData = (void*)GetProcAddress(hComctl32,(LPCSTR)167); - pFindMRUData = (void*)GetProcAddress(hComctl32,(LPCSTR)169); - pCreateMRUListW = (void*)GetProcAddress(hComctl32,(LPCSTR)400); - pEnumMRUListW = (void*)GetProcAddress(hComctl32,(LPCSTR)403); - pCreateMRUListLazyW = (void*)GetProcAddress(hComctl32,(LPCSTR)404); + hComctl32 = LoadLibraryA("comctl32.dll"); + +#define X2(f, ord) p##f = (void*)GetProcAddress(hComctl32, (const char *)ord); + X2(CreateMRUListA, 151); + X2(FreeMRUList, 152); + X2(AddMRUStringA, 153); + X2(EnumMRUListA, 154); + X2(CreateMRUListLazyA, 157); + X2(AddMRUData, 167); + X2(FindMRUData, 169); + X2(CreateMRUListW, 400); + X2(EnumMRUListW, 403); + X2(CreateMRUListLazyW, 404); +#undef X2 } /* Based on RegDeleteTreeW from dlls/advapi32/registry.c */ @@ -705,13 +709,11 @@ static void test_CreateMRUListLazyW(void) START_TEST(mru) { - hComctl32 = GetModuleHandleA("comctl32.dll"); - delete_reg_entries(); if (!create_reg_entries()) return; - InitPointers(); + init_functions(); test_MRUListA(); test_CreateMRUListLazyA(); diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index a9409eac08..0da396cdd1 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -339,7 +339,6 @@ START_TEST(pager) pSetWindowSubclass = (void*)GetProcAddress(mod, (LPSTR)410); - InitCommonControls(); init_msg_sequences(sequences, NUM_MSG_SEQUENCES); parent_wnd = create_parent_window(); diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c index 7f69c35232..bc7284b78d 100644 --- a/dlls/comctl32/tests/progress.c +++ b/dlls/comctl32/tests/progress.c @@ -94,24 +94,10 @@ static void update_window(HWND hWnd) static void init(void) { - HMODULE hComctl32; - BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); WNDCLASSA wc; RECT rect; BOOL ret; - hComctl32 = GetModuleHandleA("comctl32.dll"); - pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); - if (pInitCommonControlsEx) - { - INITCOMMONCONTROLSEX iccex; - iccex.dwSize = sizeof(iccex); - iccex.dwICC = ICC_PROGRESS_CLASS; - pInitCommonControlsEx(&iccex); - } - else - InitCommonControls(); - wc.style = CS_HREDRAW | CS_VREDRAW; wc.cbClsExtra = 0; wc.cbWndExtra = 0; diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index ec53e6bc7c..2a4afaa51e 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -34,6 +34,10 @@ static LONG active_page = -1; #define IDC_APPLY_BUTTON 12321 +static HPROPSHEETPAGE (WINAPI *pCreatePropertySheetPageA)(const PROPSHEETPAGEA *desc); +static HPROPSHEETPAGE (WINAPI *pCreatePropertySheetPageW)(const PROPSHEETPAGEW *desc); +static BOOL (WINAPI *pDestroyPropertySheetPage)(HPROPSHEETPAGE proppage); +static INT_PTR (WINAPI *pPropertySheetA)(const PROPSHEETHEADERA *header); static void detect_locale(void) { @@ -141,7 +145,7 @@ static void test_title(void) psp.pfnDlgProc = page_dlg_proc; psp.lParam = 0; - hpsp[0] = CreatePropertySheetPageA(&psp); + hpsp[0] = pCreatePropertySheetPageA(&psp); memset(&psh, 0, sizeof(psh)); psh.dwSize = PROPSHEETHEADERA_V1_SIZE; @@ -152,7 +156,7 @@ static void test_title(void) U3(psh).phpage = hpsp; psh.pfnCallback = sheet_callback; - hdlg = (HWND)PropertySheetA(&psh); + hdlg = (HWND)pPropertySheetA(&psh); ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle value %p\n", hdlg); style = GetWindowLongA(hdlg, GWL_STYLE); @@ -180,7 +184,7 @@ static void test_nopage(void) psp.pfnDlgProc = page_dlg_proc; psp.lParam = 0; - hpsp[0] = CreatePropertySheetPageA(&psp); + hpsp[0] = pCreatePropertySheetPageA(&psp); memset(&psh, 0, sizeof(psh)); psh.dwSize = PROPSHEETHEADERA_V1_SIZE; @@ -191,7 +195,7 @@ static void test_nopage(void) U3(psh).phpage = hpsp; psh.pfnCallback = sheet_callback; - hdlg = (HWND)PropertySheetA(&psh); + hdlg = (HWND)pPropertySheetA(&psh); ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle value %p\n", hdlg); ShowWindow(hdlg,SW_NORMAL); @@ -260,7 +264,7 @@ static void test_disableowner(void) psp.pfnDlgProc = NULL; psp.lParam = 0; - hpsp[0] = CreatePropertySheetPageA(&psp); + hpsp[0] = pCreatePropertySheetPageA(&psp); memset(&psh, 0, sizeof(psh)); psh.dwSize = PROPSHEETHEADERA_V1_SIZE; @@ -271,7 +275,7 @@ static void test_disableowner(void) U3(psh).phpage = hpsp; psh.pfnCallback = disableowner_callback; - p = PropertySheetA(&psh); + p = pPropertySheetA(&psh); todo_wine ok(p == 0, "Expected 0, got %ld\n", p); ok(IsWindowEnabled(parenthwnd) != 0, "parent window should be enabled\n"); @@ -357,25 +361,25 @@ static void test_wiznavigation(void) psp[0].hInstance = GetModuleHandleA(NULL); U(psp[0]).pszTemplate = (LPCSTR)MAKEINTRESOURCE(IDD_PROP_PAGE_INTRO); psp[0].pfnDlgProc = nav_page_proc; - hpsp[0] = CreatePropertySheetPageA(&psp[0]); + hpsp[0] = pCreatePropertySheetPageA(&psp[0]); psp[1].dwSize = sizeof(PROPSHEETPAGEA); psp[1].hInstance = GetModuleHandleA(NULL); U(psp[1]).pszTemplate = (LPCSTR)MAKEINTRESOURCE(IDD_PROP_PAGE_EDIT); psp[1].pfnDlgProc = nav_page_proc; - hpsp[1] = CreatePropertySheetPageA(&psp[1]); + hpsp[1] = pCreatePropertySheetPageA(&psp[1]); psp[2].dwSize = sizeof(PROPSHEETPAGEA); psp[2].hInstance = GetModuleHandleA(NULL); U(psp[2]).pszTemplate = (LPCSTR)MAKEINTRESOURCE(IDD_PROP_PAGE_RADIO); psp[2].pfnDlgProc = nav_page_proc; - hpsp[2] = CreatePropertySheetPageA(&psp[2]); + hpsp[2] = pCreatePropertySheetPageA(&psp[2]); psp[3].dwSize = sizeof(PROPSHEETPAGEA); psp[3].hInstance = GetModuleHandleA(NULL); U(psp[3]).pszTemplate = (LPCSTR)MAKEINTRESOURCE(IDD_PROP_PAGE_EXIT); psp[3].pfnDlgProc = nav_page_proc; - hpsp[3] = CreatePropertySheetPageA(&psp[3]); + hpsp[3] = pCreatePropertySheetPageA(&psp[3]); /* set up the property sheet dialog */ memset(&psh, 0, sizeof(psh)); @@ -385,7 +389,7 @@ static void test_wiznavigation(void) psh.nPages = 4; psh.hwndParent = GetDesktopWindow(); U3(psh).phpage = hpsp; - hdlg = (HWND)PropertySheetA(&psh); + hdlg = (HWND)pPropertySheetA(&psh); ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle %p\n", hdlg); ok(active_page == 0, "Active page should be 0. Is: %d\n", active_page); @@ -480,7 +484,7 @@ static void test_buttons(void) psp.pfnDlgProc = page_dlg_proc; psp.lParam = 0; - hpsp[0] = CreatePropertySheetPageA(&psp); + hpsp[0] = pCreatePropertySheetPageA(&psp); memset(&psh, 0, sizeof(psh)); psh.dwSize = PROPSHEETHEADERA_V1_SIZE; @@ -491,7 +495,7 @@ static void test_buttons(void) U3(psh).phpage = hpsp; psh.pfnCallback = sheet_callback; - hdlg = (HWND)PropertySheetA(&psh); + hdlg = (HWND)pPropertySheetA(&psh); ok(hdlg != INVALID_HANDLE_VALUE, "got null handle\n"); /* OK button */ @@ -587,7 +591,7 @@ static void test_custom_default_button(void) add_button_has_been_pressed = FALSE; /* Create the modeless property sheet. */ - hdlg = (HWND)PropertySheetA(&psh); + hdlg = (HWND)pPropertySheetA(&psh); ok(hdlg != INVALID_HANDLE_VALUE, "Cannot create the property sheet\n"); /* Set the Add button as the default button. */ @@ -798,7 +802,7 @@ static void test_messages(void) psp.pfnDlgProc = page_dlg_proc_messages; psp.lParam = 0; - hpsp[0] = CreatePropertySheetPageA(&psp); + hpsp[0] = pCreatePropertySheetPageA(&psp); memset(&psh, 0, sizeof(psh)); psh.dwSize = PROPSHEETHEADERA_V1_SIZE; @@ -810,7 +814,7 @@ static void test_messages(void) U3(psh).phpage = hpsp; psh.pfnCallback = sheet_callback_messages; - hdlg = (HWND)PropertySheetA(&psh); + hdlg = (HWND)pPropertySheetA(&psh); ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle %p\n", hdlg); ShowWindow(hdlg,SW_NORMAL); @@ -839,15 +843,15 @@ static void test_PSM_ADDPAGE(void) psp.lParam = 0; /* multiple pages with the same data */ - hpsp[0] = CreatePropertySheetPageA(&psp); - hpsp[1] = CreatePropertySheetPageA(&psp); - hpsp[2] = CreatePropertySheetPageA(&psp); + hpsp[0] = pCreatePropertySheetPageA(&psp); + hpsp[1] = pCreatePropertySheetPageA(&psp); + hpsp[2] = pCreatePropertySheetPageA(&psp); U(psp).pszTemplate = (LPCSTR)MAKEINTRESOURCE(IDD_PROP_PAGE_ERROR); - hpsp[3] = CreatePropertySheetPageA(&psp); + hpsp[3] = pCreatePropertySheetPageA(&psp); psp.dwFlags = PSP_PREMATURE; - hpsp[4] = CreatePropertySheetPageA(&psp); + hpsp[4] = pCreatePropertySheetPageA(&psp); memset(&psh, 0, sizeof(psh)); psh.dwSize = PROPSHEETHEADERA_V1_SIZE; @@ -857,7 +861,7 @@ static void test_PSM_ADDPAGE(void) psh.hwndParent = GetDesktopWindow(); U3(psh).phpage = hpsp; - hdlg = (HWND)PropertySheetA(&psh); + hdlg = (HWND)pPropertySheetA(&psh); ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle %p\n", hdlg); /* add pages one by one */ @@ -906,7 +910,7 @@ if (0) r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); ok(r == 3, "got %d\n", r); - DestroyPropertySheetPage(hpsp[4]); + pDestroyPropertySheetPage(hpsp[4]); DestroyWindow(hdlg); } @@ -929,15 +933,15 @@ static void test_PSM_INSERTPAGE(void) psp.lParam = 0; /* multiple pages with the same data */ - hpsp[0] = CreatePropertySheetPageA(&psp); - hpsp[1] = CreatePropertySheetPageA(&psp); - hpsp[2] = CreatePropertySheetPageA(&psp); + hpsp[0] = pCreatePropertySheetPageA(&psp); + hpsp[1] = pCreatePropertySheetPageA(&psp); + hpsp[2] = pCreatePropertySheetPageA(&psp); U(psp).pszTemplate = (LPCSTR)MAKEINTRESOURCE(IDD_PROP_PAGE_ERROR); - hpsp[3] = CreatePropertySheetPageA(&psp); + hpsp[3] = pCreatePropertySheetPageA(&psp); psp.dwFlags = PSP_PREMATURE; - hpsp[4] = CreatePropertySheetPageA(&psp); + hpsp[4] = pCreatePropertySheetPageA(&psp); memset(&psh, 0, sizeof(psh)); psh.dwSize = PROPSHEETHEADERA_V1_SIZE; @@ -947,7 +951,7 @@ static void test_PSM_INSERTPAGE(void) psh.hwndParent = GetDesktopWindow(); U3(psh).phpage = hpsp; - hdlg = (HWND)PropertySheetA(&psh); + hdlg = (HWND)pPropertySheetA(&psh); ok(hdlg != INVALID_HANDLE_VALUE, "got invalid handle %p\n", hdlg); /* add pages one by one */ @@ -1000,7 +1004,7 @@ if (0) r = SendMessageA(tab, TCM_GETITEMCOUNT, 0, 0); ok(r == 3, "got %d\n", r); - DestroyPropertySheetPage(hpsp[4]); + pDestroyPropertySheetPage(hpsp[4]); DestroyWindow(hdlg); } @@ -1090,7 +1094,7 @@ static void test_CreatePropertySheetPage(void) for (page.u.pageA.dwSize = PROPSHEETPAGEA_V1_SIZE - 1; page.u.pageA.dwSize <= PROPSHEETPAGEA_V4_SIZE + 1; page.u.pageA.dwSize++) { page.addref_called = 0; - hpsp = CreatePropertySheetPageA(&page.u.pageA); + hpsp = pCreatePropertySheetPageA(&page.u.pageA); if (page.u.pageA.dwSize < PROPSHEETPAGEA_V1_SIZE) ok(hpsp == NULL, "Expected failure, size %u\n", page.u.pageA.dwSize); @@ -1103,7 +1107,7 @@ static void test_CreatePropertySheetPage(void) if (hpsp) { page.release_called = 0; - ret = DestroyPropertySheetPage(hpsp); + ret = pDestroyPropertySheetPage(hpsp); ok(ret, "Failed to destroy a page\n"); ok(page.release_called == 1, "Expected RELEASE callback message\n"); } @@ -1119,7 +1123,7 @@ static void test_CreatePropertySheetPage(void) for (page.u.pageW.dwSize = PROPSHEETPAGEW_V1_SIZE - 1; page.u.pageW.dwSize <= PROPSHEETPAGEW_V4_SIZE + 1; page.u.pageW.dwSize++) { page.addref_called = 0; - hpsp = CreatePropertySheetPageW(&page.u.pageW); + hpsp = pCreatePropertySheetPageW(&page.u.pageW); if (page.u.pageW.dwSize < PROPSHEETPAGEW_V1_SIZE) ok(hpsp == NULL, "Expected failure, size %u\n", page.u.pageW.dwSize); @@ -1132,13 +1136,25 @@ static void test_CreatePropertySheetPage(void) if (hpsp) { page.release_called = 0; - ret = DestroyPropertySheetPage(hpsp); + ret = pDestroyPropertySheetPage(hpsp); ok(ret, "Failed to destroy a page\n"); ok(page.release_called == 1, "Expected RELEASE callback message\n"); } } } +static void init_functions(void) +{ + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); + X(CreatePropertySheetPageA); + X(CreatePropertySheetPageW); + X(DestroyPropertySheetPage); + X(PropertySheetA); +#undef X +} + START_TEST(propsheet) { detect_locale(); @@ -1150,6 +1166,8 @@ START_TEST(propsheet) SetProcessDefaultLayout(LAYOUT_RTL); } + init_functions(); + test_title(); test_nopage(); test_disableowner(); diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index 6430ba2b61..2ff4cebdf9 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -30,6 +30,9 @@ #include "wine/test.h" +static BOOL (WINAPI *pImageList_Destroy)(HIMAGELIST); +static HIMAGELIST (WINAPI *pImageList_LoadImageA)(HINSTANCE, LPCSTR, int, int, COLORREF, UINT, UINT); + static RECT height_change_notify_rect; static HWND hMainWnd; static int system_font_height; @@ -577,7 +580,7 @@ static void test_layout(void) check_sizes(); /* an image will increase the band height */ - himl = ImageList_LoadImageA(GetModuleHandleA("comctl32"), MAKEINTRESOURCEA(121), 24, 2, + himl = pImageList_LoadImageA(GetModuleHandleA("comctl32"), MAKEINTRESOURCEA(121), 24, 2, CLR_NONE, IMAGE_BITMAP, LR_DEFAULTCOLOR); ri.cbSize = sizeof(ri); ri.fMask = RBIM_IMAGELIST; @@ -658,7 +661,7 @@ static void test_layout(void) rbsize_results_free(); DestroyWindow(hRebar); - ImageList_Destroy(himl); + pImageList_Destroy(himl); } #if 0 /* use this to generate more tests */ @@ -1125,26 +1128,22 @@ static void test_notification(void) DestroyWindow(rebar); } +static void init_functions(void) +{ + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); + X(ImageList_Destroy); + X(ImageList_LoadImageA); +#undef X +} + START_TEST(rebar) { - HMODULE hComctl32; - BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); - INITCOMMONCONTROLSEX iccex; MSG msg; init_system_font_height(); - - /* LoadLibrary is needed. This file has no reference to functions in comctl32 */ - hComctl32 = LoadLibraryA("comctl32.dll"); - pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); - if (!pInitCommonControlsEx) - { - win_skip("InitCommonControlsEx() is missing. Skipping the tests\n"); - return; - } - iccex.dwSize = sizeof(iccex); - iccex.dwICC = ICC_COOL_CLASSES; - pInitCommonControlsEx(&iccex); + init_functions(); hMainWnd = create_parent_window(); @@ -1169,6 +1168,4 @@ out: DispatchMessageA(&msg); } DestroyWindow(hMainWnd); - - FreeLibrary(hComctl32); } diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index a394beb42a..78cbbb37ba 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -593,8 +593,6 @@ START_TEST(status) 226+GetSystemMetrics(SM_CYCAPTION)+2*GetSystemMetrics(SM_CYSIZEFRAME), NULL, NULL, GetModuleHandleA(NULL), 0); - InitCommonControls(); - register_subclass(); test_status_control(); diff --git a/dlls/comctl32/tests/subclass.c b/dlls/comctl32/tests/subclass.c index 720c68e28d..abe63a1547 100644 --- a/dlls/comctl32/tests/subclass.c +++ b/dlls/comctl32/tests/subclass.c @@ -286,7 +286,7 @@ static BOOL init_function_pointers(void) HMODULE hmod; void *ptr; - hmod = GetModuleHandleA("comctl32.dll"); + hmod = LoadLibraryA("comctl32.dll"); ok(hmod != NULL, "got %p\n", hmod); /* Functions have to be loaded by ordinal. Only XP and W2K3 export diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 72165c8100..0bfbb38a58 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -40,6 +40,11 @@ #define TabWidthPadded(padd_x, num) (DEFAULT_MIN_TAB_WIDTH - (TAB_PADDING_X - (padd_x)) * num) +static HIMAGELIST (WINAPI *pImageList_Create)(INT,INT,UINT,INT,INT); +static BOOL (WINAPI *pImageList_Destroy)(HIMAGELIST); +static INT (WINAPI *pImageList_GetImageCount)(HIMAGELIST); +static INT (WINAPI *pImageList_ReplaceIcon)(HIMAGELIST,INT,HICON); + static void CheckSize(HWND hwnd, INT width, INT height, const char *msg, int line) { RECT r; @@ -470,7 +475,7 @@ static void test_tab(INT nMinTabWidth) { HWND hwTab; RECT rTab; - HIMAGELIST himl = ImageList_Create(21, 21, ILC_COLOR, 3, 4); + HIMAGELIST himl = pImageList_Create(21, 21, ILC_COLOR, 3, 4); SIZE size; HDC hdc; HFONT hOldFont; @@ -608,7 +613,7 @@ static void test_tab(INT nMinTabWidth) DestroyWindow (hwTab); - ImageList_Destroy(himl); + pImageList_Destroy(himl); } static void test_width(void) @@ -1165,12 +1170,12 @@ static void test_removeimage(void) INT i; TCITEMA item; HICON hicon; - HIMAGELIST himl = ImageList_Create(16, 16, ILC_COLOR, 3, 4); + HIMAGELIST himl = pImageList_Create(16, 16, ILC_COLOR, 3, 4); hicon = CreateIcon(NULL, 16, 16, 1, 1, bits, bits); - ImageList_AddIcon(himl, hicon); - ImageList_AddIcon(himl, hicon); - ImageList_AddIcon(himl, hicon); + pImageList_ReplaceIcon(himl, -1, hicon); + pImageList_ReplaceIcon(himl, -1, hicon); + pImageList_ReplaceIcon(himl, -1, hicon); hwTab = create_tabcontrol(TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE); SendMessageA(hwTab, TCM_SETIMAGELIST, 0, (LPARAM)himl); @@ -1185,7 +1190,8 @@ static void test_removeimage(void) /* remove image middle image */ SendMessageA(hwTab, TCM_REMOVEIMAGE, 1, 0); - expect(2, ImageList_GetImageCount(himl)); + i = pImageList_GetImageCount(himl); + ok(i == 2, "Unexpected image count %d.\n", i); item.iImage = -1; SendMessageA(hwTab, TCM_GETITEMA, 0, (LPARAM)&item); expect(0, item.iImage); @@ -1197,7 +1203,8 @@ static void test_removeimage(void) expect(1, item.iImage); /* remove first image */ SendMessageA(hwTab, TCM_REMOVEIMAGE, 0, 0); - expect(1, ImageList_GetImageCount(himl)); + i = pImageList_GetImageCount(himl); + ok(i == 1, "Unexpected image count %d.\n", i); item.iImage = 0; SendMessageA(hwTab, TCM_GETITEMA, 0, (LPARAM)&item); expect(-1, item.iImage); @@ -1209,7 +1216,8 @@ static void test_removeimage(void) expect(0, item.iImage); /* remove the last one */ SendMessageA(hwTab, TCM_REMOVEIMAGE, 0, 0); - expect(0, ImageList_GetImageCount(himl)); + i = pImageList_GetImageCount(himl); + ok(i == 0, "Unexpected image count %d.\n", i); for(i = 0; i < 3; i++) { item.iImage = 0; SendMessageA(hwTab, TCM_GETITEMA, i, (LPARAM)&item); @@ -1217,7 +1225,7 @@ static void test_removeimage(void) } DestroyWindow(hwTab); - ImageList_Destroy(himl); + pImageList_Destroy(himl); DestroyIcon(hicon); } @@ -1423,6 +1431,18 @@ static void test_create(void) } } +static void init_functions(void) +{ + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); + X(ImageList_Create); + X(ImageList_Destroy); + X(ImageList_GetImageCount); + X(ImageList_ReplaceIcon); +#undef X +} + START_TEST(tab) { LOGFONTA logfont; @@ -1434,7 +1454,7 @@ START_TEST(tab) logfont.lfCharSet = ANSI_CHARSET; hFont = CreateFontIndirectA(&logfont); - InitCommonControls(); + init_functions(); test_width(); diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 2c1b789484..38b8339378 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -37,6 +37,13 @@ #define PARENT_SEQ_INDEX 0 #define NUM_MSG_SEQUENCES 1 +static HWND (WINAPI *pCreateToolbarEx)(HWND, DWORD, UINT, INT, HINSTANCE, UINT_PTR, const TBBUTTON *, + INT, INT, INT, INT, INT, UINT); +static BOOL (WINAPI *pImageList_Destroy)(HIMAGELIST); +static INT (WINAPI *pImageList_GetImageCount)(HIMAGELIST); +static BOOL (WINAPI *pImageList_GetIconSize)(HIMAGELIST, int *, int *); +static HIMAGELIST (WINAPI *pImageList_LoadImageA)(HINSTANCE, LPCSTR, int, int, COLORREF, UINT, UINT); + static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; static HWND hMainWnd; @@ -376,7 +383,7 @@ static void basic_test(void) MakeButton(buttons+3, 1003, TBSTYLE_SEP|TBSTYLE_GROUP, 0); MakeButton(buttons+6, 1006, TBSTYLE_SEP, 0); - hToolbar = CreateToolbarEx(hMainWnd, + hToolbar = pCreateToolbarEx(hMainWnd, WS_VISIBLE | WS_CLIPCHILDREN | CCS_TOP | WS_CHILD | TBSTYLE_LIST, 100, @@ -482,8 +489,8 @@ static void add_128x15_bitmap(HWND hToolbar, int nCmds) HIMAGELIST himl = (HIMAGELIST)SendMessageA(hToolbar, TB_GETIMAGELIST, 0, 0); \ ok(himl != NULL, "No image list\n"); \ if (himl != NULL) {\ - ok(ImageList_GetImageCount(himl) == count, "Images count mismatch - %d vs %d\n", count, ImageList_GetImageCount(himl)); \ - ImageList_GetIconSize(himl, &cx, &cy); \ + ok(pImageList_GetImageCount(himl) == count, "Images count mismatch - %d vs %d\n", count, pImageList_GetImageCount(himl)); \ + pImageList_GetIconSize(himl, &cx, &cy); \ ok(cx == dx && cy == dy, "Icon size mismatch - %dx%d vs %dx%d\n", dx, dy, cx, cy); \ } \ } @@ -515,11 +522,11 @@ static void test_add_bitmap(void) himl = (HIMAGELIST)SendMessageA(hToolbar, TB_GETIMAGELIST, 0, 0); ok(himl != NULL, "Got %p\n", himl); - ret = ImageList_GetIconSize(himl, &cx, &cy); + ret = pImageList_GetIconSize(himl, &cx, &cy); ok(ret, "Got %d\n", ret); ok(cx == cy, "Got %d x %d\n", cx, cy); - count = ImageList_GetImageCount(himl); + count = pImageList_GetImageCount(himl); /* Image count */ switch (id) @@ -688,7 +695,7 @@ static void test_add_bitmap(void) /* the control can add bitmaps to an existing image list */ rebuild_toolbar(&hToolbar); - himl = ImageList_LoadImageA(GetModuleHandleA(NULL), (LPCSTR)MAKEINTRESOURCE(IDB_BITMAP_80x15), + himl = pImageList_LoadImageA(GetModuleHandleA(NULL), (LPCSTR)MAKEINTRESOURCE(IDB_BITMAP_80x15), 20, 2, CLR_NONE, IMAGE_BITMAP, LR_DEFAULTCOLOR); ok(himl != NULL, "failed to create imagelist\n"); ok(SendMessageA(hToolbar, TB_SETIMAGELIST, 0, (LPARAM)himl) == 0, "TB_SETIMAGELIST failed\n"); @@ -709,7 +716,7 @@ static void test_add_bitmap(void) addbmp.hInst = HINST_COMMCTRL; addbmp.nID = IDB_STD_SMALL_COLOR; rebuild_toolbar(&hToolbar); - ImageList_Destroy(himl); + pImageList_Destroy(himl); ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&addbmp) == 0, "TB_ADDBITMAP - unexpected return\n"); CHECK_IMAGELIST(15, 16, 16); @@ -1506,14 +1513,14 @@ static void test_sizes(void) /* TB_SETIMAGELIST always changes the height but the width only if necessary */ SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(100, 100)); - himl = ImageList_LoadImageA(GetModuleHandleA(NULL), (LPCSTR)MAKEINTRESOURCE(IDB_BITMAP_80x15), + himl = pImageList_LoadImageA(GetModuleHandleA(NULL), (LPCSTR)MAKEINTRESOURCE(IDB_BITMAP_80x15), 20, 2, CLR_NONE, IMAGE_BITMAP, LR_DEFAULTCOLOR); ok(SendMessageA(hToolbar, TB_SETIMAGELIST, 0, (LPARAM)himl) == 0, "TB_SETIMAGELIST failed\n"); check_button_size(hToolbar, 100, 21); SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELONG(100, 100)); check_button_size(hToolbar, 100, 100); /* But there are no update when we change imagelist, and image sizes are the same */ - himl2 = ImageList_LoadImageA(GetModuleHandleA(NULL), (LPCSTR)MAKEINTRESOURCE(IDB_BITMAP_128x15), + himl2 = pImageList_LoadImageA(GetModuleHandleA(NULL), (LPCSTR)MAKEINTRESOURCE(IDB_BITMAP_128x15), 20, 2, CLR_NONE, IMAGE_BITMAP, LR_DEFAULTCOLOR); ok(SendMessageA(hToolbar, TB_SETIMAGELIST, 0, (LRESULT)himl2) == (LRESULT)himl, "TB_SETIMAGELIST failed\n"); check_button_size(hToolbar, 100, 100); @@ -1538,8 +1545,8 @@ static void test_sizes(void) check_sizes_todo(0x30); /* some small problems with BTNS_AUTOSIZE button sizes */ rebuild_toolbar(&hToolbar); - ImageList_Destroy(himl); - ImageList_Destroy(himl2); + pImageList_Destroy(himl); + pImageList_Destroy(himl2); SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons3[3]); check_button_size(hToolbar, 7 + string_width(STRING2), 23 + fontheight); @@ -1823,43 +1830,43 @@ static void test_createtoolbarex(void) TBBUTTON btns[3]; ZeroMemory(&btns, sizeof(btns)); - hToolbar = CreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, + hToolbar = pCreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, 3, 20, 20, 16, 16, sizeof(TBBUTTON)); CHECK_IMAGELIST(16, 20, 20); compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), 0x1a001b, "%x"); DestroyWindow(hToolbar); - hToolbar = CreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, + hToolbar = pCreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, 3, 4, 4, 16, 16, sizeof(TBBUTTON)); CHECK_IMAGELIST(32, 4, 4); compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), 0xa000b, "%x"); DestroyWindow(hToolbar); - hToolbar = CreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, + hToolbar = pCreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, 3, 0, 8, 12, 12, sizeof(TBBUTTON)); CHECK_IMAGELIST(16, 12, 12); compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), 0x120013, "%x"); DestroyWindow(hToolbar); - hToolbar = CreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, + hToolbar = pCreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, 3, -1, 8, 12, 12, sizeof(TBBUTTON)); CHECK_IMAGELIST(16, 12, 8); compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), 0xe0013, "%x"); DestroyWindow(hToolbar); - hToolbar = CreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, + hToolbar = pCreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, 3, -1, 8, -1, 12, sizeof(TBBUTTON)); CHECK_IMAGELIST(16, 16, 8); compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), 0xe0017, "%x"); DestroyWindow(hToolbar); - hToolbar = CreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, + hToolbar = pCreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, 3, 0, 0, 12, -1, sizeof(TBBUTTON)); CHECK_IMAGELIST(16, 12, 16); compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), 0x160013, "%x"); DestroyWindow(hToolbar); - hToolbar = CreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, + hToolbar = pCreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandleA(NULL), IDB_BITMAP_128x15, btns, 3, 0, 0, 0, 12, sizeof(TBBUTTON)); CHECK_IMAGELIST(16, 16, 16); compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), 0x160017, "%x"); @@ -1928,7 +1935,7 @@ static void test_setrows(void) MakeButton(buttons+i, 1000+i, TBSTYLE_FLAT | TBSTYLE_CHECKGROUP, 0); /* Test 1 - 9 buttons */ - hToolbar = CreateToolbarEx(hMainWnd, + hToolbar = pCreateToolbarEx(hMainWnd, WS_VISIBLE | WS_CLIPCHILDREN | WS_CHILD | CCS_NORESIZE | CCS_NOPARENTALIGN | CCS_NOMOVEY | CCS_TOP, 0, @@ -2047,7 +2054,7 @@ static void test_get_set_style(void) MakeButton(buttons+3, 1003, TBSTYLE_SEP|TBSTYLE_GROUP, 0); MakeButton(buttons+6, 1006, TBSTYLE_SEP, 0); - hToolbar = CreateToolbarEx(hMainWnd, + hToolbar = pCreateToolbarEx(hMainWnd, WS_VISIBLE | WS_CLIPCHILDREN | CCS_TOP | WS_CHILD | TBSTYLE_LIST, 100, @@ -2507,6 +2514,19 @@ static void test_imagelist(void) DestroyWindow(hwnd); } +static void init_functions(void) +{ + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); + X(CreateToolbarEx); + X(ImageList_GetIconSize); + X(ImageList_GetImageCount); + X(ImageList_LoadImageA); + X(ImageList_Destroy); +#undef X +} + START_TEST(toolbar) { WNDCLASSA wc; @@ -2514,9 +2534,8 @@ START_TEST(toolbar) RECT rc; init_msg_sequences(sequences, NUM_MSG_SEQUENCES); + init_functions(); - InitCommonControls(); - wc.style = CS_HREDRAW | CS_VREDRAW; wc.cbClsExtra = 0; wc.cbWndExtra = 0; diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index be6ab400a0..7e82604376 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -1057,7 +1057,7 @@ static void test_margin(void) START_TEST(tooltips) { - InitCommonControls(); + LoadLibraryA("comctl32.dll"); test_create_tooltip(); test_customdraw(); diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 9cc8b277ee..31845d10e0 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -1296,8 +1296,9 @@ static void test_create(void) START_TEST(trackbar) { + LoadLibraryA("comctl32.dll"); + init_msg_sequences(sequences, NUM_MSG_SEQUENCE); - InitCommonControls(); /* create parent window */ hWndParent = create_parent_window(); diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index a014625a0a..e7568d05de 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -2668,25 +2668,11 @@ static void test_right_click(void) START_TEST(treeview) { - HMODULE hComctl32; - BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); WNDCLASSA wc; MSG msg; ULONG_PTR ctx_cookie; HANDLE hCtx; - - hComctl32 = GetModuleHandleA("comctl32.dll"); - pInitCommonControlsEx = (void*)GetProcAddress(hComctl32, "InitCommonControlsEx"); - if (pInitCommonControlsEx) - { - INITCOMMONCONTROLSEX iccex; - iccex.dwSize = sizeof(iccex); - iccex.dwICC = ICC_TREEVIEW_CLASSES; - pInitCommonControlsEx(&iccex); - } - else - InitCommonControls(); init_msg_sequences(sequences, NUM_MSG_SEQUENCES); init_msg_sequences(item_sequence, 1); diff --git a/dlls/comctl32/tests/updown.c b/dlls/comctl32/tests/updown.c index 639e7802a9..f549c41583 100644 --- a/dlls/comctl32/tests/updown.c +++ b/dlls/comctl32/tests/updown.c @@ -63,6 +63,8 @@ static HWND parent_wnd, g_edit; +static HWND (WINAPI *pCreateUpDownControl)(DWORD, INT, INT, INT, INT, + HWND, INT, HINSTANCE, HWND, INT, INT, INT); static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static struct msg_sequence *sequences[NUM_MSG_SEQUENCES]; @@ -882,7 +884,7 @@ static void test_CreateUpDownControl(void) RECT rect; GetClientRect(parent_wnd, &rect); - updown = CreateUpDownControl(WS_CHILD | WS_BORDER | WS_VISIBLE, + updown = pCreateUpDownControl(WS_CHILD | WS_BORDER | WS_VISIBLE, 0, 0, rect.right, rect.bottom, parent_wnd, 1, GetModuleHandleA(NULL), g_edit, 100, 10, 50); ok(updown != NULL, "Failed to create control.\n"); @@ -898,13 +900,22 @@ static void test_CreateUpDownControl(void) DestroyWindow(updown); } -START_TEST(updown) +static void init_functions(void) { - HMODULE mod = GetModuleHandleA("comctl32.dll"); + HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); + +#define X(f) p##f = (void*)GetProcAddress(hComCtl32, #f); +#define X2(f, ord) p##f = (void*)GetProcAddress(hComCtl32, (const char *)ord); + X(CreateUpDownControl); + X2(SetWindowSubclass, 410); +#undef X +#undef X2 +} - pSetWindowSubclass = (void*)GetProcAddress(mod, (LPSTR)410); +START_TEST(updown) +{ + init_functions(); - InitCommonControls(); init_msg_sequences(sequences, NUM_MSG_SEQUENCES); parent_wnd = create_parent_window(); -- 2.15.1

2 1

[PATCH 2/2] ole32: There's no need to recreate the static entry when parsing the CONTENTS stream.
by Huw Davies 24 Jan '18

24 Jan '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/datacache.c | 47 ++++++++++++++++++++++++++++++----------------- dlls/ole32/tests/ole2.c | 4 ++-- 2 files changed, 32 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index ba253d9330..c07633d960 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -312,6 +312,29 @@ static DataCacheEntry *DataCache_GetEntryForFormatEtc(DataCache *This, const FOR return NULL; } +/* Returns the cache entry associated with a static CLSID. + This will be first in the list with connection id == 1 */ +static HRESULT get_static_entry( DataCache *cache, DataCacheEntry **cache_entry ) +{ + DataCacheEntry *entry; + struct list *head = list_head( &cache->cache_list ); + HRESULT hr = E_FAIL; + + *cache_entry = NULL; + + if (head) + { + entry = LIST_ENTRY( head, DataCacheEntry, entry ); + if (entry->id == 1) + { + *cache_entry = entry; + hr = S_OK; + } + } + + return hr; +} + /* checks that the clipformat and tymed are valid and returns an error if they * aren't and CACHE_S_NOTSUPPORTED if they are valid, but can't be rendered by * DataCache_Draw */ @@ -1698,33 +1721,23 @@ static HRESULT parse_pres_streams( DataCache *cache, IStorage *stg ) return S_OK; } -static const FORMATETC static_dib_fmt = { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; - -static HRESULT parse_contents_stream( DataCache *This, IStorage *stg ) +static HRESULT parse_contents_stream( DataCache *cache, IStorage *stg ) { HRESULT hr; - STATSTG stat; - const FORMATETC *fmt; IStream *stm; + DataCacheEntry *cache_entry; hr = open_pres_stream( stg, STREAM_NUMBER_CONTENTS, &stm ); if (FAILED( hr )) return hr; - hr = IStorage_Stat( stg, &stat, STATFLAG_NONAME ); - if (FAILED( hr )) goto done; - - if (IsEqualCLSID( &stat.clsid, &CLSID_Picture_Dib )) - fmt = &static_dib_fmt; - else + hr = get_static_entry( cache, &cache_entry ); + if (hr == S_OK) { - FIXME("unsupported format %s\n", debugstr_guid( &stat.clsid )); - hr = E_FAIL; - goto done; + cache_entry->load_stream_num = STREAM_NUMBER_CONTENTS; + cache_entry->save_stream_num = STREAM_NUMBER_CONTENTS; + cache_entry->dirty = FALSE; } - hr = add_cache_entry( This, fmt, 0, STREAM_NUMBER_CONTENTS ); - -done: IStream_Release( stm ); return hr; } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index d83ca00a66..1a4fce5b06 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4450,7 +4450,6 @@ static void test_data_cache_contents(void) ok(hr == S_OK, "unexpected %#x\n", hr); hr = IPersistStorage_IsDirty(stg); -todo_wine_if(test_data[i].in == &stg_def_4 || test_data[i].in == &stg_def_8 || test_data[i].in == &stg_def_9) ok(hr == S_FALSE, "%d: unexpected %#x\n", i, hr); hr = IPersistStorage_Save(stg, doc2, FALSE); @@ -4463,7 +4462,8 @@ todo_wine_if(test_data[i].in == &stg_def_4 || test_data[i].in == &stg_def_8 || t todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_1 || test_data[i].in == &stg_def_2)) ok(enumerated_streams == matched_streams, "%d out: enumerated %d != matched %d\n", i, enumerated_streams, matched_streams); -todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_5)) +todo_wine_if(!(test_data[i].in == &stg_def_0 || test_data[i].in == &stg_def_4 || test_data[i].in == &stg_def_5 + || test_data[i].in == &stg_def_6)) ok(enumerated_streams == test_data[i].out->stream_count, "%d: saved streams %d != def streams %d\n", i, enumerated_streams, test_data[i].out->stream_count); -- 2.12.0

1 0

[PATCH 1/2] ole32: Don't keep the streams open.
by Huw Davies 24 Jan '18

24 Jan '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/datacache.c | 156 ++++++++++++++----------------------------------- 1 file changed, 44 insertions(+), 112 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 60ddd386ba..ba253d9330 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -90,12 +90,8 @@ typedef struct PresentationDataHeader DWORD dwSize; } PresentationDataHeader; -enum stream_type -{ - no_stream, - pres_stream, - contents_stream -}; +#define STREAM_NUMBER_NOT_SET -2 +#define STREAM_NUMBER_CONTENTS -1 /* CONTENTS stream */ typedef struct DataCacheEntry { @@ -104,19 +100,16 @@ typedef struct DataCacheEntry FORMATETC fmtetc; /* cached data */ STGMEDIUM stgmedium; - /* - * This stream pointer is set through a call to - * IPersistStorage_Load. This is where the visual - * representation of the object is stored. - */ - IStream *stream; - enum stream_type stream_type; /* connection ID */ DWORD id; /* dirty flag */ BOOL dirty; - /* stream number (-1 if not set ) */ - unsigned short stream_number; + /* stream number that the entry was loaded from. + This is used to defer loading until the data is actually needed. */ + int load_stream_num; + /* stream number that the entry will be saved to. + This may differ from above if cache entries have been Uncache()d for example. */ + int save_stream_num; /* sink id set when object is running */ DWORD sink_id; /* Advise sink flags */ @@ -260,8 +253,6 @@ static int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) static void DataCacheEntry_Destroy(DataCache *cache, DataCacheEntry *cache_entry) { list_remove(&cache_entry->entry); - if (cache_entry->stream) - IStream_Release(cache_entry->stream); CoTaskMemFree(cache_entry->fmtetc.ptd); ReleaseStgMedium(&cache_entry->stgmedium); if(cache_entry->sink_id) @@ -355,11 +346,10 @@ static BOOL init_cache_entry(DataCacheEntry *entry, const FORMATETC *fmt, DWORD entry->stgmedium.tymed = TYMED_NULL; entry->stgmedium.pUnkForRelease = NULL; - entry->stream = NULL; - entry->stream_type = no_stream; entry->id = id; entry->dirty = TRUE; - entry->stream_number = -1; + entry->load_stream_num = STREAM_NUMBER_NOT_SET; + entry->save_stream_num = STREAM_NUMBER_NOT_SET; entry->sink_id = 0; entry->advise_flags = advf; @@ -518,60 +508,18 @@ static HRESULT write_clipformat(IStream *stream, CLIPFORMAT clipformat) return hr; } -/************************************************************************ - * DataCacheEntry_OpenPresStream - * - * This method will find the stream for the given presentation. It makes - * no attempt at fallback. - * - * Param: - * this - Pointer to the DataCache object - * drawAspect - The aspect of the object that we wish to draw. - * pStm - A returned stream. It points to the beginning of the - * - presentation data, including the header. - * - * Errors: - * S_OK The requested stream has been opened. - * OLE_E_BLANK The requested stream could not be found. - * Quite a few others I'm too lazy to map correctly. - * - * Notes: - * Algorithm: Scan the elements of the presentation storage, looking - * for presentation streams. For each presentation stream, - * load the header and check to see if the aspect matches. - * - * If a fallback is desired, just opening the first presentation stream - * is a possibility. - */ -static HRESULT DataCacheEntry_OpenPresStream(DataCacheEntry *cache_entry, IStream **ppStm) -{ - HRESULT hr; - LARGE_INTEGER offset; - - if (cache_entry->stream) - { - /* Rewind the stream before returning it. */ - offset.QuadPart = 0; - - hr = IStream_Seek( cache_entry->stream, offset, STREAM_SEEK_SET, NULL ); - if (SUCCEEDED( hr )) - { - *ppStm = cache_entry->stream; - IStream_AddRef( cache_entry->stream ); - } - } - else - hr = OLE_E_BLANK; - - return hr; -} +static const WCHAR CONTENTS[] = {'C','O','N','T','E','N','T','S',0}; static HRESULT open_pres_stream( IStorage *stg, int stream_number, IStream **stm ) { - WCHAR name[] = {2,'O','l','e','P','r','e','s', + WCHAR pres[] = {2,'O','l','e','P','r','e','s', '0' + (stream_number / 100) % 10, '0' + (stream_number / 10) % 10, '0' + stream_number % 10, 0}; + const WCHAR *name = pres; + + if (stream_number == STREAM_NUMBER_NOT_SET) return E_FAIL; + if (stream_number == STREAM_NUMBER_CONTENTS) name = CONTENTS; return IStorage_OpenStream( stg, name, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, stm ); } @@ -589,9 +537,9 @@ static HRESULT load_mf_pict( DataCacheEntry *cache_entry, IStream *stm ) static const LARGE_INTEGER offset_zero; ULONG read; - if (cache_entry->stream_type != pres_stream) + if (cache_entry->load_stream_num == STREAM_NUMBER_CONTENTS) { - FIXME( "Unimplemented for stream type %d\n", cache_entry->stream_type ); + FIXME( "Unimplemented for CONTENTS stream\n" ); return E_FAIL; } @@ -658,9 +606,9 @@ static HRESULT load_dib( DataCacheEntry *cache_entry, IStream *stm ) BITMAPFILEHEADER file; BITMAPINFOHEADER *info; - if (cache_entry->stream_type != contents_stream) + if (cache_entry->load_stream_num != STREAM_NUMBER_CONTENTS) { - FIXME( "Unimplemented for stream type %d\n", cache_entry->stream_type ); + FIXME( "Unimplemented for presentation stream\n" ); return E_FAIL; } @@ -746,12 +694,13 @@ fail: * This method returns a metafile handle if it is successful. * it will return 0 if not. */ -static HRESULT DataCacheEntry_LoadData(DataCacheEntry *cache_entry) +static HRESULT DataCacheEntry_LoadData(DataCacheEntry *cache_entry, IStorage *stg) { HRESULT hr; IStream *stm; - hr = DataCacheEntry_OpenPresStream( cache_entry, &stm ); + if (!stg) return OLE_E_BLANK; + hr = open_pres_stream( stg, cache_entry->load_stream_num, &stm ); if (FAILED(hr)) return hr; switch (cache_entry->fmtetc.cfFormat) @@ -1004,14 +953,13 @@ static HRESULT save_view_cache(DataCacheEntry *entry, IStream *stream) return hr; } -static const WCHAR CONTENTS[] = {'C','O','N','T','E','N','T','S',0}; static HRESULT create_stream(DataCacheEntry *cache_entry, IStorage *storage, BOOL contents, IStream **stream) { WCHAR pres[] = {2,'O','l','e','P','r','e','s', - '0' + (cache_entry->stream_number / 100) % 10, - '0' + (cache_entry->stream_number / 10) % 10, - '0' + cache_entry->stream_number % 10, 0}; + '0' + (cache_entry->save_stream_num / 100) % 10, + '0' + (cache_entry->save_stream_num / 10) % 10, + '0' + cache_entry->save_stream_num % 10, 0}; const WCHAR *name; if (contents) @@ -1031,7 +979,7 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storag IStream *stream; BOOL contents = (cache_entry->id == 1); - TRACE("stream_number = %d, fmtetc = %s\n", cache_entry->stream_number, debugstr_formatetc(&cache_entry->fmtetc)); + TRACE("stream_number = %d, fmtetc = %s\n", cache_entry->save_stream_num, debugstr_formatetc(&cache_entry->fmtetc)); hr = create_stream(cache_entry, storage, contents, &stream); if (FAILED(hr)) @@ -1216,11 +1164,11 @@ static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, return copy_stg_medium(cache_entry->fmtetc.cfFormat, &cache_entry->stgmedium, stgmedium); } -static HRESULT DataCacheEntry_GetData(DataCacheEntry *cache_entry, FORMATETC *fmt, STGMEDIUM *stgmedium) +static HRESULT DataCacheEntry_GetData(DataCacheEntry *cache_entry, IStorage *stg, FORMATETC *fmt, STGMEDIUM *stgmedium) { - if (cache_entry->stgmedium.tymed == TYMED_NULL && cache_entry->stream) + if (cache_entry->stgmedium.tymed == TYMED_NULL && cache_entry->load_stream_num != STREAM_NUMBER_NOT_SET) { - HRESULT hr = DataCacheEntry_LoadData(cache_entry); + HRESULT hr = DataCacheEntry_LoadData(cache_entry, stg); if (FAILED(hr)) return hr; } @@ -1239,15 +1187,6 @@ static inline HRESULT DataCacheEntry_DiscardData(DataCacheEntry *cache_entry) return S_OK; } -static inline void DataCacheEntry_HandsOffStorage(DataCacheEntry *cache_entry) -{ - if (cache_entry->stream) - { - IStream_Release(cache_entry->stream); - cache_entry->stream = NULL; - } -} - static inline DWORD tymed_from_cf( DWORD cf ) { switch( cf ) @@ -1470,7 +1409,7 @@ static HRESULT WINAPI DataCache_GetData( if (!cache_entry) return OLE_E_BLANK; - return DataCacheEntry_GetData(cache_entry, pformatetcIn, pmedium); + return DataCacheEntry_GetData(cache_entry, This->presentationStorage, pformatetcIn, pmedium); } static HRESULT WINAPI DataCache_GetDataHere( @@ -1703,8 +1642,7 @@ static HRESULT WINAPI DataCache_InitNew( } -static HRESULT add_cache_entry( DataCache *This, const FORMATETC *fmt, DWORD advf, IStream *stm, - enum stream_type type ) +static HRESULT add_cache_entry( DataCache *This, const FORMATETC *fmt, DWORD advf, int stream_number ) { DataCacheEntry *cache_entry; HRESULT hr = S_OK; @@ -1717,10 +1655,8 @@ static HRESULT add_cache_entry( DataCache *This, const FORMATETC *fmt, DWORD adv if (SUCCEEDED( hr )) { DataCacheEntry_DiscardData( cache_entry ); - if (cache_entry->stream) IStream_Release( cache_entry->stream ); - cache_entry->stream = stm; - IStream_AddRef( stm ); - cache_entry->stream_type = type; + cache_entry->load_stream_num = stream_number; + cache_entry->save_stream_num = stream_number; cache_entry->dirty = FALSE; } return hr; @@ -1753,7 +1689,7 @@ static HRESULT parse_pres_streams( DataCache *cache, IStorage *stg ) fmtetc.lindex = header.lindex; fmtetc.tymed = tymed_from_cf( clipformat ); - add_cache_entry( cache, &fmtetc, header.advf, stm, pres_stream ); + add_cache_entry( cache, &fmtetc, header.advf, stream_number ); } IStream_Release( stm ); stream_number++; @@ -1771,7 +1707,7 @@ static HRESULT parse_contents_stream( DataCache *This, IStorage *stg ) const FORMATETC *fmt; IStream *stm; - hr = IStorage_OpenStream( stg, CONTENTS, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm ); + hr = open_pres_stream( stg, STREAM_NUMBER_CONTENTS, &stm ); if (FAILED( hr )) return hr; hr = IStorage_Stat( stg, &stat, STATFLAG_NONAME ); @@ -1786,7 +1722,7 @@ static HRESULT parse_contents_stream( DataCache *This, IStorage *stg ) goto done; } - hr = add_cache_entry( This, fmt, 0, stm, contents_stream ); + hr = add_cache_entry( This, fmt, 0, STREAM_NUMBER_CONTENTS ); done: IStream_Release( stm ); @@ -1852,17 +1788,17 @@ static HRESULT WINAPI DataCache_Save(IPersistStorage* iface, IStorage *stg, BOOL DataCache *This = impl_from_IPersistStorage(iface); DataCacheEntry *cache_entry; HRESULT hr = S_OK; - unsigned short stream_number = 0; + int stream_number = 0; TRACE("(%p, %p, %d)\n", iface, stg, same_as_load); /* assign stream numbers to the cache entries */ LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) { - if (cache_entry->stream_number != stream_number) + if (cache_entry->save_stream_num != stream_number) { cache_entry->dirty = TRUE; /* needs to be written out again */ - cache_entry->stream_number = stream_number; + cache_entry->save_stream_num = stream_number; } stream_number++; } @@ -1916,7 +1852,6 @@ static HRESULT WINAPI DataCache_HandsOffStorage( IPersistStorage* iface) { DataCache *this = impl_from_IPersistStorage(iface); - DataCacheEntry *cache_entry; TRACE("(%p)\n", iface); @@ -1926,9 +1861,6 @@ static HRESULT WINAPI DataCache_HandsOffStorage( this->presentationStorage = NULL; } - LIST_FOR_EACH_ENTRY(cache_entry, &this->cache_list, DataCacheEntry, entry) - DataCacheEntry_HandsOffStorage(cache_entry); - return S_OK; } @@ -2018,9 +1950,9 @@ static HRESULT WINAPI DataCache_Draw( continue; /* if the data hasn't been loaded yet, do it now */ - if ((cache_entry->stgmedium.tymed == TYMED_NULL) && cache_entry->stream) + if ((cache_entry->stgmedium.tymed == TYMED_NULL) && (cache_entry->load_stream_num != STREAM_NUMBER_NOT_SET)) { - hres = DataCacheEntry_LoadData(cache_entry); + hres = DataCacheEntry_LoadData(cache_entry, This->presentationStorage); if (FAILED(hres)) continue; } @@ -2278,9 +2210,9 @@ static HRESULT WINAPI DataCache_GetExtent( continue; /* if the data hasn't been loaded yet, do it now */ - if ((cache_entry->stgmedium.tymed == TYMED_NULL) && cache_entry->stream) + if ((cache_entry->stgmedium.tymed == TYMED_NULL) && (cache_entry->load_stream_num != STREAM_NUMBER_NOT_SET)) { - hres = DataCacheEntry_LoadData(cache_entry); + hres = DataCacheEntry_LoadData(cache_entry, This->presentationStorage); if (FAILED(hres)) continue; } -- 2.12.0

1 0

[Patch Wine] Add and Change some Korean translations.
by 김건우 24 Jan '18

24 Jan '18

I don't know why $ git commit -s does not work well.

3 2

[PATCH] user32: Always process sent messages when sending inter-thread messages.
by Zebediah Figura 24 Jan '18

24 Jan '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Sometimes the sent message will be processed before the loop has had time to execute once, and sent messages will remain in the queue unprocessed. This never happens on Windows, although it is not quite clear whether this is guaranteed or whether it is simply due to consistency in thread scheduling. MSDN states: However, the sending thread will process incoming nonqueued messages while waiting for its message to be processed. which is somewhat ambiguous. We have tests in Wine (namely in ole32:clipboard) which were failing intermittently because sent messages were sometimes not being processed while executing SendMessageTimeout(). This test has never failed on Windows, in any configuration tracked on test.winehq.org, and so I am inclined to conclude that this logic matches Windows' behaviour. dlls/user32/message.c | 2 +- dlls/user32/tests/msg.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 172d659..81844e3 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3015,13 +3015,13 @@ static void wait_message_reply( UINT flags ) thread_info->wake_mask = thread_info->changed_mask = 0; - if (wake_bits & QS_SMRESULT) return; /* got a result */ if (wake_bits & QS_SENDMESSAGE) { /* Process the sent message immediately */ process_sent_messages(); continue; } + if (wake_bits & QS_SMRESULT) return; /* got a result */ wow_handlers.wait_message( 1, &server_queue, INFINITE, wake_mask, 0 ); } diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f391ab9..082b560 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -16633,6 +16633,37 @@ static void test_DoubleSetCapture(void) DestroyWindow(hwnd); } +static DWORD WINAPI send_notify_message_thread(void *param) +{ + SendNotifyMessageA((HWND) param, WM_USER, 0, 0); + return 0; +} + +static void test_SendMessage_pump(void) +{ + /* Sending a message to another thread's window should process sent messages + * currently in the queue. On Windows this always happens, i.e. we never + * fail to do so if we've already received a reply. */ + + HWND hwnd; + HANDLE thread; + + hwnd = CreateWindowA("TestWindowClass", "test_SendMessage_pump", 0, + 100, 100, 200, 200, 0, 0, 0, 0); + ok(hwnd != NULL, "Failed to create window\n"); + flush_sequence(); + + thread = CreateThread(0, 0, send_notify_message_thread, hwnd, 0, 0); + ok(WaitForSingleObject(thread, 1000) == WAIT_OBJECT_0, "wait failed\n"); + ok_sequence(WmEmptySeq, "no messages", FALSE); + + SendMessageA(GetDesktopWindow(), WM_NULL, 0, 0); + ok_sequence(WmUser, "SendMessage() pump", FALSE); + + CloseHandle(thread); + DestroyWindow(hwnd); +} + static void init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -16777,6 +16808,7 @@ START_TEST(msg) test_TrackPopupMenu(); test_TrackPopupMenuEmpty(); test_DoubleSetCapture(); + test_SendMessage_pump(); /* keep it the last test, under Windows it tends to break the tests * which rely on active/foreground windows being correct. */ -- 2.7.4

1 0

[PATCH] ddraw/tests: Make test_depth_readback work on Nvidia GPUs on Windows (v2).
by Stefan Dösinger 23 Jan '18

23 Jan '18

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- Version 2: Remove a redundant broken() around ddraw_is_nvidia(). I consider the behavior of these GPUs generally broken, but at least one format is working on all of them. We just don't know in advance which one, and on at least my Geforce 9 an actual game is broken too. This test accepts a few known failure conditions as broken, but expects at least one format to pass in ddraw2 - ddraw4. ddraw1 only has D16, which fails on GF9, so don't even attempt to run the test. I previously seemed to have results with "reversed" 32 bit formats (S8D24/X8D24 instead of D24S8/D24X8), but I could not reproduce this any more today. I suspect I did something wrong with adjusting the expected results for the shifted depth mask. --- dlls/ddraw/tests/ddraw1.c | 12 ++++++++++++ dlls/ddraw/tests/ddraw2.c | 16 ++++++++++++++-- dlls/ddraw/tests/ddraw4.c | 21 +++++++++++++++++---- dlls/ddraw/tests/ddraw7.c | 33 ++++++++++++++++++++++++++++++--- 4 files changed, 73 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index fb56980800..626b07bace 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -10840,6 +10840,18 @@ static void test_depth_readback(void) ok(!!window, "Failed to create a window.\n"); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); + if (ddraw_is_nvidia(ddraw)) + { + /* ddraw1 only has access to D16 Z buffers (and D24 ones, which are even more + * broken on Nvidia), so don't even attempt to run this test on Nvidia cards + * because some of them have broken D16 readback. See the ddraw7 version of + * this test for a more detailed comment. */ + skip("Some Nvidia GPUs have broken D16 readback, skipping.\n"); + IDirectDraw_Release(ddraw); + DestroyWindow(window); + return; + } + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) { skip("Failed to create a D3D device, skipping tests.\n"); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index faf7cefdc8..1ab1f9c591 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -12211,7 +12211,7 @@ static void test_set_render_state(void) static void test_depth_readback(void) { - DWORD depth, expected_depth, max_diff; + DWORD depth, expected_depth, max_diff, passed_fmts = 0; IDirect3DMaterial2 *blue_background; IDirectDrawSurface *rt, *ds; IDirect3DViewport2 *viewport; @@ -12223,6 +12223,7 @@ static void test_depth_readback(void) HWND window; HRESULT hr; void *ptr; + BOOL all_pass; static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; static D3DLVERTEX quad[] = @@ -12307,6 +12308,7 @@ static void test_depth_readback(void) hr = IDirectDrawSurface_Lock(ds, NULL, &surface_desc, DDLOCK_READONLY | DDLOCK_WAIT, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); + all_pass = TRUE; for (y = 60; y < 480; y += 120) { for (x = 80; x < 640; x += 160) @@ -12317,20 +12319,30 @@ static void test_depth_readback(void) depth = *((DWORD *)ptr) & tests[i].z_mask; expected_depth = (x * (0.9 / 640.0) + y * (0.1 / 480.0)) * tests[i].z_mask; max_diff = ((0.5f * 0.9f) / 640.0f) * tests[i].z_mask; - ok(abs(expected_depth - depth) <= max_diff, + /* The ddraw2 version of this test behaves similarly to the ddraw7 version on Nvidia GPUs, + * except that we only have D16 (broken on geforce 9) and D24X8 (broken on geforce 7) available. + * Accept all nvidia GPUs as broken here, but still expect one of the formats to pass. */ + ok(abs(expected_depth - depth) <= max_diff || ddraw_is_nvidia(ddraw), "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", i, depth, expected_depth - depth, expected_depth, max_diff, x, y); + if (abs(expected_depth - depth) > max_diff) + all_pass = FALSE; } } hr = IDirectDrawSurface_Unlock(ds, NULL); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); + if (all_pass) + passed_fmts++; + hr = IDirectDrawSurface_DeleteAttachedSurface(rt, 0, ds); ok(SUCCEEDED(hr), "Failed to detach depth buffer, hr %#x.\n", hr); IDirectDrawSurface_Release(ds); } + ok(passed_fmts, "Not a single format passed the tests, this is bad even by Nvidia's standards.\n"); + destroy_viewport(device, viewport); destroy_material(blue_background); IDirectDrawSurface_Release(rt); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 1f0b01bdde..02b10b5ccb 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -14313,7 +14313,7 @@ static void test_map_synchronisation(void) static void test_depth_readback(void) { - DWORD depth, expected_depth, max_diff; + DWORD depth, expected_depth, max_diff, passed_fmts = 0; IDirectDrawSurface4 *rt, *ds; IDirect3DViewport3 *viewport; DDSURFACEDESC2 surface_desc; @@ -14325,6 +14325,7 @@ static void test_depth_readback(void) HWND window; HRESULT hr; RECT r; + BOOL all_pass; static D3DRECT clear_rect = {{0}, {0}, {640}, {480}}; static struct @@ -14421,6 +14422,7 @@ static void test_depth_readback(void) hr = IDirect3DDevice3_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + all_pass = TRUE; for (y = 60; y < 480; y += 120) { for (x = 80; x < 640; x += 160) @@ -14434,21 +14436,32 @@ static void test_depth_readback(void) depth = *((DWORD *)surface_desc.lpSurface) & tests[i].z_mask; expected_depth = (x * (0.9 / 640.0) + y * (0.1 / 480.0)) * tests[i].z_mask; max_diff = ((0.5f * 0.9f) / 640.0f) * tests[i].z_mask; + /* The ddraw4 version of this test behaves similarly to the ddraw7 version on Nvidia GPUs, + * except that Geforce 7 also returns garbage data in D24S8, whereas the ddraw7 version + * returns 0 for that format. Give up on pre-filtering formats, accept Nvidia as generally + * broken here, but still expect at least one format (D16 or D24X8 in practise) to pass. */ todo_wine_if(tests[i].todo) - ok(abs(expected_depth - depth) <= max_diff, - "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", - i, depth, expected_depth - depth, expected_depth, max_diff, x, y); + ok(abs(expected_depth - depth) <= max_diff || ddraw_is_nvidia(ddraw), + "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", + i, depth, expected_depth - depth, expected_depth, max_diff, x, y); + if (abs(expected_depth - depth) > max_diff) + all_pass = FALSE; hr = IDirectDrawSurface4_Unlock(ds, &r); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); } } + if (all_pass) + passed_fmts++; + hr = IDirectDrawSurface4_DeleteAttachedSurface(rt, 0, ds); ok(SUCCEEDED(hr), "Failed to detach depth buffer, hr %#x.\n", hr); IDirectDrawSurface4_Release(ds); } + ok(passed_fmts, "Not a single format passed the tests, this is bad even by Nvidia's standards.\n"); + destroy_viewport(device, viewport); IDirectDrawSurface4_Release(rt); IDirectDraw4_Release(ddraw); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 2e41ff3715..43c52aa8b9 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -13689,7 +13689,7 @@ done: static void test_depth_readback(void) { - DWORD depth, expected_depth, max_diff; + DWORD depth, expected_depth, max_diff, raw_value, passed_fmts = 0; IDirectDrawSurface7 *rt, *ds; DDSURFACEDESC2 surface_desc; IDirect3DDevice7 *device; @@ -13700,6 +13700,7 @@ static void test_depth_readback(void) HWND window; HRESULT hr; RECT r; + BOOL all_zero, all_one, all_pass; static struct { @@ -13791,6 +13792,7 @@ static void test_depth_readback(void) hr = IDirect3DDevice7_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + all_zero = all_one = all_pass = TRUE; for (y = 60; y < 480; y += 120) { for (x = 80; x < 640; x += 160) @@ -13801,24 +13803,49 @@ static void test_depth_readback(void) hr = IDirectDrawSurface7_Lock(ds, &r, &surface_desc, DDLOCK_READONLY, NULL); ok(SUCCEEDED(hr), "Failed to lock surface, hr %#x.\n", hr); - depth = *((DWORD *)surface_desc.lpSurface) & tests[i].z_mask; + raw_value = *((DWORD *)surface_desc.lpSurface); + if (raw_value) + all_zero = FALSE; + if (raw_value != 0x00ffffff) + all_one = FALSE; + + depth = raw_value & tests[i].z_mask; expected_depth = (x * (0.9 / 640.0) + y * (0.1 / 480.0)) * tests[i].z_mask; max_diff = ((0.5f * 0.9f) / 640.0f) * tests[i].z_mask; + /* This test is very reliably on AMD, but fails in a number of interesting ways on Nvidia GPUs: + * + * Geforce 7 GPUs work only with D16. D24 and D24S8 return 0, D24X8 broken data. + * + * Geforce 9 GPUs return return broken data for D16 that resembles the expected data in + * the lower 8 bits and has 0xff in the upper 8 bits. D24X8 works, D24 and D24S8 return + * 0x00ffffff. + * + * Geforce GTX 650 has working D16 and D24, but D24S8 returns 0. + * + * Arx Fatalis is broken on the Geforce 9 in the same way it was broken in Wine (bug 43654). + * The !tests[i].s_depth is supposed to rule out D16 on GF9 and D24X8 on GF7. */ todo_wine_if(tests[i].todo) - ok(abs(expected_depth - depth) <= max_diff, + ok(abs(expected_depth - depth) <= max_diff + || (ddraw_is_nvidia(ddraw) && (all_zero || all_one || !tests[i].s_depth)), "Test %u: Got depth 0x%08x (diff %d), expected 0x%08x+/-%u, at %u, %u.\n", i, depth, expected_depth - depth, expected_depth, max_diff, x, y); + if (abs(expected_depth - depth) > max_diff) + all_pass = FALSE; hr = IDirectDrawSurface7_Unlock(ds, &r); ok(SUCCEEDED(hr), "Failed to unlock surface, hr %#x.\n", hr); } } + if (all_pass) + passed_fmts++; hr = IDirectDrawSurface7_DeleteAttachedSurface(rt, 0, ds); ok(SUCCEEDED(hr), "Failed to detach depth buffer, hr %#x.\n", hr); IDirectDrawSurface7_Release(ds); } + ok(passed_fmts, "Not a single format passed the tests, this is bad even by Nvidia's standards.\n"); + IDirectDrawSurface7_Release(rt); IDirectDraw7_Release(ddraw); IDirect3D7_Release(d3d); -- 2.13.6

2 1

[PATCH 1/5] include: Add shellscalingapi.h
by Alex Henrie 23 Jan '18

23 Jan '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Patch adapted from Wine Staging. include/Makefile.in | 1 + include/shellscalingapi.h | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 include/shellscalingapi.h diff --git a/include/Makefile.in b/include/Makefile.in index bb6f8d6fab..b975dd585e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -617,6 +617,7 @@ HEADER_SRCS = \ sfc.h \ shdispid.h \ shellapi.h \ + shellscalingapi.h \ shlguid.h \ shlobj.h \ shlwapi.h \ diff --git a/include/shellscalingapi.h b/include/shellscalingapi.h new file mode 100644 index 0000000000..4999db741a --- /dev/null +++ b/include/shellscalingapi.h @@ -0,0 +1,37 @@ +/* + * Copyright 2016 Sebastian Lackner + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_SHELLSCALINGAPI_H +#define __WINE_SHELLSCALINGAPI_H + +typedef enum MONITOR_DPI_TYPE +{ + MDT_EFFECTIVE_DPI = 0, + MDT_ANGULAR_DPI = 1, + MDT_RAW_DPI = 2, + MDT_DEFAULT = MDT_EFFECTIVE_DPI, +} MONITOR_DPI_TYPE; + +typedef enum PROCESS_DPI_AWARENESS +{ + PROCESS_DPI_UNAWARE = 0, + PROCESS_SYSTEM_DPI_AWARE = 1, + PROCESS_PER_MONITOR_DPI_AWARE = 2, +} PROCESS_DPI_AWARENESS; + +#endif /* __WINE_SHELLSCALINGAPI_H */ -- 2.16.1

2 5

[PATCH]uxtheme: add stub for SetWindowThemeAttribute
by Louis Lenders 23 Jan '18

23 Jan '18

this is for https://bugs.winehq.org/show_bug.cgi?id=42085 using >XP mode

1 0

[PATCH vkd3d 1/3] libs/vkd3d: Allow library user to enable additional instance extensions.
by Józef Kucia 23 Jan '18

23 Jan '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d.h | 3 ++ libs/vkd3d-utils/vkd3d_utils_main.c | 7 +-- libs/vkd3d/device.c | 92 ++++++++++++++++++++++++++++--------- 3 files changed, 76 insertions(+), 26 deletions(-) diff --git a/include/vkd3d.h b/include/vkd3d.h index ac37c26f4a9a..0eb85ea27d2e 100644 --- a/include/vkd3d.h +++ b/include/vkd3d.h @@ -52,6 +52,9 @@ struct vkd3d_instance_create_info /* If set to NULL, libvkd3d loads libvulkan. */ PFN_vkGetInstanceProcAddr vkGetInstanceProcAddr_pfn; + + const char * const *instance_extensions; + uint32_t instance_extension_count; }; struct vkd3d_device_create_info diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index f68c47badd5c..fb4344ebf086 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -37,16 +37,13 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, if (adapter) FIXME("Ignoring adapter %p.\n", adapter); + memset(&instance_create_info, 0, sizeof(instance_create_info)); instance_create_info.signal_event_pfn = vkd3d_signal_event; - instance_create_info.create_thread_pfn = NULL; - instance_create_info.join_thread_pfn = NULL; instance_create_info.wchar_size = sizeof(WCHAR); - instance_create_info.vkGetInstanceProcAddr_pfn = NULL; + memset(&device_create_info, 0, sizeof(device_create_info)); device_create_info.minimum_feature_level = minimum_feature_level; - device_create_info.instance = NULL; device_create_info.instance_create_info = &instance_create_info; - device_create_info.vk_physical_device = VK_NULL_HANDLE; return vkd3d_create_device(&device_create_info, riid, device); } diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 7a9951122e4d..21e09f10fad8 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -38,9 +38,6 @@ static const struct vkd3d_optional_extension_info optional_instance_extensions[] offsetof(struct vkd3d_vulkan_info, KHR_get_physical_device_properties2)}, }; -#define MAX_INSTANCE_EXTENSION_COUNT \ - (ARRAY_SIZE(required_instance_extensions) + ARRAY_SIZE(optional_instance_extensions)) - static const char * const required_device_extensions[] = { VK_KHR_MAINTENANCE1_EXTENSION_NAME, @@ -90,11 +87,13 @@ static bool has_extension(const VkExtensionProperties *extensions, return false; } -static void vkd3d_check_extensions(const VkExtensionProperties *extensions, unsigned int count, +static unsigned int vkd3d_check_extensions(const VkExtensionProperties *extensions, unsigned int count, const char * const *required_extensions, unsigned int required_extension_count, const struct vkd3d_optional_extension_info *optional_extensions, unsigned int optional_extension_count, + const char * const *user_extensions, unsigned int user_extension_count, struct vkd3d_vulkan_info *vulkan_info, const char *extension_type) { + unsigned int extension_count = 0; unsigned int i; for (i = 0; i < required_extension_count; ++i) @@ -102,6 +101,7 @@ static void vkd3d_check_extensions(const VkExtensionProperties *extensions, unsi if (!has_extension(extensions, count, required_extensions[i])) ERR("Required %s extension %s is not supported.\n", extension_type, debugstr_a(required_extensions[i])); + ++extension_count; } for (i = 0; i < optional_extension_count; ++i) @@ -111,34 +111,64 @@ static void vkd3d_check_extensions(const VkExtensionProperties *extensions, unsi bool *supported = (void *)((uintptr_t)vulkan_info + offset); if ((*supported = has_extension(extensions, count, extension_name))) + { TRACE("Found %s extension.\n", debugstr_a(extension_name)); + ++extension_count; + } + } + + for (i = 0; i < user_extension_count; ++i) + { + if (!has_extension(extensions, count, user_extensions[i])) + ERR("Required user %s extension %s is not supported.\n", + extension_type, debugstr_a(required_extensions[i])); + ++extension_count; } + + return extension_count; } static unsigned int vkd3d_enable_extensions(const char *extensions[], const char * const *required_extensions, unsigned int required_extension_count, const struct vkd3d_optional_extension_info *optional_extensions, unsigned int optional_extension_count, + const char * const *user_extensions, unsigned int user_extension_count, const struct vkd3d_vulkan_info *vulkan_info) { + unsigned int extension_count = 0; unsigned int i, j; for (i = 0; i < required_extension_count; ++i) { - extensions[i] = required_extensions[i]; + extensions[extension_count++] = required_extensions[i]; } - for (j = 0; j < optional_extension_count; ++j) + for (i = 0; i < optional_extension_count; ++i) { - ptrdiff_t offset = optional_extensions[j].vulkan_info_offset; + ptrdiff_t offset = optional_extensions[i].vulkan_info_offset; const bool *supported = (void *)((uintptr_t)vulkan_info + offset); if (*supported) - extensions[i++] = optional_extensions[j].extension_name; + extensions[extension_count++] = optional_extensions[i].extension_name; + } + for (i = 0; i < user_extension_count; ++i) + { + /* avoid duplicates */ + for (j = 0; j < extension_count; ++j) + { + if (!strcmp(extensions[j], user_extensions[i])) + break; + } + if (j != extension_count) + continue; + + extensions[extension_count++] = user_extensions[i]; } - return i; + return extension_count; } -static void vkd3d_init_instance_caps(struct vkd3d_instance *instance) +static HRESULT vkd3d_init_instance_caps(struct vkd3d_instance *instance, + const struct vkd3d_instance_create_info *create_info, + uint32_t *instance_extension_count) { const struct vkd3d_vk_global_procs *vk_procs = &instance->vk_global_procs; struct vkd3d_vulkan_info *vulkan_info = &instance->vk_info; @@ -146,31 +176,36 @@ static void vkd3d_init_instance_caps(struct vkd3d_instance *instance) uint32_t count; VkResult vr; + memset(vulkan_info, 0, sizeof(*vulkan_info)); + *instance_extension_count = 0; + if ((vr = vk_procs->vkEnumerateInstanceExtensionProperties(NULL, &count, NULL)) < 0) { ERR("Failed to enumerate instance extensions, vr %d.\n", vr); - return; + return hresult_from_vk_result(vr); } if (!count) - return; + return S_OK; if (!(vk_extensions = vkd3d_calloc(count, sizeof(*vk_extensions)))) - return; + return E_OUTOFMEMORY; TRACE("Enumerating %u instance extensions.\n", count); if ((vr = vk_procs->vkEnumerateInstanceExtensionProperties(NULL, &count, vk_extensions)) < 0) { ERR("Failed to enumerate instance extensions, vr %d.\n", vr); vkd3d_free(vk_extensions); - return; + return hresult_from_vk_result(vr); } - vkd3d_check_extensions(vk_extensions, count, + *instance_extension_count = vkd3d_check_extensions(vk_extensions, count, required_instance_extensions, ARRAY_SIZE(required_instance_extensions), optional_instance_extensions, ARRAY_SIZE(optional_instance_extensions), + create_info->instance_extensions, create_info->instance_extension_count, vulkan_info, "instance"); vkd3d_free(vk_extensions); + return S_OK; } static HRESULT vkd3d_init_vk_global_procs(struct vkd3d_instance *instance, @@ -214,9 +249,10 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, const struct vkd3d_instance_create_info *create_info) { const struct vkd3d_vk_global_procs *vk_global_procs = &instance->vk_global_procs; - const char *extensions[MAX_INSTANCE_EXTENSION_COUNT]; VkApplicationInfo application_info; VkInstanceCreateInfo instance_info; + uint32_t extension_count; + const char **extensions; VkInstance vk_instance; VkResult vr; HRESULT hr; @@ -248,8 +284,12 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, return hr; } - memset(&instance->vk_info, 0, sizeof(instance->vk_info)); - vkd3d_init_instance_caps(instance); + if (FAILED(hr = vkd3d_init_instance_caps(instance, create_info, &extension_count))) + { + if (instance->libvulkan) + dlclose(instance->libvulkan); + return hr; + } application_info.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO; application_info.pNext = NULL; @@ -259,6 +299,13 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, application_info.engineVersion = 0; application_info.apiVersion = VK_API_VERSION_1_0; + if (!(extensions = vkd3d_calloc(extension_count, sizeof(*extensions)))) + { + if (instance->libvulkan) + dlclose(instance->libvulkan); + return E_OUTOFMEMORY; + } + instance_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; instance_info.pNext = NULL; instance_info.flags = 0; @@ -268,10 +315,13 @@ static HRESULT vkd3d_instance_init(struct vkd3d_instance *instance, instance_info.enabledExtensionCount = vkd3d_enable_extensions(extensions, required_instance_extensions, ARRAY_SIZE(required_instance_extensions), optional_instance_extensions, ARRAY_SIZE(optional_instance_extensions), + create_info->instance_extensions, create_info->instance_extension_count, &instance->vk_info); instance_info.ppEnabledExtensionNames = extensions; - if ((vr = vk_global_procs->vkCreateInstance(&instance_info, NULL, &vk_instance))) + vr = vk_global_procs->vkCreateInstance(&instance_info, NULL, &vk_instance); + vkd3d_free(extensions); + if (vr < 0) { ERR("Failed to create Vulkan instance, vr %d.\n", vr); if (instance->libvulkan) @@ -699,7 +749,7 @@ static void vkd3d_init_device_caps(struct d3d12_device *device, vkd3d_check_extensions(vk_extensions, count, required_device_extensions, ARRAY_SIZE(required_device_extensions), optional_device_extensions, ARRAY_SIZE(optional_device_extensions), - vulkan_info, "device"); + NULL, 0, vulkan_info, "device"); vkd3d_free(vk_extensions); } @@ -917,7 +967,7 @@ static HRESULT vkd3d_create_vk_device(struct d3d12_device *device, VkPhysicalDev device_info.enabledExtensionCount = vkd3d_enable_extensions(extensions, required_device_extensions, ARRAY_SIZE(required_device_extensions), optional_device_extensions, ARRAY_SIZE(optional_device_extensions), - &device->vk_info); + NULL, 0, &device->vk_info); device_info.ppEnabledExtensionNames = extensions; device_info.pEnabledFeatures = &device_features; -- 2.13.6

2 5

[PATCH] schtasks: Ignore /tr and /ru options.
by Jacek Caban 23 Jan '18

23 Jan '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/schtasks/schtasks.c | 81 +++++++++++++++++++++++++++++++------------- 1 file changed, 57 insertions(+), 24 deletions(-)

1 0

[PATCH 10/10 v2] msvcp100: Support exceptions while copying object in _Concurrent_queue_base_v4::_Internal_push
by Piotr Caban 23 Jan '18

23 Jan '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 49 +++++++++++++++++++++++++++++++++--------------- include/wine/exception.h | 2 +- 2 files changed, 35 insertions(+), 16 deletions(-)

1 0

[PATCH 09/10 v2] msvcp120: Add _Concurrent_queue_base_v4 multi-threaded tests
by Piotr Caban 23 Jan '18

23 Jan '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp120/tests/msvcp120.c | 211 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 198 insertions(+), 13 deletions(-)

1 0

[PATCH 08/10 v2] msvcp120: Add _Concurrent_queue_base_v4 tests
by Piotr Caban 23 Jan '18

23 Jan '18

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

1 0

[PATCH 07/10 v2] msvcp100: Add _Concurrent_queue_base_v4 push/pop implementation
by Piotr Caban 23 Jan '18

23 Jan '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 157 insertions(+), 5 deletions(-)

1 0

[PATCH 06/10 v2] msvcp100: Add _Concurrent_queue_base_v4::_Internal_size implementation
by Piotr Caban 23 Jan '18

23 Jan '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH 05/10 v2] msvcp100: Add _Concurrent_queue_base_v4::_Internal_finish_clear implementation
by Piotr Caban 23 Jan '18

23 Jan '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)

1 0

[PATCH 04/10 v2] msvcp100: Add _Concurrent_queue_base_v4 destructor implementation
by Piotr Caban 23 Jan '18

23 Jan '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH 03/10 v2] msvcp100: Add _Concurrent_queue_base_v4 constructor implementation
by Piotr Caban 23 Jan '18

23 Jan '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)

1 0

[PATCH 02/10 v2] msvcp100: Add _Concurrent_queue_base_v4::_Internal_throw_exception implementation
by Piotr Caban 23 Jan '18

23 Jan '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH 01/10 v2] msvcp100: Add Concurrency::details::_Concurrent_queue_base_v4 class stub
by Piotr Caban 23 Jan '18

23 Jan '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - fix 64-bit compilation warning (only patch 8 was changed) dlls/concrt140/concrt140.spec | 40 ++++----- dlls/msvcp100/msvcp100.spec | 32 +++---- dlls/msvcp110/msvcp110.spec | 60 ++++++------- dlls/msvcp120/msvcp120.spec | 60 ++++++------- dlls/msvcp120_app/msvcp120_app.spec | 60 ++++++------- dlls/msvcp90/misc.c | 170 ++++++++++++++++++++++++++++++++++++ 6 files changed, 296 insertions(+), 126 deletions(-)

1 0

[PATCH] dhtmled.ocx: Add DLL and stub DHTMLEdit object
by Jacek Caban 23 Jan '18

23 Jan '18

From: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- configure.ac | 1 + dlls/dhtmled.ocx/Makefile.in | 8 + dlls/dhtmled.ocx/dhtmled.ocx.spec | 4 + dlls/dhtmled.ocx/dhtmled_private.h | 19 ++ dlls/dhtmled.ocx/dhtmled_tlb.idl | 22 ++ dlls/dhtmled.ocx/edit.c | 534 +++++++++++++++++++++++++++++++++++++ dlls/dhtmled.ocx/main.c | 156 +++++++++++ 7 files changed, 744 insertions(+) create mode 100644 dlls/dhtmled.ocx/Makefile.in create mode 100644 dlls/dhtmled.ocx/dhtmled.ocx.spec create mode 100644 dlls/dhtmled.ocx/dhtmled_private.h create mode 100644 dlls/dhtmled.ocx/dhtmled_tlb.idl create mode 100644 dlls/dhtmled.ocx/edit.c create mode 100644 dlls/dhtmled.ocx/main.c

1 0

[PATCH 4/4] kernel32: Don't initialize Information of passed OVERLAPPED struct in WriteFile.
by Jacek Caban 23 Jan '18

23 Jan '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/file.c | 2 +- dlls/kernel32/tests/pipe.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[PATCH 3/4] kernel32: Always set bytes written in WriteFile.
by Jacek Caban 23 Jan '18

23 Jan '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/file.c | 4 ++-- dlls/kernel32/tests/pipe.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH 2/4] kernel32: Don't initialize Information of passed OVERLAPPED struct in ReadFile.
by Jacek Caban 23 Jan '18

23 Jan '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/file.c | 2 +- dlls/kernel32/tests/pipe.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)

1 0

[PATCH 1/4] kernel32: Always set bytes read in ReadFile.
by Jacek Caban 23 Jan '18

23 Jan '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/file.c | 4 ++-- dlls/kernel32/tests/pipe.c | 50 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 3 deletions(-)

1 0

[PATCH 2/2] advapi32: Implement NotifyServiceStatusChange
by Andrew Eikum 23 Jan '18

23 Jan '18

This fixes launching Office 2010 applications in >=vista prefixes, see bug 38838. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/advapi32/service.c | 146 ++++++++++++++++++++++++++++++++++++------ dlls/advapi32/tests/service.c | 141 ++++++++++++++++++++++++++++++---------- 2 files changed, 233 insertions(+), 54 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index ddd6a21429..7d66326d51 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -48,6 +48,7 @@ #include "advapi32_misc.h" #include "wine/exception.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(service); @@ -83,6 +84,18 @@ typedef struct dispatcher_data_t HANDLE pipe; } dispatcher_data; +typedef struct notify_data_t { + SC_HANDLE service; + SC_RPC_NOTIFY_PARAMS params; + SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 cparams; + SC_NOTIFY_RPC_HANDLE notify_handle; + SERVICE_NOTIFYW *notify_buffer; + HANDLE calling_thread, ready_evt; + struct list entry; +} notify_data; + +static struct list notify_list = LIST_INIT(notify_list); + static CRITICAL_SECTION service_cs; static CRITICAL_SECTION_DEBUG service_cs_debug = { @@ -2596,37 +2609,130 @@ BOOL WINAPI EnumDependentServicesW( SC_HANDLE hService, DWORD dwServiceState, return TRUE; } +static DWORD WINAPI notify_thread(void *user) +{ + DWORD err; + notify_data *data = user; + SC_RPC_NOTIFY_PARAMS_LIST *list; + SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 *cparams; + BOOL dummy; + + __TRY + { + /* GetNotifyResults blocks until there is an event */ + err = svcctl_GetNotifyResults(data->notify_handle, &list); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code(GetExceptionCode()); + } + __ENDTRY + + EnterCriticalSection( &service_cs ); + + list_remove(&data->entry); + + LeaveCriticalSection( &service_cs ); + + if (err == ERROR_SUCCESS && list) + { + cparams = list->NotifyParamsArray[0].u.params; + + data->notify_buffer->dwNotificationStatus = cparams->dwNotificationStatus; + memcpy(&data->notify_buffer->ServiceStatus, &cparams->ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS)); + data->notify_buffer->dwNotificationTriggered = cparams->dwNotificationTriggered; + data->notify_buffer->pszServiceNames = NULL; + + QueueUserAPC((PAPCFUNC)data->notify_buffer->pfnNotifyCallback, + data->calling_thread, (ULONG_PTR)data->notify_buffer); + + HeapFree(GetProcessHeap(), 0, list); + } + else + WARN("GetNotifyResults server call failed: %u\n", err); + + + __TRY + { + err = svcctl_CloseNotifyHandle(&data->notify_handle, &dummy); + } + __EXCEPT(rpc_filter) + { + err = map_exception_code(GetExceptionCode()); + } + __ENDTRY + + if (err != ERROR_SUCCESS) + WARN("CloseNotifyHandle server call failed: %u\n", err); + + CloseHandle(data->calling_thread); + HeapFree(GetProcessHeap(), 0, data); + + return 0; +} + /****************************************************************************** * NotifyServiceStatusChangeW [ADVAPI32.@] */ DWORD WINAPI NotifyServiceStatusChangeW(SC_HANDLE hService, DWORD dwNotifyMask, SERVICE_NOTIFYW *pNotifyBuffer) { - DWORD dummy; - BOOL ret; - SERVICE_STATUS_PROCESS st; - static int once; + DWORD err; + BOOL b_dummy = FALSE; + GUID g_dummy = {0}; + notify_data *data; - if (!once++) FIXME("%p 0x%x %p - semi-stub\n", hService, dwNotifyMask, pNotifyBuffer); + TRACE("%p 0x%x %p\n", hService, dwNotifyMask, pNotifyBuffer); - ret = QueryServiceStatusEx(hService, SC_STATUS_PROCESS_INFO, (void*)&st, sizeof(st), &dummy); - if (ret) + data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)); + if (!data) + return ERROR_NOT_ENOUGH_MEMORY; + + data->service = hService; + data->notify_buffer = pNotifyBuffer; + if (!DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), + GetCurrentProcess(), &data->calling_thread, 0, FALSE, + DUPLICATE_SAME_ACCESS)) + { + ERR("DuplicateHandle failed: %u\n", GetLastError()); + HeapFree(GetProcessHeap(), 0, data); + return ERROR_NOT_ENOUGH_MEMORY; + } + + data->params.dwInfoLevel = 2; + data->params.u.params = &data->cparams; + + data->cparams.dwNotifyMask = dwNotifyMask; + + EnterCriticalSection( &service_cs ); + + __TRY { - /* dwNotifyMask is a set of bitflags in same order as SERVICE_ statuses */ - if (dwNotifyMask & (1 << (st.dwCurrentState - SERVICE_STOPPED))) - { - pNotifyBuffer->dwNotificationStatus = ERROR_SUCCESS; - memcpy(&pNotifyBuffer->ServiceStatus, &st, sizeof(pNotifyBuffer->ServiceStatus)); - pNotifyBuffer->dwNotificationTriggered = 1 << (st.dwCurrentState - SERVICE_STOPPED); - pNotifyBuffer->pszServiceNames = NULL; - TRACE("Queueing notification: 0x%x\n", pNotifyBuffer->dwNotificationTriggered); - QueueUserAPC((PAPCFUNC)pNotifyBuffer->pfnNotifyCallback, - GetCurrentThread(), (ULONG_PTR)pNotifyBuffer); - } + err = svcctl_NotifyServiceStatusChange(hService, data->params, + &g_dummy, &g_dummy, &b_dummy, &data->notify_handle); } + __EXCEPT(rpc_filter) + { + err = map_exception_code(GetExceptionCode()); + } + __ENDTRY + + if (err != ERROR_SUCCESS) + { + WARN("NotifyServiceStatusChange server call failed: %u\n", err); + LeaveCriticalSection( &service_cs ); + CloseHandle(data->calling_thread); + CloseHandle(data->ready_evt); + HeapFree(GetProcessHeap(), 0, data); + return err; + } + + CloseHandle(CreateThread(NULL, 0, &notify_thread, data, 0, NULL)); + + list_add_tail(&notify_list, &data->entry); - /* TODO: If the service is not currently in a matching state, we should - * tell `services` to monitor it. */ + LeaveCriticalSection( &service_cs ); return ERROR_SUCCESS; } diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index 405cef7662..cc4834753d 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2263,73 +2263,146 @@ static DWORD try_start_stop(SC_HANDLE svc_handle, const char* name, DWORD is_nt4 return le1; } +#define PHASE_STOPPED 1 +#define PHASE_RUNNING 2 + struct notify_data { SERVICE_NOTIFYW notify; SC_HANDLE svc; + BOOL was_called; + DWORD phase; }; -static void CALLBACK cb_stopped(void *user) +static void CALLBACK notify_cb(void *user) { struct notify_data *data = user; - BOOL br; + switch (data->phase) + { + case PHASE_STOPPED: + ok(data->notify.dwNotificationStatus == ERROR_SUCCESS, + "Got wrong notification status: %u\n", data->notify.dwNotificationStatus); + ok(data->notify.ServiceStatus.dwCurrentState == SERVICE_STOPPED, + "Got wrong service state: 0x%x\n", data->notify.ServiceStatus.dwCurrentState); + ok(data->notify.dwNotificationTriggered == SERVICE_NOTIFY_STOPPED, + "Got wrong notification triggered: 0x%x\n", data->notify.dwNotificationTriggered); + break; - ok(data->notify.dwNotificationStatus == ERROR_SUCCESS, - "Got wrong notification status: %u\n", data->notify.dwNotificationStatus); - ok(data->notify.ServiceStatus.dwCurrentState == SERVICE_STOPPED, - "Got wrong service state: 0x%x\n", data->notify.ServiceStatus.dwCurrentState); - ok(data->notify.dwNotificationTriggered == SERVICE_NOTIFY_STOPPED, - "Got wrong notification triggered: 0x%x\n", data->notify.dwNotificationTriggered); + case PHASE_RUNNING: + ok(data->notify.dwNotificationStatus == ERROR_SUCCESS, + "Got wrong notification status: %u\n", data->notify.dwNotificationStatus); + ok(data->notify.ServiceStatus.dwCurrentState == SERVICE_RUNNING, + "Got wrong service state: 0x%x\n", data->notify.ServiceStatus.dwCurrentState); + ok(data->notify.dwNotificationTriggered == SERVICE_NOTIFY_RUNNING, + "Got wrong notification triggered: 0x%x\n", data->notify.dwNotificationTriggered); + break; + } - br = StartServiceA(data->svc, 0, NULL); - ok(br, "StartService failed: %u\n", GetLastError()); + data->was_called = TRUE; } -static void CALLBACK cb_running(void *user) +static void test_servicenotify(SC_HANDLE scm_handle, const char *servicename) { - struct notify_data *data = user; - BOOL br; - SERVICE_STATUS status; - - ok(data->notify.dwNotificationStatus == ERROR_SUCCESS, - "Got wrong notification status: %u\n", data->notify.dwNotificationStatus); - ok(data->notify.ServiceStatus.dwCurrentState == SERVICE_RUNNING, - "Got wrong service state: 0x%x\n", data->notify.ServiceStatus.dwCurrentState); - ok(data->notify.dwNotificationTriggered == SERVICE_NOTIFY_RUNNING, - "Got wrong notification triggered: 0x%x\n", data->notify.dwNotificationTriggered); - - br = ControlService(data->svc, SERVICE_CONTROL_STOP, &status); - ok(br, "ControlService failed: %u\n", GetLastError()); -} - -static void test_servicenotify(SC_HANDLE svc) -{ - DWORD dr; + DWORD dr, dr2; struct notify_data data; + struct notify_data data2; + BOOL br; + SERVICE_STATUS status; + HANDLE svc, svc2; if(!pNotifyServiceStatusChangeW){ win_skip("No NotifyServiceStatusChangeW\n"); return; } + svc = OpenServiceA(scm_handle, servicename, GENERIC_ALL); + svc2 = OpenServiceA(scm_handle, servicename, GENERIC_ALL); + ok(svc != NULL && svc2 != NULL, "Failed to open service\n"); + if(!svc || !svc2) + return; + + /* receive stopped notification, then start service */ memset(&data.notify, 0, sizeof(data.notify)); data.notify.dwVersion = SERVICE_NOTIFY_STATUS_CHANGE; - data.notify.pfnNotifyCallback = &cb_stopped; + data.notify.pfnNotifyCallback = &notify_cb; data.notify.pContext = &data; data.svc = svc; + data.phase = PHASE_STOPPED; + data.was_called = FALSE; dr = pNotifyServiceStatusChangeW(svc, SERVICE_NOTIFY_STOPPED | SERVICE_NOTIFY_RUNNING, &data.notify); ok(dr == ERROR_SUCCESS, "NotifyServiceStatusChangeW failed: %u\n", dr); dr = SleepEx(100, TRUE); - ok(dr == WAIT_IO_COMPLETION, "APC wasn't called\n"); + ok(dr == WAIT_IO_COMPLETION, "Got wrong SleepEx result: %u\n", dr); + ok(data.was_called == TRUE, "APC wasn't called\n"); - data.notify.pfnNotifyCallback = &cb_running; + br = StartServiceA(svc, 0, NULL); + ok(br, "StartService failed: %u\n", GetLastError()); + + /* receive running notification */ + data.phase = PHASE_RUNNING; + data.was_called = FALSE; dr = pNotifyServiceStatusChangeW(svc, SERVICE_NOTIFY_STOPPED | SERVICE_NOTIFY_RUNNING, &data.notify); ok(dr == ERROR_SUCCESS, "NotifyServiceStatusChangeW failed: %u\n", dr); dr = SleepEx(100, TRUE); - ok(dr == WAIT_IO_COMPLETION, "APC wasn't called\n"); + ok(dr == WAIT_IO_COMPLETION, "Got wrong SleepEx result: %u\n", dr); + ok(data.was_called == TRUE, "APC wasn't called\n"); + + /* cannot register two notifications */ + data.phase = PHASE_STOPPED; + data.was_called = FALSE; + + dr = pNotifyServiceStatusChangeW(svc, SERVICE_NOTIFY_STOPPED | SERVICE_NOTIFY_RUNNING, &data.notify); + ok(dr == ERROR_SUCCESS, "NotifyServiceStatusChangeW failed: %u\n", dr); + + memset(&data2.notify, 0, sizeof(data2.notify)); + data2.notify.dwVersion = SERVICE_NOTIFY_STATUS_CHANGE; + data2.notify.pfnNotifyCallback = &notify_cb; + data2.notify.pContext = &data2; + + dr = pNotifyServiceStatusChangeW(svc, SERVICE_NOTIFY_STOPPED | SERVICE_NOTIFY_RUNNING, &data2.notify); + ok(dr == ERROR_SUCCESS || /* win8+ */ + dr == ERROR_ALREADY_REGISTERED, "NotifyServiceStatusChangeW gave wrong result: %u\n", dr); + + /* should receive no notification because status has not changed. + * on win8+, SleepEx quits early but the callback is still not invoked. */ + dr2 = SleepEx(100, TRUE); + ok((dr == ERROR_SUCCESS && dr2 == WAIT_IO_COMPLETION) || /* win8+ */ + (dr == ERROR_ALREADY_REGISTERED && dr2 == 0), "Got wrong SleepEx result: %u\n", dr); + ok(data.was_called == FALSE, "APC should not have been called\n"); + + /* stop service and receive notifiction */ + br = ControlService(svc, SERVICE_CONTROL_STOP, &status); + ok(br, "ControlService failed: %u\n", GetLastError()); + + dr = SleepEx(100, TRUE); + ok(dr == WAIT_IO_COMPLETION, "Got wrong SleepEx result: %u\n", dr); + ok(data.was_called == TRUE, "APC wasn't called\n"); + + /* test cancelation: create notify on svc that will block until service + * start; close svc; start service on svc2; verify that notification does + * not happen */ + + data.phase = PHASE_RUNNING; + data.was_called = FALSE; + dr = pNotifyServiceStatusChangeW(svc, SERVICE_NOTIFY_STOPPED | SERVICE_NOTIFY_RUNNING, &data.notify); + ok(dr == ERROR_SUCCESS, "NotifyServiceStatusChangeW failed: %u\n", dr); + + CloseServiceHandle(svc); + + br = StartServiceA(svc2, 0, NULL); + ok(br, "StartService failed: %u\n", GetLastError()); + + dr = SleepEx(100, TRUE); + ok(dr == 0, "Got wrong SleepEx result: %u\n", dr); + ok(data.was_called == FALSE, "APC should not have been called\n"); + + br = ControlService(svc2, SERVICE_CONTROL_STOP, &status); + ok(br, "ControlService failed: %u\n", GetLastError()); + + CloseServiceHandle(svc2); } static void test_start_stop(void) @@ -2409,7 +2482,7 @@ static void test_start_stop(void) displayname = "Winetest Service"; ret = ChangeServiceConfigA(svc_handle, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE, cmd, NULL, NULL, NULL, NULL, NULL, displayname); ok(ret, "ChangeServiceConfig() failed le=%u\n", GetLastError()); - test_servicenotify(svc_handle); + test_servicenotify(scm_handle, servicename); cleanup: if (svc_handle) -- 2.16.0

1 0

[PATCH 1/2] services: Add support for service status change notifications
by Andrew Eikum 23 Jan '18

23 Jan '18

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- programs/services/rpc.c | 224 ++++++++++++++++++++++++++++++++++++++++--- programs/services/services.h | 4 + 2 files changed, 215 insertions(+), 13 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 20c5a2761f..7c3fa1e5e9 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -59,7 +59,8 @@ typedef enum { SC_HTYPE_DONT_CARE = 0, SC_HTYPE_MANAGER, - SC_HTYPE_SERVICE + SC_HTYPE_SERVICE, + SC_HTYPE_NOTIFY } SC_HANDLE_TYPE; struct sc_handle @@ -80,6 +81,32 @@ struct sc_service_handle /* service handle */ struct service_entry *service_entry; }; +struct sc_notify_handle +{ + struct sc_handle hdr; + struct sc_service_handle *service; + HANDLE event; + DWORD notify_mask; + LONG ref; + SC_RPC_NOTIFY_PARAMS_LIST *params_list; +}; + +static void sc_notify_retain(struct sc_notify_handle *notify) +{ + InterlockedIncrement(&notify->ref); +} + +static void sc_notify_release(struct sc_notify_handle *notify) +{ + ULONG r = InterlockedDecrement(&notify->ref); + if (r == 0) + { + CloseHandle(notify->event); + HeapFree(GetProcessHeap(), 0, notify->params_list); + HeapFree(GetProcessHeap(), 0, notify); + } +} + struct sc_lock { struct scmdatabase *db; @@ -227,6 +254,15 @@ static DWORD validate_service_handle(SC_RPC_HANDLE handle, DWORD needed_access, return err; } +static DWORD validate_notify_handle(SC_RPC_HANDLE handle, DWORD needed_access, struct sc_notify_handle **notify) +{ + struct sc_handle *hdr; + DWORD err = validate_context_handle(handle, SC_HTYPE_NOTIFY, needed_access, &hdr); + if (err == ERROR_SUCCESS) + *notify = (struct sc_notify_handle *)hdr; + return err; +} + DWORD __cdecl svcctl_OpenSCManagerW( MACHINE_HANDLEW MachineName, /* Note: this parameter is ignored */ LPCWSTR DatabaseName, @@ -274,6 +310,15 @@ static void SC_RPC_HANDLE_destroy(SC_RPC_HANDLE handle) case SC_HTYPE_SERVICE: { struct sc_service_handle *service = (struct sc_service_handle *)hdr; + service_lock(service->service_entry); + if (service->service_entry->notify && + service->service_entry->notify->service == service) + { + SetEvent(service->service_entry->notify->event); + sc_notify_release(service->service_entry->notify); + service->service_entry->notify = NULL; + } + service_unlock(service->service_entry); release_service(service->service_entry); HeapFree(GetProcessHeap(), 0, service); break; @@ -776,13 +821,42 @@ DWORD __cdecl svcctl_ChangeServiceConfigW( return err; } +static void fill_notify(struct sc_notify_handle *notify) +{ + SC_RPC_NOTIFY_PARAMS_LIST *list; + SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 *cparams; + + list = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + sizeof(SC_RPC_NOTIFY_PARAMS_LIST) + sizeof(SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2)); + if (!list) + return; + + cparams = (SERVICE_NOTIFY_STATUS_CHANGE_PARAMS_2 *)(list + 1); + + cparams->dwNotifyMask = notify->notify_mask; + memcpy(&cparams->ServiceStatus, &notify->service->service_entry->status, + sizeof(SERVICE_STATUS_PROCESS)); + cparams->dwNotificationStatus = ERROR_SUCCESS; + cparams->dwNotificationTriggered = 1 << (cparams->ServiceStatus.dwCurrentState - SERVICE_STOPPED); + cparams->pszServiceNames = NULL; + + list->cElements = 1; + + list->NotifyParamsArray[0].dwInfoLevel = 2; + list->NotifyParamsArray[0].u.params = cparams; + + InterlockedExchangePointer((void**)&notify->params_list, list); + + SetEvent(notify->event); +} + DWORD __cdecl svcctl_SetServiceStatus( SC_RPC_HANDLE hServiceStatus, LPSERVICE_STATUS lpServiceStatus) { struct sc_service_handle *service; struct process_entry *process; - DWORD err; + DWORD err, mask; WINE_TRACE("(%p, %p)\n", hServiceStatus, lpServiceStatus); @@ -807,6 +881,19 @@ DWORD __cdecl svcctl_SetServiceStatus( release_process(process); } + mask = 1 << (service->service_entry->status.dwCurrentState - SERVICE_STOPPED); + if (service->service_entry->notify && + (service->service_entry->notify->notify_mask & mask)) + { + struct sc_notify_handle *notify = service->service_entry->notify; + fill_notify(notify); + service->service_entry->notify = NULL; + sc_notify_release(notify); + service->service_entry->status_notified = TRUE; + } + else + service->service_entry->status_notified = FALSE; + service_unlock(service->service_entry); return ERROR_SUCCESS; @@ -1598,31 +1685,142 @@ DWORD __cdecl svcctl_unknown46(void) } DWORD __cdecl svcctl_NotifyServiceStatusChange( - SC_RPC_HANDLE service, + SC_RPC_HANDLE handle, SC_RPC_NOTIFY_PARAMS params, GUID *clientprocessguid, GUID *scmprocessguid, BOOL *createremotequeue, - SC_NOTIFY_RPC_HANDLE *notify) + SC_NOTIFY_RPC_HANDLE *hNotify) { - WINE_FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + DWORD err, mask; + struct sc_manager_handle *manager = NULL; + struct sc_service_handle *service = NULL; + struct sc_notify_handle *notify; + struct sc_handle *hdr = handle; + + WINE_TRACE("(%p, NotifyMask: 0x%x, %p, %p, %p, %p)\n", handle, + params.u.params->dwNotifyMask, clientprocessguid, scmprocessguid, + createremotequeue, hNotify); + + switch (hdr->type) + { + case SC_HTYPE_SERVICE: + err = validate_service_handle(handle, SERVICE_QUERY_STATUS, &service); + break; + case SC_HTYPE_MANAGER: + err = validate_scm_handle(handle, SC_MANAGER_ENUMERATE_SERVICE, &manager); + break; + default: + err = ERROR_INVALID_HANDLE; + break; + } + + if (err != ERROR_SUCCESS) + return err; + + if (manager) + { + WARN("Need support for service creation/deletion notifications\n"); + return ERROR_CALL_NOT_IMPLEMENTED; + } + + notify = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*notify)); + if (!notify) + return ERROR_NOT_ENOUGH_SERVER_MEMORY; + + notify->hdr.type = SC_HTYPE_NOTIFY; + notify->hdr.access = 0; + + notify->service = service; + + notify->event = CreateEventW(NULL, TRUE, FALSE, NULL); + + notify->notify_mask = params.u.params->dwNotifyMask; + + service_lock(service->service_entry); + + if (service->service_entry->notify) + { + service_unlock(service->service_entry); + HeapFree(GetProcessHeap(), 0, notify); + return ERROR_ALREADY_REGISTERED; + } + + mask = 1 << (service->service_entry->status.dwCurrentState - SERVICE_STOPPED); + if (!service->service_entry->status_notified && + (notify->notify_mask & mask)) + { + fill_notify(notify); + service->service_entry->status_notified = TRUE; + } + else + { + sc_notify_retain(notify); + service->service_entry->notify = notify; + } + + sc_notify_retain(notify); + *hNotify = &notify->hdr; + + service_unlock(service->service_entry); + + return ERROR_SUCCESS; } DWORD __cdecl svcctl_GetNotifyResults( - SC_NOTIFY_RPC_HANDLE notify, - SC_RPC_NOTIFY_PARAMS_LIST **params) + SC_NOTIFY_RPC_HANDLE hNotify, + SC_RPC_NOTIFY_PARAMS_LIST **pList) { - WINE_FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + DWORD err; + struct sc_notify_handle *notify; + + WINE_TRACE("(%p, %p)\n", hNotify, pList); + + if (!pList) + return ERROR_INVALID_PARAMETER; + + *pList = NULL; + + if ((err = validate_notify_handle(hNotify, 0, &notify)) != 0) + return err; + + sc_notify_retain(notify); + /* block until there is a result */ + err = WaitForSingleObject(notify->event, INFINITE); + + if (err != WAIT_OBJECT_0) + { + sc_notify_release(notify); + return err; + } + + *pList = InterlockedExchangePointer((void**)&notify->params_list, NULL); + if (!*pList) + { + sc_notify_release(notify); + return ERROR_REQUEST_ABORTED; + } + + sc_notify_release(notify); + + return ERROR_SUCCESS; } DWORD __cdecl svcctl_CloseNotifyHandle( - SC_NOTIFY_RPC_HANDLE *notify, + SC_NOTIFY_RPC_HANDLE *hNotify, BOOL *apc_fired) { - WINE_FIXME("\n"); - return ERROR_CALL_NOT_IMPLEMENTED; + struct sc_notify_handle *notify; + DWORD err; + + WINE_TRACE("(%p, %p)\n", hNotify, apc_fired); + + if ((err = validate_notify_handle(*hNotify, 0, &notify)) != 0) + return err; + + sc_notify_release(notify); + + return ERROR_SUCCESS; } DWORD __cdecl svcctl_ControlServiceExA( diff --git a/programs/services/services.h b/programs/services/services.h index cda70e0b60..fd19ed32f4 100644 --- a/programs/services/services.h +++ b/programs/services/services.h @@ -45,6 +45,8 @@ struct process_entry HANDLE overlapped_event; }; +struct sc_notify_handle; + struct service_entry { struct list entry; @@ -63,6 +65,8 @@ struct service_entry BOOL force_shutdown; BOOL marked_for_delete; BOOL is_wow64; + BOOL status_notified; + struct sc_notify_handle *notify; }; extern struct scmdatabase *active_database; -- 2.16.0

1 0

[PATCH 10/10] msvcp100: Support exceptions while copying object in _Concurrent_queue_base_v4::_Internal_push
by Piotr Caban 23 Jan '18

23 Jan '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 49 +++++++++++++++++++++++++++++++++--------------- include/wine/exception.h | 2 +- 2 files changed, 35 insertions(+), 16 deletions(-)

1 0

[PATCH 09/10] msvcp120: Add _Concurrent_queue_base_v4 multi-threaded tests
by Piotr Caban 23 Jan '18

23 Jan '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp120/tests/msvcp120.c | 211 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 198 insertions(+), 13 deletions(-)

1 0

[PATCH 08/10] msvcp120: Add _Concurrent_queue_base_v4 tests
by Piotr Caban 23 Jan '18

23 Jan '18

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

1 0

[PATCH 07/10] msvcp100: Add _Concurrent_queue_base_v4 push/pop implementation
by Piotr Caban 23 Jan '18

23 Jan '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 157 insertions(+), 5 deletions(-)

1 0

[PATCH 06/10] msvcp100: Add _Concurrent_queue_base_v4::_Internal_size implementation
by Piotr Caban 23 Jan '18

23 Jan '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH 05/10] msvcp100: Add _Concurrent_queue_base_v4::_Internal_finish_clear implementation
by Piotr Caban 23 Jan '18

23 Jan '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)

1 0

[PATCH 04/10] msvcp100: Add _Concurrent_queue_base_v4 destructor implementation
by Piotr Caban 23 Jan '18

23 Jan '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH 03/10] msvcp100: Add _Concurrent_queue_base_v4 constructor implementation
by Piotr Caban 23 Jan '18

23 Jan '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-)

1 0

[PATCH 02/10] msvcp100: Add _Concurrent_queue_base_v4::_Internal_throw_exception implementation
by Piotr Caban 23 Jan '18

23 Jan '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)

1 0

[PATCH 01/10] msvcp100: Add Concurrency::details::_Concurrent_queue_base_v4 class stub
by Piotr Caban 23 Jan '18

23 Jan '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/concrt140/concrt140.spec | 40 ++++----- dlls/msvcp100/msvcp100.spec | 32 +++---- dlls/msvcp110/msvcp110.spec | 60 ++++++------- dlls/msvcp120/msvcp120.spec | 60 ++++++------- dlls/msvcp120_app/msvcp120_app.spec | 60 ++++++------- dlls/msvcp90/misc.c | 170 ++++++++++++++++++++++++++++++++++++ 6 files changed, 296 insertions(+), 126 deletions(-)

1 0

[PATCH 1/2] include: Add generic HeapAlloc() wrappers
by Michael Stefaniuc 23 Jan '18

23 Jan '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- I know that Alexandre and Jacek wanted to work on the HeapAlloc wrappers. But I don't remember if I had promised (or not) at the last WineConf to dig up my old patch and polish it up and submit it to serve as a discussion start point. Anyway, here it is with some explanations. The _nofail variants should not "fail" memory allocations and will raise an exception on out of memory conditions. heap_alloc_nofail thus will never return NULL. heap_realloc_nofail can still return NULL but *only* when the alloc size is 0 and thus functions as heap_free. Checking the returned pointer for NULL is not needed when the size != 0. And the "assign to temp pointer to prevent mem leak on failure" workaround is never needed. The _nofail variants should be used only for small allocations that are not application driven. Preferabely the allocation sizes should be known at compile time. Careful when allocating memory for COM and other objects: The main object should not be allocated with the _nofail variants. Subsequent small allocations in the same object could use the _nofail version. heap_alloc_zero was renamed to heap_zalloc to shorten it. Especially heap_alloc_zero_nofail would be too long. Same for heap_realloc_zero. The rename shouldn't be too painful: On a quick grep I found just a handfull of heap_realloc_zero and about 470 heap_alloc_zero. I'm also expecting that a good part of those heap_alloc_zero would be changed anyway to the _nofail variant or to heap_calloc. Also adding "z" in front of the alloc function name is common: The Linux kernel uses kzalloc and $ man -k alloc_zero alloc_zero: nothing appropriate. $ man -k zalloc CRYPTO_secure_zalloc (3ssl) - secure heap storage CRYPTO_zalloc (3ssl) - Memory allocation functions OPENSSL_secure_zalloc (3ssl) - secure heap storage OPENSSL_zalloc (3ssl) - Memory allocation functions heap_realloc variants follow the sane POSIX / C realloc behavior: - Passing size 0 will free the old memory. - Passing NULL as memory pointer will allocate new memory. heap_free() returns void like free(): - No existing use of the heap_free() return value. - There are a few "return HeapFree()" statements but more than half of those are just in heap_free() wrappers. - The rest of "return HeapFree()" are in "destroy object" style functions, mostly in gdi32. Most are internal helpers but I didn't bother tracing them if the return value is needed or not. Added heap_calloc() that matches the calloc behavior and always zeroes the memory. Thus there is no heap_zcalloc(). heap_calloc() (differently named) is already used in the D3D related dlls. I could also immediately make use of it in vbscript. I'm not sure if a heap_calloc_nofail would make sense. Can be added later if there is a real need for it. Now let the bikeshedding begin! include/Makefile.in | 1 + include/wine/heap.h | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) create mode 100644 include/wine/heap.h diff --git a/include/Makefile.in b/include/Makefile.in index 430c4733af..d107cf7919 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -678,6 +678,7 @@ HEADER_SRCS = \ windowsx.h \ wine/debug.h \ wine/exception.h \ + wine/heap.h \ wine/library.h \ wine/unicode.h \ winerror.h \ diff --git a/include/wine/heap.h b/include/wine/heap.h new file mode 100644 index 0000000000..ec10db67be --- /dev/null +++ b/include/wine/heap.h @@ -0,0 +1,127 @@ +/* + * Wine heap memory allocation wrappers + * + * Copyright 2006 Jacek Caban for CodeWeavers + * Copyright 2013,2018 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINE_HEAP_H +#define __WINE_WINE_HEAP_H + +#include <windef.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/* HeapAlloc wrappers + + * "zalloc" variants + * The returned memory is initialized with zero. + + * "nofail" variants + * The returned pointer is never NULL and an exception is raised in out of memory conditions. + * Use only for small allocations that are not application driven. + * Preferabely the allocation size should be known at compile time. + */ +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), 0, len); +} + +static inline void * __WINE_ALLOC_SIZE(1) heap_alloc_nofail(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS, len); +} + +static inline void * __WINE_ALLOC_SIZE(1) heap_zalloc(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len); +} + +static inline void * __WINE_ALLOC_SIZE(1) heap_zalloc_nofail(SIZE_T len) +{ + return HeapAlloc(GetProcessHeap(), HEAP_GENERATE_EXCEPTIONS | HEAP_ZERO_MEMORY, len); +} + +/* HeapReAlloc wrappers with POSIX / C realloc() behavior: + * Passing size 0 will free the old memory. + * Passing NULL as memory pointer will allocate new memory. + + * "zalloc" variants + * The returned memory is initialized with zero. + + * "nofail" variants + * The returned pointer is NULL only when the size == 0 and the memory is freed, + * Raises an exception in out of memory conditions. + * Use only for small allocations that are not application driven. + * Preferabely the allocation size should be known at compile time. + */ +static inline void * __WINE_ALLOC_SIZE(2) _heap_realloc(void *mem, SIZE_T len, DWORD flags) +{ + if (len) { + if (mem) + return HeapReAlloc(GetProcessHeap(), flags, mem, len); + else + return HeapAlloc(GetProcessHeap(), flags, len); + } else { + HeapFree(GetProcessHeap(), 0, mem); + return NULL; + } +} + +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, SIZE_T len) +{ + return _heap_realloc(mem, len, 0); +} + +static inline void * __WINE_ALLOC_SIZE(2) heap_realloc_nofail(void *mem, SIZE_T len) +{ + return _heap_realloc(mem, len, HEAP_GENERATE_EXCEPTIONS); +} + +static inline void * __WINE_ALLOC_SIZE(2) heap_zrealloc(void *mem, SIZE_T len) +{ + return _heap_realloc(mem, len, HEAP_ZERO_MEMORY); +} + +static inline void * __WINE_ALLOC_SIZE(2) heap_zrealloc_nofail(void *mem, SIZE_T len) +{ + return _heap_realloc(mem, len, HEAP_GENERATE_EXCEPTIONS | HEAP_ZERO_MEMORY); +} + +/* heap_calloc + * calloc() like wrapper that zeroes the returned memory. + */ +static inline void * __WINE_ALLOC_SIZE(2) heap_calloc(SIZE_T count, SIZE_T size) +{ + if (count > ~(SIZE_T)0 / size) + return NULL; + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, count * size); +} + + +static inline void heap_free(void *mem) +{ + HeapFree(GetProcessHeap(), 0, mem); +} + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_WINE_HEAP_H */ -- 2.14.3

3 5

[PATCH 1/4] comctl32/tests: Link to activation context API directly
by Nikolay Sivov 23 Jan '18

23 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/button.c | 10 ++-------- dlls/comctl32/tests/v6util.h | 43 +++++++------------------------------------ 2 files changed, 9 insertions(+), 44 deletions(-) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index 41cf165ad9..441ca581c5 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -54,20 +54,14 @@ struct wndclass_redirect_data /* returned pointer is valid as long as activation context is alive */ static WCHAR* get_versioned_classname(const WCHAR *name) { - BOOL (WINAPI *pFindActCtxSectionStringW)(DWORD,const GUID *,ULONG,LPCWSTR,PACTCTX_SECTION_KEYED_DATA); struct wndclass_redirect_data *wnddata; ACTCTX_SECTION_KEYED_DATA data; BOOL ret; - pFindActCtxSectionStringW = (void*)GetProcAddress(GetModuleHandleA("kernel32"), "FindActCtxSectionStringW"); - memset(&data, 0, sizeof(data)); data.cbSize = sizeof(data); - - ret = pFindActCtxSectionStringW(0, NULL, - ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, - name, &data); - ok(ret, "got %d, error %u\n", ret, GetLastError()); + ret = FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_WINDOW_CLASS_REDIRECTION, name, &data); + ok(ret, "Failed to find class redirection section, error %u\n", GetLastError()); wnddata = (struct wndclass_redirect_data*)data.lpData; return (WCHAR*)((BYTE*)wnddata + wnddata->name_offset); } diff --git a/dlls/comctl32/tests/v6util.h b/dlls/comctl32/tests/v6util.h index 9f5a9c48da..afdc12c65a 100644 --- a/dlls/comctl32/tests/v6util.h +++ b/dlls/comctl32/tests/v6util.h @@ -62,48 +62,19 @@ static const CHAR manifest[] = static void unload_v6_module(ULONG_PTR cookie, HANDLE hCtx) { - HANDLE hKernel32; - BOOL (WINAPI *pDeactivateActCtx)(DWORD, ULONG_PTR); - VOID (WINAPI *pReleaseActCtx)(HANDLE); - - hKernel32 = GetModuleHandleA("kernel32.dll"); - pDeactivateActCtx = (void*)GetProcAddress(hKernel32, "DeactivateActCtx"); - pReleaseActCtx = (void*)GetProcAddress(hKernel32, "ReleaseActCtx"); - if (!pDeactivateActCtx || !pReleaseActCtx) - { - win_skip("Activation contexts unsupported\n"); - return; - } - - pDeactivateActCtx(0, cookie); - pReleaseActCtx(hCtx); + DeactivateActCtx(0, cookie); + ReleaseActCtx(hCtx); DeleteFileA(manifest_name); } static BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx) { - HANDLE hKernel32; - HANDLE (WINAPI *pCreateActCtxA)(ACTCTXA*); - BOOL (WINAPI *pActivateActCtx)(HANDLE, ULONG_PTR*); - BOOL (WINAPI *pFindActCtxSectionStringA)(DWORD,const GUID *,ULONG,LPCSTR,PACTCTX_SECTION_KEYED_DATA); - ACTCTX_SECTION_KEYED_DATA data; - + DWORD written; ACTCTXA ctx; - BOOL ret; HANDLE file; - DWORD written; - - hKernel32 = GetModuleHandleA("kernel32.dll"); - pCreateActCtxA = (void*)GetProcAddress(hKernel32, "CreateActCtxA"); - pActivateActCtx = (void*)GetProcAddress(hKernel32, "ActivateActCtx"); - pFindActCtxSectionStringA = (void*)GetProcAddress(hKernel32, "FindActCtxSectionStringA"); - if (!(pCreateActCtxA && pActivateActCtx)) - { - win_skip("Activation contexts unsupported. No version 6 tests possible.\n"); - return FALSE; - } + BOOL ret; /* create manifest */ file = CreateFileA( manifest_name, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL ); @@ -131,10 +102,10 @@ static BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx) ctx.cbSize = sizeof(ctx); ctx.lpSource = manifest_name; - *hCtx = pCreateActCtxA(&ctx); + *hCtx = CreateActCtxA(&ctx); ok(*hCtx != 0, "Expected context handle\n"); - ret = pActivateActCtx(*hCtx, pcookie); + ret = ActivateActCtx(*hCtx, pcookie); expect(TRUE, ret); if (!ret) @@ -144,7 +115,7 @@ static BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx) } data.cbSize = sizeof(data); - ret = pFindActCtxSectionStringA(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, + ret = FindActCtxSectionStringA(0, NULL, ACTIVATION_CONTEXT_SECTION_DLL_REDIRECTION, "comctl32.dll", &data); ok(ret, "failed to find comctl32.dll in active context, %u\n", GetLastError()); if (ret) -- 2.15.1

1 3

[PATCH] gdi32: Allocate the bitmap bits during CreateBitmapIndirect() to catch out-of-memory errors.
by Huw Davies 23 Jan '18

23 Jan '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/bitmap.c | 20 ++++++++++++++++---- dlls/gdi32/dibdrv/dc.c | 7 ------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index c16793d82b..0ae5b20052 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -145,6 +145,8 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) BITMAP bm; BITMAPOBJ *bmpobj; HBITMAP hbitmap; + INT dib_stride; + SIZE_T size; if (!bmp || bmp->bmType) { @@ -194,10 +196,13 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) /* Windows ignores the provided bm.bmWidthBytes */ bm.bmWidthBytes = get_bitmap_stride( bm.bmWidth, bm.bmBitsPixel ); - /* XP doesn't allow creating bitmaps larger than 128 MB */ - if (bm.bmHeight > 128 * 1024 * 1024 / bm.bmWidthBytes) + + dib_stride = get_dib_stride( bm.bmWidth, bm.bmBitsPixel ); + size = dib_stride * bm.bmHeight; + /* Check for overflow (dib_stride itself must be ok because of the constraint on bm.bmWidth above). */ + if (dib_stride != size / bm.bmHeight) { - SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + SetLastError( ERROR_INVALID_PARAMETER ); return 0; } @@ -209,10 +214,17 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) } bmpobj->dib.dsBm = bm; - bmpobj->dib.dsBm.bmBits = NULL; + bmpobj->dib.dsBm.bmBits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); + if (!bmpobj->dib.dsBm.bmBits) + { + HeapFree( GetProcessHeap(), 0, bmpobj ); + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return 0; + } if (!(hbitmap = alloc_gdi_handle( bmpobj, OBJ_BITMAP, &bitmap_funcs ))) { + HeapFree( GetProcessHeap(), 0, bmpobj->dib.dsBm.bmBits ); HeapFree( GetProcessHeap(), 0, bmpobj ); return 0; } diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index aee305fda8..2447093921 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -168,13 +168,6 @@ BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp) BITMAPINFO info; get_ddb_bitmapinfo( bmp, &info ); - if (!bmp->dib.dsBm.bmBits) - { - int width_bytes = get_dib_stride( bmp->dib.dsBm.bmWidth, bmp->dib.dsBm.bmBitsPixel ); - bmp->dib.dsBm.bmBits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - bmp->dib.dsBm.bmHeight * width_bytes ); - if (!bmp->dib.dsBm.bmBits) return FALSE; - } init_dib_info_from_bitmapinfo( dib, &info, bmp->dib.dsBm.bmBits ); } else init_dib_info( dib, &bmp->dib.dsBmih, bmp->dib.dsBm.bmWidthBytes, -- 2.12.0

1 0

[PATCH] ole32: Prevent adding additional cache entries to static class caches.
by Sergio Gómez Del Real 23 Jan '18

23 Jan '18

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/ole32/datacache.c | 4 ++++ dlls/ole32/tests/ole2.c | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 4ba08268d7..fa0c857f15 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2440,6 +2440,10 @@ static HRESULT WINAPI DataCache_Cache( *pdwConnection = cache_entry->id; return CACHE_S_SAMECACHE; } + if (IsEqualCLSID(&This->clsid, &CLSID_Picture_Dib) || + IsEqualCLSID(&This->clsid, &CLSID_Picture_Metafile) || + IsEqualCLSID(&This->clsid, &CLSID_Picture_EnhMetafile)) + return DV_E_FORMATETC; hr = DataCache_CreateEntry(This, &fmt_cpy, advf, FALSE, &cache_entry); diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index fe45c6a73e..a9f68f15ba 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2426,6 +2426,29 @@ static void test_data_cache_cache(void) IDataObject_Release( data ); IOleCache2_Release( cache ); + + /* tests for a static class cache */ + hr = CreateDataCache( NULL, &CLSID_Picture_Dib, &IID_IOleCache2, (void **)&cache ); + + fmt.cfFormat = CF_DIB; + fmt.dwAspect = DVASPECT_CONTENT; + fmt.tymed = TYMED_HGLOBAL; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == CACHE_S_SAMECACHE, "got %08x\n", hr ); + + /* aspect other than DVASPECT_CONTENT should fail */ + fmt.dwAspect = DVASPECT_THUMBNAIL; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( FAILED(hr), "got %08x\n", hr ); + + /* try caching another clip format */ + fmt.dwAspect = DVASPECT_CONTENT; + fmt.cfFormat = CF_METAFILEPICT; + fmt.tymed = TYMED_MFPICT; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( FAILED(hr), "got %08x\n", hr ); + + IOleCache2_Release( cache ); } /* The CLSID_Picture_ classes automatically create appropriate cache entries */ -- 2.14.1

2 1

[PATCH 3/3] ole32: Prevent adding additional cache entries to static class caches.
by Huw Davies 23 Jan '18

23 Jan '18

From: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/datacache.c | 2 ++ dlls/ole32/tests/ole2.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 8c5df32f6e..60ddd386ba 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2453,6 +2453,8 @@ static HRESULT WINAPI DataCache_Cache( return CACHE_S_SAMECACHE; } + if (This->clsid_static) return DV_E_FORMATETC; + hr = DataCache_CreateEntry(This, &fmt_cpy, advf, FALSE, &cache_entry); if (SUCCEEDED(hr)) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 7fcb1aa1e0..d83ca00a66 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -2426,6 +2426,29 @@ static void test_data_cache_cache(void) IDataObject_Release( data ); IOleCache2_Release( cache ); + + /* tests for a static class cache */ + hr = CreateDataCache( NULL, &CLSID_Picture_Dib, &IID_IOleCache2, (void **)&cache ); + + fmt.cfFormat = CF_DIB; + fmt.dwAspect = DVASPECT_CONTENT; + fmt.tymed = TYMED_HGLOBAL; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == CACHE_S_SAMECACHE, "got %08x\n", hr ); + + /* aspect other than DVASPECT_CONTENT should fail */ + fmt.dwAspect = DVASPECT_THUMBNAIL; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( FAILED(hr), "got %08x\n", hr ); + + /* try caching another clip format */ + fmt.dwAspect = DVASPECT_CONTENT; + fmt.cfFormat = CF_METAFILEPICT; + fmt.tymed = TYMED_MFPICT; + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( FAILED(hr), "got %08x\n", hr ); + + IOleCache2_Release( cache ); } /* The CLSID_Picture_ classes automatically create appropriate cache entries */ -- 2.12.0

1 0

[PATCH 2/3] ole32: Explicitly enumerate the presentation streams rather than using EnumElements.
by Huw Davies 23 Jan '18

23 Jan '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/datacache.c | 75 +++++++++++++++++++------------------------------- 1 file changed, 28 insertions(+), 47 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 685abdbb49..8c5df32f6e 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -446,23 +446,6 @@ static void DataCache_FireOnViewChange( } } -/* Helper for DataCacheEntry_OpenPresStream */ -static BOOL DataCache_IsPresentationStream(const STATSTG *elem) -{ - /* The presentation streams have names of the form "\002OlePresXXX", - * where XXX goes from 000 to 999. */ - static const WCHAR OlePres[] = { 2,'O','l','e','P','r','e','s' }; - - LPCWSTR name = elem->pwcsName; - - return (elem->type == STGTY_STREAM) - && (strlenW(name) == 11) - && (strncmpW(name, OlePres, 8) == 0) - && (name[8] >= '0') && (name[8] <= '9') - && (name[9] >= '0') && (name[9] <= '9') - && (name[10] >= '0') && (name[10] <= '9'); -} - static HRESULT read_clipformat(IStream *stream, CLIPFORMAT *clipformat) { DWORD length; @@ -583,6 +566,15 @@ static HRESULT DataCacheEntry_OpenPresStream(DataCacheEntry *cache_entry, IStrea return hr; } +static HRESULT open_pres_stream( IStorage *stg, int stream_number, IStream **stm ) +{ + WCHAR name[] = {2,'O','l','e','P','r','e','s', + '0' + (stream_number / 100) % 10, + '0' + (stream_number / 10) % 10, + '0' + stream_number % 10, 0}; + + return IStorage_OpenStream( stg, name, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, stm ); +} static HRESULT load_mf_pict( DataCacheEntry *cache_entry, IStream *stm ) { @@ -1734,49 +1726,38 @@ static HRESULT add_cache_entry( DataCache *This, const FORMATETC *fmt, DWORD adv return hr; } -static HRESULT parse_pres_streams( DataCache *This, IStorage *stg ) +static HRESULT parse_pres_streams( DataCache *cache, IStorage *stg ) { HRESULT hr; - IEnumSTATSTG *stat_enum; - STATSTG stat; IStream *stm; PresentationDataHeader header; ULONG actual_read; CLIPFORMAT clipformat; FORMATETC fmtetc; + int stream_number = 0; - hr = IStorage_EnumElements( stg, 0, NULL, 0, &stat_enum ); - if (FAILED( hr )) return hr; - - while ((hr = IEnumSTATSTG_Next( stat_enum, 1, &stat, NULL )) == S_OK) + do { - if (DataCache_IsPresentationStream( &stat )) - { - hr = IStorage_OpenStream( stg, stat.pwcsName, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, - 0, &stm ); - if (SUCCEEDED( hr )) - { - hr = read_clipformat( stm, &clipformat ); + hr = open_pres_stream( stg, stream_number, &stm ); + if (FAILED(hr)) break; - if (hr == S_OK) - hr = IStream_Read( stm, &header, sizeof(header), &actual_read ); + hr = read_clipformat( stm, &clipformat ); - if (hr == S_OK && actual_read == sizeof(header)) - { - fmtetc.cfFormat = clipformat; - fmtetc.ptd = NULL; /* FIXME */ - fmtetc.dwAspect = header.dvAspect; - fmtetc.lindex = header.lindex; - fmtetc.tymed = tymed_from_cf( clipformat ); + if (hr == S_OK) hr = IStream_Read( stm, &header, sizeof(header), &actual_read ); - add_cache_entry( This, &fmtetc, header.advf, stm, pres_stream ); - } - IStream_Release( stm ); - } + if (hr == S_OK && actual_read == sizeof(header)) + { + fmtetc.cfFormat = clipformat; + fmtetc.ptd = NULL; /* FIXME */ + fmtetc.dwAspect = header.dvAspect; + fmtetc.lindex = header.lindex; + fmtetc.tymed = tymed_from_cf( clipformat ); + + add_cache_entry( cache, &fmtetc, header.advf, stm, pres_stream ); } - CoTaskMemFree( stat.pwcsName ); - } - IEnumSTATSTG_Release( stat_enum ); + IStream_Release( stm ); + stream_number++; + } while (hr == S_OK); return S_OK; } -- 2.12.0

1 0

[PATCH 1/3] ole32: Only load the contents stream for the static clsids.
by Huw Davies 23 Jan '18

23 Jan '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/datacache.c | 47 ++++++++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index e2ff928ba8..685abdbb49 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -162,6 +162,9 @@ struct DataCache IAdviseSink *sinkInterface; CLSID clsid; + /* Is the clsid one of the CLSID_Picture classes */ + BOOL clsid_static; + IStorage *presentationStorage; /* list of cache entries */ @@ -1307,9 +1310,13 @@ static HRESULT create_automatic_entry(DataCache *cache, const CLSID *clsid) while (ptr->clsid) { if (IsEqualCLSID( clsid, ptr->clsid )) + { + cache->clsid_static = TRUE; return DataCache_CreateEntry( cache, &ptr->fmt, 0, TRUE, NULL ); + } ptr++; } + cache->clsid_static = FALSE; return S_OK; } @@ -1776,24 +1783,33 @@ static HRESULT parse_pres_streams( DataCache *This, IStorage *stg ) static const FORMATETC static_dib_fmt = { CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; -static HRESULT parse_contents_stream( DataCache *This, IStorage *stg, IStream *stm ) +static HRESULT parse_contents_stream( DataCache *This, IStorage *stg ) { HRESULT hr; STATSTG stat; const FORMATETC *fmt; + IStream *stm; - hr = IStorage_Stat( stg, &stat, STATFLAG_NONAME ); + hr = IStorage_OpenStream( stg, CONTENTS, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm ); if (FAILED( hr )) return hr; + hr = IStorage_Stat( stg, &stat, STATFLAG_NONAME ); + if (FAILED( hr )) goto done; + if (IsEqualCLSID( &stat.clsid, &CLSID_Picture_Dib )) fmt = &static_dib_fmt; else { FIXME("unsupported format %s\n", debugstr_guid( &stat.clsid )); - return E_FAIL; + hr = E_FAIL; + goto done; } - return add_cache_entry( This, fmt, 0, stm, contents_stream ); + hr = add_cache_entry( This, fmt, 0, stm, contents_stream ); + +done: + IStream_Release( stm ); + return hr; } /************************************************************************ @@ -1804,42 +1820,38 @@ static HRESULT parse_contents_stream( DataCache *This, IStorage *stg, IStream *s * and it will load the presentation information when the * IDataObject_GetData or IViewObject2_Draw methods are called. */ -static HRESULT WINAPI DataCache_Load( IPersistStorage *iface, IStorage *pStg ) +static HRESULT WINAPI DataCache_Load( IPersistStorage *iface, IStorage *stg ) { DataCache *This = impl_from_IPersistStorage(iface); HRESULT hr; - IStream *stm; CLSID clsid; DataCacheEntry *entry, *cursor2; - TRACE("(%p, %p)\n", iface, pStg); + TRACE("(%p, %p)\n", iface, stg); IPersistStorage_HandsOffStorage( iface ); LIST_FOR_EACH_ENTRY_SAFE( entry, cursor2, &This->cache_list, DataCacheEntry, entry ) DataCacheEntry_Destroy( This, entry ); - ReadClassStg( pStg, &clsid ); + ReadClassStg( stg, &clsid ); hr = create_automatic_entry( This, &clsid ); if (FAILED( hr )) return hr; This->clsid = clsid; - hr = IStorage_OpenStream( pStg, CONTENTS, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, - 0, &stm ); - if (SUCCEEDED( hr )) + if (This->clsid_static) { - hr = parse_contents_stream( This, pStg, stm ); - IStream_Release( stm ); + hr = parse_contents_stream( This, stg ); + if (FAILED(hr)) hr = parse_pres_streams( This, stg ); } - - if (FAILED(hr)) - hr = parse_pres_streams( This, pStg ); + else + hr = parse_pres_streams( This, stg ); if (SUCCEEDED( hr )) { This->dirty = FALSE; - This->presentationStorage = pStg; + This->presentationStorage = stg; IStorage_AddRef( This->presentationStorage ); } @@ -2978,6 +2990,7 @@ static DataCache* DataCache_Construct( newObject->sinkAdviseFlag = 0; newObject->sinkInterface = 0; newObject->clsid = CLSID_NULL; + newObject->clsid_static = FALSE; newObject->presentationStorage = NULL; list_init(&newObject->cache_list); newObject->last_cache_id = 2; -- 2.12.0

1 0

[PATCH] iphlpapi: Implement if_indextoname.
by Hans Leidekker 23 Jan '18

23 Jan '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/iphlpapi/iphlpapi.spec | 2 +- dlls/iphlpapi/iphlpapi_main.c | 10 ++++++++++ dlls/iphlpapi/tests/iphlpapi.c | 45 +++++++++++++++++++++++++++++------------- include/netioapi.h | 2 ++ 4 files changed, 44 insertions(+), 15 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi.spec b/dlls/iphlpapi/iphlpapi.spec index fee99607b6..b6c9aef2f8 100644 --- a/dlls/iphlpapi/iphlpapi.spec +++ b/dlls/iphlpapi/iphlpapi.spec @@ -159,7 +159,7 @@ @ stdcall IcmpSendEcho2Ex(ptr ptr ptr ptr long long ptr long ptr ptr long long) @ stdcall IcmpSendEcho2(ptr ptr ptr ptr long ptr long ptr ptr long long) @ stdcall IcmpSendEcho(ptr long ptr long ptr ptr long long) -#@ stub if_indextoname +@ stdcall if_indextoname(long ptr) IPHLP_if_indextoname @ stdcall if_nametoindex(str) IPHLP_if_nametoindex #@ stub InitializeIpForwardEntry #@ stub InitializeIpInterfaceEntry diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 5f36d4666d..d31504e5a9 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -3237,3 +3237,13 @@ IF_INDEX WINAPI IPHLP_if_nametoindex(const char *name) return 0; } + +/****************************************************************** + * if_indextoname (IPHLPAPI.@) + */ +PCHAR WINAPI IPHLP_if_indextoname(NET_IFINDEX index, PCHAR name) +{ + TRACE("(%u, %p)\n", index, name); + + return getInterfaceNameByIndex(index, name); +} diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index ccaafd728e..f0d19673f4 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -99,6 +99,7 @@ static DWORD (WINAPI *pConvertInterfaceLuidToNameA)(const NET_LUID*,char*,SIZE_T static DWORD (WINAPI *pConvertInterfaceNameToLuidA)(const char*,NET_LUID*); static DWORD (WINAPI *pConvertInterfaceNameToLuidW)(const WCHAR*,NET_LUID*); +static PCHAR (WINAPI *pif_indextoname)(NET_IFINDEX,PCHAR); static NET_IFINDEX (WINAPI *pif_nametoindex)(const char*); static void loadIPHlpApi(void) @@ -151,6 +152,7 @@ static void loadIPHlpApi(void) pConvertInterfaceLuidToNameW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceLuidToNameW"); pConvertInterfaceNameToLuidA = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidA"); pConvertInterfaceNameToLuidW = (void *)GetProcAddress(hLibrary, "ConvertInterfaceNameToLuidW"); + pif_indextoname = (void *)GetProcAddress(hLibrary, "if_indextoname"); pif_nametoindex = (void *)GetProcAddress(hLibrary, "if_nametoindex"); } } @@ -1789,7 +1791,7 @@ static void test_interface_identifier_conversion(void) GUID guid; SIZE_T len; WCHAR nameW[IF_MAX_STRING_SIZE + 1]; - char nameA[IF_MAX_STRING_SIZE + 1]; + char nameA[IF_MAX_STRING_SIZE + 1], *name; NET_IFINDEX index, index2; if (!pConvertInterfaceIndexToLuid) @@ -1950,22 +1952,37 @@ static void test_interface_identifier_conversion(void) ok( luid.Info.NetLuidIndex != 0xdead, "index not set\n" ); ok( luid.Info.IfType == IF_TYPE_ETHERNET_CSMACD, "got %u\n", luid.Info.IfType ); - /* if_nametoindex */ - if (pif_nametoindex) + if (!pif_nametoindex || !pif_indextoname) { - index2 = pif_nametoindex( NULL ); - ok( !index2, "Got unexpected index %u\n", index2 ); - index2 = pif_nametoindex( nameA ); - ok( index2 == index, "Got index %u for %s, expected %u\n", index2, nameA, index ); - /* Wargaming.net Game Center passes a GUID-like string. */ - index2 = pif_nametoindex( "{00000001-0000-0000-0000-000000000000}" ); - ok( !index2, "Got unexpected index %u\n", index2 ); - index2 = pif_nametoindex( wine_dbgstr_guid( &guid ) ); - ok( !index2, "Got unexpected index %u for input %s\n", index2, wine_dbgstr_guid( &guid ) ); + skip("if_nametoindex/if_indextoname not supported\n"); + return; } - else + + index2 = pif_nametoindex( NULL ); + ok( !index2, "Got unexpected index %u\n", index2 ); + index2 = pif_nametoindex( nameA ); + ok( index2 == index, "Got index %u for %s, expected %u\n", index2, nameA, index ); + /* Wargaming.net Game Center passes a GUID-like string. */ + index2 = pif_nametoindex( "{00000001-0000-0000-0000-000000000000}" ); + ok( !index2, "Got unexpected index %u\n", index2 ); + index2 = pif_nametoindex( wine_dbgstr_guid( &guid ) ); + ok( !index2, "Got unexpected index %u for input %s\n", index2, wine_dbgstr_guid( &guid ) ); + + name = pif_indextoname( 0, NULL ); + ok( name == NULL, "got %s\n", name ); + + name = pif_indextoname( 0, nameA ); + ok( name == NULL, "got %p\n", name ); + + name = pif_indextoname( ~0u, nameA ); + ok( name == NULL, "got %p\n", name ); + + nameA[0] = 0; + name = pif_indextoname( 1, nameA ); + if (name != NULL) { - skip("if_nametoindex not supported\n"); + ok( name[0], "empty name\n" ); + ok( name == nameA, "got %p\n", name ); } } diff --git a/include/netioapi.h b/include/netioapi.h index 4f5f67171c..109588804a 100644 --- a/include/netioapi.h +++ b/include/netioapi.h @@ -174,5 +174,7 @@ void WINAPI FreeMibTable(void*); DWORD WINAPI GetIfEntry2(MIB_IF_ROW2*); DWORD WINAPI GetIfTable2(MIB_IF_TABLE2**); DWORD WINAPI GetUnicastIpAddressEntry(MIB_UNICASTIPADDRESS_ROW*); +PCHAR WINAPI if_indextoname(NET_IFINDEX,PCHAR); +NET_IFINDEX WINAPI if_nametoindex(PCSTR); #endif /* __WINE_NETIOAPI_H */ -- 2.11.0

1 0

[PATCH] crypt32: Add a stub implementation of CertUnregisterPhysicalStore.
by Hans Leidekker 23 Jan '18

23 Jan '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/crypt32/crypt32.spec | 1 + dlls/crypt32/store.c | 7 +++++++ include/wincrypt.h | 3 +++ 3 files changed, 11 insertions(+) diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 00a2d62caf..fc0955e009 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -92,6 +92,7 @@ @ stdcall CertSetStoreProperty(ptr long long ptr) @ stdcall CertStrToNameA(long str long ptr ptr ptr ptr) @ stdcall CertStrToNameW(long wstr long ptr ptr ptr ptr) +@ stdcall CertUnregisterPhysicalStore(ptr long wstr) @ stdcall CertUnregisterSystemStore(ptr long) @ stdcall CertVerifyCRLRevocation(long ptr long ptr) @ stdcall CertVerifyCRLTimeValidity(ptr ptr) diff --git a/dlls/crypt32/store.c b/dlls/crypt32/store.c index 19eca22be2..91a3cbc0dc 100644 --- a/dlls/crypt32/store.c +++ b/dlls/crypt32/store.c @@ -1384,6 +1384,13 @@ BOOL WINAPI CertRegisterPhysicalStore(const void *pvSystemStore, DWORD dwFlags, return FALSE; } +BOOL WINAPI CertUnregisterPhysicalStore(const void *pvSystemStore, DWORD dwFlags, + LPCWSTR pwszStoreName) +{ + FIXME("(%p, %08x, %s): stub\n", pvSystemStore, dwFlags, debugstr_w(pwszStoreName)); + return TRUE; +} + BOOL WINAPI CertRegisterSystemStore(const void *pvSystemStore, DWORD dwFlags, PCERT_SYSTEM_STORE_INFO pStoreInfo, void *pvReserved) { diff --git a/include/wincrypt.h b/include/wincrypt.h index 83db673087..6986bd819e 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -4090,6 +4090,9 @@ BOOL WINAPI CertEnumPhysicalStore(const void *pvSystemStore, DWORD dwFlags, BOOL WINAPI CertRegisterPhysicalStore(const void *pvSystemStore, DWORD dwFlags, LPCWSTR pwszStoreName, PCERT_PHYSICAL_STORE_INFO pStoreInfo, void *pvReserved); +BOOL WINAPI CertUnregisterPhysicalStore(const void *pvSystemStore, DWORD dwFlags, + LPCWSTR pwszStoreName); + BOOL WINAPI CertSaveStore(HCERTSTORE hCertStore, DWORD dwMsgAndCertEncodingType, DWORD dwSaveAs, DWORD dwSaveTo, void* pvSaveToPara, DWORD dwFlags); -- 2.11.0

1 0

[PATCH 1/3] msxml3: Use IUri API to load documents
by Nikolay Sivov 23 Jan '18

23 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msxml3/bsc.c | 25 ++++++++-- dlls/msxml3/domdoc.c | 49 ++++++++---------- dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/tests/domdoc.c | 118 ++++++++++++++++++++++++++++---------------- 4 files changed, 118 insertions(+), 75 deletions(-) diff --git a/dlls/msxml3/bsc.c b/dlls/msxml3/bsc.c index d9519f37a8..05977a610b 100644 --- a/dlls/msxml3/bsc.c +++ b/dlls/msxml3/bsc.c @@ -242,24 +242,24 @@ static const struct IBindStatusCallbackVtbl bsc_vtbl = bsc_OnObjectAvailable }; -HRESULT create_moniker_from_url(LPCWSTR url, IMoniker **mon) +HRESULT create_uri(const WCHAR *url, IUri **uri) { WCHAR fileUrl[INTERNET_MAX_URL_LENGTH]; TRACE("%s\n", debugstr_w(url)); - if(!PathIsURLW(url)) + if (!PathIsURLW(url)) { WCHAR fullpath[MAX_PATH]; DWORD needed = sizeof(fileUrl)/sizeof(WCHAR); - if(!PathSearchAndQualifyW(url, fullpath, sizeof(fullpath)/sizeof(WCHAR))) + if (!PathSearchAndQualifyW(url, fullpath, sizeof(fullpath)/sizeof(WCHAR))) { WARN("can't find path\n"); return E_FAIL; } - if(FAILED(UrlCreateFromPathW(fullpath, fileUrl, &needed, 0))) + if (FAILED(UrlCreateFromPathW(fullpath, fileUrl, &needed, 0))) { ERR("can't create url from path\n"); return E_FAIL; @@ -267,7 +267,22 @@ HRESULT create_moniker_from_url(LPCWSTR url, IMoniker **mon) url = fileUrl; } - return CreateURLMonikerEx(NULL, url, mon, 0); + return CreateUri(url, Uri_CREATE_ALLOW_RELATIVE | Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, uri); +} + +HRESULT create_moniker_from_url(LPCWSTR url, IMoniker **mon) +{ + HRESULT hr; + IUri *uri; + + TRACE("%s\n", debugstr_w(url)); + + if (FAILED(hr = create_uri(url, &uri))) + return hr; + + hr = CreateURLMonikerEx2(NULL, uri, mon, 0); + IUri_Release(uri); + return hr; } HRESULT bind_url(IMoniker *mon, HRESULT (*onDataAvailable)(void*,char*,DWORD), diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index a40fac2106..87a167e46e 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -86,7 +86,7 @@ typedef struct { xmlChar const* selectNsStr; LONG selectNsStr_len; BOOL XPath; - WCHAR *url; + IUri *uri; } domdoc_properties; typedef struct ConnectionPoint ConnectionPoint; @@ -298,8 +298,8 @@ static domdoc_properties *create_properties(MSXML_VERSION version) properties->version = version; properties->XPath = (version == MSXML4 || version == MSXML6); - /* document url */ - properties->url = NULL; + /* document uri */ + properties->uri = NULL; return properties; } @@ -335,16 +335,9 @@ static domdoc_properties* copy_properties(domdoc_properties const* properties) list_add_tail(&pcopy->selectNsList, &new_ns->entry); } - if (properties->url) - { - int len = strlenW(properties->url); - - pcopy->url = CoTaskMemAlloc((len+1)*sizeof(WCHAR)); - memcpy(pcopy->url, properties->url, len*sizeof(WCHAR)); - pcopy->url[len] = 0; - } - else - pcopy->url = NULL; + pcopy->uri = properties->uri; + if (pcopy->uri) + IUri_AddRef(pcopy->uri); } return pcopy; @@ -358,7 +351,8 @@ static void free_properties(domdoc_properties* properties) IXMLDOMSchemaCollection2_Release(properties->schemaCache); clear_selectNsList(&properties->selectNsList); heap_free((xmlChar*)properties->selectNsStr); - CoTaskMemFree(properties->url); + if (properties->uri) + IUri_Release(properties->uri); heap_free(properties); } } @@ -2293,16 +2287,20 @@ static HRESULT WINAPI domdoc_load( if ( filename ) { IMoniker *mon; + IUri *uri; - CoTaskMemFree(This->properties->url); - This->properties->url = NULL; + if (This->properties->uri) + { + IUri_Release(This->properties->uri); + This->properties->uri = NULL; + } - hr = create_moniker_from_url( filename, &mon); + hr = create_uri(filename, &uri); + if (SUCCEEDED(hr)) + hr = CreateURLMonikerEx2(NULL, uri, &mon, 0); if ( SUCCEEDED(hr) ) { hr = domdoc_load_moniker( This, mon ); - if (hr == S_OK) - IMoniker_GetDisplayName(mon, NULL, NULL, &This->properties->url); IMoniker_Release(mon); } @@ -2310,6 +2308,7 @@ static HRESULT WINAPI domdoc_load( This->error = E_FAIL; else { + This->properties->uri = uri; hr = This->error = S_OK; *isSuccessful = VARIANT_TRUE; } @@ -2374,16 +2373,10 @@ static HRESULT WINAPI domdoc_get_url( if (!url) return E_INVALIDARG; - if (This->properties->url) - { - *url = SysAllocString(This->properties->url); - if (!*url) - return E_OUTOFMEMORY; - - return S_OK; - } - else + if (!This->properties->uri) return return_null_bstr(url); + + return IUri_GetPropertyBSTR(This->properties->uri, Uri_PROPERTY_DISPLAY_URI, url, 0); } diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 4bcac932d0..8d7833b083 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -544,6 +544,7 @@ static inline const CLSID* SchemaCache_version(MSXML_VERSION v) typedef struct bsc_t bsc_t; HRESULT create_moniker_from_url(LPCWSTR, IMoniker**) DECLSPEC_HIDDEN; +HRESULT create_uri(const WCHAR *, IUri **) DECLSPEC_HIDDEN; HRESULT bind_url(IMoniker*, HRESULT (*onDataAvailable)(void*,char*,DWORD), void*, bsc_t**) DECLSPEC_HIDDEN; HRESULT detach_bsc(bsc_t*) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7c56015235..81e24935a4 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10152,13 +10152,68 @@ static void write_to_file(const char *name, const char *data) CloseHandle(hfile); } +static void test_doc_load_from_path(IXMLDOMDocument *doc, const char *path) +{ + IXMLDOMDocument *doc2; + IXMLDOMElement *elem; + BSTR url, url2; + VARIANT_BOOL b; + VARIANT src; + HRESULT hr; + + url = _bstr_(path); + + V_VT(&src) = VT_BSTR; + V_BSTR(&src) = url; + hr = IXMLDOMDocument_load(doc, src, &b); + ok(hr == S_OK, "Failed to load document, %#x.\n", hr); + ok(b == VARIANT_TRUE, "got %d\n", b); + + V_VT(&src) = VT_BSTR | VT_BYREF; + V_BSTRREF(&src) = &url; + hr = IXMLDOMDocument_load(doc, src, &b); + ok(hr == S_OK, "Failed to load document, %#x.\n", hr); + ok(b == VARIANT_TRUE, "got %d\n", b); + + url = NULL; + hr = IXMLDOMDocument_get_url(doc, &url); + ok(hr == S_OK, "Failed to get document url, hr %#x.\n", hr); + + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* Create another instance for the same document, check url */ + hr = IXMLDOMElement_get_ownerDocument(elem, &doc2); + ok(hr == S_OK, "Failed to get owner document, hr %#x.\n", hr); + + hr = IXMLDOMDocument_get_url(doc2, &url2); + ok(hr == S_OK, "Failed to get document url, hr %#x.\n", hr); + ok(!lstrcmpW(url, url2), "Unexpected url %s.\n", wine_dbgstr_w(url2)); + + IXMLDOMDocument_Release(doc2); + IXMLDOMElement_Release(elem); + SysFreeString(url2); + SysFreeString(url); +} + +static void url_forward_slash(char *url) +{ + char *p = url; + + while (*p) + { + if (*p == '\\') + *p = '/'; + p++; + } +} + static void test_load(void) { - IXMLDOMDocument *doc, *doc2; - BSTR pathW, bstr1, bstr2; + char path[MAX_PATH], path2[MAX_PATH]; IXMLDOMNodeList *list; - IXMLDOMElement *elem; - char path[MAX_PATH]; + IXMLDOMDocument *doc; + BSTR bstr1, bstr2; VARIANT_BOOL b; VARIANT src; HRESULT hr; @@ -10179,47 +10234,26 @@ static void test_load(void) EXPECT_HR(hr, E_INVALIDARG); ok(b == VARIANT_FALSE, "got %d\n", b); - pathW = _bstr_(path); - - /* load from path: VT_BSTR */ - V_VT(&src) = VT_BSTR; - V_BSTR(&src) = pathW; - hr = IXMLDOMDocument_load(doc, src, &b); - EXPECT_HR(hr, S_OK); - ok(b == VARIANT_TRUE, "got %d\n", b); - - bstr1 = NULL; - hr = IXMLDOMDocument_get_url(doc, &bstr1); - ok(hr == S_OK, "got 0x%08x\n", hr); - SysFreeString(bstr1); - - /* load from a path: VT_BSTR|VT_BYREF */ - V_VT(&src) = VT_BSTR | VT_BYREF; - V_BSTRREF(&src) = &pathW; - hr = IXMLDOMDocument_load(doc, src, &b); - EXPECT_HR(hr, S_OK); - ok(b == VARIANT_TRUE, "got %d\n", b); - - bstr1 = NULL; - hr = IXMLDOMDocument_get_url(doc, &bstr1); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IXMLDOMDocument_get_documentElement(doc, &elem); - ok(hr == S_OK, "got 0x%08x\n", hr); + /* "file://" url */ + strcpy(path2, "file://"); + strcat(path2, path); + test_doc_load_from_path(doc, path2); - /* create another instance for the same document, check url */ - hr = IXMLDOMElement_get_ownerDocument(elem, &doc2); - ok(hr == S_OK, "got 0x%08x\n", hr); + /* file:// url, forward slashes */ + url_forward_slash(path2); + test_doc_load_from_path(doc, path2); - hr = IXMLDOMDocument_get_url(doc, &bstr2); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(bstr1, bstr2), "got %s\n", wine_dbgstr_w(bstr2)); + /* "file:/" url */ + strcpy(path2, "file:/"); + strcat(path2, path); + test_doc_load_from_path(doc, path); - IXMLDOMDocument_Release(doc2); - IXMLDOMElement_Release(elem); + /* file:/ with forward slashes. */ + url_forward_slash(path2); + test_doc_load_from_path(doc, path2); - SysFreeString(bstr1); - SysFreeString(bstr2); + /* Regular local path. */ + test_doc_load_from_path(doc, path); /* load from a path: VT_BSTR|VT_BYREF, null ptr */ V_VT(&src) = VT_BSTR | VT_BYREF; @@ -10239,7 +10273,7 @@ static void test_load(void) write_to_file(path, nocontent); V_VT(&src) = VT_BSTR; - V_BSTR(&src) = pathW; + V_BSTR(&src) = _bstr_(path); b = VARIANT_TRUE; hr = IXMLDOMDocument_load(doc, src, &b); ok(hr == S_FALSE, "got 0x%08x\n", hr); -- 2.15.1

1 2

[PATCH] shell32: Fix a trace message
by Nikolay Sivov 23 Jan '18

23 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/shell32/shellpath.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 551fec7951..3b9c53b41c 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -4126,7 +4126,7 @@ HRESULT WINAPI SHGetFolderPathA( WCHAR szTemp[MAX_PATH]; HRESULT hr; - TRACE("%p,%p,nFolder=0x%04x\n",hwndOwner,pszPath,nFolder); + TRACE("%p,%d,%p,%#x,%p\n", hwndOwner, nFolder, hToken, dwFlags, pszPath); if (pszPath) *pszPath = '\0'; -- 2.15.1

1 0

[PATCH 4/4] ole32/tests: Added more CoWaitForMultipleHandles tests.
by Jacek Caban 23 Jan '18

23 Jan '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ole32/tests/compobj.c | 182 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 179 insertions(+), 3 deletions(-)

2 1

[PATCH 3/4] ole32: Don't stop processing messages after WM_QUIT in CoWaitForMultipleHandles.
by Jacek Caban 23 Jan '18

23 Jan '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ole32/compobj.c | 3 --- dlls/ole32/tests/compobj.c | 3 --- 2 files changed, 6 deletions(-)

2 1

[PATCH 2/4] ole32: Don't dispatch WM_QUIT messages in CoWaitForMultipleHandles.
by Jacek Caban 23 Jan '18

23 Jan '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ole32/compobj.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)

2 1

[PATCH 1/4] ole32: Post quit message after leaving wait loop in CoWaitForMultipleHandles.
by Jacek Caban 23 Jan '18

23 Jan '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I split the series more than I'd usually do because it's risky and in case of regression, a precise information which part is responsible would be interesting. dlls/ole32/compobj.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)

2 1

[PATCH] configure: Check for -Wno-pragma-pack
by Martin Storsjo 23 Jan '18

23 Jan '18

Recent clang versions warn if an include file changes the pragma pack level without restoring it before the end of the include file. This avoids warnings for each include of pshpack*.h/poppack.h. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 25d88d8..018b122 100644 --- a/configure.ac +++ b/configure.ac @@ -1853,6 +1853,7 @@ then WINE_TRY_CFLAGS([-Wempty-body]) WINE_TRY_CFLAGS([-Wignored-qualifiers]) WINE_TRY_CFLAGS([-Wno-packed-not-aligned]) + WINE_TRY_CFLAGS([-Wno-pragma-pack]) WINE_TRY_CFLAGS([-Wshift-overflow=2]) WINE_TRY_CFLAGS([-Wstrict-prototypes]) WINE_TRY_CFLAGS([-Wtype-limits]) -- 2.7.4

2 5

[PATCH 1/3] testbot: Add support for more collection filter types.
by Francois Gouget 23 Jan '18

23 Jan '18

By default filters still return the rows where the specified field is equal to one of the specified values. But now they can also be set to return rows where the field is smaller, greater, different or like one of the specified values. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 6 +++--- testbot/lib/ObjectModel/DBIBackEnd.pm | 23 +++++++++++++++++++++-- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index a9ec9958..86dee057 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -656,11 +656,11 @@ sub DeleteAll($) return undef; } -sub AddFilter($$$) +sub AddFilter($$$;$) { - my ($self, $PropertyName, $Value) = @_; + my ($self, $PropertyName, $Values, $Type) = @_; - $self->{Filters}{$PropertyName} = $Value; + $self->{Filters}{$PropertyName} = [($Type || "="), $Values]; } sub GetFilters($) diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 0594951b..565d4a8e 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -179,6 +179,16 @@ sub BuildFieldList($$) return $Fields; } +my %_AllowedFilterTypes = ( + "=" => 1, + "<>" => 1, + "<" => 1, + "<=" => 1, + ">" => 1, + ">=" => 1, + "LIKE" => 1, +); + sub LoadCollection($$) { my ($self, $Collection) = @_; @@ -202,7 +212,16 @@ sub LoadCollection($$) $Where .= " AND "; } my $PropertyDescriptor = $Collection->GetPropertyDescriptorByName($FilterProperty); - my $FilterValues = $Filters->{$FilterProperty}; + my ($FilterType, $FilterValues) = @{$Filters->{$FilterProperty}}; + if (!$_AllowedFilterTypes{$FilterType}) + { + die "unknown '$FilterType' filter type"; + } + if (!@$FilterValues) + { + die "no values for the '$FilterType' filter"; + } + if (@$FilterValues != 1) { $Where .= "("; @@ -220,7 +239,7 @@ sub LoadCollection($$) } foreach my $ColName (@{$PropertyDescriptor->GetColNames()}) { - $Where .= "$ColName = ?"; + $Where .= "$ColName $FilterType ?"; $Data[@Data] = $self->ToDb($ColValue, $PropertyDescriptor); } } -- 2.15.1

1 2

[PATCH] d3dx10/tests: Use GetModuleHandleA instead of LoadLibraryA.
by Andrey Gusev 22 Jan '18

22 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/d3dx10_43/tests/d3dx10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index ac0852bd02..4d7bc2de17 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -41,7 +41,7 @@ static BOOL compare_float(float f, float g, unsigned int ulps) static ID3D10Device *create_device(void) { ID3D10Device *device; - HMODULE d3d10_mod = LoadLibraryA("d3d10.dll"); + HMODULE d3d10_mod = GetModuleHandleA("d3d10.dll"); HRESULT (WINAPI *pD3D10CreateDevice)(IDXGIAdapter *, D3D10_DRIVER_TYPE, HMODULE, UINT, UINT, ID3D10Device **); if (!d3d10_mod) -- 2.13.6

2 1

[PATCH] kernel32/tests: Make sure the child process is done running its tests before terminating it.
by Zebediah Figura 22 Jan '18

22 Jan '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/tests/pipe.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 922eed9..1708c28 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -2962,10 +2962,15 @@ static void child_process_write_pipe(HANDLE pipe) { OVERLAPPED overlapped; char buf[10000]; + HANDLE event; memset(buf, 'x', sizeof(buf)); overlapped_write_async(pipe, buf, sizeof(buf), &overlapped); + event = OpenEventA(EVENT_MODIFY_STATE, FALSE, "wine_test_pipe_event"); + SetEvent(event); + CloseHandle(event); + /* sleep until parent process terminates this process */ Sleep(INFINITE); } @@ -3024,6 +3029,7 @@ static void test_overlapped_transport(BOOL msg_mode, BOOL msg_read_mode) HANDLE process; char buf[60000]; BOOL res; + HANDLE event; DWORD create_flags = (msg_mode ? PIPE_TYPE_MESSAGE : PIPE_TYPE_BYTE) | @@ -3074,6 +3080,7 @@ static void test_overlapped_transport(BOOL msg_mode, BOOL msg_read_mode) /* terminate process with pending write */ create_overlapped_pipe(create_flags, &client, &server); + event = CreateEventA(NULL, FALSE, FALSE, "wine_test_pipe_event"); process = create_writepipe_process(client); /* successfully read part of write that is pending in child process */ res = ReadFile(server, buf, 10, &read_bytes, NULL); @@ -3082,6 +3089,7 @@ static void test_overlapped_transport(BOOL msg_mode, BOOL msg_read_mode) else ok(!res && GetLastError() == ERROR_MORE_DATA, "ReadFile returned: %x %u\n", res, GetLastError()); ok(read_bytes == 10, "read_bytes = %u\n", read_bytes); + ok(WaitForSingleObject(event, 1000) == WAIT_OBJECT_0, "Wait failed\n"); TerminateProcess(process, 0); winetest_wait_child_process(process); /* after terminating process, there is no pending write and pipe buffer is empty */ -- 2.7.4

3 2

Vulkan ICD update
by Roderick Colenbrander 22 Jan '18

22 Jan '18

Hi all, Last year I shared my wine-vulkan icd work (https://github.com/roderickc/wine-vulkan). Since then I made many changes and the code is in a much better shape now. I would like to ask people interested in Vulkan to try it out and report issues (on github). I just want to make sure the core Vulkan code is working properly now before I start submitting patches to Wine in the future. In particular I would like to know the stability of the nasty 32-bit struct conversion code (enabled on 64-bit as well for testing). If it works correctly I can finally rebase these nasty changes across the other commits, which is something I would like to do only once. Other improvements like support for child window rendering and more extensions are in the pipeline. Changes: - Rebased on Wine 3.0 - Perform win32 <-> host struct conversion when needed. - Improved driver model, where WSI ('WGL') now lives in the graphics driver. - Improved X11 integration including client window rendering. - Support for major games including Doom 4, Wolfenstein II and Talos Principle. - Many other bug fixes. Thanks, Roderick

1 0

[PATCH] schtasks: Added support for /f argument in create command.
by Jacek Caban 22 Jan '18

22 Jan '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/schtasks/schtasks.c | 7 ++++++- programs/schtasks/tests/schtasks.c | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[PATCH] xinput: XInputGetStateEx takes the same struct as XInputGetState
by Andrew Eikum 22 Jan '18

22 Jan '18

XINPUT_STATE_EX has four extra bytes for padding, but is otherwise identical to XINPUT_STATE. It was introduced in a libSDL header in 2012, for use with the undocumented function at xinput ordinal 100, which we call XInputGetStateEx. In Wine tests, native XInputGetStateEx does not write to these padding bytes. Some real win32 applications[1] do not allocate those bytes, and they do not crash when using native XInputGetStateEx. So I believe the evidence is that this struct doesn't exist in native xinput, and both versions of this function use XINPUT_STATE. [1] mGetState here is ordinal 100, note XINPUT_STATE is used: https://github.com/speps/XInputDotNet/blob/master/XInputInterface/GamePad.c… This library is used in real games like THOTH, available on Steam. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xinput1_3/tests/xinput.c | 34 +++++++++++++++------------------- dlls/xinput1_3/xinput_main.c | 14 ++++---------- include/xinput.h | 18 +----------------- 3 files changed, 20 insertions(+), 46 deletions(-) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index 87f9929782..f26fda90eb 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -24,7 +24,7 @@ #include "wine/test.h" static DWORD (WINAPI *pXInputGetState)(DWORD, XINPUT_STATE*); -static DWORD (WINAPI *pXInputGetStateEx)(DWORD, XINPUT_STATE_EX*); +static DWORD (WINAPI *pXInputGetStateEx)(DWORD, XINPUT_STATE*); static DWORD (WINAPI *pXInputGetCapabilities)(DWORD,DWORD,XINPUT_CAPABILITIES*); static DWORD (WINAPI *pXInputSetState)(DWORD, XINPUT_VIBRATION*); static void (WINAPI *pXInputEnable)(BOOL); @@ -91,23 +91,19 @@ static void test_set_state(void) static void test_get_state(void) { - union - { - XINPUT_STATE state; - XINPUT_STATE_EX state_ex; - } xinput; + XINPUT_STATE state; DWORD controllerNum, i, result, good = XUSER_MAX_COUNT; for (i = 0; i < (pXInputGetStateEx ? 2 : 1); i++) { for (controllerNum = 0; controllerNum < XUSER_MAX_COUNT; controllerNum++) { - ZeroMemory(&xinput, sizeof(xinput)); + ZeroMemory(&state, sizeof(state)); if (i == 0) - result = pXInputGetState(controllerNum, &xinput.state); + result = pXInputGetState(controllerNum, &state); else - result = pXInputGetStateEx(controllerNum, &xinput.state_ex); + result = pXInputGetStateEx(controllerNum, &state); ok(result == ERROR_SUCCESS || result == ERROR_DEVICE_NOT_CONNECTED, "%s failed with (%d)\n", i == 0 ? "XInputGetState" : "XInputGetStateEx", result); @@ -125,39 +121,39 @@ static void test_get_state(void) } else trace("XInputGetStateEx: %d\n", result); - trace("State->dwPacketNumber: %d\n", xinput.state.dwPacketNumber); - dump_gamepad(&xinput.state.Gamepad); + trace("State->dwPacketNumber: %d\n", state.dwPacketNumber); + dump_gamepad(&state.Gamepad); } } - result = pXInputGetState(XUSER_MAX_COUNT, &xinput.state); + result = pXInputGetState(XUSER_MAX_COUNT, &state); ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); - result = pXInputGetState(XUSER_MAX_COUNT+1, &xinput.state); + result = pXInputGetState(XUSER_MAX_COUNT+1, &state); ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); if (pXInputGetStateEx) { - result = pXInputGetStateEx(XUSER_MAX_COUNT, &xinput.state_ex); + result = pXInputGetStateEx(XUSER_MAX_COUNT, &state); ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); - result = pXInputGetStateEx(XUSER_MAX_COUNT+1, &xinput.state_ex); + result = pXInputGetStateEx(XUSER_MAX_COUNT+1, &state); ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); } if (winetest_interactive && good < XUSER_MAX_COUNT) { DWORD now = GetTickCount(), packet = 0; - XINPUT_GAMEPAD *game = &xinput.state.Gamepad; + XINPUT_GAMEPAD *game = &state.Gamepad; trace("You have 20 seconds to test the joystick freely\n"); do { Sleep(100); - pXInputGetState(good, &xinput.state); - if (xinput.state.dwPacketNumber == packet) + pXInputGetState(good, &state); + if (state.dwPacketNumber == packet) continue; - packet = xinput.state.dwPacketNumber; + packet = state.dwPacketNumber; trace("Buttons 0x%04X Triggers %3d/%3d LT %6d/%6d RT %6d/%6d\n", game->wButtons, game->bLeftTrigger, game->bRightTrigger, game->sThumbLX, game->sThumbLY, game->sThumbRX, game->sThumbRY); diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index 402bd2f468..a0a0877cf4 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -73,34 +73,28 @@ DWORD WINAPI XInputSetState(DWORD index, XINPUT_VIBRATION* vibration) DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD index, XINPUT_STATE* state) { - union - { - XINPUT_STATE state; - XINPUT_STATE_EX state_ex; - } xinput; DWORD ret; static int warn_once; if (!warn_once++) FIXME("(index %u, state %p) Stub!\n", index, state); - ret = XInputGetStateEx(index, &xinput.state_ex); + ret = XInputGetStateEx(index, state); if (ret != ERROR_SUCCESS) return ret; /* The main difference between this and the Ex version is the media guide button */ - xinput.state.Gamepad.wButtons &= ~XINPUT_GAMEPAD_GUIDE; - *state = xinput.state; + state->Gamepad.wButtons &= ~XINPUT_GAMEPAD_GUIDE; return ERROR_SUCCESS; } -DWORD WINAPI DECLSPEC_HOTPATCH XInputGetStateEx(DWORD index, XINPUT_STATE_EX* state_ex) +DWORD WINAPI DECLSPEC_HOTPATCH XInputGetStateEx(DWORD index, XINPUT_STATE* state) { static int warn_once; if (!warn_once++) - FIXME("(index %u, state %p) Stub!\n", index, state_ex); + FIXME("(index %u, state %p) Stub!\n", index, state); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; diff --git a/include/xinput.h b/include/xinput.h index ccdc023343..99ff0cc7cf 100644 --- a/include/xinput.h +++ b/include/xinput.h @@ -170,27 +170,11 @@ typedef struct _XINPUT_GAMEPAD { SHORT sThumbRY; } XINPUT_GAMEPAD, *PXINPUT_GAMEPAD; -typedef struct _XINPUT_GAMEPAD_EX { - WORD wButtons; - BYTE bLeftTrigger; - BYTE bRightTrigger; - SHORT sThumbLX; - SHORT sThumbLY; - SHORT sThumbRX; - SHORT sThumbRY; - DWORD dwPaddingReserved; -} XINPUT_GAMEPAD_EX, *PXINPUT_GAMEPAD_EX; - typedef struct _XINPUT_STATE { DWORD dwPacketNumber; XINPUT_GAMEPAD Gamepad; } XINPUT_STATE, *PXINPUT_STATE; -typedef struct _XINPUT_STATE_EX { - DWORD dwPacketNumber; - XINPUT_GAMEPAD_EX Gamepad; -} XINPUT_STATE_EX, *PXINPUT_STATE_EX; - /* * Defines the structure of how much vibration is set on both the * right and left motors in a joystick. If you're not using a 360 @@ -248,7 +232,7 @@ DWORD WINAPI XInputGetCapabilities(DWORD, DWORD, XINPUT_CAPABILITIES*); DWORD WINAPI XInputGetDSoundAudioDeviceGuids(DWORD, GUID*, GUID*); DWORD WINAPI XInputGetBatteryInformation(DWORD, BYTE, XINPUT_BATTERY_INFORMATION*); -DWORD WINAPI XInputGetStateEx(DWORD, XINPUT_STATE_EX*); +DWORD WINAPI XInputGetStateEx(DWORD, XINPUT_STATE*); #ifdef __cplusplus } -- 2.16.0

1 0

[PATCH v5 4/5] winebus.sys: Process device reports for linux event devices
by Aric Stewart 22 Jan '18

22 Jan '18

v4: After review from Andrew Eikum Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 235 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 229 insertions(+), 6 deletions(-)

2 1

[PATCH v5 3/5] winebus.sys: Implement get_string for linux event devices
by Aric Stewart 22 Jan '18

22 Jan '18

v5: Update from Andrew Eikum Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)

2 1

[PATCH v5 2/5] winebus.sys: Build device reports for linux event devices
by Aric Stewart 22 Jan '18

22 Jan '18

v5: After review from Andrew Eikum Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 471 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 469 insertions(+), 2 deletions(-)

2 1

[PATCH v5 1/5] winebus.sys: Handle linux input event device via udev
by Aric Stewart 22 Jan '18

22 Jan '18

v5: After review from Andrew Eikum Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/winebus.sys/bus.h | 6 ++ dlls/winebus.sys/bus_udev.c | 172 +++++++++++++++++++++++++++++++++++++++++--- dlls/winebus.sys/main.c | 48 +++++++++++++ 3 files changed, 218 insertions(+), 8 deletions(-)

2 1

[PATCH v2] xaudio2: Partially implement XA2SRC_SetChannelVolumes().
by Masanori Kakura 22 Jan '18

22 Jan '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=44277 Thanks to Fabian Maurer and Andrew Eikum. v2 - Also test XA27 - Disable input validation in XA27 - Fix XA27-related tests Signed-off-by: Masanori Kakura <kakurasan(a)gmail.com> --- dlls/xaudio2_7/tests/xaudio2.c | 72 ++++++++++++++++++++++++++++++++++++++++++ dlls/xaudio2_7/xaudio_dll.c | 28 ++++++++++++++++ 2 files changed, 100 insertions(+) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index ff402f87c4..ccc415afaa 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -1165,6 +1165,76 @@ static void test_xapo_creation(void) test_xapo_creation_modern("xaudio2_8.dll"); } +static void test_setchannelvolumes(IXAudio2 *xa) +{ + HRESULT hr; + IXAudio2MasteringVoice *master; + IXAudio2SourceVoice *src_2ch, *src_8ch; + WAVEFORMATEX fmt_2ch, fmt_8ch; + float volumes[] = {0.1f, 0.2f, 0.3f, 0.4f, 0.5f, 0.6f, 0.7f, 0.8f}; + + if(xaudio27) + hr = IXAudio27_CreateMasteringVoice((IXAudio27*)xa, &master, 8, 44100, 0, 0, NULL); + else + hr = IXAudio2_CreateMasteringVoice(xa, &master, 8, 44100, 0, NULL, NULL, AudioCategory_GameEffects); + ok(hr == S_OK, "CreateMasteringVoice failed: %08x\n", hr); + + fmt_2ch.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; + fmt_2ch.nChannels = 2; + fmt_2ch.nSamplesPerSec = 44100; + fmt_2ch.wBitsPerSample = 32; + fmt_2ch.nBlockAlign = fmt_2ch.nChannels * fmt_2ch.wBitsPerSample / 8; + fmt_2ch.nAvgBytesPerSec = fmt_2ch.nSamplesPerSec * fmt_2ch.nBlockAlign; + fmt_2ch.cbSize = 0; + + fmt_8ch.wFormatTag = WAVE_FORMAT_IEEE_FLOAT; + fmt_8ch.nChannels = 8; + fmt_8ch.nSamplesPerSec = 44100; + fmt_8ch.wBitsPerSample = 32; + fmt_8ch.nBlockAlign = fmt_8ch.nChannels * fmt_8ch.wBitsPerSample / 8; + fmt_8ch.nAvgBytesPerSec = fmt_8ch.nSamplesPerSec * fmt_8ch.nBlockAlign; + fmt_8ch.cbSize = 0; + + XA2CALL(CreateSourceVoice, &src_2ch, &fmt_2ch, 0, 1.f, NULL, NULL, NULL); + ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + + XA2CALL(CreateSourceVoice, &src_8ch, &fmt_8ch, 0, 1.f, NULL, NULL, NULL); + ok(hr == S_OK, "CreateSourceVoice failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_SetChannelVolumes(src_2ch, 2, volumes, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "SetChannelVolumes failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_SetChannelVolumes(src_8ch, 8, volumes, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "SetChannelVolumes failed: %08x\n", hr); + + if(xaudio27){ + /* XAudio 2.7 doesn't check the number of channels */ + hr = IXAudio2SourceVoice_SetChannelVolumes(src_8ch, 2, volumes, XAUDIO2_COMMIT_NOW); + ok(hr == S_OK, "SetChannelVolumes failed: %08x\n", hr); + }else{ + /* the number of channels must be the same as the number of channels on the source voice */ + hr = IXAudio2SourceVoice_SetChannelVolumes(src_8ch, 2, volumes, XAUDIO2_COMMIT_NOW); + ok(hr == XAUDIO2_E_INVALID_CALL, "SetChannelVolumes should have failed: %08x\n", hr); + + hr = IXAudio2SourceVoice_SetChannelVolumes(src_2ch, 8, volumes, XAUDIO2_COMMIT_NOW); + ok(hr == XAUDIO2_E_INVALID_CALL, "SetChannelVolumes should have failed: %08x\n", hr); + + /* volumes must not be NULL, XAudio 2.7 doesn't check this */ + hr = IXAudio2SourceVoice_SetChannelVolumes(src_2ch, 2, NULL, XAUDIO2_COMMIT_NOW); + ok(hr == XAUDIO2_E_INVALID_CALL, "SetChannelVolumes should have failed: %08x\n", hr); + } + + if(xaudio27){ + IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src_2ch); + IXAudio27SourceVoice_DestroyVoice((IXAudio27SourceVoice*)src_8ch); + }else{ + IXAudio2SourceVoice_DestroyVoice(src_2ch); + IXAudio2SourceVoice_DestroyVoice(src_8ch); + } + + IXAudio2MasteringVoice_DestroyVoice(master); +} + static UINT32 check_has_devices(IXAudio2 *xa) { HRESULT hr; @@ -1213,6 +1283,7 @@ START_TEST(xaudio2) test_looping((IXAudio2*)xa27); test_submix((IXAudio2*)xa27); test_flush((IXAudio2*)xa27); + test_setchannelvolumes((IXAudio2*)xa27); }else skip("No audio devices available\n"); @@ -1237,6 +1308,7 @@ START_TEST(xaudio2) test_looping(xa); test_submix(xa); test_flush(xa); + test_setchannelvolumes(xa); }else skip("No audio devices available\n"); diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index bc5cf1cae9..9b7a07f7b3 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -337,7 +337,35 @@ static HRESULT WINAPI XA2SRC_SetChannelVolumes(IXAudio2SourceVoice *iface, UINT32 Channels, const float *pVolumes, UINT32 OperationSet) { XA2SourceImpl *This = impl_from_IXAudio2SourceVoice(iface); + ALfloat al_gain; + UINT32 i; + BOOL same_volumes_given = TRUE; + TRACE("%p, %u, %p, 0x%x\n", This, Channels, pVolumes, OperationSet); + +#if XAUDIO2_VER > 7 + if(Channels != This->fmt->nChannels || !pVolumes) + return COMPAT_E_INVALID_CALL; +#endif + + al_gain = *pVolumes; + + /* check whether all volumes are the same */ + for(i = 1; i < Channels; ++i){ + if(al_gain != *(pVolumes + i)){ + same_volumes_given = FALSE; + break; + } + } + if(!same_volumes_given){ + WARN("Different volumes for channels unsupported, setting the highest volume.\n"); + for(; i < Channels; ++i) + al_gain = max(al_gain, *(pVolumes + i)); + } + + palcSetThreadContext(This->xa2->al_ctx); + alSourcef(This->al_src, AL_GAIN, al_gain); + return S_OK; } -- 2.14.1

2 1

[PATCH 1/5] d3d11: Prefer D3D11 interfaces.
by Józef Kucia 22 Jan '18

22 Jan '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 4 ++-- dlls/d3d11/device.c | 20 ++++++++++---------- dlls/d3d11/texture.c | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index e7fd3a7f4c79..a184b9377a02 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -126,9 +126,9 @@ struct d3d_texture2d ID3D11Device *device; }; -static inline struct d3d_texture2d *impl_from_ID3D10Texture2D(ID3D10Texture2D *iface) +static inline struct d3d_texture2d *impl_from_ID3D11Texture2D(ID3D11Texture2D *iface) { - return CONTAINING_RECORD(iface, struct d3d_texture2d, ID3D10Texture2D_iface); + return CONTAINING_RECORD(iface, struct d3d_texture2d, ID3D11Texture2D_iface); } HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DESC *desc, diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index b2a40b3c6d31..86778f313355 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -5767,8 +5767,8 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic { struct d3d_device *device = device_from_wined3d_device_parent(device_parent); struct d3d_texture2d *texture; - ID3D10Texture2D *texture_iface; - D3D10_TEXTURE2D_DESC desc; + ID3D11Texture2D *texture_iface; + D3D11_TEXTURE2D_DESC desc; HRESULT hr; FIXME("device_parent %p, container_parent %p, wined3d_desc %p, texture flags %#x, " @@ -5784,32 +5784,32 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic desc.Format = dxgi_format_from_wined3dformat(wined3d_desc->format); desc.SampleDesc.Count = wined3d_desc->multisample_type ? wined3d_desc->multisample_type : 1; desc.SampleDesc.Quality = wined3d_desc->multisample_quality; - desc.Usage = D3D10_USAGE_DEFAULT; - desc.BindFlags = D3D10_BIND_RENDER_TARGET; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = D3D11_BIND_RENDER_TARGET; desc.CPUAccessFlags = 0; desc.MiscFlags = 0; if (texture_flags & WINED3D_TEXTURE_CREATE_GET_DC) { - desc.MiscFlags |= D3D10_RESOURCE_MISC_GDI_COMPATIBLE; + desc.MiscFlags |= D3D11_RESOURCE_MISC_GDI_COMPATIBLE; texture_flags &= ~WINED3D_TEXTURE_CREATE_GET_DC; } if (texture_flags) FIXME("Unhandled flags %#x.\n", texture_flags); - if (FAILED(hr = d3d10_device_CreateTexture2D(&device->ID3D10Device1_iface, + if (FAILED(hr = d3d11_device_CreateTexture2D(&device->ID3D11Device_iface, &desc, NULL, &texture_iface))) { - WARN("CreateTexture2D failed, returning %#x.\n", hr); + WARN("Failed to create 2D texture, hr %#x.\n", hr); return hr; } - texture = impl_from_ID3D10Texture2D(texture_iface); + texture = impl_from_ID3D11Texture2D(texture_iface); *wined3d_texture = texture->wined3d_texture; wined3d_texture_incref(*wined3d_texture); - ID3D10Texture2D_Release(&texture->ID3D10Texture2D_iface); + ID3D11Texture2D_Release(&texture->ID3D11Texture2D_iface); return S_OK; } @@ -5823,7 +5823,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent TRACE("device_parent %p, desc %p, swapchain %p.\n", device_parent, desc, swapchain); - if (FAILED(hr = d3d10_device_QueryInterface(&device->ID3D10Device1_iface, + if (FAILED(hr = d3d11_device_QueryInterface(&device->ID3D11Device_iface, &IID_IWineDXGIDevice, (void **)&wine_device))) { ERR("Device should implement IWineDXGIDevice.\n"); diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 17fb4b1da37c..2644b52dfa25 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -27,11 +27,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); /* ID3D11Texture2D methods */ -static inline struct d3d_texture2d *impl_from_ID3D11Texture2D(ID3D11Texture2D *iface) -{ - return CONTAINING_RECORD(iface, struct d3d_texture2d, ID3D11Texture2D_iface); -} - static HRESULT STDMETHODCALLTYPE d3d11_texture2d_QueryInterface(ID3D11Texture2D *iface, REFIID riid, void **object) { struct d3d_texture2d *texture = impl_from_ID3D11Texture2D(iface); @@ -251,6 +246,11 @@ struct d3d_texture2d *unsafe_impl_from_ID3D11Texture2D(ID3D11Texture2D *iface) /* IUnknown methods */ +static inline struct d3d_texture2d *impl_from_ID3D10Texture2D(ID3D10Texture2D *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_texture2d, ID3D10Texture2D_iface); +} + static HRESULT STDMETHODCALLTYPE d3d10_texture2d_QueryInterface(ID3D10Texture2D *iface, REFIID riid, void **object) { struct d3d_texture2d *texture = impl_from_ID3D10Texture2D(iface); -- 2.13.6

2 9

[PATCH] winegstreamer: don't set active during test-play
by Anton Romanov 22 Jan '18

22 Jan '18

Even the code above this says it wasn't meant to be set Signed-off-by: Anton Romanov <theli.ua(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index a19c64ff72..0b3db944b9 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1188,7 +1188,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI /* don't set active during test-play, as we don't want to push/pull data * from the source yet */ - gst_pad_set_active(This->my_src, 1); + gst_pad_set_active(This->my_src, 0); This->nextofs = This->nextpullofs = 0; return hr; -- 2.15.1

2 1

[PATCH] user32/edit: Fix EM_SETWORDBREAKPROC return value
by Nikolay Sivov 22 Jan '18

22 Jan '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/edit.c | 32 ++++++++++++++++++++++++++++++++ dlls/user32/edit.c | 1 + dlls/user32/tests/edit.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+) diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 77116837df..262ea72c30 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -2982,6 +2982,37 @@ static void test_EM_GETLINE(void) } } +static int CALLBACK test_wordbreak_procA(char *text, int current, int length, int code) +{ + return -1; +} + +static void test_wordbreak_proc(void) +{ + EDITWORDBREAKPROCA proc; + LRESULT ret; + HWND hwnd; + + hwnd = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + proc = (void *)SendMessageA(hwnd, EM_GETWORDBREAKPROC, 0, 0); + ok(proc == NULL, "Unexpected wordbreak proc %p.\n", proc); + + ret = SendMessageA(hwnd, EM_SETWORDBREAKPROC, 0, (LPARAM)test_wordbreak_procA); + ok(ret == 1, "Unexpected return value %ld.\n", ret); + + proc = (void *)SendMessageA(hwnd, EM_GETWORDBREAKPROC, 0, 0); + ok(proc == test_wordbreak_procA, "Unexpected wordbreak proc %p.\n", proc); + + ret = SendMessageA(hwnd, EM_SETWORDBREAKPROC, 0, 0); + ok(ret == 1, "Unexpected return value %ld.\n", ret); + + proc = (void *)SendMessageA(hwnd, EM_GETWORDBREAKPROC, 0, 0); + ok(proc == NULL, "Unexpected wordbreak proc %p.\n", proc); + + DestroyWindow(hwnd); +} + START_TEST(edit) { ULONG_PTR ctx_cookie; @@ -3022,6 +3053,7 @@ START_TEST(edit) test_EM_GETHANDLE(); test_paste(); test_EM_GETLINE(); + test_wordbreak_proc(); UnregisterWindowClasses(); diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 114d842759..5e161c5dbf 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -4839,6 +4839,7 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B case EM_SETWORDBREAKPROC: EDIT_EM_SetWordBreakProc(es, (void *)lParam); + result = 1; break; case EM_GETWORDBREAKPROC: diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index de8a349e13..01418bf551 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2999,6 +2999,37 @@ static void test_EM_GETLINE(void) } } +static int CALLBACK test_wordbreak_procA(char *text, int current, int length, int code) +{ + return -1; +} + +static void test_wordbreak_proc(void) +{ + EDITWORDBREAKPROCA proc; + LRESULT ret; + HWND hwnd; + + hwnd = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + + proc = (void *)SendMessageA(hwnd, EM_GETWORDBREAKPROC, 0, 0); + ok(proc == NULL, "Unexpected wordbreak proc %p.\n", proc); + + ret = SendMessageA(hwnd, EM_SETWORDBREAKPROC, 0, (LPARAM)test_wordbreak_procA); + ok(ret == 1, "Unexpected return value %ld.\n", ret); + + proc = (void *)SendMessageA(hwnd, EM_GETWORDBREAKPROC, 0, 0); + ok(proc == test_wordbreak_procA, "Unexpected wordbreak proc %p.\n", proc); + + ret = SendMessageA(hwnd, EM_SETWORDBREAKPROC, 0, 0); + ok(ret == 1, "Unexpected return value %ld.\n", ret); + + proc = (void *)SendMessageA(hwnd, EM_GETWORDBREAKPROC, 0, 0); + ok(proc == NULL, "Unexpected wordbreak proc %p.\n", proc); + + DestroyWindow(hwnd); +} + START_TEST(edit) { BOOL b; @@ -3034,6 +3065,7 @@ START_TEST(edit) test_EM_GETHANDLE(); test_paste(); test_EM_GETLINE(); + test_wordbreak_proc(); UnregisterWindowClasses(); } -- 2.15.1

1 0

[PATCH] include: Avoid using parameter names equal to the method names in IDLs.
by Zebediah Figura 22 Jan '18

22 Jan '18

This causes compilation failures when COBJMACROS is used. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/amvideo.idl | 6 +++--- include/control.idl | 2 +- include/msinkaut.idl | 22 +++++++++++----------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/amvideo.idl b/include/amvideo.idl index f3dc45f..7bbed3a 100644 --- a/include/amvideo.idl +++ b/include/amvideo.idl @@ -77,11 +77,11 @@ interface IDirectDrawVideo : IUnknown HRESULT GetDirectDraw([out] IDirectDraw **ddraw); HRESULT GetSurfaceType([out] DWORD * pSurfaceType); HRESULT SetDefault(); - HRESULT UseScanLine([in] long UseScanLine); + HRESULT UseScanLine([in] long use); HRESULT CanUseScanLine([out] long * UseScanLine); - HRESULT UseOverlayStretch([in] long UseOverlayStretch); + HRESULT UseOverlayStretch([in] long use); HRESULT CanUseOverlayStretch([out] long * UseOverlayStretch); - HRESULT UseWhenFullScreen([in] long UseWhenFullScreen); + HRESULT UseWhenFullScreen([in] long use); HRESULT WillUseFullScreen([out] long * UseWhenFullScreen); } diff --git a/include/control.idl b/include/control.idl index 529d435..2d32161 100644 --- a/include/control.idl +++ b/include/control.idl @@ -122,7 +122,7 @@ library QuartzTypeLib HRESULT GetMinIdealImageSize( [out] LONG *pWidth, [out] LONG *pHeight ); HRESULT GetMaxIdealImageSize( [out] LONG *pWidth, [out] LONG *pHeight ); HRESULT GetRestorePosition( [out] LONG *pLeft, [out] LONG *pTop, [out] LONG *pWidth, [out] LONG *pHeight ); - HRESULT HideCursor( [in] LONG HideCursor ); + HRESULT HideCursor( [in] LONG hide ); HRESULT IsCursorHidden( [out] LONG *CursorHidden ); } diff --git a/include/msinkaut.idl b/include/msinkaut.idl index 743dec8..4c30481 100644 --- a/include/msinkaut.idl +++ b/include/msinkaut.idl @@ -127,11 +127,11 @@ library MSINKAUTLib oleautomation ] interface IInkExtendedProperties : IDispatch { - HRESULT Count([out, retval] long* Count); - HRESULT _NewEnum([out, retval] IUnknown** _NewEnum); + HRESULT Count([out, retval] long* count); + HRESULT _NewEnum([out, retval] IUnknown** new_enum); HRESULT Item( [in] VARIANT Identifier, - [out, retval] IInkExtendedProperty** Item); + [out, retval] IInkExtendedProperty** item); HRESULT Add( [in] BSTR Guid, [in] VARIANT Data, @@ -140,7 +140,7 @@ library MSINKAUTLib HRESULT Clear(); HRESULT DoesPropertyExist( [in] BSTR Guid, - [out, retval] VARIANT_BOOL* DoesPropertyExist); + [out, retval] VARIANT_BOOL* exists); } [ @@ -393,7 +393,7 @@ cpp_quote("#endif /* _WINGDI_ */") [in, defaultvalue(0)] long FittingError, [out, retval] VARIANT* FlattenedBezierPoints); [id(0x0000001d)] HRESULT Transform( - [in] IInkTransform* Transform, + [in] IInkTransform* transform, [in, defaultvalue(0)] VARIANT_BOOL ApplyOnPenWidth); [id(0x0000001c)] HRESULT ScaleToRectangle( [in] IInkRectangle* Rectangle); @@ -430,7 +430,7 @@ cpp_quote("#endif /* _WINGDI_ */") [propget] HRESULT RecognitionResult( [out, retval] IInkRecognitionResult **RecognitionResult); HRESULT ToString( - [out, retval] BSTR *ToString); + [out, retval] BSTR *str); HRESULT Item( [in] long Index, [out, retval] IInkStrokeDisp **Stroke); @@ -448,7 +448,7 @@ cpp_quote("#endif /* _WINGDI_ */") [in] InkBoundingBoxMode BoundingBoxMode, [out, retval] IInkRectangle **BoundingBox); HRESULT Transform( - [in] IInkTransform *Transform, + [in] IInkTransform *transform, [in] VARIANT_BOOL ApplyOnPenWidth); HRESULT ScaleToRectangle( [in] IInkRectangle *Rectangle); @@ -514,7 +514,7 @@ cpp_quote("#endif /* _WINGDI_ */") [in] long selectionStart, [in] long selectionLength, [in] long maximumAlternates, - [out, retval] IInkRecognitionAlternates **AlternatesFromSelection); + [out, retval] IInkRecognitionAlternates **alternates); HRESULT ModifyTopAlternate( [in] IInkRecognitionAlternate *Alternate); HRESULT SetResultOnStrokes(); @@ -553,14 +553,14 @@ cpp_quote("#endif /* _WINGDI_ */") HRESULT GetStrokesFromTextRange( [in, out] long *selectionStart, [in, out] long *selectionLength, - [out, retval] IInkStrokes **GetStrokesFromTextRange); + [out, retval] IInkStrokes **strokes); HRESULT GetTextRangeFromStrokes( [in] IInkStrokes *Strokes, [in, out] long *selectionStart, [in, out] long *selectionLength); HRESULT AlternatesWithConstantPropertyValues( [in] BSTR PropertyType, - [out, retval] IInkRecognitionAlternates **AlternatesWithConstantPropertyValues); + [out, retval] IInkRecognitionAlternates **alternates); HRESULT GetPropertyValue( [in] BSTR PropertyType, [out, retval] VARIANT *PropertyValue); @@ -668,7 +668,7 @@ cpp_quote("#endif /* _WINGDI_ */") [out, retval] IDataObject **DataObject); HRESULT CanPaste( [in] IDataObject *DataObject, - [out, retval] VARIANT_BOOL *CanPaste); + [out, retval] VARIANT_BOOL *can_paste); HRESULT ClipboardPaste( [in] long x, [in] long y, -- 2.7.4

3 2

[PATCH 2/2] d2d1: Introduce a registry key to limit the maximum supported factory version.
by Henri Verbeet 22 Jan '18

22 Jan '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/Makefile.in | 2 +- dlls/d2d1/d2d1_private.h | 6 ++++ dlls/d2d1/factory.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 51b9627..20d3f26 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -1,6 +1,6 @@ MODULE = d2d1.dll IMPORTLIB = d2d1 -IMPORTS = d3d10_1 dxguid uuid gdi32 user32 +IMPORTS = d3d10_1 dxguid uuid gdi32 user32 advapi32 DELAYIMPORTS = dwrite C_SRCS = \ diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 3b21bc1..f876cbf 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -52,6 +52,12 @@ enum d2d_shape_type D2D_SHAPE_TYPE_COUNT, }; +struct d2d_settings +{ + unsigned int max_version_factory; +}; +extern struct d2d_settings d2d_settings DECLSPEC_HIDDEN; + struct d2d_clip_stack { D2D1_RECT_F *stack; diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index da2b892..f202332 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -22,8 +22,14 @@ #define D2D1_INIT_GUID #include "d2d1_private.h" +WINE_DECLARE_DEBUG_CHANNEL(winediag); WINE_DEFAULT_DEBUG_CHANNEL(d2d); +struct d2d_settings d2d_settings = +{ + ~0u, /* No ID2D1Factory version limit by default. */ +}; + struct d2d_factory { ID2D1Factory1 ID2D1Factory1_iface; @@ -62,7 +68,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory1 *iface { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - if (IsEqualGUID(iid, &IID_ID2D1Factory1) + if ((IsEqualGUID(iid, &IID_ID2D1Factory1) && d2d_settings.max_version_factory >= 1) || IsEqualGUID(iid, &IID_ID2D1Factory) || IsEqualGUID(iid, &IID_IUnknown)) { @@ -537,3 +543,71 @@ void WINAPI D2D1MakeRotateMatrix(float angle, D2D1_POINT_2F center, D2D1_MATRIX_ matrix->_31 = center.x - center.x * cos_theta + center.y * sin_theta; matrix->_32 = center.y - center.x * sin_theta - center.y * cos_theta; } + +static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) +{ + DWORD type, data, size; + + size = sizeof(data); + if (application_key && !RegQueryValueExA(application_key, + name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) + goto success; + + size = sizeof(data); + if (default_key && !RegQueryValueExA(default_key, + name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) + goto success; + + return FALSE; + +success: + *value = data; + return TRUE; +} + +static void d2d_settings_init(void) +{ + HKEY default_key, tmp_key, application_key = NULL; + char buffer[MAX_PATH + 10]; + DWORD len; + + if (RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Direct2D", &default_key)) + default_key = NULL; + + len = GetModuleFileNameA(0, buffer, MAX_PATH); + if (len && len < MAX_PATH) + { + char *p, *appname = buffer; + + if ((p = strrchr(appname, '/'))) + appname = p + 1; + if ((p = strrchr(appname, '\\'))) + appname = p + 1; + strcat(appname, "\\Direct2D"); + + if (!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\AppDefaults", &tmp_key)) + { + if (RegOpenKeyA(tmp_key, appname, &application_key)) + application_key = NULL; + RegCloseKey(tmp_key); + } + } + + if (!default_key && !application_key) + return; + + if (get_config_key_dword(default_key, application_key, "max_version_factory", &d2d_settings.max_version_factory)) + ERR_(winediag)("Limiting maximum Direct2D factory version to %#x.\n", d2d_settings.max_version_factory); + + if (application_key) + RegCloseKey(application_key); + if (default_key) + RegCloseKey(default_key); +} + +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + d2d_settings_init(); + return TRUE; +} -- 2.1.4

3 2

[PATCH 1/2] d2d1: Implement ID2D1Factory1.
by Henri Verbeet 22 Jan '18

22 Jan '18

From: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/factory.c | 182 ++++++++++++++++++++++++++++++++++++----------- dlls/uuid/d2d.c | 2 +- include/d2d1_1.idl | 136 +++++++++++++++++++++++++++++++++++ 4 files changed, 278 insertions(+), 44 deletions(-) create mode 100644 include/d2d1_1.idl diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 98298f8..3b21bc1 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -24,7 +24,7 @@ #include <assert.h> #include <limits.h> #define COBJMACROS -#include "d2d1.h" +#include "d2d1_1.h" #ifdef D2D1_INIT_GUID #include "initguid.h" #endif diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 4b9315f..da2b892 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); struct d2d_factory { - ID2D1Factory ID2D1Factory_iface; + ID2D1Factory1 ID2D1Factory1_iface; LONG refcount; ID3D10Device1 *device; @@ -35,9 +35,9 @@ struct d2d_factory float dpi_y; }; -static inline struct d2d_factory *impl_from_ID2D1Factory(ID2D1Factory *iface) +static inline struct d2d_factory *impl_from_ID2D1Factory1(ID2D1Factory1 *iface) { - return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Factory_iface); + return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Factory1_iface); } static HRESULT d2d_factory_reload_sysmetrics(struct d2d_factory *factory) @@ -58,14 +58,15 @@ static HRESULT d2d_factory_reload_sysmetrics(struct d2d_factory *factory) return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory *iface, REFIID iid, void **out) +static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory1 *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - if (IsEqualGUID(iid, &IID_ID2D1Factory) + if (IsEqualGUID(iid, &IID_ID2D1Factory1) + || IsEqualGUID(iid, &IID_ID2D1Factory) || IsEqualGUID(iid, &IID_IUnknown)) { - ID2D1Factory_AddRef(iface); + ID2D1Factory1_AddRef(iface); *out = iface; return S_OK; } @@ -76,9 +77,9 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory *iface, return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d2d_factory_AddRef(ID2D1Factory *iface) +static ULONG STDMETHODCALLTYPE d2d_factory_AddRef(ID2D1Factory1 *iface) { - struct d2d_factory *factory = impl_from_ID2D1Factory(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); ULONG refcount = InterlockedIncrement(&factory->refcount); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -86,9 +87,9 @@ static ULONG STDMETHODCALLTYPE d2d_factory_AddRef(ID2D1Factory *iface) return refcount; } -static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory *iface) +static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory1 *iface) { - struct d2d_factory *factory = impl_from_ID2D1Factory(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); ULONG refcount = InterlockedDecrement(&factory->refcount); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -103,18 +104,18 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory *iface) return refcount; } -static HRESULT STDMETHODCALLTYPE d2d_factory_ReloadSystemMetrics(ID2D1Factory *iface) +static HRESULT STDMETHODCALLTYPE d2d_factory_ReloadSystemMetrics(ID2D1Factory1 *iface) { - struct d2d_factory *factory = impl_from_ID2D1Factory(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); TRACE("iface %p.\n", iface); return d2d_factory_reload_sysmetrics(factory); } -static void STDMETHODCALLTYPE d2d_factory_GetDesktopDpi(ID2D1Factory *iface, float *dpi_x, float *dpi_y) +static void STDMETHODCALLTYPE d2d_factory_GetDesktopDpi(ID2D1Factory1 *iface, float *dpi_x, float *dpi_y) { - struct d2d_factory *factory = impl_from_ID2D1Factory(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); TRACE("iface %p, dpi_x %p, dpi_y %p.\n", iface, dpi_x, dpi_y); @@ -122,7 +123,7 @@ static void STDMETHODCALLTYPE d2d_factory_GetDesktopDpi(ID2D1Factory *iface, flo *dpi_y = factory->dpi_y; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factory1 *iface, const D2D1_RECT_F *rect, ID2D1RectangleGeometry **geometry) { struct d2d_geometry *object; @@ -133,7 +134,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factor if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_rectangle_geometry_init(object, iface, rect))) + if (FAILED(hr = d2d_rectangle_geometry_init(object, (ID2D1Factory *)iface, rect))) { WARN("Failed to initialize rectangle geometry, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -146,7 +147,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factor return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRoundedRectangleGeometry(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRoundedRectangleGeometry(ID2D1Factory1 *iface, const D2D1_ROUNDED_RECT *rect, ID2D1RoundedRectangleGeometry **geometry) { FIXME("iface %p, rect %p, geometry %p stub!\n", iface, rect, geometry); @@ -154,7 +155,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRoundedRectangleGeometry(ID2D return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateEllipseGeometry(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateEllipseGeometry(ID2D1Factory1 *iface, const D2D1_ELLIPSE *ellipse, ID2D1EllipseGeometry **geometry) { FIXME("iface %p, ellipse %p, geometry %p stub!\n", iface, ellipse, geometry); @@ -162,7 +163,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateEllipseGeometry(ID2D1Factory return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory1 *iface, D2D1_FILL_MODE fill_mode, ID2D1Geometry **geometries, UINT32 geometry_count, ID2D1GeometryGroup **group) { FIXME("iface %p, fill_mode %#x, geometries %p, geometry_count %u, group %p stub!\n", @@ -171,7 +172,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory *i return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Factory1 *iface, ID2D1Geometry *src_geometry, const D2D1_MATRIX_3X2_F *transform, ID2D1TransformedGeometry **transformed_geometry) { @@ -183,7 +184,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Fact if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - d2d_transformed_geometry_init(object, iface, src_geometry, transform); + d2d_transformed_geometry_init(object, (ID2D1Factory *)iface, src_geometry, transform); TRACE("Created transformed geometry %p.\n", object); *transformed_geometry = (ID2D1TransformedGeometry *)&object->ID2D1Geometry_iface; @@ -191,7 +192,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Fact return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory *iface, ID2D1PathGeometry **geometry) +static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory1 *iface, ID2D1PathGeometry **geometry) { struct d2d_geometry *object; @@ -200,7 +201,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory *if if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - d2d_path_geometry_init(object, iface); + d2d_path_geometry_init(object, (ID2D1Factory *)iface); TRACE("Created path geometry %p.\n", object); *geometry = (ID2D1PathGeometry *)&object->ID2D1Geometry_iface; @@ -208,7 +209,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory *if return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory1 *iface, const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count, ID2D1StrokeStyle **stroke_style) { @@ -221,7 +222,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory *ifa if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_stroke_style_init(object, iface, desc, dashes, dash_count))) + if (FAILED(hr = d2d_stroke_style_init(object, (ID2D1Factory *)iface, desc, dashes, dash_count))) { WARN("Failed to initialize stroke style, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -234,7 +235,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory *ifa return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factory1 *iface, const D2D1_DRAWING_STATE_DESCRIPTION *desc, IDWriteRenderingParams *text_rendering_params, ID2D1DrawingStateBlock **state_block) { @@ -246,7 +247,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factor if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - d2d_state_block_init(object, iface, desc, text_rendering_params); + d2d_state_block_init(object, (ID2D1Factory *)iface, desc, text_rendering_params); TRACE("Created state block %p.\n", object); *state_block = &object->ID2D1DrawingStateBlock_iface; @@ -266,10 +267,10 @@ static HRESULT d2d_factory_get_device(struct d2d_factory *factory, ID3D10Device1 return hr; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Factory1 *iface, IWICBitmap *target, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) { - struct d2d_factory *factory = impl_from_ID2D1Factory(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); struct d2d_wic_render_target *object; ID3D10Device1 *device; HRESULT hr; @@ -285,7 +286,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Fa return hr; } - if (FAILED(hr = d2d_wic_render_target_init(object, iface, device, target, desc))) + if (FAILED(hr = d2d_wic_render_target_init(object, (ID2D1Factory *)iface, device, target, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -298,11 +299,11 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Fa return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory1 *iface, const D2D1_RENDER_TARGET_PROPERTIES *desc, const D2D1_HWND_RENDER_TARGET_PROPERTIES *hwnd_rt_desc, ID2D1HwndRenderTarget **render_target) { - struct d2d_factory *factory = impl_from_ID2D1Factory(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); struct d2d_hwnd_render_target *object; ID3D10Device1 *device; HRESULT hr; @@ -315,7 +316,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_hwnd_render_target_init(object, iface, device, desc, hwnd_rt_desc))) + if (FAILED(hr = d2d_hwnd_render_target_init(object, (ID2D1Factory *)iface, device, desc, hwnd_rt_desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -328,18 +329,18 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1Factory1 *iface, IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) { TRACE("iface %p, surface %p, desc %p, render_target %p.\n", iface, surface, desc, render_target); - return d2d_d3d_create_render_target(iface, surface, NULL, desc, render_target); + return d2d_d3d_create_render_target((ID2D1Factory *)iface, surface, NULL, desc, render_target); } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory1 *iface, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1DCRenderTarget **render_target) { - struct d2d_factory *factory = impl_from_ID2D1Factory(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); struct d2d_dc_render_target *object; ID3D10Device1 *device; HRESULT hr; @@ -352,7 +353,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory * if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_dc_render_target_init(object, iface, device, desc))) + if (FAILED(hr = d2d_dc_render_target_init(object, (ID2D1Factory *)iface, device, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -365,7 +366,94 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory * return S_OK; } -static const struct ID2D1FactoryVtbl d2d_factory_vtbl = +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDevice(ID2D1Factory1 *iface, + IDXGIDevice *dxgi_device, ID2D1Device **device) +{ + FIXME("iface %p, dxgi_device %p, device %p stub!\n", iface, dxgi_device, device); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory1 *iface, + const D2D1_STROKE_STYLE_PROPERTIES1 *desc, const float *dashes, UINT32 dash_count, + ID2D1StrokeStyle1 **stroke_style) +{ + FIXME("iface %p, desc %p, dashes %p, dash_count %u, stroke_style %p stub!\n", + iface, desc, dashes, dash_count, stroke_style); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry1(ID2D1Factory1 *iface, ID2D1PathGeometry1 **geometry) +{ + FIXME("iface %p, geometry %p stub!\n", iface, geometry); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock1(ID2D1Factory1 *iface, + const D2D1_DRAWING_STATE_DESCRIPTION1 *desc, IDWriteRenderingParams *text_rendering_params, + ID2D1DrawingStateBlock1 **state_block) +{ + FIXME("iface %p, desc %p, text_rendering_params %p, state_block %p stub!\n", + iface, desc, text_rendering_params, state_block); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGdiMetafile(ID2D1Factory1 *iface, + IStream *stream, ID2D1GdiMetafile **metafile) +{ + FIXME("iface %p, stream %p, metafile %p stub!\n", iface, stream, metafile); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromStream(ID2D1Factory1 *iface, + REFCLSID effect_id, IStream *property_xml, const D2D1_PROPERTY_BINDING *bindings, + UINT32 binding_count, PD2D1_EFFECT_FACTORY effect_factory) +{ + FIXME("iface %p, effect_id %s, property_xml %p, bindings %p, binding_count %u, effect_factory %p stub!\n", + iface, debugstr_guid(effect_id), property_xml, bindings, binding_count, effect_factory); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromString(ID2D1Factory1 *iface, + REFCLSID effect_id, const WCHAR *property_xml, const D2D1_PROPERTY_BINDING *bindings, + UINT32 binding_count, PD2D1_EFFECT_FACTORY effect_factory) +{ + FIXME("iface %p, effect_id %s, property_xml %s, bindings %p, binding_count %u, effect_factory %p stub!\n", + iface, debugstr_guid(effect_id), debugstr_w(property_xml), bindings, binding_count, effect_factory); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_UnregisterEffect(ID2D1Factory1 *iface, REFCLSID effect_id) +{ + FIXME("iface %p, effect_id %s stub!\n", iface, debugstr_guid(effect_id)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_GetRegisteredEffects(ID2D1Factory1 *iface, + CLSID *effects, UINT32 effect_count, UINT32 *returned, UINT32 *registered) +{ + FIXME("iface %p, effects %p, effect_count %u, returned %p, registered %p stub!\n", + iface, effects, effect_count, returned, registered); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_GetEffectProperties(ID2D1Factory1 *iface, + REFCLSID effect_id, ID2D1Properties **props) +{ + FIXME("iface %p, effect_id %s, props %p stub!\n", iface, debugstr_guid(effect_id), props); + + return E_NOTIMPL; +} + +static const struct ID2D1Factory1Vtbl d2d_factory_vtbl = { d2d_factory_QueryInterface, d2d_factory_AddRef, @@ -384,6 +472,16 @@ static const struct ID2D1FactoryVtbl d2d_factory_vtbl = d2d_factory_CreateHwndRenderTarget, d2d_factory_CreateDxgiSurfaceRenderTarget, d2d_factory_CreateDCRenderTarget, + d2d_factory_CreateDevice, + d2d_factory_CreateStrokeStyle1, + d2d_factory_CreatePathGeometry1, + d2d_factory_CreateDrawingStateBlock1, + d2d_factory_CreateGdiMetafile, + d2d_factory_RegisterEffectFromStream, + d2d_factory_RegisterEffectFromString, + d2d_factory_UnregisterEffect, + d2d_factory_GetRegisteredEffects, + d2d_factory_GetEffectProperties, }; static void d2d_factory_init(struct d2d_factory *factory, D2D1_FACTORY_TYPE factory_type, @@ -394,7 +492,7 @@ static void d2d_factory_init(struct d2d_factory *factory, D2D1_FACTORY_TYPE fact if (factory_options && factory_options->debugLevel != D2D1_DEBUG_LEVEL_NONE) WARN("Ignoring debug level %#x.\n", factory_options->debugLevel); - factory->ID2D1Factory_iface.lpVtbl = &d2d_factory_vtbl; + factory->ID2D1Factory1_iface.lpVtbl = &d2d_factory_vtbl; factory->refcount = 1; d2d_factory_reload_sysmetrics(factory); } @@ -415,8 +513,8 @@ HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, TRACE("Created factory %p.\n", object); - hr = ID2D1Factory_QueryInterface(&object->ID2D1Factory_iface, iid, factory); - ID2D1Factory_Release(&object->ID2D1Factory_iface); + hr = ID2D1Factory1_QueryInterface(&object->ID2D1Factory1_iface, iid, factory); + ID2D1Factory1_Release(&object->ID2D1Factory1_iface); return hr; } diff --git a/dlls/uuid/d2d.c b/dlls/uuid/d2d.c index dbe143e..d2cf6db 100644 --- a/dlls/uuid/d2d.c +++ b/dlls/uuid/d2d.c @@ -18,4 +18,4 @@ #include "d3d10_1.h" #include "initguid.h" -#include "d2d1.h" +#include "d2d1_1.h" diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl new file mode 100644 index 0000000..1fbbb30 --- /dev/null +++ b/include/d2d1_1.idl @@ -0,0 +1,136 @@ +/* + * Copyright 2017 Lucian Poston + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "d2d1.idl"; + +interface ID2D1Device; +interface ID2D1StrokeStyle1; +interface ID2D1PathGeometry1; +interface ID2D1DrawingStateBlock1; +interface ID2D1GdiMetafile; +interface ID2D1Properties; + +typedef enum D2D1_STROKE_TRANSFORM_TYPE +{ + D2D1_STROKE_TRANSFORM_TYPE_NORMAL = 0x0, + D2D1_STROKE_TRANSFORM_TYPE_FIXED = 0x1, + D2D1_STROKE_TRANSFORM_TYPE_HAIRLINE = 0x2, + D2D1_STROKE_TRANSFORM_TYPE_FORCE_DWORD = 0xffffffff, +} D2D1_STROKE_TRANSFORM_TYPE; + +typedef enum D2D1_PRIMITIVE_BLEND +{ + D2D1_PRIMITIVE_BLEND_SOURCE_OVER = 0x0, + D2D1_PRIMITIVE_BLEND_COPY = 0x1, + D2D1_PRIMITIVE_BLEND_MIN = 0x2, + D2D1_PRIMITIVE_BLEND_ADD = 0x3, + D2D1_PRIMITIVE_BLEND_MAX = 0x4, + D2D1_PRIMITIVE_BLEND_FORCE_DWORD = 0xffffffff, +} D2D1_PRIMITIVE_BLEND; + +typedef enum D2D1_UNIT_MODE +{ + D2D1_UNIT_MODE_DIPS = 0x0, + D2D1_UNIT_MODE_PIXELS = 0x1, + D2D1_UNIT_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_UNIT_MODE; + +typedef struct D2D1_PROPERTY_BINDING D2D1_PROPERTY_BINDING; + +typedef struct D2D1_STROKE_STYLE_PROPERTIES1 +{ + D2D1_CAP_STYLE startCap; + D2D1_CAP_STYLE endCap; + D2D1_CAP_STYLE dashCap; + D2D1_LINE_JOIN lineJoin; + float miterLimit; + D2D1_DASH_STYLE dashStyle; + float dashOffset; + D2D1_STROKE_TRANSFORM_TYPE transformType; +} D2D1_STROKE_STYLE_PROPERTIES1; + +typedef struct D2D1_DRAWING_STATE_DESCRIPTION1 +{ + D2D1_ANTIALIAS_MODE antialiasMode; + D2D1_TEXT_ANTIALIAS_MODE textAntialiasMode; + D2D1_TAG tag1; + D2D1_TAG tag2; + D2D1_MATRIX_3X2_F transform; + D2D1_PRIMITIVE_BLEND primitiveBlend; + D2D1_UNIT_MODE unitMode; +} D2D1_DRAWING_STATE_DESCRIPTION1; + +typedef HRESULT (__stdcall *PD2D1_EFFECT_FACTORY)(IUnknown **effect); + +[ + object, + uuid(bb12d362-daee-4b9a-aa1d-14ba401cfa1f), + local, +] +interface ID2D1Factory1 : ID2D1Factory +{ + HRESULT CreateDevice( + [in] IDXGIDevice *dxgi_device, + [out] ID2D1Device **device + ); + HRESULT CreateStrokeStyle( + [in] const D2D1_STROKE_STYLE_PROPERTIES1 *desc, + [in, size_is(dash_count)] const float *dashes, + [in] UINT32 dash_count, + [out] ID2D1StrokeStyle1 **stroke_style + ); + HRESULT CreatePathGeometry( + [out] ID2D1PathGeometry1 **geometry + ); + HRESULT CreateDrawingStateBlock( + [in] const D2D1_DRAWING_STATE_DESCRIPTION1 *desc, + [in] IDWriteRenderingParams *text_rendering_params, + [out] ID2D1DrawingStateBlock1 **state_block + ); + HRESULT CreateGdiMetafile( + [in] IStream *stream, + [out] ID2D1GdiMetafile **metafile + ); + HRESULT RegisterEffectFromStream( + [in] REFCLSID effect_id, + [in] IStream *property_xml, + [in, size_is(binding_count)] const D2D1_PROPERTY_BINDING *bindings, + [in] UINT32 binding_count, + [in] PD2D1_EFFECT_FACTORY effect_factory + ); + HRESULT RegisterEffectFromString( + [in] REFCLSID effect_id, + [in] const WCHAR *property_xml, + [in, size_is(binding_count)] const D2D1_PROPERTY_BINDING *bindings, + [in] UINT32 binding_count, + [in] PD2D1_EFFECT_FACTORY effect_factory + ); + HRESULT UnregisterEffect( + [in] REFCLSID effect_id + ); + HRESULT GetRegisteredEffects( + [out, size_is(effect_count)] CLSID *effects, + [in] UINT32 effect_count, + [out] UINT32 *returned, + [out] UINT32 *registered + ); + HRESULT GetEffectProperties( + [in] REFCLSID effect_id, + [out] ID2D1Properties **props + ); +} -- 2.1.4

1 0

[Translation] Wine trranslations into Korean .po patch
by 김건우 22 Jan '18

22 Jan '18

1 0

[PATCH] gdi32: Don't bother using the return value of HeapFree().
by Huw Davies 22 Jan '18

22 Jan '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/bitmap.c | 3 ++- dlls/gdi32/brush.c | 3 ++- dlls/gdi32/dib.c | 3 ++- dlls/gdi32/dibdrv/opengl.c | 3 ++- dlls/gdi32/enhmetafile.c | 3 ++- dlls/gdi32/font.c | 3 ++- dlls/gdi32/metafile.c | 4 +++- dlls/gdi32/palette.c | 3 ++- dlls/gdi32/pen.c | 3 ++- 9 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 768911a5a4..c16793d82b 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -489,7 +489,8 @@ static BOOL BITMAP_DeleteObject( HGDIOBJ handle ) if (!bmp) return FALSE; HeapFree( GetProcessHeap(), 0, bmp->dib.dsBm.bmBits ); - return HeapFree( GetProcessHeap(), 0, bmp ); + HeapFree( GetProcessHeap(), 0, bmp ); + return TRUE; } diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 3c112439fe..7d13649305 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -467,7 +467,8 @@ static BOOL BRUSH_DeleteObject( HGDIOBJ handle ) if (!brush) return FALSE; free_brush_pattern( &brush->pattern ); - return HeapFree( GetProcessHeap(), 0, brush ); + HeapFree( GetProcessHeap(), 0, brush ); + return TRUE; } diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 2eb0e91aa3..c7dcdb122c 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -1831,5 +1831,6 @@ static BOOL DIB_DeleteObject( HGDIOBJ handle ) else VirtualFree( bmp->dib.dsBm.bmBits, 0, MEM_RELEASE ); HeapFree(GetProcessHeap(), 0, bmp->color_table); - return HeapFree( GetProcessHeap(), 0, bmp ); + HeapFree( GetProcessHeap(), 0, bmp ); + return TRUE; } diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c index 20cfc02398..dba5db0356 100644 --- a/dlls/gdi32/dibdrv/opengl.c +++ b/dlls/gdi32/dibdrv/opengl.c @@ -217,7 +217,8 @@ static struct wgl_context *dibdrv_wglCreateContext( HDC hdc ) static BOOL dibdrv_wglDeleteContext( struct wgl_context *context ) { pOSMesaDestroyContext( context->context ); - return HeapFree( GetProcessHeap(), 0, context ); + HeapFree( GetProcessHeap(), 0, context ); + return TRUE; } /*********************************************************************** diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 111fa436bd..37edc231a3 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -287,7 +287,8 @@ static BOOL EMF_Delete_HENHMETAFILE( HENHMETAFILE hmf ) UnmapViewOfFile( metaObj->emh ); else HeapFree( GetProcessHeap(), 0, metaObj->emh ); - return HeapFree( GetProcessHeap(), 0, metaObj ); + HeapFree( GetProcessHeap(), 0, metaObj ); + return TRUE; } /****************************************************************** diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index d059f97c24..17b160d2dc 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -811,7 +811,8 @@ static BOOL FONT_DeleteObject( HGDIOBJ handle ) FONTOBJ *obj; if (!(obj = free_gdi_handle( handle ))) return FALSE; - return HeapFree( GetProcessHeap(), 0, obj ); + HeapFree( GetProcessHeap(), 0, obj ); + return TRUE; } diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index c7e25a7fa8..28ad53cf57 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -135,8 +135,10 @@ static POINT *convert_points( UINT count, const POINTS *pts ) BOOL WINAPI DeleteMetaFile( HMETAFILE hmf ) { METAHEADER *mh = free_gdi_handle( hmf ); + if (!mh) return FALSE; - return HeapFree( GetProcessHeap(), 0, mh ); + HeapFree( GetProcessHeap(), 0, mh ); + return TRUE; } /****************************************************************** diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index a8135d5a37..52bd0d30bb 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -610,7 +610,8 @@ static BOOL PALETTE_DeleteObject( HGDIOBJ handle ) PALETTE_UnrealizeObject( handle ); if (!(obj = free_gdi_handle( handle ))) return FALSE; HeapFree( GetProcessHeap(), 0, obj->entries ); - return HeapFree( GetProcessHeap(), 0, obj ); + HeapFree( GetProcessHeap(), 0, obj ); + return TRUE; } diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index d6c1dc4576..fa789e4cf9 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -279,7 +279,8 @@ static BOOL PEN_DeleteObject( HGDIOBJ handle ) if (!pen) return FALSE; free_brush_pattern( &pen->pattern ); - return HeapFree( GetProcessHeap(), 0, pen ); + HeapFree( GetProcessHeap(), 0, pen ); + return TRUE; } -- 2.12.0

1 0

[PATCH] windowscodecs: Fix memory leak.
by Andrey Gusev 22 Jan '18

22 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/windowscodecs/stream.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index 308ef8e02b..1fb3967b32 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -1009,8 +1009,10 @@ static HRESULT map_file(HANDLE file, HANDLE *map, void **mem, LARGE_INTEGER *siz if (!(*mem = MapViewOfFile(*map, FILE_MAP_READ, 0, 0, size->u.LowPart))) { CloseHandle(*map); + UnmapViewOfFile(mem); return HRESULT_FROM_WIN32(GetLastError()); } + UnmapViewOfFile(mem); return S_OK; } -- 2.13.6

2 1

[PATCH] msi: Write registry values for source components too.
by Hans Leidekker 22 Jan '18

22 Jan '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/action.c | 2 +- dlls/msi/tests/action.c | 36 +++++++++++++++++++++++++++++++----- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 54295a351c..71e45e8967 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2872,7 +2872,7 @@ static UINT ITERATE_WriteRegistryValues(MSIRECORD *row, LPVOID param) return ERROR_SUCCESS; comp->Action = msi_get_component_action( package, comp ); - if (comp->Action != INSTALLSTATE_LOCAL) + if (comp->Action != INSTALLSTATE_LOCAL && comp->Action != INSTALLSTATE_SOURCE) { TRACE("component not scheduled for installation %s\n", debugstr_w(component)); return ERROR_SUCCESS; diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 11e244c6e2..31cc9819b0 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -506,7 +506,22 @@ static const char wrv_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" "Component\tComponent\n" - "augustus\t\tMSITESTDIR\t0\t\taugustus\n"; + "augustus\t\tMSITESTDIR\t0\t\taugustus\n" + "caesar\t\tMSITESTDIR\t1\t\t\n"; + +static const char wrv_feature_dat[] = + "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "feature\t\tFeature\tFeature\t2\t1\tTARGETDIR\t0\n" + "feature2\t\tFeature2\tFeature2\t2\t1\tTARGETDIR\t1"; + +static const char wrv_feature_comp_dat[] = + "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "feature\taugustus\n" + "feature2\tcaesar"; static const char wrv_registry_dat[] = "Registry\tRoot\tKey\tName\tValue\tComponent_\n" @@ -527,7 +542,8 @@ static const char wrv_registry_dat[] = "regdata12\t2\tSOFTWARE\\Wine\\msitest\tValue8\t#1\taugustus\n" "regdata13\t2\tSOFTWARE\\Wine\\msitest\tValue9\t#x1\taugustus\n" "regdata14\t2\tSOFTWARE\\Wine\\msitest\tValue10\t#x01\taugustus\n" - "regdata15\t2\tSOFTWARE\\Wine\\msitest\tValue11\t[regdata15]\taugustus\n"; + "regdata15\t2\tSOFTWARE\\Wine\\msitest\tValue11\t[regdata15]\taugustus\n" + "regdata16\t2\tSOFTWARE\\Wine\\msitest\tValue12\t#1\tcaesar\n"; static const char cf_directory_dat[] = "Directory\tDirectory_Parent\tDefaultDir\n" @@ -1752,8 +1768,8 @@ static const msi_table wrv_tables[] = { ADD_TABLE(wrv_component), ADD_TABLE(directory), - ADD_TABLE(rof_feature), - ADD_TABLE(ci2_feature_comp), + ADD_TABLE(wrv_feature), + ADD_TABLE(wrv_feature_comp), ADD_TABLE(ci2_file), ADD_TABLE(install_exec_seq), ADD_TABLE(rof_media), @@ -4988,7 +5004,7 @@ static void test_write_registry_values(void) goto error; } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\augustus", TRUE), "File installed\n"); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); if (is_64bit) @@ -5111,6 +5127,15 @@ static void test_write_registry_values(void) ok(size == 1, "got %u\n", size); ok(type == REG_BINARY, "got %u\n", type); + size = sizeof(buf); + type = 0xdeadbeef; + memset(buf, 0, size); + res = RegQueryValueExA(hkey, "Value12", NULL, &type, buf, &size); + ok(res == ERROR_SUCCESS, "got %u\n", res); + ok(*(DWORD *)buf == 1, "got %u\n", *(DWORD *)buf); + ok(size == 4, "got %u\n", size); + ok(type == REG_DWORD, "got %u\n", type); + RegDeleteValueA(hkey, "Value"); RegDeleteValueA(hkey, "Value1"); RegDeleteValueA(hkey, "Value2"); @@ -5123,6 +5148,7 @@ static void test_write_registry_values(void) RegDeleteValueA(hkey, "Value9"); RegDeleteValueA(hkey, "Value10"); RegDeleteValueA(hkey, "Value11"); + RegDeleteValueA(hkey, "Value12"); RegCloseKey(hkey); RegDeleteKeyA(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest"); -- 2.11.0

1 0

[PATCH] dnsapi: Use default server list if passed in array is empty.
by Hans Leidekker 22 Jan '18

22 Jan '18

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dnsapi/query.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index a66db37e9e..74b70967ae 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -547,6 +547,7 @@ static DNS_STATUS dns_set_serverlist( const IP4_ARRAY *addrs ) { int i; + if (!addrs || !addrs->AddrCount) return ERROR_SUCCESS; if (addrs->AddrCount > MAXNS) { WARN( "too many servers: %d only using the first: %d\n", @@ -716,8 +717,7 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser initialise_resolver(); _res.options |= dns_map_options( options ); - if (servers && (ret = dns_set_serverlist( servers ))) - return ret; + if ((ret = dns_set_serverlist( servers ))) return ret; ret = dns_do_query( name, type, options, result ); -- 2.11.0

1 0

[PATCH 2/2] oleaut32: Fix vtable offset for a SYS_WIN32 typelib loaded on WIN64.
by Huw Davies 22 Jan '18

22 Jan '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/oleaut32/tests/typelib.c | 46 ++++++++++++++----------------------------- dlls/oleaut32/typelib.c | 4 ++-- 2 files changed, 17 insertions(+), 33 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 0bae396f17..b518e1ad1c 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -3087,8 +3087,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 0, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine_if(is_win64 && sys == SYS_WIN32) - ok(pfuncdesc->oVft == 4 * sizeof(void*), "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->oVft == 4 * sizeof(void*), "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); @@ -3112,8 +3111,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 0, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine_if(is_win64 && sys == SYS_WIN32) - ok(pfuncdesc->oVft == 5 * sizeof(void*), "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->oVft == 5 * sizeof(void*), "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); @@ -3137,8 +3135,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 2, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine_if(is_win64 && sys == SYS_WIN32) - ok(pfuncdesc->oVft == 6 * sizeof(void*), "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->oVft == 6 * sizeof(void*), "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); @@ -3197,8 +3194,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 2, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine_if(is_win64 && sys == SYS_WIN32) - ok(pfuncdesc->oVft == 7 * sizeof(void*), "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->oVft == 7 * sizeof(void*), "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); @@ -3244,8 +3240,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine_if(is_win64 && sys == SYS_WIN32) - ok(pfuncdesc->oVft == 8 * sizeof(void*), "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->oVft == 8 * sizeof(void*), "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); @@ -3282,8 +3277,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine_if(is_win64 && sys == SYS_WIN32) - ok(pfuncdesc->oVft == 9 * sizeof(void*), "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->oVft == 9 * sizeof(void*), "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VARIANT, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); @@ -3320,8 +3314,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 2, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine_if(is_win64 && sys == SYS_WIN32) - ok(pfuncdesc->oVft == 10 * sizeof(void*), "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->oVft == 10 * sizeof(void*), "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); @@ -3361,8 +3354,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine_if(is_win64 && sys == SYS_WIN32) - ok(pfuncdesc->oVft == 11 * sizeof(void*), "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->oVft == 11 * sizeof(void*), "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); @@ -3397,8 +3389,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 0, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine_if(is_win64 && sys == SYS_WIN32) - ok(pfuncdesc->oVft == 12 * sizeof(void*), "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->oVft == 12 * sizeof(void*), "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_BSTR, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); @@ -3429,8 +3420,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine_if(is_win64 && sys == SYS_WIN32) - ok(pfuncdesc->oVft == 13 * sizeof(void*), "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->oVft == 13 * sizeof(void*), "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); @@ -3463,8 +3453,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine_if(is_win64 && sys == SYS_WIN32) - ok(pfuncdesc->oVft == 14 * sizeof(void*), "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->oVft == 14 * sizeof(void*), "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); @@ -3495,8 +3484,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - todo_wine_if(is_win64 && sys == SYS_WIN32) - ok(pfuncdesc->oVft == 15 * sizeof(void*), "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->oVft == 15 * sizeof(void*), "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); @@ -3557,8 +3545,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - ok(pfuncdesc->oVft == 0xffffaaa8 || - pfuncdesc->oVft == 0x5550, "got %x\n", pfuncdesc->oVft); + ok(pfuncdesc->oVft == (short)(0xaaa8 * sizeof(void *) / ptr_size), "got %x\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); @@ -3590,9 +3577,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - ok(pfuncdesc->oVft == 0xffffaaac || - pfuncdesc->oVft == 0xffffaab0 || - pfuncdesc->oVft == 0x5558, "got %x\n", pfuncdesc->oVft); + ok(pfuncdesc->oVft == (short)((sys == SYS_WIN64 ? 0xaab0 : 0xaaac) * sizeof(void *) / ptr_size), "got %x\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); @@ -3728,8 +3713,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(bindptr.lpfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", bindptr.lpfuncdesc->callconv); ok(bindptr.lpfuncdesc->cParams == 8, "got %d\n", bindptr.lpfuncdesc->cParams); ok(bindptr.lpfuncdesc->cParamsOpt == 0, "got %d\n", bindptr.lpfuncdesc->cParamsOpt); - todo_wine_if(is_win64 && sys == SYS_WIN32) - ok(bindptr.lpfuncdesc->oVft == 6 * sizeof(void*), "got %x\n", bindptr.lpfuncdesc->oVft); + ok(bindptr.lpfuncdesc->oVft == 6 * sizeof(void*), "got %x\n", bindptr.lpfuncdesc->oVft); ok(bindptr.lpfuncdesc->cScodes == 0, "got %d\n", bindptr.lpfuncdesc->cScodes); ok(bindptr.lpfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", bindptr.lpfuncdesc->elemdescFunc.tdesc.vt); ok(bindptr.lpfuncdesc->wFuncFlags == FUNCFLAG_FRESTRICTED, "got 0x%x\n", bindptr.lpfuncdesc->wFuncFlags); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index b56d81fa20..49366aeecd 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2426,7 +2426,7 @@ MSFT_DoFuncs(TLBContext* pcx, ptfd->funcdesc.callconv = (pFuncRec->FKCCIC) >> 8 & 0xF; ptfd->funcdesc.cParams = pFuncRec->nrargs ; ptfd->funcdesc.cParamsOpt = pFuncRec->nroargs ; - ptfd->funcdesc.oVft = pFuncRec->VtableOffset & ~1; + ptfd->funcdesc.oVft = (pFuncRec->VtableOffset & ~1) * sizeof(void *) / pTI->pTypeLib->ptr_size; ptfd->funcdesc.wFuncFlags = LOWORD(pFuncRec->Flags) ; /* nameoffset is sometimes -1 on the second half of a propget/propput @@ -4160,7 +4160,7 @@ static void SLTG_DoFuncs(char *pBlk, char *pFirstItem, ITypeInfoImpl *pTI, pFuncDesc->funcdesc.callconv = pFunc->nacc & 0x7; pFuncDesc->funcdesc.cParams = pFunc->nacc >> 3; pFuncDesc->funcdesc.cParamsOpt = (pFunc->retnextopt & 0x7e) >> 1; - pFuncDesc->funcdesc.oVft = pFunc->vtblpos & ~1; + pFuncDesc->funcdesc.oVft = (pFunc->vtblpos & ~1) * sizeof(void *) / pTI->pTypeLib->ptr_size; if(pFunc->magic & SLTG_FUNCTION_FLAGS_PRESENT) pFuncDesc->funcdesc.wFuncFlags = pFunc->funcflags; -- 2.12.0

1 0

[PATCH 1/2] oleaut32/tests: Remove some no longer needed test work-arounds.
by Huw Davies 22 Jan '18

22 Jan '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/oleaut32/tests/typelib.c | 47 ++++++++++++++----------------------------- 1 file changed, 15 insertions(+), 32 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 950ea43b13..0bae396f17 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -2017,8 +2017,7 @@ static void test_CreateTypeLib(SYSKIND sys) { hres = ITypeInfo_GetTypeAttr(ti, &typeattr); ok(hres == S_OK, "got %08x\n", hres); - ok(typeattr->cbSizeVft == 3 * ptr_size || broken(sys == SYS_WIN32 && typeattr->cbSizeVft == 24) /* xp64 */, - "retrieved IUnknown gave wrong cbSizeVft: %u\n", typeattr->cbSizeVft); + ok(typeattr->cbSizeVft == 3 * ptr_size, "retrieved IUnknown gave wrong cbSizeVft: %u\n", typeattr->cbSizeVft); ITypeInfo_ReleaseTypeAttr(ti, typeattr); ITypeInfo_Release(ti); @@ -2061,8 +2060,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 0, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - ok(pfuncdesc->oVft == 3 * ptr_size || broken(sys == SYS_WIN32 && pfuncdesc->oVft == 24) /* xp64 */, - "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->oVft == 3 * ptr_size, "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_BSTR, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); @@ -2121,8 +2119,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - ok(pfuncdesc->oVft == 4 * ptr_size || broken(sys == SYS_WIN32 && pfuncdesc->oVft == 28) /* xp64 */, - "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->oVft == 4 * ptr_size, "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); @@ -2164,8 +2161,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 0, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - ok(pfuncdesc->oVft == 4 * ptr_size || broken(sys == SYS_WIN32 && pfuncdesc->oVft == 28), /* xp64 */ - "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->oVft == 4 * ptr_size, "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); @@ -2195,8 +2191,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - ok(pfuncdesc->oVft == 7 * ptr_size || broken(sys == SYS_WIN32 && pfuncdesc->oVft == 40) /* xp64 */, - "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->oVft == 7 * ptr_size, "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); @@ -2227,8 +2222,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - ok(pfuncdesc->oVft == 7 * ptr_size || broken(sys == SYS_WIN32 && pfuncdesc->oVft == 40) /* xp64 */, - "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->oVft == 7 * ptr_size, "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); @@ -2263,8 +2257,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - ok(pfuncdesc->oVft == 6 * ptr_size || broken(sys == SYS_WIN32 && pfuncdesc->oVft == 36) /* xp64 */, - "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->oVft == 6 * ptr_size, "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); @@ -2304,8 +2297,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 2, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - ok(pfuncdesc->oVft == 6 * ptr_size || broken(sys == SYS_WIN32 && pfuncdesc->oVft == 36) /* xp64 */, - "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->oVft == 6 * ptr_size, "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); @@ -2358,8 +2350,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 2, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - ok(pfuncdesc->oVft == 6 * ptr_size || broken(sys == SYS_WIN32 && pfuncdesc->oVft == 36) /* xp64 */, - "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->oVft == 6 * ptr_size, "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); @@ -2416,8 +2407,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - ok(pfuncdesc->oVft == 8 * ptr_size || broken(sys == SYS_WIN32 && pfuncdesc->oVft == 44), /* xp64 */ - "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->oVft == 8 * ptr_size, "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); @@ -2460,8 +2450,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(pfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", pfuncdesc->callconv); ok(pfuncdesc->cParams == 1, "got %d\n", pfuncdesc->cParams); ok(pfuncdesc->cParamsOpt == 0, "got %d\n", pfuncdesc->cParamsOpt); - ok(pfuncdesc->oVft == 9 * ptr_size || broken(sys == SYS_WIN32 && pfuncdesc->oVft == 48), /* xp64 */ - "got %d\n", pfuncdesc->oVft); + ok(pfuncdesc->oVft == 9 * ptr_size, "got %d\n", pfuncdesc->oVft); ok(pfuncdesc->cScodes == 0, "got %d\n", pfuncdesc->cScodes); ok(pfuncdesc->elemdescFunc.tdesc.vt == VT_VARIANT, "got %d\n", pfuncdesc->elemdescFunc.tdesc.vt); ok(pfuncdesc->wFuncFlags == 0, "got 0x%x\n", pfuncdesc->wFuncFlags); @@ -2780,8 +2769,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(typeattr->cFuncs == 1, "cFuncs = %d\n", typeattr->cFuncs); ok(typeattr->cVars == 0, "cVars = %d\n", typeattr->cVars); ok(typeattr->cImplTypes == 1, "cImplTypes = %d\n", typeattr->cImplTypes); - ok(typeattr->cbSizeVft == 8 * ptr_size || broken(sys == SYS_WIN32 && typeattr->cbSizeVft == 7 * sizeof(void *) + 4), /* xp64 */ - "cbSizeVft = %d\n", typeattr->cbSizeVft); + ok(typeattr->cbSizeVft == 8 * ptr_size, "cbSizeVft = %d\n", typeattr->cbSizeVft); ok(typeattr->cbAlignment == 4, "cbAlignment = %d\n", typeattr->cbAlignment); ok(typeattr->wTypeFlags == (TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL), "wTypeFlags = %d\n", typeattr->wTypeFlags); ok(typeattr->wMajorVerNum == 0, "wMajorVerNum = %d\n", typeattr->wMajorVerNum); @@ -2825,8 +2813,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(typeattr->cFuncs == 13, "cFuncs = %d\n", typeattr->cFuncs); ok(typeattr->cVars == 0, "cVars = %d\n", typeattr->cVars); ok(typeattr->cImplTypes == 1, "cImplTypes = %d\n", typeattr->cImplTypes); - ok(typeattr->cbSizeVft == 16 * ptr_size || broken(sys == SYS_WIN32 && typeattr->cbSizeVft == 3 * sizeof(void *) + 52), /* xp64 */ - "cbSizeVft = %d\n", typeattr->cbSizeVft); + ok(typeattr->cbSizeVft == 16 * ptr_size, "cbSizeVft = %d\n", typeattr->cbSizeVft); ok(typeattr->cbAlignment == 4, "cbAlignment = %d\n", typeattr->cbAlignment); ok(typeattr->wTypeFlags == 0, "wTypeFlags = %d\n", typeattr->wTypeFlags); ok(typeattr->wMajorVerNum == 0, "wMajorVerNum = %d\n", typeattr->wMajorVerNum); @@ -4798,9 +4785,7 @@ todo_wine /* widl generates broken typelib and typeattr just reflects that */ expect_int(desc->callconv, fn_info->callconv); expect_int(desc->cParams, fn_info->cParams); expect_int(desc->cParamsOpt, fn_info->cParamsOpt); - ok( desc->oVft == fn_info->vtbl_index * sizeof(void*) || - broken(desc->oVft == fn_info->vtbl_index * 4), /* xp64 */ - "desc->oVft got %u\n", desc->oVft ); + expect_int(desc->oVft, fn_info->vtbl_index * sizeof(void*)); expect_int(desc->cScodes, fn_info->cScodes); expect_int(desc->wFuncFlags, fn_info->wFuncFlags); ole_check(ITypeInfo_GetNames(typeinfo, desc->memid, namesTab, 256, &cNames)); @@ -5951,9 +5936,7 @@ static void testTDA(ITypeLib *tl, struct _TDATest *TDATest, #endif } - ok(typeattr->cbSizeInstance == size || - broken(TDATest->vt == VT_VARIANT && ptr_size != sizeof(void*) && typeattr->cbSizeInstance == sizeof(VARIANT)) /* winxp64 */, - "got wrong size for VT %u: 0x%x\n", TDATest->vt, typeattr->cbSizeInstance); + ok(typeattr->cbSizeInstance == size, "got wrong size for VT %u: 0x%x\n", TDATest->vt, typeattr->cbSizeInstance); ok(typeattr->cbAlignment == alignment, "got wrong alignment for VT %u: 0x%x\n", TDATest->vt, typeattr->cbAlignment); ok(typeattr->tdescAlias.vt == TDATest->vt, "got wrong VT for VT %u: 0x%x\n", TDATest->vt, typeattr->tdescAlias.vt); -- 2.12.0

1 0

[PATCH] ole32: Implement saving of view cache entries.
by Huw Davies 22 Jan '18

22 Jan '18

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/datacache.c | 23 +++++++++++++++++++++-- dlls/ole32/tests/ole2.c | 19 +++++++++++++------ 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 4ba08268d7..e2ff928ba8 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -506,7 +506,9 @@ static HRESULT write_clipformat(IStream *stream, CLIPFORMAT clipformat) HRESULT hr; char format_name[256]; - if (clipformat < 0xc000) + if (clipformat == 0) + length = 0; + else if (clipformat < 0xc000) length = -1; else { @@ -515,8 +517,9 @@ static HRESULT write_clipformat(IStream *stream, CLIPFORMAT clipformat) if (length) length++; } hr = IStream_Write(stream, &length, sizeof(length), NULL); - if (FAILED(hr)) + if (FAILED(hr) || clipformat == 0) return hr; + if (clipformat < 0xc000) { DWORD cf = clipformat; @@ -993,6 +996,19 @@ static HRESULT save_emf(DataCacheEntry *entry, BOOL contents, IStream *stream) return hr; } +static HRESULT save_view_cache(DataCacheEntry *entry, IStream *stream) +{ + HRESULT hr; + PresentationDataHeader header; + + init_stream_header(entry, &header); + hr = write_clipformat(stream, entry->fmtetc.cfFormat); + if (SUCCEEDED(hr)) + hr = IStream_Write(stream, &header, FIELD_OFFSET(PresentationDataHeader, unknown7), NULL); + + return hr; +} + static const WCHAR CONTENTS[] = {'C','O','N','T','E','N','T','S',0}; static HRESULT create_stream(DataCacheEntry *cache_entry, IStorage *storage, BOOL contents, IStream **stream) @@ -1037,6 +1053,9 @@ static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storag case CF_ENHMETAFILE: hr = save_emf(cache_entry, contents, stream); break; + case 0: + hr = save_view_cache(cache_entry, stream); + break; default: FIXME("got unsupported clipboard format %x\n", cache_entry->fmtetc.cfFormat); } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index fe45c6a73e..7fcb1aa1e0 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -3986,13 +3986,18 @@ static void check_storage_contents(IStorage *stg, const struct storage_def *stg_ hr = IStorage_OpenStream(stg, stat.pwcsName, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream); ok(hr == S_OK, "unexpected %#x\n", hr); - if (!memcmp(name, "\2OlePres", 7)) + if (!memcmp(name, "\2OlePres", 8)) { + ULONG header_size = sizeof(header); + clipformat = read_clipformat(stream); - hr = IStream_Read(stream, &header, sizeof(header), &bytes); + if (clipformat == 0) /* view cache */ + header_size = FIELD_OFFSET(PresentationDataHeader, unknown7); + + hr = IStream_Read(stream, &header, header_size, &bytes); ok(hr == S_OK, "unexpected %#x\n", hr); - ok(bytes >= 24, "read %u bytes\n", bytes); + ok(bytes == header_size, "read %u bytes, expected %u\n", bytes, header_size); if (winetest_debug > 1) trace("header: tdSize %#x, dvAspect %#x, lindex %#x, advf %#x, unknown7 %#x, dwObjectExtentX %#x, dwObjectExtentY %#x, dwSize %#x\n", @@ -4228,12 +4233,14 @@ static void test_data_cache_save_data(void) { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, { CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, + { 0, 0, DVASPECT_DOCPRINT, -1, TYMED_HGLOBAL }, }, - 3, 3, &CLSID_WineTest, + 4, 3, &CLSID_WineTest, { - &CLSID_WineTestOld, 3, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 }, + &CLSID_WineTestOld, 4, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 }, { "\2OlePres001", CF_METAFILEPICT, DVASPECT_CONTENT, 0, NULL, 0 }, - { "\2OlePres002", CF_ENHMETAFILE, DVASPECT_CONTENT, 0, NULL, 0 } } + { "\2OlePres002", CF_ENHMETAFILE, DVASPECT_CONTENT, 0, NULL, 0 }, + { "\2OlePres003", 0, DVASPECT_DOCPRINT, 0, NULL, 0 } } } }, /* without setting data */ -- 2.12.0

1 0

[PATCH v2] dsound/tests: Use GetModuleHandleA instead of LoadLibraryA.
by Andrey Gusev 22 Jan '18

22 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/dsound/tests/capture.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 4eae28bd4e..de60aa9dae 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -755,11 +755,8 @@ static void test_COM(void) START_TEST(capture) { - HMODULE hDsound; + HMODULE hDsound = GetModuleHandleA("dsound.dll"); - CoInitialize(NULL); - - hDsound = LoadLibraryA("dsound.dll"); if (!hDsound) { skip("dsound.dll not found - skipping all tests\n"); return; @@ -772,10 +769,11 @@ START_TEST(capture) return; } + CoInitialize(NULL); + test_COM(); test_capture(); test_enumerate(); - FreeLibrary(hDsound); CoUninitialize(); } -- 2.13.6

1 0

[PATCH] quartz: Fix memory leaks.
by Andrey Gusev 22 Jan '18

22 Jan '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/quartz/avisplit.c | 3 +++ dlls/quartz/waveparser.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index f3eccedcfc..908c74bc88 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -1448,7 +1448,10 @@ HRESULT AVISplitter_create(IUnknown * pUnkOuter, LPVOID * ppv) hr = Parser_Create(&(This->Parser), &AVISplitterImpl_Vtbl, &CLSID_AviSplitter, AVISplitter_Sample, AVISplitter_QueryAccept, AVISplitter_InputPin_PreConnect, AVISplitter_Flush, AVISplitter_Disconnect, AVISplitter_first_request, AVISplitter_done_process, NULL, AVISplitter_seek, NULL); if (FAILED(hr)) + { + CoTaskMemFree(This); return hr; + } *ppv = &This->Parser.filter.IBaseFilter_iface; diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index f6bea2c704..a1994d9c20 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -434,7 +434,10 @@ HRESULT WAVEParser_create(IUnknown * pUnkOuter, LPVOID * ppv) hr = Parser_Create(&(This->Parser), &WAVEParser_Vtbl, &CLSID_WAVEParser, WAVEParser_Sample, WAVEParser_QueryAccept, WAVEParser_InputPin_PreConnect, WAVEParser_Cleanup, WAVEParser_disconnect, WAVEParser_first_request, NULL, NULL, WAVEParserImpl_seek, NULL); if (FAILED(hr)) + { + CoTaskMemFree(This); return hr; + } *ppv = &This->Parser.filter.IBaseFilter_iface; -- 2.13.6

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel