Module: wine Branch: refs/heads/master Commit: 063a36b66f6d0b98f37f1fb5a69549a21101ce2f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=063a36b66f6d0b98f37f1fb5...
Author: James Hawkins truiken@gmail.com Date: Mon Apr 3 12:03:58 2006 -0500
advpack: Forward RegRestoreAllA to its Unicode counterpart.
---
dlls/advpack/advpack.spec | 2 +- dlls/advpack/reg.c | 25 +++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/dlls/advpack/advpack.spec b/dlls/advpack/advpack.spec index f6a85c7..5889c92 100644 --- a/dlls/advpack/advpack.spec +++ b/dlls/advpack/advpack.spec @@ -53,7 +53,7 @@ # stdcall RegInstallW(ptr wstr ptr) @ stdcall RegInstall(ptr str ptr) RegInstallA @ stdcall RegRestoreAllA(ptr str long) -# stdcall RegRestoreAllW(ptr wstr long) +@ stdcall RegRestoreAllW(ptr wstr long) @ stdcall RegRestoreAll(ptr str long) RegRestoreAllA @ stdcall RegSaveRestoreA(ptr str long str str str long) # stdcall RegSaveRestoreW(ptr wstr long wstr wstr wstr long) diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index 921dc1b..546d249 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -191,6 +191,27 @@ HRESULT WINAPI RegInstallA(HMODULE hm, L /*********************************************************************** * RegRestoreAllA (advpack.@) * + * See RegRestoreAllW. + */ +HRESULT WINAPI RegRestoreAllA(HWND hWnd, LPSTR pszTitleString, HKEY hkBackupKey) +{ + UNICODE_STRING title; + HRESULT hr; + + TRACE("(%p, %s, %p)\n", hWnd, pszTitleString, hkBackupKey); + + RtlCreateUnicodeStringFromAsciiz(&title, pszTitleString); + + hr = RegRestoreAllW(hWnd, title.Buffer, hkBackupKey); + + RtlFreeUnicodeString(&title); + + return hr; +} + +/*********************************************************************** + * RegRestoreAllW (advpack.@) + * * Restores all saved registry entries. * * PARAMS @@ -205,9 +226,9 @@ HRESULT WINAPI RegInstallA(HMODULE hm, L * BUGS * Unimplemented. */ -HRESULT WINAPI RegRestoreAllA(HWND hWnd, LPSTR pszTitleString, HKEY hkBackupKey) +HRESULT WINAPI RegRestoreAllW(HWND hWnd, LPWSTR pszTitleString, HKEY hkBackupKey) { - FIXME("(%p, %p, %p) stub\n", hWnd, pszTitleString, hkBackupKey); + FIXME("(%p, %s, %p) stub\n", hWnd, debugstr_w(pszTitleString), hkBackupKey);
return E_FAIL; }