From 65b50022d5ec5d5e73be4f8feccf82390de5f43d Mon Sep 17 00:00:00 2001 From: James Hawkins Date: Tue, 11 Apr 2006 00:17:13 -0500 Subject: [PATCH] advpack: Standardize the format of advpack traces. Display all strings in advpack traces. Use debugstr_a/w for TRACE strings. --- dlls/advpack/advpack.c | 34 +++++++++++++++++----------------- dlls/advpack/files.c | 42 +++++++++++++++++++++++------------------- dlls/advpack/install.c | 28 ++++++++++++++-------------- dlls/advpack/reg.c | 22 +++++++++++++--------- 4 files changed, 67 insertions(+), 59 deletions(-) diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 07445b66ed0..e9c83215dcb 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -142,7 +142,7 @@ HRESULT WINAPI CloseINFEngine(HINF hInf) */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(%p, %ld, %p)\n",hinstDLL, fdwReason, lpvReserved); + TRACE("(%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved); if (fdwReason == DLL_PROCESS_ATTACH) DisableThreadLibraryCalls(hinstDLL); @@ -171,7 +171,7 @@ BOOL WINAPI IsNTAdmin(DWORD reserved, LPDWORD pReserved) HANDLE hToken; PSID pSid; - TRACE("(0x%08lx, %p)\n", reserved, pReserved); + TRACE("(%ld, %p)\n", reserved, pReserved); if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) return FALSE; @@ -233,7 +233,7 @@ BOOL WINAPI IsNTAdmin(DWORD reserved, LPDWORD pReserved) */ DWORD WINAPI NeedRebootInit(VOID) { - FIXME("(): stub\n"); + FIXME("(VOID): stub\n"); return 0; } @@ -253,7 +253,7 @@ DWORD WINAPI NeedRebootInit(VOID) */ BOOL WINAPI NeedReboot(DWORD dwRebootCheck) { - FIXME("(0x%08lx): stub\n", dwRebootCheck); + FIXME("(%ld): stub\n", dwRebootCheck); return FALSE; } @@ -268,8 +268,8 @@ HRESULT WINAPI OpenINFEngineA(LPCSTR pszInfFilename, LPCSTR pszInstallSection, UNICODE_STRING filenameW, installW; HRESULT res; - TRACE("(%p, %p, %ld, %p, %p)\n", pszInfFilename, pszInstallSection, - dwFlags, phInf, pvReserved); + TRACE("(%s, %s, %ld, %p, %p)\n", debugstr_a(pszInfFilename), + debugstr_a(pszInstallSection), dwFlags, phInf, pvReserved); if (!pszInfFilename || !phInf) return E_INVALIDARG; @@ -306,7 +306,7 @@ HRESULT WINAPI OpenINFEngineA(LPCSTR pszInfFilename, LPCSTR pszInstallSection, HRESULT WINAPI OpenINFEngineW(LPCWSTR pszInfFilename, LPCWSTR pszInstallSection, DWORD dwFlags, HINF *phInf, PVOID pvReserved) { - TRACE("(%p, %p, %ld, %p, %p)\n", debugstr_w(pszInfFilename), + TRACE("(%s, %s, %ld, %p, %p)\n", debugstr_w(pszInfFilename), debugstr_w(pszInstallSection), dwFlags, phInf, pvReserved); if (!pszInfFilename || !phInf) @@ -375,7 +375,7 @@ HRESULT WINAPI RebootCheckOnInstallA(HWND hWnd, LPCSTR pszINF, HRESULT WINAPI RebootCheckOnInstallW(HWND hWnd, LPCWSTR pszINF, LPWSTR pszSec, DWORD dwReserved) { - FIXME("(%p, %s, %s, %ld) stub\n", hWnd, debugstr_w(pszINF), + FIXME("(%p, %s, %s, %ld): stub\n", hWnd, debugstr_w(pszINF), debugstr_w(pszSec), dwReserved); return E_FAIL; @@ -392,7 +392,7 @@ void WINAPI RegisterOCX(HWND hWnd, HINSTANCE hInst, LPCSTR cmdline, INT show) DLLREGISTER pfnRegister; HRESULT hr; - TRACE("(%s)\n", cmdline); + TRACE("(%s)\n", debugstr_a(cmdline)); MultiByteToWideChar(CP_ACP, 0, cmdline, strlen(cmdline), wszBuff, MAX_PATH); if ((pwcComma = strchrW( wszBuff, ',' ))) *pwcComma = 0; @@ -560,7 +560,7 @@ HRESULT WINAPI TranslateInfStringA(LPCSTR pszInfFilename, LPCSTR pszInstallSecti HRESULT res; DWORD len = 0; - TRACE("(%s %s %s %s %p %ld %p %p)\n", + TRACE("(%s, %s, %s, %s, %p, %ld, %p, %p)\n", debugstr_a(pszInfFilename), debugstr_a(pszInstallSection), debugstr_a(pszTranslateSection), debugstr_a(pszTranslateKey), pszBuffer, dwBufferSize,pdwRequiredSize, pvReserved); @@ -636,7 +636,7 @@ HRESULT WINAPI TranslateInfStringW(LPCWSTR pszInfFilename, LPCWSTR pszInstallSec { HINF hInf; - TRACE("(%s %s %s %s %p %ld %p %p)\n", + TRACE("(%s, %s, %s, %s, %p, %ld, %p, %p)\n", debugstr_w(pszInfFilename), debugstr_w(pszInstallSection), debugstr_w(pszTranslateSection), debugstr_w(pszTranslateKey), pszBuffer, dwBufferSize,pdwRequiredSize, pvReserved); @@ -679,7 +679,7 @@ HRESULT WINAPI TranslateInfStringExA(HINF hInf, LPCSTR pszInfFilename, HRESULT res; DWORD len = 0; - TRACE("(%p, %p, %p, %p, %p, %ld, %p, %p)\n", hInf, debugstr_a(pszInfFilename), + TRACE("(%p, %s, %s, %s, %s, %ld, %p, %p)\n", hInf, debugstr_a(pszInfFilename), debugstr_a(pszTranslateSection), debugstr_a(pszTranslateKey), debugstr_a(pszBuffer), dwBufferSize, pdwRequiredSize, pvReserved); @@ -759,7 +759,7 @@ HRESULT WINAPI TranslateInfStringExW(HINF hInf, LPCWSTR pszInfFilename, LPWSTR pszBuffer, DWORD dwBufferSize, PDWORD pdwRequiredSize, PVOID pvReserved) { - TRACE("(%p, %p, %p, %p, %p, %ld, %p, %p)\n", hInf, debugstr_w(pszInfFilename), + TRACE("(%p, %s, %s, %s, %s, %ld, %p, %p)\n", hInf, debugstr_w(pszInfFilename), debugstr_w(pszTranslateSection), debugstr_w(pszTranslateKey), debugstr_w(pszBuffer), dwBufferSize, pdwRequiredSize, pvReserved); @@ -789,7 +789,7 @@ HRESULT WINAPI UserInstStubWrapperA(HWND hWnd, HINSTANCE hInstance, UNICODE_STRING parmsW; HRESULT res; - TRACE("(%p, %p, %p, %i)\n", hWnd, hInstance, pszParms, nShow); + TRACE("(%p, %p, %s, %i)\n", hWnd, hInstance, debugstr_a(pszParms), nShow); if (!pszParms) return E_INVALIDARG; @@ -809,7 +809,7 @@ HRESULT WINAPI UserInstStubWrapperA(HWND hWnd, HINSTANCE hInstance, 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, %s, %i): stub\n", hWnd, hInstance, debugstr_w(pszParms), nShow); return E_FAIL; } @@ -825,7 +825,7 @@ HRESULT WINAPI UserUnInstStubWrapperA(HWND hWnd, HINSTANCE hInstance, UNICODE_STRING parmsW; HRESULT res; - TRACE("(%p, %p, %p, %i)\n", hWnd, hInstance, pszParms, nShow); + TRACE("(%p, %p, %s, %i)\n", hWnd, hInstance, debugstr_a(pszParms), nShow); if (!pszParms) return E_INVALIDARG; @@ -845,7 +845,7 @@ HRESULT WINAPI UserUnInstStubWrapperA(HWND hWnd, HINSTANCE hInstance, 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, %s, %i): stub\n", hWnd, hInstance, debugstr_w(pszParms), nShow); return E_FAIL; } diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 7e426077296..5c7e6368eab 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -61,8 +61,8 @@ HRESULT WINAPI AddDelBackupEntryA(LPCSTR lpcszFileList, LPCSTR lpcszBackupDir, LPWSTR filelist, backup; HRESULT res; - TRACE("(%p, %p, %p, %ld)\n", lpcszFileList, lpcszBackupDir, - lpcszBaseName, dwFlags); + TRACE("(%s, %s, %s, %ld)\n", debugstr_a(lpcszFileList), + debugstr_a(lpcszBackupDir), debugstr_a(lpcszBaseName), dwFlags); if (lpcszFileList) filelist = ansi_to_unicode_list(lpcszFileList); @@ -125,8 +125,8 @@ HRESULT WINAPI AddDelBackupEntryW(LPCWSTR lpcszFileList, LPCWSTR lpcszBackupDir, static const WCHAR ini[] = {'.','i','n','i',0}; static const WCHAR backup[] = {'b','a','c','k','u','p',0}; - TRACE("(%p, %p, %p, %ld)\n", lpcszFileList, lpcszBackupDir, - lpcszBaseName, dwFlags); + TRACE("(%s, %s, %s, %ld)\n", debugstr_w(lpcszFileList), + debugstr_w(lpcszBackupDir), debugstr_w(lpcszBaseName), dwFlags); if (!lpcszFileList || !*lpcszFileList) return S_OK; @@ -198,7 +198,7 @@ HRESULT WINAPI AdvInstallFileA(HWND hwnd, LPCSTR lpszSourceDir, LPCSTR lpszSourc UNICODE_STRING destdir, destfile; HRESULT res; - TRACE("(%p,%s,%s,%s,%s,%ld,%ld)\n", hwnd, debugstr_a(lpszSourceDir), + TRACE("(%p, %s, %s, %s, %s, %ld, %ld)\n", hwnd, debugstr_a(lpszSourceDir), debugstr_a(lpszSourceFile), debugstr_a(lpszDestDir), debugstr_a(lpszDestFile), dwFlags, dwReserved); @@ -254,7 +254,7 @@ HRESULT WINAPI AdvInstallFileW(HWND hwnd, LPCWSTR lpszSourceDir, LPCWSTR lpszSou HSPFILEQ fileQueue; PVOID pContext; - TRACE("(%p,%s,%s,%s,%s,%ld,%ld)\n", hwnd, debugstr_w(lpszSourceDir), + TRACE("(%p, %s, %s, %s, %s, %ld, %ld)\n", hwnd, debugstr_w(lpszSourceDir), debugstr_w(lpszSourceFile), debugstr_w(lpszDestDir), debugstr_w(lpszDestFile), dwFlags, dwReserved); @@ -401,7 +401,7 @@ HRESULT WINAPI DelNodeA(LPCSTR pszFileOrDirName, DWORD dwFlags) UNICODE_STRING fileordirname; HRESULT res; - TRACE("(%s, 0x%08lx)\n", debugstr_a(pszFileOrDirName), dwFlags); + TRACE("(%s, %ld)\n", debugstr_a(pszFileOrDirName), dwFlags); RtlCreateUnicodeStringFromAsciiz(&fileordirname, pszFileOrDirName); @@ -435,7 +435,7 @@ HRESULT WINAPI DelNodeW(LPCWSTR pszFileOrDirName, DWORD dwFlags) WCHAR fname[MAX_PATH]; HRESULT ret = E_FAIL; - TRACE("(%s, 0x%08lx)\n", debugstr_w(pszFileOrDirName), dwFlags); + TRACE("(%s, %ld)\n", debugstr_w(pszFileOrDirName), dwFlags); if (dwFlags) FIXME("Flags ignored!\n"); @@ -715,8 +715,8 @@ HRESULT WINAPI ExtractFilesA(LPCSTR CabName, LPCSTR ExpandDir, DWORD Flags, DWORD dwFilesFound = 0; LPSTR szConvertedList = NULL; - TRACE("(%p %p %ld %p %p %ld)\n", CabName, ExpandDir, Flags, - FileList, LReserved, Reserved); + TRACE("(%s, %s, %ld, %s, %p, %ld)\n", debugstr_a(CabName), debugstr_a(ExpandDir), + Flags, debugstr_a(FileList), LReserved, Reserved); if (!CabName || !ExpandDir) return E_INVALIDARG; @@ -774,7 +774,8 @@ done: */ HRESULT WINAPI FileSaveMarkNotExistA(LPSTR pszFileList, LPSTR pszDir, LPSTR pszBaseName) { - TRACE("(%p, %p, %p)\n", pszFileList, pszDir, pszBaseName); + TRACE("(%s, %s, %s)\n", debugstr_a(pszFileList), + debugstr_a(pszDir), debugstr_a(pszBaseName)); return AddDelBackupEntryA(pszFileList, pszDir, pszBaseName, AADBE_DEL_ENTRY); } @@ -796,7 +797,8 @@ HRESULT WINAPI FileSaveMarkNotExistA(LPSTR pszFileList, LPSTR pszDir, LPSTR pszB */ HRESULT WINAPI FileSaveMarkNotExistW(LPWSTR pszFileList, LPWSTR pszDir, LPWSTR pszBaseName) { - TRACE("(%p, %p, %p)\n", pszFileList, pszDir, pszBaseName); + TRACE("(%s, %s, %s)\n", debugstr_w(pszFileList), + debugstr_w(pszDir), debugstr_w(pszBaseName)); return AddDelBackupEntryW(pszFileList, pszDir, pszBaseName, AADBE_DEL_ENTRY); } @@ -812,8 +814,8 @@ HRESULT WINAPI FileSaveRestoreA(HWND hDlg, LPSTR pszFileList, LPSTR pszDir, UNICODE_STRING filelist, dir, basename; HRESULT hr; - TRACE("(%p, %s, %s, %s, %ld)\n", hDlg, pszFileList, pszDir, - pszBaseName, dwFlags); + TRACE("(%p, %s, %s, %s, %ld)\n", hDlg, debugstr_a(pszFileList), + debugstr_a(pszDir), debugstr_a(pszBaseName), dwFlags); RtlCreateUnicodeStringFromAsciiz(&filelist, pszFileList); RtlCreateUnicodeStringFromAsciiz(&dir, pszDir); @@ -873,8 +875,9 @@ HRESULT WINAPI FileSaveRestoreOnINFA(HWND hWnd, LPCSTR pszTitle, LPCSTR pszINF, UNICODE_STRING backupdir, backupfile; HRESULT hr; - TRACE("(%p, %s, %s, %s, %s, %s, %ld) stub\n", hWnd, pszTitle, pszINF, - pszSection, pszBackupDir, pszBaseBackupFile, dwFlags); + TRACE("(%p, %s, %s, %s, %s, %s, %ld)\n", hWnd, debugstr_a(pszTitle), + debugstr_a(pszINF), debugstr_a(pszSection), debugstr_a(pszBackupDir), + debugstr_a(pszBaseBackupFile), dwFlags); RtlCreateUnicodeStringFromAsciiz(&title, pszTitle); RtlCreateUnicodeStringFromAsciiz(&inf, pszINF); @@ -921,7 +924,7 @@ HRESULT WINAPI FileSaveRestoreOnINFW(HWND hWnd, LPCWSTR pszTitle, LPCWSTR pszINF LPCWSTR pszSection, LPCWSTR pszBackupDir, LPCWSTR pszBaseBackupFile, DWORD dwFlags) { - FIXME("(%p, %p, %p, %p, %p, %p, %ld) stub\n", hWnd, debugstr_w(pszTitle), + FIXME("(%p, %s, %s, %s, %s, %s, %ld): stub\n", hWnd, debugstr_w(pszTitle), debugstr_w(pszINF), debugstr_w(pszSection), debugstr_w(pszBackupDir), debugstr_w(pszBaseBackupFile), dwFlags); @@ -936,7 +939,7 @@ HRESULT WINAPI FileSaveRestoreOnINFW(HWND hWnd, LPCWSTR pszTitle, LPCWSTR pszINF HRESULT WINAPI GetVersionFromFileA(LPCSTR Filename, LPDWORD MajorVer, LPDWORD MinorVer, BOOL Version ) { - TRACE("(%s, %p, %p, %d)\n", Filename, MajorVer, MinorVer, Version); + TRACE("(%s, %p, %p, %d)\n", debugstr_a(Filename), MajorVer, MinorVer, Version); return GetVersionFromFileExA(Filename, MajorVer, MinorVer, Version); } @@ -970,7 +973,8 @@ HRESULT WINAPI GetVersionFromFileExA(LPCSTR lpszFilename, LPDWORD pdwMSVer, UNICODE_STRING filename; HRESULT res; - TRACE("(%s, %p, %p, %d)\n", lpszFilename, pdwMSVer, pdwLSVer, bVersion); + TRACE("(%s, %p, %p, %d)\n", debugstr_a(lpszFilename), + pdwMSVer, pdwLSVer, bVersion); RtlCreateUnicodeStringFromAsciiz(&filename, lpszFilename); diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 238cd818bd5..331e956d511 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -69,7 +69,7 @@ HRESULT WINAPI DoInfInstall(const SETUPCOMMAND_PARAMS *setup) HINF hinf; void *callback_context; - TRACE("%p %s %s %s %s\n", setup->hwnd, debugstr_a(setup->title), + TRACE("%p, %s, %s, %s, %s\n", setup->hwnd, debugstr_a(setup->title), debugstr_a(setup->inf_name), debugstr_a(setup->dir), debugstr_a(setup->section_name)); @@ -151,7 +151,7 @@ HRESULT WINAPI ExecuteCabA(HWND hwnd, CABINFOA* pCab, LPVOID pReserved) */ HRESULT WINAPI ExecuteCabW(HWND hwnd, CABINFOW* pCab, LPVOID pReserved) { - FIXME("(%p %p %p): stub\n", hwnd, pCab, pReserved); + FIXME("(%p, %p, %p): stub\n", hwnd, pCab, pReserved); return E_FAIL; } @@ -165,7 +165,7 @@ INT WINAPI LaunchINFSectionA(HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show UNICODE_STRING cmd; HRESULT hr; - TRACE("(%p, %p, %s, %d)\n", hWnd, hInst, debugstr_a(cmdline), show); + TRACE("(%p, %p, %s, %i)\n", hWnd, hInst, debugstr_a(cmdline), show); RtlCreateUnicodeStringFromAsciiz(&cmd, cmdline); @@ -205,7 +205,7 @@ INT WINAPI LaunchINFSectionA(HWND hWnd, HINSTANCE hInst, LPSTR cmdline, INT show */ INT WINAPI LaunchINFSectionW(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, INT show) { - FIXME("(%p, %p, %s, %d): stub\n", hWnd, hInst, debugstr_w(cmdline), show); + FIXME("(%p, %p, %s, %i): stub\n", hWnd, hInst, debugstr_w(cmdline), show); return 0; } @@ -219,7 +219,7 @@ HRESULT WINAPI LaunchINFSectionExA(HWND hWnd, HINSTANCE hInst, LPSTR cmdline, IN UNICODE_STRING cmd; HRESULT hr; - TRACE("(%p, %p, %s, %d): stub\n", hWnd, hInst, debugstr_a(cmdline), show); + TRACE("(%p, %p, %s, %i): stub\n", hWnd, hInst, debugstr_a(cmdline), show); RtlCreateUnicodeStringFromAsciiz(&cmd, cmdline); @@ -259,7 +259,7 @@ HRESULT WINAPI LaunchINFSectionExA(HWND hWnd, HINSTANCE hInst, LPSTR cmdline, IN */ HRESULT WINAPI LaunchINFSectionExW(HWND hWnd, HINSTANCE hInst, LPWSTR cmdline, INT show) { - FIXME("(%p, %p, %s, %d): stub\n", hWnd, hInst, debugstr_w(cmdline), show ); + FIXME("(%p, %p, %s, %i): stub\n", hWnd, hInst, debugstr_w(cmdline), show); return E_FAIL; } @@ -310,10 +310,10 @@ HRESULT WINAPI RunSetupCommandA(HWND hWnd, LPCSTR szCmdName, UNICODE_STRING dir, title; HRESULT hr; - TRACE("(%p, %s, %s, %s, %s, %p, 0x%08lx, %p)\n", - hWnd, debugstr_a(szCmdName), debugstr_a(szInfSection), - debugstr_a(szDir), debugstr_a(lpszTitle), - phEXE, dwFlags, pvReserved); + TRACE("(%p, %s, %s, %s, %s, %p, %ld, %p)\n", + hWnd, debugstr_a(szCmdName), debugstr_a(szInfSection), + debugstr_a(szDir), debugstr_a(lpszTitle), + phEXE, dwFlags, pvReserved); if (!szCmdName || !szDir) return E_INVALIDARG; @@ -369,10 +369,10 @@ HRESULT WINAPI RunSetupCommandW(HWND hWnd, LPCWSTR szCmdName, { HINF hinf; - TRACE("(%p, %s, %s, %s, %s, %p, 0x%08lx, %p)\n", - hWnd, debugstr_w(szCmdName), debugstr_w(szInfSection), - debugstr_w(szDir), debugstr_w(lpszTitle), - phEXE, dwFlags, pvReserved); + TRACE("(%p, %s, %s, %s, %s, %p, %ld, %p)\n", + hWnd, debugstr_w(szCmdName), debugstr_w(szInfSection), + debugstr_w(szDir), debugstr_w(lpszTitle), + phEXE, dwFlags, pvReserved); if (dwFlags) FIXME("Unhandled flags: 0x%08lx\n", dwFlags); diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index 854cff36165..9e87dcb2c01 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -260,7 +260,7 @@ HRESULT WINAPI RegRestoreAllA(HWND hWnd, LPSTR pszTitleString, HKEY hkBackupKey) UNICODE_STRING title; HRESULT hr; - TRACE("(%p, %s, %p)\n", hWnd, pszTitleString, hkBackupKey); + TRACE("(%p, %s, %p)\n", hWnd, debugstr_a(pszTitleString), hkBackupKey); RtlCreateUnicodeStringFromAsciiz(&title, pszTitleString); @@ -307,8 +307,9 @@ HRESULT WINAPI RegSaveRestoreA(HWND hWnd, LPCSTR pszTitleString, HKEY hkBackupKe UNICODE_STRING title, root, subkey, value; HRESULT hr; - TRACE("(%p, %p, %p, %p, %p, %p, %ld)\n", hWnd, pszTitleString, - hkBackupKey, pcszRootKey, pcszSubKey, pcszValueName, dwFlags); + TRACE("(%p, %s, %p, %s, %s, %s, %ld)\n", hWnd, debugstr_a(pszTitleString), + hkBackupKey, debugstr_a(pcszRootKey), debugstr_a(pcszSubKey), + debugstr_a(pcszValueName), dwFlags); RtlCreateUnicodeStringFromAsciiz(&title, pszTitleString); RtlCreateUnicodeStringFromAsciiz(&root, pcszRootKey); @@ -351,8 +352,9 @@ HRESULT WINAPI RegSaveRestoreW(HWND hWnd, LPCWSTR pszTitleString, HKEY hkBackupK LPCWSTR pcszRootKey, LPCWSTR pcszSubKey, LPCWSTR pcszValueName, DWORD dwFlags) { - FIXME("(%p, %p, %p, %p, %p, %p, %ld) stub\n", hWnd, pszTitleString, - hkBackupKey, pcszRootKey, pcszSubKey, pcszValueName, dwFlags); + FIXME("(%p, %s, %p, %s, %s, %s, %ld): stub\n", hWnd, debugstr_w(pszTitleString), + hkBackupKey, debugstr_w(pcszRootKey), debugstr_w(pcszSubKey), + debugstr_w(pcszValueName), dwFlags); return E_FAIL; } @@ -369,8 +371,9 @@ HRESULT WINAPI RegSaveRestoreOnINFA(HWND hWnd, LPCSTR pszTitle, LPCSTR pszINF, UNICODE_STRING title, inf, section; HRESULT hr; - TRACE("(%p, %p, %p, %p, %p, %p, %ld)\n", hWnd, pszTitle, pszINF, - pszSection, hHKLMBackKey, hHKCUBackKey, dwFlags); + TRACE("(%p, %s, %s, %s, %p, %p, %ld)\n", hWnd, debugstr_a(pszTitle), + debugstr_a(pszINF), debugstr_a(pszSection), + hHKLMBackKey, hHKCUBackKey, dwFlags); RtlCreateUnicodeStringFromAsciiz(&title, pszTitle); RtlCreateUnicodeStringFromAsciiz(&inf, pszINF); @@ -411,8 +414,9 @@ HRESULT WINAPI RegSaveRestoreOnINFW(HWND hWnd, LPCWSTR pszTitle, LPCWSTR pszINF, LPCWSTR pszSection, HKEY hHKLMBackKey, HKEY hHKCUBackKey, DWORD dwFlags) { - FIXME("(%p, %p, %p, %p, %p, %p, %ld) stub\n", hWnd, pszTitle, pszINF, - pszSection, hHKLMBackKey, hHKCUBackKey, dwFlags); + FIXME("(%p, %s, %s, %s, %p, %p, %ld): stub\n", hWnd, debugstr_w(pszTitle), + debugstr_w(pszINF), debugstr_w(pszSection), + hHKLMBackKey, hHKCUBackKey, dwFlags); return E_FAIL; }