Nikolay Sivov : oledlg: Forward OleUIAddVerbMenuA to OleUIAddVerbMenuW.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu May 14 06:22:36 CDT 2015
Module: wine
Branch: master
Commit: d93781f29bb346f04f8489ae208b1ffe540fe9c6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d93781f29bb346f04f8489ae208b1ffe540fe9c6
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Thu May 14 10:44:42 2015 +0300
oledlg: Forward OleUIAddVerbMenuA to OleUIAddVerbMenuW.
---
dlls/oledlg/oledlg_main.c | 32 +++++++++++++++++++++-----------
1 file changed, 21 insertions(+), 11 deletions(-)
diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c
index f3f91fb..32b92a1 100644
--- a/dlls/oledlg/oledlg_main.c
+++ b/dlls/oledlg/oledlg_main.c
@@ -98,18 +98,28 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad)
/***********************************************************************
* OleUIAddVerbMenuA (OLEDLG.1)
*/
-BOOL WINAPI OleUIAddVerbMenuA(
- LPOLEOBJECT lpOleObj, LPCSTR lpszShortType,
- HMENU hMenu, UINT uPos, UINT uIDVerbMin, UINT uIDVerbMax,
- BOOL bAddConvert, UINT idConvert, HMENU *lphMenu)
+BOOL WINAPI OleUIAddVerbMenuA(IOleObject *object, LPCSTR shorttype,
+ HMENU hMenu, UINT uPos, UINT uIDVerbMin, UINT uIDVerbMax,
+ BOOL addConvert, UINT idConvert, HMENU *lphMenu)
{
- FIXME("(%p, %s, %p, %d, %d, %d, %d, %d, %p): stub\n",
- lpOleObj, debugstr_a(lpszShortType),
- hMenu, uPos, uIDVerbMin, uIDVerbMax,
- bAddConvert, idConvert, lphMenu
- );
- SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
- return FALSE;
+ WCHAR *shorttypeW = NULL;
+ BOOL ret;
+
+ TRACE("(%p, %s, %p, %d, %d, %d, %d, %d, %p)\n", object, debugstr_a(shorttype),
+ hMenu, uPos, uIDVerbMin, uIDVerbMax, addConvert, idConvert, lphMenu);
+
+ if (shorttype)
+ {
+ INT len = MultiByteToWideChar(CP_ACP, 0, shorttype, -1, NULL, 0);
+ shorttypeW = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR));
+ if (shorttypeW)
+ MultiByteToWideChar(CP_ACP, 0, shorttype, -1, shorttypeW, len);
+ }
+
+ ret = OleUIAddVerbMenuW(object, shorttypeW, hMenu, uPos, uIDVerbMin, uIDVerbMax,
+ addConvert, idConvert, lphMenu);
+ HeapFree(GetProcessHeap(), 0, shorttypeW);
+ return ret;
}
/***********************************************************************
More information about the wine-cvs
mailing list