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

Alistair Leslie-Hughes : include: Add IReference<T> interface.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: a05ece8c51a27689ee0130d9509a4e8578a6bed1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a05ece8c51a27689ee0130d9… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Mar 7 10:40:27 2022 +0100 include: Add IReference<T> interface. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.foundation.collections.idl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index 7576f331172..ed1f5e30793 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -73,6 +73,15 @@ cpp_quote("#endif") ] delegate HRESULT TypedEventHandler<TSender, TArgs>([in] TSender sender, [in] TArgs args); + [ + contract(Windows.Foundation.FoundationContract, 1.0), + uuid(61c17706-2d65-11e0-9ae8-d48564015472) + ] + interface IReference<T> : IInspectable + { + [propget] HRESULT Value([out, retval] T *value); + } + namespace Collections { [

1 0

Rémi Bernon : include: Add Windows.Devices.Power.IBatteryReport interface definition.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: e8dd8b010899acf62f995ee61d245ee519ead5c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8dd8b010899acf62f995ee6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 7 10:40:28 2022 +0100 include: Add Windows.Devices.Power.IBatteryReport interface definition. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/windows.devices.power.idl | 15 +++++++++++++++ include/windows.foundation.idl | 1 + include/windows.system.power.idl | 37 +++++++++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index ae551abd4c0..9578c557af7 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -792,6 +792,7 @@ SOURCES = \ windows.media.speechsynthesis.idl \ windows.storage.streams.idl \ windows.system.idl \ + windows.system.power.idl \ windows.system.userprofile.idl \ windowscontracts.idl \ windowsx.h \ diff --git a/include/windows.devices.power.idl b/include/windows.devices.power.idl index 4bf2599686c..f91c8fac6e3 100644 --- a/include/windows.devices.power.idl +++ b/include/windows.devices.power.idl @@ -22,11 +22,26 @@ import "inspectable.idl"; import "windows.foundation.idl"; +import "windows.system.power.idl"; namespace Windows.Devices.Power { interface IBatteryReport; runtimeclass BatteryReport; + [ + contract(Windows.Foundation.UniversalApiContract, 1.0), + exclusiveto(Windows.Devices.Power.BatteryReport), + uuid(c9858c3a-4e13-420a-a8d0-24f18f395401) + ] + interface IBatteryReport : IInspectable + { + [propget] HRESULT ChargeRateInMilliwatts([out, retval] Windows.Foundation.IReference<INT32> **value); + [propget] HRESULT DesignCapacityInMilliwattHours([out, retval] Windows.Foundation.IReference<INT32> **value); + [propget] HRESULT FullChargeCapacityInMilliwattHours([out, retval] Windows.Foundation.IReference<INT32> **value); + [propget] HRESULT RemainingCapacityInMilliwattHours([out, retval] Windows.Foundation.IReference<INT32> **value); + [propget] HRESULT Status([out, retval] Windows.System.Power.BatteryStatus *value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), marshaling_behavior(agile), diff --git a/include/windows.foundation.idl b/include/windows.foundation.idl index 50e134d3900..a92a5d82424 100644 --- a/include/windows.foundation.idl +++ b/include/windows.foundation.idl @@ -167,6 +167,7 @@ namespace Windows { interface Windows.Foundation.Collections.IMapView<HSTRING, Windows.Foundation.Collections.IVectorView<HSTRING>*>; interface Windows.Foundation.AsyncOperationCompletedHandler<boolean>; interface Windows.Foundation.IAsyncOperation<boolean>; + interface Windows.Foundation.IReference<INT32>; } } } diff --git a/include/windows.system.power.idl b/include/windows.system.power.idl new file mode 100644 index 00000000000..366042dbf2f --- /dev/null +++ b/include/windows.system.power.idl @@ -0,0 +1,37 @@ +/* + * Copyright 2022 Rémi Bernon for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "inspectable.idl"; +import "windows.foundation.idl"; + +namespace Windows.System.Power { + typedef enum BatteryStatus BatteryStatus; + + [contract(Windows.Foundation.UniversalApiContract, 1.0)] + enum BatteryStatus + { + NotPresent = 0, + Discharging = 1, + Idle = 2, + Charging = 3, + }; +}

1 0

Jactry Zeng : d2d1: Add D2D1Shadow effect.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: f8426dbb3b02eedcf52d8150a52a8c7c7024c605 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8426dbb3b02eedcf52d8150… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Sun Mar 6 22:13:32 2022 -0600 d2d1: Add D2D1Shadow effect. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/effect.c | 1 + dlls/d2d1/tests/d2d1.c | 1 + include/d2d1effects.idl | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/d2d1/effect.c b/dlls/d2d1/effect.c index 2f1949c073c..e7215c4b38a 100644 --- a/dlls/d2d1/effect.c +++ b/dlls/d2d1/effect.c @@ -26,6 +26,7 @@ static const struct d2d_effect_info builtin_effects[] = {&CLSID_D2D13DPerspectiveTransform, 1, 1, 1}, {&CLSID_D2D1Composite, 2, 1, 0xffffffff}, {&CLSID_D2D1Crop, 1, 1, 1}, + {&CLSID_D2D1Shadow, 1, 1, 1}, }; static inline struct d2d_effect *impl_from_ID2D1Effect(ID2D1Effect *iface) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a425395e64a..3ade9634069 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9908,6 +9908,7 @@ static void test_effect(BOOL d3d11) {&CLSID_D2D13DPerspectiveTransform, 1, 1, 1}, {&CLSID_D2D1Composite, 2, 1, 0xffffffff}, {&CLSID_D2D1Crop, 1, 1, 1}, + {&CLSID_D2D1Shadow, 1, 1, 1}, }; if (!init_test_context(&ctx, d3d11)) diff --git a/include/d2d1effects.idl b/include/d2d1effects.idl index 9bd0b7012ad..d448aec162a 100644 --- a/include/d2d1effects.idl +++ b/include/d2d1effects.idl @@ -20,6 +20,7 @@ cpp_quote("DEFINE_GUID(CLSID_D2D12DAffineTransform, 0x6aa97485,0x6354,0x4cf cpp_quote("DEFINE_GUID(CLSID_D2D13DPerspectiveTransform, 0xc2844d0b,0x3d86,0x46e7,0x85,0xba,0x52,0x6c,0x92,0x40,0xf3,0xfb);") cpp_quote("DEFINE_GUID(CLSID_D2D1Composite, 0x48fc9f51,0xf6ac,0x48f1,0x8b,0x58,0x3b,0x28,0xac,0x46,0xf7,0x6d);") cpp_quote("DEFINE_GUID(CLSID_D2D1Crop, 0xe23f7110,0x0e9a,0x4324,0xaf,0x47,0x6a,0x2c,0x0c,0x46,0xf3,0x5b);") +cpp_quote("DEFINE_GUID(CLSID_D2D1Shadow, 0xc67ea361,0x1863,0x4e69,0x89,0xdb,0x69,0x5d,0x3e,0x9a,0x5b,0x6b);") typedef enum D2D1_BORDER_MODE {

1 0

Francois Gouget : windows.gaming.input: Add a linefeed to a TRACE() message.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: ea79e50f9827bddd6920f8f520c6e7732de1ecec URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea79e50f9827bddd6920f8f5… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 7 15:38:32 2022 +0100 windows.gaming.input: Add a linefeed to a TRACE() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/vector.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windows.gaming.input/vector.c b/dlls/windows.gaming.input/vector.c index 918262af8e1..441c13dab4c 100644 --- a/dlls/windows.gaming.input/vector.c +++ b/dlls/windows.gaming.input/vector.c @@ -459,6 +459,6 @@ HRESULT vector_create( REFIID iid, REFIID view_iid, void **out ) impl->ref = 1; *out = &impl->IVector_IInspectable_iface; - TRACE( "created %p", *out ); + TRACE( "created %p\n", *out ); return S_OK; }

1 0

Jacek Caban : user32: Introduce get_class_info.
by Alexandre Julliard 07 Mar '22

07 Mar '22

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 07 Mar '22

07 Mar '22

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 07 Mar '22

07 Mar '22

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: Use UNICODE_STRING for passing window classes internally.
by Alexandre Julliard 07 Mar '22

07 Mar '22

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 : user32: Store menu name as a struct.
by Alexandre Julliard 07 Mar '22

07 Mar '22

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 class management implementation from user32.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: 7c76aa05a9d27dd6f5705c4ef90c16862af14f3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c76aa05a9d27dd6f5705c4e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 7 14:42:32 2022 +0100 win32u: Move class management 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 | 280 ++++++------------------------------------- dlls/user32/controls.h | 7 -- dlls/user32/painting.c | 2 +- dlls/user32/user_main.c | 2 + dlls/user32/user_private.h | 2 +- dlls/win32u/class.c | 251 +++++++++++++++++++++++++++++++++++++- dlls/win32u/gdiobj.c | 3 + dlls/win32u/ntuser_private.h | 11 ++ dlls/win32u/win32u.spec | 6 +- dlls/win32u/win32u_private.h | 8 ++ dlls/win32u/wrappers.c | 22 ++++ include/ntuser.h | 7 ++ 12 files changed, 341 insertions(+), 260 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7c76aa05a9d27dd6f570…

1 0