James Hawkins : advpack:
Forward RebootCheckOnInstallA to its Unicode counterpart.
Alexandre Julliard
julliard at wine.codeweavers.com
Wed Mar 22 15:09:01 CST 2006
Module: wine
Branch: refs/heads/master
Commit: 15a2169ec0f0bbac515a2ff47db4bbf6681a96b7
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=15a2169ec0f0bbac515a2ff47db4bbf6681a96b7
Author: James Hawkins <truiken at gmail.com>
Date: Wed Mar 22 14:08:37 2006 -0600
advpack: Forward RebootCheckOnInstallA to its Unicode counterpart.
---
dlls/advpack/advpack.c | 35 ++++++++++++++++++++++++++++++++---
dlls/advpack/advpack.spec | 2 +-
2 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c
index 460f72d..b4f3caf 100644
--- a/dlls/advpack/advpack.c
+++ b/dlls/advpack/advpack.c
@@ -324,6 +324,34 @@ HRESULT WINAPI OpenINFEngineW(LPCWSTR ps
/***********************************************************************
* RebootCheckOnInstallA (ADVPACK.@)
*
+ * See RebootCheckOnInstallW.
+ */
+HRESULT WINAPI RebootCheckOnInstallA(HWND hWnd, LPCSTR pszINF,
+ LPSTR pszSec, DWORD dwReserved)
+{
+ UNICODE_STRING infW, secW;
+ HRESULT res;
+
+ TRACE("(%p, %s, %s, %ld)\n", hWnd, debugstr_a(pszINF),
+ debugstr_a(pszSec), dwReserved);
+
+ if (!pszINF || !pszSec)
+ return E_INVALIDARG;
+
+ RtlCreateUnicodeStringFromAsciiz(&infW, pszINF);
+ RtlCreateUnicodeStringFromAsciiz(&secW, pszSec);
+
+ res = RebootCheckOnInstallW(hWnd, infW.Buffer, secW.Buffer, dwReserved);
+
+ RtlFreeUnicodeString(&infW);
+ RtlFreeUnicodeString(&secW);
+
+ return res;
+}
+
+/***********************************************************************
+ * RebootCheckOnInstallW (ADVPACK.@)
+ *
* Checks if a reboot is required for an installed INF section.
*
* PARAMS
@@ -344,10 +372,11 @@ HRESULT WINAPI OpenINFEngineW(LPCWSTR ps
* BUGS
* Unimplemented.
*/
-HRESULT WINAPI RebootCheckOnInstallA(HWND hWnd, LPCSTR pszINF,
- LPSTR pszSec, DWORD dwReserved)
+HRESULT WINAPI RebootCheckOnInstallW(HWND hWnd, LPCWSTR pszINF,
+ LPWSTR pszSec, DWORD dwReserved)
{
- FIXME("(%p, %p, %p, %ld) stub\n", hWnd, pszINF, pszSec, dwReserved);
+ FIXME("(%p, %s, %s, %ld) stub\n", hWnd, debugstr_w(pszINF),
+ debugstr_w(pszSec), dwReserved);
return E_FAIL;
}
diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec
index 7ddd412..ae1d5b2 100644
--- a/dlls/advpack/advpack.spec
+++ b/dlls/advpack/advpack.spec
@@ -47,7 +47,7 @@
@ stdcall OpenINFEngineW(wstr wstr long ptr ptr)
@ stdcall OpenINFEngine(str str long ptr ptr) OpenINFEngineA
@ stdcall RebootCheckOnInstallA(long str str long)
-# stdcall RebootCheckOnInstallW(long wstr wstr long)
+@ stdcall RebootCheckOnInstallW(long wstr wstr long)
@ stdcall RebootCheckOnInstall(long str str long) RebootCheckOnInstallA
@ stdcall RegInstallA(ptr str ptr)
# stdcall RegInstallW(ptr wstr ptr)
More information about the wine-cvs
mailing list