March 2022 - Wine-commits - list.winehq.org

Brendan Shanks : ntdll: Ensure CONTEXT_EX on exception stack is initialized.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: a906f13f774ca9fb575cd8cabb48fcb5ac4bf788 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a906f13f774ca9fb575cd8ca… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Mar 3 10:24:22 2022 -0800 ntdll: Ensure CONTEXT_EX on exception stack is initialized. On non-AVX CPUs, CONTEXT_EX is not being initialized. In WOW64 mode, this results in invalid exception records when dispatch_wow_exception() uses RtlCopyContext(). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 23 +++++++++++++++++++---- dlls/ntdll/unix/signal_x86_64.c | 23 +++++++++++++++++++---- 2 files changed, 38 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 6bb5649e2b5..e2a6148d609 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -581,12 +581,23 @@ static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) xctx->Legacy.Length = sizeof(CONTEXT); xctx->Legacy.Offset = -(LONG)sizeof(CONTEXT); - xctx->XState.Length = sizeof(XSTATE); - xctx->XState.Offset = (BYTE *)xstate_buffer - (BYTE *)xctx; + if (xstate_buffer) + { + xctx->XState.Length = sizeof(XSTATE); + xctx->XState.Offset = (BYTE *)xstate_buffer - (BYTE *)xctx; + context->ContextFlags |= CONTEXT_XSTATE; + + xctx->All.Length = sizeof(CONTEXT) + xctx->XState.Offset + xctx->XState.Length; + } + else + { + xctx->XState.Length = 25; + xctx->XState.Offset = 0; + + xctx->All.Length = sizeof(CONTEXT) + 24; /* sizeof(CONTEXT_EX) minus 8 alignment bytes on x64. */ + } - xctx->All.Length = sizeof(CONTEXT) + xctx->XState.Offset + xctx->XState.Length; xctx->All.Offset = -(LONG)sizeof(CONTEXT); - context->ContextFlags |= CONTEXT_XSTATE; } @@ -1456,6 +1467,10 @@ C_ASSERT( (offsetof(struct stack_layout, xstate) == sizeof(struct stack_layout)) memcpy( &dst_xs->YmmContext, &src_xs->YmmContext, sizeof(dst_xs->YmmContext) ); } } + else + { + context_init_xstate( &stack->context, NULL ); + } stack->rec_ptr = &stack->rec; stack->context_ptr = &stack->context; diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 68855dccacf..34334f72ff0 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -411,12 +411,23 @@ static inline void context_init_xstate( CONTEXT *context, void *xstate_buffer ) xctx->Legacy.Length = sizeof(CONTEXT); xctx->Legacy.Offset = -(LONG)sizeof(CONTEXT); - xctx->XState.Length = sizeof(XSTATE); - xctx->XState.Offset = (BYTE *)xstate_buffer - (BYTE *)xctx; + if (xstate_buffer) + { + xctx->XState.Length = sizeof(XSTATE); + xctx->XState.Offset = (BYTE *)xstate_buffer - (BYTE *)xctx; + context->ContextFlags |= CONTEXT_XSTATE; + + xctx->All.Length = sizeof(CONTEXT) + xctx->XState.Offset + xctx->XState.Length; + } + else + { + xctx->XState.Length = 25; + xctx->XState.Offset = 0; + + xctx->All.Length = sizeof(CONTEXT) + 24; /* sizeof(CONTEXT_EX) minus 8 alignment bytes on x64. */ + } - xctx->All.Length = sizeof(CONTEXT) + xctx->XState.Offset + xctx->XState.Length; xctx->All.Offset = -(LONG)sizeof(CONTEXT); - context->ContextFlags |= CONTEXT_XSTATE; } static USHORT cs32_sel; /* selector for %cs in 32-bit mode */ @@ -2195,6 +2206,10 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec memcpy( &dst_xs->YmmContext, &src_xs->YmmContext, sizeof(dst_xs->YmmContext) ); } } + else + { + context_init_xstate( &stack->context, NULL ); + } CS_sig(sigcontext) = cs64_sel; RIP_sig(sigcontext) = (ULONG_PTR)pKiUserExceptionDispatcher;

1 0

Hans Leidekker : include: Add OCSP definitions.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: 39d6ac0d9cd38eff5eea1f0b7577e4264378385c URL: https://source.winehq.org/git/wine.git/?a=commit;h=39d6ac0d9cd38eff5eea1f0b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 4 13:57:14 2022 +0100 include: Add OCSP definitions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wincrypt.h | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/include/wincrypt.h b/include/wincrypt.h index 456f2f14446..f5f05c1f8d0 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -608,6 +608,97 @@ typedef struct _CERT_SIGNED_CONTENT_INFO { CRYPT_BIT_BLOB Signature; } CERT_SIGNED_CONTENT_INFO, *PCERT_SIGNED_CONTENT_INFO; +typedef struct _OCSP_SIGNATURE_INFO { + CRYPT_ALGORITHM_IDENTIFIER SignatureAlgorithm; + CRYPT_BIT_BLOB Signature; + DWORD cCertEncoded; + PCERT_BLOB rgCertEncoded; +} OCSP_SIGNATURE_INFO, *POCSP_SIGNATURE_INFO; + +typedef struct _OCSP_SIGNED_REQUEST_INFO { + CRYPT_DER_BLOB ToBeSigned; + POCSP_SIGNATURE_INFO pOptionalSignatureInfo; +} OCSP_SIGNED_REQUEST_INFO, *POCSP_SIGNED_REQUEST_INFO; + +typedef struct _OCSP_CERT_ID { + CRYPT_ALGORITHM_IDENTIFIER HashAlgorithm; + CRYPT_HASH_BLOB IssuerNameHash; + CRYPT_HASH_BLOB IssuerKeyHash; + CRYPT_INTEGER_BLOB SerialNumber; +} OCSP_CERT_ID, *POCSP_CERT_ID; + +typedef struct _OCSP_REQUEST_ENTRY { + OCSP_CERT_ID CertId; + DWORD cExtension; + PCERT_EXTENSION rgExtension; +} OCSP_REQUEST_ENTRY, *POCSP_REQUEST_ENTRY; + +#define OCSP_REQUEST_V1 0 + +typedef struct _OCSP_REQUEST_INFO { + DWORD dwVersion; + PCERT_ALT_NAME_ENTRY pRequestorName; + DWORD cRequestEntry; + POCSP_REQUEST_ENTRY rgRequestEntry; + DWORD cExtension; + PCERT_EXTENSION rgExtension; +} OCSP_REQUEST_INFO, *POCSP_REQUEST_INFO; + +#define OCSP_SUCCESSFUL_RESPONSE 0 +#define OCSP_MALFORMED_REQUEST_RESPONSE 1 +#define OCSP_INTERNAL_ERROR_RESPONSE 2 +#define OCSP_TRY_LATER_RESPONSE 3 +#define OCSP_SIG_REQUIRED_RESPONSE 5 +#define OCSP_UNAUTHORIZED_RESPONSE 6 + +#define szOID_PKIX_OCSP_BASIC_SIGNED_RESPONSE "1.3.6.1.5.5.7.48.1.1" + +typedef struct _OCSP_RESPONSE_INFO { + DWORD dwStatus; + LPSTR pszObjId; + CRYPT_OBJID_BLOB Value; +} OCSP_RESPONSE_INFO, *POCSP_RESPONSE_INFO; + +typedef struct _OCSP_BASIC_SIGNED_RESPONSE_INFO { + CRYPT_DER_BLOB ToBeSigned; + OCSP_SIGNATURE_INFO SignatureInfo; +} OCSP_BASIC_SIGNED_RESPONSE_INFO, *POCSP_BASIC_SIGNED_RESPONSE_INFO; + +typedef struct _OCSP_BASIC_REVOKED_INFO { + FILETIME RevocationDate; + DWORD dwCrlReasonCode; +} OCSP_BASIC_REVOKED_INFO, *POCSP_BASIC_REVOKED_INFO; + +typedef struct _OCSP_BASIC_RESPONSE_ENTRY { + OCSP_CERT_ID CertId; + DWORD dwCertStatus; + union { + POCSP_BASIC_REVOKED_INFO pRevokedInfo; + } DUMMYUNIONNAME; + FILETIME ThisUpdate; + FILETIME NextUpdate; + DWORD cExtension; + PCERT_EXTENSION rgExtension; +} OCSP_BASIC_RESPONSE_ENTRY, *POCSP_BASIC_RESPONSE_ENTRY; + +#define OCSP_BASIC_RESPONSE_V1 0 +#define OCSP_BASIC_BY_NAME_RESPONDER_ID 1 +#define OCSP_BASIC_BY_KEY_RESPONDER_ID 2 + +typedef struct _OCSP_BASIC_RESPONSE_INFO { + DWORD dwVersion; + DWORD dwResponderIdChoice; + union { + CERT_NAME_BLOB ByNameResponderId; + CRYPT_HASH_BLOB ByKeyResponderId; + } DUMMYUNIONNAME; + FILETIME ProducedAt; + DWORD cResponseEntry; + POCSP_BASIC_RESPONSE_ENTRY rgResponseEntry; + DWORD cExtension; + PCERT_EXTENSION rgExtension; +} OCSP_BASIC_RESPONSE_INFO, *POCSP_BASIC_RESPONSE_INFO; + typedef struct _CRL_CONTEXT { DWORD dwCertEncodingType; BYTE *pbCrlEncoded; @@ -3179,6 +3270,11 @@ typedef struct _CTL_FIND_SUBJECT_PARA #define CMC_ADD_EXTENSIONS ((LPCSTR)62) #define CMC_ADD_ATTRIBUTES ((LPCSTR)63) #define X509_CERTIFICATE_TEMPLATE ((LPCSTR)64) +#define OCSP_SIGNED_REQUEST ((LPCSTR)65) +#define OCSP_REQUEST ((LPCSTR)66) +#define OCSP_RESPONSE ((LPCSTR)67) +#define OCSP_BASIC_SIGNED_RESPONSE ((LPCSTR)68) +#define OCSP_BASIC_RESPONSE ((LPCSTR)69) #define CNG_RSA_PUBLIC_KEY_BLOB ((LPCSTR)72) #define X509_OBJECT_IDENTIFIER ((LPCSTR)73) #define PKCS7_SIGNER_INFO ((LPCSTR)500)

1 0

Hans Leidekker : crypt32: Add support for encoding OCSP requests.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: 92821ebd49abfaf7435295c83c9e2bb3604c2f1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=92821ebd49abfaf7435295c8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Mar 4 13:57:15 2022 +0100 crypt32: Add support for encoding OCSP requests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/encode.c | 192 ++++++++++++++++++++++++++++++++++++++++++++ dlls/crypt32/tests/encode.c | 85 ++++++++++++++++++++ 2 files changed, 277 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=92821ebd49abfaf74352…

1 0

Jacek Caban : win32u: Move winproc array from user32.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: 77f3b54ef8b14657a4be536dda8b16130c6e9dda URL: https://source.winehq.org/git/wine.git/?a=commit;h=77f3b54ef8b14657a4be536d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 4 14:27:58 2022 +0100 win32u: Move winproc array from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/controls.h | 26 +------ dlls/user32/user_main.c | 1 + dlls/user32/user_private.h | 1 + dlls/user32/winproc.c | 159 ++++++++++------------------------------ dlls/win32u/Makefile.in | 1 + dlls/win32u/class.c | 167 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 36 ++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/sysparams.c | 4 ++ dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 8 +++ include/ntuser.h | 24 +++++++ 13 files changed, 285 insertions(+), 146 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=77f3b54ef8b14657a4be…

1 0

Jacek Caban : win32u: Implement NtUserGetAtomName.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: c722a0020b70ff3fc5e62509b71ff4d6040509d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c722a0020b70ff3fc5e62509… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 4 14:28:16 2022 +0100 win32u: Implement NtUserGetAtomName. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/class.c | 25 ++++++++++++++++++ dlls/win32u/clipboard.c | 3 ++- dlls/win32u/ntuser_private.h | 2 ++ dlls/win32u/syscall.c | 1 + dlls/win32u/tests/win32u.c | 62 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- include/ntuser.h | 1 + 7 files changed, 94 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index 57f12932d13..b3511f615c6 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -165,3 +165,28 @@ NTSTATUS WINAPI NtUserInitializeClientPfnArrays( const struct user_client_procs return STATUS_SUCCESS; } + +/*********************************************************************** + * NtUserGetAtomName (win32u.@) + */ +ULONG WINAPI NtUserGetAtomName( ATOM atom, UNICODE_STRING *name ) +{ + char buf[sizeof(ATOM_BASIC_INFORMATION) + MAX_ATOM_LEN * sizeof(WCHAR)]; + ATOM_BASIC_INFORMATION *abi = (ATOM_BASIC_INFORMATION *)buf; + UINT size; + + if (!set_ntstatus( NtQueryInformationAtom( atom, AtomBasicInformation, + buf, sizeof(buf), NULL ))) + return 0; + + if (name->MaximumLength < sizeof(WCHAR)) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return 0; + } + + size = min( abi->NameLength, name->MaximumLength - sizeof(WCHAR) ); + if (size) memcpy( name->Buffer, abi->Name, size ); + name->Buffer[size / sizeof(WCHAR)] = 0; + return size / sizeof(WCHAR); +} diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index dca01708803..e132f981344 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -28,6 +28,7 @@ #endif #include "win32u_private.h" +#include "ntuser_private.h" #include "wine/server.h" #include "wine/debug.h" @@ -168,7 +169,7 @@ INT WINAPI NtUserGetPriorityClipboardFormat( UINT *list, INT count ) */ INT WINAPI NtUserGetClipboardFormatName( UINT format, WCHAR *buffer, INT maxlen ) { - char buf[sizeof(ATOM_BASIC_INFORMATION) + 255 * sizeof(WCHAR)]; + char buf[sizeof(ATOM_BASIC_INFORMATION) + MAX_ATOM_LEN * sizeof(WCHAR)]; ATOM_BASIC_INFORMATION *abi = (ATOM_BASIC_INFORMATION *)buf; UINT length = 0; diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 686a4ab1130..2ada1c5b990 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -167,6 +167,8 @@ typedef struct tagWINDOWPROC #define WINPROC_HANDLE (~0u >> 16) #define BUILTIN_WINPROC(index) ((WNDPROC)(ULONG_PTR)((index) | (WINPROC_HANDLE << 16))) +#define MAX_ATOM_LEN 255 + /* class.c */ WNDPROC alloc_winproc( WNDPROC func, BOOL ansi ) DECLSPEC_HIDDEN; WINDOWPROC *get_winproc_ptr( WNDPROC handle ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 51b8d2216ce..48b5ad3979c 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -112,6 +112,7 @@ static void * const syscalls[] = NtUserCreateWindowStation, NtUserDestroyAcceleratorTable, NtUserFindExistingCursorIcon, + NtUserGetAtomName, NtUserGetClipboardFormatName, NtUserGetClipboardOwner, NtUserGetClipboardSequenceNumber, diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 199a7600341..ef25939d10d 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -104,6 +104,67 @@ static void test_window_props(void) DestroyWindow( hwnd ); } +static void test_class(void) +{ + UNICODE_STRING name; + WCHAR buf[64]; + WNDCLASSW cls; + ATOM class; + ULONG ret; + + memset( &cls, 0, sizeof(cls) ); + cls.style = CS_HREDRAW | CS_VREDRAW; + cls.lpfnWndProc = DefWindowProcW; + cls.hInstance = GetModuleHandleW( NULL ); + cls.hbrBackground = GetStockObject( WHITE_BRUSH ); + cls.lpszMenuName = 0; + cls.lpszClassName = L"test"; + + class = RegisterClassW( &cls ); + ok( class, "RegisterClassW failed: %lu\n", GetLastError() ); + + memset( buf, 0xcc, sizeof(buf) ); + name.Buffer = buf; + name.Length = 0xdead; + name.MaximumLength = sizeof(buf); + ret = NtUserGetAtomName( class, &name ); + ok( ret == 4, "NtUserGetAtomName returned %lu\n", ret ); + ok( name.Length == 0xdead, "Length = %u\n", name.Length ); + ok( name.MaximumLength == sizeof(buf), "MaximumLength = %u\n", name.MaximumLength ); + ok( !wcscmp( buf, L"test" ), "buf = %s\n", debugstr_w(buf) ); + + memset( buf, 0xcc, sizeof(buf) ); + name.Buffer = buf; + name.Length = 0xdead; + name.MaximumLength = 8; + ret = NtUserGetAtomName( class, &name ); + ok( ret == 3, "NtUserGetAtomName returned %lu\n", ret ); + ok( name.Length == 0xdead, "Length = %u\n", name.Length ); + ok( name.MaximumLength == 8, "MaximumLength = %u\n", name.MaximumLength ); + ok( !wcscmp( buf, L"tes" ), "buf = %s\n", debugstr_w(buf) ); + + memset( buf, 0xcc, sizeof(buf) ); + name.Buffer = buf; + name.MaximumLength = 1; + SetLastError( 0xdeadbeef ); + ret = NtUserGetAtomName( class, &name ); + ok( !ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "NtUserGetAtomName returned %lx %lu\n", ret, GetLastError() ); + + ret = UnregisterClassW( L"test", GetModuleHandleW(NULL) ); + ok( ret, "UnregisterClassW failed: %lu\n", GetLastError() ); + + memset( buf, 0xcc, sizeof(buf) ); + name.Buffer = buf; + name.MaximumLength = sizeof(buf); + SetLastError( 0xdeadbeef ); + ret = NtUserGetAtomName( class, &name ); + ok( !ret && GetLastError() == ERROR_INVALID_HANDLE, + "NtUserGetAtomName returned %lx %lu\n", ret, GetLastError() ); + ok( buf[0] == 0xcccc, "buf = %s\n", debugstr_w(buf) ); + +} + static BOOL WINAPI count_win( HWND hwnd, LPARAM lparam ) { ULONG *cnt = (ULONG *)lparam; @@ -293,6 +354,7 @@ START_TEST(win32u) test_NtUserEnumDisplayDevices(); test_window_props(); + test_class(); test_NtUserBuildHwndList(); test_cursoricon(); diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index c9e65de4c24..084c54caf5a 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -892,7 +892,7 @@ @ stub NtUserGetAncestor @ stub NtUserGetAppImeLevel @ stdcall NtUserGetAsyncKeyState(long) -@ stub NtUserGetAtomName +@ stdcall -syscall NtUserGetAtomName(long ptr) @ stub NtUserGetAutoRotationState @ stub NtUserGetCIMSSM @ stub NtUserGetCPD diff --git a/include/ntuser.h b/include/ntuser.h index f0daa44f5ad..7f4b3db52d2 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -256,6 +256,7 @@ BOOL WINAPI NtUserEnumDisplaySettings( UNICODE_STRING *device, DWORD mode, HICON WINAPI NtUserFindExistingCursorIcon( UNICODE_STRING *module, UNICODE_STRING *res_name, void *desc ); SHORT WINAPI NtUserGetAsyncKeyState( INT key ); +ULONG WINAPI NtUserGetAtomName( ATOM atom, UNICODE_STRING *name ); INT WINAPI NtUserGetClipboardFormatName( UINT format, WCHAR *buffer, INT maxlen ); HWND WINAPI NtUserGetClipboardOwner(void); DWORD WINAPI NtUserGetClipboardSequenceNumber(void);

1 0

Jacek Caban : win32u: Move NtUserGetClassName implementation from user32.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: cc4fb58d047610596066197b203ad97f51302cb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc4fb58d047610596066197b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 4 14:28:31 2022 +0100 win32u: Move NtUserGetClassName implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 64 ++---------------------------------- dlls/win32u/class.c | 77 ++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 24 ++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/tests/win32u.c | 34 +++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 4 +-- include/ntuser.h | 1 + 8 files changed, 142 insertions(+), 65 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cc4fb58d047610596066…

1 0

Jacek Caban : user32: Factor out find_class.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: dc1f9a114bfc8080192c26ce5cd56131d8ea6674 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc1f9a114bfc8080192c26ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 4 14:28:49 2022 +0100 user32: Factor out find_class. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 79 +++++++++++++++++++++++------------------------------ 1 file changed, 34 insertions(+), 45 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index c835ae06d41..5255ed1ea25 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -296,6 +296,32 @@ static void CLASS_FreeClass( CLASS *classPtr ) USER_Unlock(); } +static CLASS *find_class( HINSTANCE instance, const WCHAR *name ) +{ + ATOM atom = get_int_atom_value( name ); + CLASS *class; + + USER_Lock(); + LIST_FOR_EACH_ENTRY( class, &class_list, CLASS, entry ) + { + if (atom) + { + if (class->atomName != atom) continue; + } + else + { + if (wcsicmp( class->name, name )) continue; + } + if (!class->local || class->hInstance == instance) + { + TRACE("%s %p -> %p\n", debugstr_w(name), instance, class); + return class; + } + } + USER_Unlock(); + return NULL; +} + const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, WCHAR *combined, BOOL register_class ) { ACTCTX_SECTION_KEYED_DATA data; @@ -349,25 +375,9 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, W if (register_class && hmod) { - BOOL found = FALSE; - struct list *ptr; + CLASS *class; - USER_Lock(); - - LIST_FOR_EACH( ptr, &class_list ) - { - CLASS *class = LIST_ENTRY( ptr, CLASS, entry ); - if (wcsicmp( class->name, ret )) continue; - if (!class->local || class->hInstance == hmod) - { - found = TRUE; - break; - } - } - - USER_Unlock(); - - if (!found) + if (!(class = find_class( hmod, ret ))) { BOOL (WINAPI *pRegisterClassNameW)(const WCHAR *class); @@ -375,6 +385,7 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, W if (pRegisterClassNameW) pRegisterClassNameW(name); } + else release_class_ptr( class ); } return ret; @@ -387,8 +398,7 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, W */ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) { - struct list *ptr; - ATOM atom = get_int_atom_value( name ); + CLASS *class; GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ @@ -396,38 +406,17 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) name = CLASS_GetVersionedName( name, NULL, NULL, TRUE ); - for (;;) + while (!(class = find_class( hinstance, name ))) { - USER_Lock(); - - LIST_FOR_EACH( ptr, &class_list ) - { - CLASS *class = LIST_ENTRY( ptr, CLASS, entry ); - if (atom) - { - if (class->atomName != atom) continue; - } - else - { - if (wcsicmp( class->name, name )) continue; - } - if (!class->local || class->hInstance == hinstance) - { - TRACE("%s %p -> %p\n", debugstr_w(name), hinstance, class); - return class; - } - } - USER_Unlock(); - - if (atom) break; + if (IS_INTRESOURCE( name )) break; if (!is_comctl32_class( name )) break; if (GetModuleHandleW( L"comctl32.dll" )) break; if (!LoadLibraryW( L"comctl32.dll" )) break; TRACE( "%s retrying after loading comctl32\n", debugstr_w(name) ); } - TRACE("%s %p -> not found\n", debugstr_w(name), hinstance); - return NULL; + if (!class) TRACE("%s %p -> not found\n", debugstr_w(name), hinstance); + return class; } /***********************************************************************

1 0

Jacek Caban : user32: Store class instance as UINT_PTR.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: 7acd2f1ced4cbb8d340b3497f620606d5dc31bd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7acd2f1ced4cbb8d340b3497… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 4 14:28:59 2022 +0100 user32: Store class instance as UINT_PTR. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 15 ++++++++------- dlls/win32u/ntuser_private.h | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 5255ed1ea25..b24e72be324 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -296,9 +296,10 @@ static void CLASS_FreeClass( CLASS *classPtr ) USER_Unlock(); } -static CLASS *find_class( HINSTANCE instance, const WCHAR *name ) +static CLASS *find_class( HINSTANCE module, const WCHAR *name ) { ATOM atom = get_int_atom_value( name ); + UINT_PTR instance = (UINT_PTR)module; CLASS *class; USER_Lock(); @@ -312,9 +313,9 @@ static CLASS *find_class( HINSTANCE instance, const WCHAR *name ) { if (wcsicmp( class->name, name )) continue; } - if (!class->local || class->hInstance == instance) + if (!class->local || class->instance == instance) { - TRACE("%s %p -> %p\n", debugstr_w(name), instance, class); + TRACE("%s %Ix -> %p\n", debugstr_w(name), instance, class); return class; } } @@ -477,7 +478,7 @@ static CLASS *CLASS_RegisterClass( LPCWSTR name, UINT basename_offset, HINSTANCE classPtr->local = local; classPtr->cbWndExtra = winExtra; classPtr->cbClsExtra = classExtra; - classPtr->hInstance = hInstance; + classPtr->instance = (UINT_PTR)hInstance; /* Other non-null values must be set by caller */ @@ -953,7 +954,7 @@ static ULONG_PTR CLASS_GetClassLong( HWND hwnd, INT offset, UINT size, retvalue = class->cbClsExtra; break; case GCLP_HMODULE: - retvalue = (ULONG_PTR)class->hInstance; + retvalue = class->instance; break; case GCLP_WNDPROC: retvalue = (ULONG_PTR)WINPROC_GetProc( class->winproc, unicode ); @@ -1120,8 +1121,8 @@ static ULONG_PTR CLASS_SetClassLong( HWND hwnd, INT offset, LONG_PTR newval, break; case GCLP_HMODULE: if (!set_server_info( hwnd, offset, newval, size )) break; - retval = (ULONG_PTR)class->hInstance; - class->hInstance = (HINSTANCE)newval; + retval = class->instance; + class->instance = newval; break; case GCW_ATOM: if (!set_server_info( hwnd, offset, newval, size )) break; diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index a7f05f9c5d2..8878718d416 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -179,7 +179,7 @@ typedef struct tagCLASS INT cbWndExtra; /* Window extra bytes */ LPWSTR menuName; /* Default menu name (Unicode followed by ASCII) */ struct dce *dce; /* Opaque pointer to class DCE */ - HINSTANCE hInstance; /* Module that created the task */ + UINT_PTR instance; /* Module that created the task */ HICON hIcon; /* Default icon */ HICON hIconSm; /* Default small icon */ HICON hIconSmIntern; /* Internal small icon, derived from hIcon */

1 0

Jacek Caban : user32: Ignore low instance word in find_class.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: 9b9d818252fe1a47f3ca52d028dc10d52fa33597 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b9d818252fe1a47f3ca52d0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 4 14:29:21 2022 +0100 user32: Ignore low instance word in find_class. Like we do in wineserver. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 4 ++-- dlls/user32/tests/class.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index b24e72be324..31b02e4658f 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -299,7 +299,7 @@ static void CLASS_FreeClass( CLASS *classPtr ) static CLASS *find_class( HINSTANCE module, const WCHAR *name ) { ATOM atom = get_int_atom_value( name ); - UINT_PTR instance = (UINT_PTR)module; + UINT_PTR instance = (UINT_PTR)module & ~0xffff; CLASS *class; USER_Lock(); @@ -313,7 +313,7 @@ static CLASS *find_class( HINSTANCE module, const WCHAR *name ) { if (wcsicmp( class->name, name )) continue; } - if (!class->local || class->instance == instance) + if (!class->local || (class->instance & ~0xffff) == instance) { TRACE("%s %Ix -> %p\n", debugstr_w(name), instance, class); return class; diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index e6762032107..c13893ae9d3 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -90,12 +90,14 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) WNDCLASSW cls, wc; static const WCHAR className[] = {'T','e','s','t','C','l','a','s','s',0}; static const WCHAR winName[] = {'W','i','n','C','l','a','s','s','T','e','s','t',0}; + WNDCLASSW info; ATOM test_atom; HWND hTestWnd; LONG i; WCHAR str[20]; ATOM classatom; HINSTANCE hInstance2; + BOOL ret; cls.style = CS_HREDRAW | CS_VREDRAW | (global?CS_GLOBALCLASS:0); cls.lpfnWndProc = ClassTest_WndProc; @@ -136,6 +138,9 @@ static void ClassTest(HINSTANCE hInstance, BOOL global) DestroyWindow(hTestWnd); + ret = GetClassInfoW(hInstance2, className, &info); + ok(ret, "GetClassInfoW failed: %u\n", GetLastError()); + hTestWnd = CreateWindowW (className, winName, WS_OVERLAPPEDWINDOW + WS_HSCROLL + WS_VSCROLL, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, 0,

1 0

Martin Storsjö : ntdll: Zero-initialize the syscall_frame used for starting threads on ARM/ARM64.
by Alexandre Julliard 04 Mar '22

04 Mar '22

Module: wine Branch: master Commit: 482b6a6dea4f73db84354ff31c5cde20998aaa81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=482b6a6dea4f73db84354ff3… Author: Martin Storsjö <martin(a)martin.st> Date: Fri Mar 4 18:15:56 2022 +0200 ntdll: Zero-initialize the syscall_frame used for starting threads on ARM/ARM64. This fixes an inconsistency since fed7e7a78b4bea183d0cbb107953e275f17baa4f (ntdll: Simulate a syscall return when starting a thread); in that commit, on i386 and x86_64, the syscall_frame used for starting the thread was zeroed with a memset, while it wasn't on arm and arm64. This had a noticable effect on float maths, where the uninitialized frame->restore_flags field could have the CONTEXT_FLOATING_POINT bit set. (call_init_thunk only ORs in CONTEXT_INTEGER into the restore_flags field, on all architectures). If that bit was set, it would restore uninitialized data into the fpscr register, possibly setting the FPU in a nondefault rounding mode. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm.c | 1 + dlls/ntdll/unix/signal_arm64.c | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index a1bcb0ddd32..1fea76f6563 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -1105,6 +1105,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B ctx = (CONTEXT *)((ULONG_PTR)context.Sp & ~15) - 1; *ctx = context; ctx->ContextFlags = CONTEXT_FULL; + memset( frame, 0, sizeof(*frame) ); NtSetContextThread( GetCurrentThread(), ctx ); frame->sp = (DWORD)ctx; diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 94f280e218a..1df97f16f13 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -1202,6 +1202,7 @@ void DECLSPEC_HIDDEN call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, B ctx = (CONTEXT *)((ULONG_PTR)context.Sp & ~15) - 1; *ctx = context; ctx->ContextFlags = CONTEXT_FULL; + memset( frame, 0, sizeof(*frame) ); NtSetContextThread( GetCurrentThread(), ctx ); frame->sp = (ULONG64)ctx;

1 0