[PATCH v4 0/2] MR9057: shell32 shlwapi: Call of ShellMessageBoxW works like Windows 11.
The ShellMessageBoxW function in the shlwapi.dll library can be successfully called from any program developed for Windows 2000 and later versions. -- v4: shell32 shlwapi: Call of ShellMessageBoxW works like Windows 11. shell32 shlwapi: Call of ShellMessageBoxW works like Windows 11. https://gitlab.winehq.org/wine/wine/-/merge_requests/9057
From: Matthias Zorn <matthias0178(a)gmail.com> --- dlls/shell32/shell32.spec | 2 +- dlls/shell32/shellord.c | 50 --------------------------------------- dlls/shlwapi/ordinal.c | 12 ++-------- dlls/shlwapi/shlwapi.spec | 2 +- 4 files changed, 4 insertions(+), 62 deletions(-) diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec index bdf3378a235..7036508c6ee 100644 --- a/dlls/shell32/shell32.spec +++ b/dlls/shell32/shell32.spec @@ -171,7 +171,7 @@ 179 stdcall -ordinal SHGetNewLinkInfoA(str str ptr ptr long) 180 stdcall -ordinal SHGetNewLinkInfoW(wstr wstr ptr ptr long) 181 stdcall -noname RegisterShellHook(long long) - 182 varargs -ordinal ShellMessageBoxW(long long wstr wstr long) + 182 varargs -private ShellMessageBoxW(long long wstr wstr long) shlwapi.ShellMessageBoxW 183 varargs -ordinal ShellMessageBoxA(long long str str long) 184 stdcall -noname ArrangeWindows(long long ptr long ptr) 185 stub SHHandleDiskFull diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 7c262e6436f..9af32776c1a 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -368,56 +368,6 @@ BOOL WINAPI RegisterShellHook( return TRUE; } -/************************************************************************* - * ShellMessageBoxW [SHELL32.182] - * - * See ShellMessageBoxA. - * - * NOTE: - * shlwapi.ShellMessageBoxWrapW is a duplicate of shell32.ShellMessageBoxW - * because we can't forward to it in the .spec file since it's exported by - * ordinal. If you change the implementation here please update the code in - * shlwapi as well. - */ -int WINAPIV ShellMessageBoxW( - HINSTANCE hInstance, - HWND hWnd, - LPCWSTR lpText, - LPCWSTR lpCaption, - UINT uType, - ...) -{ - WCHAR szText[100],szTitle[100]; - LPCWSTR pszText = szText, pszTitle = szTitle; - LPWSTR pszTemp; - va_list args; - int ret; - - va_start(args, uType); - /* wvsprintfA(buf,fmt, args); */ - - TRACE("(%p,%p,%p,%p,%08x)\n", - hInstance,hWnd,lpText,lpCaption,uType); - - if (IS_INTRESOURCE(lpCaption)) - LoadStringW(hInstance, LOWORD(lpCaption), szTitle, ARRAY_SIZE(szTitle)); - else - pszTitle = lpCaption; - - if (IS_INTRESOURCE(lpText)) - LoadStringW(hInstance, LOWORD(lpText), szText, ARRAY_SIZE(szText)); - else - pszText = lpText; - - FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_STRING, - pszText, 0, 0, (LPWSTR)&pszTemp, 0, &args); - - va_end(args); - - ret = MessageBoxW(hWnd,pszTemp,pszTitle,uType); - LocalFree(pszTemp); - return ret; -} /************************************************************************* * ShellMessageBoxA [SHELL32.183] diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index eeb57f23547..e869ec8d0df 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -3983,17 +3983,9 @@ DWORD WINAPI GetUIVersion(void) } /*********************************************************************** - * ShellMessageBoxWrapW [SHLWAPI.388] - * - * See shell32.ShellMessageBoxW - * - * NOTE: - * shlwapi.ShellMessageBoxWrapW is a duplicate of shell32.ShellMessageBoxW - * because we can't forward to it in the .spec file since it's exported by - * ordinal. If you change the implementation here please update the code in - * shell32 as well. + * ShellMessageBoxW [SHLWAPI.388] */ -INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText, +INT WINAPIV ShellMessageBoxW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText, LPCWSTR lpCaption, UINT uType, ...) { WCHAR *szText = NULL, szTitle[100]; diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 7f3062a2819..8b1f3f54099 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -385,7 +385,7 @@ 385 stub -noname SHLoadRawAccelerators 386 stub -noname SHQueryRawAccelerator 387 stub -noname SHQueryRawAcceleratorMsg -388 varargs -ordinal ShellMessageBoxWrapW(long long wstr wstr long) +388 varargs ShellMessageBoxW(long long wstr wstr long) 389 stdcall -noname GetSaveFileNameWrapW(ptr) 390 stdcall -noname WNetRestoreConnectionWrapW(long wstr) 391 stdcall -noname WNetGetLastErrorWrapW(ptr ptr long ptr long) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9057
From: Matthias Zorn <matthias0178(a)gmail.com> --- dlls/shlwapi/ordinal.c | 4 ++-- dlls/shlwapi/shlwapi.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index e869ec8d0df..b4e6f4a91e0 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -3983,9 +3983,9 @@ DWORD WINAPI GetUIVersion(void) } /*********************************************************************** - * ShellMessageBoxW [SHLWAPI.388] + * ShellMessageBoxWrapW [SHLWAPI.388] */ -INT WINAPIV ShellMessageBoxW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText, +INT WINAPIV ShellMessageBoxWrapW(HINSTANCE hInstance, HWND hWnd, LPCWSTR lpText, LPCWSTR lpCaption, UINT uType, ...) { WCHAR *szText = NULL, szTitle[100]; diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 8b1f3f54099..047c23af3a6 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -385,7 +385,7 @@ 385 stub -noname SHLoadRawAccelerators 386 stub -noname SHQueryRawAccelerator 387 stub -noname SHQueryRawAcceleratorMsg -388 varargs ShellMessageBoxW(long long wstr wstr long) +388 varargs ShellMessageBoxW(long long wstr wstr long) ShellMessageBoxWrapW 389 stdcall -noname GetSaveFileNameWrapW(ptr) 390 stdcall -noname WNetRestoreConnectionWrapW(long wstr) 391 stdcall -noname WNetGetLastErrorWrapW(ptr ptr long ptr long) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9057
participants (2)
-
Matthias Zorn -
Matthias Zorn (＠Matthias-Zorn.0178)