January 2018 - Wine-commits

Nikolay Sivov : user32: Enable window class redirection.
by Alexandre Julliard 26 Jan '18

26 Jan '18

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 26 Jan '18

26 Jan '18

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

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

26 Jan '18

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

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

26 Jan '18

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

Nikolay Sivov : wevtapi: Add EvtNext() stub.
by Alexandre Julliard 26 Jan '18

26 Jan '18

Module: wine Branch: master Commit: aaf4e1d93d9c25273a1d5af2be8ab7f41f418cdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaf4e1d93d9c25273a1d5af2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 26 16:57:21 2018 +0300 wevtapi: Add EvtNext() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 5b9949b..a978437 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 e2bec57..ddd2f32 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

1 0

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

26 Jan '18

Module: wine Branch: master Commit: 20074ac855a96b310f4e54d8a4fc70ef8e1b696e URL: https://source.winehq.org/git/wine.git/?a=commit;h=20074ac855a96b310f4e54d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 12:44:50 2018 +0100 mshtml: Avoid using a global display DC. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> 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 2ddaad23..5c52e4c 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 af716d1..0227ccc 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 aef82cd..51a1add 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;

1 0

Józef Kucia : dxgi: Stop ignoring buffer usage.
by Alexandre Julliard 25 Jan '18

25 Jan '18

Module: wine Branch: master Commit: f46b3adc09d2021da4b90ffbcc8c84fbafd4384a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f46b3adc09d2021da4b90ffb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 25 10:56:29 2018 +0100 dxgi: Stop ignoring buffer usage. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/device.c | 11 +++++------ dlls/dxgi/dxgi_private.h | 2 ++ dlls/dxgi/factory.c | 2 +- dlls/dxgi/swapchain.c | 13 +++++++------ dlls/dxgi/utils.c | 30 ++++++++++++++++++++++++++++++ 5 files changed, 45 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 2539ca2..b61d5ab 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -169,24 +169,23 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *ifac UINT i; UINT j; - TRACE("iface %p, desc %p, surface_count %u, usage %#x, shared_resource %p, surface %p\n", + TRACE("iface %p, desc %p, surface_count %u, usage %#x, shared_resource %p, surface %p.\n", iface, desc, surface_count, usage, shared_resource, surface); hr = IWineDXGIDevice_QueryInterface(iface, &IID_IWineDXGIDeviceParent, (void **)&dxgi_device_parent); if (FAILED(hr)) { - ERR("Device should implement IWineDXGIDeviceParent\n"); + ERR("Device should implement IWineDXGIDeviceParent.\n"); return E_FAIL; } device_parent = IWineDXGIDeviceParent_get_wined3d_device_parent(dxgi_device_parent); - FIXME("Implement DXGI<->wined3d usage conversion\n"); surface_desc.resource_type = WINED3D_RTYPE_TEXTURE_2D; surface_desc.format = wined3dformat_from_dxgi_format(desc->Format); wined3d_sample_desc_from_dxgi(&surface_desc.multisample_type, &surface_desc.multisample_quality, &desc->SampleDesc); - surface_desc.usage = usage; + surface_desc.usage = wined3d_usage_from_dxgi_usage(usage); surface_desc.pool = WINED3D_POOL_DEFAULT; surface_desc.width = desc->Width; surface_desc.height = desc->Height; @@ -212,11 +211,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *ifac wined3d_texture_decref(wined3d_texture); if (FAILED(hr)) { - ERR("Surface should implement IDXGISurface\n"); + ERR("Surface should implement IDXGISurface.\n"); goto fail; } - TRACE("Created IDXGISurface %p (%u/%u)\n", surface[i], i + 1, surface_count); + TRACE("Created IDXGISurface %p (%u/%u).\n", surface[i], i + 1, surface_count); } wined3d_mutex_unlock(); IWineDXGIDeviceParent_Release(dxgi_device_parent); diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h index b8af8c3..2fe4331 100644 --- a/dlls/dxgi/dxgi_private.h +++ b/dlls/dxgi/dxgi_private.h @@ -92,6 +92,8 @@ void wined3d_sample_desc_from_dxgi(enum wined3d_multisample_type *wined3d_type, unsigned int *wined3d_quality, const DXGI_SAMPLE_DESC *dxgi_desc) DECLSPEC_HIDDEN; void wined3d_display_mode_from_dxgi(struct wined3d_display_mode *wined3d_mode, const DXGI_MODE_DESC *mode) DECLSPEC_HIDDEN; +DXGI_USAGE dxgi_usage_from_wined3d_usage(DWORD wined3d_usage) DECLSPEC_HIDDEN; +DWORD wined3d_usage_from_dxgi_usage(DXGI_USAGE usage) DECLSPEC_HIDDEN; unsigned int dxgi_swapchain_flags_from_wined3d(unsigned int wined3d_flags) DECLSPEC_HIDDEN; unsigned int wined3d_swapchain_flags_from_dxgi(unsigned int flags) DECLSPEC_HIDDEN; HRESULT dxgi_get_private_data(struct wined3d_private_store *store, diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 0020917..8d24078 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -313,7 +313,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IDXGIFactor wined3d_desc.backbuffer_height = swapchain_desc->Height; wined3d_desc.backbuffer_format = wined3dformat_from_dxgi_format(swapchain_desc->Format); wined3d_desc.backbuffer_count = swapchain_desc->BufferCount; - wined3d_desc.backbuffer_usage = WINED3DUSAGE_RENDERTARGET; + wined3d_desc.backbuffer_usage = wined3d_usage_from_dxgi_usage(swapchain_desc->BufferUsage); wined3d_sample_desc_from_dxgi(&wined3d_desc.multisample_type, &wined3d_desc.multisample_quality, &swapchain_desc->SampleDesc); wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 2983ec5..9df1f56 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -273,7 +273,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc(IDXGISwapChain1 *iface, struct dxgi_swapchain *swapchain = impl_from_IDXGISwapChain1(iface); struct wined3d_swapchain_desc wined3d_desc; - FIXME("iface %p, desc %p partial stub!\n", iface, desc); + TRACE("iface %p, desc %p.\n", iface, desc); if (!desc) { @@ -285,7 +285,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc(IDXGISwapChain1 *iface, wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); wined3d_mutex_unlock(); - FIXME("Ignoring ScanlineOrdering, Scaling, BufferUsage and SwapEffect.\n"); + FIXME("Ignoring ScanlineOrdering, Scaling and SwapEffect.\n"); desc->BufferDesc.Width = wined3d_desc.backbuffer_width; desc->BufferDesc.Height = wined3d_desc.backbuffer_height; @@ -294,8 +294,9 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc(IDXGISwapChain1 *iface, desc->BufferDesc.Format = dxgi_format_from_wined3dformat(wined3d_desc.backbuffer_format); desc->BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; desc->BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; - dxgi_sample_desc_from_wined3d(&desc->SampleDesc, wined3d_desc.multisample_type, wined3d_desc.multisample_quality); - desc->BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + dxgi_sample_desc_from_wined3d(&desc->SampleDesc, + wined3d_desc.multisample_type, wined3d_desc.multisample_quality); + desc->BufferUsage = dxgi_usage_from_wined3d_usage(wined3d_desc.backbuffer_usage); desc->BufferCount = wined3d_desc.backbuffer_count; desc->OutputWindow = wined3d_desc.device_window; desc->Windowed = wined3d_desc.windowed; @@ -444,7 +445,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc1(IDXGISwapChain1 *iface, wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); wined3d_mutex_unlock(); - FIXME("Ignoring Stereo, BufferUsage, Scaling, SwapEffect and AlphaMode.\n"); + FIXME("Ignoring Stereo, Scaling, SwapEffect and AlphaMode.\n"); desc->Width = wined3d_desc.backbuffer_width; desc->Height = wined3d_desc.backbuffer_height; @@ -452,7 +453,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc1(IDXGISwapChain1 *iface, desc->Stereo = FALSE; dxgi_sample_desc_from_wined3d(&desc->SampleDesc, wined3d_desc.multisample_type, wined3d_desc.multisample_quality); - desc->BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + desc->BufferUsage = dxgi_usage_from_wined3d_usage(wined3d_desc.backbuffer_usage); desc->BufferCount = wined3d_desc.backbuffer_count; desc->Scaling = DXGI_SCALING_STRETCH; desc->SwapEffect = DXGI_SWAP_EFFECT_DISCARD; diff --git a/dlls/dxgi/utils.c b/dlls/dxgi/utils.c index db74a48..a881746 100644 --- a/dlls/dxgi/utils.c +++ b/dlls/dxgi/utils.c @@ -453,6 +453,36 @@ void wined3d_display_mode_from_dxgi(struct wined3d_display_mode *wined3d_mode, wined3d_mode->scanline_ordering = wined3d_scanline_ordering_from_dxgi(mode->ScanlineOrdering); } +DXGI_USAGE dxgi_usage_from_wined3d_usage(DWORD wined3d_usage) +{ + DXGI_USAGE dxgi_usage = 0; + + if (wined3d_usage & WINED3DUSAGE_TEXTURE) + dxgi_usage |= DXGI_USAGE_SHADER_INPUT; + if (wined3d_usage & WINED3DUSAGE_RENDERTARGET) + dxgi_usage |= DXGI_USAGE_RENDER_TARGET_OUTPUT; + + wined3d_usage &= ~(WINED3DUSAGE_TEXTURE | WINED3DUSAGE_RENDERTARGET); + if (wined3d_usage) + FIXME("Unhandled wined3d usage %#x.\n", wined3d_usage); + return dxgi_usage; +} + +DWORD wined3d_usage_from_dxgi_usage(DXGI_USAGE dxgi_usage) +{ + DWORD wined3d_usage = 0; + + if (dxgi_usage & DXGI_USAGE_SHADER_INPUT) + wined3d_usage |= WINED3DUSAGE_TEXTURE; + if (dxgi_usage & DXGI_USAGE_RENDER_TARGET_OUTPUT) + wined3d_usage |= WINED3DUSAGE_RENDERTARGET; + + dxgi_usage &= ~(DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT); + if (dxgi_usage) + FIXME("Unhandled DXGI usage %#x.\n", dxgi_usage); + return wined3d_usage; +} + #define DXGI_WINED3D_SWAPCHAIN_FLAGS \ (WINED3D_SWAPCHAIN_USE_CLOSEST_MATCHING_MODE | WINED3D_SWAPCHAIN_RESTORE_WINDOW_RECT)

1 0

Józef Kucia : d3d11: Use proper bind flags for swapchain textures.
by Alexandre Julliard 25 Jan '18

25 Jan '18

Module: wine Branch: master Commit: 29b9724a14b8e57689bd7a9d2c84ff4edae71e64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29b9724a14b8e57689bd7a9d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 25 10:33:29 2018 +0100 d3d11: Use proper bind flags for swapchain textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 4 ++-- dlls/d3d11/d3d11_private.h | 1 + dlls/d3d11/device.c | 9 +++------ dlls/d3d11/tests/d3d11.c | 4 ++-- dlls/d3d11/utils.c | 15 +++++++++++++++ 5 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index ca0fd8b..86a8f43 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -8758,13 +8758,13 @@ static void test_swapchain_flip(void) ok(SUCCEEDED(hr), "Failed to create shader resource view, hr %#x.\n", hr); ID3D10Texture2D_GetDesc(backbuffer_0, &texture_desc); - todo_wine ok((texture_desc.BindFlags & (D3D10_BIND_RENDER_TARGET | D3D10_BIND_SHADER_RESOURCE)) + ok((texture_desc.BindFlags & (D3D10_BIND_RENDER_TARGET | D3D10_BIND_SHADER_RESOURCE)) == (D3D10_BIND_RENDER_TARGET | D3D10_BIND_SHADER_RESOURCE), "Got unexpected bind flags %x.\n", texture_desc.BindFlags); ok(texture_desc.Usage == D3D10_USAGE_DEFAULT, "Got unexpected usage %u.\n", texture_desc.Usage); ID3D10Texture2D_GetDesc(backbuffer_1, &texture_desc); - todo_wine ok((texture_desc.BindFlags & (D3D10_BIND_RENDER_TARGET | D3D10_BIND_SHADER_RESOURCE)) + ok((texture_desc.BindFlags & (D3D10_BIND_RENDER_TARGET | D3D10_BIND_SHADER_RESOURCE)) == (D3D10_BIND_RENDER_TARGET | D3D10_BIND_SHADER_RESOURCE), "Got unexpected bind flags %x.\n", texture_desc.BindFlags); ok(texture_desc.Usage == D3D10_USAGE_DEFAULT, "Got unexpected usage %u.\n", texture_desc.Usage); diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index a184b93..9089398 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -67,6 +67,7 @@ void d3d11_primitive_topology_from_wined3d_primitive_type(enum wined3d_primitive void wined3d_primitive_type_from_d3d11_primitive_topology(D3D11_PRIMITIVE_TOPOLOGY topology, enum wined3d_primitive_type *type, unsigned int *patch_vertex_count) DECLSPEC_HIDDEN; unsigned int wined3d_getdata_flags_from_d3d11_async_getdata_flags(unsigned int d3d11_flags) DECLSPEC_HIDDEN; +UINT d3d11_bind_flags_from_wined3d_usage(DWORD wined3d_usage) DECLSPEC_HIDDEN; DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_resource_from_d3d11_resource(ID3D11Resource *resource) DECLSPEC_HIDDEN; struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *resource) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 86778f3..cde5b3c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -5771,11 +5771,8 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic D3D11_TEXTURE2D_DESC desc; HRESULT hr; - FIXME("device_parent %p, container_parent %p, wined3d_desc %p, texture flags %#x, " - "wined3d_texture %p partial stub!\n", device_parent, container_parent, - wined3d_desc, texture_flags, wined3d_texture); - - FIXME("Implement DXGI<->wined3d usage conversion.\n"); + TRACE("device_parent %p, container_parent %p, wined3d_desc %p, texture_flags %#x, wined3d_texture %p.\n", + device_parent, container_parent, wined3d_desc, texture_flags, wined3d_texture); desc.Width = wined3d_desc->width; desc.Height = wined3d_desc->height; @@ -5785,7 +5782,7 @@ static HRESULT CDECL device_parent_create_swapchain_texture(struct wined3d_devic desc.SampleDesc.Count = wined3d_desc->multisample_type ? wined3d_desc->multisample_type : 1; desc.SampleDesc.Quality = wined3d_desc->multisample_quality; desc.Usage = D3D11_USAGE_DEFAULT; - desc.BindFlags = D3D11_BIND_RENDER_TARGET; + desc.BindFlags = d3d11_bind_flags_from_wined3d_usage(wined3d_desc->usage); desc.CPUAccessFlags = 0; desc.MiscFlags = 0; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 19e428c..ca71718 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11265,13 +11265,13 @@ static void test_swapchain_flip(void) ok(SUCCEEDED(hr), "Failed to create shader resource view, hr %#x.\n", hr); ID3D11Texture2D_GetDesc(backbuffer_0, &texture_desc); - todo_wine ok((texture_desc.BindFlags & (D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE)) + ok((texture_desc.BindFlags & (D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE)) == (D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE), "Got unexpected bind flags %x.\n", texture_desc.BindFlags); ok(texture_desc.Usage == D3D11_USAGE_DEFAULT, "Got unexpected usage %u.\n", texture_desc.Usage); ID3D11Texture2D_GetDesc(backbuffer_1, &texture_desc); - todo_wine ok((texture_desc.BindFlags & (D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE)) + ok((texture_desc.BindFlags & (D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE)) == (D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE), "Got unexpected bind flags %x.\n", texture_desc.BindFlags); ok(texture_desc.Usage == D3D11_USAGE_DEFAULT, "Got unexpected usage %u.\n", texture_desc.Usage); diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index c72216d..ae761f4 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -438,6 +438,21 @@ unsigned int wined3d_getdata_flags_from_d3d11_async_getdata_flags(unsigned int d return WINED3DGETDATA_FLUSH; } +UINT d3d11_bind_flags_from_wined3d_usage(DWORD wined3d_usage) +{ + UINT bind_flags = 0; + + if (wined3d_usage & WINED3DUSAGE_TEXTURE) + bind_flags |= D3D11_BIND_SHADER_RESOURCE; + if (wined3d_usage & WINED3DUSAGE_RENDERTARGET) + bind_flags |= D3D11_BIND_RENDER_TARGET; + + wined3d_usage &= ~(WINED3DUSAGE_TEXTURE | WINED3DUSAGE_RENDERTARGET); + if (wined3d_usage) + FIXME("Unhandled wined3d usage %#x.\n", wined3d_usage); + return bind_flags; +} + DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) { static const DWORD handled = D3D11_BIND_SHADER_RESOURCE

1 0

Józef Kucia : dxgi/tests: Add test for back buffer usage flags.
by Alexandre Julliard 25 Jan '18

25 Jan '18

Module: wine Branch: master Commit: a39e312e8dd9e21e97c45be52289130803ab52e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a39e312e8dd9e21e97c45be5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 25 10:33:30 2018 +0100 dxgi/tests: Add test for back buffer usage flags. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 94 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 88 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index f7b3ba0..4ad5b9f 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -3039,18 +3039,24 @@ static void test_swapchain_resize(void) static void test_swapchain_parameters(void) { + DXGI_USAGE usage, expected_usage, broken_usage; + D3D10_TEXTURE2D_DESC d3d10_texture_desc; + D3D11_TEXTURE2D_DESC d3d11_texture_desc; + unsigned int expected_bind_flags; + ID3D10Texture2D *d3d10_texture; + ID3D11Texture2D *d3d11_texture; + DXGI_SWAP_CHAIN_DESC desc; IDXGISwapChain *swapchain; - IUnknown *obj; + IDXGIResource *resource; IDXGIAdapter *adapter; IDXGIFactory *factory; IDXGIDevice *device; - IDXGIResource *resource; - DXGI_SWAP_CHAIN_DESC desc; - HRESULT hr; unsigned int i, j; ULONG refcount; - DXGI_USAGE usage, expected_usage, broken_usage; + IUnknown *obj; HWND window; + HRESULT hr; + static const struct { BOOL windowed; @@ -3122,6 +3128,19 @@ static void test_swapchain_parameters(void) {FALSE, 17, DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, {FALSE, 17, DXGI_SWAP_EFFECT_FLIP_DISCARD, DXGI_ERROR_INVALID_CALL, DXGI_ERROR_INVALID_CALL, 0}, }; + static const DXGI_USAGE usage_tests[] = + { + 0, + DXGI_USAGE_BACK_BUFFER, + DXGI_USAGE_SHADER_INPUT, + DXGI_USAGE_RENDER_TARGET_OUTPUT, + DXGI_USAGE_DISCARD_ON_PRESENT, + DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_BACK_BUFFER, + DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_DISCARD_ON_PRESENT, + DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_BACK_BUFFER | DXGI_USAGE_DISCARD_ON_PRESENT, + DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT, + DXGI_USAGE_SHADER_INPUT | DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_DISCARD_ON_PRESENT, + }; if (!(device = create_device(0))) { @@ -3132,7 +3151,7 @@ static void test_swapchain_parameters(void) 0, 0, 640, 480, 0, 0, 0, 0); hr = IDXGIDevice_QueryInterface(device, &IID_IUnknown, (void **)&obj); - ok(SUCCEEDED(hr), "IDXGIDevice does not implement IUnknown\n"); + ok(SUCCEEDED(hr), "IDXGIDevice does not implement IUnknown.\n"); hr = IDXGIDevice_GetAdapter(device, &adapter); ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); @@ -3228,6 +3247,69 @@ static void test_swapchain_parameters(void) IDXGISwapChain_Release(swapchain); } + for (i = 0; i < sizeof(usage_tests) / sizeof(*usage_tests); ++i) + { + usage = usage_tests[i]; + + memset(&desc, 0, sizeof(desc)); + desc.BufferDesc.Width = registry_mode.dmPelsWidth; + desc.BufferDesc.Height = registry_mode.dmPelsHeight; + desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.SampleDesc.Count = 1; + desc.BufferUsage = usage; + desc.BufferCount = 1; + desc.OutputWindow = window; + desc.Windowed = TRUE; + desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + hr = IDXGIFactory_CreateSwapChain(factory, obj, &desc, &swapchain); + ok(hr == S_OK, "Got unexpected hr %#x, test %u.\n", hr, i); + + hr = IDXGISwapChain_GetDesc(swapchain, &desc); + ok(hr == S_OK, "Failed to get swapchain desc, hr %#x, test %u.\n", hr, i); + todo_wine_if(usage & ~(DXGI_USAGE_RENDER_TARGET_OUTPUT | DXGI_USAGE_SHADER_INPUT)) + ok(desc.BufferUsage == usage, "Got usage %#x, expected %#x, test %u.\n", desc.BufferUsage, usage, i); + + expected_bind_flags = 0; + if (usage & DXGI_USAGE_RENDER_TARGET_OUTPUT) + expected_bind_flags |= D3D11_BIND_RENDER_TARGET; + if (usage & DXGI_USAGE_SHADER_INPUT) + expected_bind_flags |= D3D11_BIND_SHADER_RESOURCE; + + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D10Texture2D, (void **)&d3d10_texture); + ok(hr == S_OK, "Failed to get d3d10 texture, hr %#x, test %u.\n", hr, i); + ID3D10Texture2D_GetDesc(d3d10_texture, &d3d10_texture_desc); + ok(d3d10_texture_desc.BindFlags == expected_bind_flags, + "Got d3d10 bind flags %#x, expected %#x, test %u.\n", + d3d10_texture_desc.BindFlags, expected_bind_flags, i); + ID3D10Texture2D_Release(d3d10_texture); + + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_ID3D11Texture2D, (void **)&d3d11_texture); + ok(hr == S_OK || broken(hr == E_NOINTERFACE), "Failed to get d3d11 texture, hr %#x, test %u.\n", hr, i); + if (SUCCEEDED(hr)) + { + ID3D11Texture2D_GetDesc(d3d11_texture, &d3d11_texture_desc); + ok(d3d11_texture_desc.BindFlags == expected_bind_flags, + "Got d3d11 bind flags %#x, expected %#x, test %u.\n", + d3d11_texture_desc.BindFlags, expected_bind_flags, i); + ID3D11Texture2D_Release(d3d11_texture); + } + + hr = IDXGISwapChain_GetBuffer(swapchain, 0, &IID_IDXGIResource, (void **)&resource); + todo_wine ok(hr == S_OK, "Failed to get buffer, hr %#x, test %u.\n", hr, i); + if (FAILED(hr)) + { + IDXGISwapChain_Release(swapchain); + continue; + } + expected_usage = usage | DXGI_USAGE_BACK_BUFFER | DXGI_USAGE_DISCARD_ON_PRESENT; + hr = IDXGIResource_GetUsage(resource, &usage); + ok(hr == S_OK, "Failed to get resource usage, hr %#x, test %u.\n", hr, i); + ok(usage == expected_usage, "Got usage %x, expected %x, test %u.\n", usage, expected_usage, i); + IDXGIResource_Release(resource); + + IDXGISwapChain_Release(swapchain); + } + IDXGIFactory_Release(factory); IDXGIAdapter_Release(adapter); IUnknown_Release(obj);

1 0

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

25 Jan '18

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