Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- dlls/advpack/Makefile.in | 1 - dlls/advpack/advpack.c | 20 ++++++++++---------- dlls/advpack/files.c | 24 ++++++++++++------------ dlls/advpack/install.c | 4 ++-- dlls/advpack/reg.c | 8 ++++---- 5 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/dlls/advpack/Makefile.in b/dlls/advpack/Makefile.in index 75c30428d20..2f699a37112 100644 --- a/dlls/advpack/Makefile.in +++ b/dlls/advpack/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = advpack.dll IMPORTLIB = advpack IMPORTS = ole32 setupapi version advapi32 diff --git a/dlls/advpack/advpack.c b/dlls/advpack/advpack.c index 25751af64bc..19cbcad735f 100644 --- a/dlls/advpack/advpack.c +++ b/dlls/advpack/advpack.c @@ -213,7 +213,7 @@ BOOL WINAPI IsNTAdmin(DWORD reserved, LPDWORD pReserved) HANDLE hToken; PSID pSid;
- TRACE("(%d, %p)\n", reserved, pReserved); + TRACE("(%ld, %p)\n", reserved, pReserved);
if (!OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, &hToken)) return FALSE; @@ -295,7 +295,7 @@ DWORD WINAPI NeedRebootInit(VOID) */ BOOL WINAPI NeedReboot(DWORD dwRebootCheck) { - FIXME("(%d): stub\n", dwRebootCheck); + FIXME("(%ld): stub\n", dwRebootCheck); return FALSE; }
@@ -310,7 +310,7 @@ HRESULT WINAPI OpenINFEngineA(LPCSTR pszInfFilename, LPCSTR pszInstallSection, UNICODE_STRING filenameW, installW; HRESULT res;
- TRACE("(%s, %s, %d, %p, %p)\n", debugstr_a(pszInfFilename), + TRACE("(%s, %s, %ld, %p, %p)\n", debugstr_a(pszInfFilename), debugstr_a(pszInstallSection), dwFlags, phInf, pvReserved);
if (!pszInfFilename || !phInf) @@ -348,7 +348,7 @@ HRESULT WINAPI OpenINFEngineA(LPCSTR pszInfFilename, LPCSTR pszInstallSection, HRESULT WINAPI OpenINFEngineW(LPCWSTR pszInfFilename, LPCWSTR pszInstallSection, DWORD dwFlags, HINF *phInf, PVOID pvReserved) { - TRACE("(%s, %s, %d, %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) @@ -374,7 +374,7 @@ HRESULT WINAPI RebootCheckOnInstallA(HWND hWnd, LPCSTR pszINF, UNICODE_STRING infW, secW; HRESULT res;
- TRACE("(%p, %s, %s, %d)\n", hWnd, debugstr_a(pszINF), + TRACE("(%p, %s, %s, %ld)\n", hWnd, debugstr_a(pszINF), debugstr_a(pszSec), dwReserved);
if (!pszINF || !pszSec) @@ -417,7 +417,7 @@ HRESULT WINAPI RebootCheckOnInstallA(HWND hWnd, LPCSTR pszINF, HRESULT WINAPI RebootCheckOnInstallW(HWND hWnd, LPCWSTR pszINF, LPCWSTR pszSec, DWORD dwReserved) { - FIXME("(%p, %s, %s, %d): stub\n", hWnd, debugstr_w(pszINF), + FIXME("(%p, %s, %s, %ld): stub\n", hWnd, debugstr_w(pszINF), debugstr_w(pszSec), dwReserved);
return E_FAIL; @@ -616,7 +616,7 @@ HRESULT WINAPI TranslateInfStringA(LPCSTR pszInfFilename, LPCSTR pszInstallSecti HRESULT res; DWORD len = 0;
- TRACE("(%s, %s, %s, %s, %p, %d, %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); @@ -693,7 +693,7 @@ HRESULT WINAPI TranslateInfStringW(LPCWSTR pszInfFilename, LPCWSTR pszInstallSec HINF hInf; HRESULT hret = S_OK;
- TRACE("(%s, %s, %s, %s, %p, %d, %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); @@ -736,7 +736,7 @@ HRESULT WINAPI TranslateInfStringExA(HINF hInf, LPCSTR pszInfFilename, HRESULT res; DWORD len = 0;
- TRACE("(%p, %s, %s, %s, %p, %d, %p, %p)\n", hInf, debugstr_a(pszInfFilename), + TRACE("(%p, %s, %s, %s, %p, %ld, %p, %p)\n", hInf, debugstr_a(pszInfFilename), debugstr_a(pszTranslateSection), debugstr_a(pszTranslateKey), pszBuffer, dwBufferSize, pdwRequiredSize, pvReserved);
@@ -816,7 +816,7 @@ HRESULT WINAPI TranslateInfStringExW(HINF hInf, LPCWSTR pszInfFilename, LPWSTR pszBuffer, DWORD dwBufferSize, PDWORD pdwRequiredSize, PVOID pvReserved) { - TRACE("(%p, %s, %s, %s, %p, %d, %p, %p)\n", hInf, debugstr_w(pszInfFilename), + TRACE("(%p, %s, %s, %s, %p, %ld, %p, %p)\n", hInf, debugstr_w(pszInfFilename), debugstr_w(pszTranslateSection), debugstr_w(pszTranslateKey), pszBuffer, dwBufferSize, pdwRequiredSize, pvReserved);
diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 58ff76e0505..b26ca4e43e7 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -64,7 +64,7 @@ HRESULT WINAPI AddDelBackupEntryA(LPCSTR lpcszFileList, LPCSTR lpcszBackupDir, LPCWSTR backup; HRESULT res;
- TRACE("(%s, %s, %s, %d)\n", debugstr_a(lpcszFileList), + TRACE("(%s, %s, %s, %ld)\n", debugstr_a(lpcszFileList), debugstr_a(lpcszBackupDir), debugstr_a(lpcszBaseName), dwFlags);
if (lpcszFileList) @@ -120,7 +120,7 @@ HRESULT WINAPI AddDelBackupEntryW(LPCWSTR lpcszFileList, LPCWSTR lpcszBackupDir, WCHAR szIniPath[MAX_PATH]; LPCWSTR szString = NULL;
- TRACE("(%s, %s, %s, %d)\n", debugstr_w(lpcszFileList), + TRACE("(%s, %s, %s, %ld)\n", debugstr_w(lpcszFileList), debugstr_w(lpcszBackupDir), debugstr_w(lpcszBaseName), dwFlags);
if (!lpcszFileList || !*lpcszFileList) @@ -193,7 +193,7 @@ HRESULT WINAPI AdvInstallFileA(HWND hwnd, LPCSTR lpszSourceDir, LPCSTR lpszSourc UNICODE_STRING destdir, destfile; HRESULT res;
- TRACE("(%p, %s, %s, %s, %s, %d, %d)\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);
@@ -250,7 +250,7 @@ HRESULT WINAPI AdvInstallFileW(HWND hwnd, LPCWSTR lpszSourceDir, LPCWSTR lpszSou HSPFILEQ fileQueue; PVOID pContext;
- TRACE("(%p, %s, %s, %s, %s, %d, %d)\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);
@@ -387,7 +387,7 @@ HRESULT WINAPI DelNodeA(LPCSTR pszFileOrDirName, DWORD dwFlags) UNICODE_STRING fileordirname; HRESULT res;
- TRACE("(%s, %d)\n", debugstr_a(pszFileOrDirName), dwFlags); + TRACE("(%s, %ld)\n", debugstr_a(pszFileOrDirName), dwFlags);
RtlCreateUnicodeStringFromAsciiz(&fileordirname, pszFileOrDirName);
@@ -421,7 +421,7 @@ HRESULT WINAPI DelNodeW(LPCWSTR pszFileOrDirName, DWORD dwFlags) WCHAR fname[MAX_PATH]; HRESULT ret = E_FAIL;
- TRACE("(%s, %d)\n", debugstr_w(pszFileOrDirName), dwFlags); + TRACE("(%s, %ld)\n", debugstr_w(pszFileOrDirName), dwFlags);
if (dwFlags) FIXME("Flags ignored!\n"); @@ -682,7 +682,7 @@ HRESULT WINAPI ExtractFilesA(LPCSTR CabName, LPCSTR ExpandDir, DWORD Flags, DWORD dwFilesFound = 0; LPSTR szConvertedList = NULL;
- TRACE("(%s, %s, %d, %s, %p, %d)\n", debugstr_a(CabName), debugstr_a(ExpandDir), + TRACE("(%s, %s, %ld, %s, %p, %ld)\n", debugstr_a(CabName), debugstr_a(ExpandDir), Flags, debugstr_a(FileList), LReserved, Reserved);
if (!CabName || !ExpandDir) @@ -770,7 +770,7 @@ HRESULT WINAPI ExtractFilesW(LPCWSTR CabName, LPCWSTR ExpandDir, DWORD Flags, char *cab_name = NULL, *expand_dir = NULL, *file_list = NULL; HRESULT hres = S_OK;
- TRACE("(%s, %s, %d, %s, %p, %d)\n", debugstr_w(CabName), debugstr_w(ExpandDir), + TRACE("(%s, %s, %ld, %s, %p, %ld)\n", debugstr_w(CabName), debugstr_w(ExpandDir), Flags, debugstr_w(FileList), LReserved, Reserved);
if(CabName) { @@ -849,7 +849,7 @@ HRESULT WINAPI FileSaveRestoreA(HWND hDlg, LPSTR pszFileList, LPSTR pszDir, UNICODE_STRING filelist, dir, basename; HRESULT hr;
- TRACE("(%p, %s, %s, %s, %d)\n", hDlg, debugstr_a(pszFileList), + TRACE("(%p, %s, %s, %s, %ld)\n", hDlg, debugstr_a(pszFileList), debugstr_a(pszDir), debugstr_a(pszBaseName), dwFlags);
RtlCreateUnicodeStringFromAsciiz(&filelist, pszFileList); @@ -891,7 +891,7 @@ HRESULT WINAPI FileSaveRestoreA(HWND hDlg, LPSTR pszFileList, LPSTR pszDir, HRESULT WINAPI FileSaveRestoreW(HWND hDlg, LPWSTR pszFileList, LPWSTR pszDir, LPWSTR pszBaseName, DWORD dwFlags) { - FIXME("(%p, %s, %s, %s, %d) stub\n", hDlg, debugstr_w(pszFileList), + FIXME("(%p, %s, %s, %s, %ld) stub\n", hDlg, debugstr_w(pszFileList), debugstr_w(pszDir), debugstr_w(pszBaseName), dwFlags);
return E_FAIL; @@ -910,7 +910,7 @@ HRESULT WINAPI FileSaveRestoreOnINFA(HWND hWnd, LPCSTR pszTitle, LPCSTR pszINF, UNICODE_STRING backupdir, backupfile; HRESULT hr;
- TRACE("(%p, %s, %s, %s, %s, %s, %d)\n", hWnd, debugstr_a(pszTitle), + 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);
@@ -959,7 +959,7 @@ HRESULT WINAPI FileSaveRestoreOnINFW(HWND hWnd, LPCWSTR pszTitle, LPCWSTR pszINF LPCWSTR pszSection, LPCWSTR pszBackupDir, LPCWSTR pszBaseBackupFile, DWORD dwFlags) { - FIXME("(%p, %s, %s, %s, %s, %s, %d): 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);
diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index a2ccbd55099..deaa82d6d98 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -913,7 +913,7 @@ HRESULT WINAPI RunSetupCommandA(HWND hWnd, LPCSTR szCmdName, UNICODE_STRING dir, title; HRESULT hr;
- TRACE("(%p, %s, %s, %s, %s, %p, %d, %p)\n", + 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); @@ -970,7 +970,7 @@ HRESULT WINAPI RunSetupCommandW(HWND hWnd, LPCWSTR szCmdName, ADVInfo info; HRESULT hr;
- TRACE("(%p, %s, %s, %s, %s, %p, %d, %p)\n", + 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); diff --git a/dlls/advpack/reg.c b/dlls/advpack/reg.c index 555743d656c..74f91afa91b 100644 --- a/dlls/advpack/reg.c +++ b/dlls/advpack/reg.c @@ -314,7 +314,7 @@ HRESULT WINAPI RegSaveRestoreA(HWND hWnd, LPCSTR pszTitleString, HKEY hkBackupKe UNICODE_STRING title, root, subkey, value; HRESULT hr;
- TRACE("(%p, %s, %p, %s, %s, %s, %d)\n", hWnd, debugstr_a(pszTitleString), + TRACE("(%p, %s, %p, %s, %s, %s, %ld)\n", hWnd, debugstr_a(pszTitleString), hkBackupKey, debugstr_a(pcszRootKey), debugstr_a(pcszSubKey), debugstr_a(pcszValueName), dwFlags);
@@ -359,7 +359,7 @@ HRESULT WINAPI RegSaveRestoreW(HWND hWnd, LPCWSTR pszTitleString, HKEY hkBackupK LPCWSTR pcszRootKey, LPCWSTR pcszSubKey, LPCWSTR pcszValueName, DWORD dwFlags) { - FIXME("(%p, %s, %p, %s, %s, %s, %d): stub\n", hWnd, debugstr_w(pszTitleString), + 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);
@@ -378,7 +378,7 @@ HRESULT WINAPI RegSaveRestoreOnINFA(HWND hWnd, LPCSTR pszTitle, LPCSTR pszINF, UNICODE_STRING title, inf, section; HRESULT hr;
- TRACE("(%p, %s, %s, %s, %p, %p, %d)\n", hWnd, debugstr_a(pszTitle), + TRACE("(%p, %s, %s, %s, %p, %p, %ld)\n", hWnd, debugstr_a(pszTitle), debugstr_a(pszINF), debugstr_a(pszSection), hHKLMBackKey, hHKCUBackKey, dwFlags);
@@ -421,7 +421,7 @@ HRESULT WINAPI RegSaveRestoreOnINFW(HWND hWnd, LPCWSTR pszTitle, LPCWSTR pszINF, LPCWSTR pszSection, HKEY hHKLMBackKey, HKEY hHKCUBackKey, DWORD dwFlags) { - FIXME("(%p, %s, %s, %s, %p, %p, %d): stub\n", hWnd, debugstr_w(pszTitle), + FIXME("(%p, %s, %s, %s, %p, %p, %ld): stub\n", hWnd, debugstr_w(pszTitle), debugstr_w(pszINF), debugstr_w(pszSection), hHKLMBackKey, hHKCUBackKey, dwFlags);