From 72581bd2d73e357c2ca594a90b025f144b236553 Mon Sep 17 00:00:00 2001 From: James Hawkins Date: Wed, 22 Mar 2006 14:15:51 -0600 Subject: [PATCH] advpack: Forward the ansi user stub APIs to their Unicode counterparts. --- dlls/advpack/advpack.c | 52 ++++++++++++++++++++++++++++++++++++++- dlls/advpack/advpack.spec | 4 +-- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index b4f3caf15e3..18f33e4616c 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -683,9 +683,34 @@ HRESULT WINAPI TranslateInfStringExW(HINF hInf, LPCWSTR pszInfFilename, /*********************************************************************** * UserInstStubWrapperA (ADVPACK.@) + * + * See UserInstStubWrapperW. */ HRESULT WINAPI UserInstStubWrapperA(HWND hWnd, HINSTANCE hInstance, 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); @@ -694,9 +719,34 @@ HRESULT WINAPI UserInstStubWrapperA(HWND hWnd, HINSTANCE hInstance, /*********************************************************************** * UserUnInstStubWrapperA (ADVPACK.@) + * + * See UserUnInstStubWrapperW. */ 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); diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index aa90acfad1c..7ab49b1dae3 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -75,8 +75,8 @@ @ stdcall TranslateInfStringExW(long wstr wstr wstr wstr long ptr ptr) @ stdcall TranslateInfStringEx(long str str str str long ptr ptr) TranslateInfStringExA @ 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 UserUnInstStubWrapperA(long long str long) -# stdcall UserUnInstStubWrapperW(long long wstr long) +@ stdcall UserUnInstStubWrapperW(long long wstr long) @ stdcall UserUnInstStubWrapper(long long str long) UserUnInstStubWrapperA