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

Eric Pouech : mf/tests: Enable compilation with long types.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 506963aaea8e3c6e4820884b3308da27f435e580 URL: https://source.winehq.org/git/wine.git/?a=commit;h=506963aaea8e3c6e4820884b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:24:43 2022 +0100 mf/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/Makefile.in | 1 - dlls/mf/tests/mf.c | 2670 ++++++++++++++++++++++----------------------- 2 files changed, 1335 insertions(+), 1336 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=506963aaea8e3c6e4820…

1 0

Jacek Caban : user32: Introduce get_class_info.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 5e75e5f66dc638ef9684f949e32a17a9df43fcdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e75e5f66dc638ef9684f949… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 7 14:41:03 2022 +0100 user32: Introduce get_class_info. And use it in WIN_CreateWindowEx to trigger class registration. 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 | 42 ++++++++++++++++++++++++++++++++++-------- dlls/user32/user_private.h | 3 +-- dlls/user32/win.c | 29 +++++++++++------------------ 3 files changed, 46 insertions(+), 28 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 31b02e4658f..647a6b9b2bf 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -211,6 +211,16 @@ static BOOL set_server_info( HWND hwnd, INT offset, LONG_PTR newval, UINT size ) } +static void init_class_name( UNICODE_STRING *str, const WCHAR *name ) +{ + if (IS_INTRESOURCE( name )) + { + str->Buffer = (WCHAR *)name; + str->Length = str->MaximumLength = 0; + } + else RtlInitUnicodeString( str, name ); +} + /*********************************************************************** * CLASS_GetMenuNameA * @@ -253,7 +263,6 @@ static void CLASS_SetMenuNameA( CLASS *classPtr, LPCSTR name ) else classPtr->menuName = (LPWSTR)name; } - /*********************************************************************** * CLASS_SetMenuNameW * @@ -313,7 +322,7 @@ static CLASS *find_class( HINSTANCE module, const WCHAR *name ) { if (wcsicmp( class->name, name )) continue; } - if (!class->local || (class->instance & ~0xffff) == instance) + if (!class->local || !module || (class->instance & ~0xffff) == instance) { TRACE("%s %Ix -> %p\n", debugstr_w(name), instance, class); return class; @@ -323,7 +332,7 @@ static CLASS *find_class( HINSTANCE module, const WCHAR *name ) return NULL; } -const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, WCHAR *combined, BOOL register_class ) +static const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, WCHAR *combined, BOOL register_class ) { ACTCTX_SECTION_KEYED_DATA data; struct wndclass_redirect_data @@ -397,11 +406,12 @@ const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, W * * Return a pointer to the class. */ -static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) +static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance, UNICODE_STRING *name_str ) { CLASS *class; - GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ + if (name != (LPCWSTR)DESKTOP_CLASS_ATOM && (IS_INTRESOURCE(name) || wcsicmp( name, L"Message" ))) + GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ if (!name) return NULL; @@ -417,6 +427,7 @@ static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance ) } if (!class) TRACE("%s %p -> not found\n", debugstr_w(name), hinstance); + else if (name_str) init_class_name( name_str, name ); return class; } @@ -1253,6 +1264,21 @@ BOOL WINAPI GetClassInfoW( HINSTANCE hInstance, LPCWSTR name, WNDCLASSW *wc ) return ret; } +ATOM get_class_info( HINSTANCE instance, const WCHAR *name, UNICODE_STRING *name_str ) +{ + CLASS *class; + ATOM atom; + + if (!(class = CLASS_FindClass( name, instance, name_str ))) + { + SetLastError( ERROR_CLASS_DOES_NOT_EXIST ); + return FALSE; + } + + atom = class->atomName; + release_class_ptr( class ); + return atom; +} /*********************************************************************** * GetClassInfoExA (USER32.@) @@ -1277,9 +1303,9 @@ BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name, WNDCLASSEXA *wc ) WCHAR nameW[MAX_ATOM_LEN + 1]; if (!MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, ARRAY_SIZE( nameW ))) return FALSE; - classPtr = CLASS_FindClass( nameW, hInstance ); + classPtr = CLASS_FindClass( nameW, hInstance, NULL ); } - else classPtr = CLASS_FindClass( (LPCWSTR)name, hInstance ); + else classPtr = CLASS_FindClass( (LPCWSTR)name, hInstance, NULL ); if (!classPtr) { @@ -1323,7 +1349,7 @@ BOOL WINAPI GetClassInfoExW( HINSTANCE hInstance, LPCWSTR name, WNDCLASSEXW *wc if (!hInstance) hInstance = user32_module; - if (!(classPtr = CLASS_FindClass( name, hInstance ))) + if (!(classPtr = CLASS_FindClass( name, hInstance, NULL ))) { SetLastError( ERROR_CLASS_DOES_NOT_EXIST ); return FALSE; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index af4b1e439b2..6dc0cf8b3a1 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -160,8 +160,7 @@ extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar LRESULT *result, BOOL unicode, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; extern void winproc_init(void) DECLSPEC_HIDDEN; -extern const WCHAR *CLASS_GetVersionedName(const WCHAR *classname, UINT *basename_offset, - WCHAR *combined, BOOL register_class) DECLSPEC_HIDDEN; +extern ATOM get_class_info( HINSTANCE instance, const WCHAR *name, UNICODE_STRING *name_str ) DECLSPEC_HIDDEN; /* kernel callbacks */ diff --git a/dlls/user32/win.c b/dlls/user32/win.c index c580d040bf1..341c66c3d2d 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -126,7 +126,7 @@ void *free_user_handle( HANDLE handle, unsigned int type ) * * Create a window handle with the server. */ -static WND *create_window_handle( HWND parent, HWND owner, LPCWSTR name, +static WND *create_window_handle( HWND parent, HWND owner, UNICODE_STRING *name, HINSTANCE instance, BOOL unicode, DWORD style, DWORD ex_style ) { @@ -146,8 +146,8 @@ static WND *create_window_handle( HWND parent, HWND owner, LPCWSTR name, req->awareness = awareness; req->style = style; req->ex_style = ex_style; - if (!(req->atom = get_int_atom_value( name )) && name) - wine_server_add_data( req, name, lstrlenW(name)*sizeof(WCHAR) ); + if (!(req->atom = get_int_atom_value( name->Buffer )) && name->Length) + wine_server_add_data( req, name->Buffer, name->Length ); if (!wine_server_call_err( req )) { handle = wine_server_ptr_handle( reply->handle ); @@ -184,7 +184,7 @@ static WND *create_window_handle( HWND parent, HWND owner, LPCWSTR name, { struct user_thread_info *thread_info = get_user_thread_info(); - if (name == (LPCWSTR)DESKTOP_CLASS_ATOM) + if (name->Buffer == (LPCWSTR)DESKTOP_CLASS_ATOM) { if (!thread_info->top_window) thread_info->top_window = full_parent ? full_parent : handle; else assert( full_parent == thread_info->top_window ); @@ -1395,18 +1395,19 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, RECT rect; WND *wndPtr; HWND hwnd, parent, owner, top_child = 0; - const WCHAR *p = className; UINT win_dpi, thread_dpi = get_thread_dpi(); DPI_AWARENESS_CONTEXT context; MDICREATESTRUCTW mdi_cs; + UNICODE_STRING class; CBT_CREATEWNDW cbtc; CREATESTRUCTW cbcs; - className = CLASS_GetVersionedName(className, NULL, NULL, TRUE); + if (!get_class_info( module, className, &class )) return FALSE; TRACE("%s %s%s%s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", unicode ? debugstr_w(cs->lpszName) : debugstr_a((LPCSTR)cs->lpszName), - debugstr_w(p), p != className ? "->" : "", p != className ? debugstr_w(className) : "", + debugstr_w(className), class.Buffer != className ? "->" : "", + class.Buffer != className ? debugstr_wn(class.Buffer, class.Length / sizeof(WCHAR)) : "", cs->dwExStyle, cs->style, cs->x, cs->y, cs->cx, cs->cy, cs->hwndParent, cs->hMenu, cs->hInstance, cs->lpCreateParams ); if(TRACE_ON(win)) dump_window_styles( cs->style, cs->dwExStyle ); @@ -1524,17 +1525,9 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, style = cs->style & ~WS_VISIBLE; ex_style = cs->dwExStyle & ~WS_EX_LAYERED; - if (!(wndPtr = create_window_handle( parent, owner, className, module, - unicode, style, ex_style ))) - { - WNDCLASSW wc; - /* if it's a comctl32 class, GetClassInfo will load it, then we can retry */ - if (GetLastError() != ERROR_INVALID_HANDLE || - !GetClassInfoW( 0, className, &wc ) || - !(wndPtr = create_window_handle( parent, owner, className, module, - unicode, style, ex_style ))) - return 0; - } + if (!(wndPtr = create_window_handle( parent, owner, &class, module, + unicode, style, ex_style ))) + return 0; hwnd = wndPtr->obj.handle; /* Fill the window structure */

1 0

Jacek Caban : user32: Use get_class_info for GetClasInfoEx implementation.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 7dfdf5a5caf74bacd1dcfe0db6a8d104d9563279 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dfdf5a5caf74bacd1dcfe0d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 7 14:41:23 2022 +0100 user32: Use get_class_info for GetClasInfoEx implementation. 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 | 125 +++++++++++++++------------------------------ dlls/user32/user_private.h | 3 +- dlls/user32/win.c | 2 +- 3 files changed, 45 insertions(+), 85 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 647a6b9b2bf..1855a2c3804 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -401,36 +401,6 @@ static const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_of return ret; } -/*********************************************************************** - * CLASS_FindClass - * - * Return a pointer to the class. - */ -static CLASS *CLASS_FindClass( LPCWSTR name, HINSTANCE hinstance, UNICODE_STRING *name_str ) -{ - CLASS *class; - - if (name != (LPCWSTR)DESKTOP_CLASS_ATOM && (IS_INTRESOURCE(name) || wcsicmp( name, L"Message" ))) - GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ - - if (!name) return NULL; - - name = CLASS_GetVersionedName( name, NULL, NULL, TRUE ); - - while (!(class = find_class( hinstance, name ))) - { - 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) ); - } - - if (!class) TRACE("%s %p -> not found\n", debugstr_w(name), hinstance); - else if (name_str) init_class_name( name_str, name ); - return class; -} - /*********************************************************************** * CLASS_RegisterClass * @@ -1264,17 +1234,52 @@ BOOL WINAPI GetClassInfoW( HINSTANCE hInstance, LPCWSTR name, WNDCLASSW *wc ) return ret; } -ATOM get_class_info( HINSTANCE instance, const WCHAR *name, UNICODE_STRING *name_str ) +ATOM get_class_info( HINSTANCE instance, const WCHAR *name, WNDCLASSEXW *info, + UNICODE_STRING *name_str, BOOL ansi ) { CLASS *class; ATOM atom; - if (!(class = CLASS_FindClass( name, instance, name_str ))) + if (!name_str && !instance) instance = user32_module; + + if (name != (LPCWSTR)DESKTOP_CLASS_ATOM && (IS_INTRESOURCE(name) || wcsicmp( name, L"Message" ))) + GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ + + name = CLASS_GetVersionedName( name, NULL, NULL, TRUE ); + + while (name && !(class = find_class( instance, name ))) + { + 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) ); + } + + if (!class) { + TRACE("%s %p -> not found\n", debugstr_w(name), instance); SetLastError( ERROR_CLASS_DOES_NOT_EXIST ); - return FALSE; + return 0; + } + + if (info) + { + info->style = class->style; + info->lpfnWndProc = WINPROC_GetProc( class->winproc, !ansi ); + info->cbClsExtra = class->cbClsExtra; + info->cbWndExtra = class->cbWndExtra; + info->hInstance = (instance == user32_module) ? 0 : instance; + info->hIcon = class->hIcon; + info->hIconSm = class->hIconSm ? class->hIconSm : class->hIconSmIntern; + info->hCursor = class->hCursor; + info->hbrBackground = class->hbrBackground; + info->lpszMenuName = ansi ? (const WCHAR *)CLASS_GetMenuNameA( class ) + : CLASS_GetMenuNameW( class ); + info->lpszClassName = name; } + if (name_str) init_class_name( name_str, name ); atom = class->atomName; release_class_ptr( class ); return atom; @@ -1286,7 +1291,6 @@ ATOM get_class_info( HINSTANCE instance, const WCHAR *name, UNICODE_STRING *name BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name, WNDCLASSEXA *wc ) { ATOM atom; - CLASS *classPtr; TRACE("%p %s %p\n", hInstance, debugstr_a(name), wc); @@ -1296,35 +1300,15 @@ BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name, WNDCLASSEXA *wc ) return FALSE; } - if (!hInstance) hInstance = user32_module; - if (!IS_INTRESOURCE(name)) { WCHAR nameW[MAX_ATOM_LEN + 1]; if (!MultiByteToWideChar( CP_ACP, 0, name, -1, nameW, ARRAY_SIZE( nameW ))) return FALSE; - classPtr = CLASS_FindClass( nameW, hInstance, NULL ); - } - else classPtr = CLASS_FindClass( (LPCWSTR)name, hInstance, NULL ); - - if (!classPtr) - { - SetLastError( ERROR_CLASS_DOES_NOT_EXIST ); - return FALSE; + atom = get_class_info( hInstance, nameW, (WNDCLASSEXW *)wc, NULL, TRUE ); } - wc->style = classPtr->style; - wc->lpfnWndProc = WINPROC_GetProc( classPtr->winproc, FALSE ); - wc->cbClsExtra = classPtr->cbClsExtra; - wc->cbWndExtra = classPtr->cbWndExtra; - wc->hInstance = (hInstance == user32_module) ? 0 : hInstance; - wc->hIcon = classPtr->hIcon; - wc->hIconSm = classPtr->hIconSm ? classPtr->hIconSm : classPtr->hIconSmIntern; - wc->hCursor = classPtr->hCursor; - wc->hbrBackground = classPtr->hbrBackground; - wc->lpszMenuName = CLASS_GetMenuNameA( classPtr ); - wc->lpszClassName = name; - atom = classPtr->atomName; - release_class_ptr( classPtr ); + else atom = get_class_info( hInstance, (const WCHAR *)name, (WNDCLASSEXW *)wc, NULL, TRUE ); + if (atom) wc->lpszClassName = name; /* We must return the atom of the class here instead of just TRUE. */ return atom; @@ -1336,9 +1320,6 @@ BOOL WINAPI GetClassInfoExA( HINSTANCE hInstance, LPCSTR name, WNDCLASSEXA *wc ) */ BOOL WINAPI GetClassInfoExW( HINSTANCE hInstance, LPCWSTR name, WNDCLASSEXW *wc ) { - ATOM atom; - CLASS *classPtr; - TRACE("%p %s %p\n", hInstance, debugstr_w(name), wc); if (!wc) @@ -1347,29 +1328,7 @@ BOOL WINAPI GetClassInfoExW( HINSTANCE hInstance, LPCWSTR name, WNDCLASSEXW *wc return FALSE; } - if (!hInstance) hInstance = user32_module; - - if (!(classPtr = CLASS_FindClass( name, hInstance, NULL ))) - { - SetLastError( ERROR_CLASS_DOES_NOT_EXIST ); - return FALSE; - } - wc->style = classPtr->style; - wc->lpfnWndProc = WINPROC_GetProc( classPtr->winproc, TRUE ); - wc->cbClsExtra = classPtr->cbClsExtra; - wc->cbWndExtra = classPtr->cbWndExtra; - wc->hInstance = (hInstance == user32_module) ? 0 : hInstance; - wc->hIcon = classPtr->hIcon; - wc->hIconSm = classPtr->hIconSm ? classPtr->hIconSm : classPtr->hIconSmIntern; - wc->hCursor = classPtr->hCursor; - wc->hbrBackground = classPtr->hbrBackground; - wc->lpszMenuName = CLASS_GetMenuNameW( classPtr ); - wc->lpszClassName = name; - atom = classPtr->atomName; - release_class_ptr( classPtr ); - - /* We must return the atom of the class here instead of just TRUE. */ - return atom; + return get_class_info( hInstance, name, wc, NULL, FALSE ); } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 6dc0cf8b3a1..f0d131949d7 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -160,7 +160,8 @@ extern BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar LRESULT *result, BOOL unicode, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN; extern void winproc_init(void) DECLSPEC_HIDDEN; -extern ATOM get_class_info( HINSTANCE instance, const WCHAR *name, UNICODE_STRING *name_str ) DECLSPEC_HIDDEN; +extern ATOM get_class_info( HINSTANCE instance, const WCHAR *name, WNDCLASSEXW *info, + UNICODE_STRING *name_str, BOOL ansi ) DECLSPEC_HIDDEN; /* kernel callbacks */ diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 341c66c3d2d..688988bebd0 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1402,7 +1402,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, CBT_CREATEWNDW cbtc; CREATESTRUCTW cbcs; - if (!get_class_info( module, className, &class )) return FALSE; + if (!get_class_info( module, className, NULL, &class, FALSE )) return FALSE; TRACE("%s %s%s%s ex=%08x style=%08x %d,%d %dx%d parent=%p menu=%p inst=%p params=%p\n", unicode ? debugstr_w(cs->lpszName) : debugstr_a((LPCSTR)cs->lpszName),

1 0

Jacek Caban : user32: Move module class registration to get_class_info.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 18697bb7b598ccff23def7822a2b96f52e7ccb00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18697bb7b598ccff23def782… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 7 14:41:42 2022 +0100 user32: Move module class registration to get_class_info. 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 | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 1855a2c3804..cf5fd27184b 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -332,7 +332,8 @@ static CLASS *find_class( HINSTANCE module, const WCHAR *name ) return NULL; } -static const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, WCHAR *combined, BOOL register_class ) +static const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_offset, WCHAR *combined, + HMODULE *reg_module ) { ACTCTX_SECTION_KEYED_DATA data; struct wndclass_redirect_data @@ -349,6 +350,7 @@ static const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_of HMODULE hmod; UINT offset; + if (reg_module) *reg_module = 0; if (!basename_offset) basename_offset = &offset; @@ -383,21 +385,7 @@ static const WCHAR *CLASS_GetVersionedName( const WCHAR *name, UINT *basename_of ret = combined; } - if (register_class && hmod) - { - CLASS *class; - - if (!(class = find_class( hmod, ret ))) - { - BOOL (WINAPI *pRegisterClassNameW)(const WCHAR *class); - - pRegisterClassNameW = (void *)GetProcAddress(hmod, "RegisterClassNameW"); - if (pRegisterClassNameW) - pRegisterClassNameW(name); - } - else release_class_ptr( class ); - } - + if (reg_module) *reg_module = hmod; return ret; } @@ -1237,28 +1225,42 @@ BOOL WINAPI GetClassInfoW( HINSTANCE hInstance, LPCWSTR name, WNDCLASSW *wc ) ATOM get_class_info( HINSTANCE instance, const WCHAR *name, WNDCLASSEXW *info, UNICODE_STRING *name_str, BOOL ansi ) { + const WCHAR *class_name; + HMODULE module; CLASS *class; ATOM atom; + class_name = CLASS_GetVersionedName( name, NULL, NULL, &module ); + if (!name_str && !instance) instance = user32_module; if (name != (LPCWSTR)DESKTOP_CLASS_ATOM && (IS_INTRESOURCE(name) || wcsicmp( name, L"Message" ))) GetDesktopWindow(); /* create the desktop window to trigger builtin class registration */ - name = CLASS_GetVersionedName( name, NULL, NULL, TRUE ); - - while (name && !(class = find_class( instance, name ))) + while (class_name && !(class = find_class( instance, class_name ))) { - if (IS_INTRESOURCE( name )) break; - if (!is_comctl32_class( name )) break; + if (module) + { + BOOL (WINAPI *pRegisterClassNameW)( const WCHAR *class ); + pRegisterClassNameW = (void *)GetProcAddress( module, "RegisterClassNameW" ); + module = NULL; + if (pRegisterClassNameW) + { + TRACE( "registering %s\n", debugstr_w(name) ); + pRegisterClassNameW( name ); + continue; + } + } + if (IS_INTRESOURCE( class_name )) break; + if (!is_comctl32_class( 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 retrying after loading comctl32\n", debugstr_w(class_name) ); } if (!class) { - TRACE("%s %p -> not found\n", debugstr_w(name), instance); + TRACE("%s %p -> not found\n", debugstr_w(class_name), instance); SetLastError( ERROR_CLASS_DOES_NOT_EXIST ); return 0; } @@ -1279,7 +1281,7 @@ ATOM get_class_info( HINSTANCE instance, const WCHAR *name, WNDCLASSEXW *info, info->lpszClassName = name; } - if (name_str) init_class_name( name_str, name ); + if (name_str) init_class_name( name_str, class_name ); atom = class->atomName; release_class_ptr( class ); return atom;

1 0

Jacek Caban : user32: Store menu name as a struct.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: b1b0470083970bacfbc3a6d5ad08740a1e50d46f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1b0470083970bacfbc3a6d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 7 14:42:03 2022 +0100 user32: Store menu name as a struct. 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 | 103 +++++++++++++++++++++++++------------------ dlls/win32u/ntuser_private.h | 2 +- include/ntuser.h | 7 +++ 3 files changed, 67 insertions(+), 45 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 5b3243ca8d5..a184a06206c 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -230,28 +230,49 @@ static void init_class_name( UNICODE_STRING *str, const WCHAR *name ) else RtlInitUnicodeString( str, name ); } -/*********************************************************************** - * CLASS_GetMenuNameA - * - * Get the menu name as an ANSI string. - */ -static inline LPSTR CLASS_GetMenuNameA( CLASS *classPtr ) +static BOOL alloc_menu_nameA( struct client_menu_name *ret, const char *menu_name ) { - if (IS_INTRESOURCE(classPtr->menuName)) return (LPSTR)classPtr->menuName; - return (LPSTR)(classPtr->menuName + lstrlenW(classPtr->menuName) + 1); + if (!IS_INTRESOURCE(menu_name)) + { + DWORD lenA = strlen( menu_name ) + 1; + DWORD lenW = MultiByteToWideChar( CP_ACP, 0, menu_name, lenA, NULL, 0 ); + ret->nameW = HeapAlloc( GetProcessHeap(), 0, lenA + lenW * sizeof(WCHAR) ); + if (!ret->nameW) return FALSE; + ret->nameA = (char *)(ret->nameW + lenW); + MultiByteToWideChar( CP_ACP, 0, menu_name, lenA, ret->nameW, lenW ); + memcpy( ret->nameA, menu_name, lenA ); + } + else + { + ret->nameW = (WCHAR *)menu_name; + ret->nameA = (char *)menu_name; + } + return TRUE; } - -/*********************************************************************** - * CLASS_GetMenuNameW - * - * Get the menu name as a Unicode string. - */ -static inline LPWSTR CLASS_GetMenuNameW( CLASS *classPtr ) +static BOOL alloc_menu_nameW( struct client_menu_name *ret, const WCHAR *menu_name ) { - return classPtr->menuName; + if (!IS_INTRESOURCE(menu_name)) + { + DWORD lenW = lstrlenW( menu_name ) + 1; + DWORD lenA = WideCharToMultiByte( CP_ACP, 0, menu_name, lenW, NULL, 0, NULL, NULL ); + ret->nameW = HeapAlloc( GetProcessHeap(), 0, lenA + lenW * sizeof(WCHAR) ); + if (!ret->nameW) return FALSE; + memcpy( ret->nameW, menu_name, lenW * sizeof(WCHAR) ); + WideCharToMultiByte( CP_ACP, 0, menu_name, lenW, ret->nameA, lenA, NULL, NULL ); + } + else + { + ret->nameW = (WCHAR *)menu_name; + ret->nameA = (char *)menu_name; + } + return TRUE; } +static void free_menu_name( struct client_menu_name *name ) +{ + if (!IS_INTRESOURCE(name->nameW)) HeapFree( GetProcessHeap(), 0, name->nameW ); +} /*********************************************************************** * CLASS_SetMenuNameA @@ -260,16 +281,10 @@ static inline LPWSTR CLASS_GetMenuNameW( CLASS *classPtr ) */ static void CLASS_SetMenuNameA( CLASS *classPtr, LPCSTR name ) { - if (!IS_INTRESOURCE(classPtr->menuName)) HeapFree( GetProcessHeap(), 0, classPtr->menuName ); - if (!IS_INTRESOURCE(name)) - { - DWORD lenA = strlen(name) + 1; - DWORD lenW = MultiByteToWideChar( CP_ACP, 0, name, lenA, NULL, 0 ); - classPtr->menuName = HeapAlloc( GetProcessHeap(), 0, lenA + lenW*sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, name, lenA, classPtr->menuName, lenW ); - memcpy( classPtr->menuName + lenW, name, lenA ); - } - else classPtr->menuName = (LPWSTR)name; + struct client_menu_name menu_name; + if (!alloc_menu_nameA( &menu_name, name )) return; + free_menu_name( &classPtr->menu_name ); + classPtr->menu_name = menu_name; } /*********************************************************************** @@ -279,17 +294,10 @@ static void CLASS_SetMenuNameA( CLASS *classPtr, LPCSTR name ) */ static void CLASS_SetMenuNameW( CLASS *classPtr, LPCWSTR name ) { - if (!IS_INTRESOURCE(classPtr->menuName)) HeapFree( GetProcessHeap(), 0, classPtr->menuName ); - if (!IS_INTRESOURCE(name)) - { - DWORD lenW = lstrlenW(name) + 1; - DWORD lenA = WideCharToMultiByte( CP_ACP, 0, name, lenW, NULL, 0, NULL, NULL ); - classPtr->menuName = HeapAlloc( GetProcessHeap(), 0, lenA + lenW*sizeof(WCHAR) ); - memcpy( classPtr->menuName, name, lenW*sizeof(WCHAR) ); - WideCharToMultiByte( CP_ACP, 0, name, lenW, - (char *)(classPtr->menuName + lenW), lenA, NULL, NULL ); - } - else classPtr->menuName = (LPWSTR)name; + struct client_menu_name menu_name; + if (!alloc_menu_nameW( &menu_name, name )) return; + free_menu_name( &classPtr->menu_name ); + classPtr->menu_name = menu_name; } @@ -309,7 +317,7 @@ static void CLASS_FreeClass( CLASS *classPtr ) if (classPtr->hbrBackground > (HBRUSH)(COLOR_GRADIENTINACTIVECAPTION + 1)) DeleteObject( classPtr->hbrBackground ); DestroyIcon( classPtr->hIconSmIntern ); - HeapFree( GetProcessHeap(), 0, classPtr->menuName ); + free_menu_name( &classPtr->menu_name ); HeapFree( GetProcessHeap(), 0, classPtr ); USER_Unlock(); } @@ -643,6 +651,7 @@ ATOM WINAPI RegisterClassW( const WNDCLASSW* wc ) ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) { WCHAR nameW[MAX_ATOM_LEN + 1], combined[MAX_ATOM_LEN + 1]; + struct client_menu_name menu_name; UNICODE_STRING name, version; ATOM atom; CLASS *classPtr; @@ -671,6 +680,8 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) version.Length = 0; } + if (!alloc_menu_nameA( &menu_name, wc->lpszMenuName )) return 0; + classPtr = CLASS_RegisterClass( &name, version.Length / sizeof(WCHAR), instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ); if (!classPtr) return 0; @@ -690,7 +701,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) classPtr->hCursor = wc->hCursor; classPtr->hbrBackground = wc->hbrBackground; classPtr->winproc = WINPROC_AllocProc( wc->lpfnWndProc, FALSE ); - CLASS_SetMenuNameA( classPtr, wc->lpszMenuName ); + classPtr->menu_name = menu_name; release_class_ptr( classPtr ); return atom; } @@ -702,6 +713,7 @@ ATOM WINAPI RegisterClassExA( const WNDCLASSEXA* wc ) ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) { WCHAR combined[MAX_ATOM_LEN + 1]; + struct client_menu_name menu_name; UNICODE_STRING name, version; ATOM atom; CLASS *classPtr; @@ -717,13 +729,18 @@ ATOM WINAPI RegisterClassExW( const WNDCLASSEXW* wc ) } if (!(instance = wc->hInstance)) instance = GetModuleHandleW( NULL ); + if (!alloc_menu_nameW( &menu_name, wc->lpszMenuName )) return 0; + version.Buffer = combined; version.MaximumLength = sizeof(combined); get_versioned_name( wc->lpszClassName, &name, &version, FALSE ); if (!(classPtr = CLASS_RegisterClass( &name, version.Length / sizeof(WCHAR), instance, !(wc->style & CS_GLOBALCLASS), wc->style, wc->cbClsExtra, wc->cbWndExtra ))) + { + free_menu_name( &menu_name ); return 0; + } atom = classPtr->atomName; @@ -945,11 +962,10 @@ static ULONG_PTR CLASS_GetClassLong( HWND hwnd, INT offset, UINT size, retvalue = (ULONG_PTR)WINPROC_GetProc( class->winproc, unicode ); break; case GCLP_MENUNAME: - retvalue = (ULONG_PTR)CLASS_GetMenuNameW( class ); if (unicode) - retvalue = (ULONG_PTR)CLASS_GetMenuNameW( class ); + retvalue = (ULONG_PTR)class->menu_name.nameW; else - retvalue = (ULONG_PTR)CLASS_GetMenuNameA( class ); + retvalue = (ULONG_PTR)class->menu_name.nameA; break; case GCW_ATOM: retvalue = class->atomName; @@ -1294,8 +1310,7 @@ ATOM get_class_info( HINSTANCE instance, const WCHAR *class_name, WNDCLASSEXW *i info->hIconSm = class->hIconSm ? class->hIconSm : class->hIconSmIntern; info->hCursor = class->hCursor; info->hbrBackground = class->hbrBackground; - info->lpszMenuName = ansi ? (const WCHAR *)CLASS_GetMenuNameA( class ) - : CLASS_GetMenuNameW( class ); + info->lpszMenuName = ansi ? (const WCHAR *)class->menu_name.nameA : class->menu_name.nameW; info->lpszClassName = class_name; } diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 8878718d416..ed345025ac3 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -177,7 +177,7 @@ typedef struct tagCLASS WNDPROC winproc; /* Window procedure */ INT cbClsExtra; /* Class extra bytes */ INT cbWndExtra; /* Window extra bytes */ - LPWSTR menuName; /* Default menu name (Unicode followed by ASCII) */ + struct client_menu_name menu_name; /* Default menu name */ struct dce *dce; /* Opaque pointer to class DCE */ UINT_PTR instance; /* Module that created the task */ HICON hIcon; /* Default icon */ diff --git a/include/ntuser.h b/include/ntuser.h index fc5ca720cf9..70d400baa18 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -201,6 +201,13 @@ struct cursoricon_desc HRSRC rsrc; }; +struct client_menu_name +{ + char *nameA; + WCHAR *nameW; + UNICODE_STRING *nameUS; +}; + /* internal messages codes */ enum wine_internal_message {

1 0

Jacek Caban : win32u: Move NtUserSetClassLong from user32.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 8fe050fbbadaa180f879d036f7e7e1c88c1d482a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fe050fbbadaa180f879d036… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 7 14:42:47 2022 +0100 win32u: Move NtUserSetClassLong 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 | 237 ++++--------------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/class.c | 210 ++++++++++++++++++++++++++++++++++++++ dlls/win32u/gdiobj.c | 3 + dlls/win32u/win32u.spec | 6 +- dlls/win32u/win32u_private.h | 3 + dlls/win32u/wrappers.c | 18 ++++ include/ntuser.h | 3 + 8 files changed, 259 insertions(+), 223 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8fe050fbbadaa180f879…

1 0

Jan Sikorski : wined3d: Poll Vulkan queries directly on the application thread.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 1a7a50a140ea6f0c15bc5da2c22adfaae952fed2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a7a50a140ea6f0c15bc5da2… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Mar 4 18:12:58 2022 +0100 wined3d: Poll Vulkan queries directly on the application thread. We want to avoid using the poll list, for occlusion queries especially, as in some games the number of occlusion queries can reach the hundreds. OpenGL backend already does this by using ARB_QUERY_BUFFER_OBJECT. We could mimic this in Vulkan too using compute shaders to accumulate pending queries, however, unlike with OpenGL, we can also just directly call vkGetQueryPoolResults() from the application's thread. A downside of the approach taken here is that Vulkan queries allocated to a wined3d_query are only released after the query is reused or destroyed. In principle, if this ever becomes a problem, it could be avoided by protecting the query pool with a mutex and releasing queries after reading the results. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 40 ++++++++++++++-------------------------- dlls/wined3d/wined3d_private.h | 4 +++- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 7309b7a68df..3a4a518fcfb 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1460,11 +1460,10 @@ bool wined3d_query_pool_vk_init(struct wined3d_query_pool_vk *pool_vk, } bool wined3d_query_vk_accumulate_data(struct wined3d_query_vk *query_vk, - struct wined3d_context_vk *context_vk, const struct wined3d_query_pool_idx_vk *pool_idx) + struct wined3d_device_vk *device_vk, const struct wined3d_query_pool_idx_vk *pool_idx) { - struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); const struct wined3d_query_data_pipeline_statistics *ps_tmp; - const struct wined3d_vk_info *vk_info = context_vk->vk_info; + const struct wined3d_vk_info *vk_info = &device_vk->vk_info; struct wined3d_query_data_pipeline_statistics *ps_result; VkResult vr; union @@ -1487,9 +1486,6 @@ bool wined3d_query_vk_accumulate_data(struct wined3d_query_vk *query_vk, ERR("Failed to get event status, vr %s\n", wined3d_debug_vkresult(vr)); return false; } - - VK_CALL(vkDestroyEvent(device_vk->vk_device, pool_idx->pool_vk->vk_event, NULL)); - pool_idx->pool_vk->vk_event = VK_NULL_HANDLE; } if ((vr = VK_CALL(vkGetQueryPoolResults(device_vk->vk_device, pool_idx->pool_vk->vk_query_pool, @@ -1502,8 +1498,6 @@ bool wined3d_query_vk_accumulate_data(struct wined3d_query_vk *query_vk, if (vr == VK_NOT_READY) return false; - wined3d_query_pool_vk_mark_complete(pool_idx->pool_vk, pool_idx->idx, context_vk); - result = (void *)query_vk->q.data; switch (query_vk->q.type) { @@ -1613,35 +1607,27 @@ void wined3d_query_vk_suspend(struct wined3d_query_vk *query_vk, struct wined3d_ static BOOL wined3d_query_vk_poll(struct wined3d_query *query, uint32_t flags) { + struct wined3d_device_vk *device_vk = wined3d_device_vk(query->device); struct wined3d_query_vk *query_vk = wined3d_query_vk(query); - struct wined3d_context_vk *context_vk; + unsigned int i; - context_vk = wined3d_context_vk(context_acquire(query->device, NULL, 0)); + memset((void *)query->data, 0, query->data_size); - if (flags & WINED3DGETDATA_FLUSH) - wined3d_context_vk_submit_command_buffer(context_vk, 0, NULL, NULL, 0, NULL); - if (query_vk->command_buffer_id == context_vk->current_command_buffer.id) + if (query_vk->pool_idx.pool_vk && !wined3d_query_vk_accumulate_data(query_vk, device_vk, &query_vk->pool_idx)) goto unavailable; - while (query_vk->pending_count) + for (i = 0; i < query_vk->pending_count; ++i) { - if (!wined3d_query_vk_accumulate_data(query_vk, context_vk, &query_vk->pending[query_vk->pending_count - 1])) + if (!wined3d_query_vk_accumulate_data(query_vk, device_vk, &query_vk->pending[i])) goto unavailable; - query_vk->pending_count--; } - /* If the query was suspended, and then ended before it was resumed, - * there's no data to accumulate here. */ - if (query_vk->pool_idx.pool_vk && !wined3d_query_vk_accumulate_data(query_vk, context_vk, &query_vk->pool_idx)) - goto unavailable; - - query_vk->pool_idx.pool_vk = NULL; - context_release(&context_vk->c); - return TRUE; unavailable: - context_release(&context_vk->c); + if ((flags & WINED3DGETDATA_FLUSH) && !query->device->cs->queries_flushed) + query->device->cs->c.ops->flush(&query->device->cs->c); + return FALSE; } @@ -1672,7 +1658,6 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) if (query_vk->pending_count) wined3d_query_vk_remove_pending_queries(context_vk, query_vk); - memset((void *)query->data, 0, query->data_size); vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk); if (query_vk->flags & WINED3D_QUERY_VK_FLAG_STARTED) { @@ -1953,6 +1938,9 @@ HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_quer wined3d_query_init(&query_vk->q, device, type, data, data_size, ops, parent, parent_ops); + if (type != WINED3D_QUERY_TYPE_EVENT) + query_vk->q.poll_in_cs = false; + switch (type) { case WINED3D_QUERY_TYPE_OCCLUSION: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d035b89a5e5..a9e42e0cb16 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2095,7 +2095,9 @@ static inline struct wined3d_query_vk *wined3d_query_vk(struct wined3d_query *qu return CONTAINING_RECORD(query, struct wined3d_query_vk, q); } -bool wined3d_query_vk_accumulate_data(struct wined3d_query_vk *query_vk, struct wined3d_context_vk *context_vk, +struct wined3d_device_vk; + +bool wined3d_query_vk_accumulate_data(struct wined3d_query_vk *query_vk, struct wined3d_device_vk *device_vk, const struct wined3d_query_pool_idx_vk *pool_idx) DECLSPEC_HIDDEN; HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_query_type type, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_query **query) DECLSPEC_HIDDEN;

1 0

Jan Sikorski : wined3d: Implement event queries using Vulkan events.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 8e0ab7363d84d615e0a6ec93ce07b569a13a1eee URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e0ab7363d84d615e0a6ec93… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Mar 4 18:12:59 2022 +0100 wined3d: Implement event queries using Vulkan events. This makes event results available sooner, i.e. after they are executed by the GPU, and also moves the polling from CS to application's thread. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 30 ++++++++++++++++ dlls/wined3d/query.c | 79 +++++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 5 +++ 3 files changed, 83 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index dcb94eb7c1a..436973fe76f 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -973,6 +973,31 @@ void wined3d_context_vk_destroy_vk_sampler(struct wined3d_context_vk *context_vk o->command_buffer_id = command_buffer_id; } +void wined3d_context_vk_destroy_vk_event(struct wined3d_context_vk *context_vk, + VkEvent vk_event, uint64_t command_buffer_id) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(context_vk->c.device); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + struct wined3d_retired_object_vk *o; + + if (context_vk->completed_command_buffer_id > command_buffer_id) + { + VK_CALL(vkDestroyEvent(device_vk->vk_device, vk_event, NULL)); + TRACE("Destroyed event 0x%s.\n", wine_dbgstr_longlong(vk_event)); + return; + } + + if (!(o = wined3d_context_vk_get_retired_object_vk(context_vk))) + { + ERR("Leaking event 0x%s.\n", wine_dbgstr_longlong(vk_event)); + return; + } + + o->type = WINED3D_RETIRED_EVENT_VK; + o->u.vk_event = vk_event; + o->command_buffer_id = command_buffer_id; +} + void wined3d_context_vk_destroy_image(struct wined3d_context_vk *context_vk, struct wined3d_image_vk *image) { wined3d_context_vk_destroy_vk_image(context_vk, image->vk_image, image->command_buffer_id); @@ -1134,6 +1159,11 @@ static void wined3d_context_vk_cleanup_resources(struct wined3d_context_vk *cont TRACE("Freed query range %u+%u in pool %p.\n", o->u.queries.start, o->u.queries.count, o->u.queries.pool_vk); break; + case WINED3D_RETIRED_EVENT_VK: + VK_CALL(vkDestroyEvent(device_vk->vk_device, o->u.vk_event, NULL)); + TRACE("Destroyed event 0x%s.\n", wine_dbgstr_longlong(o->u.vk_event)); + break; + default: ERR("Unhandled object type %#x.\n", o->type); break; diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 3a4a518fcfb..4b94cb8daea 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1742,6 +1742,8 @@ static void wined3d_query_vk_destroy(struct wined3d_query *query) wined3d_query_vk_remove_pending_queries(context_vk, query_vk); if (query_vk->pool_idx.pool_vk) wined3d_query_pool_vk_mark_complete(query_vk->pool_idx.pool_vk, query_vk->pool_idx.idx, context_vk); + if (query_vk->vk_event) + wined3d_context_vk_destroy_vk_event(context_vk, query_vk->vk_event, query_vk->command_buffer_id); context_release(&context_vk->c); heap_free(query_vk->pending); heap_free(query_vk); @@ -1756,50 +1758,67 @@ static const struct wined3d_query_ops wined3d_query_vk_ops = static BOOL wined3d_query_event_vk_poll(struct wined3d_query *query, uint32_t flags) { + struct wined3d_device_vk *device_vk = wined3d_device_vk(query->device); struct wined3d_query_vk *query_vk = wined3d_query_vk(query); - struct wined3d_context_vk *context_vk; - BOOL *signalled; - - context_vk = wined3d_context_vk(context_acquire(query->device, NULL, 0)); - - signalled = (BOOL *)query->data; - if (flags & WINED3DGETDATA_FLUSH) - wined3d_context_vk_submit_command_buffer(context_vk, 0, NULL, NULL, 0, NULL); - if (query_vk->command_buffer_id == context_vk->current_command_buffer.id) - { - context_release(&context_vk->c); - return *signalled = FALSE; - } - - if (query_vk->command_buffer_id > context_vk->completed_command_buffer_id) - wined3d_context_vk_poll_command_buffers(context_vk); - *signalled = context_vk->completed_command_buffer_id >= query_vk->command_buffer_id; - - context_release(&context_vk->c); + const struct wined3d_vk_info *vk_info = &device_vk->vk_info; + BOOL signalled; - return *signalled; + signalled = VK_CALL(vkGetEventStatus(device_vk->vk_device, query_vk->vk_event)) + == VK_EVENT_SET; + if (!signalled && (flags & WINED3DGETDATA_FLUSH) && !query->device->cs->queries_flushed) + query->device->cs->c.ops->flush(&query->device->cs->c); + return *(BOOL *)query->data = signalled; } static BOOL wined3d_query_event_vk_issue(struct wined3d_query *query, uint32_t flags) { struct wined3d_device_vk *device_vk = wined3d_device_vk(query->device); + const struct wined3d_vk_info *vk_info = &device_vk->vk_info; struct wined3d_query_vk *query_vk = wined3d_query_vk(query); struct wined3d_context_vk *context_vk; + VkEventCreateInfo create_info; + VkResult vr; TRACE("query %p, flags %#x.\n", query, flags); if (flags & WINED3DISSUE_END) { context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); + wined3d_context_vk_end_current_render_pass(context_vk); + + if (query_vk->vk_event) + { + if (query_vk->command_buffer_id > context_vk->completed_command_buffer_id) + { + /* Cannot reuse this event, as it may still get signalled by previous usage. */ + /* Throw it away and create a new one, but if that happens a lot we may want to pool instead. */ + wined3d_context_vk_destroy_vk_event(context_vk, query_vk->vk_event, query_vk->command_buffer_id); + query_vk->vk_event = VK_NULL_HANDLE; + } + else + { + VK_CALL(vkResetEvent(device_vk->vk_device, query_vk->vk_event)); + } + } + + if (!query_vk->vk_event) + { + create_info.sType = VK_STRUCTURE_TYPE_EVENT_CREATE_INFO; + create_info.pNext = NULL; + create_info.flags = 0; + + vr = VK_CALL(vkCreateEvent(device_vk->vk_device, &create_info, NULL, &query_vk->vk_event)); + if (vr != VK_SUCCESS) + { + ERR("Failed to create Vulkan event, vr %s\n", wined3d_debug_vkresult(vr)); + context_release(&context_vk->c); + return FALSE; + } + } + wined3d_context_vk_reference_query(context_vk, query_vk); - /* Because we don't actually submit any commands to the command buffer - * for event queries, the context's current command buffer may still - * be empty, and we should wait on the preceding command buffer - * instead. That's not merely an optimisation; if the command buffer - * referenced by the query is still empty by the time the application - * waits for it, that wait will never complete. */ - if (!context_vk->current_command_buffer.vk_command_buffer) - --query_vk->command_buffer_id; + VK_CALL(vkCmdSetEvent(wined3d_context_vk_get_command_buffer(context_vk), query_vk->vk_event, + VK_PIPELINE_STAGE_ALL_COMMANDS_BIT)); context_release(&context_vk->c); return TRUE; @@ -1937,9 +1956,7 @@ HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_quer data = query_vk + 1; wined3d_query_init(&query_vk->q, device, type, data, data_size, ops, parent, parent_ops); - - if (type != WINED3D_QUERY_TYPE_EVENT) - query_vk->q.poll_in_cs = false; + query_vk->q.poll_in_cs = false; switch (type) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a9e42e0cb16..58ef6764f2d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2086,6 +2086,7 @@ struct wined3d_query_vk uint8_t flags; uint64_t command_buffer_id; uint32_t control_flags; + VkEvent vk_event; SIZE_T pending_count, pending_size; struct wined3d_query_pool_idx_vk *pending; }; @@ -2414,6 +2415,7 @@ enum wined3d_retired_object_type_vk WINED3D_RETIRED_IMAGE_VIEW_VK, WINED3D_RETIRED_SAMPLER_VK, WINED3D_RETIRED_QUERY_POOL_VK, + WINED3D_RETIRED_EVENT_VK, }; struct wined3d_retired_object_vk @@ -2436,6 +2438,7 @@ struct wined3d_retired_object_vk VkBufferView vk_buffer_view; VkImageView vk_image_view; VkSampler vk_sampler; + VkEvent vk_event; struct { struct wined3d_query_pool_vk *pool_vk; @@ -2659,6 +2662,8 @@ void wined3d_context_vk_destroy_vk_memory(struct wined3d_context_vk *context_vk, VkDeviceMemory vk_memory, uint64_t command_buffer_id) DECLSPEC_HIDDEN; void wined3d_context_vk_destroy_vk_sampler(struct wined3d_context_vk *context_vk, VkSampler vk_sampler, uint64_t command_buffer_id) DECLSPEC_HIDDEN; +void wined3d_context_vk_destroy_vk_event(struct wined3d_context_vk *context_vk, + VkEvent vk_event, uint64_t command_buffer_id) DECLSPEC_HIDDEN; void wined3d_context_vk_end_current_render_pass(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; VkCommandBuffer wined3d_context_vk_get_command_buffer(struct wined3d_context_vk *context_vk) DECLSPEC_HIDDEN; struct wined3d_pipeline_layout_vk *wined3d_context_vk_get_pipeline_layout(struct wined3d_context_vk *context_vk,

1 0

Jacek Caban : user32: Use UNICODE_STRING for passing window classes internally.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: 0044b02d482fa19f6d1ddebc4b716efeba287d44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0044b02d482fa19f6d1ddebc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 7 14:41:53 2022 +0100 user32: Use UNICODE_STRING for passing window classes internally. 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 | 162 +++++++++++++++++++++++++++---------------------- dlls/user32/controls.h | 2 +- dlls/user32/win.c | 24 ++++++-- 3 files changed, 109 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0044b02d482fa19f6d1d…

1 0

Jacek Caban : win32u: Move GetClassLong implementation from user32.
by Alexandre Julliard March 7, 2022

March 7, 2022

Module: wine Branch: master Commit: a58483c9b157afddad15c341b2fb26031f2db64c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a58483c9b157afddad15c341… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 7 14:43:07 2022 +0100 win32u: Move GetClassLong 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 | 207 ++----------------------------------------- dlls/user32/spy.c | 35 -------- dlls/user32/user_private.h | 1 - dlls/win32u/class.c | 169 +++++++++++++++++++++++++++++++++++ dlls/win32u/ntuser_private.h | 3 + dlls/win32u/win32u_private.h | 2 +- dlls/win32u/window.c | 12 ++- dlls/win32u/wrappers.c | 2 +- include/ntuser.h | 7 +- 9 files changed, 196 insertions(+), 242 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a58483c9b157afddad15…

1 0