mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-05 23:11:47 +00:00
oledlg: Use standard va_list instead of __ms_va_list.
This commit is contained in:
parent
ee9abe526e
commit
3485d4de1d
|
@ -207,7 +207,7 @@ BOOL WINAPI OleUIAddVerbMenuW(IOleObject *object, LPCWSTR shorttype,
|
||||||
args[1] = (DWORD_PTR)objecttype;
|
args[1] = (DWORD_PTR)objecttype;
|
||||||
|
|
||||||
FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_ARGUMENT_ARRAY,
|
FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_ARGUMENT_ARRAY,
|
||||||
resstrW, 0, 0, (WCHAR*)&str, 0, (__ms_va_list*)args);
|
resstrW, 0, 0, (WCHAR*)&str, 0, (va_list *)args);
|
||||||
|
|
||||||
RemoveMenu(hMenu, uPos, MF_BYPOSITION);
|
RemoveMenu(hMenu, uPos, MF_BYPOSITION);
|
||||||
InsertMenuW(hMenu, uPos, MF_BYPOSITION|MF_STRING, idmin, str);
|
InsertMenuW(hMenu, uPos, MF_BYPOSITION|MF_STRING, idmin, str);
|
||||||
|
@ -247,7 +247,7 @@ BOOL WINAPI OleUIAddVerbMenuW(IOleObject *object, LPCWSTR shorttype,
|
||||||
|
|
||||||
args[0] = (DWORD_PTR)objecttype;
|
args[0] = (DWORD_PTR)objecttype;
|
||||||
FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_ARGUMENT_ARRAY,
|
FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_ARGUMENT_ARRAY,
|
||||||
resstrW, 0, 0, (WCHAR*)&str, 0, (__ms_va_list*)args);
|
resstrW, 0, 0, (WCHAR*)&str, 0, (va_list *)args);
|
||||||
|
|
||||||
InsertMenuW(hMenu, uPos, MF_BYPOSITION|MF_POPUP|MF_STRING, (UINT_PTR)submenu, str);
|
InsertMenuW(hMenu, uPos, MF_BYPOSITION|MF_POPUP|MF_STRING, (UINT_PTR)submenu, str);
|
||||||
HeapFree(GetProcessHeap(), 0, str);
|
HeapFree(GetProcessHeap(), 0, str);
|
||||||
|
|
Loading…
Reference in a new issue