From: Zhiyi Zhang <zzhang@codeweavers.com> The return type should be BOOLEAN instead of BOOL according to native headers. --- dlls/comctl32/commctrl.c | 2 +- dlls/comctl32/tests/misc.c | 2 +- dlls/user32/class.c | 2 +- include/winuser.h | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 80404b8990f..0605680c792 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -166,7 +166,7 @@ static void unregister_classes(void) } } -BOOL WINAPI RegisterClassNameW(const WCHAR *class) +BOOLEAN WINAPI RegisterClassNameW(const WCHAR *class) { int min = 0, max = ARRAY_SIZE(classes) - 1; diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 155d9e34ab3..15925c0d8a4 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -39,7 +39,7 @@ static INT (WINAPI * pStr_GetPtrW)(LPCWSTR, LPWSTR, INT); static BOOL (WINAPI * pStr_SetPtrW)(LPWSTR, LPCWSTR); static HRESULT (WINAPI *pDllGetVersion)(DLLVERSIONINFO *); -static BOOL (WINAPI *pRegisterClassNameW)(const WCHAR *class_name); +static PREGISTERCLASSNAMEW pRegisterClassNameW; static BOOL (WINAPI *pSetWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR, DWORD_PTR); static BOOL (WINAPI *pRemoveWindowSubclass)(HWND, SUBCLASSPROC, UINT_PTR); static LRESULT (WINAPI *pDefSubclassProc)(HWND, UINT, WPARAM, LPARAM); diff --git a/dlls/user32/class.c b/dlls/user32/class.c index a754720caec..a8150e76cc0 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -232,7 +232,7 @@ void get_class_version( UNICODE_STRING *name, UNICODE_STRING *version, BOOL load if (load && hmod) { - BOOL (WINAPI *pRegisterClassNameW)( const WCHAR *class ); + PREGISTERCLASSNAMEW pRegisterClassNameW; if ((pRegisterClassNameW = (void *)GetProcAddress( hmod, "RegisterClassNameW" ))) { TRACE( "registering %s version %s\n", debugstr_us(name), debugstr_us(version) ); diff --git a/include/winuser.h b/include/winuser.h index b74bc3fd6a6..c983f78ab9f 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3844,6 +3844,8 @@ typedef struct tagMENUGETOBJECTINFO void *pvObj; } MENUGETOBJECTINFO, *PMENUGETOBJECTINFO; +typedef BOOLEAN (WINAPI *PREGISTERCLASSNAMEW)(LPCWSTR); + #if defined(_WINGDI_) && !defined(NOGDI) WINUSERAPI LONG WINAPI ChangeDisplaySettingsA(LPDEVMODEA,DWORD); WINUSERAPI LONG WINAPI ChangeDisplaySettingsW(LPDEVMODEW,DWORD); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9883