[2/2] shlwapi: Forward more entries to user32 exports
Dmitry Timoshkov
dmitry at codeweavers.com
Wed Oct 24 00:04:07 CDT 2007
Hello,
"SHLWAPI Wrapper Functions" page in MSDN lists AppendMenuWrapW as a simple
user32 forwarder. I've converted a couple more stubs to forwarders as well.
Should we convert all "stdcall -noname" spec entries to "stdcall @" notation?
Changelog:
shlwapi: Forward more entries to user32 exports.
---
dlls/shlwapi/ordinal.c | 21 ---------------------
dlls/shlwapi/shlwapi.spec | 6 +++---
2 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c
index f5c0217..ee60ea9 100644
--- a/dlls/shlwapi/ordinal.c
+++ b/dlls/shlwapi/ordinal.c
@@ -739,27 +739,6 @@ BOOL WINAPI GetStringType3ExW(LPWSTR lpszStr, DWORD dwLen, LPVOID p3)
}
/*************************************************************************
- * @ [SHLWAPI.36]
- *
- * Insert a bitmap menu item at the bottom of a menu.
- *
- * PARAMS
- * hMenu [I] Menu to insert into
- * flags [I] Flags for insertion
- * id [I] Menu ID of the item
- * str [I] Menu text for the item
- *
- * RETURNS
- * Success: TRUE, the item is inserted into the menu
- * Failure: FALSE, if any parameter is invalid
- */
-BOOL WINAPI AppendMenuWrapW(HMENU hMenu, UINT flags, UINT id, LPCWSTR str)
-{
- TRACE("(%p,0x%08x,0x%08x,%s)\n",hMenu, flags, id, debugstr_w(str));
- return InsertMenuW(hMenu, -1, flags | MF_BITMAP, id, str);
-}
-
-/*************************************************************************
* @ [SHLWAPI.138]
*
* Set the text of a given dialog item.
diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec
index 3a920d0..ffde04c 100644
--- a/dlls/shlwapi/shlwapi.spec
+++ b/dlls/shlwapi/shlwapi.spec
@@ -33,7 +33,7 @@
33 stdcall -noname IsCharDigitW(long)
34 stdcall -noname IsCharXDigitW(long)
35 stdcall -noname GetStringType3ExW(ptr long ptr)
-36 stdcall -noname AppendMenuWrapW(long long long wstr)
+36 stdcall -noname AppendMenuWrapW(long long long wstr) user32.AppendMenuW
37 stdcall @(ptr long long long long) user32.CallWindowProcW
38 stdcall @(wstr) user32.CharLowerW
39 stdcall @(wstr long) user32.CharLowerBuffW
@@ -423,8 +423,8 @@
423 stdcall -noname _SHGlobalCounterCreateNamedW(wstr long)
424 stdcall -noname _SHGlobalCounterDecrement(long)
425 stdcall -noname DeleteMenuWrap(ptr long long)
-426 stub -noname DestroyMenuWrap
-427 stub -noname TrackPopupMenuWrap
+426 stdcall -noname DestroyMenuWrap(long) user32.DestroyMenu
+427 stdcall -noname TrackPopupMenuWrap(long long long long long long ptr) user32.TrackPopupMenu
428 stdcall @(long long long long long ptr) user32.TrackPopupMenuEx
429 stdcall -noname MLIsMLHInstance(long)
430 stdcall -noname MLSetMLHInstance(long long)
--
1.5.3.4
More information about the wine-patches
mailing list