January 2018 - Wine-Commits

Dmitry Timoshkov : kerberos: Print verbose traces on gssapi failures.
by Alexandre Julliard Jan. 26, 2018

Jan. 26, 2018

Module: wine Branch: master Commit: 10c2968ce8b53c1cdf920cef1deb3b52dfca3b5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=10c2968ce8b53c1cdf920cef… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 26 12:48:36 2018 +0800 kerberos: Print verbose traces on gssapi failures. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 56b78fc..b4a37f7 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 );

1 0

Dmitry Timoshkov : kerberos: Fix printing of the sequence message number.
by Alexandre Julliard Jan. 26, 2018

Jan. 26, 2018

Module: wine Branch: master Commit: 40f317749f697a6e127df9344743dda0ca595765 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40f317749f697a6e127df934… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jan 26 12:48:20 2018 +0800 kerberos: Fix printing of the sequence message number. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 2d3b601..56b78fc 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 );

1 0

Alexandre Julliard : winex11: Use a separate XRender format for the root window.
by Alexandre Julliard Jan. 26, 2018

Jan. 26, 2018

Module: wine Branch: master Commit: a2a2b5bc885b96748c4e0df5f54a9341b5e8d19c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2a2b5bc885b96748c4e0df5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 13:36:21 2018 +0100 winex11: Use a separate XRender format for the root window. When using a custom visual, the default format may not work with the root window. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xrender.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index cefbd22..b9b7c4f 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -68,6 +68,7 @@ enum wxr_format WXR_FORMAT_B8G8R8A8, WXR_FORMAT_X8R8G8B8, WXR_FORMAT_B8G8R8X8, + WXR_FORMAT_ROOT, /* placeholder for the format to use on the root window */ WXR_NB_FORMATS, WXR_INVALID_FORMAT = WXR_NB_FORMATS }; @@ -273,6 +274,13 @@ static int load_xrender_formats(void) { XRenderPictFormat templ; + if (i == WXR_FORMAT_ROOT) + { + pict_formats[i] = pXRenderFindVisualFormat(gdi_display, + DefaultVisual( gdi_display, DefaultScreen(gdi_display) )); + TRACE( "Loaded root pict_format with id=%#lx\n", pict_formats[i]->id ); + continue; + } if(is_wxrformat_compatible_with_default_visual(&wxr_formats_template[i])) { pict_formats[i] = pXRenderFindVisualFormat(gdi_display, default_visual.visual); @@ -875,6 +883,16 @@ static HFONT xrenderdrv_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) return ret; } +static void set_physdev_format( struct xrender_physdev *physdev, enum wxr_format format ) +{ + if (physdev->x11dev->drawable == DefaultRootWindow( gdi_display )) + physdev->format = WXR_FORMAT_ROOT; + else + physdev->format = format; + + physdev->pict_format = pict_formats[physdev->format]; +} + static BOOL create_xrender_dc( PHYSDEV *pdev, enum wxr_format format ) { X11DRV_PDEVICE *x11dev = get_x11drv_dev( *pdev ); @@ -883,8 +901,7 @@ static BOOL create_xrender_dc( PHYSDEV *pdev, enum wxr_format format ) if (!physdev) return FALSE; physdev->x11dev = x11dev; physdev->cache_index = -1; - physdev->format = format; - physdev->pict_format = pict_formats[format]; + set_physdev_format( physdev, format ); push_dc_driver( pdev, &physdev->dev, &xrender_funcs ); return TRUE; } @@ -974,7 +991,11 @@ static INT xrenderdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID if (*(const enum x11drv_escape_codes *)in_data == X11DRV_SET_DRAWABLE) { BOOL ret = dev->funcs->pExtEscape( dev, escape, in_count, in_data, out_count, out_data ); - if (ret) free_xrender_picture( physdev ); /* pict format doesn't change, only drawable */ + if (ret) + { + free_xrender_picture( physdev ); + set_physdev_format( physdev, default_format ); + } return ret; } }

1 0

Nikolay Sivov : user32: Enable window class redirection.
by Alexandre Julliard Jan. 26, 2018

Jan. 26, 2018

Module: wine Branch: master Commit: bdb048a50e2c9a051dc08f15b4667088830a3b63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdb048a50e2c9a051dc08f15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 26 14:51:41 2018 +0300 user32: Enable window class redirection. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 fae88f2..8aa568d 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 dd8f266..88e4bfc 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);

1 0

Louis Lenders : uxtheme: Add stub for SetWindowThemeAttribute.
by Alexandre Julliard Jan. 26, 2018

Jan. 26, 2018

Module: wine Branch: master Commit: 28613fcd934bffb3a581830a8fa7568ab35e4140 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28613fcd934bffb3a581830a… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Jan 4 21:00:27 2018 +0100 uxtheme: Add stub for SetWindowThemeAttribute. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/system.c | 10 ++++++++++ dlls/uxtheme/uxtheme.spec | 1 + include/uxtheme.h | 4 +++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 08996e1..e11271a 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -721,6 +721,16 @@ HRESULT WINAPI SetWindowTheme(HWND hwnd, LPCWSTR pszSubAppName, } /*********************************************************************** + * SetWindowThemeAttribute (UXTHEME.@) + */ +HRESULT WINAPI SetWindowThemeAttribute(HWND hwnd, enum WINDOWTHEMEATTRIBUTETYPE type, + PVOID attribute, DWORD size) +{ + FIXME("(%p,%d,%p,%d): stub\n", hwnd, type, attribute, size); + return E_NOTIMPL; +} + +/*********************************************************************** * GetCurrentThemeName (UXTHEME.@) */ HRESULT WINAPI GetCurrentThemeName(LPWSTR pszThemeFileName, int dwMaxNameChars, diff --git a/dlls/uxtheme/uxtheme.spec b/dlls/uxtheme/uxtheme.spec index 5b68fde..632129b 100644 --- a/dlls/uxtheme/uxtheme.spec +++ b/dlls/uxtheme/uxtheme.spec @@ -108,3 +108,4 @@ @ stdcall OpenThemeData(ptr wstr) @ stdcall SetThemeAppProperties(long) @ stdcall SetWindowTheme(ptr wstr wstr) +@ stdcall SetWindowThemeAttribute(ptr long ptr long) diff --git a/include/uxtheme.h b/include/uxtheme.h index 374b530..a35f4ae 100644 --- a/include/uxtheme.h +++ b/include/uxtheme.h @@ -206,6 +206,8 @@ HTHEME WINAPI GetWindowTheme(HWND); #define OTD_NONCLIENT 0x0002 #define OTD_VALIDBITS (OTD_FORCE_RECT_SIZING | OTD_NONCLIENT) +enum WINDOWTHEMEATTRIBUTETYPE { WTA_NONCLIENT = 1 }; + HRESULT WINAPI HitTestThemeBackground(HTHEME,HDC,int,int,DWORD,const RECT*, HRGN,POINT,WORD*); BOOL WINAPI IsAppThemed(void); @@ -218,7 +220,7 @@ HTHEME WINAPI OpenThemeData(HWND,LPCWSTR); HTHEME WINAPI OpenThemeDataEx(HWND,LPCWSTR,DWORD); void WINAPI SetThemeAppProperties(DWORD); HRESULT WINAPI SetWindowTheme(HWND,LPCWSTR,LPCWSTR); - +HRESULT WINAPI SetWindowThemeAttribute(HWND,enum WINDOWTHEMEATTRIBUTETYPE,PVOID,DWORD); /* Double-buffered Drawing API */

1 0

Alexandre Julliard : winex11: Default to an ARGB visual when depth is set to 32.
by Alexandre Julliard Jan. 26, 2018

Jan. 26, 2018

Module: wine Branch: master Commit: 31c7a7157d991d3d60ff8985fa1061c9eb97142a URL: https://source.winehq.org/git/wine.git/?a=commit;h=31c7a7157d991d3d60ff8985… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 13:39:22 2018 +0100 winex11: Default to an ARGB visual when depth is set to 32. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/x11drv_main.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index a2ec18b..e67a3c0 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -484,11 +484,29 @@ static void init_visuals( Display *display, int screen ) int count; XVisualInfo *info; + argb_visual.screen = screen; + argb_visual.class = TrueColor; + argb_visual.depth = 32; + argb_visual.red_mask = 0xff0000; + argb_visual.green_mask = 0x00ff00; + argb_visual.blue_mask = 0x0000ff; + + if ((info = XGetVisualInfo( display, VisualScreenMask | VisualDepthMask | VisualClassMask | + VisualRedMaskMask | VisualGreenMaskMask | VisualBlueMaskMask, + &argb_visual, &count ))) + { + argb_visual = *info; + XFree( info ); + } + default_visual.screen = screen; if (default_visual.depth) /* depth specified */ { - info = XGetVisualInfo( display, VisualScreenMask | VisualDepthMask, &default_visual, &count ); - if (info) + if (default_visual.depth == 32 && argb_visual.visual) + { + default_visual = argb_visual; + } + else if ((info = XGetVisualInfo( display, VisualScreenMask | VisualDepthMask, &default_visual, &count ))) { default_visual = *info; XFree( info ); @@ -510,20 +528,6 @@ static void init_visuals( Display *display, int screen ) } default_colormap = XCreateColormap( display, root_window, default_visual.visual, AllocNone ); - argb_visual.screen = screen; - argb_visual.class = TrueColor; - argb_visual.depth = 32; - argb_visual.red_mask = 0xff0000; - argb_visual.green_mask = 0x00ff00; - argb_visual.blue_mask = 0x0000ff; - - if ((info = XGetVisualInfo( display, VisualScreenMask | VisualDepthMask | VisualClassMask | - VisualRedMaskMask | VisualGreenMaskMask | VisualBlueMaskMask, - &argb_visual, &count ))) - { - argb_visual = *info; - XFree( info ); - } TRACE( "default visual %lx class %u argb %lx\n", default_visual.visualid, default_visual.class, argb_visual.visualid ); }

1 0

Nikolay Sivov : comctl32/tests: Reload library before starting version 6 tests.
by Alexandre Julliard Jan. 25, 2018

Jan. 25, 2018

Module: wine Branch: master Commit: f54a6617673d8fea6c2a3a2fa805fa906de82198 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f54a6617673d8fea6c2a3a2f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 25 17:23:18 2018 +0300 comctl32/tests: Reload library before starting version 6 tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 11 ----------- dlls/comctl32/tests/v6util.h | 6 ++++++ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 51404af..64fb1eb 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -1342,9 +1342,6 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, break; } - case WM_DESTROY: - PostQuitMessage(0); - break; } defwndproc_counter++; @@ -2682,7 +2679,6 @@ START_TEST(treeview) ULONG_PTR ctx_cookie; HANDLE hCtx; WNDCLASSA wc; - MSG msg; init_functions(); @@ -2760,11 +2756,4 @@ START_TEST(treeview) test_WM_GETDLGCODE(); unload_v6_module(ctx_cookie, hCtx); - - PostMessageA(hMainWnd, WM_CLOSE, 0, 0); - while(GetMessageA(&msg, 0, 0, 0)) - { - TranslateMessage(&msg); - DispatchMessageA(&msg); - } } diff --git a/dlls/comctl32/tests/v6util.h b/dlls/comctl32/tests/v6util.h index b78290a..626f6e6 100644 --- a/dlls/comctl32/tests/v6util.h +++ b/dlls/comctl32/tests/v6util.h @@ -70,6 +70,7 @@ static BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx) { ACTCTX_SECTION_KEYED_DATA data; DWORD written; + HMODULE hmod; ACTCTXA ctx; HANDLE file; BOOL ret; @@ -103,6 +104,8 @@ static BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx) *hCtx = CreateActCtxA(&ctx); ok(*hCtx != 0, "Expected context handle\n"); + hmod = GetModuleHandleA("comctl32.dll"); + ret = ActivateActCtx(*hCtx, pcookie); ok(ret, "Failed to activate context, error %d.\n", GetLastError()); @@ -117,7 +120,10 @@ static BOOL load_v6_module(ULONG_PTR *pcookie, HANDLE *hCtx) "comctl32.dll", &data); ok(ret, "failed to find comctl32.dll in active context, %u\n", GetLastError()); if (ret) + { + FreeLibrary(hmod); LoadLibraryA("comctl32.dll"); + } return ret; }

1 0

Nikolay Sivov : comctl32/tests: Use better names for test window procedures.
by Alexandre Julliard Jan. 25, 2018

Jan. 25, 2018

Module: wine Branch: master Commit: 7b304a9ddda9198dd21e765a5ec70a47568acba6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b304a9ddda9198dd21e765a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 25 17:23:15 2018 +0300 comctl32/tests: Use better names for test window procedures. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/tab.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 9823915..8a55553 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -319,7 +319,7 @@ create_tabcontrol (DWORD style, DWORD mask) return handle; } -static LRESULT WINAPI parentWindowProcess(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; struct message msg = { 0 }; @@ -367,7 +367,7 @@ static BOOL registerParentWindowClass(void) WNDCLASSA cls; cls.style = 0; - cls.lpfnWndProc = parentWindowProcess; + cls.lpfnWndProc = parent_wnd_proc; cls.cbClsExtra = 0; cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(NULL); @@ -389,7 +389,7 @@ static HWND createParentWindow(void) GetDesktopWindow(), NULL, GetModuleHandleA(NULL), NULL); } -static LRESULT WINAPI tabSubclassProcess(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +static LRESULT WINAPI tab_subclass_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); static LONG defwndproc_counter = 0; @@ -435,7 +435,7 @@ static HWND createFilledTabControl(HWND parent_wnd, DWORD style, DWORD mask, INT rect.bottom, parent_wnd, NULL, NULL, 0); ok(tabHandle != NULL, "failed to create tab wnd\n"); - oldproc = (WNDPROC)SetWindowLongPtrA(tabHandle, GWLP_WNDPROC, (LONG_PTR)tabSubclassProcess); + oldproc = (WNDPROC)SetWindowLongPtrA(tabHandle, GWLP_WNDPROC, (LONG_PTR)tab_subclass_proc); SetWindowLongPtrA(tabHandle, GWLP_USERDATA, (LONG_PTR)oldproc); tcNewTab.mask = mask;

1 0

Nikolay Sivov : comctl32/tests: A test for TCN_SELCHANGING handling.
by Alexandre Julliard Jan. 25, 2018

Jan. 25, 2018

Module: wine Branch: master Commit: 413b2a031b8741c2c66c115374ef957f4a824949 URL: https://source.winehq.org/git/wine.git/?a=commit;h=413b2a031b8741c2c66c1153… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 25 17:23:14 2018 +0300 comctl32/tests: A test for TCN_SELCHANGING handling. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 0bfbb38..9823915 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); }

1 0

Nikolay Sivov : comctl32/tests: Extend TCM_SETTOOLTIPS test.
by Alexandre Julliard Jan. 25, 2018

Jan. 25, 2018

Module: wine Branch: master Commit: 37052ad9c1dc274dd0dfdaa1d0002160a93eb7cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=37052ad9c1dc274dd0dfdaa1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 25 17:23:16 2018 +0300 comctl32/tests: Extend TCM_SETTOOLTIPS test. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/tab.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 8a55553..aa411b5 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -974,8 +974,9 @@ static void test_getset_item(void) static void test_getset_tooltips(void) { char toolTipText[32] = "ToolTip Text Test"; + HWND hTab, toolTip, hwnd; const INT nTabs = 5; - HWND hTab, toolTip; + int ret; hTab = createFilledTabControl(parent_wnd, TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE, nTabs); ok(hTab != NULL, "Failed to create tab control\n"); @@ -983,16 +984,22 @@ static void test_getset_tooltips(void) flush_sequences(sequences, NUM_MSG_SEQUENCES); toolTip = create_tooltip(hTab, toolTipText); - SendMessageA(hTab, TCM_SETTOOLTIPS, (LPARAM)toolTip, 0); - ok(toolTip == (HWND)SendMessageA(hTab, TCM_GETTOOLTIPS, 0,0), "ToolTip was set incorrectly.\n"); + ret = SendMessageA(hTab, TCM_SETTOOLTIPS, (WPARAM)toolTip, 0); + ok(ret == 0, "Unexpected ret value %d.\n", ret); + hwnd = (HWND)SendMessageA(hTab, TCM_GETTOOLTIPS, 0, 0); + ok(toolTip == hwnd, "Unexpected tooltip window.\n"); - SendMessageA(hTab, TCM_SETTOOLTIPS, 0, 0); - ok(!SendMessageA(hTab, TCM_GETTOOLTIPS, 0,0), "ToolTip was set incorrectly.\n"); + ret = SendMessageA(hTab, TCM_SETTOOLTIPS, 0, 0); + ok(ret == 0, "Unexpected ret value %d.\n", ret); + hwnd = (HWND)SendMessageA(hTab, TCM_GETTOOLTIPS, 0, 0); + ok(hwnd == NULL, "Unexpected tooltip window.\n"); + ok(IsWindow(toolTip), "Expected tooltip window to be alive.\n"); ok_sequence(sequences, TAB_SEQ_INDEX, getset_tooltip_seq, "Getset tooltip test sequence", TRUE); ok_sequence(sequences, PARENT_SEQ_INDEX, getset_tooltip_parent_seq, "Getset tooltip test parent sequence", TRUE); DestroyWindow(hTab); + DestroyWindow(toolTip); } static void test_misc(void)

1 0