Commit 72581bd2 authored by James Hawkins's avatar James Hawkins Committed by Alexandre Julliard

advpack: Forward the ansi user stub APIs to their Unicode counterparts.

parent ca3ad7d6
...@@ -683,10 +683,35 @@ HRESULT WINAPI TranslateInfStringExW(HINF hInf, LPCWSTR pszInfFilename, ...@@ -683,10 +683,35 @@ HRESULT WINAPI TranslateInfStringExW(HINF hInf, LPCWSTR pszInfFilename,
/*********************************************************************** /***********************************************************************
* UserInstStubWrapperA (ADVPACK.@) * UserInstStubWrapperA (ADVPACK.@)
*
* See UserInstStubWrapperW.
*/ */
HRESULT WINAPI UserInstStubWrapperA(HWND hWnd, HINSTANCE hInstance, HRESULT WINAPI UserInstStubWrapperA(HWND hWnd, HINSTANCE hInstance,
LPSTR pszParms, INT nShow) LPSTR pszParms, INT nShow)
{ {
UNICODE_STRING parmsW;
HRESULT res;
TRACE("(%p, %p, %p, %i)\n", hWnd, hInstance, pszParms, nShow);
if (!pszParms)
return E_INVALIDARG;
RtlCreateUnicodeStringFromAsciiz(&parmsW, pszParms);
res = UserInstStubWrapperW(hWnd, hInstance, parmsW.Buffer, nShow);
RtlFreeUnicodeString(&parmsW);
return res;
}
/***********************************************************************
* UserInstStubWrapperW (ADVPACK.@)
*/
HRESULT WINAPI UserInstStubWrapperW(HWND hWnd, HINSTANCE hInstance,
LPWSTR pszParms, INT nShow)
{
FIXME("(%p, %p, %p, %i) stub\n", hWnd, hInstance, pszParms, nShow); FIXME("(%p, %p, %p, %i) stub\n", hWnd, hInstance, pszParms, nShow);
return E_FAIL; return E_FAIL;
...@@ -694,9 +719,34 @@ HRESULT WINAPI UserInstStubWrapperA(HWND hWnd, HINSTANCE hInstance, ...@@ -694,9 +719,34 @@ HRESULT WINAPI UserInstStubWrapperA(HWND hWnd, HINSTANCE hInstance,
/*********************************************************************** /***********************************************************************
* UserUnInstStubWrapperA (ADVPACK.@) * UserUnInstStubWrapperA (ADVPACK.@)
*
* See UserUnInstStubWrapperW.
*/ */
HRESULT WINAPI UserUnInstStubWrapperA(HWND hWnd, HINSTANCE hInstance, HRESULT WINAPI UserUnInstStubWrapperA(HWND hWnd, HINSTANCE hInstance,
LPSTR pszParms, INT nShow) LPSTR pszParms, INT nShow)
{
UNICODE_STRING parmsW;
HRESULT res;
TRACE("(%p, %p, %p, %i)\n", hWnd, hInstance, pszParms, nShow);
if (!pszParms)
return E_INVALIDARG;
RtlCreateUnicodeStringFromAsciiz(&parmsW, pszParms);
res = UserUnInstStubWrapperW(hWnd, hInstance, parmsW.Buffer, nShow);
RtlFreeUnicodeString(&parmsW);
return res;
}
/***********************************************************************
* UserUnInstStubWrapperW (ADVPACK.@)
*/
HRESULT WINAPI UserUnInstStubWrapperW(HWND hWnd, HINSTANCE hInstance,
LPWSTR pszParms, INT nShow)
{ {
FIXME("(%p, %p, %p, %i) stub\n", hWnd, hInstance, pszParms, nShow); FIXME("(%p, %p, %p, %i) stub\n", hWnd, hInstance, pszParms, nShow);
......
...@@ -75,8 +75,8 @@ ...@@ -75,8 +75,8 @@
@ stdcall TranslateInfStringExW(long wstr wstr wstr wstr long ptr ptr) @ stdcall TranslateInfStringExW(long wstr wstr wstr wstr long ptr ptr)
@ stdcall TranslateInfStringEx(long str str str str long ptr ptr) TranslateInfStringExA @ stdcall TranslateInfStringEx(long str str str str long ptr ptr) TranslateInfStringExA
@ stdcall UserInstStubWrapperA(long long str long) @ stdcall UserInstStubWrapperA(long long str long)
# stdcall UserInstStubWrapperW(long long wstr long) @ stdcall UserInstStubWrapperW(long long wstr long)
@ stdcall UserInstStubWrapper(long long str long) UserInstStubWrapperA @ stdcall UserInstStubWrapper(long long str long) UserInstStubWrapperA
@ stdcall UserUnInstStubWrapperA(long long str long) @ stdcall UserUnInstStubWrapperA(long long str long)
# stdcall UserUnInstStubWrapperW(long long wstr long) @ stdcall UserUnInstStubWrapperW(long long wstr long)
@ stdcall UserUnInstStubWrapper(long long str long) UserUnInstStubWrapperA @ stdcall UserUnInstStubWrapper(long long str long) UserUnInstStubWrapperA
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment