[PATCH 01/28] programs/cmd: enable compilation with long types
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/cmd/Makefile.in | 1 - programs/cmd/builtins.c | 20 ++++++++++---------- programs/cmd/directory.c | 4 ++-- programs/cmd/wcmdmain.c | 14 +++++++------- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/programs/cmd/Makefile.in b/programs/cmd/Makefile.in index 8c8489af727..b3b33aa1413 100644 --- a/programs/cmd/Makefile.in +++ b/programs/cmd/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = cmd.exe IMPORTS = shell32 user32 advapi32 diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 2fc7e07f7aa..963a9eaf361 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -344,7 +344,7 @@ void WCMD_choice (const WCHAR * args) { } if (opt_timeout) - WINE_FIXME("timeout not supported: %c,%d\n", opt_default, opt_timeout); + WINE_FIXME("timeout not supported: %c,%ld\n", opt_default, opt_timeout); if (have_console) SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), 0); @@ -396,7 +396,7 @@ void WCMD_choice (const WCHAR * args) { SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), oldmode); errorlevel = (ptr - opt_c) + 1; - WINE_TRACE("answer: %d\n", errorlevel); + WINE_TRACE("answer: %ld\n", errorlevel); heap_free(my_command); return; } @@ -427,12 +427,12 @@ static BOOL WCMD_AppendEOF(WCHAR *filename) OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) { - WINE_ERR("Failed to open %s (%d)\n", wine_dbgstr_w(filename), GetLastError()); + WINE_ERR("Failed to open %s (%ld)\n", wine_dbgstr_w(filename), GetLastError()); return FALSE; } else { SetFilePointer (h, 0, NULL, FILE_END); if (!WriteFile(h, &eof, 1, &bytes_written, NULL)) { - WINE_ERR("Failed to append EOF to %s (%d)\n", wine_dbgstr_w(filename), GetLastError()); + WINE_ERR("Failed to append EOF to %s (%ld)\n", wine_dbgstr_w(filename), GetLastError()); CloseHandle(h); return FALSE; } @@ -491,7 +491,7 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app in = CreateFileW(srcname, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (in == INVALID_HANDLE_VALUE) { - WINE_ERR("Failed to open %s (%d)\n", wine_dbgstr_w(srcname), GetLastError()); + WINE_ERR("Failed to open %s (%ld)\n", wine_dbgstr_w(srcname), GetLastError()); return FALSE; } @@ -499,7 +499,7 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app out = CreateFileW(dstname, GENERIC_WRITE, 0, NULL, append?OPEN_EXISTING:CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (out == INVALID_HANDLE_VALUE) { - WINE_ERR("Failed to open %s (%d)\n", wine_dbgstr_w(dstname), GetLastError()); + WINE_ERR("Failed to open %s (%ld)\n", wine_dbgstr_w(dstname), GetLastError()); CloseHandle(in); return FALSE; } @@ -526,12 +526,12 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app if (bytesread) { ok = WriteFile(out, buffer, bytesread, &byteswritten, NULL); if (!ok || byteswritten != bytesread) { - WINE_ERR("Unexpected failure writing to %s, rc=%d\n", + WINE_ERR("Unexpected failure writing to %s, rc=%ld\n", wine_dbgstr_w(dstname), GetLastError()); } } } else { - WINE_ERR("Unexpected failure reading from %s, rc=%d\n", + WINE_ERR("Unexpected failure reading from %s, rc=%ld\n", wine_dbgstr_w(srcname), GetLastError()); } } while (ok && bytesread > 0); @@ -2442,7 +2442,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { if (useNumbers) { WCHAR thisNum[20]; - WINE_TRACE("FOR /L provided range from %d to %d step %d\n", + WINE_TRACE("FOR /L provided range from %ld to %ld step %ld\n", numbers[0], numbers[2], numbers[1]); for (i=numbers[0]; (numbers[1]<0)? i>=numbers[2] : i<=numbers[2]; @@ -4775,7 +4775,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { /* Open a key to HKEY_CLASSES_ROOT for enumerating */ if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"", 0, accessOptions, &key) != ERROR_SUCCESS) { - WINE_FIXME("Unexpected failure opening HKCR key: %d\n", GetLastError()); + WINE_FIXME("Unexpected failure opening HKCR key: %ld\n", GetLastError()); return; } diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 807f7b386b1..8417687939a 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -536,7 +536,7 @@ static void WCMD_dir_trailer(WCHAR drive) { driveName[0] = drive; status = GetDiskFreeSpaceExW(driveName, &avail, &total, &freebytes); - WINE_TRACE("Writing trailer for '%s' gave %d(%d)\n", wine_dbgstr_w(driveName), + WINE_TRACE("Writing trailer for '%s' gave %ld(%ld)\n", wine_dbgstr_w(driveName), status, GetLastError()); if (errorlevel==0 && !bare) { @@ -727,7 +727,7 @@ void WCMD_directory (WCHAR *args) p++; } p = p - 1; /* So when step on, move to '/' */ - WINE_TRACE("Result: showattrs %x, bits %x\n", showattrs, attrsbits); + WINE_TRACE("Result: showattrs %lx, bits %lx\n", showattrs, attrsbits); break; default: SetLastError(ERROR_INVALID_PARAMETER); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 65601348b05..af54b209d83 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -132,7 +132,7 @@ void WINAPIV WCMD_output (const WCHAR *format, ...) { format, 0, 0, (LPWSTR)&string, 0, &ap); va_end(ap); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) - WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); + WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); else { WCMD_output_asis_len(string, len, GetStdHandle(STD_OUTPUT_HANDLE)); @@ -157,7 +157,7 @@ void WINAPIV WCMD_output_stderr (const WCHAR *format, ...) { format, 0, 0, (LPWSTR)&string, 0, &ap); va_end(ap); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) - WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); + WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); else { WCMD_output_asis_len(string, len, GetStdHandle(STD_ERROR_HANDLE)); @@ -181,7 +181,7 @@ WCHAR* WINAPIV WCMD_format_string (const WCHAR *format, ...) format, 0, 0, (LPWSTR)&string, 0, &ap); va_end(ap); if (len == 0 && GetLastError() != ERROR_NO_WORK_DONE) { - WINE_FIXME("Could not format string: le=%u, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); + WINE_FIXME("Could not format string: le=%lu, fmt=%s\n", GetLastError(), wine_dbgstr_w(format)); string = (WCHAR*)LocalAlloc(LMEM_FIXED, 2); *string = 0; } @@ -303,7 +303,7 @@ void WCMD_print_error (void) { status = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, error_code, 0, (LPWSTR) &lpMsgBuf, 0, NULL); if (!status) { - WINE_FIXME ("Cannot display message for error %d, status %d\n", + WINE_FIXME ("Cannot display message for error %ld, status %ld\n", error_code, GetLastError()); return; } @@ -1462,7 +1462,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, GetCurrentProcess(), &h, 0, TRUE, DUPLICATE_SAME_ACCESS) == 0) { - WINE_FIXME("Duplicating handle failed with gle %d\n", GetLastError()); + WINE_FIXME("Duplicating handle failed with gle %ld\n", GetLastError()); } WINE_TRACE("Redirect %d (%p) to %d (%p)\n", handle, GetStdHandle(idx_stdhandles[idx]), idx, h); @@ -1664,7 +1664,7 @@ WCHAR *WCMD_LoadMessage(UINT id) { static WCHAR msg[2048]; if (!LoadStringW(GetModuleHandleW(NULL), id, msg, ARRAY_SIZE(msg))) { - WINE_FIXME("LoadString failed with %d\n", GetLastError()); + WINE_FIXME("LoadString failed with %ld\n", GetLastError()); lstrcpyW(msg, L"Failed!"); } return msg; @@ -2442,7 +2442,7 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) /* Pre initialize some messages */ lstrcpyW(anykey, WCMD_LoadMessage(WCMD_ANYKEY)); - sprintf(osver, "%d.%d.%d", osv.dwMajorVersion, osv.dwMinorVersion, osv.dwBuildNumber); + sprintf(osver, "%ld.%ld.%ld", osv.dwMajorVersion, osv.dwMinorVersion, osv.dwBuildNumber); cmd = WCMD_format_string(WCMD_LoadMessage(WCMD_VERSION), osver); lstrcpyW(version_string, cmd); LocalFree(cmd);
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/cmd/tests/Makefile.in | 1 - programs/cmd/tests/batch.c | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/programs/cmd/tests/Makefile.in b/programs/cmd/tests/Makefile.in index 78d92f7c778..87942fedcf9 100644 --- a/programs/cmd/tests/Makefile.in +++ b/programs/cmd/tests/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = cmd.exe C_SRCS = \ diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 162e9cfa151..3846693ef2e 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -92,7 +92,7 @@ static BOOL run_cmd(const char *cmd_data, DWORD cmd_size) bres = WriteFile(file, cmd_data, cmd_size, &size, NULL); CloseHandle(file); - ok(bres, "Could not write to file: %u\n", GetLastError()); + ok(bres, "Could not write to file: %lu\n", GetLastError()); if(!bres) return FALSE; @@ -112,7 +112,7 @@ static BOOL run_cmd(const char *cmd_data, DWORD cmd_size) si.hStdOutput = file; si.hStdError = fileerr; bres = CreateProcessA(NULL, command, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi); - ok(bres, "CreateProcess failed: %u\n", GetLastError()); + ok(bres, "CreateProcess failed: %lu\n", GetLastError()); if(!bres) { DeleteFileA("test.out"); return FALSE; @@ -133,7 +133,7 @@ static DWORD map_file(const char *file_name, const char **ret) DWORD size; file = CreateFileA(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, NULL); - ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %08x\n", GetLastError()); + ok(file != INVALID_HANDLE_VALUE, "CreateFile failed: %08lx\n", GetLastError()); if(file == INVALID_HANDLE_VALUE) return 0; @@ -141,12 +141,12 @@ static DWORD map_file(const char *file_name, const char **ret) map = CreateFileMappingA(file, NULL, PAGE_READONLY, 0, 0, NULL); CloseHandle(file); - ok(map != NULL, "CreateFileMappingA(%s) failed: %u\n", file_name, GetLastError()); + ok(map != NULL, "CreateFileMappingA(%s) failed: %lu\n", file_name, GetLastError()); if(!map) return 0; *ret = MapViewOfFile(map, FILE_MAP_READ, 0, 0, 0); - ok(*ret != NULL, "MapViewOfFile failed: %u\n", GetLastError()); + ok(*ret != NULL, "MapViewOfFile failed: %lu\n", GetLastError()); CloseHandle(map); if(!*ret) return 0; @@ -307,10 +307,10 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da err = compare_line(out_ptr, out_nl, exp_ptr, exp_nl); if(err == out_nl) - ok(0, "unexpected end of line %d (got '%.*s', wanted '%.*s')\n", + ok(0, "unexpected end of line %ld (got '%.*s', wanted '%.*s')\n", line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); else if(err == exp_nl) - ok(0, "excess characters on line %d (got '%.*s', wanted '%.*s')\n", + ok(0, "excess characters on line %ld (got '%.*s', wanted '%.*s')\n", line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); else if (!err && is_todo_wine && is_out_resync && is_exp_resync) /* Consider that the todo_wine was to deal with extra lines, @@ -318,7 +318,7 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da */ err = NULL; else - ok(!err, "unexpected char 0x%x position %d in line %d (got '%.*s', wanted '%.*s')\n", + ok(!err, "unexpected char 0x%x position %d in line %ld (got '%.*s', wanted '%.*s')\n", (err ? *err : 0), (err ? (int)(err-out_ptr) : -1), line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); } @@ -344,7 +344,7 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da } } - ok(exp_ptr >= exp_data+exp_size, "unexpected end of output in line %d, missing %s\n", line, exp_ptr); + ok(exp_ptr >= exp_data+exp_size, "unexpected end of output in line %ld, missing %s\n", line, exp_ptr); ok(out_ptr >= out_data+out_size, "too long output, got additional %s\n", out_ptr); } @@ -380,14 +380,14 @@ static void run_from_file(const char *file_name) test_size = map_file(file_name, &test_data); if(!test_size) { - ok(0, "Could not map file %s: %u\n", file_name, GetLastError()); + ok(0, "Could not map file %s: %lu\n", file_name, GetLastError()); return; } sprintf(out_name, "%s.exp", file_name); out_size = map_file(out_name, &out_data); if(!out_size) { - ok(0, "Could not map file %s: %u\n", out_name, GetLastError()); + ok(0, "Could not map file %s: %lu\n", out_name, GetLastError()); UnmapViewOfFile(test_data); return; } @@ -405,7 +405,7 @@ static DWORD load_resource(const char *name, const char *type, const char **ret) DWORD size; src = FindResourceA(NULL, name, type); - ok(src != NULL, "Could not find resource %s: %u\n", name, GetLastError()); + ok(src != NULL, "Could not find resource %s: %lu\n", name, GetLastError()); if(!src) return 0;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/packager/Makefile.in | 1 - dlls/packager/packager_main.c | 36 ++++++++++++++++++------------------ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/packager/Makefile.in b/dlls/packager/Makefile.in index f539cb6f095..a2b2daa0cea 100644 --- a/dlls/packager/Makefile.in +++ b/dlls/packager/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = packager.dll IMPORTS = uuid shell32 shlwapi user32 diff --git a/dlls/packager/packager_main.c b/dlls/packager/packager_main.c index 591664371a1..c08bc30da6e 100644 --- a/dlls/packager/packager_main.c +++ b/dlls/packager/packager_main.c @@ -80,7 +80,7 @@ static ULONG WINAPI OleObject_AddRef(IOleObject *iface) struct Package *This = impl_from_IOleObject(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -90,7 +90,7 @@ static ULONG WINAPI OleObject_Release(IOleObject *iface) struct Package *This = impl_from_IOleObject(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref){ if(This->clientsite) @@ -139,7 +139,7 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) { struct Package *This = impl_from_IOleObject(iface); - TRACE("(%p)->(0x%x)\n", This, dwSaveOption); + TRACE("(%p)->(0x%lx)\n", This, dwSaveOption); if(dwSaveOption == OLECLOSE_SAVEIFDIRTY || dwSaveOption == OLECLOSE_PROMPTSAVE) @@ -151,14 +151,14 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) static HRESULT WINAPI OleObject_SetMoniker(IOleObject *iface, DWORD dwWhichMoniker, IMoniker *pmk) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d, %p)\n", This, dwWhichMoniker, pmk); + FIXME("(%p)->(%ld, %p)\n", This, dwWhichMoniker, pmk); return E_NOTIMPL; } static HRESULT WINAPI OleObject_GetMoniker(IOleObject *iface, DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmk) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d, %d, %p)\n", This, dwAssign, dwWhichMoniker, ppmk); + FIXME("(%p)->(%ld, %ld, %p)\n", This, dwAssign, dwWhichMoniker, ppmk); return E_NOTIMPL; } @@ -166,14 +166,14 @@ static HRESULT WINAPI OleObject_InitFromData(IOleObject *iface, IDataObject *pDa DWORD dwReserved) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p, 0x%x, %d)\n", This, pDataObject, fCreation, dwReserved); + FIXME("(%p)->(%p, 0x%x, %ld)\n", This, pDataObject, fCreation, dwReserved); return E_NOTIMPL; } static HRESULT WINAPI OleObject_GetClipboardData(IOleObject *iface, DWORD dwReserved, IDataObject **ppDataObject) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d, %p)\n", This, dwReserved, ppDataObject); + FIXME("(%p)->(%ld, %p)\n", This, dwReserved, ppDataObject); return E_NOTIMPL; } @@ -188,7 +188,7 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms { struct Package *This = impl_from_IOleObject(iface); - TRACE("(%p)->(%d)\n", This, iVerb); + TRACE("(%p)->(%ld)\n", This, iVerb); switch(iVerb){ case 0: @@ -229,21 +229,21 @@ static HRESULT WINAPI OleObject_GetUserClassID(IOleObject *iface, CLSID *pClsid) static HRESULT WINAPI OleObject_GetUserType(IOleObject *iface, DWORD dwFormOfType, LPOLESTR *pszUserType) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d, %p)\n", This, dwFormOfType, pszUserType); + FIXME("(%p)->(%ld, %p)\n", This, dwFormOfType, pszUserType); return E_NOTIMPL; } static HRESULT WINAPI OleObject_SetExtent(IOleObject *iface, DWORD dwDrawAspect, SIZEL *psizel) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d, %p)\n", This, dwDrawAspect, psizel); + FIXME("(%p)->(%ld, %p)\n", This, dwDrawAspect, psizel); return E_NOTIMPL; } static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD dwDrawAspect, SIZEL *psizel) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d, %p)\n", This, dwDrawAspect, psizel); + FIXME("(%p)->(%ld, %p)\n", This, dwDrawAspect, psizel); return E_NOTIMPL; } @@ -257,7 +257,7 @@ static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink, static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection) { struct Package *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d)\n", This, dwConnection); + FIXME("(%p)->(%ld)\n", This, dwConnection); return E_NOTIMPL; } @@ -272,7 +272,7 @@ static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect, { struct Package *This = impl_from_IOleObject(iface); - TRACE("(%p)->(%d, %p)\n", This, dwAspect, pdwStatus); + TRACE("(%p)->(%ld, %p)\n", This, dwAspect, pdwStatus); if(!pdwStatus) return E_INVALIDARG; @@ -370,7 +370,7 @@ static HRESULT discard_string(struct Package *This, IStream *stream) do{ hr = IStream_Read(stream, &chr, 1, &nbytes); if(FAILED(hr) || !nbytes){ - TRACE("Unexpected end of stream or Read failed with %08x\n", hr); + TRACE("Unexpected end of stream or Read failed with %08lx\n", hr); return (hr == S_OK || hr == S_FALSE) ? E_FAIL : hr; } }while(chr); @@ -398,7 +398,7 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, hr = IStorage_OpenStream(pStg, L"\1Ole10Native", NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream); if(FAILED(hr)){ - TRACE("OpenStream gave: %08x\n", hr); + TRACE("OpenStream gave: %08lx\n", hr); return hr; } @@ -485,7 +485,7 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); while(file == INVALID_HANDLE_VALUE){ if(GetLastError() != ERROR_FILE_EXISTS){ - WARN("CreateFile failed: %u\n", GetLastError()); + WARN("CreateFile failed: %lu\n", GetLastError()); hr = E_FAIL; goto exit; } @@ -507,7 +507,7 @@ static HRESULT WINAPI PersistStorage_Load(IPersistStorage* iface, hr = IStream_Read(stream, data, min(sizeof(data), payload_size), &nbytes); if(FAILED(hr) || nbytes == 0){ - TRACE("Unexpected end of file, or Read failed with %08x\n", hr); + TRACE("Unexpected end of file, or Read failed with %08lx\n", hr); if(hr == S_OK || hr == S_FALSE) hr = E_FAIL; goto exit; @@ -528,7 +528,7 @@ exit: } IStream_Release(stream); - TRACE("Returning: %08x\n", hr); + TRACE("Returning: %08lx\n", hr); return hr; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/pdh/Makefile.in | 1 - dlls/pdh/pdh_main.c | 40 ++++++++++++++++++++-------------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/pdh/Makefile.in b/dlls/pdh/Makefile.in index f98fb916646..a56b9d6e4fc 100644 --- a/dlls/pdh/Makefile.in +++ b/dlls/pdh/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = pdh.dll IMPORTLIB = pdh diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 3840b9d0288..3fc3f7bc6b8 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -213,7 +213,7 @@ PDH_STATUS WINAPI PdhAddCounterA( PDH_HQUERY query, LPCSTR path, PDH_STATUS ret; WCHAR *pathW; - TRACE("%p %s %lx %p\n", query, debugstr_a(path), userdata, counter); + TRACE("%p %s %Ix %p\n", query, debugstr_a(path), userdata, counter); if (!path) return PDH_INVALID_ARGUMENT; @@ -236,7 +236,7 @@ PDH_STATUS WINAPI PdhAddCounterW( PDH_HQUERY hquery, LPCWSTR path, struct counter *counter; unsigned int i; - TRACE("%p %s %lx %p\n", hquery, debugstr_w(path), userdata, hcounter); + TRACE("%p %s %Ix %p\n", hquery, debugstr_w(path), userdata, hcounter); if (!path || !hcounter) return PDH_INVALID_ARGUMENT; @@ -282,7 +282,7 @@ PDH_STATUS WINAPI PdhAddCounterW( PDH_HQUERY hquery, LPCWSTR path, PDH_STATUS WINAPI PdhAddEnglishCounterA( PDH_HQUERY query, LPCSTR path, DWORD_PTR userdata, PDH_HCOUNTER *counter ) { - TRACE("%p %s %lx %p\n", query, debugstr_a(path), userdata, counter); + TRACE("%p %s %Ix %p\n", query, debugstr_a(path), userdata, counter); if (!counter) return PDH_INVALID_ARGUMENT; if (!query) return PDH_INVALID_HANDLE; @@ -295,7 +295,7 @@ PDH_STATUS WINAPI PdhAddEnglishCounterA( PDH_HQUERY query, LPCSTR path, PDH_STATUS WINAPI PdhAddEnglishCounterW( PDH_HQUERY query, LPCWSTR path, DWORD_PTR userdata, PDH_HCOUNTER *counter ) { - TRACE("%p %s %lx %p\n", query, debugstr_w(path), userdata, counter); + TRACE("%p %s %Ix %p\n", query, debugstr_w(path), userdata, counter); if (!counter) return PDH_INVALID_ARGUMENT; if (!query) return PDH_INVALID_HANDLE; @@ -326,7 +326,7 @@ static PDH_STATUS format_value( struct counter *counter, DWORD format, union val } else { - WARN("unknown format %x\n", format); + WARN("unknown format %lx\n", format); return PDH_INVALID_ARGUMENT; } return ERROR_SUCCESS; @@ -342,7 +342,7 @@ PDH_STATUS WINAPI PdhCalculateCounterFromRawValue( PDH_HCOUNTER handle, DWORD fo PDH_STATUS ret; struct counter *counter = handle; - TRACE("%p 0x%08x %p %p %p\n", handle, format, raw1, raw2, value); + TRACE("%p 0x%08lx %p %p %p\n", handle, format, raw1, raw2, value); if (!value) return PDH_INVALID_ARGUMENT; @@ -492,7 +492,7 @@ PDH_STATUS WINAPI PdhCollectQueryDataEx( PDH_HQUERY handle, DWORD interval, HAND PDH_STATUS ret; struct query *query = handle; - TRACE("%p %d %p\n", handle, interval, event); + TRACE("%p %ld %p\n", handle, interval, event); EnterCriticalSection( &pdh_handle_cs ); if (!query || query->magic != PDH_MAGIC_QUERY) @@ -584,7 +584,7 @@ PDH_STATUS WINAPI PdhCollectQueryDataWithTime( PDH_HQUERY handle, LONGLONG *time */ PDH_STATUS WINAPI PdhExpandWildCardPathA( LPCSTR szDataSource, LPCSTR szWildCardPath, LPSTR mszExpandedPathList, LPDWORD pcchPathListLength, DWORD dwFlags ) { - FIXME("%s, %s, %p, %p, 0x%x: stub\n", debugstr_a(szDataSource), debugstr_a(szWildCardPath), mszExpandedPathList, pcchPathListLength, dwFlags); + FIXME("%s, %s, %p, %p, 0x%lx: stub\n", debugstr_a(szDataSource), debugstr_a(szWildCardPath), mszExpandedPathList, pcchPathListLength, dwFlags); return PDH_NOT_IMPLEMENTED; } @@ -593,7 +593,7 @@ PDH_STATUS WINAPI PdhExpandWildCardPathA( LPCSTR szDataSource, LPCSTR szWildCard */ PDH_STATUS WINAPI PdhExpandWildCardPathW( LPCWSTR szDataSource, LPCWSTR szWildCardPath, LPWSTR mszExpandedPathList, LPDWORD pcchPathListLength, DWORD dwFlags ) { - FIXME("%s, %s, %p, %p, 0x%x: stub\n", debugstr_w(szDataSource), debugstr_w(szWildCardPath), mszExpandedPathList, pcchPathListLength, dwFlags); + FIXME("%s, %s, %p, %p, 0x%lx: stub\n", debugstr_w(szDataSource), debugstr_w(szWildCardPath), mszExpandedPathList, pcchPathListLength, dwFlags); return PDH_NOT_IMPLEMENTED; } @@ -745,7 +745,7 @@ PDH_STATUS WINAPI PdhGetFormattedCounterValue( PDH_HCOUNTER handle, DWORD format PDH_STATUS ret; struct counter *counter = handle; - TRACE("%p %x %p %p\n", handle, format, type, value); + TRACE("%p %lx %p %p\n", handle, format, type, value); if (!value) return PDH_INVALID_ARGUMENT; @@ -864,7 +864,7 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexA( LPCSTR machine, DWORD index, LPSTR WCHAR bufferW[PDH_MAX_COUNTER_NAME]; DWORD sizeW = ARRAY_SIZE(bufferW); - TRACE("%s %d %p %p\n", debugstr_a(machine), index, buffer, size); + TRACE("%s %ld %p %p\n", debugstr_a(machine), index, buffer, size); if (!buffer || !size) return PDH_INVALID_ARGUMENT; @@ -890,7 +890,7 @@ PDH_STATUS WINAPI PdhLookupPerfNameByIndexW( LPCWSTR machine, DWORD index, LPWST PDH_STATUS ret; unsigned int i; - TRACE("%s %d %p %p\n", debugstr_w(machine), index, buffer, size); + TRACE("%s %ld %p %p\n", debugstr_w(machine), index, buffer, size); if (machine) { @@ -929,7 +929,7 @@ PDH_STATUS WINAPI PdhOpenQueryA( LPCSTR source, DWORD_PTR userdata, PDH_HQUERY * PDH_STATUS ret; WCHAR *sourceW = NULL; - TRACE("%s %lx %p\n", debugstr_a(source), userdata, query); + TRACE("%s %Ix %p\n", debugstr_a(source), userdata, query); if (source && !(sourceW = pdh_strdup_aw( source ))) return PDH_MEMORY_ALLOCATION_FAILURE; @@ -946,7 +946,7 @@ PDH_STATUS WINAPI PdhOpenQueryW( LPCWSTR source, DWORD_PTR userdata, PDH_HQUERY { struct query *query; - TRACE("%s %lx %p\n", debugstr_w(source), userdata, handle); + TRACE("%s %Ix %p\n", debugstr_w(source), userdata, handle); if (!handle) return PDH_INVALID_ARGUMENT; @@ -1112,7 +1112,7 @@ PDH_STATUS WINAPI PdhMakeCounterPathA( PDH_COUNTER_PATH_ELEMENTS_A *e, LPSTR buf WCHAR *bufferW; DWORD buflenW; - TRACE("%p %p %p 0x%08x\n", e, buffer, buflen, flags); + TRACE("%p %p %p 0x%08lx\n", e, buffer, buflen, flags); if (!e || !buflen) return PDH_INVALID_ARGUMENT; @@ -1162,9 +1162,9 @@ PDH_STATUS WINAPI PdhMakeCounterPathW( PDH_COUNTER_PATH_ELEMENTS_W *e, LPWSTR bu PDH_STATUS ret = ERROR_SUCCESS; DWORD len; - TRACE("%p %p %p 0x%08x\n", e, buffer, buflen, flags); + TRACE("%p %p %p 0x%08lx\n", e, buffer, buflen, flags); - if (flags) FIXME("unimplemented flags 0x%08x\n", flags); + if (flags) FIXME("unimplemented flags 0x%08lx\n", flags); if (!e || !e->szCounterName || !e->szObjectName || !buflen) return PDH_INVALID_ARGUMENT; @@ -1207,7 +1207,7 @@ PDH_STATUS WINAPI PdhEnumObjectItemsA(LPCSTR szDataSource, LPCSTR szMachineName, LPSTR mszCounterList, LPDWORD pcchCounterListLength, LPSTR mszInstanceList, LPDWORD pcchInstanceListLength, DWORD dwDetailLevel, DWORD dwFlags) { - FIXME("%s, %s, %s, %p, %p, %p, %p, %d, 0x%x: stub\n", debugstr_a(szDataSource), debugstr_a(szMachineName), + FIXME("%s, %s, %s, %p, %p, %p, %p, %ld, 0x%lx: stub\n", debugstr_a(szDataSource), debugstr_a(szMachineName), debugstr_a(szObjectName), mszCounterList, pcchCounterListLength, mszInstanceList, pcchInstanceListLength, dwDetailLevel, dwFlags); @@ -1221,7 +1221,7 @@ PDH_STATUS WINAPI PdhEnumObjectItemsW(LPCWSTR szDataSource, LPCWSTR szMachineNam LPWSTR mszCounterList, LPDWORD pcchCounterListLength, LPWSTR mszInstanceList, LPDWORD pcchInstanceListLength, DWORD dwDetailLevel, DWORD dwFlags) { - FIXME("%s, %s, %s, %p, %p, %p, %p, %d, 0x%x: stub\n", debugstr_w(szDataSource), debugstr_w(szMachineName), + FIXME("%s, %s, %s, %p, %p, %p, %p, %ld, 0x%lx: stub\n", debugstr_w(szDataSource), debugstr_w(szMachineName), debugstr_w(szObjectName), mszCounterList, pcchCounterListLength, mszInstanceList, pcchInstanceListLength, dwDetailLevel, dwFlags); @@ -1233,7 +1233,7 @@ PDH_STATUS WINAPI PdhEnumObjectItemsW(LPCWSTR szDataSource, LPCWSTR szMachineNam */ PDH_STATUS WINAPI PdhSetDefaultRealTimeDataSource( DWORD source ) { - FIXME("%u\n", source); + FIXME("%lu\n", source); return ERROR_SUCCESS; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/powrprof/Makefile.in | 1 - dlls/powrprof/powrprof.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/powrprof/Makefile.in b/dlls/powrprof/Makefile.in index b2e59f6032f..e51fc62e7c0 100644 --- a/dlls/powrprof/Makefile.in +++ b/dlls/powrprof/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = powrprof.dll IMPORTLIB = powrprof IMPORTS = advapi32 diff --git a/dlls/powrprof/powrprof.c b/dlls/powrprof/powrprof.c index 0fd20b9f29b..c4af8ab9ce1 100644 --- a/dlls/powrprof/powrprof.c +++ b/dlls/powrprof/powrprof.c @@ -68,7 +68,7 @@ BOOLEAN WINAPI CanUserWritePwrScheme(VOID) r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPowerCfgSubKey, 0, KEY_READ | KEY_WRITE, &hKey); if (r != ERROR_SUCCESS) { - TRACE("RegOpenKeyEx failed: %d\n", r); + TRACE("RegOpenKeyEx failed: %ld\n", r); bSuccess = FALSE; } @@ -89,7 +89,7 @@ BOOLEAN WINAPI EnumPwrSchemes(PWRSCHEMESENUMPROC lpfnPwrSchemesEnumProc, LPARAM lParam) { /* FIXME: See note #1 */ - FIXME("(%p, %ld) stub!\n", lpfnPwrSchemesEnumProc, lParam); + FIXME("(%p, %Id) stub!\n", lpfnPwrSchemesEnumProc, lParam); SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } @@ -151,7 +151,7 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) r = RegOpenKeyExW(HKEY_LOCAL_MACHINE, szPowerCfgSubKey, 0, KEY_READ, &hKey); if (r != ERROR_SUCCESS) { - TRACE("RegOpenKeyEx failed: %d\n", r); + TRACE("RegOpenKeyEx failed: %ld\n", r); TRACE("Using defaults: 3600, 3\n"); *RangeMax = 3600; *RangeMin = 3; @@ -161,7 +161,7 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) r = RegQueryValueExW(hKey, L"DiskSpindownMax", 0, 0, lpValue, &cbValue); if (r != ERROR_SUCCESS) { - TRACE("Couldn't open DiskSpinDownMax: %d\n", r); + TRACE("Couldn't open DiskSpinDownMax: %ld\n", r); TRACE("Using default: 3600\n"); *RangeMax = 3600; } else { @@ -172,7 +172,7 @@ BOOLEAN WINAPI GetPwrDiskSpindownRange(PUINT RangeMax, PUINT RangeMin) r = RegQueryValueExW(hKey, L"DiskSpindownMin", 0, 0, lpValue, &cbValue); if (r != ERROR_SUCCESS) { - TRACE("Couldn't open DiskSpinDownMin: %d\n", r); + TRACE("Couldn't open DiskSpinDownMin: %ld\n", r); TRACE("Using default: 3\n"); *RangeMin = 3; } else { @@ -318,21 +318,21 @@ POWER_PLATFORM_ROLE WINAPI PowerDeterminePlatformRole(void) POWER_PLATFORM_ROLE WINAPI PowerDeterminePlatformRoleEx(ULONG version) { - FIXME("%u stub.\n", version); + FIXME("%lu stub.\n", version); return PlatformRoleDesktop; } DWORD WINAPI PowerEnumerate(HKEY key, const GUID *scheme, const GUID *subgroup, POWER_DATA_ACCESSOR flags, ULONG index, UCHAR *buffer, DWORD *buffer_size) { - FIXME("(%p,%s,%s,%d,%d,%p,%p) stub!\n", key, debugstr_guid(scheme), debugstr_guid(subgroup), + FIXME("(%p,%s,%s,%d,%ld,%p,%p) stub!\n", key, debugstr_guid(scheme), debugstr_guid(subgroup), flags, index, buffer, buffer_size); return ERROR_CALL_NOT_IMPLEMENTED; } DWORD WINAPI PowerRegisterSuspendResumeNotification(DWORD flags, HANDLE recipient, PHPOWERNOTIFY handle) { - FIXME("(0x%08x,%p,%p) stub!\n", flags, recipient, handle); + FIXME("(0x%08lx,%p,%p) stub!\n", flags, recipient, handle); return ERROR_SUCCESS; } @@ -362,7 +362,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) PPRegSemaphore = CreateSemaphoreW(NULL, 1, 1, L"PowerProfileRegistrySemaphore"); if (PPRegSemaphore == NULL) { - ERR("Couldn't create Semaphore: %d\n", GetLastError()); + ERR("Couldn't create Semaphore: %ld\n", GetLastError()); return FALSE; } break;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/printui/Makefile.in | 1 - dlls/printui/printui.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/printui/Makefile.in b/dlls/printui/Makefile.in index eb1dbf899dc..c504f190b2f 100644 --- a/dlls/printui/Makefile.in +++ b/dlls/printui/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = printui.dll IMPORTS = shell32 diff --git a/dlls/printui/printui.c b/dlls/printui/printui.c index 09f527bfb0a..8f65ed27e87 100644 --- a/dlls/printui/printui.c +++ b/dlls/printui/printui.c @@ -220,7 +220,7 @@ void WINAPI PrintUIEntryW(HWND hWnd, HINSTANCE hInst, LPCWSTR pCommand, DWORD nC context_t cx; BOOL res = FALSE; - TRACE("(%p, %p, %s, 0x%x)\n", hWnd, hInst, debugstr_w(pCommand), nCmdShow); + TRACE("(%p, %p, %s, 0x%lx)\n", hWnd, hInst, debugstr_w(pCommand), nCmdShow); memset(&cx, 0, sizeof(context_t)); cx.hWnd = hWnd;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/prntvpt/Makefile.in | 1 - dlls/prntvpt/main.c | 4 ++-- dlls/prntvpt/ticket.c | 14 +++++++------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/prntvpt/Makefile.in b/dlls/prntvpt/Makefile.in index 7c581662357..77eaf354224 100644 --- a/dlls/prntvpt/Makefile.in +++ b/dlls/prntvpt/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = prntvpt.dll IMPORTLIB = prntvpt IMPORTS = winspool ole32 oleaut32 diff --git a/dlls/prntvpt/main.c b/dlls/prntvpt/main.c index d6ad0cff46a..e046c6cbaed 100644 --- a/dlls/prntvpt/main.c +++ b/dlls/prntvpt/main.c @@ -76,7 +76,7 @@ HRESULT WINAPI PTOpenProvider(PCWSTR printer, DWORD version, HPTPROVIDER *provid { DWORD used_version; - TRACE("%s, %d, %p\n", debugstr_w(printer), version, provider); + TRACE("%s, %ld, %p\n", debugstr_w(printer), version, provider); if (version != 1) return E_INVALIDARG; @@ -87,7 +87,7 @@ HRESULT WINAPI PTOpenProviderEx(const WCHAR *printer, DWORD max_version, DWORD p { struct prn_provider *prov; - TRACE("%s, %d, %d, %p, %p\n", debugstr_w(printer), max_version, pref_version, provider, used_version); + TRACE("%s, %ld, %ld, %p, %p\n", debugstr_w(printer), max_version, pref_version, provider, used_version); if (!max_version || !provider || !used_version) return E_INVALIDARG; diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index 13aaf80423f..e43cda8be6b 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -574,7 +574,7 @@ static void set_SelectionNamespaces(IXMLDOMDocument2 *doc) { if (!wcscmp(str, L"xmlns") || !wcsncmp(str, L"xmlns:", 6)) { - TRACE("ns[%d]: %s=%s\n", i, wine_dbgstr_w(str), wine_dbgstr_w(V_BSTR(&var))); + TRACE("ns[%ld]: %s=%s\n", i, wine_dbgstr_w(str), wine_dbgstr_w(V_BSTR(&var))); IStream_Write(stream, str, wcslen(str) * sizeof(WCHAR), NULL); IStream_Write(stream, L"=\"", 2 * sizeof(WCHAR), NULL); IStream_Write(stream, V_BSTR(&var), wcslen(V_BSTR(&var)) * sizeof(WCHAR), NULL); @@ -1174,7 +1174,7 @@ while (0) CHECK_FIELD(DM_DITHERTYPE); CHECK_FIELD(DM_PANNINGWIDTH); CHECK_FIELD(DM_PANNINGHEIGHT); - if (fields) TRACE(" %#x", fields); + if (fields) TRACE(" %#lx", fields); TRACE("\n"); #undef CHECK_FIELD } @@ -1192,7 +1192,7 @@ static void dump_devmode(const DEVMODEW *dm) TRACE("dmDriverVersion: 0x%04x\n", dm->dmDriverVersion); TRACE("dmSize: 0x%04x\n", dm->dmSize); TRACE("dmDriverExtra: 0x%04x\n", dm->dmDriverExtra); - TRACE("dmFields: 0x%04x\n", dm->dmFields); + TRACE("dmFields: 0x%04lx\n", dm->dmFields); dump_fields(dm->dmFields); TRACE("dmOrientation: %d\n", dm->u1.s1.dmOrientation); TRACE("dmPaperSize: %d\n", dm->u1.s1.dmPaperSize); @@ -1209,9 +1209,9 @@ static void dump_devmode(const DEVMODEW *dm) TRACE("dmCollate: %d\n", dm->dmCollate); TRACE("dmFormName: %s\n", debugstr_w(dm->dmFormName)); TRACE("dmLogPixels %u\n", dm->dmLogPixels); - TRACE("dmBitsPerPel %u\n", dm->dmBitsPerPel); - TRACE("dmPelsWidth %u\n", dm->dmPelsWidth); - TRACE("dmPelsHeight %u\n", dm->dmPelsHeight); + TRACE("dmBitsPerPel %lu\n", dm->dmBitsPerPel); + TRACE("dmPelsWidth %lu\n", dm->dmPelsWidth); + TRACE("dmPelsHeight %lu\n", dm->dmPelsHeight); } HRESULT WINAPI PTConvertDevModeToPrintTicket(HPTPROVIDER provider, ULONG size, PDEVMODEW dm, @@ -1221,7 +1221,7 @@ HRESULT WINAPI PTConvertDevModeToPrintTicket(HPTPROVIDER provider, ULONG size, P struct ticket ticket; HRESULT hr; - TRACE("%p,%u,%p,%d,%p\n", provider, size, dm, scope, stream); + TRACE("%p,%lu,%p,%d,%p\n", provider, size, dm, scope, stream); if (!is_valid_provider(provider) || !dm || !stream) return E_INVALIDARG;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/propsys/Makefile.in | 1 - dlls/propsys/propstore.c | 8 ++++---- dlls/propsys/propsys_main.c | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/propsys/Makefile.in b/dlls/propsys/Makefile.in index 71fd29a0dfe..166b7751d6e 100644 --- a/dlls/propsys/Makefile.in +++ b/dlls/propsys/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = propsys.dll IMPORTLIB = propsys IMPORTS = ole32 oleaut32 uuid diff --git a/dlls/propsys/propstore.c b/dlls/propsys/propstore.c index 6e0d49057d9..9906df83f6f 100644 --- a/dlls/propsys/propstore.c +++ b/dlls/propsys/propstore.c @@ -92,7 +92,7 @@ static ULONG WINAPI PropertyStore_AddRef(IPropertyStoreCache *iface) PropertyStore *This = impl_from_IPropertyStoreCache(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); return ref; } @@ -113,7 +113,7 @@ static ULONG WINAPI PropertyStore_Release(IPropertyStoreCache *iface) PropertyStore *This = impl_from_IPropertyStoreCache(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount=%u\n", iface, ref); + TRACE("(%p) refcount=%lu\n", iface, ref); if (ref == 0) { @@ -159,7 +159,7 @@ static HRESULT WINAPI PropertyStore_GetAt(IPropertyStoreCache *iface, propstore_value *value; HRESULT hr; - TRACE("%p,%d,%p\n", iface, iProp, pkey); + TRACE("%p,%ld,%p\n", iface, iProp, pkey); if (!pkey) return E_POINTER; @@ -478,7 +478,7 @@ HRESULT WINAPI PSCreatePropertyStoreFromObject(IUnknown *obj, DWORD access, REFI { HRESULT hr; - TRACE("(%p, %d, %s, %p)\n", obj, access, debugstr_guid(riid), ret); + TRACE("(%p, %ld, %s, %p)\n", obj, access, debugstr_guid(riid), ret); if (!obj || !ret) return E_POINTER; diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 06150dfad12..6e87b3d3579 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -157,7 +157,7 @@ static HRESULT WINAPI propsys_FormatForDisplay(IPropertySystem *iface, REFPROPERTYKEY key, REFPROPVARIANT propvar, PROPDESC_FORMAT_FLAGS flags, LPWSTR dest, DWORD destlen) { - FIXME("%p %p %x %p %d: stub\n", key, propvar, flags, dest, destlen); + FIXME("%p %p %x %p %ld: stub\n", key, propvar, flags, dest, destlen); return E_NOTIMPL; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/pstorec/Makefile.in | 1 - dlls/pstorec/pstorec.c | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/pstorec/Makefile.in b/dlls/pstorec/Makefile.in index bc92381f7bf..62d06a759b4 100644 --- a/dlls/pstorec/Makefile.in +++ b/dlls/pstorec/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = pstorec.dll IMPORTS = uuid diff --git a/dlls/pstorec/pstorec.c b/dlls/pstorec/pstorec.c index 8d0293d7e44..44b417db9d2 100644 --- a/dlls/pstorec/pstorec.c +++ b/dlls/pstorec/pstorec.c @@ -78,7 +78,7 @@ static ULONG WINAPI PStore_fnAddRef(IPStore* iface) { PStore_impl *This = impl_from_IPStore(iface); - TRACE("%p %u\n", This, This->ref); + TRACE("%p %lu\n", This, This->ref); return InterlockedIncrement( &This->ref ); } @@ -91,7 +91,7 @@ static ULONG WINAPI PStore_fnRelease(IPStore* iface) PStore_impl *This = impl_from_IPStore(iface); LONG ref; - TRACE("%p %u\n", This, This->ref); + TRACE("%p %lu\n", This, This->ref); ref = InterlockedDecrement( &This->ref ); if( !ref ) @@ -135,7 +135,7 @@ static HRESULT WINAPI PStore_fnSetProvParam( IPStore* This, static HRESULT WINAPI PStore_fnCreateType( IPStore* This, PST_KEY Key, const GUID* pType, PPST_TYPEINFO pInfo, DWORD dwFlags) { - FIXME("%p %08x %s %p(%d,%s) %08x\n", This, Key, debugstr_guid(pType), + FIXME("%p %08lx %s %p(%ld,%s) %08lx\n", This, Key, debugstr_guid(pType), pInfo, pInfo->cbSize, debugstr_w(pInfo->szDisplayName), dwFlags); return E_NOTIMPL; @@ -157,7 +157,7 @@ static HRESULT WINAPI PStore_fnGetTypeInfo( IPStore* This, static HRESULT WINAPI PStore_fnDeleteType( IPStore* This, PST_KEY Key, const GUID* pType, DWORD dwFlags) { - FIXME("%p %d %s %08x\n", This, Key, debugstr_guid(pType), dwFlags); + FIXME("%p %ld %s %08lx\n", This, Key, debugstr_guid(pType), dwFlags); return E_NOTIMPL; } @@ -168,7 +168,7 @@ static HRESULT WINAPI PStore_fnCreateSubtype( IPStore* This, PST_KEY Key, const GUID* pType, const GUID* pSubtype, PPST_TYPEINFO pInfo, PPST_ACCESSRULESET pRules, DWORD dwFlags) { - FIXME("%p %08x %s %s %p %p %08x\n", This, Key, debugstr_guid(pType), + FIXME("%p %08lx %s %s %p %p %08lx\n", This, Key, debugstr_guid(pType), debugstr_guid(pSubtype), pInfo, pRules, dwFlags); return E_NOTIMPL; } @@ -190,7 +190,7 @@ static HRESULT WINAPI PStore_fnGetSubtypeInfo( IPStore* This, static HRESULT WINAPI PStore_fnDeleteSubtype( IPStore* This, PST_KEY Key, const GUID* pType, const GUID* pSubtype, DWORD dwFlags) { - FIXME("%p %u %s %s %08x\n", This, Key, + FIXME("%p %lu %s %s %08lx\n", This, Key, debugstr_guid(pType), debugstr_guid(pSubtype), dwFlags); return E_NOTIMPL; } @@ -255,7 +255,7 @@ static HRESULT WINAPI PStore_fnReadItem( IPStore* This, PST_KEY Key, const GUID* pItemType, const GUID* pItemSubtype, LPCWSTR szItemName, DWORD *cbData, BYTE** pbData, PPST_PROMPTINFO pPromptInfo, DWORD dwFlags) { - FIXME("%p %08x %s %s %s %p %p %p %08x\n", This, Key, + FIXME("%p %08lx %s %s %s %p %p %p %08lx\n", This, Key, debugstr_guid(pItemType), debugstr_guid(pItemSubtype), debugstr_w(szItemName), cbData, pbData, pPromptInfo, dwFlags); return E_NOTIMPL; @@ -269,7 +269,7 @@ static HRESULT WINAPI PStore_fnWriteItem( IPStore* This, PST_KEY Key, DWORD cbData, BYTE* ppbData, PPST_PROMPTINFO pPromptInfo, DWORD dwDefaultConfirmationStyle, DWORD dwFlags) { - FIXME("%p %08x %s %s %s %d %p %p %08x\n", This, Key, + FIXME("%p %08lx %s %s %s %ld %p %p %08lx\n", This, Key, debugstr_guid(pItemType), debugstr_guid(pItemSubtype), debugstr_w(szItemName), cbData, ppbData, pPromptInfo, dwFlags); return E_NOTIMPL; @@ -282,7 +282,7 @@ static HRESULT WINAPI PStore_fnOpenItem( IPStore* This, PST_KEY Key, const GUID* pItemType, const GUID* pItemSubtype, LPCWSTR szItemName, PST_ACCESSMODE ModeFlags, PPST_PROMPTINFO pPromptInfo, DWORD dwFlags ) { - FIXME("(%p,%08x,%s,%s,%s,%08x,%p,%08x) stub\n", This, Key, debugstr_guid(pItemType), + FIXME("(%p,%08lx,%s,%s,%s,%08lx,%p,%08lx) stub\n", This, Key, debugstr_guid(pItemType), debugstr_guid(pItemSubtype), debugstr_w(szItemName), ModeFlags, pPromptInfo, dwFlags); return E_NOTIMPL; } @@ -341,7 +341,7 @@ HRESULT WINAPI PStoreCreateInstance( IPStore** ppProvider, { PStore_impl *ips; - TRACE("%p %s %p %08x\n", ppProvider, debugstr_guid(pProviderID), pReserved, dwFlags); + TRACE("%p %s %p %08lx\n", ppProvider, debugstr_guid(pProviderID), pReserved, dwFlags); ips = HeapAlloc( GetProcessHeap(), 0, sizeof (PStore_impl) ); if( !ips )
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/qmgr/Makefile.in | 1 - dlls/qmgr/enum_files.c | 8 ++++---- dlls/qmgr/enum_jobs.c | 8 ++++---- dlls/qmgr/file.c | 14 +++++++------- dlls/qmgr/job.c | 34 +++++++++++++++++----------------- dlls/qmgr/qmgr.c | 4 ++-- dlls/qmgr/service.c | 6 +++--- 7 files changed, 37 insertions(+), 38 deletions(-) diff --git a/dlls/qmgr/Makefile.in b/dlls/qmgr/Makefile.in index 1e23b75c30d..21d2328e2f0 100644 --- a/dlls/qmgr/Makefile.in +++ b/dlls/qmgr/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = qmgr.dll IMPORTS = uuid winhttp ole32 advapi32 diff --git a/dlls/qmgr/enum_files.c b/dlls/qmgr/enum_files.c index 67953d9e1ad..92834c6bd3b 100644 --- a/dlls/qmgr/enum_files.c +++ b/dlls/qmgr/enum_files.c @@ -60,7 +60,7 @@ static ULONG WINAPI EnumBackgroundCopyFiles_AddRef(IEnumBackgroundCopyFiles *ifa EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("(%p)->(%ld)\n", This, ref); return ref; } @@ -70,7 +70,7 @@ static ULONG WINAPI EnumBackgroundCopyFiles_Release(IEnumBackgroundCopyFiles *if ULONG ref = InterlockedDecrement(&This->ref); ULONG i; - TRACE("(%p)->(%d)\n", This, ref); + TRACE("(%p)->(%ld)\n", This, ref); if (ref == 0) { @@ -92,7 +92,7 @@ static HRESULT WINAPI EnumBackgroundCopyFiles_Next(IEnumBackgroundCopyFiles *ifa ULONG i; IBackgroundCopyFile2 *file; - TRACE("(%p)->(%d %p %p)\n", This, celt, rgelt, pceltFetched); + TRACE("(%p)->(%ld %p %p)\n", This, celt, rgelt, pceltFetched); /* Despite documented behavior, Windows (tested on XP) is not verifying that the caller set pceltFetched to zero. No check here. */ @@ -129,7 +129,7 @@ static HRESULT WINAPI EnumBackgroundCopyFiles_Skip(IEnumBackgroundCopyFiles *ifa { EnumBackgroundCopyFilesImpl *This = impl_from_IEnumBackgroundCopyFiles(iface); - TRACE("(%p)->(%d)\n", This, celt); + TRACE("(%p)->(%ld)\n", This, celt); if (celt > This->numFiles - This->indexFiles) { diff --git a/dlls/qmgr/enum_jobs.c b/dlls/qmgr/enum_jobs.c index 5a798259547..00d8ea52b4f 100644 --- a/dlls/qmgr/enum_jobs.c +++ b/dlls/qmgr/enum_jobs.c @@ -60,7 +60,7 @@ static ULONG WINAPI EnumBackgroundCopyJobs_AddRef(IEnumBackgroundCopyJobs *iface EnumBackgroundCopyJobsImpl *This = impl_from_IEnumBackgroundCopyJobs(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("(%p)->(%ld)\n", This, ref); return ref; } @@ -71,7 +71,7 @@ static ULONG WINAPI EnumBackgroundCopyJobs_Release(IEnumBackgroundCopyJobs *ifac ULONG ref = InterlockedDecrement(&This->ref); ULONG i; - TRACE("(%p)->(%d)\n", This, ref); + TRACE("(%p)->(%ld)\n", This, ref); if (ref == 0) { for(i = 0; i < This->numJobs; i++) @@ -90,7 +90,7 @@ static HRESULT WINAPI EnumBackgroundCopyJobs_Next(IEnumBackgroundCopyJobs *iface ULONG fetched; ULONG i; - TRACE("(%p)->(%d %p %p)\n", This, celt, rgelt, pceltFetched); + TRACE("(%p)->(%ld %p %p)\n", This, celt, rgelt, pceltFetched); fetched = min(celt, This->numJobs - This->indexJobs); if (pceltFetched) @@ -121,7 +121,7 @@ static HRESULT WINAPI EnumBackgroundCopyJobs_Skip(IEnumBackgroundCopyJobs *iface { EnumBackgroundCopyJobsImpl *This = impl_from_IEnumBackgroundCopyJobs(iface); - TRACE("(%p)->(%d)\n", This, celt); + TRACE("(%p)->(%ld)\n", This, celt); if (This->numJobs - This->indexJobs < celt) { diff --git a/dlls/qmgr/file.c b/dlls/qmgr/file.c index befd38b416b..339354d59c0 100644 --- a/dlls/qmgr/file.c +++ b/dlls/qmgr/file.c @@ -67,7 +67,7 @@ static ULONG WINAPI BackgroundCopyFile_AddRef( { BackgroundCopyFileImpl *file = impl_from_IBackgroundCopyFile2(iface); ULONG ref = InterlockedIncrement(&file->ref); - TRACE("(%p)->(%d)\n", file, ref); + TRACE("(%p)->(%ld)\n", file, ref); return ref; } @@ -77,7 +77,7 @@ static ULONG WINAPI BackgroundCopyFile_Release( BackgroundCopyFileImpl *file = impl_from_IBackgroundCopyFile2(iface); ULONG ref = InterlockedDecrement(&file->ref); - TRACE("(%p)->(%d)\n", file, ref); + TRACE("(%p)->(%ld)\n", file, ref); if (ref == 0) { @@ -216,7 +216,7 @@ static HRESULT hresult_from_http_response(DWORD code) case 504: return BG_E_HTTP_ERROR_504; case 505: return BG_E_HTTP_ERROR_505; default: - FIXME("unhandled response code %u\n", code); + FIXME("unhandled response code %lu\n", code); return S_OK; } } @@ -227,7 +227,7 @@ static void CALLBACK progress_callback_http(HINTERNET handle, DWORD_PTR context, BackgroundCopyFileImpl *file = (BackgroundCopyFileImpl *)context; BackgroundCopyJobImpl *job = file->owner; - TRACE("%p, %p, %x, %p, %u\n", handle, file, status, buf, buflen); + TRACE("%p, %p, %lx, %p, %lu\n", handle, file, status, buf, buflen); switch (status) { @@ -465,7 +465,7 @@ static BOOL transfer_file_local(BackgroundCopyFileImpl *file, const WCHAR *tmpna if (!(ret = CopyFileExW(ptr, tmpname, progress_callback_local, file, NULL, 0))) { - WARN("Local file copy failed: error %u\n", GetLastError()); + WARN("Local file copy failed: error %lu\n", GetLastError()); transitionJobState(job, BG_JOB_STATE_TRANSFERRING, BG_JOB_STATE_ERROR); } @@ -482,7 +482,7 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) if (!GetTempPathW(MAX_PATH, tmpDir)) { - ERR("Couldn't create temp file name: %d\n", GetLastError()); + ERR("Couldn't create temp file name: %ld\n", GetLastError()); /* Guessing on what state this should give us */ transitionJobState(job, BG_JOB_STATE_QUEUED, BG_JOB_STATE_TRANSIENT_ERROR); return FALSE; @@ -490,7 +490,7 @@ BOOL processFile(BackgroundCopyFileImpl *file, BackgroundCopyJobImpl *job) if (!GetTempFileNameW(tmpDir, L"BIT", 0, tmpName)) { - ERR("Couldn't create temp file: %d\n", GetLastError()); + ERR("Couldn't create temp file: %ld\n", GetLastError()); /* Guessing on what state this should give us */ transitionJobState(job, BG_JOB_STATE_QUEUED, BG_JOB_STATE_TRANSIENT_ERROR); return FALSE; diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 2ba65cbc290..2b8572465ad 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -84,7 +84,7 @@ static ULONG WINAPI copy_error_AddRef( { struct copy_error *error = impl_from_IBackgroundCopyError(iface); LONG refs = InterlockedIncrement(&error->refs); - TRACE("(%p)->(%d)\n", error, refs); + TRACE("(%p)->(%ld)\n", error, refs); return refs; } @@ -94,7 +94,7 @@ static ULONG WINAPI copy_error_Release( struct copy_error *error = impl_from_IBackgroundCopyError(iface); LONG refs = InterlockedDecrement(&error->refs); - TRACE("(%p)->(%d)\n", error, refs); + TRACE("(%p)->(%ld)\n", error, refs); if (!refs) { @@ -116,7 +116,7 @@ static HRESULT WINAPI copy_error_GetError( *pContext = error->context; *pCode = error->code; - TRACE("returning context %u error code 0x%08x\n", error->context, error->code); + TRACE("returning context %u error code 0x%08lx\n", error->context, error->code); return S_OK; } @@ -187,7 +187,7 @@ static HRESULT create_copy_error( { struct copy_error *error; - TRACE("context %u code %08x file %p\n", context, code, file); + TRACE("context %u code %08lx file %p\n", context, code, file); if (!(error = HeapAlloc(GetProcessHeap(), 0, sizeof(*error) ))) return E_OUTOFMEMORY; error->IBackgroundCopyError_iface.lpVtbl = ©_error_vtbl; @@ -245,7 +245,7 @@ static ULONG WINAPI BackgroundCopyJob_AddRef(IBackgroundCopyJob4 *iface) { BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob4(iface); ULONG refcount = InterlockedIncrement(&job->ref); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); return refcount; } @@ -254,7 +254,7 @@ static ULONG WINAPI BackgroundCopyJob_Release(IBackgroundCopyJob4 *iface) BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJob4(iface); ULONG i, j, ref = InterlockedDecrement(&job->ref); - TRACE("%p, refcount %d.\n", iface, ref); + TRACE("%p, refcount %ld.\n", iface, ref); if (!ref) { @@ -291,7 +291,7 @@ static HRESULT WINAPI BackgroundCopyJob_AddFileSet(IBackgroundCopyJob4 *iface, U HRESULT hr = S_OK; ULONG i; - TRACE("%p, %u, %p.\n", iface, cFileCount, pFileSet); + TRACE("%p, %lu, %p.\n", iface, cFileCount, pFileSet); EnterCriticalSection(&job->cs); @@ -405,12 +405,12 @@ static HRESULT WINAPI BackgroundCopyJob_Cancel(IBackgroundCopyJob4 *iface) { if (file->tempFileName[0] && !DeleteFileW(file->tempFileName)) { - WARN("Couldn't delete %s (%u)\n", debugstr_w(file->tempFileName), GetLastError()); + WARN("Couldn't delete %s (%lu)\n", debugstr_w(file->tempFileName), GetLastError()); hr = BG_S_UNABLE_TO_DELETE_FILES; } if (file->info.LocalName && !DeleteFileW(file->info.LocalName)) { - WARN("Couldn't delete %s (%u)\n", debugstr_w(file->info.LocalName), GetLastError()); + WARN("Couldn't delete %s (%lu)\n", debugstr_w(file->info.LocalName), GetLastError()); hr = BG_S_UNABLE_TO_DELETE_FILES; } } @@ -620,7 +620,7 @@ static HRESULT WINAPI BackgroundCopyJob_SetNotifyFlags(IBackgroundCopyJob4 *ifac BG_NOTIFY_JOB_MODIFICATION | BG_NOTIFY_FILE_TRANSFERRED; - TRACE("%p, %#x.\n", iface, flags); + TRACE("%p, %#lx.\n", iface, flags); if (is_job_done(job)) return BG_E_INVALID_STATE; if (flags & ~valid_flags) return E_NOTIMPL; @@ -686,7 +686,7 @@ static HRESULT WINAPI BackgroundCopyJob_GetNotifyInterface(IBackgroundCopyJob4 * static HRESULT WINAPI BackgroundCopyJob_SetMinimumRetryDelay(IBackgroundCopyJob4 *iface, ULONG delay) { - FIXME("%p, %u.\n", iface, delay); + FIXME("%p, %lu.\n", iface, delay); return S_OK; } @@ -699,7 +699,7 @@ static HRESULT WINAPI BackgroundCopyJob_GetMinimumRetryDelay(IBackgroundCopyJob4 static HRESULT WINAPI BackgroundCopyJob_SetNoProgressTimeout(IBackgroundCopyJob4 *iface, ULONG timeout) { - FIXME("%p, %u.: stub\n", iface, timeout); + FIXME("%p, %lu.: stub\n", iface, timeout); return S_OK; } @@ -859,13 +859,13 @@ static HRESULT WINAPI BackgroundCopyJob_AddFileWithRanges( DWORD RangeCount, BG_FILE_RANGE Ranges[]) { - FIXME("%p, %s, %s, %u, %p: stub\n", iface, debugstr_w(RemoteUrl), debugstr_w(LocalName), RangeCount, Ranges); + FIXME("%p, %s, %s, %lu, %p: stub\n", iface, debugstr_w(RemoteUrl), debugstr_w(LocalName), RangeCount, Ranges); return S_OK; } static HRESULT WINAPI BackgroundCopyJob_SetFileACLFlags(IBackgroundCopyJob4 *iface, DWORD flags) { - FIXME("%p, %#x: stub\n", iface, flags); + FIXME("%p, %#lx: stub\n", iface, flags); return S_OK; } @@ -877,7 +877,7 @@ static HRESULT WINAPI BackgroundCopyJob_GetFileACLFlags(IBackgroundCopyJob4 *ifa static HRESULT WINAPI BackgroundCopyJob_SetPeerCachingFlags(IBackgroundCopyJob4 *iface, DWORD flags) { - FIXME("%p, %#x.\n", iface, flags); + FIXME("%p, %#lx.\n", iface, flags); return S_OK; } @@ -901,7 +901,7 @@ static HRESULT WINAPI BackgroundCopyJob_GetOwnerElevationState(IBackgroundCopyJo static HRESULT WINAPI BackgroundCopyJob_SetMaximumDownloadTime(IBackgroundCopyJob4 *iface, ULONG timeout) { - FIXME("%p, %u.\n", iface, timeout); + FIXME("%p, %lu.\n", iface, timeout); return S_OK; } @@ -1100,7 +1100,7 @@ static HRESULT WINAPI http_options_SetSecurityFlags( { BackgroundCopyJobImpl *job = impl_from_IBackgroundCopyJobHttpOptions(iface); - TRACE("(%p)->(0x%08x)\n", iface, Flags); + TRACE("(%p)->(0x%08lx)\n", iface, Flags); job->http_options.flags = Flags; return S_OK; diff --git a/dlls/qmgr/qmgr.c b/dlls/qmgr/qmgr.c index 5b16e86caf5..c49bd61ce3c 100644 --- a/dlls/qmgr/qmgr.c +++ b/dlls/qmgr/qmgr.c @@ -108,14 +108,14 @@ static HRESULT WINAPI BackgroundCopyManager_GetJob(IBackgroundCopyManager *iface static HRESULT WINAPI BackgroundCopyManager_EnumJobs(IBackgroundCopyManager *iface, DWORD flags, IEnumBackgroundCopyJobs **ppEnum) { - TRACE("(0x%x %p)\n", flags, ppEnum); + TRACE("(0x%lx %p)\n", flags, ppEnum); return enum_copy_job_create(&globalMgr, ppEnum); } static HRESULT WINAPI BackgroundCopyManager_GetErrorDescription(IBackgroundCopyManager *iface, HRESULT hr, DWORD langid, LPWSTR *error_description) { - FIXME("(0x%08x 0x%x %p): stub\n", hr, langid, error_description); + FIXME("(0x%08lx 0x%lx %p): stub\n", hr, langid, error_description); return E_NOTIMPL; } diff --git a/dlls/qmgr/service.c b/dlls/qmgr/service.c index 521cb74eb8b..635e134df8d 100644 --- a/dlls/qmgr/service.c +++ b/dlls/qmgr/service.c @@ -64,7 +64,7 @@ ServiceHandler(DWORD ctrl, DWORD event_type, LPVOID event_data, LPVOID context) SetEvent(stop_event); break; default: - FIXME("ignoring handle service ctrl %x\n", ctrl); + FIXME("ignoring handle service ctrl %lx\n", ctrl); UpdateStatus(status.dwCurrentState, NO_ERROR, 0); break; } @@ -116,7 +116,7 @@ ServiceMain(DWORD dwArgc, LPWSTR *lpszArgv) status_handle = RegisterServiceCtrlHandlerExW(L"BITS", ServiceHandler, NULL); if (!status_handle) { - ERR("failed to register handler: %u\n", GetLastError()); + ERR("failed to register handler: %lu\n", GetLastError()); return; } @@ -129,7 +129,7 @@ ServiceMain(DWORD dwArgc, LPWSTR *lpszArgv) globalMgr.jobEvent = CreateEventW(NULL, TRUE, FALSE, NULL); if (!globalMgr.jobEvent) { - ERR("Couldn't create event: error %d\n", GetLastError()); + ERR("Couldn't create event: error %ld\n", GetLastError()); UpdateStatus(SERVICE_STOPPED, NO_ERROR, 0); return; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/query/Makefile.in | 1 - dlls/query/query_main.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/query/Makefile.in b/dlls/query/Makefile.in index 71352a5ff0f..8cdeb9c9765 100644 --- a/dlls/query/Makefile.in +++ b/dlls/query/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = query.dll IMPORTS = uuid diff --git a/dlls/query/query_main.c b/dlls/query/query_main.c index cc1eac596c7..9e27986e022 100644 --- a/dlls/query/query_main.c +++ b/dlls/query/query_main.c @@ -57,7 +57,7 @@ HRESULT WINAPI LocateCatalogsA(CHAR const *pwszScope, ULONG iBm, CHAR *pwszCat, ULONG *pcCat) { - FIXME("%s %u %p %p %p %p\n", debugstr_a(pwszScope), + FIXME("%s %lu %p %p %p %p\n", debugstr_a(pwszScope), iBm, pwszMachine, pcMachine, pwszCat, pcCat); return CI_E_NOT_RUNNING; } @@ -67,7 +67,7 @@ HRESULT WINAPI LocateCatalogsW(WCHAR const *pwszScope, ULONG iBm, WCHAR *pwszCat, ULONG *pcCat) { - FIXME("%s %u %p %p %p %p\n", debugstr_w(pwszScope), + FIXME("%s %lu %p %p %p %p\n", debugstr_w(pwszScope), iBm, pwszMachine, pcMachine, pwszCat, pcCat); return CI_E_NOT_RUNNING; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/qwave/Makefile.in | 1 - dlls/qwave/main.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/qwave/Makefile.in b/dlls/qwave/Makefile.in index b75cbb05423..fee5602d7ba 100644 --- a/dlls/qwave/Makefile.in +++ b/dlls/qwave/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = qwave.dll IMPORTLIB = qwave diff --git a/dlls/qwave/main.c b/dlls/qwave/main.c index fceb5c79503..a8755d993d1 100644 --- a/dlls/qwave/main.c +++ b/dlls/qwave/main.c @@ -39,7 +39,7 @@ BOOL WINAPI QOSCreateHandle(PQOS_VERSION version, PHANDLE handle) BOOL WINAPI QOSAddSocketToFlow(HANDLE handle, SOCKET socket, PSOCKADDR addr, QOS_TRAFFIC_TYPE traffictype, DWORD flags, PQOS_FLOWID flowid) { - FIXME("%p, %lx, %p, %d, 0x%08x, %p stub!\n", handle, socket, addr, traffictype, flags, flowid); + FIXME("%p, %Ix, %p, %d, 0x%08lx, %p stub!\n", handle, socket, addr, traffictype, flags, flowid); SetLastError(ERROR_NOT_SUPPORTED); return FALSE; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/rasapi32/Makefile.in | 1 - dlls/rasapi32/rasapi.c | 52 +++++++++++++++++++++++---------------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/rasapi32/Makefile.in b/dlls/rasapi32/Makefile.in index e1d31e8c405..ff7e71042f9 100644 --- a/dlls/rasapi32/Makefile.in +++ b/dlls/rasapi32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = rasapi32.dll IMPORTLIB = rasapi32 diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c index f70f73caa2c..a7f3baf4953 100644 --- a/dlls/rasapi32/rasapi.c +++ b/dlls/rasapi32/rasapi.c @@ -30,13 +30,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(ras); DWORD WINAPI RasConnectionNotificationA(HRASCONN hrasconn, HANDLE hEvent, DWORD dwFlags) { - FIXME("(%p,%p,0x%08x),stub!\n",hrasconn,hEvent,dwFlags); + FIXME("(%p,%p,0x%08lx),stub!\n",hrasconn,hEvent,dwFlags); return 1; } DWORD WINAPI RasConnectionNotificationW(HRASCONN hrasconn, HANDLE hEvent, DWORD dwFlags) { - FIXME("(%p,%p,0x%08x),stub!\n",hrasconn,hEvent,dwFlags); + FIXME("(%p,%p,0x%08lx),stub!\n",hrasconn,hEvent,dwFlags); return 1; } @@ -54,14 +54,14 @@ DWORD WINAPI RasCreatePhonebookEntryW(HWND hwnd, LPCWSTR lpszPhonebook) DWORD WINAPI RasDeleteSubEntryA(LPCSTR lpszPhonebook, LPCSTR lpszEntry, DWORD dwSubEntryId) { - FIXME("(%s,%s,0x%08x),stub!\n",debugstr_a(lpszPhonebook), + FIXME("(%s,%s,0x%08lx),stub!\n",debugstr_a(lpszPhonebook), debugstr_a(lpszEntry),dwSubEntryId); return 0; } DWORD WINAPI RasDeleteSubEntryW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, DWORD dwSubEntryId) { - FIXME("(%s,%s,0x%08x),stub!\n",debugstr_w(lpszPhonebook), + FIXME("(%s,%s,0x%08lx),stub!\n",debugstr_w(lpszPhonebook), debugstr_w(lpszEntry),dwSubEntryId); return 0; } @@ -70,7 +70,7 @@ DWORD WINAPI RasDialA(LPRASDIALEXTENSIONS lpRasDialExtensions, LPCSTR lpszPhoneb LPRASDIALPARAMSA lpRasDialParams, DWORD dwNotifierType, LPVOID lpvNotifier, LPHRASCONN lphRasConn) { - FIXME("(%p,%s,%p,0x%08x,%p,%p),stub!\n",lpRasDialExtensions,debugstr_a(lpszPhonebook), + FIXME("(%p,%s,%p,0x%08lx,%p,%p),stub!\n",lpRasDialExtensions,debugstr_a(lpszPhonebook), lpRasDialParams,dwNotifierType,lpvNotifier,lphRasConn); return 1; } @@ -79,7 +79,7 @@ DWORD WINAPI RasDialW(LPRASDIALEXTENSIONS lpRasDialExtensions, LPCWSTR lpszPhone LPRASDIALPARAMSW lpRasDialParams, DWORD dwNotifierType, LPVOID lpvNotifier, LPHRASCONN lphRasConn) { - FIXME("(%p,%s,%p,0x%08x,%p,%p),stub!\n",lpRasDialExtensions,debugstr_w(lpszPhonebook), + FIXME("(%p,%s,%p,0x%08lx,%p,%p),stub!\n",lpRasDialExtensions,debugstr_w(lpszPhonebook), lpRasDialParams,dwNotifierType,lpvNotifier,lphRasConn); return 1; } @@ -300,7 +300,7 @@ DWORD WINAPI RasGetAutodialAddressW(LPCWSTR a, LPDWORD b, LPRASAUTODIALENTRYW c, */ DWORD WINAPI RasGetAutodialEnableA(DWORD a, LPBOOL b) { - FIXME("(%x,%p),stub!\n",a,b); + FIXME("(%lx,%p),stub!\n",a,b); return 0; } @@ -309,7 +309,7 @@ DWORD WINAPI RasGetAutodialEnableA(DWORD a, LPBOOL b) */ DWORD WINAPI RasGetAutodialEnableW(DWORD a, LPBOOL b) { - FIXME("(%x,%p),stub!\n",a,b); + FIXME("(%lx,%p),stub!\n",a,b); return 0; } @@ -318,7 +318,7 @@ DWORD WINAPI RasGetAutodialEnableW(DWORD a, LPBOOL b) */ DWORD WINAPI RasGetAutodialParamA(DWORD dwKey, LPVOID lpvValue, LPDWORD lpdwcbValue) { - FIXME("(%x,%p,%p),stub!\n",dwKey,lpvValue,lpdwcbValue); + FIXME("(%lx,%p,%p),stub!\n",dwKey,lpvValue,lpdwcbValue); return 0; } @@ -327,7 +327,7 @@ DWORD WINAPI RasGetAutodialParamA(DWORD dwKey, LPVOID lpvValue, LPDWORD lpdwcbVa */ DWORD WINAPI RasGetAutodialParamW(DWORD dwKey, LPVOID lpvValue, LPDWORD lpdwcbValue) { - FIXME("(%x,%p,%p),stub!\n",dwKey,lpvValue,lpdwcbValue); + FIXME("(%lx,%p,%p),stub!\n",dwKey,lpvValue,lpdwcbValue); return 0; } @@ -337,7 +337,7 @@ DWORD WINAPI RasGetAutodialParamW(DWORD dwKey, LPVOID lpvValue, LPDWORD lpdwcbVa DWORD WINAPI RasSetAutodialAddressA(LPCSTR a, DWORD b, LPRASAUTODIALENTRYA c, DWORD d, DWORD e) { - FIXME("(%s,%x,%p,%x,%x),stub!\n",debugstr_a(a),b,c,d,e); + FIXME("(%s,%lx,%p,%lx,%lx),stub!\n",debugstr_a(a),b,c,d,e); return 0; } @@ -347,7 +347,7 @@ DWORD WINAPI RasSetAutodialAddressA(LPCSTR a, DWORD b, LPRASAUTODIALENTRYA c, DWORD WINAPI RasSetAutodialAddressW(LPCWSTR a, DWORD b, LPRASAUTODIALENTRYW c, DWORD d, DWORD e) { - FIXME("(%s,%x,%p,%x,%x),stub!\n",debugstr_w(a),b,c,d,e); + FIXME("(%s,%lx,%p,%lx,%lx),stub!\n",debugstr_w(a),b,c,d,e); return 0; } @@ -356,7 +356,7 @@ DWORD WINAPI RasSetAutodialAddressW(LPCWSTR a, DWORD b, LPRASAUTODIALENTRYW c, */ DWORD WINAPI RasSetAutodialEnableA(DWORD dwDialingLocation, BOOL fEnabled) { - FIXME("(%x,%x),stub!\n",dwDialingLocation,fEnabled); + FIXME("(%lx,%x),stub!\n",dwDialingLocation,fEnabled); return 0; } @@ -365,7 +365,7 @@ DWORD WINAPI RasSetAutodialEnableA(DWORD dwDialingLocation, BOOL fEnabled) */ DWORD WINAPI RasSetAutodialEnableW(DWORD dwDialingLocation, BOOL fEnabled) { - FIXME("(%x,%x),stub!\n",dwDialingLocation,fEnabled); + FIXME("(%lx,%x),stub!\n",dwDialingLocation,fEnabled); return 0; } @@ -374,7 +374,7 @@ DWORD WINAPI RasSetAutodialEnableW(DWORD dwDialingLocation, BOOL fEnabled) */ DWORD WINAPI RasSetAutodialParamA(DWORD a, LPVOID b, DWORD c) { - FIXME("(%x,%p,%x),stub!\n",a,b,c); + FIXME("(%lx,%p,%lx),stub!\n",a,b,c); return 0; } @@ -383,7 +383,7 @@ DWORD WINAPI RasSetAutodialParamA(DWORD a, LPVOID b, DWORD c) */ DWORD WINAPI RasSetAutodialParamW(DWORD a, LPVOID b, DWORD c) { - FIXME("(%x,%p,%x),stub!\n",a,b,c); + FIXME("(%lx,%p,%lx),stub!\n",a,b,c); return 0; } @@ -394,12 +394,12 @@ DWORD WINAPI RasSetEntryPropertiesA(LPCSTR lpszPhonebook, LPCSTR lpszEntry, LPRASENTRYA lpRasEntry, DWORD dwEntryInfoSize, LPBYTE lpbDeviceInfo, DWORD dwDeviceInfoSize ) { - FIXME("(%s,%s,%p,%d,%p,%d), stub!\n", + FIXME("(%s,%s,%p,%ld,%p,%ld), stub!\n", debugstr_a(lpszPhonebook),debugstr_a(lpszEntry), lpRasEntry,dwEntryInfoSize,lpbDeviceInfo,dwDeviceInfoSize ); FIXME("Rasentry:\n"); - FIXME("\tdwfOptions %x\n",lpRasEntry->dwfOptions); + FIXME("\tdwfOptions %lx\n",lpRasEntry->dwfOptions); FIXME("\tszLocalPhoneNumber %s\n",debugstr_a(lpRasEntry->szLocalPhoneNumber)); return 0; } @@ -411,7 +411,7 @@ DWORD WINAPI RasSetEntryPropertiesW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, LPRASENTRYW lpRasEntry, DWORD dwEntryInfoSize, LPBYTE lpbDeviceInfo, DWORD dwDeviceInfoSize ) { - FIXME("(%s,%s,%p,%d,%p,%d), stub!\n", + FIXME("(%s,%s,%p,%ld,%p,%ld), stub!\n", debugstr_w(lpszPhonebook),debugstr_w(lpszEntry), lpRasEntry,dwEntryInfoSize,lpbDeviceInfo,dwDeviceInfoSize ); @@ -458,13 +458,13 @@ DWORD WINAPI RasGetEntryPropertiesW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, LP DWORD WINAPI RasGetErrorStringA(UINT uErrorValue, LPSTR lpszErrorString, DWORD cBufSize) { - FIXME("(0x%08x,%p,0x%08x), stub!\n", uErrorValue, lpszErrorString, cBufSize); + FIXME("(0x%08x,%p,0x%08lx), stub!\n", uErrorValue, lpszErrorString, cBufSize); return 1; } DWORD WINAPI RasGetErrorStringW(UINT uErrorValue, LPWSTR lpszErrorString, DWORD cBufSize) { - FIXME("(0x%08x,%p,0x%08x), stub!\n", uErrorValue, lpszErrorString, cBufSize); + FIXME("(0x%08x,%p,0x%08lx), stub!\n", uErrorValue, lpszErrorString, cBufSize); return 1; } @@ -510,13 +510,13 @@ DWORD WINAPI RasSetCredentialsW(const WCHAR *phonebook, const WCHAR *entry, RASC DWORD WINAPI RasSetCustomAuthDataA(const char *phonebook, const char *entry, BYTE *authdata, DWORD size) { - FIXME("(%s,%s,%p,0x%08x), stub!\n", debugstr_a(phonebook), debugstr_a(entry), authdata, size); + FIXME("(%s,%s,%p,0x%08lx), stub!\n", debugstr_a(phonebook), debugstr_a(entry), authdata, size); return 0; } DWORD WINAPI RasSetCustomAuthDataW(const WCHAR *phonebook, const WCHAR *entry, BYTE *authdata, DWORD size) { - FIXME("(%s,%s,%p,0x%08x), stub!\n", debugstr_w(phonebook), debugstr_w(entry), authdata, size); + FIXME("(%s,%s,%p,0x%08lx), stub!\n", debugstr_w(phonebook), debugstr_w(entry), authdata, size); return 0; } @@ -538,7 +538,7 @@ DWORD WINAPI RasSetSubEntryPropertiesA(LPCSTR lpszPhonebook, LPCSTR lpszEntry, D LPRASSUBENTRYA lpRasSubEntry, DWORD dwcbRasSubEntry, LPBYTE lpbDeviceConfig, DWORD dwcbDeviceConfig) { - FIXME("(%s,%s,0x%08x,%p,0x%08x,%p,0x%08x), stub!\n", debugstr_a(lpszPhonebook), + FIXME("(%s,%s,0x%08lx,%p,0x%08lx,%p,0x%08lx), stub!\n", debugstr_a(lpszPhonebook), debugstr_a(lpszEntry), dwSubEntry, lpRasSubEntry, dwcbRasSubEntry, lpbDeviceConfig, dwcbDeviceConfig); return 0; @@ -548,7 +548,7 @@ DWORD WINAPI RasSetSubEntryPropertiesW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, LPRASSUBENTRYW lpRasSubEntry, DWORD dwcbRasSubEntry, LPBYTE lpbDeviceConfig, DWORD dwcbDeviceConfig) { - FIXME("(%s,%s,0x%08x,%p,0x%08x,%p,0x%08x), stub!\n", debugstr_w(lpszPhonebook), + FIXME("(%s,%s,0x%08lx,%p,0x%08lx,%p,0x%08lx), stub!\n", debugstr_w(lpszPhonebook), debugstr_w(lpszEntry), dwSubEntry, lpRasSubEntry, dwcbRasSubEntry, lpbDeviceConfig, dwcbDeviceConfig); return 0; @@ -556,7 +556,7 @@ DWORD WINAPI RasSetSubEntryPropertiesW(LPCWSTR lpszPhonebook, LPCWSTR lpszEntry, DWORD WINAPI RasGetLinkStatistics(HRASCONN connection, DWORD entry, RAS_STATS *statistics) { - FIXME("(%p,%u,%p), stub!\n", connection, entry, statistics); + FIXME("(%p,%lu,%p), stub!\n", connection, entry, statistics); return 0; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/riched20/Makefile.in | 1 dlls/riched20/caret.c | 2 dlls/riched20/clipboard.c | 20 +-- dlls/riched20/editor.c | 22 ++- dlls/riched20/para.c | 16 +- dlls/riched20/richole.c | 304 +++++++++++++++++++++++---------------------- dlls/riched20/run.c | 2 dlls/riched20/style.c | 4 - dlls/riched20/txthost.c | 16 +- dlls/riched20/txtsrv.c | 12 +- dlls/riched20/wrap.c | 6 - dlls/riched20/writer.c | 38 +++--- 12 files changed, 221 insertions(+), 222 deletions(-) diff --git a/dlls/riched20/Makefile.in b/dlls/riched20/Makefile.in index 8d6dde5dcd0..b64ee554690 100644 --- a/dlls/riched20/Makefile.in +++ b/dlls/riched20/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = riched20.dll IMPORTLIB = riched20 IMPORTS = uuid usp10 ole32 oleaut32 imm32 user32 gdi32 diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index cc5ce90ea42..6d32776e3d2 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1387,7 +1387,7 @@ void ME_SendSelChange(ME_TextEditor *editor) if (editor->nEventMask & ENM_SELCHANGE) { - TRACE("cpMin=%d cpMax=%d seltyp=%d (%s %s)\n", + TRACE("cpMin=%ld cpMax=%ld seltyp=%d (%s %s)\n", sc.chrg.cpMin, sc.chrg.cpMax, sc.seltyp, (sc.seltyp & SEL_TEXT) ? "SEL_TEXT" : "", (sc.seltyp & SEL_MULTICHAR) ? "SEL_MULTICHAR" : ""); diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c index 10a814214be..3a8440ffcd6 100644 --- a/dlls/riched20/clipboard.c +++ b/dlls/riched20/clipboard.c @@ -77,7 +77,7 @@ static ULONG WINAPI EnumFormatImpl_AddRef(IEnumFORMATETC *iface) { EnumFormatImpl *This = impl_from_IEnumFORMATETC(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -85,7 +85,7 @@ static ULONG WINAPI EnumFormatImpl_Release(IEnumFORMATETC *iface) { EnumFormatImpl *This = impl_from_IEnumFORMATETC(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { GlobalFree(This->fmtetc); @@ -100,7 +100,7 @@ static HRESULT WINAPI EnumFormatImpl_Next(IEnumFORMATETC *iface, ULONG celt, { EnumFormatImpl *This = impl_from_IEnumFORMATETC(iface); ULONG count = 0; - TRACE("(%p)->(%d %p %p)\n", This, celt, rgelt, pceltFetched); + TRACE("(%p)->(%ld %p %p)\n", This, celt, rgelt, pceltFetched); if(!rgelt) return E_INVALIDARG; @@ -119,7 +119,7 @@ static HRESULT WINAPI EnumFormatImpl_Skip(IEnumFORMATETC *iface, ULONG celt) { EnumFormatImpl *This = impl_from_IEnumFORMATETC(iface); ULONG count = 0; - TRACE("(%p)->(%d)\n", This, celt); + TRACE("(%p)->(%ld)\n", This, celt); count = min(celt, This->fmtetc_cnt-This->cur); This->cur += count; @@ -194,7 +194,7 @@ static ULONG WINAPI DataObjectImpl_AddRef(IDataObject* iface) { DataObjectImpl *This = impl_from_IDataObject(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -202,7 +202,7 @@ static ULONG WINAPI DataObjectImpl_Release(IDataObject* iface) { DataObjectImpl *This = impl_from_IDataObject(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n",This, ref); + TRACE("(%p) ref=%ld\n",This, ref); if(!ref) { if(This->unicode) GlobalFree(This->unicode); @@ -217,7 +217,7 @@ static ULONG WINAPI DataObjectImpl_Release(IDataObject* iface) static HRESULT WINAPI DataObjectImpl_GetData(IDataObject* iface, FORMATETC *pformatetc, STGMEDIUM *pmedium) { DataObjectImpl *This = impl_from_IDataObject(iface); - TRACE("(%p)->(fmt=0x%08x tym=0x%08x)\n", This, pformatetc->cfFormat, pformatetc->tymed); + TRACE("(%p)->(fmt=0x%08x tym=0x%08lx)\n", This, pformatetc->cfFormat, pformatetc->tymed); if(pformatetc->lindex != -1) return DV_E_LINDEX; @@ -250,7 +250,7 @@ static HRESULT WINAPI DataObjectImpl_QueryGetData(IDataObject* iface, FORMATETC DataObjectImpl *This = impl_from_IDataObject(iface); UINT i; BOOL foundFormat = FALSE; - TRACE("(%p)->(fmt=0x%08x tym=0x%08x)\n", This, pformatetc->cfFormat, pformatetc->tymed); + TRACE("(%p)->(fmt=0x%08x tym=0x%08lx)\n", This, pformatetc->cfFormat, pformatetc->tymed); if(pformatetc->lindex != -1) return DV_E_LINDEX; @@ -290,10 +290,10 @@ static HRESULT WINAPI DataObjectImpl_EnumFormatEtc(IDataObject* iface, DWORD dwD IEnumFORMATETC **ppenumFormatEtc) { DataObjectImpl *This = impl_from_IDataObject(iface); - TRACE("(%p)->(%d)\n", This, dwDirection); + TRACE("(%p)->(%ld)\n", This, dwDirection); if(dwDirection != DATADIR_GET) { - FIXME("Unsupported direction: %d\n", dwDirection); + FIXME("Unsupported direction: %ld\n", dwDirection); /* WinXP riched20 also returns E_NOTIMPL in this case */ *ppenumFormatEtc = NULL; return E_NOTIMPL; diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index ddf619870f1..a8cf3175591 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -293,7 +293,7 @@ static LRESULT ME_StreamInText(ME_TextEditor *editor, DWORD dwFormat, ME_InStrea static const char bom_utf8[] = {0xEF, 0xBB, 0xBF}; - TRACE("%08x %p\n", dwFormat, stream); + TRACE("%08lx %p\n", dwFormat, stream); do { LONG nWideChars = 0; @@ -1575,7 +1575,7 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre ME_Cursor *selStart, *selEnd; LRESULT num_read = 0; /* bytes read for SF_TEXT, non-control chars inserted for SF_RTF */ - TRACE("stream==%p editor==%p format==0x%X\n", stream, editor, format); + TRACE("stream==%p editor==%p format==0x%lX\n", stream, editor, format); editor->nEventMask = 0; ME_GetSelectionOfs(editor, &from, &to); @@ -1841,11 +1841,11 @@ ME_FindText(ME_TextEditor *editor, DWORD flags, const CHARRANGE *chrg, const WCH ME_Cursor cursor; WCHAR wLastChar = ' '; - TRACE("flags==0x%08x, chrg->cpMin==%d, chrg->cpMax==%d text==%s\n", + TRACE("flags==0x%08lx, chrg->cpMin==%ld, chrg->cpMax==%ld text==%s\n", flags, chrg->cpMin, chrg->cpMax, debugstr_w(text)); if (flags & ~(FR_DOWN | FR_MATCHCASE | FR_WHOLEWORD)) - FIXME("Flags 0x%08x not implemented\n", + FIXME("Flags 0x%08lx not implemented\n", flags & ~(FR_DOWN | FR_MATCHCASE | FR_WHOLEWORD)); nMin = chrg->cpMin; @@ -2084,7 +2084,7 @@ static int ME_GetTextEx(ME_TextEditor *editor, GETTEXTEX *ex, LPARAM pText) if (!ex->cb || !pText) return 0; if (ex->flags & ~(GT_SELECTION | GT_USECRLF)) - FIXME("GETTEXTEX flags 0x%08x not supported\n", ex->flags & ~(GT_SELECTION | GT_USECRLF)); + FIXME("GETTEXTEX flags 0x%08lx not supported\n", ex->flags & ~(GT_SELECTION | GT_USECRLF)); if (ex->flags & GT_SELECTION) { @@ -2284,7 +2284,7 @@ static BOOL paste_special(ME_TextEditor *editor, UINT cf, REPASTESPECIAL *ps, BO init_paste_formats(); if (ps && ps->dwAspect != DVASPECT_CONTENT) - FIXME("Ignoring aspect %x\n", ps->dwAspect); + FIXME("Ignoring aspect %lx\n", ps->dwAspect); hr = OleGetClipboard( &data ); if (hr != S_OK) return FALSE; @@ -3294,7 +3294,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, { CHARRANGE *pRange = (CHARRANGE *)lParam; ME_GetSelectionOfs(editor, &pRange->cpMin, &pRange->cpMax); - TRACE("EM_EXGETSEL = (%d,%d)\n", pRange->cpMin, pRange->cpMax); + TRACE("EM_EXGETSEL = (%ld,%ld)\n", pRange->cpMin, pRange->cpMax); return 0; } case EM_SETUNDOLIMIT: @@ -3407,7 +3407,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, bUnicode = !bRtf && pStruct->codepage == CP_UNICODE; bUTF8 = (lParam && (!strncmp((char *)lParam, utf8_bom, 3))); - TRACE("EM_SETTEXTEX - %s, flags %d, cp %d\n", + TRACE("EM_SETTEXTEX - %s, flags %ld, cp %d\n", bUnicode ? debugstr_w((LPCWSTR)lParam) : debugstr_a((LPCSTR)lParam), pStruct->flags, pStruct->codepage); @@ -3606,7 +3606,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, ME_InternalDeleteText(editor, &cursor, ME_GetTextLength(editor), FALSE); if (lParam) { - TRACE("WM_SETTEXT lParam==%lx\n",lParam); + TRACE("WM_SETTEXT lParam==%Ix\n",lParam); if (!strncmp((char *)lParam, "{\\rtf", 5) || !strncmp((char *)lParam, "{\\urtf", 6)) { @@ -3689,7 +3689,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, int nEnd = rng->chrg.cpMax; int textlength = ME_GetTextLength(editor); - TRACE( "EM_GETTEXTRANGE min = %d max = %d textlength = %d\n", rng->chrg.cpMin, rng->chrg.cpMax, textlength ); + TRACE( "EM_GETTEXTRANGE min = %ld max = %ld textlength = %d\n", rng->chrg.cpMin, rng->chrg.cpMax, textlength ); if (nStart < 0) return 0; if ((nStart == 0 && nEnd == -1) || nEnd > textlength) nEnd = textlength; @@ -3803,7 +3803,7 @@ LRESULT editor_handle_message( ME_TextEditor *editor, UINT msg, WPARAM wParam, start_ofs = ME_GetCursorOfs( &cursor ); row_end_cursor( row, &cursor, FALSE ); end_ofs = ME_GetCursorOfs( &cursor ); - TRACE( "EM_LINELENGTH(%ld)==%d\n", wParam, end_ofs - start_ofs ); + TRACE( "EM_LINELENGTH(%Id)==%d\n", wParam, end_ofs - start_ofs ); return end_ofs - start_ofs; } case EM_EXLIMITTEXT: diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 78148ae7793..166b1fcd45b 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -806,10 +806,10 @@ void ME_DumpParaStyleToBuf(const PARAFORMAT2 *pFmt, char buf[2048]) DUMP_EFFECT(PFM_RTLPARA, "RTL para:"); DUMP_EFFECT(PFM_SIDEBYSIDE, "Side by side:"); DUMP_EFFECT(PFM_TABLE, "Table:"); - DUMP(PFM_OFFSETINDENT, "Offset indent:", "%d", dxStartIndent); - DUMP(PFM_STARTINDENT, "Start indent:", "%d", dxStartIndent); - DUMP(PFM_RIGHTINDENT, "Right indent:", "%d", dxRightIndent); - DUMP(PFM_OFFSET, "Offset:", "%d", dxOffset); + DUMP(PFM_OFFSETINDENT, "Offset indent:", "%ld", dxStartIndent); + DUMP(PFM_STARTINDENT, "Start indent:", "%ld", dxStartIndent); + DUMP(PFM_RIGHTINDENT, "Right indent:", "%ld", dxRightIndent); + DUMP(PFM_OFFSET, "Offset:", "%ld", dxOffset); if (pFmt->dwMask & PFM_ALIGNMENT) { switch (pFmt->wAlignment) { case PFA_LEFT : p += sprintf(p, "Alignment: left\n"); break; @@ -824,12 +824,12 @@ void ME_DumpParaStyleToBuf(const PARAFORMAT2 *pFmt, char buf[2048]) if (pFmt->dwMask & PFM_TABSTOPS) { int i; p += sprintf(p, "\t"); - for (i = 0; i < pFmt->cTabCount; i++) p += sprintf(p, "%x ", pFmt->rgxTabs[i]); + for (i = 0; i < pFmt->cTabCount; i++) p += sprintf(p, "%lx ", pFmt->rgxTabs[i]); p += sprintf(p, "\n"); } - DUMP(PFM_SPACEBEFORE, "Space Before:", "%d", dySpaceBefore); - DUMP(PFM_SPACEAFTER, "Space After:", "%d", dySpaceAfter); - DUMP(PFM_LINESPACING, "Line spacing:", "%d", dyLineSpacing); + DUMP(PFM_SPACEBEFORE, "Space Before:", "%ld", dySpaceBefore); + DUMP(PFM_SPACEAFTER, "Space After:", "%ld", dySpaceAfter); + DUMP(PFM_LINESPACING, "Line spacing:", "%ld", dyLineSpacing); DUMP(PFM_STYLE, "Text style:", "%d", sStyle); DUMP(PFM_LINESPACING, "Line spacing rule:", "%u", bLineSpacingRule); /* bOutlineLevel should be 0 */ diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 47194096bdc..74a25a96830 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -82,7 +82,7 @@ static HRESULT load_typelib(void) hr = LoadRegTypeLib(&LIBID_tom, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); if (FAILED(hr)) { - ERR("LoadRegTypeLib failed: %08x\n", hr); + ERR("LoadRegTypeLib failed: %08lx\n", hr); return hr; } @@ -121,7 +121,7 @@ static HRESULT get_typeinfo(enum tid_t tid, ITypeInfo **typeinfo) hr = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); if (FAILED(hr)) { - ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hr); + ERR("GetTypeInfoOfGuid(%s) failed: %08lx\n", debugstr_guid(tid_ids[tid]), hr); return hr; } @@ -889,7 +889,7 @@ static HRESULT textrange_expand(ITextRange *range, LONG unit, LONG *delta) ITextRange_GetStoryLength(range, &expand_end); break; default: - FIXME("unit %d is not supported\n", unit); + FIXME("unit %ld is not supported\n", unit); return E_NOTIMPL; } @@ -984,7 +984,7 @@ static ULONG WINAPI IOleClientSite_fnAddRef(IOleClientSite *iface) { IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); return ref; } @@ -993,7 +993,7 @@ static ULONG WINAPI IOleClientSite_fnRelease(IOleClientSite *iface) IOleClientSiteImpl *This = impl_from_IOleClientSite(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); if (ref == 0) { if (This->child.reole) { @@ -1249,7 +1249,7 @@ IRichEditOle_fnGetClipboardData(IRichEditOle *iface, CHARRANGE *lpchrg, ME_Cursor start; int nChars; - TRACE("(%p,%p,%d)\n", services, lpchrg, reco); + TRACE("(%p,%p,%ld)\n", services, lpchrg, reco); if(!lplpdataobj) return E_INVALIDARG; if(!lpchrg) @@ -1282,7 +1282,7 @@ IRichEditOle_fnGetObject(IRichEditOle *iface, LONG iob, struct re_object *reobj = NULL; LONG count = 0; - TRACE("(%p)->(%x, %p, %x)\n", services, iob, lpreobject, dwFlags); + TRACE("(%p)->(%lx, %p, %lx)\n", services, iob, lpreobject, dwFlags); if (!lpreobject || !lpreobject->cbStruct) return E_INVALIDARG; @@ -1291,7 +1291,7 @@ IRichEditOle_fnGetObject(IRichEditOle *iface, LONG iob, { ME_Cursor cursor; - TRACE("character offset: %d\n", lpreobject->cp); + TRACE("character offset: %ld\n", lpreobject->cp); cursor_from_char_ofs( services->editor, lpreobject->cp, &cursor ); if (!cursor.run->reobj) return E_INVALIDARG; @@ -1463,7 +1463,7 @@ static ULONG WINAPI ITextRange_fnRelease(ITextRange *me) ITextRangeImpl *This = impl_from_ITextRange(me); ULONG ref = InterlockedDecrement(&This->ref); - TRACE ("%p ref=%u\n", This, ref); + TRACE ("%p ref=%lu\n", This, ref); if (ref == 0) { if (This->child.reole) @@ -1490,7 +1490,7 @@ static HRESULT WINAPI ITextRange_fnGetTypeInfo(ITextRange *me, UINT iTInfo, LCID ITextRangeImpl *This = impl_from_ITextRange(me); HRESULT hr; - TRACE("(%p)->(%u,%d,%p)\n", This, iTInfo, lcid, ppTInfo); + TRACE("(%p)->(%u,%ld,%p)\n", This, iTInfo, lcid, ppTInfo); hr = get_typeinfo(ITextRange_tid, ppTInfo); if (SUCCEEDED(hr)) @@ -1505,7 +1505,7 @@ static HRESULT WINAPI ITextRange_fnGetIDsOfNames(ITextRange *me, REFIID riid, LP ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, + TRACE("(%p)->(%s, %p, %u, %ld, %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(ITextRange_tid, &ti); @@ -1523,7 +1523,7 @@ static HRESULT WINAPI ITextRange_fnInvoke(ITextRange *me, DISPID dispIdMember, R ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%d, %s, %d, %u, %p, %p, %p, %p)\n", This, dispIdMember, debugstr_guid(riid), + TRACE("(%p)->(%ld, %s, %ld, %u, %p, %p, %p, %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(ITextRange_tid, &ti); @@ -1647,7 +1647,7 @@ static HRESULT WINAPI ITextRange_fnSetChar(ITextRange *me, LONG ch) { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%x): stub\n", This, ch); + FIXME("(%p)->(%lx): stub\n", This, ch); if (!This->child.reole) return CO_E_RELEASED; @@ -1736,7 +1736,7 @@ static HRESULT WINAPI ITextRange_fnSetStart(ITextRange *me, LONG value) { ITextRangeImpl *This = impl_from_ITextRange(me); - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); if (!This->child.reole) return CO_E_RELEASED; @@ -1781,7 +1781,7 @@ static HRESULT WINAPI ITextRange_fnSetEnd(ITextRange *me, LONG value) { ITextRangeImpl *This = impl_from_ITextRange(me); - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); if (!This->child.reole) return CO_E_RELEASED; @@ -1891,7 +1891,7 @@ static HRESULT WINAPI ITextRange_fnCollapse(ITextRange *me, LONG bStart) { ITextRangeImpl *This = impl_from_ITextRange(me); - TRACE("(%p)->(%d)\n", This, bStart); + TRACE("(%p)->(%ld)\n", This, bStart); if (!This->child.reole) return CO_E_RELEASED; @@ -1903,7 +1903,7 @@ static HRESULT WINAPI ITextRange_fnExpand(ITextRange *me, LONG unit, LONG *delta { ITextRangeImpl *This = impl_from_ITextRange(me); - TRACE("(%p)->(%d %p)\n", This, unit, delta); + TRACE("(%p)->(%ld %p)\n", This, unit, delta); if (!This->child.reole) return CO_E_RELEASED; @@ -1915,7 +1915,7 @@ static HRESULT WINAPI ITextRange_fnGetIndex(ITextRange *me, LONG unit, LONG *ind { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%d %p): stub\n", This, unit, index); + FIXME("(%p)->(%ld %p): stub\n", This, unit, index); if (!This->child.reole) return CO_E_RELEASED; @@ -1928,7 +1928,7 @@ static HRESULT WINAPI ITextRange_fnSetIndex(ITextRange *me, LONG unit, LONG inde { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%d %d %d): stub\n", This, unit, index, extend); + FIXME("(%p)->(%ld %ld %ld): stub\n", This, unit, index, extend); if (!This->child.reole) return CO_E_RELEASED; @@ -1958,7 +1958,7 @@ static HRESULT WINAPI ITextRange_fnSetRange(ITextRange *me, LONG anchor, LONG ac { ITextRangeImpl *This = impl_from_ITextRange(me); - TRACE("(%p)->(%d %d)\n", This, anchor, active); + TRACE("(%p)->(%ld %ld)\n", This, anchor, active); if (!This->child.reole) return CO_E_RELEASED; @@ -2089,7 +2089,7 @@ static HRESULT textrange_startof(ITextRange *range, LONG unit, LONG extend, LONG break; } default: - FIXME("unit %d is not supported\n", unit); + FIXME("unit %ld is not supported\n", unit); return E_NOTIMPL; } return hr; @@ -2100,7 +2100,7 @@ static HRESULT WINAPI ITextRange_fnStartOf(ITextRange *me, LONG unit, LONG exten { ITextRangeImpl *This = impl_from_ITextRange(me); - TRACE("(%p)->(%d %d %p)\n", This, unit, extend, delta); + TRACE("(%p)->(%ld %ld %p)\n", This, unit, extend, delta); if (!This->child.reole) return CO_E_RELEASED; @@ -2142,7 +2142,7 @@ static HRESULT textrange_endof(ITextRange *range, ME_TextEditor *editor, LONG un break; } default: - FIXME("unit %d is not supported\n", unit); + FIXME("unit %ld is not supported\n", unit); return E_NOTIMPL; } return hr; @@ -2153,7 +2153,7 @@ static HRESULT WINAPI ITextRange_fnEndOf(ITextRange *me, LONG unit, LONG extend, { ITextRangeImpl *This = impl_from_ITextRange(me); - TRACE("(%p)->(%d %d %p)\n", This, unit, extend, delta); + TRACE("(%p)->(%ld %ld %p)\n", This, unit, extend, delta); if (!This->child.reole) return CO_E_RELEASED; @@ -2216,7 +2216,7 @@ static HRESULT textrange_move(ITextRange *range, ME_TextEditor *editor, LONG uni break; } default: - FIXME("unit %d is not supported\n", unit); + FIXME("unit %ld is not supported\n", unit); return E_NOTIMPL; } if (moved == 0) @@ -2231,7 +2231,7 @@ static HRESULT WINAPI ITextRange_fnMove(ITextRange *me, LONG unit, LONG count, L { ITextRangeImpl *This = impl_from_ITextRange(me); - TRACE("(%p)->(%d %d %p)\n", This, unit, count, delta); + TRACE("(%p)->(%ld %ld %p)\n", This, unit, count, delta); if (!This->child.reole) return CO_E_RELEASED; @@ -2271,7 +2271,7 @@ static HRESULT textrange_movestart(ITextRange *range, ME_TextEditor *editor, LON break; } default: - FIXME("unit %d is not supported\n", unit); + FIXME("unit %ld is not supported\n", unit); return E_NOTIMPL; } if (new_start == old_start) @@ -2287,7 +2287,7 @@ static HRESULT WINAPI ITextRange_fnMoveStart(ITextRange *me, LONG unit, LONG cou { ITextRangeImpl *This = impl_from_ITextRange(me); - TRACE("(%p)->(%d %d %p)\n", This, unit, count, delta); + TRACE("(%p)->(%ld %ld %p)\n", This, unit, count, delta); if (!This->child.reole) return CO_E_RELEASED; @@ -2345,7 +2345,7 @@ static HRESULT textrange_moveend(ITextRange *range, ME_TextEditor *editor, LONG } break; default: - FIXME("unit %d is not supported\n", unit); + FIXME("unit %ld is not supported\n", unit); return E_NOTIMPL; } if (new_end == old_end) @@ -2361,7 +2361,7 @@ static HRESULT WINAPI ITextRange_fnMoveEnd(ITextRange *me, LONG unit, LONG count { ITextRangeImpl *This = impl_from_ITextRange(me); - TRACE("(%p)->(%d %d %p)\n", This, unit, count, delta); + TRACE("(%p)->(%ld %ld %p)\n", This, unit, count, delta); if (!This->child.reole) return CO_E_RELEASED; @@ -2374,7 +2374,7 @@ static HRESULT WINAPI ITextRange_fnMoveWhile(ITextRange *me, VARIANT *charset, L { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%s %d %p): stub\n", This, debugstr_variant(charset), count, delta); + FIXME("(%p)->(%s %ld %p): stub\n", This, debugstr_variant(charset), count, delta); if (!This->child.reole) return CO_E_RELEASED; @@ -2387,7 +2387,7 @@ static HRESULT WINAPI ITextRange_fnMoveStartWhile(ITextRange *me, VARIANT *chars { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%s %d %p): stub\n", This, debugstr_variant(charset), count, delta); + FIXME("(%p)->(%s %ld %p): stub\n", This, debugstr_variant(charset), count, delta); if (!This->child.reole) return CO_E_RELEASED; @@ -2400,7 +2400,7 @@ static HRESULT WINAPI ITextRange_fnMoveEndWhile(ITextRange *me, VARIANT *charset { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%s %d %p): stub\n", This, debugstr_variant(charset), count, delta); + FIXME("(%p)->(%s %ld %p): stub\n", This, debugstr_variant(charset), count, delta); if (!This->child.reole) return CO_E_RELEASED; @@ -2413,7 +2413,7 @@ static HRESULT WINAPI ITextRange_fnMoveUntil(ITextRange *me, VARIANT *charset, L { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%s %d %p): stub\n", This, debugstr_variant(charset), count, delta); + FIXME("(%p)->(%s %ld %p): stub\n", This, debugstr_variant(charset), count, delta); if (!This->child.reole) return CO_E_RELEASED; @@ -2426,7 +2426,7 @@ static HRESULT WINAPI ITextRange_fnMoveStartUntil(ITextRange *me, VARIANT *chars { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%s %d %p): stub\n", This, debugstr_variant(charset), count, delta); + FIXME("(%p)->(%s %ld %p): stub\n", This, debugstr_variant(charset), count, delta); if (!This->child.reole) return CO_E_RELEASED; @@ -2439,7 +2439,7 @@ static HRESULT WINAPI ITextRange_fnMoveEndUntil(ITextRange *me, VARIANT *charset { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%s %d %p): stub\n", This, debugstr_variant(charset), count, delta); + FIXME("(%p)->(%s %ld %p): stub\n", This, debugstr_variant(charset), count, delta); if (!This->child.reole) return CO_E_RELEASED; @@ -2452,7 +2452,7 @@ static HRESULT WINAPI ITextRange_fnFindText(ITextRange *me, BSTR text, LONG coun { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%s %d %x %p): stub\n", This, debugstr_w(text), count, flags, length); + FIXME("(%p)->(%s %ld %lx %p): stub\n", This, debugstr_w(text), count, flags, length); if (!This->child.reole) return CO_E_RELEASED; @@ -2465,7 +2465,7 @@ static HRESULT WINAPI ITextRange_fnFindTextStart(ITextRange *me, BSTR text, LONG { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%s %d %x %p): stub\n", This, debugstr_w(text), count, flags, length); + FIXME("(%p)->(%s %ld %lx %p): stub\n", This, debugstr_w(text), count, flags, length); if (!This->child.reole) return CO_E_RELEASED; @@ -2478,7 +2478,7 @@ static HRESULT WINAPI ITextRange_fnFindTextEnd(ITextRange *me, BSTR text, LONG c { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%s %d %x %p): stub\n", This, debugstr_w(text), count, flags, length); + FIXME("(%p)->(%s %ld %lx %p): stub\n", This, debugstr_w(text), count, flags, length); if (!This->child.reole) return CO_E_RELEASED; @@ -2490,7 +2490,7 @@ static HRESULT WINAPI ITextRange_fnDelete(ITextRange *me, LONG unit, LONG count, { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%d %d %p): stub\n", This, unit, count, delta); + FIXME("(%p)->(%ld %ld %p): stub\n", This, unit, count, delta); if (!This->child.reole) return CO_E_RELEASED; @@ -2551,7 +2551,7 @@ static HRESULT WINAPI ITextRange_fnPaste(ITextRange *me, VARIANT *v, LONG format { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%s %x): stub\n", This, debugstr_variant(v), format); + FIXME("(%p)->(%s %lx): stub\n", This, debugstr_variant(v), format); if (!This->child.reole) return CO_E_RELEASED; @@ -2563,7 +2563,7 @@ static HRESULT WINAPI ITextRange_fnCanPaste(ITextRange *me, VARIANT *v, LONG for { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%s %x %p): stub\n", This, debugstr_variant(v), format, ret); + FIXME("(%p)->(%s %lx %p): stub\n", This, debugstr_variant(v), format, ret); if (!This->child.reole) return CO_E_RELEASED; @@ -2587,7 +2587,7 @@ static HRESULT WINAPI ITextRange_fnChangeCase(ITextRange *me, LONG type) { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%d): stub\n", This, type); + FIXME("(%p)->(%ld): stub\n", This, type); if (!This->child.reole) return CO_E_RELEASED; @@ -2599,7 +2599,7 @@ static HRESULT WINAPI ITextRange_fnGetPoint(ITextRange *me, LONG type, LONG *cx, { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%d %p %p): stub\n", This, type, cx, cy); + FIXME("(%p)->(%ld %p %p): stub\n", This, type, cx, cy); if (!This->child.reole) return CO_E_RELEASED; @@ -2612,7 +2612,7 @@ static HRESULT WINAPI ITextRange_fnSetPoint(ITextRange *me, LONG x, LONG y, LONG { ITextRangeImpl *This = impl_from_ITextRange(me); - FIXME("(%p)->(%d %d %d %d): stub\n", This, x, y, type, extend); + FIXME("(%p)->(%ld %ld %ld %ld): stub\n", This, x, y, type, extend); if (!This->child.reole) return CO_E_RELEASED; @@ -2627,7 +2627,7 @@ static HRESULT WINAPI ITextRange_fnScrollIntoView(ITextRange *me, LONG value) ME_Cursor cursor; int x, y, height; - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); if (!This->child.reole) return CO_E_RELEASED; @@ -2645,7 +2645,7 @@ static HRESULT WINAPI ITextRange_fnScrollIntoView(ITextRange *me, LONG value) cursor_coords( editor, &cursor, &x, &y, &height ); break; default: - FIXME("bStart value %d not handled\n", value); + FIXME("bStart value %ld not handled\n", value); return E_NOTIMPL; } scroll_abs( editor, x, y, TRUE ); @@ -2749,7 +2749,7 @@ static ULONG WINAPI TextFont_AddRef(ITextFont *iface) { ITextFontImpl *This = impl_from_ITextFont(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); return ref; } @@ -2758,7 +2758,7 @@ static ULONG WINAPI TextFont_Release(ITextFont *iface) ITextFontImpl *This = impl_from_ITextFont(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); if (!ref) { @@ -2785,7 +2785,7 @@ static HRESULT WINAPI TextFont_GetTypeInfo(ITextFont *iface, UINT iTInfo, LCID l ITextFontImpl *This = impl_from_ITextFont(iface); HRESULT hr; - TRACE("(%p)->(%u,%d,%p)\n", This, iTInfo, lcid, ppTInfo); + TRACE("(%p)->(%u,%ld,%p)\n", This, iTInfo, lcid, ppTInfo); hr = get_typeinfo(ITextFont_tid, ppTInfo); if (SUCCEEDED(hr)) @@ -2800,7 +2800,7 @@ static HRESULT WINAPI TextFont_GetIDsOfNames(ITextFont *iface, REFIID riid, ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), + TRACE("(%p)->(%s, %p, %u, %ld, %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(ITextFont_tid, &ti); @@ -2824,7 +2824,7 @@ static HRESULT WINAPI TextFont_Invoke( ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%d, %s, %d, %u, %p, %p, %p, %p)\n", This, dispIdMember, debugstr_guid(riid), + TRACE("(%p)->(%ld, %s, %ld, %u, %p, %p, %p, %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(ITextFont_tid, &ti); @@ -2974,7 +2974,7 @@ static HRESULT WINAPI TextFont_Reset(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); /* If font is attached to a range, released or not, we can't reset to undefined */ @@ -3004,7 +3004,7 @@ static HRESULT WINAPI TextFont_Reset(ITextFont *iface, LONG value) case tomUseTwips: return E_INVALIDARG; default: - FIXME("reset mode %d not supported\n", value); + FIXME("reset mode %ld not supported\n", value); } return S_OK; @@ -3031,7 +3031,7 @@ static HRESULT WINAPI TextFont_Reset(ITextFont *iface, LONG value) } } - FIXME("reset mode %d not supported\n", value); + FIXME("reset mode %ld not supported\n", value); return E_NOTIMPL; } @@ -3045,7 +3045,7 @@ static HRESULT WINAPI TextFont_GetStyle(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetStyle(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - FIXME("(%p)->(%d): stub\n", This, value); + FIXME("(%p)->(%ld): stub\n", This, value); return E_NOTIMPL; } @@ -3059,7 +3059,7 @@ static HRESULT WINAPI TextFont_GetAllCaps(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetAllCaps(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); return set_textfont_propd(This, FONT_ALLCAPS, value); } @@ -3074,7 +3074,7 @@ static HRESULT WINAPI TextFont_SetAnimation(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); if (value < tomNoAnimation || value > tomAnimationMax) return E_INVALIDARG; @@ -3092,7 +3092,7 @@ static HRESULT WINAPI TextFont_GetBackColor(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetBackColor(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); return set_textfont_propl(This, FONT_BACKCOLOR, value); } @@ -3106,7 +3106,7 @@ static HRESULT WINAPI TextFont_GetBold(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetBold(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); return set_textfont_propd(This, FONT_BOLD, value); } @@ -3120,7 +3120,7 @@ static HRESULT WINAPI TextFont_GetEmboss(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetEmboss(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); return set_textfont_propd(This, FONT_EMBOSS, value); } @@ -3134,7 +3134,7 @@ static HRESULT WINAPI TextFont_GetForeColor(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetForeColor(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); return set_textfont_propl(This, FONT_FORECOLOR, value); } @@ -3148,7 +3148,7 @@ static HRESULT WINAPI TextFont_GetHidden(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetHidden(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); return set_textfont_propd(This, FONT_HIDDEN, value); } @@ -3162,7 +3162,7 @@ static HRESULT WINAPI TextFont_GetEngrave(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetEngrave(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); return set_textfont_propd(This, FONT_ENGRAVE, value); } @@ -3176,7 +3176,7 @@ static HRESULT WINAPI TextFont_GetItalic(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetItalic(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); return set_textfont_propd(This, FONT_ITALIC, value); } @@ -3204,7 +3204,7 @@ static HRESULT WINAPI TextFont_GetLanguageID(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetLanguageID(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); return set_textfont_propl(This, FONT_LANGID, value); } @@ -3251,7 +3251,7 @@ static HRESULT WINAPI TextFont_GetOutline(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetOutline(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); return set_textfont_propd(This, FONT_OUTLINE, value); } @@ -3279,7 +3279,7 @@ static HRESULT WINAPI TextFont_GetProtected(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetProtected(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); return set_textfont_propd(This, FONT_PROTECTED, value); } @@ -3293,7 +3293,7 @@ static HRESULT WINAPI TextFont_GetShadow(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetShadow(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); return set_textfont_propd(This, FONT_SHADOW, value); } @@ -3321,7 +3321,7 @@ static HRESULT WINAPI TextFont_GetSmallCaps(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetSmallCaps(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); return set_textfont_propd(This, FONT_SMALLCAPS, value); } @@ -3349,7 +3349,7 @@ static HRESULT WINAPI TextFont_GetStrikeThrough(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetStrikeThrough(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); return set_textfont_propd(This, FONT_STRIKETHROUGH, value); } @@ -3363,7 +3363,7 @@ static HRESULT WINAPI TextFont_GetSubscript(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetSubscript(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); return set_textfont_propd(This, FONT_SUBSCRIPT, value); } @@ -3377,7 +3377,7 @@ static HRESULT WINAPI TextFont_GetSuperscript(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetSuperscript(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); return set_textfont_propd(This, FONT_SUPERSCRIPT, value); } @@ -3391,7 +3391,7 @@ static HRESULT WINAPI TextFont_GetUnderline(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetUnderline(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); return set_textfont_propd(This, FONT_UNDERLINE, value); } @@ -3405,7 +3405,7 @@ static HRESULT WINAPI TextFont_GetWeight(ITextFont *iface, LONG *value) static HRESULT WINAPI TextFont_SetWeight(ITextFont *iface, LONG value) { ITextFontImpl *This = impl_from_ITextFont(iface); - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); return set_textfont_propl(This, FONT_WEIGHT, value); } @@ -3532,7 +3532,7 @@ static ULONG WINAPI TextPara_AddRef(ITextPara *iface) { ITextParaImpl *This = impl_from_ITextPara(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); return ref; } @@ -3541,7 +3541,7 @@ static ULONG WINAPI TextPara_Release(ITextPara *iface) ITextParaImpl *This = impl_from_ITextPara(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); if (!ref) { @@ -3566,7 +3566,7 @@ static HRESULT WINAPI TextPara_GetTypeInfo(ITextPara *iface, UINT iTInfo, LCID l ITextParaImpl *This = impl_from_ITextPara(iface); HRESULT hr; - TRACE("(%p)->(%u,%d,%p)\n", This, iTInfo, lcid, ppTInfo); + TRACE("(%p)->(%u,%ld,%p)\n", This, iTInfo, lcid, ppTInfo); hr = get_typeinfo(ITextPara_tid, ppTInfo); if (SUCCEEDED(hr)) @@ -3581,7 +3581,7 @@ static HRESULT WINAPI TextPara_GetIDsOfNames(ITextPara *iface, REFIID riid, ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), rgszNames, + TRACE("(%p)->(%s, %p, %u, %ld, %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(ITextPara_tid, &ti); @@ -3605,7 +3605,7 @@ static HRESULT WINAPI TextPara_Invoke( ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%d, %s, %d, %u, %p, %p, %p, %p)\n", This, dispIdMember, + TRACE("(%p)->(%ld, %s, %ld, %u, %p, %p, %p, %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); @@ -3646,7 +3646,7 @@ static HRESULT WINAPI TextPara_IsEqual(ITextPara *iface, ITextPara *para, LONG * static HRESULT WINAPI TextPara_Reset(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); - FIXME("(%p)->(%d)\n", This, value); + FIXME("(%p)->(%ld)\n", This, value); return E_NOTIMPL; } @@ -3660,7 +3660,7 @@ static HRESULT WINAPI TextPara_GetStyle(ITextPara *iface, LONG *value) static HRESULT WINAPI TextPara_SetStyle(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); - FIXME("(%p)->(%d)\n", This, value); + FIXME("(%p)->(%ld)\n", This, value); return E_NOTIMPL; } @@ -3674,7 +3674,7 @@ static HRESULT WINAPI TextPara_GetAlignment(ITextPara *iface, LONG *value) static HRESULT WINAPI TextPara_SetAlignment(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); - FIXME("(%p)->(%d)\n", This, value); + FIXME("(%p)->(%ld)\n", This, value); return E_NOTIMPL; } @@ -3688,7 +3688,7 @@ static HRESULT WINAPI TextPara_GetHyphenation(ITextPara *iface, LONG *value) static HRESULT WINAPI TextPara_SetHyphenation(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); - FIXME("(%p)->(%d)\n", This, value); + FIXME("(%p)->(%ld)\n", This, value); return E_NOTIMPL; } @@ -3709,7 +3709,7 @@ static HRESULT WINAPI TextPara_GetKeepTogether(ITextPara *iface, LONG *value) static HRESULT WINAPI TextPara_SetKeepTogether(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); - FIXME("(%p)->(%d)\n", This, value); + FIXME("(%p)->(%ld)\n", This, value); return E_NOTIMPL; } @@ -3723,7 +3723,7 @@ static HRESULT WINAPI TextPara_GetKeepWithNext(ITextPara *iface, LONG *value) static HRESULT WINAPI TextPara_SetKeepWithNext(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); - FIXME("(%p)->(%d)\n", This, value); + FIXME("(%p)->(%ld)\n", This, value); return E_NOTIMPL; } @@ -3758,7 +3758,7 @@ static HRESULT WINAPI TextPara_GetListAlignment(ITextPara *iface, LONG *value) static HRESULT WINAPI TextPara_SetListAlignment(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); - FIXME("(%p)->(%d)\n", This, value); + FIXME("(%p)->(%ld)\n", This, value); return E_NOTIMPL; } @@ -3772,7 +3772,7 @@ static HRESULT WINAPI TextPara_GetListLevelIndex(ITextPara *iface, LONG *value) static HRESULT WINAPI TextPara_SetListLevelIndex(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); - FIXME("(%p)->(%d)\n", This, value); + FIXME("(%p)->(%ld)\n", This, value); return E_NOTIMPL; } @@ -3786,7 +3786,7 @@ static HRESULT WINAPI TextPara_GetListStart(ITextPara *iface, LONG *value) static HRESULT WINAPI TextPara_SetListStart(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); - FIXME("(%p)->(%d)\n", This, value); + FIXME("(%p)->(%ld)\n", This, value); return E_NOTIMPL; } @@ -3814,7 +3814,7 @@ static HRESULT WINAPI TextPara_GetListType(ITextPara *iface, LONG *value) static HRESULT WINAPI TextPara_SetListType(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); - FIXME("(%p)->(%d)\n", This, value); + FIXME("(%p)->(%ld)\n", This, value); return E_NOTIMPL; } @@ -3828,7 +3828,7 @@ static HRESULT WINAPI TextPara_GetNoLineNumber(ITextPara *iface, LONG *value) static HRESULT WINAPI TextPara_SetNoLineNumber(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); - FIXME("(%p)->(%d)\n", This, value); + FIXME("(%p)->(%ld)\n", This, value); return E_NOTIMPL; } @@ -3842,7 +3842,7 @@ static HRESULT WINAPI TextPara_GetPageBreakBefore(ITextPara *iface, LONG *value) static HRESULT WINAPI TextPara_SetPageBreakBefore(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); - FIXME("(%p)->(%d)\n", This, value); + FIXME("(%p)->(%ld)\n", This, value); return E_NOTIMPL; } @@ -3870,7 +3870,7 @@ static HRESULT WINAPI TextPara_SetIndents(ITextPara *iface, FLOAT StartIndent, F static HRESULT WINAPI TextPara_SetLineSpacing(ITextPara *iface, LONG LineSpacingRule, FLOAT LineSpacing) { ITextParaImpl *This = impl_from_ITextPara(iface); - FIXME("(%p)->(%d %.2f)\n", This, LineSpacingRule, LineSpacing); + FIXME("(%p)->(%ld %.2f)\n", This, LineSpacingRule, LineSpacing); return E_NOTIMPL; } @@ -3912,7 +3912,7 @@ static HRESULT WINAPI TextPara_GetWidowControl(ITextPara *iface, LONG *value) static HRESULT WINAPI TextPara_SetWidowControl(ITextPara *iface, LONG value) { ITextParaImpl *This = impl_from_ITextPara(iface); - FIXME("(%p)->(%d)\n", This, value); + FIXME("(%p)->(%ld)\n", This, value); return E_NOTIMPL; } @@ -3926,7 +3926,7 @@ static HRESULT WINAPI TextPara_GetTabCount(ITextPara *iface, LONG *value) static HRESULT WINAPI TextPara_AddTab(ITextPara *iface, FLOAT tbPos, LONG tbAlign, LONG tbLeader) { ITextParaImpl *This = impl_from_ITextPara(iface); - FIXME("(%p)->(%.2f %d %d)\n", This, tbPos, tbAlign, tbLeader); + FIXME("(%p)->(%.2f %ld %ld)\n", This, tbPos, tbAlign, tbLeader); return E_NOTIMPL; } @@ -3947,7 +3947,7 @@ static HRESULT WINAPI TextPara_DeleteTab(ITextPara *iface, FLOAT pos) static HRESULT WINAPI TextPara_GetTab(ITextPara *iface, LONG iTab, FLOAT *ptbPos, LONG *ptbAlign, LONG *ptbLeader) { ITextParaImpl *This = impl_from_ITextPara(iface); - FIXME("(%p)->(%d %p %p %p)\n", This, iTab, ptbPos, ptbAlign, ptbLeader); + FIXME("(%p)->(%ld %p %p %p)\n", This, iTab, ptbPos, ptbAlign, ptbLeader); return E_NOTIMPL; } @@ -4062,7 +4062,7 @@ static HRESULT WINAPI ITextDocument2Old_fnGetTypeInfo(ITextDocument2Old *iface, struct text_services *services = impl_from_ITextDocument2Old(iface); HRESULT hr; - TRACE("(%p)->(%u,%d,%p)\n", services, iTInfo, lcid, ppTInfo); + TRACE("(%p)->(%u,%ld,%p)\n", services, iTInfo, lcid, ppTInfo); hr = get_typeinfo(ITextDocument_tid, ppTInfo); if (SUCCEEDED(hr)) @@ -4078,7 +4078,7 @@ static HRESULT WINAPI ITextDocument2Old_fnGetIDsOfNames(ITextDocument2Old *iface ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%s, %p, %u, %d, %p)\n", services, debugstr_guid(riid), + TRACE("(%p)->(%s, %p, %u, %ld, %p)\n", services, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(ITextDocument_tid, &ti); @@ -4096,7 +4096,7 @@ static HRESULT WINAPI ITextDocument2Old_fnInvoke(ITextDocument2Old *iface, DISPI ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%d, %s, %d, %u, %p, %p, %p, %p)\n", services, dispIdMember, + TRACE("(%p)->(%ld, %s, %ld, %u, %p, %p, %p, %p)\n", services, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); @@ -4266,7 +4266,7 @@ static HRESULT WINAPI ITextDocument2Old_fnRange(ITextDocument2Old *iface, LONG c { struct text_services *services = impl_from_ITextDocument2Old(iface); - TRACE("%p %p %d %d\n", services, ppRange, cp1, cp2); + TRACE("%p %p %ld %ld\n", services, ppRange, cp1, cp2); if (!ppRange) return E_INVALIDARG; @@ -4296,7 +4296,7 @@ static HRESULT WINAPI ITextDocument2Old_fnSetEffectColor(ITextDocument2Old *ifac { struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(%d, 0x%x): stub\n", services, index, cr); + FIXME("(%p)->(%ld, 0x%lx): stub\n", services, index, cr); return E_NOTIMPL; } @@ -4305,7 +4305,7 @@ static HRESULT WINAPI ITextDocument2Old_fnGetEffectColor(ITextDocument2Old *ifac { struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(%d, %p): stub\n", services, index, cr); + FIXME("(%p)->(%ld, %p): stub\n", services, index, cr); return E_NOTIMPL; } @@ -4323,7 +4323,7 @@ static HRESULT WINAPI ITextDocument2Old_fnSetCaretType(ITextDocument2Old *iface, { struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(%d): stub\n", services, type); + FIXME("(%p)->(%ld): stub\n", services, type); return E_NOTIMPL; } @@ -4341,7 +4341,7 @@ static HRESULT WINAPI ITextDocument2Old_fnReleaseImmContext(ITextDocument2Old *i { struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(%d): stub\n", services, context); + FIXME("(%p)->(%ld): stub\n", services, context); return E_NOTIMPL; } @@ -4352,7 +4352,7 @@ static HRESULT WINAPI ITextDocument2Old_fnGetPreferredFont(ITextDocument2Old *if { struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(%d, %d, %d, %d, %d, %p, %p, %p): stub\n", services, cp, charrep, options, current_charrep, + FIXME("(%p)->(%ld, %ld, %ld, %ld, %ld, %p, %p, %p): stub\n", services, cp, charrep, options, current_charrep, current_fontsize, bstr, pitch_family, new_fontsize); return E_NOTIMPL; @@ -4371,7 +4371,7 @@ static HRESULT WINAPI ITextDocument2Old_fnSetNotificationMode(ITextDocument2Old { struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(0x%x): stub\n", services, mode); + FIXME("(%p)->(0x%lx): stub\n", services, mode); return E_NOTIMPL; } @@ -4381,7 +4381,7 @@ static HRESULT WINAPI ITextDocument2Old_fnGetClientRect(ITextDocument2Old *iface { struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(%d, %p, %p, %p, %p): stub\n", services, type, left, top, right, bottom); + FIXME("(%p)->(%ld, %p, %p, %p, %p): stub\n", services, type, left, top, right, bottom); return E_NOTIMPL; } @@ -4426,7 +4426,7 @@ static HRESULT WINAPI ITextDocument2Old_fnCheckTextLimit(ITextDocument2Old *ifac { struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(%d, %p): stub\n", services, cch, exceed); + FIXME("(%p)->(%ld, %p): stub\n", services, cch, exceed); return E_NOTIMPL; } @@ -4435,7 +4435,7 @@ static HRESULT WINAPI ITextDocument2Old_fnIMEInProgress(ITextDocument2Old *iface { struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(0x%x): stub\n", services, mode); + FIXME("(%p)->(0x%lx): stub\n", services, mode); return E_NOTIMPL; } @@ -4453,7 +4453,7 @@ static HRESULT WINAPI ITextDocument2Old_fnUpdate(ITextDocument2Old *iface, LONG { struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(0x%x): stub\n", services, mode); + FIXME("(%p)->(0x%lx): stub\n", services, mode); return E_NOTIMPL; } @@ -4462,7 +4462,7 @@ static HRESULT WINAPI ITextDocument2Old_fnNotify(ITextDocument2Old *iface, LONG { struct text_services *services = impl_from_ITextDocument2Old(iface); - FIXME("(%p)->(%d): stub\n", services, notify); + FIXME("(%p)->(%ld): stub\n", services, notify); return E_NOTIMPL; } @@ -4574,7 +4574,7 @@ static HRESULT WINAPI ITextSelection_fnGetTypeInfo(ITextSelection *me, UINT iTIn struct text_selection *This = impl_from_ITextSelection(me); HRESULT hr; - TRACE("(%p)->(%u,%d,%p)\n", This, iTInfo, lcid, ppTInfo); + TRACE("(%p)->(%u,%ld,%p)\n", This, iTInfo, lcid, ppTInfo); hr = get_typeinfo(ITextSelection_tid, ppTInfo); if (SUCCEEDED(hr)) @@ -4589,7 +4589,7 @@ static HRESULT WINAPI ITextSelection_fnGetIDsOfNames(ITextSelection *me, REFIID ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%s, %p, %u, %d, %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, + TRACE("(%p)->(%s, %p, %u, %ld, %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); hr = get_typeinfo(ITextSelection_tid, &ti); @@ -4613,7 +4613,7 @@ static HRESULT WINAPI ITextSelection_fnInvoke( ITypeInfo *ti; HRESULT hr; - TRACE("(%p)->(%d, %s, %d, %u, %p, %p, %p, %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, + TRACE("(%p)->(%ld, %s, %ld, %u, %p, %p, %p, %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); hr = get_typeinfo(ITextSelection_tid, &ti); @@ -4702,7 +4702,7 @@ static HRESULT WINAPI ITextSelection_fnSetChar(ITextSelection *me, LONG ch) { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%x): stub\n", This, ch); + FIXME("(%p)->(%lx): stub\n", This, ch); if (!This->services) return CO_E_RELEASED; @@ -4775,7 +4775,7 @@ static HRESULT WINAPI ITextSelection_fnSetStart(ITextSelection *me, LONG value) LONG start, end; HRESULT hr; - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); if (!This->services) return CO_E_RELEASED; @@ -4810,7 +4810,7 @@ static HRESULT WINAPI ITextSelection_fnSetEnd(ITextSelection *me, LONG value) LONG start, end; HRESULT hr; - TRACE("(%p)->(%d)\n", This, value); + TRACE("(%p)->(%ld)\n", This, value); if (!This->services) return CO_E_RELEASED; @@ -4929,7 +4929,7 @@ static HRESULT WINAPI ITextSelection_fnCollapse(ITextSelection *me, LONG bStart) LONG start, end; HRESULT hres; - TRACE("(%p)->(%d)\n", This, bStart); + TRACE("(%p)->(%ld)\n", This, bStart); if (!This->services) return CO_E_RELEASED; @@ -4947,7 +4947,7 @@ static HRESULT WINAPI ITextSelection_fnExpand(ITextSelection *me, LONG unit, LON ITextRange *range = NULL; HRESULT hr; - TRACE("(%p)->(%d %p)\n", This, unit, delta); + TRACE("(%p)->(%ld %p)\n", This, unit, delta); if (!This->services) return CO_E_RELEASED; @@ -4962,7 +4962,7 @@ static HRESULT WINAPI ITextSelection_fnGetIndex(ITextSelection *me, LONG unit, L { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%d %p): stub\n", This, unit, index); + FIXME("(%p)->(%ld %p): stub\n", This, unit, index); if (!This->services) return CO_E_RELEASED; @@ -4975,7 +4975,7 @@ static HRESULT WINAPI ITextSelection_fnSetIndex(ITextSelection *me, LONG unit, L { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%d %d %d): stub\n", This, unit, index, extend); + FIXME("(%p)->(%ld %ld %ld): stub\n", This, unit, index, extend); if (!This->services) return CO_E_RELEASED; @@ -4987,7 +4987,7 @@ static HRESULT WINAPI ITextSelection_fnSetRange(ITextSelection *me, LONG anchor, { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%d %d): stub\n", This, anchor, active); + FIXME("(%p)->(%ld %ld): stub\n", This, anchor, active); if (!This->services) return CO_E_RELEASED; @@ -5081,7 +5081,7 @@ static HRESULT WINAPI ITextSelection_fnStartOf(ITextSelection *me, LONG unit, LO ITextRange *range = NULL; HRESULT hr; - TRACE("(%p)->(%d %d %p)\n", This, unit, extend, delta); + TRACE("(%p)->(%ld %ld %p)\n", This, unit, extend, delta); if (!This->services) return CO_E_RELEASED; @@ -5099,7 +5099,7 @@ static HRESULT WINAPI ITextSelection_fnEndOf(ITextSelection *me, LONG unit, LONG ITextRange *range = NULL; HRESULT hr; - TRACE("(%p)->(%d %d %p)\n", This, unit, extend, delta); + TRACE("(%p)->(%ld %ld %p)\n", This, unit, extend, delta); if (!This->services) return CO_E_RELEASED; @@ -5116,7 +5116,7 @@ static HRESULT WINAPI ITextSelection_fnMove(ITextSelection *me, LONG unit, LONG ITextRange *range = NULL; HRESULT hr; - TRACE("(%p)->(%d %d %p)\n", This, unit, count, delta); + TRACE("(%p)->(%ld %ld %p)\n", This, unit, count, delta); if (!This->services) return CO_E_RELEASED; @@ -5134,7 +5134,7 @@ static HRESULT WINAPI ITextSelection_fnMoveStart(ITextSelection *me, LONG unit, ITextRange *range = NULL; HRESULT hr; - TRACE("(%p)->(%d %d %p)\n", This, unit, count, delta); + TRACE("(%p)->(%ld %ld %p)\n", This, unit, count, delta); if (!This->services) return CO_E_RELEASED; @@ -5152,7 +5152,7 @@ static HRESULT WINAPI ITextSelection_fnMoveEnd(ITextSelection *me, LONG unit, LO ITextRange *range = NULL; HRESULT hr; - TRACE("(%p)->(%d %d %p)\n", This, unit, count, delta); + TRACE("(%p)->(%ld %ld %p)\n", This, unit, count, delta); if (!This->services) return CO_E_RELEASED; @@ -5168,7 +5168,7 @@ static HRESULT WINAPI ITextSelection_fnMoveWhile(ITextSelection *me, VARIANT *ch { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%s %d %p): stub\n", This, debugstr_variant(charset), count, delta); + FIXME("(%p)->(%s %ld %p): stub\n", This, debugstr_variant(charset), count, delta); if (!This->services) return CO_E_RELEASED; @@ -5181,7 +5181,7 @@ static HRESULT WINAPI ITextSelection_fnMoveStartWhile(ITextSelection *me, VARIAN { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%s %d %p): stub\n", This, debugstr_variant(charset), count, delta); + FIXME("(%p)->(%s %ld %p): stub\n", This, debugstr_variant(charset), count, delta); if (!This->services) return CO_E_RELEASED; @@ -5194,7 +5194,7 @@ static HRESULT WINAPI ITextSelection_fnMoveEndWhile(ITextSelection *me, VARIANT { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%s %d %p): stub\n", This, debugstr_variant(charset), count, delta); + FIXME("(%p)->(%s %ld %p): stub\n", This, debugstr_variant(charset), count, delta); if (!This->services) return CO_E_RELEASED; @@ -5207,7 +5207,7 @@ static HRESULT WINAPI ITextSelection_fnMoveUntil(ITextSelection *me, VARIANT *ch { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%s %d %p): stub\n", This, debugstr_variant(charset), count, delta); + FIXME("(%p)->(%s %ld %p): stub\n", This, debugstr_variant(charset), count, delta); if (!This->services) return CO_E_RELEASED; @@ -5220,7 +5220,7 @@ static HRESULT WINAPI ITextSelection_fnMoveStartUntil(ITextSelection *me, VARIAN { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%s %d %p): stub\n", This, debugstr_variant(charset), count, delta); + FIXME("(%p)->(%s %ld %p): stub\n", This, debugstr_variant(charset), count, delta); if (!This->services) return CO_E_RELEASED; @@ -5233,7 +5233,7 @@ static HRESULT WINAPI ITextSelection_fnMoveEndUntil(ITextSelection *me, VARIANT { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%s %d %p): stub\n", This, debugstr_variant(charset), count, delta); + FIXME("(%p)->(%s %ld %p): stub\n", This, debugstr_variant(charset), count, delta); if (!This->services) return CO_E_RELEASED; @@ -5246,7 +5246,7 @@ static HRESULT WINAPI ITextSelection_fnFindText(ITextSelection *me, BSTR text, L { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%s %d %x %p): stub\n", This, debugstr_w(text), count, flags, length); + FIXME("(%p)->(%s %ld %lx %p): stub\n", This, debugstr_w(text), count, flags, length); if (!This->services) return CO_E_RELEASED; @@ -5260,7 +5260,7 @@ static HRESULT WINAPI ITextSelection_fnFindTextStart(ITextSelection *me, BSTR te { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%s %d %x %p): stub\n", This, debugstr_w(text), count, flags, length); + FIXME("(%p)->(%s %ld %lx %p): stub\n", This, debugstr_w(text), count, flags, length); if (!This->services) return CO_E_RELEASED; @@ -5273,7 +5273,7 @@ static HRESULT WINAPI ITextSelection_fnFindTextEnd(ITextSelection *me, BSTR text { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%s %d %x %p): stub\n", This, debugstr_w(text), count, flags, length); + FIXME("(%p)->(%s %ld %lx %p): stub\n", This, debugstr_w(text), count, flags, length); if (!This->services) return CO_E_RELEASED; @@ -5286,7 +5286,7 @@ static HRESULT WINAPI ITextSelection_fnDelete(ITextSelection *me, LONG unit, LON { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%d %d %p): stub\n", This, unit, count, delta); + FIXME("(%p)->(%ld %ld %p): stub\n", This, unit, count, delta); if (!This->services) return CO_E_RELEASED; @@ -5332,7 +5332,7 @@ static HRESULT WINAPI ITextSelection_fnPaste(ITextSelection *me, VARIANT *v, LON { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%s %x): stub\n", This, debugstr_variant(v), format); + FIXME("(%p)->(%s %lx): stub\n", This, debugstr_variant(v), format); if (!This->services) return CO_E_RELEASED; @@ -5345,7 +5345,7 @@ static HRESULT WINAPI ITextSelection_fnCanPaste(ITextSelection *me, VARIANT *v, { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%s %x %p): stub\n", This, debugstr_variant(v), format, ret); + FIXME("(%p)->(%s %lx %p): stub\n", This, debugstr_variant(v), format, ret); if (!This->services) return CO_E_RELEASED; @@ -5369,7 +5369,7 @@ static HRESULT WINAPI ITextSelection_fnChangeCase(ITextSelection *me, LONG type) { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%d): stub\n", This, type); + FIXME("(%p)->(%ld): stub\n", This, type); if (!This->services) return CO_E_RELEASED; @@ -5381,7 +5381,7 @@ static HRESULT WINAPI ITextSelection_fnGetPoint(ITextSelection *me, LONG type, L { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%d %p %p): stub\n", This, type, cx, cy); + FIXME("(%p)->(%ld %p %p): stub\n", This, type, cx, cy); if (!This->services) return CO_E_RELEASED; @@ -5394,7 +5394,7 @@ static HRESULT WINAPI ITextSelection_fnSetPoint(ITextSelection *me, LONG x, LONG { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%d %d %d %d): stub\n", This, x, y, type, extend); + FIXME("(%p)->(%ld %ld %ld %ld): stub\n", This, x, y, type, extend); if (!This->services) return CO_E_RELEASED; @@ -5406,7 +5406,7 @@ static HRESULT WINAPI ITextSelection_fnScrollIntoView(ITextSelection *me, LONG v { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%d): stub\n", This, value); + FIXME("(%p)->(%ld): stub\n", This, value); if (!This->services) return CO_E_RELEASED; @@ -5443,7 +5443,7 @@ static HRESULT WINAPI ITextSelection_fnSetFlags(ITextSelection *me, LONG flags) { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%x): stub\n", This, flags); + FIXME("(%p)->(%lx): stub\n", This, flags); if (!This->services) return CO_E_RELEASED; @@ -5468,7 +5468,7 @@ static HRESULT WINAPI ITextSelection_fnMoveLeft(ITextSelection *me, LONG unit, L { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%d %d %d %p): stub\n", This, unit, count, extend, delta); + FIXME("(%p)->(%ld %ld %ld %p): stub\n", This, unit, count, extend, delta); if (!This->services) return CO_E_RELEASED; @@ -5481,7 +5481,7 @@ static HRESULT WINAPI ITextSelection_fnMoveRight(ITextSelection *me, LONG unit, { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%d %d %d %p): stub\n", This, unit, count, extend, delta); + FIXME("(%p)->(%ld %ld %ld %p): stub\n", This, unit, count, extend, delta); if (!This->services) return CO_E_RELEASED; @@ -5494,7 +5494,7 @@ static HRESULT WINAPI ITextSelection_fnMoveUp(ITextSelection *me, LONG unit, LON { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%d %d %d %p): stub\n", This, unit, count, extend, delta); + FIXME("(%p)->(%ld %ld %ld %p): stub\n", This, unit, count, extend, delta); if (!This->services) return CO_E_RELEASED; @@ -5507,7 +5507,7 @@ static HRESULT WINAPI ITextSelection_fnMoveDown(ITextSelection *me, LONG unit, L { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%d %d %d %p): stub\n", This, unit, count, extend, delta); + FIXME("(%p)->(%ld %ld %ld %p): stub\n", This, unit, count, extend, delta); if (!This->services) return CO_E_RELEASED; @@ -5520,7 +5520,7 @@ static HRESULT WINAPI ITextSelection_fnHomeKey(ITextSelection *me, LONG unit, LO { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%d %d %p): stub\n", This, unit, extend, delta); + FIXME("(%p)->(%ld %ld %p): stub\n", This, unit, extend, delta); if (!This->services) return CO_E_RELEASED; @@ -5533,7 +5533,7 @@ static HRESULT WINAPI ITextSelection_fnEndKey(ITextSelection *me, LONG unit, LON { struct text_selection *This = impl_from_ITextSelection(me); - FIXME("(%p)->(%d %d %p): stub\n", This, unit, extend, delta); + FIXME("(%p)->(%ld %ld %p): stub\n", This, unit, extend, delta); if (!This->services) return CO_E_RELEASED; @@ -5714,7 +5714,7 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) pSize->cy = emh.rclBounds.bottom - emh.rclBounds.top; break; default: - FIXME("Unsupported tymed %d\n", stgm.tymed); + FIXME("Unsupported tymed %ld\n", stgm.tymed); break; } ReleaseStgMedium(&stgm); @@ -5810,7 +5810,7 @@ void draw_ole( ME_Context *c, int x, int y, ME_Run *run, BOOL selected ) PlayEnhMetaFile(c->hDC, stgm.u.hEnhMetaFile, &rc); break; default: - FIXME("Unsupported tymed %d\n", stgm.tymed); + FIXME("Unsupported tymed %ld\n", stgm.tymed); selected = FALSE; break; } diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 51e768f8441..f6e6f08d12a 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -199,7 +199,7 @@ void ME_CheckCharOffsets(ME_TextEditor *editor) ofs = 0; break; case diRun: - TRACE_(richedit_check)("run, real ofs = %d (+ofsp = %d), counted = %d, len = %d, txt = %s, flags=%08x, fx&mask = %08x\n", + TRACE_(richedit_check)("run, real ofs = %d (+ofsp = %d), counted = %d, len = %d, txt = %s, flags=%08x, fx&mask = %08lx\n", p->member.run.nCharOfs, p->member.run.nCharOfs+ofsp, ofsp+ofs, p->member.run.len, debugstr_run( &p->member.run ), p->member.run.nFlags, diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 266bb934753..9c9b5cbb4e0 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -264,12 +264,12 @@ void ME_DumpStyleToBuf(CHARFORMAT2W *pFmt, char buf[2048]) p += sprintf(p, "N/A"); if (pFmt->dwMask & CFM_SIZE) - p += sprintf(p, "\nFont size: %d\n", pFmt->yHeight); + p += sprintf(p, "\nFont size: %ld\n", pFmt->yHeight); else p += sprintf(p, "\nFont size: N/A\n"); if (pFmt->dwMask & CFM_OFFSET) - p += sprintf(p, "Char offset: %d\n", pFmt->yOffset); + p += sprintf(p, "Char offset: %ld\n", pFmt->yOffset); else p += sprintf(p, "Char offset: N/A\n"); diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 82a3db8f0b6..c53aa0a3e05 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1084,7 +1084,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, HRESULT hr = S_OK; LRESULT res = 0; - TRACE( "enter hwnd %p msg %04x (%s) %lx %lx, unicode %d\n", + TRACE( "enter hwnd %p msg %04x (%s) %Ix %Ix, unicode %d\n", hwnd, msg, get_msg_name(msg), wparam, lparam, unicode ); host = (struct host *)GetWindowLongPtrW( hwnd, 0 ); @@ -1094,7 +1094,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, { CREATESTRUCTW *pcs = (CREATESTRUCTW *)lparam; - TRACE( "WM_NCCREATE: hwnd %p style 0x%08x\n", hwnd, pcs->style ); + TRACE( "WM_NCCREATE: hwnd %p style 0x%08lx\n", hwnd, pcs->style ); return create_windowed_editor( hwnd, pcs, FALSE ); } else return DefWindowProcW( hwnd, msg, wparam, lparam ); @@ -1108,7 +1108,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, res = send_msg_filter( host, msg, &wparam, &lparam ); if (!--host->notify_level && host->defer_release) { - TRACE( "exit (filtered deferred release) hwnd %p msg %04x (%s) %lx %lx -> 0\n", + TRACE( "exit (filtered deferred release) hwnd %p msg %04x (%s) %Ix %Ix -> 0\n", hwnd, msg, get_msg_name(msg), wparam, lparam ); ITextHost2_Release( &host->ITextHost_iface ); return 0; @@ -1116,7 +1116,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, if (res) { - TRACE( "exit (filtered %lu) hwnd %p msg %04x (%s) %lx %lx -> 0\n", + TRACE( "exit (filtered %Iu) hwnd %p msg %04x (%s) %Ix %Ix -> 0\n", res, hwnd, msg, get_msg_name(msg), wparam, lparam ); return 0; } @@ -1497,7 +1497,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, if (hr == S_FALSE) res = DefWindowProcW( hwnd, msg, wparam, lparam ); - TRACE( "exit hwnd %p msg %04x (%s) %lx %lx, unicode %d -> %lu\n", + TRACE( "exit hwnd %p msg %04x (%s) %Ix %Ix, unicode %d -> %Iu\n", hwnd, msg, get_msg_name(msg), wparam, lparam, unicode, res ); return res; @@ -1536,7 +1536,7 @@ LRESULT WINAPI RichEdit10ANSIWndProc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM { CREATESTRUCTW *pcs = (CREATESTRUCTW *)lparam; - TRACE( "WM_NCCREATE: hwnd %p style 0x%08x\n", hwnd, pcs->style ); + TRACE( "WM_NCCREATE: hwnd %p style 0x%08lx\n", hwnd, pcs->style ); return create_windowed_editor( hwnd, pcs, TRUE ); } return RichEditANSIWndProc( hwnd, msg, wparam, lparam ); @@ -1545,7 +1545,7 @@ LRESULT WINAPI RichEdit10ANSIWndProc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM static LRESULT WINAPI REComboWndProc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { /* FIXME: Not implemented */ - TRACE( "hwnd %p msg %04x (%s) %08lx %08lx\n", + TRACE( "hwnd %p msg %04x (%s) %08Ix %08Ix\n", hwnd, msg, get_msg_name( msg ), wparam, lparam ); return DefWindowProcW( hwnd, msg, wparam, lparam ); } @@ -1553,7 +1553,7 @@ static LRESULT WINAPI REComboWndProc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM static LRESULT WINAPI REListWndProc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { /* FIXME: Not implemented */ - TRACE( "hwnd %p msg %04x (%s) %08lx %08lx\n", + TRACE( "hwnd %p msg %04x (%s) %08Ix %08Ix\n", hwnd, msg, get_msg_name( msg ), wparam, lparam ); return DefWindowProcW( hwnd, msg, wparam, lparam ); } diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index fb7fc754bb5..809bb5ac3ae 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -65,7 +65,7 @@ static ULONG WINAPI ITextServicesImpl_AddRef(IUnknown *iface) struct text_services *services = impl_from_IUnknown( iface ); LONG ref = InterlockedIncrement( &services->ref ); - TRACE( "(%p) ref = %d\n", services, ref ); + TRACE( "(%p) ref = %ld\n", services, ref ); return ref; } @@ -75,7 +75,7 @@ static ULONG WINAPI ITextServicesImpl_Release(IUnknown *iface) struct text_services *services = impl_from_IUnknown( iface ); LONG ref = InterlockedDecrement( &services->ref ); - TRACE( "(%p) ref = %d\n", services, ref ); + TRACE( "(%p) ref = %ld\n", services, ref ); if (!ref) { @@ -161,7 +161,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxDraw( ITextServices *iface, DWORD HDC dc = draw; BOOL rewrap = FALSE; - TRACE( "%p: aspect %d, %d, %p, %p, draw %p, target %p, bounds %s, mf_bounds %s, update %s, %p, %d, view %d\n", + TRACE( "%p: aspect %ld, %ld, %p, %p, draw %p, target %p, bounds %s, mf_bounds %s, update %s, %p, %ld, view %ld\n", services, aspect, index, aspect_info, td, draw, target, wine_dbgstr_rect( (RECT *)bounds ), wine_dbgstr_rect( (RECT *)mf_bounds ), wine_dbgstr_rect( update ), continue_fn, continue_param, view_id ); @@ -226,7 +226,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxSetCursor( ITextServices *iface { struct text_services *services = impl_from_ITextServices( iface ); - TRACE( "%p: %d, %d, %p, %p, draw %p target %p client %s pos (%d, %d)\n", services, aspect, index, aspect_info, td, draw, + TRACE( "%p: %ld, %ld, %p, %p, draw %p target %p client %s pos (%d, %d)\n", services, aspect, index, aspect_info, td, draw, target, wine_dbgstr_rect( client ), x, y ); if (aspect != DVASPECT_CONTENT || index || aspect_info || td || draw || target || client) @@ -367,7 +367,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetNaturalSize( ITextServices *if BOOL rewrap = FALSE; HRESULT hr; - TRACE( "%p: aspect %d, draw %p, target %p, td %p, mode %08x, extent %s, *width %d, *height %d\n", services, + TRACE( "%p: aspect %ld, draw %p, target %p, td %p, mode %08lx, extent %s, *width %ld, *height %ld\n", services, aspect, draw, target, td, mode, wine_dbgstr_point( (POINT *)extent ), *width, *height ); if (aspect != DVASPECT_CONTENT || target || td || mode != TXTNS_FITTOCONTENT ) @@ -413,7 +413,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_OnTxPropertyBitsChange( ITextServic HRESULT hr; BOOL repaint = FALSE; - TRACE( "%p, mask %08x, bits %08x\n", services, mask, bits ); + TRACE( "%p, mask %08lx, bits %08lx\n", services, mask, bits ); services->editor->props = (services->editor->props & ~mask) | (bits & mask); if (mask & (TXTBIT_WORDWRAP | TXTBIT_MULTILINE)) diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 14e825b1e2d..db3e2806239 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -136,7 +136,7 @@ static ME_Run *split_run_extents( ME_WrapContext *wc, ME_Run *run, int nVChar ) assert( run->nCharOfs != -1 ); ME_CheckCharOffsets(editor); - TRACE("Before split: %s(%d, %d)\n", debugstr_run( run ), + TRACE("Before split: %s(%ld, %ld)\n", debugstr_run( run ), run->pt.x, run->pt.y); run_split( editor, &cursor ); @@ -153,7 +153,7 @@ static ME_Run *split_run_extents( ME_WrapContext *wc, ME_Run *run, int nVChar ) ME_CheckCharOffsets(editor); - TRACE("After split: %s(%d, %d), %s(%d, %d)\n", + TRACE("After split: %s(%ld, %ld), %s(%ld, %ld)\n", debugstr_run( run ), run->pt.x, run->pt.y, debugstr_run( run2 ), run2->pt.x, run2->pt.y); @@ -274,7 +274,7 @@ static void layout_row( ME_Run *start, ME_Run *last ) for (i = 0, run = start; i < num_runs; run = run_next( run )) { run->pt.x = pos[ log_to_vis[ i ] ]; - TRACE( "%d: x = %d\n", i, run->pt.x ); + TRACE( "%d: x = %ld\n", i, run->pt.x ); i++; } diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index c4f79ce6f5b..def16a4925a 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -76,7 +76,7 @@ ME_StreamOutFlush(ME_OutStream *pStream) nWritten = pStream->pos; stream->dwError = stream->pfnCallback(stream->dwCookie, (LPBYTE)pStream->buffer, pStream->pos, &nWritten); - TRACE("error=%u written=%u\n", stream->dwError, nWritten); + TRACE("error=%lu written=%lu\n", stream->dwError, nWritten); if (nWritten == 0 || stream->dwError) return FALSE; /* Don't resend partial chunks if nWritten < pStream->pos */ @@ -92,7 +92,7 @@ static LONG ME_StreamOutFree(ME_OutStream *pStream) { LONG written = pStream->written; - TRACE("total length = %u\n", written); + TRACE("total length = %lu\n", written); heap_free(pStream); return written; @@ -400,9 +400,9 @@ static BOOL stream_out_table_props( ME_TextEditor *editor, ME_OutStream *pStream cell = table_row_first_cell( para ); assert( cell ); if (pFmt->dxOffset) - sprintf(props + strlen(props), "\\trgaph%d", pFmt->dxOffset); + sprintf(props + strlen(props), "\\trgaph%ld", pFmt->dxOffset); if (pFmt->dxStartIndent) - sprintf(props + strlen(props), "\\trleft%d", pFmt->dxStartIndent); + sprintf(props + strlen(props), "\\trleft%ld", pFmt->dxStartIndent); do { ME_Border* borders[4] = { &cell->border.top, &cell->border.left, @@ -434,9 +434,9 @@ static BOOL stream_out_table_props( ME_TextEditor *editor, ME_OutStream *pStream assert( !(para->nFlags & (MEPF_ROWSTART | MEPF_ROWEND | MEPF_CELL)) ); if (pFmt->dxOffset) - sprintf(props + strlen(props), "\\trgaph%d", pFmt->dxOffset); + sprintf(props + strlen(props), "\\trgaph%ld", pFmt->dxOffset); if (pFmt->dxStartIndent) - sprintf(props + strlen(props), "\\trleft%d", pFmt->dxStartIndent); + sprintf(props + strlen(props), "\\trleft%ld", pFmt->dxStartIndent); for (i = 0; i < 4; i++) { if (borders[i]->width) @@ -452,7 +452,7 @@ static BOOL stream_out_table_props( ME_TextEditor *editor, ME_OutStream *pStream } for (i = 0; i < pFmt->cTabCount; i++) { - sprintf(props + strlen(props), "\\cellx%d", pFmt->rgxTabs[i] & 0x00FFFFFF); + sprintf(props + strlen(props), "\\cellx%ld", pFmt->rgxTabs[i] & 0x00FFFFFF); } } if (!ME_StreamOutPrint(pStream, props)) @@ -631,13 +631,13 @@ static BOOL stream_out_para_props( ME_TextEditor *editor, ME_OutStream *pStream, strcat(props, "\\sl-480\\slmult1"); break; case 3: - sprintf(props + strlen(props), "\\sl%d\\slmult0", fmt->dyLineSpacing); + sprintf(props + strlen(props), "\\sl%ld\\slmult0", fmt->dyLineSpacing); break; case 4: - sprintf(props + strlen(props), "\\sl-%d\\slmult0", fmt->dyLineSpacing); + sprintf(props + strlen(props), "\\sl-%ld\\slmult0", fmt->dyLineSpacing); break; case 5: - sprintf(props + strlen(props), "\\sl-%d\\slmult1", fmt->dyLineSpacing * 240 / 20); + sprintf(props + strlen(props), "\\sl-%ld\\slmult1", fmt->dyLineSpacing * 240 / 20); break; } } @@ -663,11 +663,11 @@ static BOOL stream_out_para_props( ME_TextEditor *editor, ME_OutStream *pStream, fmt->dwMask & PFM_TABLE && fmt->wEffects & PFE_TABLE)) { if (fmt->dxOffset) - sprintf(props + strlen(props), "\\li%d", fmt->dxOffset); + sprintf(props + strlen(props), "\\li%ld", fmt->dxOffset); if (fmt->dxStartIndent) - sprintf(props + strlen(props), "\\fi%d", fmt->dxStartIndent); + sprintf(props + strlen(props), "\\fi%ld", fmt->dxStartIndent); if (fmt->dxRightIndent) - sprintf(props + strlen(props), "\\ri%d", fmt->dxRightIndent); + sprintf(props + strlen(props), "\\ri%ld", fmt->dxRightIndent); if (fmt->dwMask & PFM_TABSTOPS) { static const char * const leader[6] = { "", "\\tldot", "\\tlhyph", "\\tlul", "\\tlth", "\\tleq" }; @@ -690,14 +690,14 @@ static BOOL stream_out_para_props( ME_TextEditor *editor, ME_OutStream *pStream, } if (fmt->rgxTabs[i] >> 28 <= 5) strcat(props, leader[fmt->rgxTabs[i] >> 28]); - sprintf(props+strlen(props), "\\tx%d", fmt->rgxTabs[i]&0x00FFFFFF); + sprintf(props+strlen(props), "\\tx%ld", fmt->rgxTabs[i]&0x00FFFFFF); } } } if (fmt->dySpaceAfter) - sprintf(props + strlen(props), "\\sa%d", fmt->dySpaceAfter); + sprintf(props + strlen(props), "\\sa%ld", fmt->dySpaceAfter); if (fmt->dySpaceBefore) - sprintf(props + strlen(props), "\\sb%d", fmt->dySpaceBefore); + sprintf(props + strlen(props), "\\sb%ld", fmt->dySpaceBefore); if (fmt->sStyle != -1) sprintf(props + strlen(props), "\\s%d", fmt->sStyle); @@ -791,12 +791,12 @@ ME_StreamOutRTFCharProps(ME_OutStream *pStream, CHARFORMAT2W *fmt) if (old_fmt->yOffset != fmt->yOffset) { if (fmt->yOffset >= 0) - sprintf(props + strlen(props), "\\up%d", fmt->yOffset); + sprintf(props + strlen(props), "\\up%ld", fmt->yOffset); else - sprintf(props + strlen(props), "\\dn%d", -fmt->yOffset); + sprintf(props + strlen(props), "\\dn%ld", -fmt->yOffset); } if (old_fmt->yHeight != fmt->yHeight) - sprintf(props + strlen(props), "\\fs%d", fmt->yHeight / 10); + sprintf(props + strlen(props), "\\fs%ld", fmt->yHeight / 10); if (old_fmt->sSpacing != fmt->sSpacing) sprintf(props + strlen(props), "\\expnd%u\\expndtw%u", fmt->sSpacing / 5, fmt->sSpacing); if ((old_fmt->dwEffects ^ fmt->dwEffects) & (CFM_SUBSCRIPT | CFM_SUPERSCRIPT))
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/rpcrt4/Makefile.in | 2 - dlls/rpcrt4/cproxy.c | 6 +- dlls/rpcrt4/cstub.c | 8 +- dlls/rpcrt4/ndr_clientserver.c | 4 + dlls/rpcrt4/ndr_contexthandle.c | 12 ++- dlls/rpcrt4/ndr_es.c | 32 ++++---- dlls/rpcrt4/ndr_fullpointer.c | 8 +- dlls/rpcrt4/ndr_marshall.c | 150 ++++++++++++++++++++------------------- dlls/rpcrt4/ndr_ole.c | 8 +- dlls/rpcrt4/ndr_stubless.c | 30 ++++---- dlls/rpcrt4/ndr_typelib.c | 6 +- dlls/rpcrt4/rpc_assoc.c | 2 - dlls/rpcrt4/rpc_async.c | 2 - dlls/rpcrt4/rpc_binding.c | 58 ++++++++------- dlls/rpcrt4/rpc_epmap.c | 20 +++-- dlls/rpcrt4/rpc_message.c | 62 ++++++++-------- dlls/rpcrt4/rpc_server.c | 40 +++++----- dlls/rpcrt4/rpc_transport.c | 76 ++++++++++---------- dlls/rpcrt4/rpcrt4_main.c | 12 ++- 19 files changed, 269 insertions(+), 269 deletions(-) diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in index 1ad225735d2..2aa2a5376aa 100644 --- a/dlls/rpcrt4/Makefile.in +++ b/dlls/rpcrt4/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_RPCRT4_ -DMSWMSG +EXTRADEFS = -D_RPCRT4_ -DMSWMSG MODULE = rpcrt4.dll IMPORTLIB = rpcrt4 IMPORTS = uuid advapi32 diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index 968c7b51568..da3e19e50f3 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -289,7 +289,7 @@ BOOL fill_stubless_table( IUnknownVtbl *vtbl, DWORD num ) if (num - 3 > BLOCK_SIZE * MAX_BLOCKS) { - FIXME( "%u methods not supported\n", num ); + FIXME( "%lu methods not supported\n", num ); return FALSE; } for (i = 0; i < (num - 3 + BLOCK_SIZE - 1) / BLOCK_SIZE; i++) @@ -320,7 +320,7 @@ HRESULT StdProxy_Construct(REFIID riid, if (ProxyInfo->TableVersion > 1) { ULONG count = ProxyInfo->pStubVtblList[Index]->header.DispatchTableCount; vtbl = (CInterfaceProxyVtbl *)((const void **)vtbl + 1); - TRACE("stubless vtbl %p: count=%d\n", vtbl->Vtbl, count ); + TRACE("stubless vtbl %p: count=%ld\n", vtbl->Vtbl, count ); fill_stubless_table( (IUnknownVtbl *)vtbl->Vtbl, count ); } @@ -592,7 +592,7 @@ void WINAPI NdrProxyFreeBuffer(void *This, */ HRESULT WINAPI NdrProxyErrorHandler(DWORD dwExceptionCode) { - WARN("(0x%08x): a proxy call failed\n", dwExceptionCode); + WARN("(0x%08lx): a proxy call failed\n", dwExceptionCode); if (FAILED(dwExceptionCode)) return dwExceptionCode; diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index 1903a5f0c9d..a6ec4caaadf 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -248,7 +248,7 @@ static BOOL fill_delegated_stub_table(IUnknownVtbl *vtbl, DWORD num) if (num - 3 > BLOCK_SIZE * MAX_BLOCKS) { - FIXME( "%u methods not supported\n", num ); + FIXME( "%lu methods not supported\n", num ); return FALSE; } vtbl->QueryInterface = delegating_QueryInterface; @@ -270,7 +270,7 @@ BOOL fill_delegated_proxy_table(IUnknownVtbl *vtbl, DWORD num) if (num - 3 > BLOCK_SIZE * MAX_BLOCKS) { - FIXME( "%u methods not supported\n", num ); + FIXME( "%lu methods not supported\n", num ); return FALSE; } vtbl->QueryInterface = IUnknown_QueryInterface_Proxy; @@ -328,7 +328,7 @@ void release_delegating_vtbl(IUnknownVtbl *vtbl) EnterCriticalSection(&delegating_vtbl_section); table->ref--; - TRACE("ref now %d\n", table->ref); + TRACE("ref now %ld\n", table->ref); if(table->ref == 0 && table != current_vtbl) { TRACE("... and we're not current so free'ing\n"); @@ -508,7 +508,7 @@ HRESULT WINAPI CStdStubBuffer_Invoke(LPRPCSTUBBUFFER iface, __EXCEPT(stub_filter) { DWORD dwExceptionCode = GetExceptionCode(); - WARN("a stub call failed with exception 0x%08x (%d)\n", dwExceptionCode, dwExceptionCode); + WARN("a stub call failed with exception 0x%08lx (%ld)\n", dwExceptionCode, dwExceptionCode); if (FAILED(dwExceptionCode)) hr = dwExceptionCode; else diff --git a/dlls/rpcrt4/ndr_clientserver.c b/dlls/rpcrt4/ndr_clientserver.c index 66fe33b2839..d4ba2ffa5e0 100644 --- a/dlls/rpcrt4/ndr_clientserver.c +++ b/dlls/rpcrt4/ndr_clientserver.c @@ -164,7 +164,7 @@ unsigned char *WINAPI NdrGetBuffer(PMIDL_STUB_MESSAGE stubmsg, ULONG buflen, RPC { RPC_STATUS status; - TRACE("(stubmsg == ^%p, buflen == %u, handle == %p)\n", stubmsg, buflen, handle); + TRACE("(stubmsg == ^%p, buflen == %lu, handle == %p)\n", stubmsg, buflen, handle); stubmsg->RpcMsg->Handle = handle; stubmsg->RpcMsg->BufferLength = buflen; @@ -233,7 +233,7 @@ RPC_STATUS RPC_ENTRY NdrMapCommAndFaultStatus( PMIDL_STUB_MESSAGE pStubMsg, ULONG *pFaultStatus, RPC_STATUS Status ) { - TRACE("(%p, %p, %p, %d)\n", pStubMsg, pCommStatus, pFaultStatus, Status); + TRACE("(%p, %p, %p, %ld)\n", pStubMsg, pCommStatus, pFaultStatus, Status); switch (Status) { diff --git a/dlls/rpcrt4/ndr_contexthandle.c b/dlls/rpcrt4/ndr_contexthandle.c index 36deb41d812..00057508753 100644 --- a/dlls/rpcrt4/ndr_contexthandle.c +++ b/dlls/rpcrt4/ndr_contexthandle.c @@ -210,7 +210,7 @@ void WINAPI NDRCContextUnmarshall(NDR_CCONTEXT *CContext, { RPC_STATUS status; - TRACE("*%p=(%p) %p %p %08x\n", + TRACE("*%p=(%p) %p %p %08lx\n", CContext, *CContext, hBinding, pBuff, DataRepresentation); EnterCriticalSection(&ndr_context_cs); @@ -258,7 +258,7 @@ void WINAPI NDRSContextMarshall2(RPC_BINDING_HANDLE hBinding, RPC_STATUS status; ndr_context_handle *ndr = pBuff; - TRACE("(%p %p %p %p %p %u)\n", + TRACE("(%p %p %p %p %p %lu)\n", hBinding, SContext, pBuff, userRunDownIn, CtxGuard, Flags); if (!binding->server || !binding->Assoc) @@ -298,7 +298,7 @@ void WINAPI NDRSContextMarshall2(RPC_BINDING_HANDLE hBinding, NDR_SCONTEXT WINAPI NDRSContextUnmarshall(void *pBuff, ULONG DataRepresentation) { - TRACE("(%p %08x)\n", pBuff, DataRepresentation); + TRACE("(%p %08lx)\n", pBuff, DataRepresentation); return NDRSContextUnmarshall2(I_RpcGetCurrentCallHandle(), pBuff, DataRepresentation, NULL, RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); @@ -311,7 +311,7 @@ NDR_SCONTEXT WINAPI NDRSContextUnmarshallEx(RPC_BINDING_HANDLE hBinding, void *pBuff, ULONG DataRepresentation) { - TRACE("(%p %p %08x)\n", hBinding, pBuff, DataRepresentation); + TRACE("(%p %p %08lx)\n", hBinding, pBuff, DataRepresentation); return NDRSContextUnmarshall2(hBinding, pBuff, DataRepresentation, NULL, RPC_CONTEXT_HANDLE_DEFAULT_FLAGS); } @@ -329,7 +329,7 @@ NDR_SCONTEXT WINAPI NDRSContextUnmarshall2(RPC_BINDING_HANDLE hBinding, RPC_STATUS status; const ndr_context_handle *context_ndr = pBuff; - TRACE("(%p %p %08x %p %u)\n", + TRACE("(%p %p %08lx %p %lu)\n", hBinding, pBuff, DataRepresentation, CtxGuard, Flags); if (!binding->server || !binding->Assoc) @@ -343,7 +343,7 @@ NDR_SCONTEXT WINAPI NDRSContextUnmarshall2(RPC_BINDING_HANDLE hBinding, { if (context_ndr->attributes) { - ERR("non-null attributes 0x%x\n", context_ndr->attributes); + ERR("non-null attributes 0x%lx\n", context_ndr->attributes); status = RPC_X_SS_CONTEXT_MISMATCH; } else diff --git a/dlls/rpcrt4/ndr_es.c b/dlls/rpcrt4/ndr_es.c index a756b178c5d..f7fb45feee1 100644 --- a/dlls/rpcrt4/ndr_es.c +++ b/dlls/rpcrt4/ndr_es.c @@ -130,7 +130,7 @@ RPC_STATUS WINAPI MesBufferHandleReset(handle_t Handle, ULONG HandleStyle, { MIDL_ES_MESSAGE *pEsMsg = (MIDL_ES_MESSAGE *)Handle; - TRACE("(%p, %u, %d, %p, %u, %p)\n", Handle, HandleStyle, Operation, Buffer, + TRACE("(%p, %lu, %d, %p, %lu, %p)\n", Handle, HandleStyle, Operation, Buffer, BufferSize, EncodedSize); if (!Handle || !Buffer || !EncodedSize) @@ -186,7 +186,7 @@ RPC_STATUS RPC_ENTRY MesEncodeFixedBufferHandleCreate( MIDL_ES_MESSAGE *pEsMsg; RPC_STATUS status; - TRACE("(%p, %d, %p, %p)\n", Buffer, BufferSize, pEncodedSize, pHandle); + TRACE("(%p, %ld, %p, %p)\n", Buffer, BufferSize, pEncodedSize, pHandle); if ((status = validate_mes_buffer_pointer(Buffer))) return status; @@ -251,7 +251,7 @@ RPC_STATUS RPC_ENTRY MesDecodeBufferHandleCreate( MIDL_ES_MESSAGE *pEsMsg; RPC_STATUS status; - TRACE("(%p, %d, %p)\n", Buffer, BufferSize, pHandle); + TRACE("(%p, %ld, %p)\n", Buffer, BufferSize, pHandle); if ((status = validate_mes_buffer_pointer(Buffer))) return status; @@ -277,17 +277,17 @@ static void es_data_alloc(MIDL_ES_MESSAGE *pEsMsg, ULONG size) if (pEsMsg->HandleStyle == MES_INCREMENTAL_HANDLE) { unsigned int tmpsize = size; - TRACE("%d with incremental handle\n", size); + TRACE("%ld with incremental handle\n", size); pEsMsg->Alloc(pEsMsg->UserState, (char **)&pEsMsg->StubMsg.Buffer, &tmpsize); if (tmpsize < size) { - ERR("not enough bytes allocated - requested %d, got %d\n", size, tmpsize); + ERR("not enough bytes allocated - requested %ld, got %d\n", size, tmpsize); RpcRaiseException(RPC_S_OUT_OF_MEMORY); } } else if (pEsMsg->HandleStyle == MES_FIXED_BUFFER_HANDLE) { - TRACE("%d with fixed buffer handle\n", size); + TRACE("%ld with fixed buffer handle\n", size); pEsMsg->StubMsg.Buffer = pEsMsg->Buffer; } pEsMsg->StubMsg.RpcMsg->Buffer = pEsMsg->StubMsg.BufferStart = pEsMsg->StubMsg.Buffer; @@ -298,17 +298,17 @@ static void es_data_read(MIDL_ES_MESSAGE *pEsMsg, ULONG size) if (pEsMsg->HandleStyle == MES_INCREMENTAL_HANDLE) { unsigned int tmpsize = size; - TRACE("%d from incremental handle\n", size); + TRACE("%ld from incremental handle\n", size); pEsMsg->Read(pEsMsg->UserState, (char **)&pEsMsg->StubMsg.Buffer, &tmpsize); if (tmpsize < size) { - ERR("not enough bytes read - requested %d, got %d\n", size, tmpsize); + ERR("not enough bytes read - requested %ld, got %d\n", size, tmpsize); RpcRaiseException(RPC_S_OUT_OF_MEMORY); } } else { - TRACE("%d from fixed or dynamic buffer handle\n", size); + TRACE("%ld from fixed or dynamic buffer handle\n", size); /* FIXME: validate BufferSize? */ pEsMsg->StubMsg.Buffer = pEsMsg->Buffer; pEsMsg->Buffer += size; @@ -323,12 +323,12 @@ static void es_data_write(MIDL_ES_MESSAGE *pEsMsg, ULONG size) { if (pEsMsg->HandleStyle == MES_INCREMENTAL_HANDLE) { - TRACE("%d to incremental handle\n", size); + TRACE("%ld to incremental handle\n", size); pEsMsg->Write(pEsMsg->UserState, (char *)pEsMsg->StubMsg.BufferStart, size); } else { - TRACE("%d to dynamic or fixed buffer handle\n", size); + TRACE("%ld to dynamic or fixed buffer handle\n", size); *pEsMsg->pEncodedSize += size; } } @@ -386,7 +386,7 @@ static void mes_proc_header_unmarshal(MIDL_ES_MESSAGE *pEsMsg) pEsMsg->ProcNumber = *(DWORD *)pEsMsg->StubMsg.Buffer; pEsMsg->StubMsg.Buffer += 4; if (*(DWORD *)pEsMsg->StubMsg.Buffer != 0x00000001) - FIXME("unknown value 0x%08x, expected 0x00000001\n", *(DWORD *)pEsMsg->StubMsg.Buffer); + FIXME("unknown value 0x%08lx, expected 0x00000001\n", *(DWORD *)pEsMsg->StubMsg.Buffer); pEsMsg->StubMsg.Buffer += 4; pEsMsg->ByteCount = *(DWORD *)pEsMsg->StubMsg.Buffer; pEsMsg->StubMsg.Buffer += 4; @@ -416,7 +416,7 @@ void WINAPIV NdrMesProcEncodeDecode(handle_t Handle, const MIDL_STUB_DESC * pStu /* Later NDR language versions probably won't be backwards compatible */ if (pStubDesc->Version > 0x50002) { - FIXME("Incompatible stub description version: 0x%x\n", pStubDesc->Version); + FIXME("Incompatible stub description version: 0x%lx\n", pStubDesc->Version); RpcRaiseException(RPC_X_WRONG_STUB_VERSION); } @@ -457,7 +457,7 @@ void WINAPIV NdrMesProcEncodeDecode(handle_t Handle, const MIDL_STUB_DESC * pStu } TRACE("stack size: 0x%x\n", stack_size); - TRACE("proc num: %d\n", pEsMsg->ProcNumber); + TRACE("proc num: %ld\n", pEsMsg->ProcNumber); memset(&rpcMsg, 0, sizeof(rpcMsg)); pEsMsg->StubMsg.RpcMsg = &rpcMsg; @@ -470,8 +470,8 @@ void WINAPIV NdrMesProcEncodeDecode(handle_t Handle, const MIDL_STUB_DESC * pStu pEsMsg->StubMsg.FullPtrXlatTables = NdrFullPointerXlatInit(0,XLAT_CLIENT); TRACE("Oi_flags = 0x%02x\n", pProcHeader->Oi_flags); - TRACE("stubdesc version = 0x%x\n", pStubDesc->Version); - TRACE("MIDL stub version = 0x%x\n", pStubDesc->MIDLVersion); + TRACE("stubdesc version = 0x%lx\n", pStubDesc->Version); + TRACE("MIDL stub version = 0x%lx\n", pStubDesc->MIDLVersion); /* needed for conformance of top-level objects */ va_start( args, pFormat ); diff --git a/dlls/rpcrt4/ndr_fullpointer.c b/dlls/rpcrt4/ndr_fullpointer.c index 2bbd2b2b1aa..e4c959ce90a 100644 --- a/dlls/rpcrt4/ndr_fullpointer.c +++ b/dlls/rpcrt4/ndr_fullpointer.c @@ -35,7 +35,7 @@ PFULL_PTR_XLAT_TABLES WINAPI NdrFullPointerXlatInit(ULONG NumberOfPointers, ULONG NumberOfBuckets; PFULL_PTR_XLAT_TABLES pXlatTables = HeapAlloc(GetProcessHeap(), 0, sizeof(*pXlatTables)); - TRACE("(%d, %d)\n", NumberOfPointers, XlatSide); + TRACE("(%ld, %d)\n", NumberOfPointers, XlatSide); if (!NumberOfPointers) NumberOfPointers = 512; NumberOfBuckets = ((NumberOfPointers + 3) & ~3) - 1; @@ -48,7 +48,7 @@ PFULL_PTR_XLAT_TABLES WINAPI NdrFullPointerXlatInit(ULONG NumberOfPointers, sizeof(unsigned char) * NumberOfPointers); pXlatTables->RefIdToPointer.NumberOfEntries = NumberOfPointers; - TRACE("NumberOfBuckets = %d\n", NumberOfBuckets); + TRACE("NumberOfBuckets = %ld\n", NumberOfBuckets); pXlatTables->PointerToRefId.XlatTable = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(PFULL_PTR_TO_REFID_ELEMENT) * NumberOfBuckets); @@ -159,7 +159,7 @@ int WINAPI NdrFullPointerQueryRefId(PFULL_PTR_XLAT_TABLES pXlatTables, ULONG RefId, unsigned char QueryType, void **ppPointer) { - TRACE("(%p, 0x%x, %d, %p)\n", pXlatTables, RefId, QueryType, ppPointer); + TRACE("(%p, 0x%lx, %d, %p)\n", pXlatTables, RefId, QueryType, ppPointer); if (!RefId) return 1; @@ -192,7 +192,7 @@ void WINAPI NdrFullPointerInsertRefId(PFULL_PTR_XLAT_TABLES pXlatTables, unsigned int i; PFULL_PTR_TO_REFID_ELEMENT XlatTableEntry; - TRACE("(%p, 0x%x, %p)\n", pXlatTables, RefId, pPointer); + TRACE("(%p, 0x%lx, %p)\n", pXlatTables, RefId, pPointer); /* simple hashing algorithm, don't know whether it matches native */ for (i = 0; i < sizeof(pPointer); i++) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 764b304a047..d0d2e19342c 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -121,9 +121,9 @@ static inline void align_pointer_offset_clear( unsigned char **ptr, unsigned cha } #define STD_OVERFLOW_CHECK(_Msg) do { \ - TRACE("buffer=%d/%d\n", (ULONG)(_Msg->Buffer - (unsigned char *)_Msg->RpcMsg->Buffer), _Msg->BufferLength); \ + TRACE("buffer=%ld/%ld\n", (ULONG)(_Msg->Buffer - (unsigned char *)_Msg->RpcMsg->Buffer), _Msg->BufferLength); \ if (_Msg->Buffer > (unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength) \ - ERR("buffer overflow %d bytes\n", (ULONG)(_Msg->Buffer - ((unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength))); \ + ERR("buffer overflow %ld bytes\n", (ULONG)(_Msg->Buffer - ((unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength))); \ } while (0) #define NDR_POINTER_ID_BASE 0x20000 @@ -428,7 +428,7 @@ void * WINAPI NdrAllocate(MIDL_STUB_MESSAGE *pStubMsg, SIZE_T len) /* check for overflow */ if (adjusted_len < len) { - ERR("overflow of adjusted_len %ld, len %ld\n", adjusted_len, len); + ERR("overflow of adjusted_len %Id, len %Id\n", adjusted_len, len); RpcRaiseException(RPC_X_BAD_STUB_DATA); } @@ -477,7 +477,7 @@ static PFORMAT_STRING ReadConformance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRIN RpcRaiseException(RPC_X_BAD_STUB_DATA); pStubMsg->MaxCount = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); pStubMsg->Buffer += 4; - TRACE("unmarshalled conformance is %ld\n", pStubMsg->MaxCount); + TRACE("unmarshalled conformance is %Id\n", pStubMsg->MaxCount); return SkipConformance(pStubMsg, pFormat); } @@ -495,15 +495,15 @@ static inline PFORMAT_STRING ReadVariance(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_S RpcRaiseException(RPC_X_BAD_STUB_DATA); pStubMsg->Offset = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); pStubMsg->Buffer += 4; - TRACE("offset is %d\n", pStubMsg->Offset); + TRACE("offset is %ld\n", pStubMsg->Offset); pStubMsg->ActualCount = NDR_LOCAL_UINT32_READ(pStubMsg->Buffer); pStubMsg->Buffer += 4; - TRACE("variance is %d\n", pStubMsg->ActualCount); + TRACE("variance is %ld\n", pStubMsg->ActualCount); if ((pStubMsg->ActualCount > MaxValue) || (pStubMsg->ActualCount + pStubMsg->Offset > MaxValue)) { - ERR("invalid array bound(s): ActualCount = %d, Offset = %d, MaxValue = %d\n", + ERR("invalid array bound(s): ActualCount = %ld, Offset = %ld, MaxValue = %ld\n", pStubMsg->ActualCount, pStubMsg->Offset, MaxValue); RpcRaiseException(RPC_S_INVALID_BOUND); return NULL; @@ -589,7 +589,7 @@ PFORMAT_STRING ComputeConformanceOrVariance( break; case FC_CONSTANT_CONFORMANCE: data = ofs | ((DWORD)pFormat[1] << 16); - TRACE("constant conformance, val=%ld\n", data); + TRACE("constant conformance, val=%Id\n", data); *pCount = data; goto finish_conf; case FC_TOP_LEVEL_MULTID_CONFORMANCE: @@ -661,7 +661,7 @@ PFORMAT_STRING ComputeConformanceOrVariance( FIXME("unknown conformance data type %x\n", dtype); goto done_conf_grab; } - TRACE("dereferenced data type %x at %p, got %ld\n", dtype, ptr, data); + TRACE("dereferenced data type %x at %p, got %Id\n", dtype, ptr, data); done_conf_grab: switch (pFormat[1]) { @@ -687,7 +687,7 @@ done_conf_grab: } finish_conf: - TRACE("resulting conformance is %ld\n", *pCount); + TRACE("resulting conformance is %Id\n", *pCount); return SkipConformance(pStubMsg, pFormat); } @@ -722,7 +722,7 @@ static inline void safe_buffer_length_increment(MIDL_STUB_MESSAGE *pStubMsg, ULO { if (pStubMsg->BufferLength + size < pStubMsg->BufferLength) /* integer overflow of pStubMsg->BufferSize */ { - ERR("buffer length overflow - BufferLength = %u, size = %u\n", + ERR("buffer length overflow - BufferLength = %lu, size = %lu\n", pStubMsg->BufferLength, size); RpcRaiseException(RPC_X_BAD_STUB_DATA); } @@ -736,7 +736,7 @@ static inline void safe_copy_from_buffer(MIDL_STUB_MESSAGE *pStubMsg, void *p, U if ((pStubMsg->Buffer + size < pStubMsg->Buffer) || /* integer overflow of pStubMsg->Buffer */ (pStubMsg->Buffer + size > pStubMsg->BufferEnd)) { - ERR("buffer overflow - Buffer = %p, BufferEnd = %p, size = %u\n", + ERR("buffer overflow - Buffer = %p, BufferEnd = %p, size = %lu\n", pStubMsg->Buffer, pStubMsg->BufferEnd, size); RpcRaiseException(RPC_X_BAD_STUB_DATA); } @@ -752,7 +752,7 @@ static inline void safe_copy_to_buffer(MIDL_STUB_MESSAGE *pStubMsg, const void * if ((pStubMsg->Buffer + size < pStubMsg->Buffer) || /* integer overflow of pStubMsg->Buffer */ (pStubMsg->Buffer + size > (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength)) { - ERR("buffer overflow - Buffer = %p, BufferEnd = %p, size = %u\n", + ERR("buffer overflow - Buffer = %p, BufferEnd = %p, size = %lu\n", pStubMsg->Buffer, (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength, size); RpcRaiseException(RPC_X_BAD_STUB_DATA); @@ -771,7 +771,7 @@ static void validate_string_data(MIDL_STUB_MESSAGE *pStubMsg, ULONG bufsize, ULO if ((pStubMsg->Buffer + bufsize < pStubMsg->Buffer) || (pStubMsg->Buffer + bufsize > pStubMsg->BufferEnd)) { - ERR("bufsize 0x%x exceeded buffer end %p of buffer %p\n", bufsize, + ERR("bufsize 0x%lx exceeded buffer end %p of buffer %p\n", bufsize, pStubMsg->BufferEnd, pStubMsg->Buffer); RpcRaiseException(RPC_X_BAD_STUB_DATA); } @@ -779,14 +779,14 @@ static void validate_string_data(MIDL_STUB_MESSAGE *pStubMsg, ULONG bufsize, ULO /* strings must always have null terminating bytes */ if (bufsize < esize) { - ERR("invalid string length of %d\n", bufsize / esize); + ERR("invalid string length of %ld\n", bufsize / esize); RpcRaiseException(RPC_S_INVALID_BOUND); } for (i = bufsize - esize; i < bufsize; i++) if (pStubMsg->Buffer[i] != 0) { - ERR("string not null-terminated at byte position %d, data is 0x%x\n", + ERR("string not null-terminated at byte position %ld, data is 0x%x\n", i, pStubMsg->Buffer[i]); RpcRaiseException(RPC_S_INVALID_BOUND); } @@ -843,13 +843,13 @@ static void PointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, else pointer_needs_marshaling = FALSE; pointer_id = Pointer ? NDR_POINTER_ID(pStubMsg) : 0; - TRACE("writing 0x%08x to buffer\n", pointer_id); + TRACE("writing 0x%08lx to buffer\n", pointer_id); NDR_LOCAL_UINT32_WRITE(Buffer, pointer_id); break; case FC_FP: pointer_needs_marshaling = !NdrFullPointerQueryPointer( pStubMsg->FullPtrXlatTables, Pointer, 1, &pointer_id); - TRACE("writing 0x%08x to buffer\n", pointer_id); + TRACE("writing 0x%08lx to buffer\n", pointer_id); NDR_LOCAL_UINT32_WRITE(Buffer, pointer_id); break; default: @@ -905,7 +905,7 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, break; case FC_UP: /* unique pointer */ pointer_id = NDR_LOCAL_UINT32_READ(Buffer); - TRACE("pointer_id is 0x%08x\n", pointer_id); + TRACE("pointer_id is 0x%08lx\n", pointer_id); if (pointer_id) pointer_needs_unmarshaling = TRUE; else { @@ -915,7 +915,7 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, break; case FC_OP: /* object pointer - we must free data before overwriting it */ pointer_id = NDR_LOCAL_UINT32_READ(Buffer); - TRACE("pointer_id is 0x%08x\n", pointer_id); + TRACE("pointer_id is 0x%08lx\n", pointer_id); /* An object pointer always allocates new memory (it cannot point to the * buffer). */ @@ -933,7 +933,7 @@ static void PointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, break; case FC_FP: pointer_id = NDR_LOCAL_UINT32_READ(Buffer); - TRACE("pointer_id is 0x%08x\n", pointer_id); + TRACE("pointer_id is 0x%08lx\n", pointer_id); pointer_needs_unmarshaling = !NdrFullPointerQueryRefId( pStubMsg->FullPtrXlatTables, pointer_id, 1, (void **)pPointer); break; @@ -1079,7 +1079,7 @@ static ULONG PointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, case FC_UP: /* unique pointer */ case FC_OP: /* object pointer - we must free data before overwriting it */ pointer_id = NDR_LOCAL_UINT32_READ(Buffer); - TRACE("pointer_id is 0x%08x\n", pointer_id); + TRACE("pointer_id is 0x%08lx\n", pointer_id); if (pointer_id) pointer_needs_sizing = TRUE; else @@ -1089,7 +1089,7 @@ static ULONG PointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, { void *pointer; pointer_id = NDR_LOCAL_UINT32_READ(Buffer); - TRACE("pointer_id is 0x%08x\n", pointer_id); + TRACE("pointer_id is 0x%08lx\n", pointer_id); pointer_needs_sizing = !NdrFullPointerQueryRefId( pStubMsg->FullPtrXlatTables, pointer_id, 1, &pointer); break; @@ -1693,7 +1693,7 @@ void WINAPI NdrSimpleTypeUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* case FC_ERROR_STATUS_T: case FC_ENUM32: BASE_TYPE_UNMARSHALL(ULONG); - TRACE("value: 0x%08x\n", *(ULONG *)pMemory); + TRACE("value: 0x%08lx\n", *(ULONG *)pMemory); break; case FC_FLOAT: BASE_TYPE_UNMARSHALL(float); @@ -1720,14 +1720,14 @@ void WINAPI NdrSimpleTypeUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* /* 32-bits on the wire, but int_ptr in memory */ *(INT_PTR *)pMemory = *(INT *)pStubMsg->Buffer; pStubMsg->Buffer += sizeof(INT); - TRACE("value: 0x%08lx\n", *(INT_PTR *)pMemory); + TRACE("value: 0x%08Ix\n", *(INT_PTR *)pMemory); break; case FC_UINT3264: align_pointer(&pStubMsg->Buffer, sizeof(UINT)); /* 32-bits on the wire, but int_ptr in memory */ *(UINT_PTR *)pMemory = *(UINT *)pStubMsg->Buffer; pStubMsg->Buffer += sizeof(UINT); - TRACE("value: 0x%08lx\n", *(UINT_PTR *)pMemory); + TRACE("value: 0x%08Ix\n", *(UINT_PTR *)pMemory); break; case FC_IGNORE: break; @@ -2225,13 +2225,13 @@ static inline ULONG array_read_variance_and_unmarshall( if (pFormat[1] != FC_STRING_SIZED && (pStubMsg->MaxCount != pStubMsg->ActualCount)) { - ERR("buffer size %d must equal memory size %ld for non-sized conformant strings\n", + ERR("buffer size %ld must equal memory size %Id for non-sized conformant strings\n", pStubMsg->ActualCount, pStubMsg->MaxCount); RpcRaiseException(RPC_S_INVALID_BOUND); } if (pStubMsg->Offset) { - ERR("conformant strings can't have Offset (%d)\n", pStubMsg->Offset); + ERR("conformant strings can't have Offset (%ld)\n", pStubMsg->Offset); RpcRaiseException(RPC_S_INVALID_BOUND); } @@ -2356,13 +2356,13 @@ static inline void array_memory_size( if (pFormat[1] != FC_STRING_SIZED && (pStubMsg->MaxCount != pStubMsg->ActualCount)) { - ERR("buffer size %d must equal memory size %ld for non-sized conformant strings\n", + ERR("buffer size %ld must equal memory size %Id for non-sized conformant strings\n", pStubMsg->ActualCount, pStubMsg->MaxCount); RpcRaiseException(RPC_S_INVALID_BOUND); } if (pStubMsg->Offset) { - ERR("conformant strings can't have Offset (%d)\n", pStubMsg->Offset); + ERR("conformant strings can't have Offset (%ld)\n", pStubMsg->Offset); RpcRaiseException(RPC_S_INVALID_BOUND); } @@ -2636,7 +2636,7 @@ unsigned char * WINAPI NdrNonConformantStringUnmarshall(PMIDL_STUB_MESSAGE pStu ReadVariance(pStubMsg, NULL, maxsize); if (pStubMsg->Offset) { - ERR("non-conformant strings can't have Offset (%d)\n", pStubMsg->Offset); + ERR("non-conformant strings can't have Offset (%ld)\n", pStubMsg->Offset); RpcRaiseException(RPC_S_INVALID_BOUND); } @@ -2728,7 +2728,7 @@ ULONG WINAPI NdrNonConformantStringMemorySize(PMIDL_STUB_MESSAGE pStubMsg, if (pStubMsg->Offset) { - ERR("non-conformant strings can't have Offset (%d)\n", pStubMsg->Offset); + ERR("non-conformant strings can't have Offset (%ld)\n", pStubMsg->Offset); RpcRaiseException(RPC_S_INVALID_BOUND); } @@ -2869,7 +2869,7 @@ static unsigned char * ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, case FC_ENUM16: { USHORT val = *(DWORD *)pMemory; - TRACE("enum16=%d <= %p\n", *(DWORD*)pMemory, pMemory); + TRACE("enum16=%ld <= %p\n", *(DWORD*)pMemory, pMemory); if (32767 < *(DWORD*)pMemory) RpcRaiseException(RPC_X_ENUM_VALUE_OUT_OF_RANGE); safe_copy_to_buffer(pStubMsg, &val, 2); @@ -2879,7 +2879,7 @@ static unsigned char * ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, case FC_LONG: case FC_ULONG: case FC_ENUM32: - TRACE("long=%d <= %p\n", *(DWORD*)pMemory, pMemory); + TRACE("long=%ld <= %p\n", *(DWORD*)pMemory, pMemory); safe_copy_to_buffer(pStubMsg, pMemory, 4); pMemory += 4; break; @@ -2887,7 +2887,7 @@ static unsigned char * ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, case FC_UINT3264: { UINT val = *(UINT_PTR *)pMemory; - TRACE("int3264=%ld <= %p\n", *(UINT_PTR *)pMemory, pMemory); + TRACE("int3264=%Id <= %p\n", *(UINT_PTR *)pMemory, pMemory); safe_copy_to_buffer(pStubMsg, &val, sizeof(UINT)); pMemory += sizeof(UINT_PTR); break; @@ -2970,7 +2970,7 @@ static unsigned char * ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, pFormat += 2; desc = pFormat + *(const SHORT*)pFormat; size = EmbeddedComplexSize(pStubMsg, desc); - TRACE("embedded complex (size=%d) <= %p\n", size, pMemory); + TRACE("embedded complex (size=%ld) <= %p\n", size, pMemory); m = NdrMarshaller[*desc & NDR_TABLE_MASK]; if (m) { @@ -3031,7 +3031,7 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, WORD val; safe_copy_from_buffer(pStubMsg, &val, 2); *(DWORD*)pMemory = val; - TRACE("enum16=%d => %p\n", *(DWORD*)pMemory, pMemory); + TRACE("enum16=%ld => %p\n", *(DWORD*)pMemory, pMemory); if (32767 < *(DWORD*)pMemory) RpcRaiseException(RPC_X_ENUM_VALUE_OUT_OF_RANGE); pMemory += 4; @@ -3041,7 +3041,7 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, case FC_ULONG: case FC_ENUM32: safe_copy_from_buffer(pStubMsg, pMemory, 4); - TRACE("long=%d => %p\n", *(DWORD*)pMemory, pMemory); + TRACE("long=%ld => %p\n", *(DWORD*)pMemory, pMemory); pMemory += 4; break; case FC_INT3264: @@ -3049,7 +3049,7 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, INT val; safe_copy_from_buffer(pStubMsg, &val, 4); *(INT_PTR *)pMemory = val; - TRACE("int3264=%ld => %p\n", *(INT_PTR*)pMemory, pMemory); + TRACE("int3264=%Id => %p\n", *(INT_PTR*)pMemory, pMemory); pMemory += sizeof(INT_PTR); break; } @@ -3058,7 +3058,7 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, UINT val; safe_copy_from_buffer(pStubMsg, &val, 4); *(UINT_PTR *)pMemory = val; - TRACE("uint3264=%ld => %p\n", *(UINT_PTR*)pMemory, pMemory); + TRACE("uint3264=%Id => %p\n", *(UINT_PTR*)pMemory, pMemory); pMemory += sizeof(UINT_PTR); break; } @@ -3140,7 +3140,7 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, pFormat += 2; desc = pFormat + *(const SHORT*)pFormat; size = EmbeddedComplexSize(pStubMsg, desc); - TRACE("embedded complex (size=%d) => %p\n", size, pMemory); + TRACE("embedded complex (size=%ld) => %p\n", size, pMemory); if (fMustAlloc) /* we can't pass fMustAlloc=TRUE into the marshaller for this type * since the type is part of the memory block that is encompassed by @@ -3629,7 +3629,7 @@ unsigned char * WINAPI NdrComplexStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, /* save it for use by embedded pointer code later */ pStubMsg->PointerBufferMark = (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength; - TRACE("difference = 0x%x\n", (ULONG)(pStubMsg->PointerBufferMark - pStubMsg->Buffer)); + TRACE("difference = 0x%lx\n", (ULONG)(pStubMsg->PointerBufferMark - pStubMsg->Buffer)); pointer_buffer_mark_set = TRUE; /* restore the original buffer length */ @@ -3715,7 +3715,7 @@ unsigned char * WINAPI NdrComplexStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, /* save it for use by embedded pointer code later */ pStubMsg->PointerBufferMark = pStubMsg->Buffer; - TRACE("difference = 0x%x\n", (ULONG)(pStubMsg->PointerBufferMark - saved_buffer)); + TRACE("difference = 0x%lx\n", (ULONG)(pStubMsg->PointerBufferMark - saved_buffer)); pointer_buffer_mark_set = TRUE; /* restore the original buffer */ @@ -3803,7 +3803,7 @@ void WINAPI NdrComplexStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg, /* save it for use by embedded pointer code later */ pStubMsg->PointerLength = pStubMsg->BufferLength; pointer_length_set = 1; - TRACE("difference = 0x%x\n", pStubMsg->PointerLength - saved_buffer_length); + TRACE("difference = 0x%lx\n", pStubMsg->PointerLength - saved_buffer_length); /* restore the original buffer length */ pStubMsg->BufferLength = saved_buffer_length; @@ -4186,7 +4186,7 @@ unsigned char * WINAPI NdrComplexArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, /* save it for use by embedded pointer code later */ pStubMsg->PointerBufferMark = (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength; - TRACE("difference = 0x%x\n", (ULONG)(pStubMsg->Buffer - (unsigned char *)pStubMsg->RpcMsg->Buffer)); + TRACE("difference = 0x%lx\n", (ULONG)(pStubMsg->Buffer - (unsigned char *)pStubMsg->RpcMsg->Buffer)); pointer_buffer_mark_set = TRUE; /* restore fields */ @@ -4242,7 +4242,7 @@ unsigned char * WINAPI NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, NdrComplexArrayMemorySize(pStubMsg, pFormat); pStubMsg->IgnoreEmbeddedPointers = saved_ignore_embedded; - TRACE("difference = 0x%x\n", (ULONG)(pStubMsg->Buffer - saved_buffer)); + TRACE("difference = 0x%lx\n", (ULONG)(pStubMsg->Buffer - saved_buffer)); if (!pStubMsg->PointerBufferMark) { /* save it for use by embedded pointer code later */ @@ -4362,10 +4362,10 @@ void WINAPI NdrComplexArrayFree(PMIDL_STUB_MESSAGE pStubMsg, pFormat += 4; pFormat = ComputeConformance(pStubMsg, pMemory, pFormat, def); - TRACE("conformance = %ld\n", pStubMsg->MaxCount); + TRACE("conformance = %Id\n", pStubMsg->MaxCount); pFormat = ComputeVariance(pStubMsg, pMemory, pFormat, pStubMsg->MaxCount); - TRACE("variance = %d\n", pStubMsg->ActualCount); + TRACE("variance = %ld\n", pStubMsg->ActualCount); count = pStubMsg->ActualCount; for (i = 0; i < count; i++) @@ -4533,7 +4533,7 @@ void WINAPI NdrUserMarshalBufferSize(PMIDL_STUB_MESSAGE pStubMsg, align_length(&pStubMsg->BufferLength, (flags & 0xf) + 1); if (bufsize) { - TRACE("size=%d\n", bufsize); + TRACE("size=%ld\n", bufsize); safe_buffer_length_increment(pStubMsg, bufsize); } else @@ -4612,7 +4612,7 @@ RPC_STATUS RPC_ENTRY NdrGetUserMarshalInfo(ULONG *flags, ULONG level, NDR_USER_M { USER_MARSHAL_CB *umcb = CONTAINING_RECORD(flags, USER_MARSHAL_CB, Flags); - TRACE("(%p,%u,%p)\n", flags, level, umi); + TRACE("(%p,%lu,%p)\n", flags, level, umi); if (level != 1) return RPC_S_INVALID_ARG; @@ -4680,7 +4680,7 @@ void WINAPI NdrConvert( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat ) */ void WINAPI NdrConvert2( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, LONG NumberParams ) { - FIXME("(pStubMsg == ^%p, pFormat == ^%p, NumberParams == %d): stub.\n", + FIXME("(pStubMsg == ^%p, pFormat == ^%p, NumberParams == %ld): stub.\n", pStubMsg, pFormat, NumberParams); /* FIXME: since this stub doesn't do any converting, the proper behavior is to raise an exception */ @@ -4739,7 +4739,7 @@ unsigned char * WINAPI NdrConformantStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, bufsize = safe_multiply(esize, pStubMsg->MaxCount); if (pCStructFormat->memory_size + bufsize < pCStructFormat->memory_size) /* integer overflow */ { - ERR("integer overflow of memory_size %u with bufsize %u\n", + ERR("integer overflow of memory_size %u with bufsize %lu\n", pCStructFormat->memory_size, bufsize); RpcRaiseException(RPC_X_BAD_STUB_DATA); } @@ -4794,7 +4794,7 @@ unsigned char * WINAPI NdrConformantStructUnmarshall(PMIDL_STUB_MESSAGE pStubMs bufsize = safe_multiply(esize, pStubMsg->MaxCount); if (pCStructFormat->memory_size + bufsize < pCStructFormat->memory_size) /* integer overflow */ { - ERR("integer overflow of memory_size %u with bufsize %u\n", + ERR("integer overflow of memory_size %u with bufsize %lu\n", pCStructFormat->memory_size, bufsize); RpcRaiseException(RPC_X_BAD_STUB_DATA); } @@ -5706,13 +5706,13 @@ static PFORMAT_STRING get_arm_offset_from_union_arm_selector(PMIDL_STUB_MESSAGE { if(type == 0xffff) { - ERR("no arm for 0x%x and no default case\n", discriminant); + ERR("no arm for 0x%lx and no default case\n", discriminant); RpcRaiseException(RPC_S_INVALID_TAG); return NULL; } if(type == 0) { - TRACE("falling back to empty default case for 0x%x\n", discriminant); + TRACE("falling back to empty default case for 0x%lx\n", discriminant); return NULL; } } @@ -6032,7 +6032,7 @@ unsigned char * WINAPI NdrEncapsulatedUnionMarshall(PMIDL_STUB_MESSAGE pStubMsg align_pointer_clear(&pStubMsg->Buffer, increment); switch_value = get_discriminant(switch_type, pMemory); - TRACE("got switch value 0x%x\n", switch_value); + TRACE("got switch value 0x%lx\n", switch_value); NdrBaseTypeMarshall(pStubMsg, pMemory, &switch_type); pMemory += increment; @@ -6063,7 +6063,7 @@ unsigned char * WINAPI NdrEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE pStubM align_pointer(&pStubMsg->Buffer, increment); switch_value = get_discriminant(switch_type, pStubMsg->Buffer); - TRACE("got switch value 0x%x\n", switch_value); + TRACE("got switch value 0x%lx\n", switch_value); size = *(const unsigned short*)pFormat + increment; if (!fMustAlloc && !*ppMemory) @@ -6105,7 +6105,7 @@ void WINAPI NdrEncapsulatedUnionBufferSize(PMIDL_STUB_MESSAGE pStubMsg, align_length(&pStubMsg->BufferLength, increment); switch_value = get_discriminant(switch_type, pMemory); - TRACE("got switch value 0x%x\n", switch_value); + TRACE("got switch value 0x%lx\n", switch_value); /* Add discriminant size */ NdrBaseTypeBufferSize(pStubMsg, (unsigned char *)&switch_value, &switch_type); @@ -6130,7 +6130,7 @@ ULONG WINAPI NdrEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE pStubMsg, align_pointer(&pStubMsg->Buffer, increment); switch_value = get_discriminant(switch_type, pStubMsg->Buffer); - TRACE("got switch value 0x%x\n", switch_value); + TRACE("got switch value 0x%lx\n", switch_value); pStubMsg->Memory += increment; @@ -6156,7 +6156,7 @@ void WINAPI NdrEncapsulatedUnionFree(PMIDL_STUB_MESSAGE pStubMsg, pFormat++; switch_value = get_discriminant(switch_type, pMemory); - TRACE("got switch value 0x%x\n", switch_value); + TRACE("got switch value 0x%lx\n", switch_value); pMemory += increment; @@ -6179,7 +6179,7 @@ unsigned char * WINAPI NdrNonEncapsulatedUnionMarshall(PMIDL_STUB_MESSAGE pStub pFormat++; pFormat = ComputeConformance(pStubMsg, pMemory, pFormat, 0); - TRACE("got switch value 0x%lx\n", pStubMsg->MaxCount); + TRACE("got switch value 0x%Ix\n", pStubMsg->MaxCount); /* Marshall discriminant */ NdrBaseTypeMarshall(pStubMsg, (unsigned char *)&pStubMsg->MaxCount, &switch_type); @@ -6248,7 +6248,7 @@ unsigned char * WINAPI NdrNonEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE pSt /* Unmarshall discriminant */ discriminant = unmarshall_discriminant(pStubMsg, &pFormat); - TRACE("unmarshalled discriminant %x\n", discriminant); + TRACE("unmarshalled discriminant %lx\n", discriminant); pFormat += *(const SHORT*)pFormat; @@ -6286,7 +6286,7 @@ void WINAPI NdrNonEncapsulatedUnionBufferSize(PMIDL_STUB_MESSAGE pStubMsg, pFormat++; pFormat = ComputeConformance(pStubMsg, pMemory, pFormat, 0); - TRACE("got switch value 0x%lx\n", pStubMsg->MaxCount); + TRACE("got switch value 0x%Ix\n", pStubMsg->MaxCount); /* Add discriminant size */ NdrBaseTypeBufferSize(pStubMsg, (unsigned char *)&pStubMsg->MaxCount, &switch_type); @@ -6304,7 +6304,7 @@ ULONG WINAPI NdrNonEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE pStubMsg, pFormat++; /* Unmarshall discriminant */ discriminant = unmarshall_discriminant(pStubMsg, &pFormat); - TRACE("unmarshalled discriminant 0x%x\n", discriminant); + TRACE("unmarshalled discriminant 0x%lx\n", discriminant); return union_arm_memory_size(pStubMsg, discriminant, pFormat + *(const SHORT*)pFormat); } @@ -6321,7 +6321,7 @@ void WINAPI NdrNonEncapsulatedUnionFree(PMIDL_STUB_MESSAGE pStubMsg, pFormat++; pFormat = ComputeConformance(pStubMsg, pMemory, pFormat, 0); - TRACE("got switch value 0x%lx\n", pStubMsg->MaxCount); + TRACE("got switch value 0x%Ix\n", pStubMsg->MaxCount); union_arm_free(pStubMsg, pMemory, pStubMsg->MaxCount, pFormat + *(const SHORT*)pFormat); } @@ -6479,7 +6479,7 @@ unsigned char *WINAPI NdrRangeUnmarshall( } base_type = pRange->flags_type & 0xf; - TRACE("base_type = 0x%02x, low_value = %d, high_value = %d\n", + TRACE("base_type = 0x%02x, low_value = %ld, high_value = %ld\n", base_type, pRange->low_value, pRange->high_value); #define RANGE_UNMARSHALL(mem_type, wire_type, format_spec) \ @@ -6533,12 +6533,12 @@ unsigned char *WINAPI NdrRangeUnmarshall( break; case FC_LONG: case FC_ENUM32: - RANGE_UNMARSHALL(LONG, LONG, "%d"); - TRACE("value: 0x%08x\n", **(ULONG **)ppMemory); + RANGE_UNMARSHALL(LONG, LONG, "%ld"); + TRACE("value: 0x%08lx\n", **(ULONG **)ppMemory); break; case FC_ULONG: - RANGE_UNMARSHALL(ULONG, ULONG, "%u"); - TRACE("value: 0x%08x\n", **(ULONG **)ppMemory); + RANGE_UNMARSHALL(ULONG, ULONG, "%lu"); + TRACE("value: 0x%08lx\n", **(ULONG **)ppMemory); break; case FC_ENUM16: RANGE_UNMARSHALL(UINT, USHORT, "%u"); @@ -6643,7 +6643,7 @@ static unsigned char *WINAPI NdrBaseTypeMarshall( case FC_ENUM32: align_pointer_clear(&pStubMsg->Buffer, sizeof(ULONG)); safe_copy_to_buffer(pStubMsg, pMemory, sizeof(ULONG)); - TRACE("value: 0x%08x\n", *(ULONG *)pMemory); + TRACE("value: 0x%08lx\n", *(ULONG *)pMemory); break; case FC_FLOAT: align_pointer_clear(&pStubMsg->Buffer, sizeof(float)); @@ -6735,7 +6735,7 @@ static unsigned char *WINAPI NdrBaseTypeUnmarshall( case FC_ERROR_STATUS_T: case FC_ENUM32: BASE_TYPE_UNMARSHALL(ULONG); - TRACE("value: 0x%08x\n", **(ULONG **)ppMemory); + TRACE("value: 0x%08lx\n", **(ULONG **)ppMemory); break; case FC_FLOAT: BASE_TYPE_UNMARSHALL(float); @@ -6775,7 +6775,7 @@ static unsigned char *WINAPI NdrBaseTypeUnmarshall( *ppMemory = NdrAllocate(pStubMsg, sizeof(INT_PTR)); safe_copy_from_buffer(pStubMsg, &val, sizeof(INT)); **(INT_PTR **)ppMemory = val; - TRACE("value: 0x%08lx\n", **(INT_PTR **)ppMemory); + TRACE("value: 0x%08Ix\n", **(INT_PTR **)ppMemory); } break; case FC_UINT3264: @@ -6790,7 +6790,7 @@ static unsigned char *WINAPI NdrBaseTypeUnmarshall( *ppMemory = NdrAllocate(pStubMsg, sizeof(UINT_PTR)); safe_copy_from_buffer(pStubMsg, &val, sizeof(UINT)); **(UINT_PTR **)ppMemory = val; - TRACE("value: 0x%08lx\n", **(UINT_PTR **)ppMemory); + TRACE("value: 0x%08Ix\n", **(UINT_PTR **)ppMemory); } break; case FC_IGNORE: @@ -7263,7 +7263,7 @@ void WINAPI NdrCorrelationInitialize(PMIDL_STUB_MESSAGE pStubMsg, void *pMemory, static int once; if (!once++) - FIXME("(%p, %p, %d, 0x%x): semi-stub\n", pStubMsg, pMemory, CacheSize, Flags); + FIXME("(%p, %p, %ld, 0x%lx): semi-stub\n", pStubMsg, pMemory, CacheSize, Flags); if (pStubMsg->CorrDespIncrement == 0) pStubMsg->CorrDespIncrement = 2; /* size of the normal (non-range) /robust payload */ diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index c8026c0ff15..c5e0b34ecc5 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -116,7 +116,7 @@ static ULONG WINAPI RpcStream_Release(LPSTREAM iface) RpcStreamImpl *This = impl_from_IStream(iface); ULONG ref = InterlockedDecrement( &This->RefCount ); if (!ref) { - TRACE("size=%d\n", *This->size); + TRACE("size=%ld\n", *This->size); This->pMsg->Buffer = This->data + *This->size; HeapFree(GetProcessHeap(),0,This); } @@ -203,7 +203,7 @@ static HRESULT WINAPI RpcStream_CopyTo(IStream *iface, IStream *dest, static HRESULT WINAPI RpcStream_Commit(IStream *iface, DWORD flags) { RpcStreamImpl *This = impl_from_IStream(iface); - FIXME("(%p)->(0x%08x): stub\n", This, flags); + FIXME("(%p)->(0x%08lx): stub\n", This, flags); return E_NOTIMPL; } @@ -276,7 +276,7 @@ static HRESULT RpcStream_Create(PMIDL_STUB_MESSAGE pStubMsg, BOOL init, ULONG *s This->data = pStubMsg->Buffer + sizeof(DWORD); This->pos = 0; if (init) *This->size = 0; - TRACE("init size=%d\n", *This->size); + TRACE("init size=%ld\n", *This->size); if (size) *size = *This->size; *stream = &This->IStream_iface; @@ -382,7 +382,7 @@ void WINAPI NdrInterfacePointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, COM_GetMarshalSizeMax(&size, riid, (LPUNKNOWN)pMemory, pStubMsg->dwDestContext, pStubMsg->pvDestContext, MSHLFLAGS_NORMAL); - TRACE("size=%d\n", size); + TRACE("size=%ld\n", size); pStubMsg->BufferLength += sizeof(DWORD) + size; } diff --git a/dlls/rpcrt4/ndr_stubless.c b/dlls/rpcrt4/ndr_stubless.c index 815b8ecce23..e15c93d2310 100644 --- a/dlls/rpcrt4/ndr_stubless.c +++ b/dlls/rpcrt4/ndr_stubless.c @@ -184,7 +184,7 @@ static DWORD calc_arg_size(MIDL_STUB_MESSAGE *pStubMsg, PFORMAT_STRING pFormat) break; case FC_BOGUS_ARRAY: pFormat = ComputeConformance(pStubMsg, NULL, pFormat + 4, *(const WORD*)&pFormat[2]); - TRACE("conformance = %ld\n", pStubMsg->MaxCount); + TRACE("conformance = %Id\n", pStubMsg->MaxCount); pFormat = ComputeVariance(pStubMsg, NULL, pFormat, pStubMsg->MaxCount); size = ComplexStructSize(pStubMsg, pFormat); size *= pStubMsg->MaxCount; @@ -873,7 +873,7 @@ LONG_PTR CDECL DECLSPEC_HIDDEN ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORM TRACE("pStubDesc %p, pFormat %p, ...\n", pStubDesc, pFormat); - TRACE("NDR Version: 0x%x\n", pStubDesc->Version); + TRACE("NDR Version: 0x%lx\n", pStubDesc->Version); if (pProcHeader->Oi_flags & Oi_HAS_RPCFLAGS) { @@ -891,7 +891,7 @@ LONG_PTR CDECL DECLSPEC_HIDDEN ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORM TRACE("stack size: 0x%x\n", stack_size); TRACE("proc num: %d\n", procedure_number); TRACE("Oi_flags = 0x%02x\n", pProcHeader->Oi_flags); - TRACE("MIDL stub version = 0x%x\n", pStubDesc->MIDLVersion); + TRACE("MIDL stub version = 0x%lx\n", pStubDesc->MIDLVersion); pHandleFormat = pFormat; @@ -998,7 +998,7 @@ LONG_PTR CDECL DECLSPEC_HIDDEN ndr_client_call( PMIDL_STUB_DESC pStubDesc, PFORM number_of_params, Oif_flags, ext_flags, pProcHeader); } - TRACE("RetVal = 0x%lx\n", RetVal); + TRACE("RetVal = 0x%Ix\n", RetVal); return RetVal; } @@ -1344,7 +1344,7 @@ LONG WINAPI NdrStubCall2( pFormat = pServerInfo->ProcString + pServerInfo->FmtStringOffset[pRpcMsg->ProcNum]; pProcHeader = (const NDR_PROC_HEADER *)&pFormat[0]; - TRACE("NDR Version: 0x%x\n", pStubDesc->Version); + TRACE("NDR Version: 0x%lx\n", pStubDesc->Version); if (pProcHeader->Oi_flags & Oi_HAS_RPCFLAGS) { @@ -1496,7 +1496,7 @@ LONG WINAPI NdrStubCall2( if (retval_ptr) { - TRACE("stub implementation returned 0x%lx\n", retval); + TRACE("stub implementation returned 0x%Ix\n", retval); *retval_ptr = retval; } else @@ -1616,7 +1616,7 @@ static void do_ndr_async_client_call( const MIDL_STUB_DESC *pStubDesc, PFORMAT_S /* Later NDR language versions probably won't be backwards compatible */ if (pStubDesc->Version > 0x60001) { - FIXME("Incompatible stub description version: 0x%x\n", pStubDesc->Version); + FIXME("Incompatible stub description version: 0x%lx\n", pStubDesc->Version); RpcRaiseException(RPC_X_WRONG_STUB_VERSION); } @@ -1657,7 +1657,7 @@ static void do_ndr_async_client_call( const MIDL_STUB_DESC *pStubDesc, PFORMAT_S NdrClientInitializeNew(pRpcMsg, pStubMsg, pStubDesc, procedure_number); TRACE("Oi_flags = 0x%02x\n", pProcHeader->Oi_flags); - TRACE("MIDL stub version = 0x%x\n", pStubDesc->MIDLVersion); + TRACE("MIDL stub version = 0x%lx\n", pStubDesc->MIDLVersion); /* needed for conformance of top-level objects */ pStubMsg->StackTop = I_RpcAllocate(async_call_data->stack_size); @@ -1808,7 +1808,7 @@ LONG_PTR CDECL DECLSPEC_HIDDEN ndr_async_client_call( PMIDL_STUB_DESC pStubDesc, } __EXCEPT_ALL { - FIXME("exception %x during ndr_async_client_call()\n", GetExceptionCode()); + FIXME("exception %lx during ndr_async_client_call()\n", GetExceptionCode()); ret = GetExceptionCode(); } __ENDTRY @@ -1816,7 +1816,7 @@ LONG_PTR CDECL DECLSPEC_HIDDEN ndr_async_client_call( PMIDL_STUB_DESC pStubDesc, else do_ndr_async_client_call( pStubDesc, pFormat, stack_top); - TRACE("returning %ld\n", ret); + TRACE("returning %Id\n", ret); return ret; } @@ -1897,7 +1897,7 @@ cleanup: I_RpcFree(pStubMsg->StackTop); I_RpcFree(async_call_data); - TRACE("-- 0x%x\n", status); + TRACE("-- 0x%lx\n", status); return status; } @@ -1963,7 +1963,7 @@ void RPC_ENTRY NdrAsyncServerCall(PRPC_MESSAGE pRpcMsg) pFormat = pServerInfo->ProcString + pServerInfo->FmtStringOffset[pRpcMsg->ProcNum]; pProcHeader = (const NDR_PROC_HEADER *)&pFormat[0]; - TRACE("NDR Version: 0x%x\n", pStubDesc->Version); + TRACE("NDR Version: 0x%lx\n", pStubDesc->Version); async_call_data = I_RpcAllocate(sizeof(*async_call_data) + sizeof(MIDL_STUB_MESSAGE) + sizeof(RPC_MESSAGE)); if (!async_call_data) RpcRaiseException(RPC_X_NO_MEMORY); @@ -2143,7 +2143,7 @@ RPC_STATUS NdrpCompleteAsyncServerCall(RPC_ASYNC_STATE *pAsync, void *Reply) if (async_call_data->retval_ptr) { - TRACE("stub implementation returned 0x%lx\n", *(LONG_PTR *)Reply); + TRACE("stub implementation returned 0x%Ix\n", *(LONG_PTR *)Reply); *async_call_data->retval_ptr = *(LONG_PTR *)Reply; } else @@ -2219,7 +2219,7 @@ LONG_PTR CDECL DECLSPEC_HIDDEN ndr64_client_call( MIDL_STUBLESS_PROXY_INFO *info { ULONG_PTR i; - TRACE("info %p, proc %u, retval %p, stack_top %p, fpu_stack %p\n", + TRACE("info %p, proc %lu, retval %p, stack_top %p, fpu_stack %p\n", info, proc, retval, stack_top, fpu_stack); for (i = 0; i < info->nCount; ++i) @@ -2279,7 +2279,7 @@ LONG_PTR CDECL DECLSPEC_HIDDEN ndr64_async_client_call( MIDL_STUBLESS_PROXY_INFO { ULONG_PTR i; - TRACE("info %p, proc %u, retval %p, stack_top %p, fpu_stack %p\n", + TRACE("info %p, proc %lu, retval %p, stack_top %p, fpu_stack %p\n", info, proc, retval, stack_top, fpu_stack); for (i = 0; i < info->nCount; ++i) diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index f1f25885b75..ff1d1025838 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -1318,7 +1318,7 @@ static ULONG WINAPI typelib_proxy_Release(IRpcProxyBuffer *iface) struct typelib_proxy *proxy = CONTAINING_RECORD(iface, struct typelib_proxy, proxy.IRpcProxyBuffer_iface); ULONG refcount = InterlockedDecrement(&proxy->proxy.RefCount); - TRACE("(%p) decreasing refs to %d\n", proxy, refcount); + TRACE("(%p) decreasing refs to %ld\n", proxy, refcount); if (!refcount) { @@ -1455,7 +1455,7 @@ static ULONG WINAPI typelib_stub_Release(IRpcStubBuffer *iface) struct typelib_stub *stub = CONTAINING_RECORD(iface, struct typelib_stub, stub.stub_buffer); ULONG refcount = InterlockedDecrement(&stub->stub.stub_buffer.RefCount); - TRACE("(%p) decreasing refs to %d\n", stub, refcount); + TRACE("(%p) decreasing refs to %ld\n", stub, refcount); if (!refcount) { @@ -1488,7 +1488,7 @@ static HRESULT typelib_stub_init(struct typelib_stub *stub, IUnknown *server, (void **)&stub->stub.stub_buffer.pvServerObject); if (FAILED(hr)) { - WARN("Failed to get interface %s, hr %#x.\n", + WARN("Failed to get interface %s, hr %#lx.\n", debugstr_guid(stub->stub_vtbl.header.piid), hr); stub->stub.stub_buffer.pvServerObject = server; IUnknown_AddRef(server); diff --git a/dlls/rpcrt4/rpc_assoc.c b/dlls/rpcrt4/rpc_assoc.c index ab865c2de14..80851c8cddd 100644 --- a/dlls/rpcrt4/rpc_assoc.c +++ b/dlls/rpcrt4/rpc_assoc.c @@ -251,7 +251,7 @@ static RPC_STATUS RpcAssoc_BindConnection(const RpcAssoc *assoc, RpcConnection * status = RPCRT4_ReceiveWithAuth(conn, &response_hdr, &msg, &auth_data, &auth_length); if (status != RPC_S_OK) { - ERR("receive failed with error %d\n", status); + ERR("receive failed with error %ld\n", status); return status; } diff --git a/dlls/rpcrt4/rpc_async.c b/dlls/rpcrt4/rpc_async.c index 00c2d6bede8..d194496812b 100644 --- a/dlls/rpcrt4/rpc_async.c +++ b/dlls/rpcrt4/rpc_async.c @@ -143,7 +143,7 @@ RPC_STATUS WINAPI RpcAsyncCompleteCall(PRPC_ASYNC_STATE pAsync, void *Reply) */ RPC_STATUS WINAPI RpcAsyncAbortCall(PRPC_ASYNC_STATE pAsync, ULONG ExceptionCode) { - FIXME("(%p, %d/0x%x): stub\n", pAsync, ExceptionCode, ExceptionCode); + FIXME("(%p, %ld/0x%lx): stub\n", pAsync, ExceptionCode, ExceptionCode); return RPC_S_INVALID_ASYNC_HANDLE; } diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 56502e4eb34..ba7ef418419 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -1390,7 +1390,7 @@ BOOL RpcQualityOfService_IsEqual(const RpcQualityOfService *qos1, const RpcQuali if (!qos1 || !qos2) return FALSE; - TRACE("qos1 = { %d %d %d %d }, qos2 = { %d %d %d %d }\n", + TRACE("qos1 = { %ld %ld %ld %ld }, qos2 = { %ld %ld %ld %ld }\n", qos1->qos->Capabilities, qos1->qos->IdentityTracking, qos1->qos->ImpersonationType, qos1->qos->AdditionalSecurityInfoType, qos2->qos->Capabilities, qos2->qos->IdentityTracking, @@ -1481,7 +1481,7 @@ RpcBindingInqAuthInfoExA( RPC_BINDING_HANDLE Binding, RPC_CSTR *ServerPrincName, RPC_STATUS status; RPC_WSTR principal; - TRACE("%p %p %p %p %p %p %u %p\n", Binding, ServerPrincName, AuthnLevel, + TRACE("%p %p %p %p %p %p %lu %p\n", Binding, ServerPrincName, AuthnLevel, AuthnSvc, AuthIdentity, AuthzSvc, RpcQosVersion, SecurityQOS); status = RpcBindingInqAuthInfoExW(Binding, ServerPrincName ? &principal : NULL, AuthnLevel, @@ -1506,7 +1506,7 @@ RpcBindingInqAuthInfoExW( RPC_BINDING_HANDLE Binding, RPC_WSTR *ServerPrincName, { RpcBinding *bind = Binding; - TRACE("%p %p %p %p %p %p %u %p\n", Binding, ServerPrincName, AuthnLevel, + TRACE("%p %p %p %p %p %p %lu %p\n", Binding, ServerPrincName, AuthnLevel, AuthnSvc, AuthIdentity, AuthzSvc, RpcQosVersion, SecurityQOS); if (!bind->AuthInfo) return RPC_S_BINDING_HAS_NO_AUTH; @@ -1595,7 +1595,7 @@ RpcBindingInqAuthClientExA( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE * RPC_STATUS status; RPC_WSTR principal; - TRACE("%p %p %p %p %p %p 0x%x\n", ClientBinding, Privs, ServerPrincName, AuthnLevel, + TRACE("%p %p %p %p %p %p 0x%lx\n", ClientBinding, Privs, ServerPrincName, AuthnLevel, AuthnSvc, AuthzSvc, Flags); status = RpcBindingInqAuthClientExW(ClientBinding, Privs, ServerPrincName ? &principal : NULL, @@ -1620,7 +1620,7 @@ RpcBindingInqAuthClientExW( RPC_BINDING_HANDLE ClientBinding, RPC_AUTHZ_HANDLE * { RpcBinding *bind; - TRACE("%p %p %p %p %p %p 0x%x\n", ClientBinding, Privs, ServerPrincName, AuthnLevel, + TRACE("%p %p %p %p %p %p 0x%lx\n", ClientBinding, Privs, ServerPrincName, AuthnLevel, AuthnSvc, AuthzSvc, Flags); if (!ClientBinding) ClientBinding = I_RpcGetCurrentCallHandle(); @@ -1676,21 +1676,21 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HANDLE Binding, RPC_CSTR ServerPrincName, PSecPkgInfoA packages; ULONG cbMaxToken; - TRACE("%p %s %u %u %p %u %p\n", Binding, debugstr_a((const char*)ServerPrincName), + TRACE("%p %s %lu %lu %p %lu %p\n", Binding, debugstr_a((const char*)ServerPrincName), AuthnLevel, AuthnSvc, AuthIdentity, AuthzSvr, SecurityQos); if (SecurityQos) { RPC_STATUS status; - TRACE("SecurityQos { Version=%d, Capabilities=0x%x, IdentityTracking=%d, ImpersonationLevel=%d", + TRACE("SecurityQos { Version=%ld, Capabilities=0x%lx, IdentityTracking=%ld, ImpersonationLevel=%ld", SecurityQos->Version, SecurityQos->Capabilities, SecurityQos->IdentityTracking, SecurityQos->ImpersonationType); if (SecurityQos->Version >= 2) { const RPC_SECURITY_QOS_V2_A *SecurityQos2 = (const RPC_SECURITY_QOS_V2_A *)SecurityQos; - TRACE(", AdditionalSecurityInfoType=%d", SecurityQos2->AdditionalSecurityInfoType); + TRACE(", AdditionalSecurityInfoType=%ld", SecurityQos2->AdditionalSecurityInfoType); if (SecurityQos2->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP) - TRACE(", { %p, 0x%x, %d, %d, %p(%u), %s }", + TRACE(", { %p, 0x%lx, %ld, %ld, %p(%lu), %s }", SecurityQos2->u.HttpCredentials->TransportCredentials, SecurityQos2->u.HttpCredentials->Flags, SecurityQos2->u.HttpCredentials->AuthenticationTarget, @@ -1726,21 +1726,21 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HANDLE Binding, RPC_CSTR ServerPrincName, if (AuthnLevel > RPC_C_AUTHN_LEVEL_PKT_PRIVACY) { - FIXME("unknown AuthnLevel %u\n", AuthnLevel); + FIXME("unknown AuthnLevel %lu\n", AuthnLevel); return RPC_S_UNKNOWN_AUTHN_LEVEL; } /* RPC_C_AUTHN_WINNT ignores the AuthzSvr parameter */ if (AuthzSvr && AuthnSvc != RPC_C_AUTHN_WINNT) { - FIXME("unsupported AuthzSvr %u\n", AuthzSvr); + FIXME("unsupported AuthzSvr %lu\n", AuthzSvr); return RPC_S_UNKNOWN_AUTHZ_SERVICE; } r = EnumerateSecurityPackagesA(&package_count, &packages); if (r != SEC_E_OK) { - ERR("EnumerateSecurityPackagesA failed with error 0x%08x\n", r); + ERR("EnumerateSecurityPackagesA failed with error 0x%08lx\n", r); return RPC_S_SEC_PKG_ERROR; } @@ -1750,12 +1750,12 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HANDLE Binding, RPC_CSTR ServerPrincName, if (i == package_count) { - FIXME("unsupported AuthnSvc %u\n", AuthnSvc); + FIXME("unsupported AuthnSvc %lu\n", AuthnSvc); FreeContextBuffer(packages); return RPC_S_UNKNOWN_AUTHN_SERVICE; } - TRACE("found package %s for service %u\n", packages[i].Name, AuthnSvc); + TRACE("found package %s for service %lu\n", packages[i].Name, AuthnSvc); r = AcquireCredentialsHandleA(NULL, packages[i].Name, SECPKG_CRED_OUTBOUND, NULL, AuthIdentity, NULL, NULL, &cred, &exp); cbMaxToken = packages[i].cbMaxToken; @@ -1785,7 +1785,7 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HANDLE Binding, RPC_CSTR ServerPrincName, } else { - ERR("AcquireCredentialsHandleA failed with error 0x%08x\n", r); + ERR("AcquireCredentialsHandleA failed with error 0x%08lx\n", r); return RPC_S_SEC_PKG_ERROR; } } @@ -1807,21 +1807,21 @@ RpcBindingSetAuthInfoExW( RPC_BINDING_HANDLE Binding, RPC_WSTR ServerPrincName, PSecPkgInfoW packages; ULONG cbMaxToken; - TRACE("%p %s %u %u %p %u %p\n", Binding, debugstr_w(ServerPrincName), + TRACE("%p %s %lu %lu %p %lu %p\n", Binding, debugstr_w(ServerPrincName), AuthnLevel, AuthnSvc, AuthIdentity, AuthzSvr, SecurityQos); if (SecurityQos) { RPC_STATUS status; - TRACE("SecurityQos { Version=%d, Capabilities=0x%x, IdentityTracking=%d, ImpersonationLevel=%d", + TRACE("SecurityQos { Version=%ld, Capabilities=0x%lx, IdentityTracking=%ld, ImpersonationLevel=%ld", SecurityQos->Version, SecurityQos->Capabilities, SecurityQos->IdentityTracking, SecurityQos->ImpersonationType); if (SecurityQos->Version >= 2) { const RPC_SECURITY_QOS_V2_W *SecurityQos2 = (const RPC_SECURITY_QOS_V2_W *)SecurityQos; - TRACE(", AdditionalSecurityInfoType=%d", SecurityQos2->AdditionalSecurityInfoType); + TRACE(", AdditionalSecurityInfoType=%ld", SecurityQos2->AdditionalSecurityInfoType); if (SecurityQos2->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP) - TRACE(", { %p, 0x%x, %d, %d, %p(%u), %s }", + TRACE(", { %p, 0x%lx, %ld, %ld, %p(%lu), %s }", SecurityQos2->u.HttpCredentials->TransportCredentials, SecurityQos2->u.HttpCredentials->Flags, SecurityQos2->u.HttpCredentials->AuthenticationTarget, @@ -1857,21 +1857,21 @@ RpcBindingSetAuthInfoExW( RPC_BINDING_HANDLE Binding, RPC_WSTR ServerPrincName, if (AuthnLevel > RPC_C_AUTHN_LEVEL_PKT_PRIVACY) { - FIXME("unknown AuthnLevel %u\n", AuthnLevel); + FIXME("unknown AuthnLevel %lu\n", AuthnLevel); return RPC_S_UNKNOWN_AUTHN_LEVEL; } /* RPC_C_AUTHN_WINNT ignores the AuthzSvr parameter */ if (AuthzSvr && AuthnSvc != RPC_C_AUTHN_WINNT) { - FIXME("unsupported AuthzSvr %u\n", AuthzSvr); + FIXME("unsupported AuthzSvr %lu\n", AuthzSvr); return RPC_S_UNKNOWN_AUTHZ_SERVICE; } r = EnumerateSecurityPackagesW(&package_count, &packages); if (r != SEC_E_OK) { - ERR("EnumerateSecurityPackagesW failed with error 0x%08x\n", r); + ERR("EnumerateSecurityPackagesW failed with error 0x%08lx\n", r); return RPC_S_SEC_PKG_ERROR; } @@ -1881,12 +1881,12 @@ RpcBindingSetAuthInfoExW( RPC_BINDING_HANDLE Binding, RPC_WSTR ServerPrincName, if (i == package_count) { - FIXME("unsupported AuthnSvc %u\n", AuthnSvc); + FIXME("unsupported AuthnSvc %lu\n", AuthnSvc); FreeContextBuffer(packages); return RPC_S_UNKNOWN_AUTHN_SERVICE; } - TRACE("found package %s for service %u\n", debugstr_w(packages[i].Name), AuthnSvc); + TRACE("found package %s for service %lu\n", debugstr_w(packages[i].Name), AuthnSvc); r = AcquireCredentialsHandleW(NULL, packages[i].Name, SECPKG_CRED_OUTBOUND, NULL, AuthIdentity, NULL, NULL, &cred, &exp); cbMaxToken = packages[i].cbMaxToken; @@ -1916,7 +1916,7 @@ RpcBindingSetAuthInfoExW( RPC_BINDING_HANDLE Binding, RPC_WSTR ServerPrincName, } else { - ERR("AcquireCredentialsHandleW failed with error 0x%08x\n", r); + ERR("AcquireCredentialsHandleW failed with error 0x%08lx\n", r); return RPC_S_SEC_PKG_ERROR; } } @@ -1928,7 +1928,7 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingSetAuthInfoA( RPC_BINDING_HANDLE Binding, RPC_CSTR ServerPrincName, ULONG AuthnLevel, ULONG AuthnSvc, RPC_AUTH_IDENTITY_HANDLE AuthIdentity, ULONG AuthzSvr ) { - TRACE("%p %s %u %u %p %u\n", Binding, debugstr_a((const char*)ServerPrincName), + TRACE("%p %s %lu %lu %p %lu\n", Binding, debugstr_a((const char*)ServerPrincName), AuthnLevel, AuthnSvc, AuthIdentity, AuthzSvr); return RpcBindingSetAuthInfoExA(Binding, ServerPrincName, AuthnLevel, AuthnSvc, AuthIdentity, AuthzSvr, NULL); } @@ -1940,7 +1940,7 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingSetAuthInfoW( RPC_BINDING_HANDLE Binding, RPC_WSTR ServerPrincName, ULONG AuthnLevel, ULONG AuthnSvc, RPC_AUTH_IDENTITY_HANDLE AuthIdentity, ULONG AuthzSvr ) { - TRACE("%p %s %u %u %p %u\n", Binding, debugstr_w(ServerPrincName), + TRACE("%p %s %lu %lu %p %lu\n", Binding, debugstr_w(ServerPrincName), AuthnLevel, AuthnSvc, AuthIdentity, AuthzSvr); return RpcBindingSetAuthInfoExW(Binding, ServerPrincName, AuthnLevel, AuthnSvc, AuthIdentity, AuthzSvr, NULL); } @@ -1950,7 +1950,7 @@ RpcBindingSetAuthInfoW( RPC_BINDING_HANDLE Binding, RPC_WSTR ServerPrincName, UL */ RPC_STATUS WINAPI RpcBindingSetOption(RPC_BINDING_HANDLE BindingHandle, ULONG Option, ULONG_PTR OptionValue) { - TRACE("(%p, %d, %ld)\n", BindingHandle, Option, OptionValue); + TRACE("(%p, %ld, %Id)\n", BindingHandle, Option, OptionValue); switch (Option) { @@ -1969,7 +1969,7 @@ RPC_STATUS WINAPI RpcBindingSetOption(RPC_BINDING_HANDLE BindingHandle, ULONG Op break; } default: - FIXME("option %u not supported\n", Option); + FIXME("option %lu not supported\n", Option); break; } return RPC_S_OK; diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index 35af454ce95..2ef5f6a8860 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -116,7 +116,7 @@ static BOOL start_rpcss(void) } while (status.dwCurrentState == SERVICE_START_PENDING); if (status.dwCurrentState != SERVICE_RUNNING) - WARN( "RpcSs failed to start %u\n", status.dwCurrentState ); + WARN( "RpcSs failed to start %lu\n", status.dwCurrentState ); } else ERR( "failed to start RpcSs service\n" ); @@ -206,12 +206,12 @@ static RPC_STATUS epm_register( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *Bindin TRACE(" ifid=%s\n", debugstr_guid(&If->InterfaceId.SyntaxGUID)); for (i=0; i<BindingVector->Count; i++) { RpcBinding* bind = BindingVector->BindingH[i]; - TRACE(" protseq[%d]=%s\n", i, debugstr_a(bind->Protseq)); - TRACE(" endpoint[%d]=%s\n", i, debugstr_a(bind->Endpoint)); + TRACE(" protseq[%ld]=%s\n", i, debugstr_a(bind->Protseq)); + TRACE(" endpoint[%ld]=%s\n", i, debugstr_a(bind->Endpoint)); } if (UuidVector) { for (i=0; i<UuidVector->Count; i++) - TRACE(" obj[%d]=%s\n", i, debugstr_guid(UuidVector->Uuid[i])); + TRACE(" obj[%ld]=%s\n", i, debugstr_guid(UuidVector->Uuid[i])); } if (!BindingVector->Count) return RPC_S_OK; @@ -270,7 +270,7 @@ static RPC_STATUS epm_register( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *Bindin continue; } if (status2 != RPC_S_OK) - ERR("ept_insert failed with error %d\n", status2); + ERR("ept_insert failed with error %ld\n", status2); status = status2; /* FIXME: convert status? */ break; } @@ -354,12 +354,12 @@ RPC_STATUS WINAPI RpcEpUnregister( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *Bin TRACE(" ifid=%s\n", debugstr_guid(&If->InterfaceId.SyntaxGUID)); for (i=0; i<BindingVector->Count; i++) { RpcBinding* bind = BindingVector->BindingH[i]; - TRACE(" protseq[%d]=%s\n", i, debugstr_a(bind->Protseq)); - TRACE(" endpoint[%d]=%s\n", i, debugstr_a(bind->Endpoint)); + TRACE(" protseq[%ld]=%s\n", i, debugstr_a(bind->Protseq)); + TRACE(" endpoint[%ld]=%s\n", i, debugstr_a(bind->Endpoint)); } if (UuidVector) { for (i=0; i<UuidVector->Count; i++) - TRACE(" obj[%d]=%s\n", i, debugstr_guid(UuidVector->Uuid[i])); + TRACE(" obj[%ld]=%s\n", i, debugstr_guid(UuidVector->Uuid[i])); } entries = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*entries) * BindingVector->Count * (UuidVector ? UuidVector->Count : 1)); @@ -407,7 +407,7 @@ RPC_STATUS WINAPI RpcEpUnregister( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *Bin if (status2 == RPC_S_SERVER_UNAVAILABLE) status2 = EPT_S_NOT_REGISTERED; if (status2 != RPC_S_OK) - ERR("ept_insert failed with error %d\n", status2); + ERR("ept_insert failed with error %ld\n", status2); status = status2; /* FIXME: convert status? */ } RpcBindingFree(&handle); @@ -501,7 +501,7 @@ RPC_STATUS WINAPI RpcEpResolveBinding( RPC_BINDING_HANDLE Binding, RPC_IF_HANDLE if (!resolved_endpoint) { status = TowerExplode(towers[i], NULL, NULL, NULL, &resolved_endpoint, NULL); - TRACE("status = %d\n", status); + TRACE("status = %ld\n", status); } I_RpcFree(towers[i]); } diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 59cd438a26a..4a6ebf434f2 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -524,7 +524,7 @@ BOOL RPCRT4_IsValidHttpPacket(RpcPktHdr *hdr, unsigned char *data, data_len -= 24; break; default: - FIXME("unimplemented type 0x%x\n", type); + FIXME("unimplemented type 0x%lx\n", type); break; } } @@ -554,7 +554,7 @@ static unsigned char *RPCRT4_NextHttpHeaderField(unsigned char *data) case 0x1: return data + 24; default: - FIXME("unimplemented type 0x%x\n", type); + FIXME("unimplemented type 0x%lx\n", type); return data; } } @@ -580,7 +580,7 @@ RPC_STATUS RPCRT4_ParseHttpPrepareHeader1(RpcPktHdr *header, type = READ_HTTP_PAYLOAD_FIELD_TYPE(data); if (type != 0x00000002) { - ERR("invalid type 0x%08x\n", type); + ERR("invalid type 0x%08lx\n", type); return RPC_S_PROTOCOL_ERROR; } *field1 = *(ULONG *)GET_HTTP_PAYLOAD_FIELD_DATA(data); @@ -608,7 +608,7 @@ RPC_STATUS RPCRT4_ParseHttpPrepareHeader2(RpcPktHdr *header, type = READ_HTTP_PAYLOAD_FIELD_TYPE(data); if (type != 0x00000006) { - ERR("invalid type for field 1: 0x%08x\n", type); + ERR("invalid type for field 1: 0x%08lx\n", type); return RPC_S_PROTOCOL_ERROR; } *field1 = *(ULONG *)GET_HTTP_PAYLOAD_FIELD_DATA(data); @@ -617,7 +617,7 @@ RPC_STATUS RPCRT4_ParseHttpPrepareHeader2(RpcPktHdr *header, type = READ_HTTP_PAYLOAD_FIELD_TYPE(data); if (type != 0x00000000) { - ERR("invalid type for field 2: 0x%08x\n", type); + ERR("invalid type for field 2: 0x%08lx\n", type); return RPC_S_PROTOCOL_ERROR; } *bytes_until_next_packet = *(ULONG *)GET_HTTP_PAYLOAD_FIELD_DATA(data); @@ -626,7 +626,7 @@ RPC_STATUS RPCRT4_ParseHttpPrepareHeader2(RpcPktHdr *header, type = READ_HTTP_PAYLOAD_FIELD_TYPE(data); if (type != 0x00000002) { - ERR("invalid type for field 3: 0x%08x\n", type); + ERR("invalid type for field 3: 0x%08lx\n", type); return RPC_S_PROTOCOL_ERROR; } *field3 = *(ULONG *)GET_HTTP_PAYLOAD_FIELD_DATA(data); @@ -655,12 +655,12 @@ RPC_STATUS RPCRT4_ParseHttpFlowControlHeader(RpcPktHdr *header, type = READ_HTTP_PAYLOAD_FIELD_TYPE(data); if (type != 0x0000000d) { - ERR("invalid type for field 1: 0x%08x\n", type); + ERR("invalid type for field 1: 0x%08lx\n", type); return RPC_S_PROTOCOL_ERROR; } if (*(ULONG *)GET_HTTP_PAYLOAD_FIELD_DATA(data) != (server ? 0x3 : 0x0)) { - ERR("invalid type for 0xd field data: 0x%08x\n", *(ULONG *)GET_HTTP_PAYLOAD_FIELD_DATA(data)); + ERR("invalid type for 0xd field data: 0x%08lx\n", *(ULONG *)GET_HTTP_PAYLOAD_FIELD_DATA(data)); return RPC_S_PROTOCOL_ERROR; } data = RPCRT4_NextHttpHeaderField(data); @@ -668,7 +668,7 @@ RPC_STATUS RPCRT4_ParseHttpFlowControlHeader(RpcPktHdr *header, type = READ_HTTP_PAYLOAD_FIELD_TYPE(data); if (type != 0x00000001) { - ERR("invalid type for field 2: 0x%08x\n", type); + ERR("invalid type for field 2: 0x%08lx\n", type); return RPC_S_PROTOCOL_ERROR; } *bytes_transmitted = *(ULONG *)GET_HTTP_PAYLOAD_FIELD_DATA(data); @@ -714,7 +714,7 @@ RPC_STATUS RPCRT4_default_secure_packet(RpcConnection *Connection, sec_status = EncryptMessage(&Connection->ctx, 0, &message, 0 /* FIXME */); if (sec_status != SEC_E_OK) { - ERR("EncryptMessage failed with 0x%08x\n", sec_status); + ERR("EncryptMessage failed with 0x%08lx\n", sec_status); return RPC_S_SEC_PKG_ERROR; } } @@ -723,7 +723,7 @@ RPC_STATUS RPCRT4_default_secure_packet(RpcConnection *Connection, sec_status = MakeSignature(&Connection->ctx, 0, &message, 0 /* FIXME */); if (sec_status != SEC_E_OK) { - ERR("MakeSignature failed with 0x%08x\n", sec_status); + ERR("MakeSignature failed with 0x%08lx\n", sec_status); return RPC_S_SEC_PKG_ERROR; } } @@ -735,7 +735,7 @@ RPC_STATUS RPCRT4_default_secure_packet(RpcConnection *Connection, sec_status = DecryptMessage(&Connection->ctx, &message, 0 /* FIXME */, 0); if (sec_status != SEC_E_OK) { - ERR("DecryptMessage failed with 0x%08x\n", sec_status); + ERR("DecryptMessage failed with 0x%08lx\n", sec_status); return RPC_S_SEC_PKG_ERROR; } } @@ -744,7 +744,7 @@ RPC_STATUS RPCRT4_default_secure_packet(RpcConnection *Connection, sec_status = VerifySignature(&Connection->ctx, &message, 0 /* FIXME */, NULL); if (sec_status != SEC_E_OK) { - ERR("VerifySignature failed with 0x%08x\n", sec_status); + ERR("VerifySignature failed with 0x%08lx\n", sec_status); return RPC_S_SEC_PKG_ERROR; } } @@ -945,11 +945,11 @@ RPC_STATUS RPCRT4_default_authorize(RpcConnection *conn, BOOL first_time, } if (FAILED(r)) { - WARN("InitializeSecurityContext failed with error 0x%08x\n", r); + WARN("InitializeSecurityContext failed with error 0x%08lx\n", r); goto failed; } - TRACE("r = 0x%08x, attr = 0x%08x\n", r, conn->attr); + TRACE("r = 0x%08lx, attr = 0x%08lx\n", r, conn->attr); continue_needed = ((r == SEC_I_CONTINUE_NEEDED) || (r == SEC_I_COMPLETE_AND_CONTINUE)); @@ -959,19 +959,19 @@ RPC_STATUS RPCRT4_default_authorize(RpcConnection *conn, BOOL first_time, r = CompleteAuthToken(&conn->ctx, &out_desc); if (FAILED(r)) { - WARN("CompleteAuthToken failed with error 0x%08x\n", r); + WARN("CompleteAuthToken failed with error 0x%08lx\n", r); goto failed; } } - TRACE("cbBuffer = %d\n", out.cbBuffer); + TRACE("cbBuffer = %ld\n", out.cbBuffer); if (!continue_needed) { r = QueryContextAttributesA(&conn->ctx, SECPKG_ATTR_SIZES, &secctx_sizes); if (FAILED(r)) { - WARN("QueryContextAttributes failed with error 0x%08x\n", r); + WARN("QueryContextAttributes failed with error 0x%08lx\n", r); goto failed; } conn->signature_auth_len = secctx_sizes.cbMaxSignature; @@ -997,7 +997,7 @@ RPC_STATUS RPCRT4_ClientConnectionAuth(RpcConnection* conn, BYTE *challenge, unsigned char *out_buffer; unsigned int out_len = 0; - TRACE("challenge %s, %d bytes\n", challenge, count); + TRACE("challenge %s, %ld bytes\n", challenge, count); status = rpcrt4_conn_authorize(conn, FALSE, challenge, count, NULL, &out_len); if (status) return status; @@ -1138,7 +1138,7 @@ RPC_STATUS RPCRT4_default_impersonate_client(RpcConnection *conn) return RPC_S_NO_CONTEXT_AVAILABLE; sec_status = ImpersonateSecurityContext(&conn->ctx); if (sec_status != SEC_E_OK) - WARN("ImpersonateSecurityContext returned 0x%08x\n", sec_status); + WARN("ImpersonateSecurityContext returned 0x%08lx\n", sec_status); switch (sec_status) { case SEC_E_UNSUPPORTED_FUNCTION: @@ -1166,7 +1166,7 @@ RPC_STATUS RPCRT4_default_revert_to_self(RpcConnection *conn) return RPC_S_NO_CONTEXT_AVAILABLE; sec_status = RevertSecurityContext(&conn->ctx); if (sec_status != SEC_E_OK) - WARN("RevertSecurityContext returned 0x%08x\n", sec_status); + WARN("RevertSecurityContext returned 0x%08lx\n", sec_status); switch (sec_status) { case SEC_E_UNSUPPORTED_FUNCTION: @@ -1210,7 +1210,7 @@ RPC_STATUS RPCRT4_default_inquire_auth_client( *authz_svc = RPC_C_AUTHZ_NONE; } if (flags) - FIXME("flags 0x%x not implemented\n", flags); + FIXME("flags 0x%lx not implemented\n", flags); return RPC_S_OK; } @@ -1300,7 +1300,7 @@ static RPC_STATUS RPCRT4_default_receive_fragment(RpcConnection *Connection, Rpc /* read packet common header */ dwRead = rpcrt4_conn_read(Connection, &common_hdr, sizeof(common_hdr)); if (dwRead != sizeof(common_hdr)) { - WARN("Short read of header, %d bytes\n", dwRead); + WARN("Short read of header, %ld bytes\n", dwRead); status = RPC_S_CALL_FAILED; goto fail; } @@ -1321,7 +1321,7 @@ static RPC_STATUS RPCRT4_default_receive_fragment(RpcConnection *Connection, Rpc /* read the rest of packet header */ dwRead = rpcrt4_conn_read(Connection, &(*Header)->common + 1, hdr_length - sizeof(common_hdr)); if (dwRead != hdr_length - sizeof(common_hdr)) { - WARN("bad header length, %d bytes, hdr_length %d\n", dwRead, hdr_length); + WARN("bad header length, %ld bytes, hdr_length %ld\n", dwRead, hdr_length); status = RPC_S_CALL_FAILED; goto fail; } @@ -1338,7 +1338,7 @@ static RPC_STATUS RPCRT4_default_receive_fragment(RpcConnection *Connection, Rpc dwRead = rpcrt4_conn_read(Connection, *Payload, common_hdr.frag_len - hdr_length); if (dwRead != common_hdr.frag_len - hdr_length) { - WARN("bad data length, %d/%d\n", dwRead, common_hdr.frag_len - hdr_length); + WARN("bad data length, %ld/%ld\n", dwRead, common_hdr.frag_len - hdr_length); status = RPC_S_CALL_FAILED; goto fail; } @@ -1442,14 +1442,14 @@ RPC_STATUS RPCRT4_ReceiveWithAuth(RpcConnection *Connection, RpcPktHdr **Header, if ((CurrentHeader->common.frag_len < hdr_length) || (CurrentHeader->common.frag_len - hdr_length < header_auth_len)) { - WARN("frag_len %d too small for hdr_length %d and auth_len %d\n", + WARN("frag_len %d too small for hdr_length %ld and auth_len %d\n", CurrentHeader->common.frag_len, hdr_length, CurrentHeader->common.auth_len); status = RPC_S_PROTOCOL_ERROR; goto fail; } if (CurrentHeader->common.auth_len != auth_length) { - WARN("auth_len header field changed from %d to %d\n", + WARN("auth_len header field changed from %ld to %d\n", auth_length, CurrentHeader->common.auth_len); status = RPC_S_PROTOCOL_ERROR; goto fail; @@ -1463,7 +1463,7 @@ RPC_STATUS RPCRT4_ReceiveWithAuth(RpcConnection *Connection, RpcPktHdr **Header, data_length = CurrentHeader->common.frag_len - hdr_length - header_auth_len; if (data_length + buffer_length > pMsg->BufferLength) { - TRACE("allocation hint exceeded, new buffer length = %d\n", + TRACE("allocation hint exceeded, new buffer length = %ld\n", data_length + buffer_length); pMsg->BufferLength = data_length + buffer_length; status = I_RpcReAllocateBuffer(pMsg); @@ -1741,7 +1741,7 @@ static DWORD WINAPI async_notifier_proc(LPVOID p) QueueUserAPC(async_apc_notifier_proc, state->u.APC.hThread, (ULONG_PTR)state); break; case RpcNotificationTypeIoc: - TRACE("RpcNotificationTypeIoc %p, 0x%x, 0x%lx, %p\n", + TRACE("RpcNotificationTypeIoc %p, 0x%lx, 0x%Ix, %p\n", state->u.IOC.hIOPort, state->u.IOC.dwNumberOfBytesTransferred, state->u.IOC.dwCompletionKey, state->u.IOC.lpOverlapped); PostQueuedCompletionStatus(state->u.IOC.hIOPort, @@ -1867,7 +1867,7 @@ RPC_STATUS WINAPI I_RpcReceive(PRPC_MESSAGE pMsg) conn = pMsg->ReservedForRuntime; status = RPCRT4_Receive(conn, &hdr, pMsg); if (status != RPC_S_OK) { - WARN("receive failed with error %x\n", status); + WARN("receive failed with error %lx\n", status); goto fail; } @@ -1976,6 +1976,6 @@ RPC_STATUS WINAPI I_RpcAsyncSetHandle(PRPC_MESSAGE pMsg, PRPC_ASYNC_STATE pAsync */ RPC_STATUS WINAPI I_RpcAsyncAbortCall(PRPC_ASYNC_STATE pAsync, ULONG ExceptionCode) { - FIXME("(%p, %d): stub\n", pAsync, ExceptionCode); + FIXME("(%p, %ld): stub\n", pAsync, ExceptionCode); return RPC_S_INVALID_ASYNC_HANDLE; } diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 12260b7298b..cb62c59e368 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -190,7 +190,7 @@ static RpcPktHdr *handle_bind_error(RpcConnection *conn, RPC_STATUS error) reject_reason = REJECT_INVALID_CHECKSUM; break; default: - FIXME("unexpected status value %d\n", error); + FIXME("unexpected status value %ld\n", error); /* fall through */ case RPC_S_INVALID_BOUND: reject_reason = REJECT_REASON_NOT_SPECIFIED; @@ -435,7 +435,7 @@ static RPC_STATUS process_request_packet(RpcConnection *conn, RpcPktRequestHdr * __TRY { if (func) func(msg); } __EXCEPT_ALL { - WARN("exception caught with code 0x%08x = %d\n", GetExceptionCode(), GetExceptionCode()); + WARN("exception caught with code 0x%08lx = %ld\n", GetExceptionCode(), GetExceptionCode()); exception = TRUE; if (GetExceptionCode() == STATUS_ACCESS_VIOLATION) status = ERROR_NOACCESS; @@ -558,7 +558,7 @@ static DWORD CALLBACK RPCRT4_io_thread(LPVOID the_arg) status = RPCRT4_ReceiveWithAuth(conn, &hdr, msg, &auth_data, &auth_length); if (status != RPC_S_OK) { - WARN("receive failed with error %x\n", status); + WARN("receive failed with error %lx\n", status); HeapFree(GetProcessHeap(), 0, msg); break; } @@ -588,7 +588,7 @@ static DWORD CALLBACK RPCRT4_io_thread(LPVOID the_arg) packet->auth_data = auth_data; packet->auth_length = auth_length; if (!QueueUserWorkItem(RPCRT4_worker_thread, packet, WT_EXECUTELONGFUNCTION)) { - ERR("couldn't queue work item for worker thread, error was %d\n", GetLastError()); + ERR("couldn't queue work item for worker thread, error was %ld\n", GetLastError()); HeapFree(GetProcessHeap(), 0, packet); status = RPC_S_OUT_OF_RESOURCES; } else { @@ -613,7 +613,7 @@ static DWORD CALLBACK RPCRT4_io_thread(LPVOID the_arg) HeapFree(GetProcessHeap(), 0, auth_data); if (status != RPC_S_OK) { - WARN("processing packet failed with error %u\n", status); + WARN("processing packet failed with error %lu\n", status); break; } } @@ -627,7 +627,7 @@ void RPCRT4_new_client(RpcConnection* conn) HANDLE thread = CreateThread(NULL, 0, RPCRT4_io_thread, conn, 0, NULL); if (!thread) { DWORD err = GetLastError(); - ERR("failed to create thread, error=%08x\n", err); + ERR("failed to create thread, error=%08lx\n", err); RPCRT4_ReleaseConnection(conn); } /* we could set conn->thread, but then we'd have to make the io_thread wait @@ -1020,7 +1020,7 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpExA( RPC_CSTR Protseq, UINT MaxCalls, RPC RpcServerProtseq* ps; RPC_STATUS status; - TRACE("(%s,%u,%s,%p,{%u,%u,%u})\n", debugstr_a((const char *)Protseq), + TRACE("(%s,%u,%s,%p,{%u,%lu,%lu})\n", debugstr_a((const char *)Protseq), MaxCalls, debugstr_a((const char *)Endpoint), SecurityDescriptor, lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); @@ -1042,7 +1042,7 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpExW( RPC_WSTR Protseq, UINT MaxCalls, RPC LPSTR ProtseqA; LPSTR EndpointA; - TRACE("(%s,%u,%s,%p,{%u,%u,%u})\n", debugstr_w( Protseq ), MaxCalls, + TRACE("(%s,%u,%s,%p,{%u,%lu,%lu})\n", debugstr_w( Protseq ), MaxCalls, debugstr_w( Endpoint ), SecurityDescriptor, lpPolicy->Length, lpPolicy->EndpointFlags, lpPolicy->NICFlags ); @@ -1170,7 +1170,7 @@ RPC_STATUS WINAPI RpcServerRegisterIf3( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, for (i=0; i<If->DispatchTable->DispatchTableCount; i++) { TRACE(" entry %d: %p\n", i, If->DispatchTable->DispatchTable[i]); } - TRACE(" reserved: %ld\n", If->DispatchTable->Reserved); + TRACE(" reserved: %Id\n", If->DispatchTable->Reserved); } TRACE(" protseq endpoint count: %d\n", If->RpcProtseqEndpointCount); TRACE(" default manager epv: %p\n", If->DefaultManagerEpv); @@ -1345,7 +1345,7 @@ static RPC_STATUS find_security_package(ULONG auth_type, SecPkgInfoW **packages_ sec_status = EnumerateSecurityPackagesW(&package_count, &packages); if (sec_status != SEC_E_OK) { - ERR("EnumerateSecurityPackagesW failed with error 0x%08x\n", sec_status); + ERR("EnumerateSecurityPackagesW failed with error 0x%08lx\n", sec_status); return RPC_S_SEC_PKG_ERROR; } @@ -1355,12 +1355,12 @@ static RPC_STATUS find_security_package(ULONG auth_type, SecPkgInfoW **packages_ if (i == package_count) { - WARN("unsupported AuthnSvc %u\n", auth_type); + WARN("unsupported AuthnSvc %lu\n", auth_type); FreeContextBuffer(packages); return RPC_S_UNKNOWN_AUTHN_SERVICE; } - TRACE("found package %s for service %u\n", debugstr_w(packages[i].Name), auth_type); + TRACE("found package %s for service %lu\n", debugstr_w(packages[i].Name), auth_type); *packages_buf = packages; *ret = packages + i; return RPC_S_OK; @@ -1421,7 +1421,7 @@ RPC_STATUS WINAPI RpcServerRegisterAuthInfoA( RPC_CSTR ServerPrincName, ULONG Au WCHAR *principal_name = NULL; RPC_STATUS status; - TRACE("(%s,%u,%p,%p)\n", ServerPrincName, AuthnSvc, GetKeyFn, Arg); + TRACE("(%s,%lu,%p,%p)\n", ServerPrincName, AuthnSvc, GetKeyFn, Arg); if(ServerPrincName && !(principal_name = RPCRT4_strdupAtoW((const char*)ServerPrincName))) return RPC_S_OUT_OF_RESOURCES; @@ -1444,7 +1444,7 @@ RPC_STATUS WINAPI RpcServerRegisterAuthInfoW( RPC_WSTR ServerPrincName, ULONG Au ULONG max_token; RPC_STATUS status; - TRACE("(%s,%u,%p,%p)\n", debugstr_w(ServerPrincName), AuthnSvc, GetKeyFn, Arg); + TRACE("(%s,%lu,%p,%p)\n", debugstr_w(ServerPrincName), AuthnSvc, GetKeyFn, Arg); status = find_security_package(AuthnSvc, &packages, &package); if (status != RPC_S_OK) @@ -1487,7 +1487,7 @@ RPC_STATUS RPC_ENTRY RpcServerInqDefaultPrincNameA(ULONG AuthnSvc, RPC_CSTR *Pri RPC_STATUS ret; RPC_WSTR principalW; - TRACE("%u, %p\n", AuthnSvc, PrincName); + TRACE("%lu, %p\n", AuthnSvc, PrincName); if ((ret = RpcServerInqDefaultPrincNameW( AuthnSvc, &principalW )) == RPC_S_OK) { @@ -1504,7 +1504,7 @@ RPC_STATUS RPC_ENTRY RpcServerInqDefaultPrincNameW(ULONG AuthnSvc, RPC_WSTR *Pri { ULONG len = 0; - FIXME("%u, %p\n", AuthnSvc, PrincName); + FIXME("%lu, %p\n", AuthnSvc, PrincName); if (AuthnSvc != RPC_C_AUTHN_WINNT) return RPC_S_UNKNOWN_AUTHN_SERVICE; @@ -1576,7 +1576,7 @@ RPC_STATUS WINAPI RpcMgmtWaitServerListen( void ) if (!wait_thread) break; - TRACE("waiting for thread %u\n", GetThreadId(wait_thread)); + TRACE("waiting for thread %lu\n", GetThreadId(wait_thread)); LeaveCriticalSection(&listen_cs); WaitForSingleObject(wait_thread, INFINITE); EnterCriticalSection(&listen_cs); @@ -1639,7 +1639,7 @@ RPC_STATUS WINAPI I_RpcServerStopListening( void ) */ UINT WINAPI I_RpcWindowProc( void *hWnd, UINT Message, UINT wParam, ULONG lParam ) { - FIXME( "(%p,%08x,%08x,%08x): stub\n", hWnd, Message, wParam, lParam ); + FIXME( "(%p,%08x,%08x,%08lx): stub\n", hWnd, Message, wParam, lParam ); return 0; } @@ -1693,7 +1693,7 @@ RPC_STATUS WINAPI RpcMgmtStatsVectorFree(RPC_STATS_VECTOR **StatsVector) RPC_STATUS WINAPI RpcMgmtEpEltInqBegin(RPC_BINDING_HANDLE Binding, ULONG InquiryType, RPC_IF_ID *IfId, ULONG VersOption, UUID *ObjectUuid, RPC_EP_INQ_HANDLE* InquiryContext) { - FIXME("(%p,%u,%p,%u,%p,%p): stub\n", + FIXME("(%p,%lu,%p,%lu,%p,%p): stub\n", Binding, InquiryType, IfId, VersOption, ObjectUuid, InquiryContext); return RPC_S_INVALID_BINDING; } @@ -1733,7 +1733,7 @@ RPC_STATUS WINAPI RpcMgmtSetAuthorizationFn(RPC_MGMT_AUTHORIZATION_FN fn) */ RPC_STATUS WINAPI RpcMgmtSetServerStackSize(ULONG ThreadStackSize) { - FIXME("(0x%x): stub\n", ThreadStackSize); + FIXME("(0x%lx): stub\n", ThreadStackSize); return RPC_S_OK; } diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index d1a2f99c147..82798a5a80d 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -101,7 +101,7 @@ static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *conn) RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); if (connection->pipe == INVALID_HANDLE_VALUE) { - WARN("CreateNamedPipe failed with error %d\n", GetLastError()); + WARN("CreateNamedPipe failed with error %ld\n", GetLastError()); if (GetLastError() == ERROR_FILE_EXISTS) return RPC_S_DUPLICATE_ENDPOINT; else @@ -154,12 +154,12 @@ static RPC_STATUS rpcrt4_conn_open_pipe(RpcConnection *Connection, LPCSTR pname, TRACE("retrying busy server\n"); continue; } - TRACE("connection failed, error=%x\n", err); + TRACE("connection failed, error=%lx\n", err); return RPC_S_SERVER_TOO_BUSY; } if (!wait || !WaitNamedPipeA(pname, NMPWAIT_WAIT_FOREVER)) { err = GetLastError(); - WARN("connection failed, error=%x\n", err); + WARN("connection failed, error=%lx\n", err); return RPC_S_SERVER_UNAVAILABLE; } } @@ -214,7 +214,7 @@ static RPC_STATUS rpcrt4_protseq_ncalrpc_open_endpoint(RpcServerProtseq* protseq DWORD process_id = GetCurrentProcessId(); ULONG id = InterlockedIncrement(&lrpc_nameless_id); snprintf(generated_endpoint, sizeof(generated_endpoint), - "LRPC%08x.%08x", process_id, id); + "LRPC%08lx.%08lx", process_id, id); endpoint = generated_endpoint; } @@ -274,7 +274,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protse DWORD process_id = GetCurrentProcessId(); ULONG id = InterlockedExchangeAdd(&np_nameless_id, 1 ); snprintf(generated_endpoint, sizeof(generated_endpoint), - "\\\\pipe\\\\%08x.%03x", process_id, id); + "\\\\pipe\\\\%08lx.%03lx", process_id, id); endpoint = generated_endpoint; } @@ -317,7 +317,7 @@ static RPC_STATUS rpcrt4_ncacn_np_handoff(RpcConnection *old_conn, RpcConnection new_conn->NetworkAddr = HeapAlloc(GetProcessHeap(), 0, len); if (!GetComputerNameA(new_conn->NetworkAddr, &len)) { - ERR("Failed to retrieve the computer name, error %u\n", GetLastError()); + ERR("Failed to retrieve the computer name, error %lu\n", GetLastError()); return RPC_S_OUT_OF_RESOURCES; } @@ -365,7 +365,7 @@ static RPC_STATUS rpcrt4_ncalrpc_handoff(RpcConnection *old_conn, RpcConnection new_conn->NetworkAddr = HeapAlloc(GetProcessHeap(), 0, len); if (!GetComputerNameA(new_conn->NetworkAddr, &len)) { - ERR("Failed to retrieve the computer name, error %u\n", GetLastError()); + ERR("Failed to retrieve the computer name, error %lu\n", GetLastError()); return RPC_S_OUT_OF_RESOURCES; } @@ -595,7 +595,7 @@ static RPC_STATUS rpcrt4_conn_np_impersonate_client(RpcConnection *conn) if (!ret) { DWORD error = GetLastError(); - WARN("ImpersonateNamedPipeClient failed with error %u\n", error); + WARN("ImpersonateNamedPipeClient failed with error %lu\n", error); switch (error) { case ERROR_CANNOT_IMPERSONATE: @@ -617,7 +617,7 @@ static RPC_STATUS rpcrt4_conn_np_revert_to_self(RpcConnection *conn) ret = RevertToSelf(); if (!ret) { - WARN("RevertToSelf failed with error %u\n", GetLastError()); + WARN("RevertToSelf failed with error %lu\n", GetLastError()); return RPC_S_NO_CONTEXT_AVAILABLE; } return RPC_S_OK; @@ -677,7 +677,7 @@ static void *rpcrt4_protseq_np_get_wait_array(RpcServerProtseq *protseq, void *p case STATUS_PENDING: break; default: - ERR("pipe listen error %x\n", status); + ERR("pipe listen error %lx\n", status); continue; } @@ -738,7 +738,7 @@ static int rpcrt4_protseq_np_wait_for_new_connection(RpcServerProtseq *protseq, return 0; else if (res == WAIT_FAILED) { - ERR("wait failed with error %d\n", GetLastError()); + ERR("wait failed with error %ld\n", GetLastError()); return -1; } else @@ -755,7 +755,7 @@ static int rpcrt4_protseq_np_wait_for_new_connection(RpcServerProtseq *protseq, if (conn->io_status.Status == STATUS_SUCCESS || conn->io_status.Status == STATUS_PIPE_CONNECTED) cconn = rpcrt4_spawn_connection(&conn->common); else - ERR("listen failed %x\n", conn->io_status.Status); + ERR("listen failed %lx\n", conn->io_status.Status); break; } } @@ -867,7 +867,7 @@ static RPC_STATUS rpcrt4_ncalrpc_inquire_auth_client( RpcConnection *conn, RPC_AUTHZ_HANDLE *privs, RPC_WSTR *server_princ_name, ULONG *authn_level, ULONG *authn_svc, ULONG *authz_svc, ULONG flags) { - TRACE("(%p, %p, %p, %p, %p, %p, 0x%x)\n", conn, privs, + TRACE("(%p, %p, %p, %p, %p, %p, 0x%lx)\n", conn, privs, server_princ_name, authn_level, authn_svc, authz_svc, flags); if (privs) @@ -888,7 +888,7 @@ static RPC_STATUS rpcrt4_ncalrpc_inquire_auth_client( *authz_svc = RPC_C_AUTHZ_NONE; } if (flags) - FIXME("flags 0x%x not implemented\n", flags); + FIXME("flags 0x%lx not implemented\n", flags); return RPC_S_OK; } @@ -1082,7 +1082,7 @@ static BOOL rpcrt4_sock_wait_for_recv(RpcConnection_tcp *tcpc) case WAIT_OBJECT_0 + 1: return FALSE; default: - ERR("WaitForMultipleObjects() failed with error %d\n", GetLastError()); + ERR("WaitForMultipleObjects() failed with error %ld\n", GetLastError()); return FALSE; } } @@ -1101,7 +1101,7 @@ static BOOL rpcrt4_sock_wait_for_send(RpcConnection_tcp *tcpc) case WAIT_OBJECT_0: return TRUE; default: - ERR("WaitForMultipleObjects() failed with error %d\n", GetLastError()); + ERR("WaitForMultipleObjects() failed with error %ld\n", GetLastError()); return FALSE; } } @@ -1597,7 +1597,7 @@ static int rpcrt4_protseq_sock_wait_for_new_connection(RpcServerProtseq *protseq return 0; if (res == WAIT_FAILED) { - ERR("wait failed with error %d\n", GetLastError()); + ERR("wait failed with error %ld\n", GetLastError()); return -1; } @@ -1689,7 +1689,7 @@ static RPC_STATUS wait_async_request(RpcHttpAsyncData *async_data, BOOL call_ret if(GetLastError() != ERROR_IO_PENDING) { RpcHttpAsyncData_Release(async_data); - ERR("Request failed with error %d\n", GetLastError()); + ERR("Request failed with error %ld\n", GetLastError()); return RPC_S_SERVER_UNAVAILABLE; } @@ -1863,7 +1863,7 @@ static RPC_STATUS rpcrt4_http_check_response(HINTERNET hor) ret = HttpQueryInfoW(hor, HTTP_QUERY_STATUS_TEXT, status_text, &size, &index); } - ERR("server returned: %d %s\n", status_code, ret ? debugstr_w(status_text) : "<status text unavailable>"); + ERR("server returned: %ld %s\n", status_code, ret ? debugstr_w(status_text) : "<status text unavailable>"); if(status_text != buf) HeapFree(GetProcessHeap(), 0, status_text); if (status_code == HTTP_STATUS_DENIED) @@ -1952,7 +1952,7 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) HeapFree(GetProcessHeap(), 0, user); HeapFree(GetProcessHeap(), 0, proxy); HeapFree(GetProcessHeap(), 0, servername); - ERR("InternetOpenW failed with error %d\n", GetLastError()); + ERR("InternetOpenW failed with error %ld\n", GetLastError()); return RPC_S_SERVER_UNAVAILABLE; } InternetSetStatusCallbackW(httpc->app_info, rpcrt4_http_internet_callback); @@ -1986,7 +1986,7 @@ static RPC_STATUS rpcrt4_http_internet_connect(RpcConnection_http *httpc) if (!httpc->session) { - ERR("InternetConnectW failed with error %d\n", GetLastError()); + ERR("InternetConnectW failed with error %ld\n", GetLastError()); HeapFree(GetProcessHeap(), 0, servername); return RPC_S_SERVER_UNAVAILABLE; } @@ -2029,7 +2029,7 @@ static int rpcrt4_http_async_read(HINTERNET req, RpcHttpAsyncData *async_data, H HeapFree(GetProcessHeap(), 0, async_data->inet_buffers.lpvBuffer); async_data->inet_buffers.lpvBuffer = NULL; - TRACE("%p %p %u -> %u\n", req, buffer, count, status); + TRACE("%p %p %u -> %lu\n", req, buffer, count, status); return status == RPC_S_OK ? count : -1; } @@ -2100,7 +2100,7 @@ static RPC_STATUS rpcrt4_http_prepare_in_pipe(HINTERNET in_request, RpcHttpAsync RPCRT4_FreeHeader(hdr); if (!ret) { - ERR("InternetWriteFile failed with error %d\n", GetLastError()); + ERR("InternetWriteFile failed with error %ld\n", GetLastError()); return RPC_S_SERVER_UNAVAILABLE; } @@ -2201,7 +2201,7 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, RpcHttpAsy &field1); HeapFree(GetProcessHeap(), 0, data_from_server); if (status != RPC_S_OK) return status; - TRACE("received (%d) from first prepare header\n", field1); + TRACE("received (%ld) from first prepare header\n", field1); for (;;) { @@ -2224,7 +2224,7 @@ static RPC_STATUS rpcrt4_http_prepare_out_pipe(HINTERNET out_request, RpcHttpAsy &field3); HeapFree(GetProcessHeap(), 0, data_from_server); if (status != RPC_S_OK) return status; - TRACE("received (0x%08x 0x%08x %d) from second prepare header\n", field1, *flow_control_increment, field3); + TRACE("received (0x%08lx 0x%08lx %ld) from second prepare header\n", field1, *flow_control_increment, field3); return RPC_S_OK; } @@ -2536,7 +2536,7 @@ static RPC_STATUS do_authorization(HINTERNET request, SEC_WCHAR *servername, } else { - ERR("InitializeSecurityContextW failed with error 0x%08x\n", ret); + ERR("InitializeSecurityContextW failed with error 0x%08lx\n", ret); HeapFree(GetProcessHeap(), 0, out.pvBuffer); break; } @@ -2544,7 +2544,7 @@ static RPC_STATUS do_authorization(HINTERNET request, SEC_WCHAR *servername, break; } default: - FIXME("scheme %u not supported\n", creds->AuthnSchemes[0]); + FIXME("scheme %lu not supported\n", creds->AuthnSchemes[0]); break; } @@ -2584,7 +2584,7 @@ static RPC_STATUS insert_authorization_header(HINTERNET request, ULONG scheme, c scheme_len = ARRAY_SIZE(ntlmW); break; default: - ERR("unknown scheme %u\n", scheme); + ERR("unknown scheme %lu\n", scheme); return RPC_S_SERVER_UNAVAILABLE; } if ((header = HeapAlloc(GetProcessHeap(), 0, (auth_len + scheme_len + len + 2) * sizeof(WCHAR)))) @@ -2780,7 +2780,7 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) flags, (DWORD_PTR)httpc->async_data); if (!httpc->in_request) { - ERR("HttpOpenRequestW failed with error %d\n", GetLastError()); + ERR("HttpOpenRequestW failed with error %ld\n", GetLastError()); HeapFree(GetProcessHeap(), 0, url); return RPC_S_SERVER_UNAVAILABLE; } @@ -2807,7 +2807,7 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) HeapFree(GetProcessHeap(), 0, url); if (!httpc->out_request) { - ERR("HttpOpenRequestW failed with error %d\n", GetLastError()); + ERR("HttpOpenRequestW failed with error %ld\n", GetLastError()); return RPC_S_SERVER_UNAVAILABLE; } @@ -2881,7 +2881,7 @@ again: /* read packet common header */ dwRead = rpcrt4_ncacn_http_read(Connection, &common_hdr, sizeof(common_hdr)); if (dwRead != sizeof(common_hdr)) { - WARN("Short read of header, %d bytes\n", dwRead); + WARN("Short read of header, %ld bytes\n", dwRead); status = RPC_S_PROTOCOL_ERROR; goto fail; } @@ -2914,7 +2914,7 @@ again: /* read the rest of packet header */ dwRead = rpcrt4_ncacn_http_read(Connection, &(*Header)->common + 1, hdr_length - sizeof(common_hdr)); if (dwRead != hdr_length - sizeof(common_hdr)) { - WARN("bad header length, %d bytes, hdr_length %d\n", dwRead, hdr_length); + WARN("bad header length, %ld bytes, hdr_length %ld\n", dwRead, hdr_length); status = RPC_S_PROTOCOL_ERROR; goto fail; } @@ -2931,7 +2931,7 @@ again: dwRead = rpcrt4_ncacn_http_read(Connection, *Payload, common_hdr.frag_len - hdr_length); if (dwRead != common_hdr.frag_len - hdr_length) { - WARN("bad data length, %d/%d\n", dwRead, common_hdr.frag_len - hdr_length); + WARN("bad data length, %ld/%ld\n", dwRead, common_hdr.frag_len - hdr_length); status = RPC_S_PROTOCOL_ERROR; goto fail; } @@ -2969,7 +2969,7 @@ again: &pipe_uuid); if (status != RPC_S_OK) goto fail; - TRACE("received http flow control header (0x%x, 0x%x, %s)\n", + TRACE("received http flow control header (0x%lx, 0x%lx, %s)\n", bytes_transmitted, flow_control_increment, debugstr_guid(&pipe_uuid)); /* FIXME: do something with parsed data */ } @@ -2991,7 +2991,7 @@ again: httpc->bytes_received += common_hdr.frag_len; - TRACE("httpc->bytes_received = 0x%x\n", httpc->bytes_received); + TRACE("httpc->bytes_received = 0x%lx\n", httpc->bytes_received); if (httpc->bytes_received > httpc->flow_control_mark) { @@ -3003,7 +3003,7 @@ again: { DWORD bytes_written; BOOL ret2; - TRACE("sending flow control packet at 0x%x\n", httpc->bytes_received); + TRACE("sending flow control packet at 0x%lx\n", httpc->bytes_received); ret2 = InternetWriteFile(httpc->in_request, hdr, hdr->common.frag_len, &bytes_written); RPCRT4_FreeHeader(hdr); if (ret2) @@ -3358,7 +3358,7 @@ void rpcrt4_conn_release_and_wait(RpcConnection *connection) RpcConnection *RPCRT4_GrabConnection(RpcConnection *connection) { LONG ref = InterlockedIncrement(&connection->ref); - TRACE("%p ref=%u\n", connection, ref); + TRACE("%p ref=%lu\n", connection, ref); return connection; } @@ -3383,7 +3383,7 @@ void RPCRT4_ReleaseConnection(RpcConnection *connection) ref = InterlockedDecrement(&connection->ref); } - TRACE("%p ref=%u\n", connection, ref); + TRACE("%p ref=%lu\n", connection, ref); if (!ref) { diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index a1848ef28e5..d7073b550dd 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -752,7 +752,7 @@ void WINAPI I_RpcFree(void *Object) */ LONG WINAPI I_RpcMapWin32Status(RPC_STATUS status) { - TRACE("(%d)\n", status); + TRACE("(%ld)\n", status); switch (status) { case ERROR_ACCESS_DENIED: return STATUS_ACCESS_DENIED; @@ -871,7 +871,7 @@ LONG WINAPI I_RpcMapWin32Status(RPC_STATUS status) */ int WINAPI RpcExceptionFilter(ULONG ExceptionCode) { - TRACE("0x%x\n", ExceptionCode); + TRACE("0x%lx\n", ExceptionCode); switch (ExceptionCode) { case STATUS_DATATYPE_MISALIGNMENT: @@ -920,7 +920,7 @@ RPC_STATUS RPC_ENTRY RpcErrorSaveErrorInfo(RPC_ERROR_ENUM_HANDLE *EnumHandle, vo */ RPC_STATUS RPC_ENTRY RpcErrorLoadErrorInfo(void *ErrorBlob, SIZE_T BlobSize, RPC_ERROR_ENUM_HANDLE *EnumHandle) { - FIXME("(%p %lu %p): stub\n", ErrorBlob, BlobSize, EnumHandle); + FIXME("(%p %Iu %p): stub\n", ErrorBlob, BlobSize, EnumHandle); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -938,7 +938,7 @@ RPC_STATUS RPC_ENTRY RpcErrorGetNextRecord(RPC_ERROR_ENUM_HANDLE *EnumHandle, BO */ RPC_STATUS RPC_ENTRY RpcMgmtSetCancelTimeout(LONG Timeout) { - FIXME("(%d): stub\n", Timeout); + FIXME("(%ld): stub\n", Timeout); return RPC_S_OK; } @@ -1077,7 +1077,7 @@ RPC_STATUS RPC_ENTRY RpcCancelThreadEx(void* ThreadHandle, LONG Timeout) { DWORD target_tid; - FIXME("(%p, %d)\n", ThreadHandle, Timeout); + FIXME("(%p, %ld)\n", ThreadHandle, Timeout); target_tid = GetThreadId(ThreadHandle); if (!target_tid) @@ -1085,7 +1085,7 @@ RPC_STATUS RPC_ENTRY RpcCancelThreadEx(void* ThreadHandle, LONG Timeout) if (Timeout) { - FIXME("(%p, %d)\n", ThreadHandle, Timeout); + FIXME("(%p, %ld)\n", ThreadHandle, Timeout); return RPC_S_OK; } else
Signed-off-by: Huw Davies <huw(a)codeweavers.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/rsaenh/Makefile.in | 1 - dlls/rsaenh/handle.c | 10 +++---- dlls/rsaenh/rsaenh.c | 72 ++++++++++++++++++++++++----------------------- 3 files changed, 41 insertions(+), 42 deletions(-) diff --git a/dlls/rsaenh/Makefile.in b/dlls/rsaenh/Makefile.in index 36120f2074b..9997752ad3f 100644 --- a/dlls/rsaenh/Makefile.in +++ b/dlls/rsaenh/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = rsaenh.dll IMPORTLIB = rsaenh IMPORTS = bcrypt crypt32 advapi32 diff --git a/dlls/rsaenh/handle.c b/dlls/rsaenh/handle.c index 4d85d7385db..e9ec13f4ef4 100644 --- a/dlls/rsaenh/handle.c +++ b/dlls/rsaenh/handle.c @@ -95,7 +95,7 @@ BOOL is_valid_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwTyp unsigned int index = HANDLE2INDEX(handle); BOOL ret = FALSE; - TRACE("(lpTable=%p, handle=%ld)\n", lpTable, handle); + TRACE("(lpTable=%p, handle=%Id)\n", lpTable, handle); EnterCriticalSection(&lpTable->mutex); @@ -230,7 +230,7 @@ BOOL release_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType OBJECTHDR *pObject; BOOL ret = FALSE; - TRACE("(lpTable=%p, handle=%ld)\n", lpTable, handle); + TRACE("(lpTable=%p, handle=%Id)\n", lpTable, handle); EnterCriticalSection(&lpTable->mutex); @@ -240,7 +240,7 @@ BOOL release_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType pObject = lpTable->paEntries[index].pObject; if (InterlockedDecrement(&pObject->refcount) == 0) { - TRACE("destroying handle %ld\n", handle); + TRACE("destroying handle %Id\n", handle); if (pObject->destructor) pObject->destructor(pObject); } @@ -273,7 +273,7 @@ BOOL lookup_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, { BOOL ret = FALSE; - TRACE("(lpTable=%p, handle=%ld, lplpObject=%p)\n", lpTable, handle, lplpObject); + TRACE("(lpTable=%p, handle=%Id, lplpObject=%p)\n", lpTable, handle, lplpObject); EnterCriticalSection(&lpTable->mutex); if (!is_valid_handle(lpTable, handle, dwType)) @@ -309,7 +309,7 @@ BOOL copy_handle(struct handle_table *lpTable, HCRYPTKEY handle, DWORD dwType, H OBJECTHDR *pObject; BOOL ret; - TRACE("(lpTable=%p, handle=%ld, copy=%p)\n", lpTable, handle, copy); + TRACE("(lpTable=%p, handle=%Id, copy=%p)\n", lpTable, handle, copy); EnterCriticalSection(&lpTable->mutex); if (!lookup_handle(lpTable, handle, dwType, &pObject)) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index d03f647832e..a02b4f0ecad 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -794,7 +794,7 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK peaAlgidInfo = get_algid_info(hProv, aiAlgid); if (!peaAlgidInfo) return (HCRYPTKEY)INVALID_HANDLE_VALUE; - TRACE("alg = %s, dwKeyLen = %d\n", debugstr_a(peaAlgidInfo->szName), + TRACE("alg = %s, dwKeyLen = %ld\n", debugstr_a(peaAlgidInfo->szName), dwKeyLen); /* * Assume the default key length, if none is specified explicitly @@ -847,7 +847,7 @@ static HCRYPTKEY new_key(HCRYPTPROV hProv, ALG_ID aiAlgid, DWORD dwFlags, CRYPTK dwKeyLen > peaAlgidInfo->dwMaxLen || dwKeyLen < peaAlgidInfo->dwMinLen) { - TRACE("key len %d out of bounds (%d, %d)\n", dwKeyLen, + TRACE("key len %ld out of bounds (%ld, %ld)\n", dwKeyLen, peaAlgidInfo->dwMinLen, peaAlgidInfo->dwMaxLen); SetLastError(NTE_BAD_DATA); return (HCRYPTKEY)INVALID_HANDLE_VALUE; @@ -958,7 +958,7 @@ static LPCSTR map_key_spec_to_key_pair_name(DWORD dwKeySpec) szValueName = "SignatureKeyPair"; break; default: - WARN("invalid key spec %d\n", dwKeySpec); + WARN("invalid key spec %ld\n", dwKeySpec); szValueName = NULL; } return szValueName; @@ -1039,7 +1039,7 @@ static LPCSTR map_key_spec_to_permissions_name(DWORD dwKeySpec) szValueName = "SignaturePermissions"; break; default: - WARN("invalid key spec %d\n", dwKeySpec); + WARN("invalid key spec %ld\n", dwKeySpec); szValueName = NULL; } return szValueName; @@ -1608,7 +1608,7 @@ static BOOL tls1_prf(HCRYPTPROV hProv, HCRYPTPROV hSecret, const PCRYPT_DATA_BLO BOOL result = FALSE; CRYPT_DATA_BLOB blobLabelSeed; - TRACE("(hProv=%08lx, hSecret=%08lx, pblobLabel=%p, pblobSeed=%p, pbBuffer=%p, dwBufferLen=%d)\n", + TRACE("(hProv=%08Ix, hSecret=%08Ix, pblobLabel=%p, pblobSeed=%p, pbBuffer=%p, dwBufferLen=%ld)\n", hProv, hSecret, pblobLabel, pblobSeed, pbBuffer, dwBufferLen); if (!lookup_handle(&handle_table, hSecret, RSAENH_MAGIC_KEY, (OBJECTHDR**)&pSecret)) { @@ -2075,7 +2075,7 @@ BOOL WINAPI RSAENH_CPAcquireContext(HCRYPTPROV *phProv, LPSTR pszContainer, { CHAR szKeyContainerName[MAX_PATH]; - TRACE("(phProv=%p, pszContainer=%s, dwFlags=%08x, pVTable=%p)\n", phProv, + TRACE("(phProv=%p, pszContainer=%s, dwFlags=%08lx, pVTable=%p)\n", phProv, debugstr_a(pszContainer), dwFlags, pVTable); if (pszContainer && *pszContainer) @@ -2160,7 +2160,7 @@ BOOL WINAPI RSAENH_CPCreateHash(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTKEY hKey, CRYPTHASH *pCryptHash; const PROV_ENUMALGS_EX *peaAlgidInfo; - TRACE("(hProv=%08lx, Algid=%08x, hKey=%08lx, dwFlags=%08x, phHash=%p)\n", hProv, Algid, hKey, + TRACE("(hProv=%08Ix, Algid=%08x, hKey=%08Ix, dwFlags=%08lx, phHash=%p)\n", hProv, Algid, hKey, dwFlags, phHash); peaAlgidInfo = get_algid_info(hProv, Algid); @@ -2278,7 +2278,7 @@ BOOL WINAPI RSAENH_CPCreateHash(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTKEY hKey, */ BOOL WINAPI RSAENH_CPDestroyHash(HCRYPTPROV hProv, HCRYPTHASH hHash) { - TRACE("(hProv=%08lx, hHash=%08lx)\n", hProv, hHash); + TRACE("(hProv=%08Ix, hHash=%08Ix)\n", hProv, hHash); if (!is_valid_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER)) { @@ -2311,7 +2311,7 @@ BOOL WINAPI RSAENH_CPDestroyHash(HCRYPTPROV hProv, HCRYPTHASH hHash) */ BOOL WINAPI RSAENH_CPDestroyKey(HCRYPTPROV hProv, HCRYPTKEY hKey) { - TRACE("(hProv=%08lx, hKey=%08lx)\n", hProv, hKey); + TRACE("(hProv=%08Ix, hKey=%08Ix)\n", hProv, hKey); if (!is_valid_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER)) { @@ -2349,7 +2349,7 @@ BOOL WINAPI RSAENH_CPDuplicateHash(HCRYPTPROV hUID, HCRYPTHASH hHash, DWORD *pdw { CRYPTHASH *pSrcHash, *pDestHash; - TRACE("(hUID=%08lx, hHash=%08lx, pdwReserved=%p, dwFlags=%08x, phHash=%p)\n", hUID, hHash, + TRACE("(hUID=%08Ix, hHash=%08Ix, pdwReserved=%p, dwFlags=%08lx, phHash=%p)\n", hUID, hHash, pdwReserved, dwFlags, phHash); if (!is_valid_handle(&handle_table, hUID, RSAENH_MAGIC_CONTAINER)) @@ -2405,7 +2405,7 @@ BOOL WINAPI RSAENH_CPDuplicateKey(HCRYPTPROV hUID, HCRYPTKEY hKey, DWORD *pdwRes { CRYPTKEY *pSrcKey, *pDestKey; - TRACE("(hUID=%08lx, hKey=%08lx, pdwReserved=%p, dwFlags=%08x, phKey=%p)\n", hUID, hKey, + TRACE("(hUID=%08Ix, hKey=%08Ix, pdwReserved=%p, dwFlags=%08lx, phKey=%p)\n", hUID, hKey, pdwReserved, dwFlags, phKey); if (!is_valid_handle(&handle_table, hUID, RSAENH_MAGIC_CONTAINER)) @@ -2476,8 +2476,8 @@ BOOL WINAPI RSAENH_CPEncrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash, BYTE *in, out[RSAENH_MAX_BLOCK_SIZE], o[RSAENH_MAX_BLOCK_SIZE]; DWORD dwEncryptedLen, i, j, k; - TRACE("(hProv=%08lx, hKey=%08lx, hHash=%08lx, Final=%d, dwFlags=%08x, pbData=%p, " - "pdwDataLen=%p, dwBufLen=%d)\n", hProv, hKey, hHash, Final, dwFlags, pbData, pdwDataLen, + TRACE("(hProv=%08Ix, hKey=%08Ix, hHash=%08Ix, Final=%d, dwFlags=%08lx, pbData=%p, " + "pdwDataLen=%p, dwBufLen=%ld)\n", hProv, hKey, hHash, Final, dwFlags, pbData, pdwDataLen, dwBufLen); if (!is_valid_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER)) @@ -2629,7 +2629,7 @@ BOOL WINAPI RSAENH_CPDecrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash, DWORD i, j, k; DWORD dwMax; - TRACE("(hProv=%08lx, hKey=%08lx, hHash=%08lx, Final=%d, dwFlags=%08x, pbData=%p, " + TRACE("(hProv=%08Ix, hKey=%08Ix, hHash=%08Ix, Final=%d, dwFlags=%08lx, pbData=%p, " "pdwDataLen=%p)\n", hProv, hKey, hHash, Final, dwFlags, pbData, pdwDataLen); if (!is_valid_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER)) @@ -2973,7 +2973,7 @@ BOOL WINAPI RSAENH_CPExportKey(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTKEY hPubK { CRYPTKEY *pCryptKey; - TRACE("(hProv=%08lx, hKey=%08lx, hPubKey=%08lx, dwBlobType=%08x, dwFlags=%08x, pbData=%p," + TRACE("(hProv=%08Ix, hKey=%08Ix, hPubKey=%08Ix, dwBlobType=%08lx, dwFlags=%08lx, pbData=%p," "pdwDataLen=%p)\n", hProv, hKey, hPubKey, dwBlobType, dwFlags, pbData, pdwDataLen); if (!is_valid_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER)) @@ -3063,14 +3063,14 @@ static BOOL import_private_key(HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDat if ((dwDataLen < sizeof(BLOBHEADER) + sizeof(RSAPUBKEY))) { - ERR("datalen %d not long enough for a BLOBHEADER + RSAPUBKEY\n", + ERR("datalen %ld not long enough for a BLOBHEADER + RSAPUBKEY\n", dwDataLen); SetLastError(NTE_BAD_DATA); return FALSE; } if (pRSAPubKey->magic != RSAENH_MAGIC_RSA2) { - ERR("unexpected magic %08x\n", pRSAPubKey->magic); + ERR("unexpected magic %08lx\n", pRSAPubKey->magic); SetLastError(NTE_BAD_DATA); return FALSE; } @@ -3080,7 +3080,7 @@ static BOOL import_private_key(HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDat DWORD expectedLen = sizeof(BLOBHEADER) + sizeof(RSAPUBKEY) + (pRSAPubKey->bitlen >> 3) + (5 * ((pRSAPubKey->bitlen+8)>>4)); - ERR("blob too short for pub key: expect %d, got %d\n", + ERR("blob too short for pub key: expect %ld, got %ld\n", expectedLen, dwDataLen); SetLastError(NTE_BAD_DATA); return FALSE; @@ -3421,7 +3421,7 @@ static BOOL import_key(HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDataLen, HC BOOL WINAPI RSAENH_CPImportKey(HCRYPTPROV hProv, const BYTE *pbData, DWORD dwDataLen, HCRYPTKEY hPubKey, DWORD dwFlags, HCRYPTKEY *phKey) { - TRACE("(hProv=%08lx, pbData=%p, dwDataLen=%d, hPubKey=%08lx, dwFlags=%08x, phKey=%p)\n", + TRACE("(hProv=%08Ix, pbData=%p, dwDataLen=%ld, hPubKey=%08Ix, dwFlags=%08lx, phKey=%p)\n", hProv, pbData, dwDataLen, hPubKey, dwFlags, phKey); return import_key(hProv, pbData, dwDataLen, hPubKey, dwFlags, TRUE, phKey); @@ -3454,7 +3454,7 @@ BOOL WINAPI RSAENH_CPGenKey(HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYP KEYCONTAINER *pKeyContainer; CRYPTKEY *pCryptKey; - TRACE("(hProv=%08lx, aiAlgid=%d, dwFlags=%08x, phKey=%p)\n", hProv, Algid, dwFlags, phKey); + TRACE("(hProv=%08Ix, aiAlgid=%d, dwFlags=%08lx, phKey=%p)\n", hProv, Algid, dwFlags, phKey); if (!(pKeyContainer = get_key_container(hProv))) { @@ -3543,7 +3543,7 @@ BOOL WINAPI RSAENH_CPGenKey(HCRYPTPROV hProv, ALG_ID Algid, DWORD dwFlags, HCRYP */ BOOL WINAPI RSAENH_CPGenRandom(HCRYPTPROV hProv, DWORD dwLen, BYTE *pbBuffer) { - TRACE("(hProv=%08lx, dwLen=%d, pbBuffer=%p)\n", hProv, dwLen, pbBuffer); + TRACE("(hProv=%08Ix, dwLen=%ld, pbBuffer=%p)\n", hProv, dwLen, pbBuffer); if (!is_valid_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER)) { @@ -3581,7 +3581,7 @@ BOOL WINAPI RSAENH_CPGetHashParam(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwPa { CRYPTHASH *pCryptHash; - TRACE("(hProv=%08lx, hHash=%08lx, dwParam=%08x, pbData=%p, pdwDataLen=%p, dwFlags=%08x)\n", + TRACE("(hProv=%08Ix, hHash=%08Ix, dwParam=%08lx, pbData=%p, pdwDataLen=%p, dwFlags=%08lx)\n", hProv, hHash, dwParam, pbData, pdwDataLen, dwFlags); if (!is_valid_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER)) @@ -3675,7 +3675,7 @@ BOOL WINAPI RSAENH_CPSetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam { CRYPTKEY *pCryptKey; - TRACE("(hProv=%08lx, hKey=%08lx, dwParam=%08x, pbData=%p, dwFlags=%08x)\n", hProv, hKey, + TRACE("(hProv=%08Ix, hKey=%08Ix, dwParam=%08lx, pbData=%p, dwFlags=%08lx)\n", hProv, hKey, dwParam, pbData, dwFlags); if (!is_valid_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER)) @@ -3893,7 +3893,7 @@ BOOL WINAPI RSAENH_CPGetKeyParam(HCRYPTPROV hProv, HCRYPTKEY hKey, DWORD dwParam CRYPTKEY *pCryptKey; DWORD dwValue; - TRACE("(hProv=%08lx, hKey=%08lx, dwParam=%08x, pbData=%p, pdwDataLen=%p dwFlags=%08x)\n", + TRACE("(hProv=%08Ix, hKey=%08Ix, dwParam=%08lx, pbData=%p, pdwDataLen=%p dwFlags=%08lx)\n", hProv, hKey, dwParam, pbData, pdwDataLen, dwFlags); if (!is_valid_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER)) @@ -4022,7 +4022,7 @@ BOOL WINAPI RSAENH_CPGetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, 0xf3, 0x81, /**/0x00,/**/ 0xfa, 0xe8, 0x26, /**/0x00,/**/ 0xca }; - TRACE("(hProv=%08lx, dwParam=%08x, pbData=%p, pdwDataLen=%p, dwFlags=%08x)\n", + TRACE("(hProv=%08Ix, dwParam=%08lx, pbData=%p, pdwDataLen=%p, dwFlags=%08lx)\n", hProv, dwParam, pbData, pdwDataLen, dwFlags); if (!pdwDataLen) { @@ -4216,7 +4216,7 @@ BOOL WINAPI RSAENH_CPDeriveKey(HCRYPTPROV hProv, ALG_ID Algid, HCRYPTHASH hBaseD BYTE abHashValue[RSAENH_MAX_HASH_SIZE*2]; DWORD dwLen; - TRACE("(hProv=%08lx, Algid=%d, hBaseData=%08lx, dwFlags=%08x phKey=%p)\n", hProv, Algid, + TRACE("(hProv=%08Ix, Algid=%d, hBaseData=%08Ix, dwFlags=%08lx phKey=%p)\n", hProv, Algid, hBaseData, dwFlags, phKey); if (!is_valid_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER)) @@ -4396,7 +4396,7 @@ BOOL WINAPI RSAENH_CPGetUserKey(HCRYPTPROV hProv, DWORD dwKeySpec, HCRYPTKEY *ph { KEYCONTAINER *pKeyContainer; - TRACE("(hProv=%08lx, dwKeySpec=%08x, phUserKey=%p)\n", hProv, dwKeySpec, phUserKey); + TRACE("(hProv=%08Ix, dwKeySpec=%08lx, phUserKey=%p)\n", hProv, dwKeySpec, phUserKey); if (!(pKeyContainer = get_key_container(hProv))) { @@ -4455,7 +4455,7 @@ BOOL WINAPI RSAENH_CPHashData(HCRYPTPROV hProv, HCRYPTHASH hHash, const BYTE *pb { CRYPTHASH *pCryptHash; - TRACE("(hProv=%08lx, hHash=%08lx, pbData=%p, dwDataLen=%d, dwFlags=%08x)\n", + TRACE("(hProv=%08Ix, hHash=%08Ix, pbData=%p, dwDataLen=%ld, dwFlags=%08lx)\n", hProv, hHash, pbData, dwDataLen, dwFlags); if (dwFlags & ~CRYPT_USERDATA) @@ -4509,7 +4509,7 @@ BOOL WINAPI RSAENH_CPHashSessionKey(HCRYPTPROV hProv, HCRYPTHASH hHash, HCRYPTKE CRYPTKEY *pKey; DWORD i; - TRACE("(hProv=%08lx, hHash=%08lx, hKey=%08lx, dwFlags=%08x)\n", hProv, hHash, hKey, dwFlags); + TRACE("(hProv=%08Ix, hHash=%08Ix, hKey=%08Ix, dwFlags=%08lx)\n", hProv, hHash, hKey, dwFlags); if (!lookup_handle(&handle_table, hKey, RSAENH_MAGIC_KEY, (OBJECTHDR**)&pKey) || (GET_ALG_CLASS(pKey->aiAlgid) != ALG_CLASS_DATA_ENCRYPT)) @@ -4550,7 +4550,7 @@ BOOL WINAPI RSAENH_CPHashSessionKey(HCRYPTPROV hProv, HCRYPTHASH hHash, HCRYPTKE */ BOOL WINAPI RSAENH_CPReleaseContext(HCRYPTPROV hProv, DWORD dwFlags) { - TRACE("(hProv=%08lx, dwFlags=%08x)\n", hProv, dwFlags); + TRACE("(hProv=%08Ix, dwFlags=%08lx)\n", hProv, dwFlags); if (!release_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER)) { @@ -4595,7 +4595,7 @@ BOOL WINAPI RSAENH_CPSetHashParam(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwPa CRYPTKEY *pCryptKey; DWORD i; - TRACE("(hProv=%08lx, hHash=%08lx, dwParam=%08x, pbData=%p, dwFlags=%08x)\n", + TRACE("(hProv=%08Ix, hHash=%08Ix, dwParam=%08lx, pbData=%p, dwFlags=%08lx)\n", hProv, hHash, dwParam, pbData, dwFlags); if (!is_valid_handle(&handle_table, hProv, RSAENH_MAGIC_CONTAINER)) @@ -4686,7 +4686,7 @@ BOOL WINAPI RSAENH_CPSetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, KEYCONTAINER *pKeyContainer; HKEY hKey; - TRACE("(hProv=%08lx, dwParam=%08x, pbData=%p, dwFlags=%08x)\n", hProv, dwParam, pbData, dwFlags); + TRACE("(hProv=%08Ix, dwParam=%08lx, pbData=%p, dwFlags=%08lx)\n", hProv, dwParam, pbData, dwFlags); if (!(pKeyContainer = get_key_container(hProv))) return FALSE; @@ -4727,7 +4727,7 @@ BOOL WINAPI RSAENH_CPSetProvParam(HCRYPTPROV hProv, DWORD dwParam, BYTE *pbData, return TRUE; } default: - FIXME("unimplemented parameter %08x\n", dwParam); + FIXME("unimplemented parameter %08lx\n", dwParam); return FALSE; } } @@ -4761,7 +4761,7 @@ BOOL WINAPI RSAENH_CPSignHash(HCRYPTPROV hProv, HCRYPTHASH hHash, DWORD dwKeySpe ALG_ID aiAlgid; BOOL ret = FALSE; - TRACE("(hProv=%08lx, hHash=%08lx, dwKeySpec=%08x, sDescription=%s, dwFlags=%08x, " + TRACE("(hProv=%08Ix, hHash=%08Ix, dwKeySpec=%08lx, sDescription=%s, dwFlags=%08lx, " "pbSignature=%p, pdwSigLen=%p)\n", hProv, hHash, dwKeySpec, debugstr_w(sDescription), dwFlags, pbSignature, pdwSigLen); @@ -4846,8 +4846,8 @@ BOOL WINAPI RSAENH_CPVerifySignature(HCRYPTPROV hProv, HCRYPTHASH hHash, const B BYTE abHashValue[RSAENH_MAX_HASH_SIZE]; BOOL res = FALSE; - TRACE("(hProv=%08lx, hHash=%08lx, pbSignature=%p, dwSigLen=%d, hPubKey=%08lx, sDescription=%s, " - "dwFlags=%08x)\n", hProv, hHash, pbSignature, dwSigLen, hPubKey, debugstr_w(sDescription), + TRACE("(hProv=%08Ix, hHash=%08Ix, pbSignature=%p, dwSigLen=%ld, hPubKey=%08Ix, sDescription=%s, " + "dwFlags=%08lx)\n", hProv, hHash, pbSignature, dwSigLen, hPubKey, debugstr_w(sDescription), dwFlags); if (dwFlags & ~(CRYPT_NOHASHOID|CRYPT_X931_FORMAT)) {
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/rstrtmgr/Makefile.in | 1 - dlls/rstrtmgr/main.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/rstrtmgr/Makefile.in b/dlls/rstrtmgr/Makefile.in index 9770a4b3408..8e9610ee5c9 100644 --- a/dlls/rstrtmgr/Makefile.in +++ b/dlls/rstrtmgr/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = rstrtmgr.dll EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/rstrtmgr/main.c b/dlls/rstrtmgr/main.c index b9f29c7060c..238bcc20b1a 100644 --- a/dlls/rstrtmgr/main.c +++ b/dlls/rstrtmgr/main.c @@ -34,7 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(rstrtmgr); DWORD WINAPI RmGetList(DWORD dwSessionHandle, UINT *pnProcInfoNeeded, UINT *pnProcInfo, RM_PROCESS_INFO *rgAffectedApps[], LPDWORD lpdwRebootReasons) { - FIXME("%d, %p, %p, %p, %p stub!\n", dwSessionHandle, pnProcInfoNeeded, pnProcInfo, rgAffectedApps, lpdwRebootReasons); + FIXME("%ld, %p, %p, %p, %p stub!\n", dwSessionHandle, pnProcInfoNeeded, pnProcInfo, rgAffectedApps, lpdwRebootReasons); if (pnProcInfoNeeded) *pnProcInfoNeeded = 0; if (pnProcInfo) @@ -51,7 +51,7 @@ DWORD WINAPI RmRegisterResources(DWORD dwSessionHandle, UINT nFiles, LPCWSTR rgs UINT nApplications, RM_UNIQUE_PROCESS *rgApplications, UINT nServices, LPCWSTR rgsServiceNames[]) { - FIXME("%d, %d, %p, %d, %p, %d, %p stub!\n", dwSessionHandle, nFiles, rgsFilenames, + FIXME("%ld, %d, %p, %d, %p, %d, %p stub!\n", dwSessionHandle, nFiles, rgsFilenames, nApplications, rgApplications, nServices, rgsServiceNames); return ERROR_SUCCESS; } @@ -63,7 +63,7 @@ DWORD WINAPI RmRegisterResources(DWORD dwSessionHandle, UINT nFiles, LPCWSTR rgs */ DWORD WINAPI RmStartSession(DWORD *sessionhandle, DWORD flags, WCHAR sessionkey[]) { - FIXME("%p, %d, %p stub!\n", sessionhandle, flags, sessionkey); + FIXME("%p, %ld, %p stub!\n", sessionhandle, flags, sessionkey); if (sessionhandle) *sessionhandle = 0xdeadbeef; return ERROR_SUCCESS; @@ -74,7 +74,7 @@ DWORD WINAPI RmStartSession(DWORD *sessionhandle, DWORD flags, WCHAR sessionkey[ */ DWORD WINAPI RmRestart(DWORD handle, DWORD flags, RM_WRITE_STATUS_CALLBACK status) { - FIXME("%u, 0x%08x, %p stub!\n", handle, flags, status); + FIXME("%lu, 0x%08lx, %p stub!\n", handle, flags, status); return ERROR_SUCCESS; } @@ -83,7 +83,7 @@ DWORD WINAPI RmRestart(DWORD handle, DWORD flags, RM_WRITE_STATUS_CALLBACK statu */ DWORD WINAPI RmEndSession(DWORD handle) { - FIXME("%u stub!\n", handle); + FIXME("%lu stub!\n", handle); return ERROR_SUCCESS; } @@ -92,7 +92,7 @@ DWORD WINAPI RmEndSession(DWORD handle) */ DWORD WINAPI RmShutdown(DWORD handle, ULONG flags, RM_WRITE_STATUS_CALLBACK status) { - FIXME("%u, 0x%08x, %p stub!\n", handle, flags, status); + FIXME("%lu, 0x%08lx, %p stub!\n", handle, flags, status); return ERROR_SUCCESS; } @@ -102,7 +102,7 @@ DWORD WINAPI RmShutdown(DWORD handle, ULONG flags, RM_WRITE_STATUS_CALLBACK stat DWORD WINAPI RmAddFilter(DWORD handle, LPCWSTR moduleName, RM_UNIQUE_PROCESS *process, LPCWSTR serviceShortName, RM_FILTER_ACTION filter) { - FIXME("%u, %s %p %s 0x%08x stub!\n", handle, debugstr_w(moduleName), process, + FIXME("%lu, %s %p %s 0x%08x stub!\n", handle, debugstr_w(moduleName), process, debugstr_w(serviceShortName), filter); return ERROR_SUCCESS; } @@ -113,7 +113,7 @@ DWORD WINAPI RmAddFilter(DWORD handle, LPCWSTR moduleName, RM_UNIQUE_PROCESS *pr DWORD WINAPI RmRemoveFilter(DWORD handle, LPCWSTR moduleName, RM_UNIQUE_PROCESS *process, LPCWSTR serviceShortName) { - FIXME("%u, %s %p %s stub!\n", handle, debugstr_w(moduleName), process, + FIXME("%lu, %s %p %s stub!\n", handle, debugstr_w(moduleName), process, debugstr_w(serviceShortName)); return ERROR_SUCCESS; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/rtutils/Makefile.in | 1 - dlls/rtutils/tracing.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/rtutils/Makefile.in b/dlls/rtutils/Makefile.in index ac39ee054aa..d55efc11cfb 100644 --- a/dlls/rtutils/Makefile.in +++ b/dlls/rtutils/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = rtutils.dll IMPORTLIB = rtutils diff --git a/dlls/rtutils/tracing.c b/dlls/rtutils/tracing.c index 96d1dfb4a02..576acbd7647 100644 --- a/dlls/rtutils/tracing.c +++ b/dlls/rtutils/tracing.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(rtutils); */ DWORD WINAPI TraceRegisterExW(LPCWSTR name, DWORD flags) { - FIXME("(%s, %x): stub\n", debugstr_w(name), flags); + FIXME("(%s, %lx): stub\n", debugstr_w(name), flags); return INVALID_TRACEID; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/sane.ds/Makefile.in | 1 - dlls/sane.ds/capability.c | 12 ++++++------ dlls/sane.ds/ds_ctrl.c | 2 +- dlls/sane.ds/sane_main.c | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/sane.ds/Makefile.in b/dlls/sane.ds/Makefile.in index 9c4931a0b54..59ceeda3fac 100644 --- a/dlls/sane.ds/Makefile.in +++ b/dlls/sane.ds/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sane.ds UNIXLIB = sane.so IMPORTS = comctl32 user32 gdi32 diff --git a/dlls/sane.ds/capability.c b/dlls/sane.ds/capability.c index 8c0922ca176..15ca4ea740a 100644 --- a/dlls/sane.ds/capability.c +++ b/dlls/sane.ds/capability.c @@ -198,7 +198,7 @@ static TW_UINT16 SANE_ICAPXferMech (pTW_CAPABILITY pCapability, TW_UINT16 action if (twCC == TWCC_SUCCESS) { activeDS.capXferMech = (TW_UINT16) val; - FIXME("Partial Stub: XFERMECH set to %d, but ignored\n", val); + FIXME("Partial Stub: XFERMECH set to %ld, but ignored\n", val); } break; @@ -242,7 +242,7 @@ static TW_UINT16 SANE_CAPXferCount (pTW_CAPABILITY pCapability, TW_UINT16 action case MSG_SET: twCC = msg_set(pCapability, &val); if (twCC == TWCC_SUCCESS) - FIXME("Partial Stub: XFERCOUNT set to %d, but ignored\n", val); + FIXME("Partial Stub: XFERCOUNT set to %ld, but ignored\n", val); break; case MSG_GETDEFAULT: @@ -326,7 +326,7 @@ static TW_UINT16 SANE_ICAPPixelType (pTW_CAPABILITY pCapability, TW_UINT16 actio twCC = msg_set(pCapability, &val); if (twCC == TWCC_SUCCESS) { - TRACE("Setting pixeltype to %d\n", val); + TRACE("Setting pixeltype to %ld\n", val); if (! pixeltype_to_sane_mode(val, mode, sizeof(mode))) return TWCC_BADVALUE; @@ -493,7 +493,7 @@ static TW_UINT16 SANE_ICAPCompression (pTW_CAPABILITY pCapability, TW_UINT16 act case MSG_SET: twCC = msg_set(pCapability, &val); if (twCC == TWCC_SUCCESS) - FIXME("Partial Stub: COMPRESSION set to %d, but ignored\n", val); + FIXME("Partial Stub: COMPRESSION set to %ld, but ignored\n", val); break; case MSG_GETDEFAULT: @@ -659,7 +659,7 @@ static TW_UINT16 SANE_ICAPPixelFlavor (pTW_CAPABILITY pCapability, TW_UINT16 act twCC = msg_set(pCapability, &val); if (twCC == TWCC_SUCCESS) { - FIXME("Stub: PIXELFLAVOR set to %d, but ignored\n", val); + FIXME("Stub: PIXELFLAVOR set to %ld, but ignored\n", val); } break; @@ -822,7 +822,7 @@ static TW_UINT16 SANE_ICAPSupportedSizes (pTW_CAPABILITY pCapability, TW_UINT16 if (supported_sizes[i].size == val) return set_width_height(supported_sizes[i].x, supported_sizes[i].y); - ERR("Unsupported size %d\n", val); + ERR("Unsupported size %ld\n", val); twCC = TWCC_BADCAP; break; diff --git a/dlls/sane.ds/ds_ctrl.c b/dlls/sane.ds/ds_ctrl.c index 915f085a481..79c268a36ae 100644 --- a/dlls/sane.ds/ds_ctrl.c +++ b/dlls/sane.ds/ds_ctrl.c @@ -176,7 +176,7 @@ TW_UINT16 SANE_ProcessEvent (pTW_IDENTITY pOrigin, pTW_EVENT pEvent = (pTW_EVENT) pData; MSG *pMsg = pEvent->pEvent; - TRACE("DG_CONTROL/DAT_EVENT/MSG_PROCESSEVENT msg 0x%x, wParam 0x%lx\n", pMsg->message, pMsg->wParam); + TRACE("DG_CONTROL/DAT_EVENT/MSG_PROCESSEVENT msg 0x%x, wParam 0x%Ix\n", pMsg->message, pMsg->wParam); activeDS.twCC = TWCC_SUCCESS; pEvent->TWMessage = MSG_NULL; /* no message to the application */ diff --git a/dlls/sane.ds/sane_main.c b/dlls/sane.ds/sane_main.c index 48972bd4b8c..832c333ae57 100644 --- a/dlls/sane.ds/sane_main.c +++ b/dlls/sane.ds/sane_main.c @@ -34,7 +34,7 @@ unixlib_handle_t sane_handle = 0; BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); + TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { @@ -333,7 +333,7 @@ DS_Entry ( pTW_IDENTITY pOrigin, { TW_UINT16 twRC = TWRC_SUCCESS; /* Return Code */ - TRACE("(DG=%d DAT=%d MSG=%d)\n", DG, DAT, MSG); + TRACE("(DG=%ld DAT=%d MSG=%d)\n", DG, DAT, MSG); switch (DG) {
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/sapi/Makefile.in | 1 - dlls/sapi/automation.c | 26 +++++++++++++------------- dlls/sapi/resource.c | 4 ++-- dlls/sapi/stream.c | 18 +++++++++--------- dlls/sapi/token.c | 20 ++++++++++---------- dlls/sapi/tts.c | 48 ++++++++++++++++++++++++------------------------ 6 files changed, 58 insertions(+), 59 deletions(-) diff --git a/dlls/sapi/Makefile.in b/dlls/sapi/Makefile.in index e61773fb12a..e0f9a8cdd07 100644 --- a/dlls/sapi/Makefile.in +++ b/dlls/sapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sapi.dll IMPORTS = uuid ole32 user32 advapi32 diff --git a/dlls/sapi/automation.c b/dlls/sapi/automation.c index 7a9fa17f8f1..8a0e0203198 100644 --- a/dlls/sapi/automation.c +++ b/dlls/sapi/automation.c @@ -81,7 +81,7 @@ static ULONG WINAPI file_stream_AddRef(ISpeechFileStream *iface) struct file_stream *This = impl_from_ISpeechFileStream(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p): ref=%u.\n", iface, ref); + TRACE("(%p): ref=%lu.\n", iface, ref); return ref; } @@ -91,7 +91,7 @@ static ULONG WINAPI file_stream_Release(ISpeechFileStream *iface) struct file_stream *This = impl_from_ISpeechFileStream(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): ref=%u.\n", iface, ref); + TRACE("(%p): ref=%lu.\n", iface, ref); if (!ref) { @@ -111,7 +111,7 @@ static HRESULT WINAPI file_stream_GetTypeInfoCount(ISpeechFileStream *iface, UIN static HRESULT WINAPI file_stream_GetTypeInfo(ISpeechFileStream *iface, UINT info, LCID lcid, ITypeInfo **type_info) { - FIXME("(%p, %u, %u, %p): stub.\n", iface, info, lcid, type_info); + FIXME("(%p, %u, %lu, %p): stub.\n", iface, info, lcid, type_info); return E_NOTIMPL; } @@ -119,7 +119,7 @@ static HRESULT WINAPI file_stream_GetTypeInfo(ISpeechFileStream *iface, UINT inf static HRESULT WINAPI file_stream_GetIDsOfNames(ISpeechFileStream *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) { - FIXME("(%p, %s, %p, %u, %u, %p): stub.\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + FIXME("(%p, %s, %p, %u, %lu, %p): stub.\n", iface, debugstr_guid(riid), names, count, lcid, dispid); return E_NOTIMPL; } @@ -128,7 +128,7 @@ static HRESULT WINAPI file_stream_Invoke(ISpeechFileStream *iface, DISPID dispid WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) { - FIXME("(%p, %d, %s, %#x, %#x, %p, %p, %p, %p): stub.\n", iface, dispid, debugstr_guid(riid), + FIXME("(%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p): stub.\n", iface, dispid, debugstr_guid(riid), lcid, flags, params, result, excepinfo, argerr); return E_NOTIMPL; @@ -150,7 +150,7 @@ static HRESULT WINAPI file_stream_putref_Format(ISpeechFileStream *iface, ISpeec static HRESULT WINAPI file_stream_Read(ISpeechFileStream *iface, VARIANT *buffer, LONG written, LONG *read) { - FIXME("(%p, %p, %d, %p): stub.\n", iface, buffer, written, read); + FIXME("(%p, %p, %ld, %p): stub.\n", iface, buffer, written, read); return E_NOTIMPL; } @@ -232,21 +232,21 @@ static ULONG WINAPI spstream_Release(ISpStream *iface) static HRESULT WINAPI spstream_Read(ISpStream *iface, void *pv, ULONG cb, ULONG *read) { - FIXME("(%p, %p, %d, %p): stub.\n", iface, pv, cb, read); + FIXME("(%p, %p, %ld, %p): stub.\n", iface, pv, cb, read); return E_NOTIMPL; } static HRESULT WINAPI spstream_Write(ISpStream *iface, const void *pv, ULONG cb, ULONG *written) { - FIXME("(%p, %p, %d, %p): stub.\n", iface, pv, cb, written); + FIXME("(%p, %p, %ld, %p): stub.\n", iface, pv, cb, written); return E_NOTIMPL; } static HRESULT WINAPI spstream_Seek(ISpStream *iface, LARGE_INTEGER mode, DWORD origin, ULARGE_INTEGER *position) { - FIXME("(%p, %s, %d, %p): stub.\n", iface, wine_dbgstr_longlong(mode.QuadPart), origin, position); + FIXME("(%p, %s, %ld, %p): stub.\n", iface, wine_dbgstr_longlong(mode.QuadPart), origin, position); return E_NOTIMPL; } @@ -269,7 +269,7 @@ static HRESULT WINAPI spstream_CopyTo(ISpStream *iface, IStream *stream, ULARGE_ static HRESULT WINAPI spstream_Commit(ISpStream *iface, DWORD flag) { - FIXME("(%p, %d): stub.\n", iface, flag); + FIXME("(%p, %ld): stub.\n", iface, flag); return E_NOTIMPL; } @@ -283,7 +283,7 @@ static HRESULT WINAPI spstream_Revert(ISpStream *iface) static HRESULT WINAPI spstream_LockRegion(ISpStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER cb, DWORD type) { - FIXME("(%p, %s, %s, %d): stub.\n", iface, wine_dbgstr_longlong(offset.QuadPart), + FIXME("(%p, %s, %s, %ld): stub.\n", iface, wine_dbgstr_longlong(offset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), type); return E_NOTIMPL; @@ -291,7 +291,7 @@ static HRESULT WINAPI spstream_LockRegion(ISpStream *iface, ULARGE_INTEGER offse static HRESULT WINAPI spstream_UnlockRegion(ISpStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER cb, DWORD type) { - FIXME("(%p, %s, %s, %d): stub.\n", iface, wine_dbgstr_longlong(offset.QuadPart), + FIXME("(%p, %s, %s, %ld): stub.\n", iface, wine_dbgstr_longlong(offset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), type); return E_NOTIMPL; @@ -299,7 +299,7 @@ static HRESULT WINAPI spstream_UnlockRegion(ISpStream *iface, ULARGE_INTEGER off static HRESULT WINAPI spstream_Stat(ISpStream *iface, STATSTG *statstg, DWORD flag) { - FIXME("(%p, %p, %d): stub.\n", iface, statstg, flag); + FIXME("(%p, %p, %ld): stub.\n", iface, statstg, flag); return E_NOTIMPL; } diff --git a/dlls/sapi/resource.c b/dlls/sapi/resource.c index 85d4430f8ad..8db833b3b39 100644 --- a/dlls/sapi/resource.c +++ b/dlls/sapi/resource.c @@ -70,7 +70,7 @@ static ULONG WINAPI resource_manager_AddRef(ISpResourceManager *iface) struct resource_manager *This = impl_from_ISpResourceManager(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p): ref=%u.\n", iface, ref); + TRACE("(%p): ref=%lu.\n", iface, ref); return ref; } @@ -80,7 +80,7 @@ static ULONG WINAPI resource_manager_Release(ISpResourceManager *iface) struct resource_manager *This = impl_from_ISpResourceManager(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): ref=%u.\n", iface, ref); + TRACE("(%p): ref=%lu.\n", iface, ref); if (!ref) { diff --git a/dlls/sapi/stream.c b/dlls/sapi/stream.c index 06ba4367b48..6df2768b5cc 100644 --- a/dlls/sapi/stream.c +++ b/dlls/sapi/stream.c @@ -70,7 +70,7 @@ static ULONG WINAPI spstream_AddRef(ISpStream *iface) struct spstream *This = impl_from_ISpStream(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p): ref=%u.\n", iface, ref); + TRACE("(%p): ref=%lu.\n", iface, ref); return ref; } @@ -80,7 +80,7 @@ static ULONG WINAPI spstream_Release(ISpStream *iface) struct spstream *This = impl_from_ISpStream(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): ref=%u.\n", iface, ref); + TRACE("(%p): ref=%lu.\n", iface, ref); if (!ref) { @@ -92,21 +92,21 @@ static ULONG WINAPI spstream_Release(ISpStream *iface) static HRESULT WINAPI spstream_Read(ISpStream *iface, void *pv, ULONG cb, ULONG *read) { - FIXME("(%p, %p, %d, %p): stub.\n", iface, pv, cb, read); + FIXME("(%p, %p, %ld, %p): stub.\n", iface, pv, cb, read); return E_NOTIMPL; } static HRESULT WINAPI spstream_Write(ISpStream *iface, const void *pv, ULONG cb, ULONG *written) { - FIXME("(%p, %p, %d, %p): stub.\n", iface, pv, cb, written); + FIXME("(%p, %p, %ld, %p): stub.\n", iface, pv, cb, written); return E_NOTIMPL; } static HRESULT WINAPI spstream_Seek(ISpStream *iface, LARGE_INTEGER mode, DWORD origin, ULARGE_INTEGER *position) { - FIXME("(%p, %s, %d, %p): stub.\n", iface, wine_dbgstr_longlong(mode.QuadPart), origin, position); + FIXME("(%p, %s, %ld, %p): stub.\n", iface, wine_dbgstr_longlong(mode.QuadPart), origin, position); return E_NOTIMPL; } @@ -129,7 +129,7 @@ static HRESULT WINAPI spstream_CopyTo(ISpStream *iface, IStream *stream, ULARGE_ static HRESULT WINAPI spstream_Commit(ISpStream *iface, DWORD flag) { - FIXME("(%p, %d): stub.\n", iface, flag); + FIXME("(%p, %ld): stub.\n", iface, flag); return E_NOTIMPL; } @@ -143,7 +143,7 @@ static HRESULT WINAPI spstream_Revert(ISpStream *iface) static HRESULT WINAPI spstream_LockRegion(ISpStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER cb, DWORD type) { - FIXME("(%p, %s, %s, %d): stub.\n", iface, wine_dbgstr_longlong(offset.QuadPart), + FIXME("(%p, %s, %s, %ld): stub.\n", iface, wine_dbgstr_longlong(offset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), type); return E_NOTIMPL; @@ -151,7 +151,7 @@ static HRESULT WINAPI spstream_LockRegion(ISpStream *iface, ULARGE_INTEGER offse static HRESULT WINAPI spstream_UnlockRegion(ISpStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER cb, DWORD type) { - FIXME("(%p, %s, %s, %d): stub.\n", iface, wine_dbgstr_longlong(offset.QuadPart), + FIXME("(%p, %s, %s, %ld): stub.\n", iface, wine_dbgstr_longlong(offset.QuadPart), wine_dbgstr_longlong(cb.QuadPart), type); return E_NOTIMPL; @@ -159,7 +159,7 @@ static HRESULT WINAPI spstream_UnlockRegion(ISpStream *iface, ULARGE_INTEGER off static HRESULT WINAPI spstream_Stat(ISpStream *iface, STATSTG *statstg, DWORD flag) { - FIXME("(%p, %p, %d): stub.\n", iface, statstg, flag); + FIXME("(%p, %p, %ld): stub.\n", iface, statstg, flag); return E_NOTIMPL; } diff --git a/dlls/sapi/token.c b/dlls/sapi/token.c index ba91a425e9e..2de3553b3ab 100644 --- a/dlls/sapi/token.c +++ b/dlls/sapi/token.c @@ -73,7 +73,7 @@ static ULONG WINAPI data_key_AddRef( ISpRegDataKey *iface ) struct data_key *This = impl_from_ISpRegDataKey( iface ); ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); return ref; } @@ -82,7 +82,7 @@ static ULONG WINAPI data_key_Release( ISpRegDataKey *iface ) struct data_key *This = impl_from_ISpRegDataKey( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) { @@ -265,7 +265,7 @@ static ULONG WINAPI token_category_AddRef( ISpObjectTokenCategory *iface ) struct token_category *This = impl_from_ISpObjectTokenCategory( iface ); ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); return ref; } @@ -274,7 +274,7 @@ static ULONG WINAPI token_category_Release( ISpObjectTokenCategory *iface ) struct token_category *This = impl_from_ISpObjectTokenCategory( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) { @@ -514,7 +514,7 @@ static HRESULT WINAPI token_category_GetDefaultTokenId( ISpObjectTokenCategory * return SPERR_NOT_FOUND; } else if (res != ERROR_SUCCESS) { /* probably not the correct return value */ - FIXME( "returning %08x\n", res ); + FIXME( "returning %08lx\n", res ); return res; } @@ -606,7 +606,7 @@ static ULONG WINAPI token_enum_AddRef( ISpObjectTokenEnumBuilder *iface ) struct token_enum *This = impl_from_ISpObjectTokenEnumBuilder( iface ); ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); return ref; } @@ -615,7 +615,7 @@ static ULONG WINAPI token_enum_Release( ISpObjectTokenEnumBuilder *iface ) struct token_enum *This = impl_from_ISpObjectTokenEnumBuilder( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) { @@ -633,7 +633,7 @@ static HRESULT WINAPI token_enum_Next( ISpObjectTokenEnumBuilder *iface, { struct token_enum *This = impl_from_ISpObjectTokenEnumBuilder( iface ); - TRACE( "(%p)->(%u %p %p)\n", This, num, tokens, fetched ); + TRACE( "(%p)->(%lu %p %p)\n", This, num, tokens, fetched ); if (!This->init) return SPERR_UNINITIALIZED; @@ -817,7 +817,7 @@ static ULONG WINAPI token_AddRef( ISpObjectToken *iface ) struct object_token *This = impl_from_ISpObjectToken( iface ); ULONG ref = InterlockedIncrement( &This->ref ); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); return ref; } @@ -826,7 +826,7 @@ static ULONG WINAPI token_Release( ISpObjectToken *iface ) struct object_token *This = impl_from_ISpObjectToken( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE( "(%p) ref = %u\n", This, ref ); + TRACE( "(%p) ref = %lu\n", This, ref ); if (!ref) { diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 6c5e89de25c..9f60c70e6c4 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -88,7 +88,7 @@ static ULONG WINAPI speech_voice_AddRef(ISpeechVoice *iface) struct speech_voice *This = impl_from_ISpeechVoice(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p): ref=%u.\n", iface, ref); + TRACE("(%p): ref=%lu.\n", iface, ref); return ref; } @@ -98,7 +98,7 @@ static ULONG WINAPI speech_voice_Release(ISpeechVoice *iface) struct speech_voice *This = impl_from_ISpeechVoice(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p): ref=%u.\n", iface, ref); + TRACE("(%p): ref=%lu.\n", iface, ref); if (!ref) { @@ -118,7 +118,7 @@ static HRESULT WINAPI speech_voice_GetTypeInfoCount(ISpeechVoice *iface, UINT *i static HRESULT WINAPI speech_voice_GetTypeInfo(ISpeechVoice *iface, UINT info, LCID lcid, ITypeInfo **type_info) { - FIXME("(%p, %u, %u, %p): stub.\n", iface, info, lcid, type_info); + FIXME("(%p, %u, %lu, %p): stub.\n", iface, info, lcid, type_info); return E_NOTIMPL; } @@ -126,7 +126,7 @@ static HRESULT WINAPI speech_voice_GetTypeInfo(ISpeechVoice *iface, UINT info, L static HRESULT WINAPI speech_voice_GetIDsOfNames(ISpeechVoice *iface, REFIID riid, LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) { - FIXME("(%p, %s, %p, %u, %u, %p): stub.\n", iface, debugstr_guid(riid), names, count, lcid, dispid); + FIXME("(%p, %s, %p, %u, %lu, %p): stub.\n", iface, debugstr_guid(riid), names, count, lcid, dispid); return E_NOTIMPL; } @@ -135,7 +135,7 @@ static HRESULT WINAPI speech_voice_Invoke(ISpeechVoice *iface, DISPID dispid, RE WORD flags, DISPPARAMS *params, VARIANT *result, EXCEPINFO *excepinfo, UINT *argerr) { - FIXME("(%p, %d, %s, %#x, %#x, %p, %p, %p, %p): stub.\n", iface, dispid, debugstr_guid(riid), + FIXME("(%p, %ld, %s, %#lx, %#x, %p, %p, %p, %p): stub.\n", iface, dispid, debugstr_guid(riid), lcid, flags, params, result, excepinfo, argerr); return E_NOTIMPL; @@ -199,7 +199,7 @@ static HRESULT WINAPI speech_voice_get_Rate(ISpeechVoice *iface, LONG *rate) static HRESULT WINAPI speech_voice_put_Rate(ISpeechVoice *iface, LONG rate) { - FIXME("(%p, %d): stub.\n", iface, rate); + FIXME("(%p, %ld): stub.\n", iface, rate); return E_NOTIMPL; } @@ -213,7 +213,7 @@ static HRESULT WINAPI speech_voice_get_Volume(ISpeechVoice *iface, LONG *volume) static HRESULT WINAPI speech_voice_put_Volume(ISpeechVoice *iface, LONG volume) { - FIXME("(%p, %d): stub.\n", iface, volume); + FIXME("(%p, %ld): stub.\n", iface, volume); return E_NOTIMPL; } @@ -277,7 +277,7 @@ static HRESULT WINAPI speech_voice_get_AlertBoundary(ISpeechVoice *iface, Speech static HRESULT WINAPI speech_voice_put_SynchronousSpeakTimeout(ISpeechVoice *iface, LONG timeout) { - FIXME("(%p, %d): stub.\n", iface, timeout); + FIXME("(%p, %ld): stub.\n", iface, timeout); return E_NOTIMPL; } @@ -320,7 +320,7 @@ static HRESULT WINAPI speech_voice_Resume(ISpeechVoice *iface) static HRESULT WINAPI speech_voice_Skip(ISpeechVoice *iface, const BSTR type, LONG items, LONG *skipped) { - FIXME("(%p, %s, %d, %p): stub.\n", iface, debugstr_w(type), items, skipped); + FIXME("(%p, %s, %ld, %p): stub.\n", iface, debugstr_w(type), items, skipped); return E_NOTIMPL; } @@ -343,7 +343,7 @@ static HRESULT WINAPI speech_voice_GetAudioOutputs(ISpeechVoice *iface, BSTR req static HRESULT WINAPI speech_voice_WaitUntilDone(ISpeechVoice *iface, LONG timeout, VARIANT_BOOL *done) { - FIXME("(%p, %d, %p): stub.\n", iface, timeout, done); + FIXME("(%p, %ld, %p): stub.\n", iface, timeout, done); return E_NOTIMPL; } @@ -366,7 +366,7 @@ static HRESULT WINAPI speech_voice_IsUISupported(ISpeechVoice *iface, const BSTR static HRESULT WINAPI speech_voice_DisplayUI(ISpeechVoice *iface, LONG hwnd, BSTR title, const BSTR typeui, const VARIANT *data) { - FIXME("(%p, %d, %s, %s, %p): stub.\n", iface, hwnd, debugstr_w(title), debugstr_w(typeui), data); + FIXME("(%p, %ld, %s, %s, %p): stub.\n", iface, hwnd, debugstr_w(title), debugstr_w(typeui), data); return E_NOTIMPL; } @@ -452,7 +452,7 @@ static HRESULT WINAPI spvoice_SetNotifySink(ISpVoice *iface, ISpNotifySink *sink static HRESULT WINAPI spvoice_SetNotifyWindowMessage(ISpVoice *iface, HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { - FIXME("(%p, %p, %u, %lx, %lx): stub.\n", iface, hwnd, msg, wparam, lparam); + FIXME("(%p, %p, %u, %Ix, %Ix): stub.\n", iface, hwnd, msg, wparam, lparam); return E_NOTIMPL; } @@ -460,7 +460,7 @@ static HRESULT WINAPI spvoice_SetNotifyWindowMessage(ISpVoice *iface, HWND hwnd, static HRESULT WINAPI spvoice_SetNotifyCallbackFunction(ISpVoice *iface, SPNOTIFYCALLBACK *callback, WPARAM wparam, LPARAM lparam) { - FIXME("(%p, %p, %lx, %lx): stub.\n", iface, callback, wparam, lparam); + FIXME("(%p, %p, %Ix, %Ix): stub.\n", iface, callback, wparam, lparam); return E_NOTIMPL; } @@ -468,7 +468,7 @@ static HRESULT WINAPI spvoice_SetNotifyCallbackFunction(ISpVoice *iface, SPNOTIF static HRESULT WINAPI spvoice_SetNotifyCallbackInterface(ISpVoice *iface, ISpNotifyCallback *callback, WPARAM wparam, LPARAM lparam) { - FIXME("(%p, %p, %lx, %lx): stub.\n", iface, callback, wparam, lparam); + FIXME("(%p, %p, %Ix, %Ix): stub.\n", iface, callback, wparam, lparam); return E_NOTIMPL; } @@ -482,7 +482,7 @@ static HRESULT WINAPI spvoice_SetNotifyWin32Event(ISpVoice *iface) static HRESULT WINAPI spvoice_WaitForNotifyEvent(ISpVoice *iface, DWORD milliseconds) { - FIXME("(%p, %d): stub.\n", iface, milliseconds); + FIXME("(%p, %ld): stub.\n", iface, milliseconds); return E_NOTIMPL; } @@ -503,7 +503,7 @@ static HRESULT WINAPI spvoice_SetInterest(ISpVoice *iface, ULONGLONG event, ULON static HRESULT WINAPI spvoice_GetEvents(ISpVoice *iface, ULONG count, SPEVENT *array, ULONG *fetched) { - FIXME("(%p, %u, %p, %p): stub.\n", iface, count, array, fetched); + FIXME("(%p, %lu, %p, %p): stub.\n", iface, count, array, fetched); return E_NOTIMPL; } @@ -566,14 +566,14 @@ static HRESULT WINAPI spvoice_GetVoice(ISpVoice *iface, ISpObjectToken **token) static HRESULT WINAPI spvoice_Speak(ISpVoice *iface, const WCHAR *contents, DWORD flags, ULONG *number) { - FIXME("(%p, %p, %#x, %p): stub.\n", iface, contents, flags, number); + FIXME("(%p, %p, %#lx, %p): stub.\n", iface, contents, flags, number); return E_NOTIMPL; } static HRESULT WINAPI spvoice_SpeakStream(ISpVoice *iface, IStream *stream, DWORD flags, ULONG *number) { - FIXME("(%p, %p, %#x, %p): stub.\n", iface, stream, flags, number); + FIXME("(%p, %p, %#lx, %p): stub.\n", iface, stream, flags, number); return E_NOTIMPL; } @@ -587,7 +587,7 @@ static HRESULT WINAPI spvoice_GetStatus(ISpVoice *iface, SPVOICESTATUS *status, static HRESULT WINAPI spvoice_Skip(ISpVoice *iface, const WCHAR *type, LONG items, ULONG *skipped) { - FIXME("(%p, %s, %d, %p): stub.\n", iface, debugstr_w(type), items, skipped); + FIXME("(%p, %s, %ld, %p): stub.\n", iface, debugstr_w(type), items, skipped); return E_NOTIMPL; } @@ -622,7 +622,7 @@ static HRESULT WINAPI spvoice_GetAlertBoundary(ISpVoice *iface, SPEVENTENUM *bou static HRESULT WINAPI spvoice_SetRate(ISpVoice *iface, LONG adjust) { - FIXME("(%p, %d): stub.\n", iface, adjust); + FIXME("(%p, %ld): stub.\n", iface, adjust); return E_NOTIMPL; } @@ -650,14 +650,14 @@ static HRESULT WINAPI spvoice_GetVolume(ISpVoice *iface, USHORT *volume) static HRESULT WINAPI spvoice_WaitUntilDone(ISpVoice *iface, ULONG timeout) { - FIXME("(%p, %d): stub.\n", iface, timeout); + FIXME("(%p, %ld): stub.\n", iface, timeout); return E_NOTIMPL; } static HRESULT WINAPI spvoice_SetSyncSpeakTimeout(ISpVoice *iface, ULONG timeout) { - FIXME("(%p, %d): stub.\n", iface, timeout); + FIXME("(%p, %ld): stub.\n", iface, timeout); return E_NOTIMPL; } @@ -679,7 +679,7 @@ static HANDLE WINAPI spvoice_SpeakCompleteEvent(ISpVoice *iface) static HRESULT WINAPI spvoice_IsUISupported(ISpVoice *iface, const WCHAR *type, void *extra, ULONG count, BOOL *supported) { - FIXME("(%p, %p, %p, %d, %p): stub.\n", iface, type, extra, count, supported); + FIXME("(%p, %p, %p, %ld, %p): stub.\n", iface, type, extra, count, supported); return E_NOTIMPL; } @@ -687,7 +687,7 @@ static HRESULT WINAPI spvoice_IsUISupported(ISpVoice *iface, const WCHAR *type, static HRESULT WINAPI spvoice_DisplayUI(ISpVoice *iface, HWND parent, const WCHAR *title, const WCHAR *type, void *extra, ULONG count) { - FIXME("(%p, %p, %p, %p, %p, %d): stub.\n", iface, parent, title, type, extra, count); + FIXME("(%p, %p, %p, %p, %p, %ld): stub.\n", iface, parent, title, type, extra, count); return E_NOTIMPL; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/schannel/Makefile.in | 1 - dlls/schannel/lsamode.c | 2 +- dlls/schannel/schannel_main.c | 4 ++-- dlls/schannel/usermode.c | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/schannel/Makefile.in b/dlls/schannel/Makefile.in index 7493cf9dd5b..84c4480cf2d 100644 --- a/dlls/schannel/Makefile.in +++ b/dlls/schannel/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = schannel.dll IMPORTS = secur32 diff --git a/dlls/schannel/lsamode.c b/dlls/schannel/lsamode.c index 372c5800b38..cb71115c64b 100644 --- a/dlls/schannel/lsamode.c +++ b/dlls/schannel/lsamode.c @@ -166,7 +166,7 @@ static SECPKG_FUNCTION_TABLE secPkgFunctionTable[2] = NTSTATUS WINAPI SpLsaModeInitialize(ULONG LsaVersion, PULONG PackageVersion, PSECPKG_FUNCTION_TABLE *ppTables, PULONG pcTables) { - TRACE("(%u, %p, %p, %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); + TRACE("(%lu, %p, %p, %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); *PackageVersion = SECPKG_INTERFACE_VERSION_8; *pcTables = 2; diff --git a/dlls/schannel/schannel_main.c b/dlls/schannel/schannel_main.c index dad82c9efd2..c0a11783e63 100644 --- a/dlls/schannel/schannel_main.c +++ b/dlls/schannel/schannel_main.c @@ -29,12 +29,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(schannel); BOOL WINAPI SslEmptyCacheA(LPSTR target, DWORD flags) { - FIXME("%s %x\n", debugstr_a(target), flags); + FIXME("%s %lx\n", debugstr_a(target), flags); return TRUE; } BOOL WINAPI SslEmptyCacheW(LPWSTR target, DWORD flags) { - FIXME("%s %x\n", debugstr_w(target), flags); + FIXME("%s %lx\n", debugstr_w(target), flags); return TRUE; } diff --git a/dlls/schannel/usermode.c b/dlls/schannel/usermode.c index 0713f822f91..1049be8bcef 100644 --- a/dlls/schannel/usermode.c +++ b/dlls/schannel/usermode.c @@ -72,7 +72,7 @@ static SECPKG_USER_FUNCTION_TABLE secPkgUserTables[2] = NTSTATUS WINAPI SpUserModeInitialize(ULONG LsaVersion, PULONG PackageVersion, PSECPKG_USER_FUNCTION_TABLE *ppTables, PULONG pcTables) { - TRACE("(%u, %p, %p, %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); + TRACE("(%lu, %p, %p, %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); if (LsaVersion != SECPKG_INTERFACE_VERSION) return STATUS_INVALID_PARAMETER;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/schedsvc/Makefile.in | 1 - dlls/schedsvc/atsvc.c | 38 +++++++++++++++++++------------------- dlls/schedsvc/schedsvc.c | 30 +++++++++++++++--------------- dlls/schedsvc/svc_main.c | 34 +++++++++++++++++----------------- 4 files changed, 51 insertions(+), 52 deletions(-) diff --git a/dlls/schedsvc/Makefile.in b/dlls/schedsvc/Makefile.in index 321e3bfccab..021cae468a6 100644 --- a/dlls/schedsvc/Makefile.in +++ b/dlls/schedsvc/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = schedsvc.dll IMPORTS = rpcrt4 advapi32 ole32 diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 1625b43c888..0a47e37089b 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -335,7 +335,7 @@ static DWORD load_unicode_strings(const char *data, DWORD limit, struct job_t *j { if (limit < sizeof(USHORT)) { - TRACE("invalid string %u offset\n", i); + TRACE("invalid string %lu offset\n", i); break; } @@ -345,11 +345,11 @@ static DWORD load_unicode_strings(const char *data, DWORD limit, struct job_t *j limit -= sizeof(USHORT); if (limit < len * sizeof(WCHAR)) { - TRACE("invalid string %u size\n", i); + TRACE("invalid string %lu size\n", i); break; } - TRACE("string %u: %s\n", i, wine_dbgstr_wn((const WCHAR *)data, len)); + TRACE("string %lu: %s\n", i, wine_dbgstr_wn((const WCHAR *)data, len)); switch (i) { @@ -439,7 +439,7 @@ static BOOL load_job_data(const char *data, DWORD size, struct job_t *info) TRACE("invalid name_size_offset\n"); return FALSE; } - TRACE("unicode strings end at %#x\n", fixed->name_size_offset + unicode_strings_size); + TRACE("unicode strings end at %#lx\n", fixed->name_size_offset + unicode_strings_size); if (size < fixed->trigger_offset + sizeof(USHORT)) { @@ -449,7 +449,7 @@ static BOOL load_job_data(const char *data, DWORD size, struct job_t *info) info->trigger_count = *(const USHORT *)(data + fixed->trigger_offset); TRACE("trigger_count %u\n", info->trigger_count); triggers_size = size - fixed->trigger_offset - sizeof(USHORT); - TRACE("triggers_size %u\n", triggers_size); + TRACE("triggers_size %lu\n", triggers_size); data += fixed->name_size_offset + unicode_strings_size; size -= fixed->name_size_offset + unicode_strings_size; @@ -467,7 +467,7 @@ static BOOL load_job_data(const char *data, DWORD size, struct job_t *info) TRACE("no space for user data\n"); return FALSE; } - TRACE("User Data size %#x\n", data_size); + TRACE("User Data size %#lx\n", data_size); size -= sizeof(USHORT) + data_size; data += sizeof(USHORT) + data_size; @@ -485,13 +485,13 @@ static BOOL load_job_data(const char *data, DWORD size, struct job_t *info) TRACE("no space for reserved data\n"); return FALSE; } - TRACE("Reserved Data size %#x\n", data_size); + TRACE("Reserved Data size %#lx\n", data_size); size -= sizeof(USHORT) + data_size; data += sizeof(USHORT) + data_size; /* Trigger Data */ - TRACE("trigger_offset %04x, triggers end at %04x\n", fixed->trigger_offset, + TRACE("trigger_offset %04x, triggers end at %04lx\n", fixed->trigger_offset, (DWORD)(fixed->trigger_offset + sizeof(USHORT) + info->trigger_count * sizeof(TASK_TRIGGER))); info->trigger_count = *(const USHORT *)data; @@ -525,9 +525,9 @@ static BOOL load_job_data(const char *data, DWORD size, struct job_t *info) TRACE("wEndDay = %u\n", trigger[i].wEndDay); TRACE("wStartHour = %u\n", trigger[i].wStartHour); TRACE("wStartMinute = %u\n", trigger[i].wStartMinute); - TRACE("MinutesDuration = %u\n", trigger[i].MinutesDuration); - TRACE("MinutesInterval = %u\n", trigger[i].MinutesInterval); - TRACE("rgFlags = %u\n", trigger[i].rgFlags); + TRACE("MinutesDuration = %lu\n", trigger[i].MinutesDuration); + TRACE("MinutesInterval = %lu\n", trigger[i].MinutesInterval); + TRACE("rgFlags = %lu\n", trigger[i].rgFlags); TRACE("TriggerType = %u\n", trigger[i].TriggerType); TRACE("Reserved2 = %u\n", trigger[i].Reserved2); TRACE("wRandomMinutesInterval = %u\n", trigger[i].wRandomMinutesInterval); @@ -563,7 +563,7 @@ static BOOL load_job(const WCHAR *name, struct job_t *info) file = CreateFileW(name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); if (file == INVALID_HANDLE_VALUE) { - TRACE("Failed to open %s, error %u\n", debugstr_w(name), GetLastError()); + TRACE("Failed to open %s, error %lu\n", debugstr_w(name), GetLastError()); if (GetLastError() != ERROR_SHARING_VIOLATION || try++ >= 3) break; Sleep(100); continue; @@ -574,7 +574,7 @@ static BOOL load_job(const WCHAR *name, struct job_t *info) mapping = CreateFileMappingW(file, NULL, PAGE_READONLY, 0, 0, 0); if (!mapping) { - TRACE("Failed to create file mapping %s, error %u\n", debugstr_w(name), GetLastError()); + TRACE("Failed to create file mapping %s, error %lu\n", debugstr_w(name), GetLastError()); CloseHandle(file); break; } @@ -880,7 +880,7 @@ static void update_job_status(struct job_t *job) if (GetLastError() != ERROR_SHARING_VIOLATION || try++ >= 3) { - TRACE("Failed to update %s, error %u\n", debugstr_w(job->name), GetLastError()); + TRACE("Failed to update %s, error %lu\n", debugstr_w(job->name), GetLastError()); return; } Sleep(100); @@ -1131,7 +1131,7 @@ DWORD __cdecl NetrJobAdd(ATSVC_HANDLE server_name, AT_INFO *info, DWORD *jobid) if (GetLastError() != ERROR_FILE_EXISTS) { - TRACE("create_job error %u\n", GetLastError()); + TRACE("create_job error %lu\n", GetLastError()); return GetLastError(); } @@ -1145,7 +1145,7 @@ DWORD __cdecl NetrJobDel(ATSVC_HANDLE server_name, DWORD min_jobid, DWORD max_jo { DWORD jobid, ret = APE_AT_ID_NOT_FOUND; - TRACE("%s,%u,%u\n", debugstr_w(server_name), min_jobid, max_jobid); + TRACE("%s,%lu,%lu\n", debugstr_w(server_name), min_jobid, max_jobid); EnterCriticalSection(&at_job_list_section); @@ -1155,7 +1155,7 @@ DWORD __cdecl NetrJobDel(ATSVC_HANDLE server_name, DWORD min_jobid, DWORD max_jo if (!job) { - TRACE("job %u not found\n", jobid); + TRACE("job %lu not found\n", jobid); ret = APE_AT_ID_NOT_FOUND; break; } @@ -1190,7 +1190,7 @@ DWORD __cdecl NetrJobEnum(ATSVC_HANDLE server_name, AT_ENUM_CONTAINER *container DWORD allocated; struct job_t *job; - TRACE("%s,%p,%u,%p,%p\n", debugstr_w(server_name), container, max_length, total, resume); + TRACE("%s,%p,%lu,%p,%p\n", debugstr_w(server_name), container, max_length, total, resume); *total = 0; *resume = 0; @@ -1242,7 +1242,7 @@ DWORD __cdecl NetrJobGetInfo(ATSVC_HANDLE server_name, DWORD jobid, AT_INFO **in struct job_t *job; DWORD ret = APE_AT_ID_NOT_FOUND; - TRACE("%s,%u,%p\n", debugstr_w(server_name), jobid, info); + TRACE("%s,%lu,%p\n", debugstr_w(server_name), jobid, info); EnterCriticalSection(&at_job_list_section); diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index 62367087616..ee200d94a6c 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -170,7 +170,7 @@ HRESULT __cdecl SchRpcRegisterTask(const WCHAR *path, const WCHAR *xml, DWORD fl DWORD disposition; HRESULT hr; - TRACE("%s,%s,%#x,%s,%u,%u,%p,%p,%p\n", debugstr_w(path), debugstr_w(xml), flags, + TRACE("%s,%s,%#lx,%s,%lu,%lu,%p,%p,%p\n", debugstr_w(path), debugstr_w(xml), flags, debugstr_w(sddl), task_logon_type, n_creds, creds, actual_path, xml_error_info); *actual_path = NULL; @@ -332,7 +332,7 @@ HRESULT __cdecl SchRpcCreateFolder(const WCHAR *path, const WCHAR *sddl, DWORD f WCHAR *full_name; HRESULT hr; - TRACE("%s,%s,%#x\n", debugstr_w(path), debugstr_w(sddl), flags); + TRACE("%s,%s,%#lx\n", debugstr_w(path), debugstr_w(sddl), flags); if (flags) return E_INVALIDARG; @@ -347,13 +347,13 @@ HRESULT __cdecl SchRpcCreateFolder(const WCHAR *path, const WCHAR *sddl, DWORD f HRESULT __cdecl SchRpcSetSecurity(const WCHAR *path, const WCHAR *sddl, DWORD flags) { - FIXME("%s,%s,%#x: stub\n", debugstr_w(path), debugstr_w(sddl), flags); + FIXME("%s,%s,%#lx: stub\n", debugstr_w(path), debugstr_w(sddl), flags); return E_NOTIMPL; } HRESULT __cdecl SchRpcGetSecurity(const WCHAR *path, DWORD flags, WCHAR **sddl) { - FIXME("%s,%#x,%p: stub\n", debugstr_w(path), flags, sddl); + FIXME("%s,%#lx,%p: stub\n", debugstr_w(path), flags, sddl); return E_NOTIMPL; } @@ -398,7 +398,7 @@ HRESULT __cdecl SchRpcEnumFolders(const WCHAR *path, DWORD flags, DWORD *start_i DWORD allocated, count, index; TASK_NAMES list; - TRACE("%s,%#x,%u,%u,%p,%p\n", debugstr_w(path), flags, *start_index, n_requested, n_names, names); + TRACE("%s,%#lx,%lu,%lu,%p,%p\n", debugstr_w(path), flags, *start_index, n_requested, n_names, names); *n_names = 0; *names = NULL; @@ -506,7 +506,7 @@ HRESULT __cdecl SchRpcEnumTasks(const WCHAR *path, DWORD flags, DWORD *start_ind DWORD allocated, count, index; TASK_NAMES list; - TRACE("%s,%#x,%u,%u,%p,%p\n", debugstr_w(path), flags, *start_index, n_requested, n_names, names); + TRACE("%s,%#lx,%lu,%lu,%p,%p\n", debugstr_w(path), flags, *start_index, n_requested, n_names, names); *n_names = 0; *names = NULL; @@ -604,7 +604,7 @@ HRESULT __cdecl SchRpcEnumTasks(const WCHAR *path, DWORD flags, DWORD *start_ind HRESULT __cdecl SchRpcEnumInstances(const WCHAR *path, DWORD flags, DWORD *n_guids, GUID **guids) { - FIXME("%s,%#x,%p,%p: stub\n", debugstr_w(path), flags, n_guids, guids); + FIXME("%s,%#lx,%p,%p: stub\n", debugstr_w(path), flags, n_guids, guids); return E_NOTIMPL; } @@ -618,20 +618,20 @@ HRESULT __cdecl SchRpcGetInstanceInfo(GUID guid, WCHAR **path, DWORD *task_state HRESULT __cdecl SchRpcStopInstance(GUID guid, DWORD flags) { - FIXME("%s,%#x: stub\n", wine_dbgstr_guid(&guid), flags); + FIXME("%s,%#lx: stub\n", wine_dbgstr_guid(&guid), flags); return E_NOTIMPL; } HRESULT __cdecl SchRpcStop(const WCHAR *path, DWORD flags) { - FIXME("%s,%#x: stub\n", debugstr_w(path), flags); + FIXME("%s,%#lx: stub\n", debugstr_w(path), flags); return E_NOTIMPL; } HRESULT __cdecl SchRpcRun(const WCHAR *path, DWORD n_args, const WCHAR **args, DWORD flags, DWORD session_id, const WCHAR *user, GUID *guid) { - FIXME("%s,%u,%p,%#x,%#x,%s,%p: stub\n", debugstr_w(path), n_args, args, flags, + FIXME("%s,%lu,%p,%#lx,%#lx,%s,%p: stub\n", debugstr_w(path), n_args, args, flags, session_id, debugstr_w(user), guid); return E_NOTIMPL; } @@ -641,7 +641,7 @@ HRESULT __cdecl SchRpcDelete(const WCHAR *path, DWORD flags) WCHAR *full_name; HRESULT hr = S_OK; - TRACE("%s,%#x\n", debugstr_w(path), flags); + TRACE("%s,%#lx\n", debugstr_w(path), flags); if (flags) return E_INVALIDARG; @@ -664,14 +664,14 @@ HRESULT __cdecl SchRpcDelete(const WCHAR *path, DWORD flags) HRESULT __cdecl SchRpcRename(const WCHAR *path, const WCHAR *name, DWORD flags) { - FIXME("%s,%s,%#x: stub\n", debugstr_w(path), debugstr_w(name), flags); + FIXME("%s,%s,%#lx: stub\n", debugstr_w(path), debugstr_w(name), flags); return E_NOTIMPL; } HRESULT __cdecl SchRpcScheduledRuntimes(const WCHAR *path, SYSTEMTIME *start, SYSTEMTIME *end, DWORD flags, DWORD n_requested, DWORD *n_runtimes, SYSTEMTIME **runtimes) { - FIXME("%s,%p,%p,%#x,%u,%p,%p: stub\n", debugstr_w(path), start, end, flags, + FIXME("%s,%p,%p,%#lx,%lu,%p,%p: stub\n", debugstr_w(path), start, end, flags, n_requested, n_runtimes, runtimes); return E_NOTIMPL; } @@ -687,7 +687,7 @@ HRESULT __cdecl SchRpcGetTaskInfo(const WCHAR *path, DWORD flags, DWORD *enabled WCHAR *full_name, *xml; HRESULT hr; - FIXME("%s,%#x,%p,%p: stub\n", debugstr_w(path), flags, enabled, task_state); + FIXME("%s,%#lx,%p,%p: stub\n", debugstr_w(path), flags, enabled, task_state); full_name = get_full_name(path, NULL); if (!full_name) return E_OUTOFMEMORY; @@ -710,6 +710,6 @@ HRESULT __cdecl SchRpcGetNumberOfMissedRuns(const WCHAR *path, DWORD *runs) HRESULT __cdecl SchRpcEnableTask(const WCHAR *path, DWORD enabled) { - FIXME("%s,%u: stub\n", debugstr_w(path), enabled); + FIXME("%s,%lu: stub\n", debugstr_w(path), enabled); return E_NOTIMPL; } diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index a7af96ec65a..7681a220592 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -81,7 +81,7 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, NULL); if (htasks == INVALID_HANDLE_VALUE) { - ERR("Couldn't start monitoring %s for tasks, error %u\n", debugstr_w(path), GetLastError()); + ERR("Couldn't start monitoring %s for tasks, error %lu\n", debugstr_w(path), GetLastError()); return -1; } @@ -146,11 +146,11 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) { if (msg == JOB_OBJECT_MSG_EXIT_PROCESS) { - TRACE("got message: process %#lx has terminated\n", pid); + TRACE("got message: process %#Ix has terminated\n", pid); update_process_status(pid); } else - FIXME("got message %#x from the job\n", msg); + FIXME("got message %#lx from the job\n", msg); } continue; } @@ -191,7 +191,7 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) break; default: - FIXME("%s: action %#x not handled\n", debugstr_w(info.data.FileName), info.data.Action); + FIXME("%s: action %#lx not handled\n", debugstr_w(info.data.FileName), info.data.Action); break; } @@ -235,7 +235,7 @@ void schedsvc_auto_start(void) scm = OpenSCManagerW(NULL, NULL, 0); if (!scm) { - WARN("failed to open SCM (%u)\n", GetLastError()); + WARN("failed to open SCM (%lu)\n", GetLastError()); return; } @@ -261,12 +261,12 @@ void schedsvc_auto_start(void) } } else - WARN("failed to query service config (%u)\n", GetLastError()); + WARN("failed to query service config (%lu)\n", GetLastError()); CloseServiceHandle(service); } else - WARN("failed to open service (%u)\n", GetLastError()); + WARN("failed to open service (%lu)\n", GetLastError()); CloseServiceHandle(scm); } @@ -289,7 +289,7 @@ static void schedsvc_update_status(DWORD state) static void WINAPI schedsvc_handler(DWORD control) { - TRACE("%#x\n", control); + TRACE("%#lx\n", control); switch (control) { @@ -318,14 +318,14 @@ static RPC_STATUS RPC_init(void) status = RpcServerRegisterIf(ITaskSchedulerService_v1_0_s_ifspec, NULL, NULL); if (status != RPC_S_OK) { - ERR("RpcServerRegisterIf error %#x\n", status); + ERR("RpcServerRegisterIf error %#lx\n", status); return status; } status = RpcServerRegisterIf(atsvc_v1_0_s_ifspec, NULL, NULL); if (status != RPC_S_OK) { - ERR("RpcServerRegisterIf error %#x\n", status); + ERR("RpcServerRegisterIf error %#lx\n", status); RpcServerUnregisterIf(ITaskSchedulerService_v1_0_s_ifspec, NULL, FALSE); return status; } @@ -333,42 +333,42 @@ static RPC_STATUS RPC_init(void) status = RpcServerUseProtseqEpW(ncacn_npW, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, endpoint_npW, NULL); if (status != RPC_S_OK) { - ERR("RpcServerUseProtseqEp error %#x\n", status); + ERR("RpcServerUseProtseqEp error %#lx\n", status); return status; } status = RpcServerUseProtseqEpW(ncalrpcW, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, endpoint_lrpcW, NULL); if (status != RPC_S_OK) { - ERR("RpcServerUseProtseqEp error %#x\n", status); + ERR("RpcServerUseProtseqEp error %#lx\n", status); return status; } status = RpcServerInqBindings(&sched_bindings); if (status != RPC_S_OK) { - ERR("RpcServerInqBindings error %#x\n", status); + ERR("RpcServerInqBindings error %#lx\n", status); return status; } status = RpcEpRegisterW(ITaskSchedulerService_v1_0_s_ifspec, sched_bindings, NULL, NULL); if (status != RPC_S_OK) { - ERR("RpcEpRegister error %#x\n", status); + ERR("RpcEpRegister error %#lx\n", status); return status; } status = RpcEpRegisterW(atsvc_v1_0_s_ifspec, sched_bindings, NULL, NULL); if (status != RPC_S_OK) { - ERR("RpcEpRegister error %#x\n", status); + ERR("RpcEpRegister error %#lx\n", status); return status; } status = RpcServerListen(1, RPC_C_LISTEN_MAX_CALLS_DEFAULT, TRUE); if (status != RPC_S_OK) { - ERR("RpcServerListen error %#x\n", status); + ERR("RpcServerListen error %#lx\n", status); return status; } return RPC_S_OK; @@ -394,7 +394,7 @@ void WINAPI ServiceMain(DWORD argc, LPWSTR *argv) schedsvc_handle = RegisterServiceCtrlHandlerW(scheduleW, schedsvc_handler); if (!schedsvc_handle) { - ERR("RegisterServiceCtrlHandler error %d\n", GetLastError()); + ERR("RegisterServiceCtrlHandler error %ld\n", GetLastError()); return; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/sechost/Makefile.in | 1 - dlls/sechost/security.c | 6 ++- dlls/sechost/service.c | 88 +++++++++++++++++++++++----------------------- dlls/sechost/trace.c | 14 ++++--- 4 files changed, 54 insertions(+), 55 deletions(-) diff --git a/dlls/sechost/Makefile.in b/dlls/sechost/Makefile.in index 0bcace7b9c7..f930088d3a7 100644 --- a/dlls/sechost/Makefile.in +++ b/dlls/sechost/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = sechost.dll IMPORTLIB = sechost IMPORTS = kernelbase diff --git a/dlls/sechost/security.c b/dlls/sechost/security.c index 4aee8c723d2..6916b3ad662 100644 --- a/dlls/sechost/security.c +++ b/dlls/sechost/security.c @@ -536,7 +536,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH ConvertSecurityDescriptorToStringSecurityDescripto if (revision != SDDL_REVISION_1) { - ERR("Unhandled SDDL revision %d\n", revision); + ERR("Unhandled SDDL revision %ld\n", revision); SetLastError( ERROR_UNKNOWN_REVISION ); return FALSE; } @@ -573,7 +573,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH ConvertSecurityDescriptorToStringSecurityDescripto } *wptr = 0; - TRACE("ret: %s, %d\n", wine_dbgstr_w(wstr), len); + TRACE("ret: %s, %ld\n", wine_dbgstr_w(wstr), len); *string = wstr; if (ret_len) *ret_len = wcslen(*string) + 1; return TRUE; @@ -1219,7 +1219,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH ConvertStringSecurityDescriptorToSecurityDescripto DWORD size; SECURITY_DESCRIPTOR *psd; - TRACE("%s, %u, %p, %p\n", debugstr_w(string), revision, sd, ret_size); + TRACE("%s, %lu, %p, %p\n", debugstr_w(string), revision, sd, ret_size); if (GetVersion() & 0x80000000) { diff --git a/dlls/sechost/service.c b/dlls/sechost/service.c index fee3b52b6ac..1026f2df851 100644 --- a/dlls/sechost/service.c +++ b/dlls/sechost/service.c @@ -170,7 +170,7 @@ static handle_t rpc_wstr_bind( RPC_WSTR str ) status = RpcStringBindingComposeW( NULL, transport, str, endpoint, NULL, &binding_str ); if (status != RPC_S_OK) { - ERR("RpcStringBindingComposeW failed, error %d\n", status); + ERR("RpcStringBindingComposeW failed, error %ld\n", status); return NULL; } @@ -179,7 +179,7 @@ static handle_t rpc_wstr_bind( RPC_WSTR str ) if (status != RPC_S_OK) { - ERR("Couldn't connect to services.exe, error %d\n", status); + ERR("Couldn't connect to services.exe, error %ld\n", status); return NULL; } @@ -197,7 +197,7 @@ static handle_t rpc_cstr_bind(RPC_CSTR str) status = RpcStringBindingComposeA( NULL, transport, str, endpoint, NULL, &binding_str ); if (status != RPC_S_OK) { - ERR("RpcStringBindingComposeA failed, error %d\n", status); + ERR("RpcStringBindingComposeA failed, error %ld\n", status); return NULL; } @@ -206,7 +206,7 @@ static handle_t rpc_cstr_bind(RPC_CSTR str) if (status != RPC_S_OK) { - ERR("Couldn't connect to services.exe, error %d\n", status); + ERR("Couldn't connect to services.exe, error %ld\n", status); return NULL; } @@ -273,7 +273,7 @@ SC_HANDLE WINAPI DECLSPEC_HOTPATCH OpenSCManagerW( const WCHAR *machine, const W SC_RPC_HANDLE handle = NULL; DWORD err; - TRACE( "%s %s %#x\n", debugstr_w(machine), debugstr_w(database), access ); + TRACE( "%s %s %#lx\n", debugstr_w(machine), debugstr_w(database), access ); __TRY { @@ -298,7 +298,7 @@ SC_HANDLE WINAPI DECLSPEC_HOTPATCH OpenServiceA( SC_HANDLE manager, const char * WCHAR *nameW; SC_HANDLE ret; - TRACE( "%p %s %#x\n", manager, debugstr_a(name), access ); + TRACE( "%p %s %#lx\n", manager, debugstr_a(name), access ); nameW = heap_strdupAtoW( name ); ret = OpenServiceW( manager, nameW, access ); @@ -314,7 +314,7 @@ SC_HANDLE WINAPI DECLSPEC_HOTPATCH OpenServiceW( SC_HANDLE manager, const WCHAR SC_RPC_HANDLE handle = NULL; DWORD err; - TRACE( "%p %s %#x\n", manager, debugstr_w(name), access ); + TRACE( "%p %s %#lx\n", manager, debugstr_w(name), access ); if (!manager) { @@ -473,7 +473,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH ChangeServiceConfig2A( SC_HANDLE service, DWORD le { BOOL r = FALSE; - TRACE( "%p %d %p\n", service, level, info ); + TRACE( "%p %ld %p\n", service, level, info ); if (level == SERVICE_CONFIG_DESCRIPTION) { @@ -557,7 +557,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH ChangeServiceConfigA( SC_HANDLE service, DWORD ser WCHAR *pathW, *groupW, *dependenciesW, *usernameW, *passwordW, *display_nameW; BOOL r; - TRACE( "%p %d %d %d %s %s %p %p %s %s %s\n", service, service_type, start_type, + TRACE( "%p %ld %ld %ld %s %s %p %p %s %s %s\n", service, service_type, start_type, error_control, debugstr_a(path), debugstr_a(group), tag, dependencies, debugstr_a(username), debugstr_a(password), debugstr_a(display_name) ); @@ -592,7 +592,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH ChangeServiceConfigW( SC_HANDLE service, DWORD ser DWORD password_size; DWORD err; - TRACE( "%p %d %d %d %s %s %p %p %s %s %s\n", service, service_type, start_type, + TRACE( "%p %ld %ld %ld %s %s %p %p %s %s %s\n", service, service_type, start_type, error_control, debugstr_w(path), debugstr_w(group), tag, dependencies, debugstr_w(username), debugstr_w(password), debugstr_w(display_name) ); @@ -624,7 +624,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH QueryServiceConfigA( SC_HANDLE service, QUERY_SERV BOOL ret; QUERY_SERVICE_CONFIGW *configW; - TRACE( "%p %p %d %p\n", service, config, size, ret_size ); + TRACE( "%p %p %ld %p\n", service, config, size, ret_size ); if (!(buffer = heap_alloc( 2 * size ))) return set_error( ERROR_NOT_ENOUGH_MEMORY ); configW = (QUERY_SERVICE_CONFIGW *)buffer; @@ -710,7 +710,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH QueryServiceConfigW( SC_HANDLE service, QUERY_SERV DWORD err; BYTE *bufpos; - TRACE( "%p %p %d %p\n", service, ret_config, size, ret_size ); + TRACE( "%p %p %ld %p\n", service, ret_config, size, ret_size ); memset(&config, 0, sizeof(config)); @@ -773,7 +773,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH QueryServiceConfig2A( SC_HANDLE service, DWORD lev { BYTE *bufferW = NULL; - TRACE( "%p %u %p %u %p\n", service, level, buffer, size, ret_size ); + TRACE( "%p %lu %p %lu %p\n", service, level, buffer, size, ret_size ); if (buffer && size) bufferW = heap_alloc( size ); @@ -804,7 +804,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH QueryServiceConfig2A( SC_HANDLE service, DWORD lev memcpy(buffer, bufferW, *ret_size); break; default: - FIXME("conversion W->A not implemented for level %d\n", level); + FIXME("conversion W->A not implemented for level %ld\n", level); heap_free( bufferW ); return FALSE; } @@ -822,7 +822,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH QueryServiceConfig2W( SC_HANDLE service, DWORD lev BYTE *bufptr; DWORD err; - TRACE( "%p %u %p %u %p\n", service, level, buffer, size, ret_size ); + TRACE( "%p %lu %p %lu %p\n", service, level, buffer, size, ret_size ); if (!buffer && size) { @@ -845,7 +845,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH QueryServiceConfig2W( SC_HANDLE service, DWORD lev break; default: - FIXME("Level %d not implemented\n", level); + FIXME("Level %ld not implemented\n", level); SetLastError(ERROR_INVALID_LEVEL); return FALSE; } @@ -1041,7 +1041,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH StartServiceW( SC_HANDLE service, DWORD argc, cons { DWORD err; - TRACE( "%p %u %p\n", service, argc, argv ); + TRACE( "%p %lu %p\n", service, argc, argv ); __TRY { @@ -1063,7 +1063,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH ControlService( SC_HANDLE service, DWORD control, { DWORD err; - TRACE( "%p %d %p\n", service, control, status ); + TRACE( "%p %ld %p\n", service, control, status ); __TRY { @@ -1106,7 +1106,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH QueryServiceStatusEx( SC_HANDLE service, SC_STATUS { DWORD err; - TRACE( "%p %d %p %d %p\n", service, level, buffer, size, ret_size ); + TRACE( "%p %d %p %ld %p\n", service, level, buffer, size, ret_size ); if (level != SC_STATUS_PROCESS_INFO) return set_error( ERROR_INVALID_LEVEL ); @@ -1142,7 +1142,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumServicesStatusExW( SC_HANDLE manager, SC_ENUM_ const WCHAR *str; BYTE *buf; - TRACE( "%p %u 0x%x 0x%x %p %u %p %p %p %s\n", manager, level, type, state, buffer, + TRACE( "%p %u 0x%lx 0x%lx %p %lu %p %p %p %s\n", manager, level, type, state, buffer, size, needed, returned, resume_handle, debugstr_w(group) ); if (level != SC_ENUM_PROCESS_INFO) return set_error( ERROR_INVALID_LEVEL ); @@ -1236,7 +1236,7 @@ BOOL WINAPI EnumDependentServicesW( SC_HANDLE hService, DWORD dwServiceState, LPENUM_SERVICE_STATUSW lpServices, DWORD cbBufSize, LPDWORD pcbBytesNeeded, LPDWORD lpServicesReturned ) { - FIXME("%p 0x%08x %p 0x%08x %p %p - stub\n", hService, dwServiceState, + FIXME("%p 0x%08lx %p 0x%08lx %p %p - stub\n", hService, dwServiceState, lpServices, cbBufSize, pcbBytesNeeded, lpServicesReturned); *lpServicesReturned = 0; @@ -1253,10 +1253,10 @@ BOOL WINAPI DECLSPEC_HOTPATCH QueryServiceObjectSecurity( SC_HANDLE service, SEC NTSTATUS status; ACL acl; - FIXME( "%p %d %p %u %p - semi-stub\n", service, type, ret_descriptor, size, ret_size ); + FIXME( "%p %ld %p %lu %p - semi-stub\n", service, type, ret_descriptor, size, ret_size ); if (type != DACL_SECURITY_INFORMATION) - FIXME("information %d not supported\n", type); + FIXME("information %ld not supported\n", type); InitializeSecurityDescriptor( &descriptor, SECURITY_DESCRIPTOR_REVISION ); @@ -1276,7 +1276,7 @@ BOOL WINAPI SetServiceObjectSecurity(SC_HANDLE hService, SECURITY_INFORMATION dwSecurityInformation, PSECURITY_DESCRIPTOR lpSecurityDescriptor) { - FIXME("%p %d %p\n", hService, dwSecurityInformation, lpSecurityDescriptor); + FIXME("%p %ld %p\n", hService, dwSecurityInformation, lpSecurityDescriptor); return TRUE; } @@ -1321,7 +1321,7 @@ static DWORD WINAPI notify_thread(void *user) HeapFree(GetProcessHeap(), 0, list); } else - WARN("GetNotifyResults server call failed: %u\n", err); + WARN("GetNotifyResults server call failed: %lu\n", err); __TRY @@ -1335,7 +1335,7 @@ static DWORD WINAPI notify_thread(void *user) __ENDTRY if (err != ERROR_SUCCESS) - WARN("CloseNotifyHandle server call failed: %u\n", err); + WARN("CloseNotifyHandle server call failed: %lu\n", err); CloseHandle(data->calling_thread); HeapFree(GetProcessHeap(), 0, data); @@ -1354,7 +1354,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH NotifyServiceStatusChangeW( SC_HANDLE service, DW GUID g_dummy = {0}; struct notify_data *data; - TRACE( "%p 0x%x %p\n", service, mask, notify_buffer ); + TRACE( "%p 0x%lx %p\n", service, mask, notify_buffer ); if (!(data = heap_alloc_zero( sizeof(*data) ))) return ERROR_NOT_ENOUGH_MEMORY; @@ -1364,7 +1364,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH NotifyServiceStatusChangeW( SC_HANDLE service, DW if (!DuplicateHandle( GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), &data->calling_thread, 0, FALSE, DUPLICATE_SAME_ACCESS )) { - ERR("DuplicateHandle failed: %u\n", GetLastError()); + ERR("DuplicateHandle failed: %lu\n", GetLastError()); heap_free( data ); return ERROR_NOT_ENOUGH_MEMORY; } @@ -1389,7 +1389,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH NotifyServiceStatusChangeW( SC_HANDLE service, DW if (err != ERROR_SUCCESS) { - WARN("NotifyServiceStatusChange server call failed: %u\n", err); + WARN("NotifyServiceStatusChange server call failed: %lu\n", err); LeaveCriticalSection( &service_cs ); CloseHandle( data->calling_thread ); CloseHandle( data->ready_evt ); @@ -1490,7 +1490,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetServiceStatus( SERVICE_STATUS_HANDLE service, S { DWORD err; - TRACE( "%p %#x %#x %#x %#x %#x %#x %#x\n", service, status->dwServiceType, + TRACE( "%p %#lx %#lx %#lx %#lx %#lx %#lx %#lx\n", service, status->dwServiceType, status->dwCurrentState, status->dwControlsAccepted, status->dwWin32ExitCode, status->dwServiceSpecificExitCode, status->dwCheckPoint, status->dwWaitHint ); @@ -1652,7 +1652,7 @@ static DWORD service_handle_control( struct service_data *service, DWORD control { DWORD ret = ERROR_INVALID_SERVICE_CONTROL; - TRACE( "%s control %u data %p data_size %u\n", debugstr_w(service->name), control, data, data_size ); + TRACE( "%s control %lu data %p data_size %lu\n", debugstr_w(service->name), control, data, data_size ); if (control == SERVICE_CONTROL_START) ret = service_handle_start( service, data, data_size ); @@ -1679,12 +1679,12 @@ static DWORD WINAPI service_control_dispatcher( void *arg ) if (!r) { if (GetLastError() != ERROR_BROKEN_PIPE) - ERR( "pipe read failed error %u\n", GetLastError() ); + ERR( "pipe read failed error %lu\n", GetLastError() ); break; } if (count != FIELD_OFFSET(service_start_info,data)) { - ERR( "partial pipe read %u\n", count ); + ERR( "partial pipe read %lu\n", count ); break; } if (count < info.total_size) @@ -1695,13 +1695,13 @@ static DWORD WINAPI service_control_dispatcher( void *arg ) if (!r) { if (GetLastError() != ERROR_BROKEN_PIPE) - ERR( "pipe read failed error %u\n", GetLastError() ); + ERR( "pipe read failed error %lu\n", GetLastError() ); heap_free( data ); break; } if (count != data_size) { - ERR( "partial pipe read %u/%u\n", count, data_size ); + ERR( "partial pipe read %lu/%lu\n", count, data_size ); heap_free( data ); break; } @@ -1824,7 +1824,7 @@ static BOOL service_run_main_thread(void) disp->manager = OpenSCManagerW( NULL, NULL, SC_MANAGER_CONNECT ); if (!disp->manager) { - ERR("failed to open service manager error %u\n", GetLastError()); + ERR("failed to open service manager error %lu\n", GetLastError()); heap_free( disp ); return FALSE; } @@ -1832,7 +1832,7 @@ static BOOL service_run_main_thread(void) disp->pipe = service_open_pipe(); if (disp->pipe == INVALID_HANDLE_VALUE) { - WARN("failed to create control pipe error %u\n", GetLastError()); + WARN("failed to create control pipe error %lu\n", GetLastError()); CloseServiceHandle( disp->manager ); heap_free( disp ); SetLastError( ERROR_FAILED_SERVICE_CONTROLLER_CONNECT ); @@ -1848,7 +1848,7 @@ static BOOL service_run_main_thread(void) wait_handles[1] = CreateThread( NULL, 0, service_control_dispatcher, disp, 0, NULL ); wait_handles[2] = service_event; - TRACE("Starting %d services running as process %d\n", + TRACE("Starting %d services running as process %ld\n", nb_services, GetCurrentProcessId()); /* wait for all the threads to pack up and exit */ @@ -2003,7 +2003,7 @@ static BOOL notification_filter_matches( DEV_BROADCAST_HDR *filter, DEV_BROADCAS return IsEqualGUID( &filter_iface->dbcc_classguid, &event_iface->dbcc_classguid ); } - FIXME( "Filter dbch_devicetype %u not implemented\n", filter->dbch_devicetype ); + FIXME( "Filter dbch_devicetype %lu not implemented\n", filter->dbch_devicetype ); return TRUE; } @@ -2023,14 +2023,14 @@ static DWORD WINAPI device_notify_proc( void *arg ) if ((err = RpcStringBindingComposeW( NULL, protseq, NULL, endpoint, NULL, &binding_str ))) { - ERR("RpcStringBindingCompose() failed, error %#x\n", err); + ERR("RpcStringBindingCompose() failed, error %#lx\n", err); return err; } err = RpcBindingFromStringBindingW( binding_str, &plugplay_binding_handle ); RpcStringFreeW( &binding_str ); if (err) { - ERR("RpcBindingFromStringBinding() failed, error %#x\n", err); + ERR("RpcBindingFromStringBinding() failed, error %#lx\n", err); return err; } @@ -2046,7 +2046,7 @@ static DWORD WINAPI device_notify_proc( void *arg ) if (!handle) { - ERR("failed to open RPC handle, error %u\n", err); + ERR("failed to open RPC handle, error %lu\n", err); return 1; } @@ -2069,7 +2069,7 @@ static DWORD WINAPI device_notify_proc( void *arg ) if (err) { - ERR("failed to get event, error %u\n", err); + ERR("failed to get event, error %lu\n", err); break; } @@ -2120,7 +2120,7 @@ HDEVNOTIFY WINAPI I_ScRegisterDeviceNotification( struct device_notification_det { struct device_notify_registration *registration; - TRACE("callback %p, handle %p, filter %p, flags %#x\n", details->cb, details->handle, filter, flags); + TRACE("callback %p, handle %p, filter %p, flags %#lx\n", details->cb, details->handle, filter, flags); if (!(registration = heap_alloc(sizeof(struct device_notify_registration)))) { diff --git a/dlls/sechost/trace.c b/dlls/sechost/trace.c index 01733690ac8..7cefcbbb55f 100644 --- a/dlls/sechost/trace.c +++ b/dlls/sechost/trace.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(eventlog); ULONG WINAPI ControlTraceA( TRACEHANDLE handle, const char *session, EVENT_TRACE_PROPERTIES *properties, ULONG control ) { - FIXME("(%s, %s, %p, %d) stub\n", wine_dbgstr_longlong(handle), debugstr_a(session), properties, control); + FIXME("(%s, %s, %p, %ld) stub\n", wine_dbgstr_longlong(handle), debugstr_a(session), properties, control); return ERROR_SUCCESS; } @@ -46,7 +46,7 @@ ULONG WINAPI ControlTraceA( TRACEHANDLE handle, const char *session, ULONG WINAPI ControlTraceW( TRACEHANDLE handle, const WCHAR *session, EVENT_TRACE_PROPERTIES *properties, ULONG control ) { - FIXME("(%s, %s, %p, %d) stub\n", wine_dbgstr_longlong(handle), debugstr_w(session), properties, control); + FIXME("(%s, %s, %p, %ld) stub\n", wine_dbgstr_longlong(handle), debugstr_w(session), properties, control); return ERROR_SUCCESS; } @@ -57,7 +57,7 @@ ULONG WINAPI EnableTraceEx2( TRACEHANDLE handle, const GUID *provider, ULONG con ULONGLONG match_any, ULONGLONG match_all, ULONG timeout, ENABLE_TRACE_PARAMETERS *params ) { - FIXME("(%s, %s, %u, %u, %s, %s, %u, %p): stub\n", wine_dbgstr_longlong(handle), + FIXME("(%s, %s, %lu, %u, %s, %s, %lu, %p): stub\n", wine_dbgstr_longlong(handle), debugstr_guid(provider), control, level, wine_dbgstr_longlong(match_any), wine_dbgstr_longlong(match_all), timeout, params); @@ -69,7 +69,7 @@ ULONG WINAPI EnableTraceEx2( TRACEHANDLE handle, const GUID *provider, ULONG con */ ULONG WINAPI QueryAllTracesA( EVENT_TRACE_PROPERTIES **properties, ULONG count, ULONG *ret_count ) { - FIXME("(%p, %d, %p) stub\n", properties, count, ret_count); + FIXME("(%p, %ld, %p) stub\n", properties, count, ret_count); if (ret_count) *ret_count = 0; return ERROR_SUCCESS; @@ -80,7 +80,7 @@ ULONG WINAPI QueryAllTracesA( EVENT_TRACE_PROPERTIES **properties, ULONG count, */ ULONG WINAPI QueryAllTracesW( EVENT_TRACE_PROPERTIES **properties, ULONG count, ULONG *ret_count ) { - FIXME("(%p, %d, %p) stub\n", properties, count, ret_count); + FIXME("(%p, %ld, %p) stub\n", properties, count, ret_count); if (ret_count) *ret_count = 0; return ERROR_SUCCESS; @@ -132,7 +132,7 @@ TRACEHANDLE WINAPI OpenTraceW( EVENT_TRACE_LOGFILEW *logfile ) */ ULONG WINAPI ProcessTrace( TRACEHANDLE *handles, ULONG count, FILETIME *start_time, FILETIME *end_time ) { - FIXME("%p %u %p %p: stub\n", handles, count, start_time, end_time); + FIXME("%p %lu %p %p: stub\n", handles, count, start_time, end_time); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -150,6 +150,6 @@ ULONG WINAPI CloseTrace( TRACEHANDLE handle ) */ ULONG WINAPI TraceSetInformation( TRACEHANDLE handle, TRACE_INFO_CLASS class, void *info, ULONG len ) { - FIXME("%s %d %p %d: stub\n", wine_dbgstr_longlong(handle), class, info, len); + FIXME("%s %d %p %ld: stub\n", wine_dbgstr_longlong(handle), class, info, len); return ERROR_CALL_NOT_IMPLEMENTED; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/secur32/Makefile.in | 1 - dlls/secur32/lsa.c | 46 ++++++++++++------------- dlls/secur32/negotiate.c | 26 +++++++------- dlls/secur32/schannel.c | 74 ++++++++++++++++++++-------------------- dlls/secur32/schannel_gnutls.c | 7 ++-- dlls/secur32/secur32.c | 10 +++-- dlls/secur32/thunks.c | 32 +++++++++-------- dlls/secur32/wrapper.c | 36 ++++++++++--------- 8 files changed, 116 insertions(+), 116 deletions(-) diff --git a/dlls/secur32/Makefile.in b/dlls/secur32/Makefile.in index e4c6927656a..5b71cd82417 100644 --- a/dlls/secur32/Makefile.in +++ b/dlls/secur32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = secur32.dll IMPORTLIB = secur32 UNIXLIB = secur32.so diff --git a/dlls/secur32/lsa.c b/dlls/secur32/lsa.c index bd3cac4704f..adb8545c4c8 100644 --- a/dlls/secur32/lsa.c +++ b/dlls/secur32/lsa.c @@ -75,7 +75,7 @@ NTSTATUS WINAPI LsaCallAuthenticationPackage(HANDLE lsa_handle, ULONG package_id { ULONG i; - TRACE("%p,%u,%p,%u,%p,%p,%p\n", lsa_handle, package_id, in_buffer, + TRACE("%p,%lu,%p,%lu,%p,%p,%p\n", lsa_handle, package_id, in_buffer, in_buffer_length, out_buffer, out_buffer_length, status); for (i = 0; i < loaded_packages_count; i++) @@ -169,7 +169,7 @@ NTSTATUS WINAPI LsaLogonUser(HANDLE LsaHandle, PLSA_STRING OriginName, PVOID* ProfileBuffer, PULONG ProfileBufferLength, PLUID LogonId, PHANDLE Token, PQUOTA_LIMITS Quotas, PNTSTATUS SubStatus) { - FIXME("%p %s %d %d %p %d %p %p %p %p %p %p %p %p stub\n", LsaHandle, + FIXME("%p %s %d %ld %p %ld %p %p %p %p %p %p %p %p stub\n", LsaHandle, debugstr_as(OriginName), LogonType, AuthenticationPackage, AuthenticationInformation, AuthenticationInformationLength, LocalGroups, SourceContext, ProfileBuffer, ProfileBufferLength, @@ -192,7 +192,7 @@ static NTSTATUS NTAPI lsa_DeleteLogonSession(LUID *logon_id) static NTSTATUS NTAPI lsa_AddCredential(LUID *logon_id, ULONG package_id, LSA_STRING *primary_key, LSA_STRING *credentials) { - FIXME("%p,%u,%s,%s: stub\n", logon_id, package_id, + FIXME("%p,%lu,%s,%s: stub\n", logon_id, package_id, debugstr_as(primary_key), debugstr_as(credentials)); return STATUS_NOT_IMPLEMENTED; } @@ -200,20 +200,20 @@ static NTSTATUS NTAPI lsa_AddCredential(LUID *logon_id, ULONG package_id, static NTSTATUS NTAPI lsa_GetCredentials(LUID *logon_id, ULONG package_id, ULONG *context, BOOLEAN retrieve_all, LSA_STRING *primary_key, ULONG *primary_key_len, LSA_STRING *credentials) { - FIXME("%p,%#x,%p,%d,%p,%p,%p: stub\n", logon_id, package_id, context, + FIXME("%p,%#lx,%p,%d,%p,%p,%p: stub\n", logon_id, package_id, context, retrieve_all, primary_key, primary_key_len, credentials); return STATUS_NOT_IMPLEMENTED; } static NTSTATUS NTAPI lsa_DeleteCredential(LUID *logon_id, ULONG package_id, LSA_STRING *primary_key) { - FIXME("%p,%#x,%s: stub\n", logon_id, package_id, debugstr_as(primary_key)); + FIXME("%p,%#lx,%s: stub\n", logon_id, package_id, debugstr_as(primary_key)); return STATUS_NOT_IMPLEMENTED; } static void * NTAPI lsa_AllocateLsaHeap(ULONG size) { - TRACE("%u\n", size); + TRACE("%lu\n", size); return malloc(size); } @@ -225,7 +225,7 @@ static void NTAPI lsa_FreeLsaHeap(void *p) static NTSTATUS NTAPI lsa_AllocateClientBuffer(PLSA_CLIENT_REQUEST req, ULONG size, void **p) { - TRACE("%p,%u,%p\n", req, size, p); + TRACE("%p,%lu,%p\n", req, size, p); *p = malloc(size); return *p ? STATUS_SUCCESS : STATUS_NO_MEMORY; } @@ -239,14 +239,14 @@ static NTSTATUS NTAPI lsa_FreeClientBuffer(PLSA_CLIENT_REQUEST req, void *p) static NTSTATUS NTAPI lsa_CopyToClientBuffer(PLSA_CLIENT_REQUEST req, ULONG size, void *client, void *buf) { - TRACE("%p,%u,%p,%p\n", req, size, client, buf); + TRACE("%p,%lu,%p,%p\n", req, size, client, buf); memcpy(client, buf, size); return STATUS_SUCCESS; } static NTSTATUS NTAPI lsa_CopyFromClientBuffer(PLSA_CLIENT_REQUEST req, ULONG size, void *buf, void *client) { - TRACE("%p,%u,%p,%p\n", req, size, buf, client); + TRACE("%p,%lu,%p,%p\n", req, size, buf, client); memcpy(buf, client, size); return STATUS_SUCCESS; } @@ -268,7 +268,7 @@ static LSA_DISPATCH_TABLE lsa_dispatch = static NTSTATUS NTAPI lsa_RegisterCallback(ULONG callback_id, PLSA_CALLBACK_FUNCTION callback) { - FIXME("%u,%p: stub\n", callback_id, callback); + FIXME("%lu,%p: stub\n", callback_id, callback); return STATUS_NOT_IMPLEMENTED; } @@ -315,7 +315,7 @@ static SECURITY_STATUS WINAPI lsa_AcquireCredentialsHandleW( UNICODE_STRING principal_us; LSA_SEC_HANDLE lsa_credential; - TRACE("%s %s %#x %p %p %p %p %p\n", debugstr_w(principal), debugstr_w(package), + TRACE("%s %s %#lx %p %p %p %p %p\n", debugstr_w(principal), debugstr_w(package), credentials_use, auth_data, get_key_fn, get_key_arg, credential, ts_expiry); if (!credential) return SEC_E_INVALID_HANDLE; @@ -354,7 +354,7 @@ static SECURITY_STATUS WINAPI lsa_AcquireCredentialsHandleA( SEC_WINNT_AUTH_IDENTITY_W *auth_dataW = NULL; SEC_WINNT_AUTH_IDENTITY_A *id = NULL; - TRACE("%s %s %#x %p %p %p %p %p\n", debugstr_a(principal), debugstr_a(package), + TRACE("%s %s %#lx %p %p %p %p %p\n", debugstr_a(principal), debugstr_a(package), credentials_use, auth_data, get_key_fn, get_key_arg, credential, ts_expiry); if (principal) @@ -450,7 +450,7 @@ static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextW( BOOLEAN mapped_context; LSA_SEC_HANDLE new_handle; - TRACE("%p %p %s %#x %d %d %p %d %p %p %p %p\n", credential, context, + TRACE("%p %p %s %#lx %ld %ld %p %ld %p %p %p %p\n", credential, context, debugstr_w(target_name), context_req, reserved1, target_data_rep, input, reserved2, new_context, output, context_attr, ts_expiry); @@ -496,7 +496,7 @@ static SECURITY_STATUS WINAPI lsa_InitializeSecurityContextA( SECURITY_STATUS status; SEC_WCHAR *targetW = NULL; - TRACE("%p %p %s %#x %d %d %p %d %p %p %p %p\n", credential, context, + TRACE("%p %p %s %#lx %ld %ld %p %ld %p %p %p %p\n", credential, context, debugstr_a(target_name), context_req, reserved1, target_data_rep, input, reserved2, new_context, output, context_attr, ts_expiry); @@ -524,7 +524,7 @@ static SECURITY_STATUS WINAPI lsa_AcceptSecurityContext( BOOLEAN mapped_context; LSA_SEC_HANDLE new_handle; - TRACE("%p %p %p %#x %#x %p %p %p %p\n", credential, context, input, + TRACE("%p %p %p %#lx %#lx %p %p %p %p\n", credential, context, input, context_req, target_data_rep, new_context, output, context_attr, ts_expiry); if (context) @@ -581,7 +581,7 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesW(CtxtHandle *context, U { struct lsa_handle *lsa_ctx; - TRACE("%p %d %p\n", context, attribute, buffer); + TRACE("%p %ld %p\n", context, attribute, buffer); if (!context) return SEC_E_INVALID_HANDLE; lsa_ctx = (struct lsa_handle *)context->dwLower; @@ -622,7 +622,7 @@ static SECURITY_STATUS nego_info_WtoA( const SecPkgContext_NegotiationInfoW *inf static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, ULONG attribute, void *buffer) { - TRACE("%p %d %p\n", context, attribute, buffer); + TRACE("%p %ld %p\n", context, attribute, buffer); if (!context) return SEC_E_INVALID_HANDLE; @@ -658,7 +658,7 @@ static SECURITY_STATUS WINAPI lsa_QueryContextAttributesA(CtxtHandle *context, U X(SECPKG_ATTR_TARGET_INFORMATION); #undef X default: - FIXME( "unknown attribute %u\n", attribute ); + FIXME( "unknown attribute %lu\n", attribute ); break; } @@ -670,7 +670,7 @@ static SECURITY_STATUS WINAPI lsa_MakeSignature(CtxtHandle *context, ULONG quali { struct lsa_handle *lsa_ctx; - TRACE("%p %#x %p %u)\n", context, quality_of_protection, message, message_seq_no); + TRACE("%p %#lx %p %lu)\n", context, quality_of_protection, message, message_seq_no); if (!context) return SEC_E_INVALID_HANDLE; lsa_ctx = (struct lsa_handle *)context->dwLower; @@ -687,7 +687,7 @@ static SECURITY_STATUS WINAPI lsa_VerifySignature(CtxtHandle *context, SecBuffer { struct lsa_handle *lsa_ctx; - TRACE("%p %p %u %p)\n", context, message, message_seq_no, quality_of_protection); + TRACE("%p %p %lu %p)\n", context, message, message_seq_no, quality_of_protection); if (!context) return SEC_E_INVALID_HANDLE; lsa_ctx = (struct lsa_handle *)context->dwLower; @@ -704,7 +704,7 @@ static SECURITY_STATUS WINAPI lsa_EncryptMessage(CtxtHandle *context, ULONG qual { struct lsa_handle *lsa_ctx; - TRACE("%p %#x %p %u)\n", context, quality_of_protection, message, message_seq_no); + TRACE("%p %#lx %p %lu)\n", context, quality_of_protection, message, message_seq_no); if (!context) return SEC_E_INVALID_HANDLE; lsa_ctx = (struct lsa_handle *)context->dwLower; @@ -721,7 +721,7 @@ static SECURITY_STATUS WINAPI lsa_DecryptMessage(CtxtHandle *context, SecBufferD { struct lsa_handle *lsa_ctx; - TRACE("%p %p %u %p)\n", context, message, message_seq_no, quality_of_protection); + TRACE("%p %p %lu %p)\n", context, message, message_seq_no, quality_of_protection); if (!context) return SEC_E_INVALID_HANDLE; lsa_ctx = (struct lsa_handle *)context->dwLower; @@ -835,7 +835,7 @@ static BOOL load_package(const WCHAR *name, struct lsa_package *package, ULONG p status = package->lsa_api->InitializePackage(package_id, &lsa_dispatch, NULL, NULL, &package->name); if (status == STATUS_SUCCESS) { - TRACE("%s => %p, name %s, version %#x, api table %p, table count %u\n", + TRACE("%s => %p, name %s, version %#lx, api table %p, table count %lu\n", debugstr_w(name), package->mod, debugstr_an(package->name->Buffer, package->name->Length), package->lsa_api_version, package->lsa_api, package->lsa_table_count); package->package_id = package_id; diff --git a/dlls/secur32/negotiate.c b/dlls/secur32/negotiate.c index 498ef9ec35a..d01419ce9c7 100644 --- a/dlls/secur32/negotiate.c +++ b/dlls/secur32/negotiate.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(secur32); static SECURITY_STATUS SEC_ENTRY nego_QueryCredentialsAttributesA( PCredHandle phCredential, ULONG ulAttribute, PVOID pBuffer) { - FIXME("%p, %u, %p\n", phCredential, ulAttribute, pBuffer); + FIXME("%p, %lu, %p\n", phCredential, ulAttribute, pBuffer); return SEC_E_UNSUPPORTED_FUNCTION; } @@ -46,7 +46,7 @@ static SECURITY_STATUS SEC_ENTRY nego_QueryCredentialsAttributesA( static SECURITY_STATUS SEC_ENTRY nego_QueryCredentialsAttributesW( PCredHandle phCredential, ULONG ulAttribute, PVOID pBuffer) { - FIXME("%p, %u, %p\n", phCredential, ulAttribute, pBuffer); + FIXME("%p, %lu, %p\n", phCredential, ulAttribute, pBuffer); return SEC_E_UNSUPPORTED_FUNCTION; } @@ -74,7 +74,7 @@ static SECURITY_STATUS SEC_ENTRY nego_AcquireCredentialsHandleW( struct sec_handle *cred; SecurePackage *package; - TRACE("%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p\n", + TRACE("%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); @@ -120,7 +120,7 @@ static SECURITY_STATUS SEC_ENTRY nego_AcquireCredentialsHandleA( SEC_WCHAR *user = NULL, *domain = NULL, *passwd = NULL, *package = NULL; SEC_WINNT_AUTH_IDENTITY_W *identityW = NULL; - TRACE("%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p\n", + TRACE("%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p\n", debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialUse, pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); @@ -199,7 +199,7 @@ static SECURITY_STATUS SEC_ENTRY nego_InitializeSecurityContextW( SECURITY_STATUS ret = SEC_E_INVALID_HANDLE; struct sec_handle *handle = NULL, *ctxt, *new_ctxt = NULL, *cred = NULL; - TRACE("%p, %p, %s, 0x%08x, %u, %u, %p, %u, %p, %p, %p, %p\n", + TRACE("%p, %p, %s, 0x%08lx, %lu, %lu, %p, %lu, %p, %p, %p, %p\n", phCredential, phContext, debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); @@ -261,7 +261,7 @@ static SECURITY_STATUS SEC_ENTRY nego_InitializeSecurityContextA( SECURITY_STATUS ret; SEC_WCHAR *target = NULL; - TRACE("%p, %p, %s, 0x%08x, %u, %u, %p, %u, %p, %p, %p, %p\n", + TRACE("%p, %p, %s, 0x%08lx, %lu, %lu, %p, %lu, %p, %p, %p, %p\n", phCredential, phContext, debugstr_a(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); @@ -290,7 +290,7 @@ static SECURITY_STATUS SEC_ENTRY nego_AcceptSecurityContext( SECURITY_STATUS ret = SEC_E_INVALID_HANDLE; struct sec_handle *handle = NULL, *ctxt, *new_ctxt = NULL, *cred = NULL; - TRACE("%p, %p, %p, 0x%08x, %u, %p, %p, %p, %p\n", phCredential, phContext, + TRACE("%p, %p, %p, 0x%08lx, %lu, %p, %p, %p, %p\n", phCredential, phContext, pInput, fContextReq, TargetDataRep, phNewContext, pOutput, pfContextAttr, ptsExpiry); @@ -402,7 +402,7 @@ static SECURITY_STATUS SEC_ENTRY nego_QueryContextAttributesW( SECURITY_STATUS ret = SEC_E_INVALID_HANDLE; struct sec_handle *ctxt; - TRACE("%p, %u, %p\n", phContext, ulAttribute, pBuffer); + TRACE("%p, %lu, %p\n", phContext, ulAttribute, pBuffer); if (!phContext) return SEC_E_INVALID_HANDLE; @@ -427,7 +427,7 @@ static SECURITY_STATUS SEC_ENTRY nego_QueryContextAttributesA(PCtxtHandle phCont SECURITY_STATUS ret = SEC_E_INVALID_HANDLE; struct sec_handle *ctxt; - TRACE("%p, %u, %p\n", phContext, ulAttribute, pBuffer); + TRACE("%p, %lu, %p\n", phContext, ulAttribute, pBuffer); if (!phContext) return SEC_E_INVALID_HANDLE; @@ -478,7 +478,7 @@ static SECURITY_STATUS SEC_ENTRY nego_MakeSignature(PCtxtHandle phContext, SECURITY_STATUS ret = SEC_E_INVALID_HANDLE; struct sec_handle *ctxt; - TRACE("%p, 0x%08x, %p, %u\n", phContext, fQOP, pMessage, MessageSeqNo); + TRACE("%p, 0x%08lx, %p, %lu\n", phContext, fQOP, pMessage, MessageSeqNo); if (!phContext) return SEC_E_INVALID_HANDLE; @@ -503,7 +503,7 @@ static SECURITY_STATUS SEC_ENTRY nego_VerifySignature(PCtxtHandle phContext, SECURITY_STATUS ret = SEC_E_INVALID_HANDLE; struct sec_handle *ctxt; - TRACE("%p, %p, %u, %p\n", phContext, pMessage, MessageSeqNo, pfQOP); + TRACE("%p, %p, %lu, %p\n", phContext, pMessage, MessageSeqNo, pfQOP); if (!phContext) return SEC_E_INVALID_HANDLE; @@ -547,7 +547,7 @@ static SECURITY_STATUS SEC_ENTRY nego_EncryptMessage(PCtxtHandle phContext, SECURITY_STATUS ret = SEC_E_INVALID_HANDLE; struct sec_handle *ctxt; - TRACE("%p, 0x%08x, %p, %u\n", phContext, fQOP, pMessage, MessageSeqNo); + TRACE("%p, 0x%08lx, %p, %lu\n", phContext, fQOP, pMessage, MessageSeqNo); if (!phContext) return SEC_E_INVALID_HANDLE; @@ -572,7 +572,7 @@ static SECURITY_STATUS SEC_ENTRY nego_DecryptMessage(PCtxtHandle phContext, SECURITY_STATUS ret = SEC_E_INVALID_HANDLE; struct sec_handle *ctxt; - TRACE("%p, %p, %u, %p\n", phContext, pMessage, MessageSeqNo, pfQOP); + TRACE("%p, %p, %lu, %p\n", phContext, pMessage, MessageSeqNo, pfQOP); if (!phContext) return SEC_E_INVALID_HANDLE; diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index c4e01c1e2a7..c7d62c47758 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -88,7 +88,7 @@ static ULONG_PTR schan_alloc_handle(void *object, enum schan_handle_type type) handle = schan_free_handles; if (handle->type != SCHAN_HANDLE_FREE) { - ERR("Handle %d(%p) is in the free list, but has type %#x.\n", index, handle, handle->type); + ERR("Handle %ld(%p) is in the free list, but has type %#x.\n", index, handle, handle->type); return SCHAN_INVALID_HANDLE; } schan_free_handles = handle->object; @@ -128,7 +128,7 @@ static void *schan_free_handle(ULONG_PTR handle_idx, enum schan_handle_type type handle = &schan_handle_table[handle_idx]; if (handle->type != type) { - ERR("Handle %ld(%p) is not of type %#x\n", handle_idx, handle, type); + ERR("Handle %Id(%p) is not of type %#x\n", handle_idx, handle, type); return NULL; } @@ -149,7 +149,7 @@ static void *schan_get_object(ULONG_PTR handle_idx, enum schan_handle_type type) handle = &schan_handle_table[handle_idx]; if (handle->type != type) { - ERR("Handle %ld(%p) is not of type %#x\n", handle_idx, handle, type); + ERR("Handle %Id(%p) is not of type %#x\n", handle_idx, handle, type); return NULL; } @@ -238,7 +238,7 @@ static void read_config(void) config_default_disabled_protocols = default_disabled; config_read = TRUE; - TRACE("enabled %x, disabled by default %x\n", config_enabled_protocols, config_default_disabled_protocols); + TRACE("enabled %lx, disabled by default %lx\n", config_enabled_protocols, config_default_disabled_protocols); } static SECURITY_STATUS schan_QueryCredentialsAttributes( @@ -298,7 +298,7 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryCredentialsAttributesA( { SECURITY_STATUS ret; - TRACE("(%p, %d, %p)\n", phCredential, ulAttribute, pBuffer); + TRACE("(%p, %ld, %p)\n", phCredential, ulAttribute, pBuffer); switch (ulAttribute) { @@ -318,7 +318,7 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryCredentialsAttributesW( { SECURITY_STATUS ret; - TRACE("(%p, %d, %p)\n", phCredential, ulAttribute, pBuffer); + TRACE("(%p, %ld, %p)\n", phCredential, ulAttribute, pBuffer); switch (ulAttribute) { @@ -338,19 +338,19 @@ static SECURITY_STATUS get_cert(const SCHANNEL_CRED *cred, CERT_CONTEXT const ** SECURITY_STATUS status; DWORD i; - TRACE("dwVersion = %u\n", cred->dwVersion); - TRACE("cCreds = %u\n", cred->cCreds); + TRACE("dwVersion = %lu\n", cred->dwVersion); + TRACE("cCreds = %lu\n", cred->cCreds); TRACE("paCred = %p\n", cred->paCred); TRACE("hRootStore = %p\n", cred->hRootStore); - TRACE("cMappers = %u\n", cred->cMappers); - TRACE("cSupportedAlgs = %u:\n", cred->cSupportedAlgs); + TRACE("cMappers = %lu\n", cred->cMappers); + TRACE("cSupportedAlgs = %lu:\n", cred->cSupportedAlgs); for (i = 0; i < cred->cSupportedAlgs; i++) TRACE("%08x\n", cred->palgSupportedAlgs[i]); - TRACE("grbitEnabledProtocols = %08x\n", cred->grbitEnabledProtocols); - TRACE("dwMinimumCipherStrength = %u\n", cred->dwMinimumCipherStrength); - TRACE("dwMaximumCipherStrength = %u\n", cred->dwMaximumCipherStrength); - TRACE("dwSessionLifespan = %u\n", cred->dwSessionLifespan); - TRACE("dwFlags = %08x\n", cred->dwFlags); - TRACE("dwCredFormat = %u\n", cred->dwCredFormat); + TRACE("grbitEnabledProtocols = %08lx\n", cred->grbitEnabledProtocols); + TRACE("dwMinimumCipherStrength = %lu\n", cred->dwMinimumCipherStrength); + TRACE("dwMaximumCipherStrength = %lu\n", cred->dwMaximumCipherStrength); + TRACE("dwSessionLifespan = %lu\n", cred->dwSessionLifespan); + TRACE("dwFlags = %08lx\n", cred->dwFlags); + TRACE("dwCredFormat = %lu\n", cred->dwCredFormat); switch (cred->dwVersion) { @@ -610,7 +610,7 @@ static SECURITY_STATUS SEC_ENTRY schan_AcquireCredentialsHandleA( PLUID pLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn, PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) { - TRACE("(%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p)\n", + TRACE("(%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p)\n", debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialUse, pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); return schan_AcquireCredentialsHandle(fCredentialUse, @@ -622,7 +622,7 @@ static SECURITY_STATUS SEC_ENTRY schan_AcquireCredentialsHandleW( PLUID pLogonID, PVOID pAuthData, SEC_GET_KEY_FN pGetKeyFn, PVOID pGetKeyArgument, PCredHandle phCredential, PTimeStamp ptsExpiry) { - TRACE("(%s, %s, 0x%08x, %p, %p, %p, %p, %p, %p)\n", + TRACE("(%s, %s, 0x%08lx, %p, %p, %p, %p, %p, %p)\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, pLogonID, pAuthData, pGetKeyFn, pGetKeyArgument, phCredential, ptsExpiry); return schan_AcquireCredentialsHandle(fCredentialUse, @@ -674,7 +674,7 @@ static void dump_buffer_desc(SecBufferDesc *desc) for (i = 0; i < desc->cBuffers; ++i) { SecBuffer *b = &desc->pBuffers[i]; - TRACE("\tbuffer %u: cbBuffer %d, BufferType %#x pvBuffer %p\n", i, b->cbBuffer, b->BufferType, b->pvBuffer); + TRACE("\tbuffer %u: cbBuffer %ld, BufferType %#lx pvBuffer %p\n", i, b->cbBuffer, b->BufferType, b->pvBuffer); } } @@ -711,7 +711,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( struct handshake_params params; int idx, i; - TRACE("%p %p %s 0x%08x %d %d %p %d %p %p %p %p\n", phCredential, phContext, + TRACE("%p %p %s 0x%08lx %ld %ld %p %ld %p %p %p %p\n", phCredential, phContext, debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); @@ -746,7 +746,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( if (!(cred->credential_use & SECPKG_CRED_OUTBOUND)) { - WARN("Invalid credential use %#x\n", cred->credential_use); + WARN("Invalid credential use %#lx\n", cred->credential_use); return SEC_E_INVALID_HANDLE; } @@ -805,7 +805,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( struct set_dtls_mtu_params params = { ctx->transport.session, *(WORD *)buffer->pvBuffer }; GNUTLS_CALL( set_dtls_mtu, ¶ms ); } - else WARN("invalid buffer size %u\n", buffer->cbBuffer); + else WARN("invalid buffer size %lu\n", buffer->cbBuffer); } if (is_dtls_context(ctx)) @@ -843,12 +843,12 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( if (!expected_size) { - TRACE("Expected at least %lu bytes, but buffer only contains %u bytes.\n", + TRACE("Expected at least %Iu bytes, but buffer only contains %lu bytes.\n", max(ctx->header_size + 1, record_size), buffer->cbBuffer); return SEC_E_INCOMPLETE_MESSAGE; } - TRACE("Using expected_size %lu.\n", expected_size); + TRACE("Using expected_size %Iu.\n", expected_size); } if (phNewContext) *phNewContext = *phContext; @@ -925,7 +925,7 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextA( SECURITY_STATUS ret; SEC_WCHAR *target_name = NULL; - TRACE("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext, + TRACE("%p %p %s %ld %ld %ld %p %ld %p %p %p %p\n", phCredential, phContext, debugstr_a(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); @@ -1020,7 +1020,7 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( struct schan_context *ctx; SECURITY_STATUS status; - TRACE("context_handle %p, attribute %#x, buffer %p\n", + TRACE("context_handle %p, attribute %#lx, buffer %p\n", context_handle, attribute, buffer); if (!context_handle) return SEC_E_INVALID_HANDLE; @@ -1041,7 +1041,7 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( unsigned int block_size = GNUTLS_CALL( get_session_cipher_block_size, ¶ms ); unsigned int message_size = GNUTLS_CALL( get_max_message_size, ¶ms ); - TRACE("Using header size %lu mac bytes %lu, message size %u, block size %u\n", + TRACE("Using header size %Iu mac bytes %Iu, message size %u, block size %u\n", ctx->header_size, mac_size, message_size, block_size); /* These are defined by the TLS RFC */ @@ -1163,7 +1163,7 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( } default: - FIXME("Unhandled attribute %#x\n", attribute); + FIXME("Unhandled attribute %#lx\n", attribute); return SEC_E_UNSUPPORTED_FUNCTION; } } @@ -1171,7 +1171,7 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesA( PCtxtHandle context_handle, ULONG attribute, PVOID buffer) { - TRACE("context_handle %p, attribute %#x, buffer %p\n", + TRACE("context_handle %p, attribute %#lx, buffer %p\n", context_handle, attribute, buffer); switch(attribute) @@ -1201,7 +1201,7 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesA( return schan_QueryContextAttributesW(context_handle, attribute, buffer); default: - FIXME("Unhandled attribute %#x\n", attribute); + FIXME("Unhandled attribute %#lx\n", attribute); return SEC_E_UNSUPPORTED_FUNCTION; } } @@ -1218,7 +1218,7 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle char *data; int idx; - TRACE("context_handle %p, quality %d, message %p, message_seq_no %d\n", + TRACE("context_handle %p, quality %ld, message %p, message_seq_no %ld\n", context_handle, quality, message, message_seq_no); if (!context_handle) return SEC_E_INVALID_HANDLE; @@ -1245,14 +1245,14 @@ static SECURITY_STATUS SEC_ENTRY schan_EncryptMessage(PCtxtHandle context_handle params.length = &length; status = GNUTLS_CALL( send, ¶ms ); - TRACE("Sent %ld bytes.\n", length); + TRACE("Sent %Id bytes.\n", length); if (length != data_size) status = SEC_E_INTERNAL_ERROR; free(data); - TRACE("Returning %#x.\n", status); + TRACE("Returning %#lx.\n", status); return status; } @@ -1327,7 +1327,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle int idx; unsigned char *buf_ptr; - TRACE("context_handle %p, message %p, message_seq_no %d, quality %p\n", + TRACE("context_handle %p, message %p, message_seq_no %ld, quality %p\n", context_handle, message, message_seq_no, quality); if (!context_handle) return SEC_E_INVALID_HANDLE; @@ -1344,7 +1344,7 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle expected_size = ctx->header_size + read_record_size(buf_ptr, ctx->header_size); if(buffer->cbBuffer < expected_size) { - TRACE("Expected %u bytes, but buffer only contains %u bytes\n", expected_size, buffer->cbBuffer); + TRACE("Expected %u bytes, but buffer only contains %lu bytes\n", expected_size, buffer->cbBuffer); buffer->BufferType = SECBUFFER_MISSING; buffer->cbBuffer = expected_size - buffer->cbBuffer; @@ -1373,11 +1373,11 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle if (status != SEC_E_OK && status != SEC_I_RENEGOTIATE) { free(data); - ERR("Returning %x\n", status); + ERR("Returning %lx\n", status); return status; } - TRACE("Received %ld bytes\n", received); + TRACE("Received %Id bytes\n", received); memcpy(buf_ptr + ctx->header_size, data, received); free(data); diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index b7ffa1822b5..0145c59e0f0 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -333,7 +333,8 @@ static char *get_buffer(const struct schan_transport *t, struct schan_buffers *s } buffer = &s->desc->pBuffers[s->current_buffer_idx]; - TRACE("Using buffer %d: cbBuffer %d, BufferType %#x, pvBuffer %p\n", s->current_buffer_idx, buffer->cbBuffer, buffer->BufferType, buffer->pvBuffer); + TRACE("Using buffer %d: cbBuffer %d, BufferType %#x, pvBuffer %p\n", + s->current_buffer_idx, (unsigned)buffer->cbBuffer, (unsigned)buffer->BufferType, buffer->pvBuffer); max_count = buffer->cbBuffer - s->offset; if (s->limit != ~0UL && s->limit < max_count) @@ -1044,7 +1045,7 @@ static gnutls_x509_privkey_t get_x509_key(const DATA_BLOB *key_blob) if (size < sizeof(BLOBHEADER)) return NULL; rsakey = (RSAPUBKEY *)(key_blob->pbData + sizeof(BLOBHEADER)); - TRACE("RSA key bitlen %u pubexp %u\n", rsakey->bitlen, rsakey->pubexp); + TRACE("RSA key bitlen %u pubexp %u\n", (unsigned)rsakey->bitlen, (unsigned)rsakey->pubexp); size -= sizeof(BLOBHEADER) + FIELD_OFFSET(RSAPUBKEY, pubexp); set_component(&e, (BYTE *)&rsakey->pubexp, sizeof(rsakey->pubexp), &size); @@ -1084,7 +1085,7 @@ static gnutls_x509_crt_t get_x509_crt(const CERT_CONTEXT *ctx) if (!ctx) return FALSE; if (ctx->dwCertEncodingType != X509_ASN_ENCODING) { - FIXME("encoding type %u not supported\n", ctx->dwCertEncodingType); + FIXME("encoding type %u not supported\n", (unsigned)ctx->dwCertEncodingType); return NULL; } diff --git a/dlls/secur32/secur32.c b/dlls/secur32/secur32.c index 05ec6b1e692..b14fc0e05b7 100644 --- a/dlls/secur32/secur32.c +++ b/dlls/secur32/secur32.c @@ -709,7 +709,7 @@ SECURITY_STATUS WINAPI EnumerateSecurityPackagesW(PULONG pcPackages, *pkgInfo = package->infoW; if (package->infoW.Name) { - TRACE("Name[%d] = %s\n", i - 1, debugstr_w(package->infoW.Name)); + TRACE("Name[%ld] = %s\n", i - 1, debugstr_w(package->infoW.Name)); pkgInfo->Name = nextString; lstrcpyW(nextString, package->infoW.Name); nextString += lstrlenW(nextString) + 1; @@ -718,7 +718,7 @@ SECURITY_STATUS WINAPI EnumerateSecurityPackagesW(PULONG pcPackages, pkgInfo->Name = NULL; if (package->infoW.Comment) { - TRACE("Comment[%d] = %s\n", i - 1, debugstr_w(package->infoW.Comment)); + TRACE("Comment[%ld] = %s\n", i - 1, debugstr_w(package->infoW.Comment)); pkgInfo->Comment = nextString; lstrcpyW(nextString, package->infoW.Comment); nextString += lstrlenW(nextString) + 1; @@ -732,7 +732,7 @@ SECURITY_STATUS WINAPI EnumerateSecurityPackagesW(PULONG pcPackages, } } LeaveCriticalSection(&cs); - TRACE("<-- 0x%08x\n", ret); + TRACE("<-- 0x%08lx\n", ret); return ret; } @@ -909,7 +909,7 @@ BOOLEAN WINAPI GetComputerObjectNameW( if (ntStatus != STATUS_SUCCESS) { SetLastError(LsaNtStatusToWinError(ntStatus)); - WARN("LsaOpenPolicy failed with NT status %u\n", GetLastError()); + WARN("LsaOpenPolicy failed with NT status %lu\n", GetLastError()); return FALSE; } @@ -919,7 +919,7 @@ BOOLEAN WINAPI GetComputerObjectNameW( if (ntStatus != STATUS_SUCCESS) { SetLastError(LsaNtStatusToWinError(ntStatus)); - WARN("LsaQueryInformationPolicy failed with NT status %u\n", + WARN("LsaQueryInformationPolicy failed with NT status %lu\n", GetLastError()); LsaClose(policyHandle); return FALSE; diff --git a/dlls/secur32/thunks.c b/dlls/secur32/thunks.c index 7087696ca35..de0fb0a50ec 100644 --- a/dlls/secur32/thunks.c +++ b/dlls/secur32/thunks.c @@ -38,7 +38,7 @@ SECURITY_STATUS SEC_ENTRY thunk_AcquireCredentialsHandleA( { SECURITY_STATUS ret; - TRACE("%s %s %d %p %p %p %p %p %p\n", debugstr_a(pszPrincipal), + TRACE("%s %s %ld %p %p %p %p %p %p\n", debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialsUse, pvLogonID, pAuthData, pGetKeyFn, pvGetKeyArgument, phCredential, ptsExpiry); if (pszPackage) @@ -77,7 +77,7 @@ SECURITY_STATUS SEC_ENTRY thunk_AcquireCredentialsHandleW( { SECURITY_STATUS ret; - TRACE("%s %s %d %p %p %p %p %p %p\n", debugstr_w(pszPrincipal), + TRACE("%s %s %ld %p %p %p %p %p %p\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialsUse, pvLogonID, pAuthData, pGetKeyFn, pvGetKeyArgument, phCredential, ptsExpiry); if (pszPackage) @@ -104,7 +104,7 @@ SECURITY_STATUS SEC_ENTRY thunk_QueryCredentialsAttributesA( { SECURITY_STATUS ret; - TRACE("%p %d %p\n", phCredential, ulAttribute, pBuffer); + TRACE("%p %ld %p\n", phCredential, ulAttribute, pBuffer); if (phCredential) { SecurePackage *package = (SecurePackage *)phCredential->dwUpper; @@ -132,7 +132,7 @@ SECURITY_STATUS SEC_ENTRY thunk_QueryCredentialsAttributesA( break; } default: - WARN("attribute type %d unknown\n", ulAttribute); + WARN("attribute type %ld unknown\n", ulAttribute); ret = SEC_E_INTERNAL_ERROR; } } @@ -165,7 +165,7 @@ SECURITY_STATUS SEC_ENTRY thunk_QueryCredentialsAttributesW( { SECURITY_STATUS ret; - TRACE("%p %d %p\n", phCredential, ulAttribute, pBuffer); + TRACE("%p %ld %p\n", phCredential, ulAttribute, pBuffer); if (phCredential) { SecurePackage *package = (SecurePackage *)phCredential->dwUpper; @@ -193,7 +193,7 @@ SECURITY_STATUS SEC_ENTRY thunk_QueryCredentialsAttributesW( break; } default: - WARN("attribute type %d unknown\n", ulAttribute); + WARN("attribute type %ld unknown\n", ulAttribute); ret = SEC_E_INTERNAL_ERROR; } } @@ -218,7 +218,7 @@ SECURITY_STATUS SEC_ENTRY thunk_InitializeSecurityContextA( { SECURITY_STATUS ret; - TRACE("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext, + TRACE("%p %p %s %ld %ld %ld %p %ld %p %p %p %p\n", phCredential, phContext, debugstr_a(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); if (phCredential) @@ -258,7 +258,7 @@ SECURITY_STATUS SEC_ENTRY thunk_InitializeSecurityContextW( { SECURITY_STATUS ret; - TRACE("%p %p %s %d %d %d %p %d %p %p %p %p\n", phCredential, phContext, + TRACE("%p %p %s %ld %ld %ld %p %ld %p %p %p %p\n", phCredential, phContext, debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); if (phCredential) @@ -295,7 +295,7 @@ SECURITY_STATUS SEC_ENTRY thunk_AddCredentialsA(PCredHandle hCredentials, { SECURITY_STATUS ret; - TRACE("%p %s %s %d %p %p %p %p\n", hCredentials, debugstr_a(pszPrincipal), + TRACE("%p %s %s %ld %p %p %p %p\n", hCredentials, debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialUse, pAuthData, pGetKeyFn, pvGetKeyArgument, ptsExpiry); if (hCredentials) @@ -335,7 +335,7 @@ SECURITY_STATUS SEC_ENTRY thunk_AddCredentialsW(PCredHandle hCredentials, { SECURITY_STATUS ret; - TRACE("%p %s %s %d %p %p %p %p\n", hCredentials, debugstr_w(pszPrincipal), + TRACE("%p %s %s %ld %p %p %p %p\n", hCredentials, debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, pAuthData, pGetKeyFn, pvGetKeyArgument, ptsExpiry); if (hCredentials) @@ -534,7 +534,7 @@ static SECURITY_STATUS thunk_ContextAttributesWToA(SecurePackage *package, case SECPKG_ATTR_TARGET_INFORMATION: break; default: - WARN("attribute type %d unknown\n", ulAttribute); + WARN("attribute type %ld unknown\n", ulAttribute); ret = SEC_E_INTERNAL_ERROR; } } @@ -548,7 +548,7 @@ SECURITY_STATUS SEC_ENTRY thunk_QueryContextAttributesA(PCtxtHandle phContext, { SECURITY_STATUS ret; - TRACE("%p %d %p\n", phContext, ulAttribute, pBuffer); + TRACE("%p %ld %p\n", phContext, ulAttribute, pBuffer); if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; @@ -738,7 +738,7 @@ static SECURITY_STATUS thunk_ContextAttributesAToW(SecurePackage *package, case SECPKG_ATTR_TARGET_INFORMATION: break; default: - WARN("attribute type %d unknown\n", ulAttribute); + WARN("attribute type %ld unknown\n", ulAttribute); ret = SEC_E_INTERNAL_ERROR; } } @@ -752,7 +752,7 @@ SECURITY_STATUS SEC_ENTRY thunk_QueryContextAttributesW(PCtxtHandle phContext, { SECURITY_STATUS ret; - TRACE("%p %d %p\n", phContext, ulAttribute, pBuffer); + TRACE("%p %ld %p\n", phContext, ulAttribute, pBuffer); if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; @@ -782,7 +782,7 @@ SECURITY_STATUS SEC_ENTRY thunk_SetContextAttributesA(PCtxtHandle phContext, { SECURITY_STATUS ret; - TRACE("%p %d %p %d\n", phContext, ulAttribute, pBuffer, cbBuffer); + TRACE("%p %ld %p %ld\n", phContext, ulAttribute, pBuffer, cbBuffer); if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; @@ -813,7 +813,7 @@ SECURITY_STATUS SEC_ENTRY thunk_SetContextAttributesW(PCtxtHandle phContext, { SECURITY_STATUS ret; - TRACE("%p %d %p %d\n", phContext, ulAttribute, pBuffer, cbBuffer); + TRACE("%p %ld %p %ld\n", phContext, ulAttribute, pBuffer, cbBuffer); if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; diff --git a/dlls/secur32/wrapper.c b/dlls/secur32/wrapper.c index e4475069b86..53fea29fcc5 100644 --- a/dlls/secur32/wrapper.c +++ b/dlls/secur32/wrapper.c @@ -40,7 +40,7 @@ SECURITY_STATUS WINAPI AcquireCredentialsHandleA( { SECURITY_STATUS ret; - TRACE("%s %s %d %p %p %p %p %p %p\n", debugstr_a(pszPrincipal), + TRACE("%s %s %ld %p %p %p %p %p %p\n", debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialsUse, pvLogonID, pAuthData, pGetKeyFn, pvGetKeyArgument, phCredential, ptsExpiry); if (pszPackage) @@ -78,7 +78,7 @@ SECURITY_STATUS WINAPI AcquireCredentialsHandleW( { SECURITY_STATUS ret; - TRACE("%s %s %d %p %p %p %p %p %p\n", debugstr_w(pszPrincipal), + TRACE("%s %s %ld %p %p %p %p %p %p\n", debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialsUse, pvLogonID, pAuthData, pGetKeyFn, pvGetKeyArgument, phCredential, ptsExpiry); if (pszPackage) @@ -136,7 +136,7 @@ SECURITY_STATUS WINAPI QueryCredentialsAttributesA( { SECURITY_STATUS ret; - TRACE("%p %d %p\n", phCredential, ulAttribute, pBuffer); + TRACE("%p %ld %p\n", phCredential, ulAttribute, pBuffer); if (phCredential) { SecurePackage *package = (SecurePackage *)phCredential->dwUpper; @@ -164,7 +164,7 @@ SECURITY_STATUS WINAPI QueryCredentialsAttributesW( { SECURITY_STATUS ret; - TRACE("%p %d %p\n", phCredential, ulAttribute, pBuffer); + TRACE("%p %ld %p\n", phCredential, ulAttribute, pBuffer); if (phCredential) { SecurePackage *package = (SecurePackage *)phCredential->dwUpper; @@ -196,7 +196,7 @@ SECURITY_STATUS WINAPI InitializeSecurityContextA( SECURITY_STATUS ret; SecurePackage *package = NULL; - TRACE("%p %p %s 0x%08x %d %d %p %d %p %p %p %p\n", phCredential, phContext, + TRACE("%p %p %s 0x%08lx %ld %ld %p %ld %p %p %p %p\n", phCredential, phContext, debugstr_a(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); @@ -235,7 +235,7 @@ SECURITY_STATUS WINAPI InitializeSecurityContextW( SECURITY_STATUS ret; SecurePackage *package = NULL; - TRACE("%p %p %s 0x%08x %d %d %p %d %p %p %p %p\n", phCredential, phContext, + TRACE("%p %p %s 0x%08lx %ld %ld %p %ld %p %p %p %p\n", phCredential, phContext, debugstr_w(pszTargetName), fContextReq, Reserved1, TargetDataRep, pInput, Reserved1, phNewContext, pOutput, pfContextAttr, ptsExpiry); @@ -271,7 +271,7 @@ SECURITY_STATUS WINAPI AcceptSecurityContext( { SECURITY_STATUS ret; - TRACE("%p %p %p %d %d %p %p %p %p\n", phCredential, phContext, pInput, + TRACE("%p %p %p %ld %ld %p %p %p %p\n", phCredential, phContext, pInput, fContextReq, TargetDataRep, phNewContext, pOutput, pfContextAttr, ptsExpiry); if (phCredential) @@ -381,7 +381,7 @@ SECURITY_STATUS WINAPI QueryContextAttributesA(PCtxtHandle phContext, { SECURITY_STATUS ret; - TRACE("%p %d %p\n", phContext, ulAttribute, pBuffer); + TRACE("%p %ld %p\n", phContext, ulAttribute, pBuffer); if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; @@ -408,7 +408,7 @@ SECURITY_STATUS WINAPI QueryContextAttributesW(PCtxtHandle phContext, { SECURITY_STATUS ret; - TRACE("%p %d %p\n", phContext, ulAttribute, pBuffer); + TRACE("%p %ld %p\n", phContext, ulAttribute, pBuffer); if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; @@ -487,7 +487,7 @@ SECURITY_STATUS WINAPI MakeSignature(PCtxtHandle phContext, ULONG fQOP, { SECURITY_STATUS ret; - TRACE("%p %d %p %d\n", phContext, fQOP, pMessage, MessageSeqNo); + TRACE("%p %ld %p %ld\n", phContext, fQOP, pMessage, MessageSeqNo); if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; @@ -514,7 +514,7 @@ SECURITY_STATUS WINAPI VerifySignature(PCtxtHandle phContext, { SECURITY_STATUS ret; - TRACE("%p %p %d %p\n", phContext, pMessage, MessageSeqNo, pfQOP); + TRACE("%p %p %ld %p\n", phContext, pMessage, MessageSeqNo, pfQOP); if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; @@ -665,7 +665,7 @@ SECURITY_STATUS WINAPI ExportSecurityContext(PCtxtHandle phContext, { SECURITY_STATUS ret; - TRACE("%p %d %p %p\n", phContext, fFlags, pPackedContext, pToken); + TRACE("%p %ld %p %p\n", phContext, fFlags, pPackedContext, pToken); if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; @@ -747,7 +747,7 @@ SECURITY_STATUS WINAPI AddCredentialsA(PCredHandle hCredentials, { SECURITY_STATUS ret; - TRACE("%p %s %s %d %p %p %p %p\n", hCredentials, debugstr_a(pszPrincipal), + TRACE("%p %s %s %ld %p %p %p %p\n", hCredentials, debugstr_a(pszPrincipal), debugstr_a(pszPackage), fCredentialUse, pAuthData, pGetKeyFn, pvGetKeyArgument, ptsExpiry); if (hCredentials) @@ -780,7 +780,7 @@ SECURITY_STATUS WINAPI AddCredentialsW(PCredHandle hCredentials, { SECURITY_STATUS ret; - TRACE("%p %s %s %d %p %p %p %p\n", hCredentials, debugstr_w(pszPrincipal), + TRACE("%p %s %s %ld %p %p %p %p\n", hCredentials, debugstr_w(pszPrincipal), debugstr_w(pszPackage), fCredentialUse, pAuthData, pGetKeyFn, pvGetKeyArgument, ptsExpiry); if (hCredentials) @@ -838,7 +838,7 @@ SECURITY_STATUS WINAPI EncryptMessage(PCtxtHandle phContext, ULONG fQOP, { SECURITY_STATUS ret; - TRACE("%p %d %p %d\n", phContext, fQOP, pMessage, MessageSeqNo); + TRACE("%p %ld %p %ld\n", phContext, fQOP, pMessage, MessageSeqNo); if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; @@ -865,7 +865,7 @@ SECURITY_STATUS WINAPI DecryptMessage(PCtxtHandle phContext, { SECURITY_STATUS ret; - TRACE("%p %p %d %p\n", phContext, pMessage, MessageSeqNo, pfQOP); + TRACE("%p %p %ld %p\n", phContext, pMessage, MessageSeqNo, pfQOP); if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; @@ -892,7 +892,7 @@ SECURITY_STATUS WINAPI SetContextAttributesA(PCtxtHandle phContext, { SECURITY_STATUS ret; - TRACE("%p %d %p %d\n", phContext, ulAttribute, pBuffer, cbBuffer); + TRACE("%p %ld %p %ld\n", phContext, ulAttribute, pBuffer, cbBuffer); if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper; @@ -919,7 +919,7 @@ SECURITY_STATUS WINAPI SetContextAttributesW(PCtxtHandle phContext, { SECURITY_STATUS ret; - TRACE("%p %d %p %d\n", phContext, ulAttribute, pBuffer, cbBuffer); + TRACE("%p %ld %p %ld\n", phContext, ulAttribute, pBuffer, cbBuffer); if (phContext) { SecurePackage *package = (SecurePackage *)phContext->dwUpper;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/scrobj/Makefile.in | 1 - dlls/scrobj/scrobj.c | 84 ++++++++++++++++++++++++----------------------- 2 files changed, 42 insertions(+), 43 deletions(-) diff --git a/dlls/scrobj/Makefile.in b/dlls/scrobj/Makefile.in index 8b641129688..ad21234f065 100644 --- a/dlls/scrobj/Makefile.in +++ b/dlls/scrobj/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = scrobj.dll IMPORTS = uuid urlmon ole32 oleaut32 xmllite advapi32 diff --git a/dlls/scrobj/scrobj.c b/dlls/scrobj/scrobj.c index 5537fbb7b88..0df6be1cd44 100644 --- a/dlls/scrobj/scrobj.c +++ b/dlls/scrobj/scrobj.c @@ -194,7 +194,7 @@ static HRESULT load_typelib(void) hres = LoadRegTypeLib(&LIBID_Scriptlet, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); if (FAILED(hres)) { - ERR("LoadRegTypeLib failed: %08x\n", hres); + ERR("LoadRegTypeLib failed: %08lx\n", hres); return hres; } @@ -216,7 +216,7 @@ static HRESULT get_typeinfo(tid_t tid, ITypeInfo **typeinfo) hres = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); if (FAILED(hres)) { - ERR("GetTypeInfoOfGuid(%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hres); + ERR("GetTypeInfoOfGuid(%s) failed: %08lx\n", debugstr_guid(tid_ids[tid]), hres); return hres; } @@ -292,7 +292,7 @@ static ULONG WINAPI global_AddRef(IDispatchEx *iface) struct scriptlet_global *This = global_from_IDispatchEx(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -302,7 +302,7 @@ static ULONG WINAPI global_Release(IDispatchEx *iface) struct scriptlet_global *This = global_from_IDispatchEx(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) heap_free(This); return ref; @@ -318,7 +318,7 @@ static HRESULT WINAPI global_GetTypeInfoCount(IDispatchEx *iface, UINT *pctinfo) static HRESULT WINAPI global_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { struct scriptlet_global *This = global_from_IDispatchEx(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; } @@ -329,7 +329,7 @@ static HRESULT WINAPI global_GetIDsOfNames(IDispatchEx *iface, REFIID riid, UINT i; HRESULT hres; - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + TRACE("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); for(i=0; i < cNames; i++) { @@ -346,7 +346,7 @@ static HRESULT WINAPI global_Invoke(IDispatchEx *iface, DISPID dispIdMember, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { struct scriptlet_global *This = global_from_IDispatchEx(iface); - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + TRACE("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return IDispatchEx_InvokeEx(&This->IDispatchEx_iface, dispIdMember, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, NULL); @@ -355,7 +355,7 @@ static HRESULT WINAPI global_Invoke(IDispatchEx *iface, DISPID dispIdMember, static HRESULT WINAPI global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD grfdex, DISPID *pid) { struct scriptlet_global *This = global_from_IDispatchEx(iface); - FIXME("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); + FIXME("(%p)->(%s %lx %p)\n", This, debugstr_w(bstrName), grfdex, pid); return E_NOTIMPL; } @@ -363,42 +363,42 @@ static HRESULT WINAPI global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { struct scriptlet_global *This = global_from_IDispatchEx(iface); - FIXME("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); + FIXME("(%p)->(%lx %lx %x %p %p %p %p)\n", This, id, lcid, wFlags, pdp, pvarRes, pei, pspCaller); return E_NOTIMPL; } static HRESULT WINAPI global_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) { struct scriptlet_global *This = global_from_IDispatchEx(iface); - FIXME("(%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex); + FIXME("(%p)->(%s %lx)\n", This, debugstr_w(bstrName), grfdex); return E_NOTIMPL; } static HRESULT WINAPI global_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) { struct scriptlet_global *This = global_from_IDispatchEx(iface); - FIXME("(%p)->(%x)\n", This, id); + FIXME("(%p)->(%lx)\n", This, id); return E_NOTIMPL; } static HRESULT WINAPI global_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex) { struct scriptlet_global *This = global_from_IDispatchEx(iface); - FIXME("(%p)->(%x %x %p)\n", This, id, grfdexFetch, pgrfdex); + FIXME("(%p)->(%lx %lx %p)\n", This, id, grfdexFetch, pgrfdex); return E_NOTIMPL; } static HRESULT WINAPI global_GetMemberName(IDispatchEx *iface, DISPID id, BSTR *pbstrName) { struct scriptlet_global *This = global_from_IDispatchEx(iface); - FIXME("(%p)->(%x %p)\n", This, id, pbstrName); + FIXME("(%p)->(%lx %p)\n", This, id, pbstrName); return E_NOTIMPL; } static HRESULT WINAPI global_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid) { struct scriptlet_global *This = global_from_IDispatchEx(iface); - FIXME("(%p)->(%x %x %p)\n", This, grfdex, id, pid); + FIXME("(%p)->(%lx %lx %p)\n", This, grfdex, id, pid); return E_NOTIMPL; } @@ -482,7 +482,7 @@ static ULONG WINAPI ActiveScriptSite_AddRef(IActiveScriptSite *iface) struct script_host *This = impl_from_IActiveScriptSite(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -492,7 +492,7 @@ static ULONG WINAPI ActiveScriptSite_Release(IActiveScriptSite *iface) struct script_host *This = impl_from_IActiveScriptSite(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if(!ref) { heap_free(This->language); @@ -517,11 +517,11 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPC { struct script_host *This = impl_from_IActiveScriptSite(iface); - TRACE("(%p, %s, %#x, %p, %p)\n", This, debugstr_w(name), mask, unk, ti); + TRACE("(%p, %s, %#lx, %p, %p)\n", This, debugstr_w(name), mask, unk, ti); if (mask != SCRIPTINFO_IUNKNOWN) { - FIXME("mask %x not supported\n", mask); + FIXME("mask %lx not supported\n", mask); return E_NOTIMPL; } @@ -713,7 +713,7 @@ static HRESULT parse_scripts(struct scriptlet_factory *factory, struct list *hos parse_flags, NULL, NULL); if (FAILED(hres)) { - WARN("ParseScriptText failed: %08x\n", hres); + WARN("ParseScriptText failed: %08lx\n", hres); return hres; } } @@ -973,7 +973,7 @@ static ULONG WINAPI scriptlet_AddRef(IDispatchEx *iface) struct scriptlet_instance *This = impl_from_IDispatchEx(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -983,7 +983,7 @@ static ULONG WINAPI scriptlet_Release(IDispatchEx *iface) struct scriptlet_instance *This = impl_from_IDispatchEx(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { @@ -1008,7 +1008,7 @@ static HRESULT WINAPI scriptlet_GetTypeInfoCount(IDispatchEx *iface, UINT *pctin static HRESULT WINAPI scriptlet_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { struct scriptlet_instance *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; } @@ -1019,7 +1019,7 @@ static HRESULT WINAPI scriptlet_GetIDsOfNames(IDispatchEx *iface, REFIID riid, UINT i; HRESULT hres; - TRACE("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + TRACE("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); for(i=0; i < cNames; i++) @@ -1037,7 +1037,7 @@ static HRESULT WINAPI scriptlet_Invoke(IDispatchEx *iface, DISPID dispIdMember, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) { struct scriptlet_instance *This = impl_from_IDispatchEx(iface); - TRACE("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + TRACE("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return IDispatchEx_InvokeEx(&This->IDispatchEx_iface, dispIdMember, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, NULL); @@ -1048,10 +1048,10 @@ static HRESULT WINAPI scriptlet_GetDispID(IDispatchEx *iface, BSTR bstrName, DWO struct scriptlet_instance *This = impl_from_IDispatchEx(iface); unsigned i; - TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(bstrName), grfdex, pid); + TRACE("(%p)->(%s %lx %p)\n", This, debugstr_w(bstrName), grfdex, pid); if (grfdex & ~(fdexNameCaseInsensitive|fdexNameCaseSensitive)) - FIXME("Unsupported grfdex %x\n", grfdex); + FIXME("Unsupported grfdex %lx\n", grfdex); for (i = 0; i < This->member_cnt; i++) { @@ -1074,11 +1074,11 @@ static HRESULT WINAPI scriptlet_InvokeEx(IDispatchEx *iface, DISPID id, LCID lci struct scriptlet_instance *This = impl_from_IDispatchEx(iface); struct object_member *member; - TRACE("(%p)->(%x %x %x %p %p %p %p)\n", This, id, lcid, flags, pdp, res, pei, caller); + TRACE("(%p)->(%lx %lx %x %p %p %p %p)\n", This, id, lcid, flags, pdp, res, pei, caller); if (id < 1 || id > This->member_cnt) { - WARN("Unknown id %xu\n", id); + WARN("Unknown id %lxu\n", id); return DISP_E_MEMBERNOTFOUND; } member = &This->members[id - 1]; @@ -1133,35 +1133,35 @@ static HRESULT WINAPI scriptlet_InvokeEx(IDispatchEx *iface, DISPID id, LCID lci static HRESULT WINAPI scriptlet_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) { struct scriptlet_instance *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex); + FIXME("(%p)->(%s %lx)\n", This, debugstr_w(bstrName), grfdex); return E_NOTIMPL; } static HRESULT WINAPI scriptlet_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) { struct scriptlet_instance *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%x)\n", This, id); + FIXME("(%p)->(%lx)\n", This, id); return E_NOTIMPL; } static HRESULT WINAPI scriptlet_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex) { struct scriptlet_instance *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%x %x %p)\n", This, id, grfdexFetch, pgrfdex); + FIXME("(%p)->(%lx %lx %p)\n", This, id, grfdexFetch, pgrfdex); return E_NOTIMPL; } static HRESULT WINAPI scriptlet_GetMemberName(IDispatchEx *iface, DISPID id, BSTR *pbstrName) { struct scriptlet_instance *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%x %p)\n", This, id, pbstrName); + FIXME("(%p)->(%lx %p)\n", This, id, pbstrName); return E_NOTIMPL; } static HRESULT WINAPI scriptlet_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid) { struct scriptlet_instance *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%x %x %p)\n", This, grfdex, id, pid); + FIXME("(%p)->(%lx %lx %p)\n", This, grfdex, id, pid); return E_NOTIMPL; } @@ -1672,7 +1672,7 @@ static HRESULT parse_scriptlet_file(struct scriptlet_factory *factory, const WCH hres = CreateURLMoniker(NULL, url, &factory->moniker); if (FAILED(hres)) { - WARN("CreateURLMoniker failed: %08x\n", hres); + WARN("CreateURLMoniker failed: %08lx\n", hres); return hres; } @@ -1782,7 +1782,7 @@ static ULONG WINAPI scriptlet_factory_AddRef(IClassFactory *iface) struct scriptlet_factory *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); return ref; } @@ -1792,7 +1792,7 @@ static ULONG WINAPI scriptlet_factory_Release(IClassFactory *iface) struct scriptlet_factory *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref); if (!ref) { @@ -2092,7 +2092,7 @@ static ULONG WINAPI scriptlet_typelib_AddRef(IGenScriptletTLib *iface) { struct scriptlet_typelib *This = impl_from_IGenScriptletTLib(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); return ref; } @@ -2101,7 +2101,7 @@ static ULONG WINAPI scriptlet_typelib_Release(IGenScriptletTLib *iface) struct scriptlet_typelib *This = impl_from_IGenScriptletTLib(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); if (!ref) { @@ -2127,7 +2127,7 @@ static HRESULT WINAPI scriptlet_typelib_GetTypeInfo(IGenScriptletTLib *iface, UI { struct scriptlet_typelib *This = impl_from_IGenScriptletTLib(iface); - TRACE("(%p, %u, %x, %p)\n", This, index, lcid, tinfo); + TRACE("(%p, %u, %lx, %p)\n", This, index, lcid, tinfo); return get_typeinfo(IGenScriptletTLib_tid, tinfo); } @@ -2139,7 +2139,7 @@ static HRESULT WINAPI scriptlet_typelib_GetIDsOfNames(IGenScriptletTLib *iface, ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p, %s, %p, %u, %x, %p)\n", This, debugstr_guid(riid), names, cNames, lcid, dispid); + TRACE("(%p, %s, %p, %u, %lx, %p)\n", This, debugstr_guid(riid), names, cNames, lcid, dispid); hr = get_typeinfo(IGenScriptletTLib_tid, &typeinfo); if (SUCCEEDED(hr)) @@ -2158,7 +2158,7 @@ static HRESULT WINAPI scriptlet_typelib_Invoke(IGenScriptletTLib *iface, DISPID ITypeInfo *typeinfo; HRESULT hr; - TRACE("(%p, %d, %s, %x, %x, %p, %p, %p, %p)\n", This, dispid, debugstr_guid(riid), lcid, flags, + TRACE("(%p, %ld, %s, %lx, %x, %p, %p, %p, %p)\n", This, dispid, debugstr_guid(riid), lcid, flags, params, result, ei, argerr); hr = get_typeinfo(IGenScriptletTLib_tid, &typeinfo); @@ -2356,7 +2356,7 @@ static const IGenScriptletTLibVtbl scriptlet_typelib_vtbl = BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) { - TRACE("%p, %u, %p\n", hinst, reason, reserved); + TRACE("%p, %lu, %p\n", hinst, reason, reserved); switch (reason) {
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/serialui/Makefile.in | 1 - dlls/serialui/confdlg.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in index c7a03a98d93..6c22afda68e 100644 --- a/dlls/serialui/Makefile.in +++ b/dlls/serialui/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = serialui.dll IMPORTS = user32 advapi32 diff --git a/dlls/serialui/confdlg.c b/dlls/serialui/confdlg.c index 23c9eb68c2a..e35ceb1f36b 100644 --- a/dlls/serialui/confdlg.c +++ b/dlls/serialui/confdlg.c @@ -61,7 +61,7 @@ static HMODULE SERIALUI_hModule; BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p,%x,%p\n", hinstDLL, fdwReason, lpvReserved); + TRACE("%p,%lx,%p\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { case DLL_PROCESS_ATTACH: @@ -86,7 +86,7 @@ typedef LPVOID LPDEVICE_INFO; typedef LPVOID LPFNADDPROPSHEETPAGE; BOOL WINAPI EnumPropPages(LPDEVICE_INFO pdi, LPFNADDPROPSHEETPAGE pfnAdd, LPARAM lParam ) { - FIXME("(%p %p %lx)\n",pdi,pfnAdd,lParam); + FIXME("(%p %p %Ix)\n",pdi,pfnAdd,lParam); return FALSE; } @@ -170,13 +170,13 @@ static BOOL SERIALUI_GetConfItems(HWND hDlg, DWORD id, LPCPARAM2STR table, LPDWO if( (!hControl) || (!lpdwVal)) { - TRACE("Couldn't get window handle for item %x\n",id); + TRACE("Couldn't get window handle for item %lx\n",id); return FALSE; } if(!GetWindowTextA(hControl, &lpEntry[0], sizeof(lpEntry))) { - TRACE("Couldn't get window text for item %x\n",id); + TRACE("Couldn't get window text for item %lx\n",id); return FALSE; } /* TRACE("%ld contains %s\n",id, lpEntry); */ @@ -286,7 +286,7 @@ static void SERIALUI_DialogInfoToDCB(HWND hDlg, SERIALUI_DialogInfo *info) SERIALUI_GetConfItems( hDlg, IDC_DATA, &SERIALUI_Data2Str, &dwByteSize); SERIALUI_GetConfItems( hDlg, IDC_FLOW, &SERIALUI_Flow2Str, &dwFlowControl ); - TRACE("baud=%d stop=%d parity=%d data=%d flow=%d\n", + TRACE("baud=%ld stop=%ld parity=%ld data=%ld flow=%ld\n", dwBaudRate, dwStopBits, dwParity, dwByteSize, dwFlowControl); lpdcb->BaudRate = dwBaudRate; @@ -477,7 +477,7 @@ BOOL WINAPI drvSetDefaultCommConfigW( WCHAR szKeyName[100]; DWORD r,dwDCBSize; - TRACE("%p %p %x\n",lpszDevice,lpCommConfig,dwSize); + TRACE("%p %p %lx\n",lpszDevice,lpCommConfig,dwSize); if(!lpCommConfig) return FALSE; @@ -495,7 +495,7 @@ BOOL WINAPI drvSetDefaultCommConfigW( { dwDCBSize = sizeof (DCB); r = RegSetValueExW(hKeyPort, L"DCB", 0, REG_BINARY, (BYTE *)&lpCommConfig->dcb, dwDCBSize); - TRACE("write key r=%d\n",r); + TRACE("write key r=%ld\n",r); RegCloseKey(hKeyPort); } @@ -530,7 +530,7 @@ DWORD WINAPI drvGetDefaultCommConfigW( WCHAR szKeyName[100]; DWORD r,dwSize,dwType; - TRACE("(%s, %p, %p) *lpdwSize: %u\n", debugstr_w(lpszDevice), lpCommConfig, lpdwSize, lpdwSize ? *lpdwSize : 0); + TRACE("(%s, %p, %p) *lpdwSize: %lu\n", debugstr_w(lpszDevice), lpCommConfig, lpdwSize, lpdwSize ? *lpdwSize : 0); if ((!lpszDevice) || (!lpCommConfig) || (!lpdwSize)) { return ERROR_INVALID_PARAMETER;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/setupapi/Makefile.in | 2 - dlls/setupapi/devinst.c | 160 ++++++++++++++++++++++--------------------- dlls/setupapi/dialog.c | 6 +- dlls/setupapi/dirid.c | 4 + dlls/setupapi/diskspace.c | 2 - dlls/setupapi/fakedll.c | 16 ++-- dlls/setupapi/install.c | 18 ++--- dlls/setupapi/misc.c | 16 ++-- dlls/setupapi/parser.c | 10 +-- dlls/setupapi/query.c | 24 +++--- dlls/setupapi/queue.c | 32 ++++----- dlls/setupapi/setupcab.c | 4 + dlls/setupapi/stringtable.c | 14 ++-- dlls/setupapi/stubs.c | 100 +++++++++++++-------------- 14 files changed, 204 insertions(+), 204 deletions(-) diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index f37ec8402cb..d1b647cd5e5 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_SETUPAPI_ +EXTRADEFS = -D_SETUPAPI_ MODULE = setupapi.dll IMPORTLIB = setupapi IMPORTS = uuid version advapi32 rpcrt4 kernelbase diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index ecc0b58ca5c..77fa26726cc 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -273,7 +273,7 @@ static struct device *get_devnode_device(DEVINST devnode) if (devnode < devnode_table_size) return devnode_table[devnode]; - WARN("device node %u not found\n", devnode); + WARN("device node %lu not found\n", devnode); return NULL; } @@ -553,7 +553,7 @@ static LONG open_driver_key(struct device *device, REGSAM access, HKEY *key) if ((l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, ControlClass, 0, NULL, 0, KEY_CREATE_SUB_KEY, NULL, &class_key, NULL))) { - ERR("Failed to open driver class root key, error %u.\n", l); + ERR("Failed to open driver class root key, error %lu.\n", l); return l; } @@ -564,7 +564,7 @@ static LONG open_driver_key(struct device *device, REGSAM access, HKEY *key) RegCloseKey(class_key); return l; } - TRACE("Failed to open driver key, error %u.\n", l); + TRACE("Failed to open driver key, error %lu.\n", l); } RegCloseKey(class_key); @@ -587,7 +587,7 @@ static LONG create_driver_key(struct device *device, HKEY *key) if ((l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, ControlClass, 0, NULL, 0, KEY_CREATE_SUB_KEY, NULL, &class_key, NULL))) { - ERR("Failed to open driver class root key, error %u.\n", l); + ERR("Failed to open driver class root key, error %lu.\n", l); return l; } @@ -608,7 +608,7 @@ static LONG create_driver_key(struct device *device, HKEY *key) } RegCloseKey(*key); } - ERR("Failed to create driver key, error %u.\n", l); + ERR("Failed to create driver key, error %lu.\n", l); RegCloseKey(class_key); return l; } @@ -704,7 +704,7 @@ static void remove_all_device_ifaces(struct device *device) if ((ret = RegOpenKeyExW(HKEY_LOCAL_MACHINE, DeviceClasses, 0, KEY_READ, &classes_key))) { - WARN("Failed to open classes key, error %u.\n", ret); + WARN("Failed to open classes key, error %lu.\n", ret); return; } @@ -717,13 +717,13 @@ static void remove_all_device_ifaces(struct device *device) len = ARRAY_SIZE(class_name); if ((ret = RegEnumKeyExW(classes_key, i, class_name, &len, NULL, NULL, NULL, NULL))) { - if (ret != ERROR_NO_MORE_ITEMS) ERR("Failed to enumerate classes, error %u.\n", ret); + if (ret != ERROR_NO_MORE_ITEMS) ERR("Failed to enumerate classes, error %lu.\n", ret); break; } if ((ret = RegOpenKeyExW(classes_key, class_name, 0, KEY_READ, &class_key))) { - ERR("Failed to open class %s, error %u.\n", debugstr_w(class_name), ret); + ERR("Failed to open class %s, error %lu.\n", debugstr_w(class_name), ret); continue; } @@ -735,20 +735,20 @@ static void remove_all_device_ifaces(struct device *device) len = ARRAY_SIZE(iface_name); if ((ret = RegEnumKeyExW(class_key, j, iface_name, &len, NULL, NULL, NULL, NULL))) { - if (ret != ERROR_NO_MORE_ITEMS) ERR("Failed to enumerate interfaces, error %u.\n", ret); + if (ret != ERROR_NO_MORE_ITEMS) ERR("Failed to enumerate interfaces, error %lu.\n", ret); break; } if ((ret = RegOpenKeyExW(class_key, iface_name, 0, KEY_ALL_ACCESS, &iface_key))) { - ERR("Failed to open interface %s, error %u.\n", debugstr_w(iface_name), ret); + ERR("Failed to open interface %s, error %lu.\n", debugstr_w(iface_name), ret); continue; } len = sizeof(device_name); if ((ret = RegQueryValueExW(iface_key, L"DeviceInstance", NULL, NULL, (BYTE *)device_name, &len))) { - ERR("Failed to query device instance, error %u.\n", ret); + ERR("Failed to query device instance, error %lu.\n", ret); RegCloseKey(iface_key); continue; } @@ -756,9 +756,9 @@ static void remove_all_device_ifaces(struct device *device) if (!wcsicmp(device_name, device->instanceId)) { if ((ret = RegDeleteTreeW(iface_key, NULL))) - ERR("Failed to delete interface %s subkeys, error %u.\n", debugstr_w(iface_name), ret); + ERR("Failed to delete interface %s subkeys, error %lu.\n", debugstr_w(iface_name), ret); if ((ret = RegDeleteKeyW(iface_key, L""))) - ERR("Failed to delete interface %s, error %u.\n", debugstr_w(iface_name), ret); + ERR("Failed to delete interface %s, error %lu.\n", debugstr_w(iface_name), ret); } RegCloseKey(iface_key); @@ -1030,7 +1030,7 @@ BOOL WINAPI SetupDiBuildClassInfoListExW( NULL, NULL, NULL); - TRACE("RegEnumKeyExW() returns %d\n", lError); + TRACE("RegEnumKeyExW() returns %ld\n", lError); if (lError == ERROR_SUCCESS || lError == ERROR_MORE_DATA) { TRACE("Key name: %p\n", szKeyName); @@ -1230,7 +1230,7 @@ BOOL WINAPI SetupDiClassGuidsFromNameExW( NULL, NULL, NULL); - TRACE("RegEnumKeyExW() returns %d\n", lError); + TRACE("RegEnumKeyExW() returns %ld\n", lError); if (lError == ERROR_SUCCESS || lError == ERROR_MORE_DATA) { TRACE("Key name: %p\n", szKeyName); @@ -1527,7 +1527,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyA( PWSTR InfSectionNameW = NULL; HKEY key; - TRACE("%p %p %d %d %d %p %s\n", DeviceInfoSet, DeviceInfoData, Scope, + TRACE("%p %p %ld %ld %ld %p %s\n", DeviceInfoSet, DeviceInfoData, Scope, HwProfile, KeyType, InfHandle, debugstr_a(InfSectionName)); if (InfHandle) @@ -1559,7 +1559,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_da HKEY key = INVALID_HANDLE_VALUE; LONG l; - TRACE("devinfo %p, device_data %p, scope %d, profile %d, type %d, inf_handle %p, inf_section %s.\n", + TRACE("devinfo %p, device_data %p, scope %ld, profile %ld, type %ld, inf_handle %p, inf_section %s.\n", devinfo, device_data, Scope, HwProfile, KeyType, InfHandle, debugstr_w(InfSectionName)); if (!(device = get_device(devinfo, device_data))) @@ -1581,7 +1581,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_da return INVALID_HANDLE_VALUE; } if (Scope != DICS_FLAG_GLOBAL) - FIXME("unimplemented for scope %d\n", Scope); + FIXME("unimplemented for scope %ld\n", Scope); switch (KeyType) { case DIREG_DEV: @@ -1592,7 +1592,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_da l = create_driver_key(device, &key); break; default: - FIXME("Unhandled type %#x.\n", KeyType); + FIXME("Unhandled type %#lx.\n", KeyType); l = ERROR_CALL_NOT_IMPLEMENTED; } if (InfHandle) @@ -1649,7 +1649,7 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO devinfo, const WCHAR *name, const struct device *device; LONG l; - TRACE("devinfo %p, name %s, class %s, description %s, hwnd %p, flags %#x, device_data %p.\n", + TRACE("devinfo %p, name %s, class %s, description %s, hwnd %p, flags %#lx, device_data %p.\n", devinfo, debugstr_w(name), debugstr_guid(class), debugstr_w(description), parent, flags, device_data); @@ -1756,7 +1756,7 @@ BOOL WINAPI SetupDiRegisterDeviceInfo(HDEVINFO devinfo, SP_DEVINFO_DATA *device_ { struct device *device; - TRACE("devinfo %p, data %p, flags %#x, compare_proc %p, context %p, duplicate_data %p.\n", + TRACE("devinfo %p, data %p, flags %#lx, compare_proc %p, context %p, duplicate_data %p.\n", devinfo, device_data, flags, compare_proc, context, duplicate_data); if (!(device = get_device(devinfo, device_data))) @@ -1801,7 +1801,7 @@ BOOL WINAPI SetupDiRemoveDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) { SERVICE_STATUS status; if (!ControlService(service, SERVICE_CONTROL_REENUMERATE_ROOT_DEVICES, &status)) - ERR("Failed to control service %s, error %u.\n", debugstr_w(service_name), GetLastError()); + ERR("Failed to control service %s, error %lu.\n", debugstr_w(service_name), GetLastError()); CloseServiceHandle(service); } CloseServiceHandle(manager); @@ -1873,7 +1873,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetupDiEnumDeviceInfo(HDEVINFO devinfo, DWORD inde struct device *device; DWORD i = 0; - TRACE("devinfo %p, index %d, device_data %p\n", devinfo, index, device_data); + TRACE("devinfo %p, index %ld, device_data %p\n", devinfo, index, device_data); if (!(set = get_device_set(devinfo))) return FALSE; @@ -1911,7 +1911,7 @@ BOOL WINAPI SetupDiGetDeviceInstanceIdA(HDEVINFO devinfo, SP_DEVINFO_DATA *devic { WCHAR idW[MAX_DEVICE_ID_LEN]; - TRACE("devinfo %p, device_data %p, id %p, size %d, needed %p.\n", + TRACE("devinfo %p, device_data %p, id %p, size %ld, needed %p.\n", devinfo, device_data, id, size, needed); if (!SetupDiGetDeviceInstanceIdW(devinfo, device_data, idW, ARRAY_SIZE(idW), NULL)) @@ -1935,7 +1935,7 @@ BOOL WINAPI SetupDiGetDeviceInstanceIdW(HDEVINFO devinfo, SP_DEVINFO_DATA *devic { struct device *device; - TRACE("devinfo %p, device_data %p, DeviceInstanceId %p, DeviceInstanceIdSize %d, RequiredSize %p.\n", + TRACE("devinfo %p, device_data %p, DeviceInstanceId %p, DeviceInstanceIdSize %ld, RequiredSize %p.\n", devinfo, device_data, DeviceInstanceId, DeviceInstanceIdSize, RequiredSize); if (!(device = get_device(devinfo, device_data))) @@ -2010,7 +2010,7 @@ BOOL WINAPI SetupDiGetActualSectionToInstallExW(HINF hinf, const WCHAR *section, DWORD full_len; LONG line_count = -1; - TRACE("hinf %p, section %s, altplatform %p, ext %p, size %d, needed %p, extptr %p, reserved %p.\n", + TRACE("hinf %p, section %s, altplatform %p, ext %p, size %ld, needed %p, extptr %p, reserved %p.\n", hinf, debugstr_w(section), altplatform, section_ext, size, needed, extptr, reserved); if (altplatform) @@ -2127,7 +2127,7 @@ BOOL WINAPI SetupDiGetClassDescriptionExA( Reserved); if (hKey == INVALID_HANDLE_VALUE) { - WARN("SetupDiOpenClassRegKeyExA() failed (Error %u)\n", GetLastError()); + WARN("SetupDiOpenClassRegKeyExA() failed (Error %lu)\n", GetLastError()); return FALSE; } @@ -2161,7 +2161,7 @@ BOOL WINAPI SetupDiGetClassDescriptionExW( Reserved); if (hKey == INVALID_HANDLE_VALUE) { - WARN("SetupDiOpenClassRegKeyExW() failed (Error %u)\n", GetLastError()); + WARN("SetupDiOpenClassRegKeyExW() failed (Error %lu)\n", GetLastError()); return FALSE; } @@ -2371,7 +2371,7 @@ static void SETUPDI_EnumerateInterfaces(HDEVINFO DeviceInfoSet, HKEY interfacesKey = SetupDiOpenClassRegKeyExW(guid, KEY_READ, DIOCR_INTERFACE, NULL, NULL); - TRACE("%p, %s, %s, %08x\n", DeviceInfoSet, debugstr_guid(guid), + TRACE("%p, %s, %s, %08lx\n", DeviceInfoSet, debugstr_guid(guid), debugstr_w(enumstr), flags); if (interfacesKey != INVALID_HANDLE_VALUE) @@ -2520,7 +2520,7 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class, HKEY enumKey; LONG l; - TRACE("%p, %s, %s, %08x\n", DeviceInfoSet, debugstr_guid(class), + TRACE("%p, %s, %s, %08lx\n", DeviceInfoSet, debugstr_guid(class), debugstr_w(enumstr), flags); l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, KEY_READ, NULL, @@ -2603,7 +2603,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsExW(const GUID *class, PCWSTR enumstr, HWND p static const DWORD unsupportedFlags = DIGCF_DEFAULT | DIGCF_PROFILE; HDEVINFO set; - TRACE("%s %s %p 0x%08x %p %s %p\n", debugstr_guid(class), + TRACE("%s %s %p 0x%08lx %p %s %p\n", debugstr_guid(class), debugstr_w(enumstr), parent, flags, deviceset, debugstr_w(machine), reserved); @@ -2616,7 +2616,7 @@ HDEVINFO WINAPI SetupDiGetClassDevsExW(const GUID *class, PCWSTR enumstr, HWND p class = NULL; if (flags & unsupportedFlags) - WARN("unsupported flags %08x\n", flags & unsupportedFlags); + WARN("unsupported flags %08lx\n", flags & unsupportedFlags); if (deviceset) set = deviceset; else @@ -2696,7 +2696,7 @@ BOOL WINAPI SetupDiCreateDeviceInterfaceA( BOOL ret; LPWSTR ReferenceStringW = NULL; - TRACE("%p %p %s %s %08x %p\n", DeviceInfoSet, DeviceInfoData, + TRACE("%p %p %s %s %08lx %p\n", DeviceInfoSet, DeviceInfoData, debugstr_guid(InterfaceClassGuid), debugstr_a(ReferenceString), CreationFlags, DeviceInterfaceData); @@ -2724,7 +2724,7 @@ BOOL WINAPI SetupDiCreateDeviceInterfaceW(HDEVINFO devinfo, SP_DEVINFO_DATA *dev struct device *device; struct device_iface *iface; - TRACE("devinfo %p, device_data %p, class %s, refstr %s, flags %#x, iface_data %p.\n", + TRACE("devinfo %p, device_data %p, class %s, refstr %s, flags %#lx, iface_data %p.\n", devinfo, device_data, debugstr_guid(class), debugstr_w(refstr), flags, iface_data); if (!(device = get_device(devinfo, device_data))) @@ -2766,7 +2766,7 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyA( HKEY key; PWSTR InfSectionNameW = NULL; - TRACE("%p %p %d %08x %p %p\n", DeviceInfoSet, DeviceInterfaceData, Reserved, + TRACE("%p %p %ld %08lx %p %p\n", DeviceInfoSet, DeviceInterfaceData, Reserved, samDesired, InfHandle, InfSectionName); if (InfHandle) { @@ -2802,7 +2802,7 @@ HKEY WINAPI SetupDiCreateDeviceInterfaceRegKeyW(HDEVINFO devinfo, HKEY params_key; LONG ret; - TRACE("devinfo %p, iface_data %p, reserved %d, access %#x, hinf %p, section %s.\n", + TRACE("devinfo %p, iface_data %p, reserved %ld, access %#lx, hinf %p, section %s.\n", devinfo, iface_data, reserved, access, hinf, debugstr_w(section)); if (!(iface = get_device_iface(devinfo, iface_data))) @@ -2833,7 +2833,7 @@ BOOL WINAPI SetupDiDeleteDeviceInterfaceRegKey(HDEVINFO devinfo, struct device_iface *iface; LONG ret; - TRACE("devinfo %p, iface_data %p, reserved %d.\n", devinfo, iface_data, reserved); + TRACE("devinfo %p, iface_data %p, reserved %ld.\n", devinfo, iface_data, reserved); if (!(iface = get_device_iface(devinfo, iface_data))) return FALSE; @@ -2880,7 +2880,7 @@ BOOL WINAPI SetupDiEnumDeviceInterfaces(HDEVINFO devinfo, struct device_iface *iface; DWORD i = 0; - TRACE("devinfo %p, device_data %p, class %s, index %u, iface_data %p.\n", + TRACE("devinfo %p, device_data %p, class %s, index %lu, iface_data %p.\n", devinfo, device_data, debugstr_guid(class), index, iface_data); if (!iface_data || iface_data->cbSize != sizeof(SP_DEVICE_INTERFACE_DATA)) @@ -2980,7 +2980,7 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO devinfo, SP_DEVICE_INTERFA DWORD bytesNeeded = FIELD_OFFSET(SP_DEVICE_INTERFACE_DETAIL_DATA_A, DevicePath[1]); BOOL ret = FALSE; - TRACE("devinfo %p, iface_data %p, detail_data %p, size %d, needed %p, device_data %p.\n", + TRACE("devinfo %p, iface_data %p, detail_data %p, size %ld, needed %p, device_data %p.\n", devinfo, iface_data, DeviceInterfaceDetailData, DeviceInterfaceDetailDataSize, RequiredSize, device_data); @@ -3040,7 +3040,7 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO devinfo, SP_DEVICE_INTERFA + sizeof(WCHAR); /* include NULL terminator */ BOOL ret = FALSE; - TRACE("devinfo %p, iface_data %p, detail_data %p, size %d, needed %p, device_data %p.\n", + TRACE("devinfo %p, iface_data %p, detail_data %p, size %ld, needed %p, device_data %p.\n", devinfo, iface_data, DeviceInterfaceDetailData, DeviceInterfaceDetailDataSize, RequiredSize, device_data); @@ -3094,7 +3094,7 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyA(HDEVINFO devinfo, BOOL ret = FALSE; struct device *device; - TRACE("devinfo %p, device_data %p, property %d, type %p, buffer %p, size %d, required %p\n", + TRACE("devinfo %p, device_data %p, property %ld, type %p, buffer %p, size %ld, required %p\n", devinfo, device_data, Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, RequiredSize); if (!(device = get_device(devinfo, device_data))) @@ -3136,7 +3136,7 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW(HDEVINFO devinfo, BOOL ret = FALSE; struct device *device; - TRACE("devinfo %p, device_data %p, prop %d, type %p, buffer %p, size %d, required %p\n", + TRACE("devinfo %p, device_data %p, prop %ld, type %p, buffer %p, size %ld, required %p\n", devinfo, device_data, Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, RequiredSize); if (!(device = get_device(devinfo, device_data))) @@ -3177,7 +3177,7 @@ BOOL WINAPI SetupDiSetDeviceRegistryPropertyA(HDEVINFO devinfo, SP_DEVINFO_DATA BOOL ret = FALSE; struct device *device; - TRACE("devinfo %p, device_data %p, prop %d, buffer %p, size %d.\n", + TRACE("devinfo %p, device_data %p, prop %ld, buffer %p, size %ld.\n", devinfo, device_data, Property, PropertyBuffer, PropertyBufferSize); if (!(device = get_device(devinfo, device_data))) @@ -3204,7 +3204,7 @@ BOOL WINAPI SetupDiSetDeviceRegistryPropertyW(HDEVINFO devinfo, { struct device *device; - TRACE("devinfo %p, device_data %p, prop %d, buffer %p, size %d.\n", + TRACE("devinfo %p, device_data %p, prop %ld, buffer %p, size %ld.\n", devinfo, device_data, prop, buffer, size); if (!(device = get_device(devinfo, device_data))) @@ -3544,7 +3544,7 @@ BOOL WINAPI SetupDiOpenDeviceInfoA(HDEVINFO devinfo, PCSTR instance_id, HWND hwn { WCHAR instance_idW[MAX_DEVICE_ID_LEN]; - TRACE("%p %s %p 0x%08x %p\n", devinfo, debugstr_a(instance_id), hwnd_parent, flags, device_data); + TRACE("%p %s %p 0x%08lx %p\n", devinfo, debugstr_a(instance_id), hwnd_parent, flags, device_data); if (!instance_id || strlen(instance_id) >= MAX_DEVICE_ID_LEN) { @@ -3572,7 +3572,7 @@ BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO devinfo, PCWSTR instance_id, HWND hw DWORD size; DWORD error = ERROR_NO_SUCH_DEVINST; - TRACE("%p %s %p 0x%08x %p\n", devinfo, debugstr_w(instance_id), hwnd_parent, flags, device_data); + TRACE("%p %s %p 0x%08lx %p\n", devinfo, debugstr_w(instance_id), hwnd_parent, flags, device_data); if (!(set = get_device_set(devinfo))) return FALSE; @@ -3587,7 +3587,7 @@ BOOL WINAPI SetupDiOpenDeviceInfoW(HDEVINFO devinfo, PCWSTR instance_id, HWND hw FIXME("hwnd_parent unsupported\n"); if (flags) - FIXME("flags unsupported: 0x%08x\n", flags); + FIXME("flags unsupported: 0x%08lx\n", flags); RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &enumKey, NULL); /* Instance needs to be already existent in registry, if not, report ERROR_NO_SUCH_DEVINST */ @@ -3641,7 +3641,7 @@ BOOL WINAPI SetupDiOpenDeviceInterfaceW( DWORD OpenFlags, PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData) { - FIXME("%p %s %08x %p\n", + FIXME("%p %s %08lx %p\n", DeviceInfoSet, debugstr_w(DevicePath), OpenFlags, DeviceInterfaceData); return FALSE; } @@ -3655,7 +3655,7 @@ BOOL WINAPI SetupDiOpenDeviceInterfaceA( DWORD OpenFlags, PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData) { - FIXME("%p %s %08x %p\n", DeviceInfoSet, + FIXME("%p %s %08lx %p\n", DeviceInfoSet, debugstr_a(DevicePath), OpenFlags, DeviceInterfaceData); return FALSE; } @@ -3670,7 +3670,7 @@ HKEY WINAPI SetupDiOpenDeviceInterfaceRegKey(HDEVINFO devinfo, PSP_DEVICE_INTERF LSTATUS lr; HKEY key; - TRACE("devinfo %p, iface_data %p, reserved %d, access %#x.\n", devinfo, iface_data, reserved, access); + TRACE("devinfo %p, iface_data %p, reserved %ld, access %#lx.\n", devinfo, iface_data, reserved, access); if (!(iface = get_device_iface(devinfo, iface_data))) return INVALID_HANDLE_VALUE; @@ -3694,7 +3694,7 @@ BOOL WINAPI SetupDiSetClassInstallParamsA( PSP_CLASSINSTALL_HEADER ClassInstallParams, DWORD ClassInstallParamsSize) { - FIXME("%p %p %x %u\n",DeviceInfoSet, DeviceInfoData, + FIXME("%p %p %x %lu\n",DeviceInfoSet, DeviceInfoData, ClassInstallParams->InstallFunction, ClassInstallParamsSize); return FALSE; } @@ -3708,7 +3708,7 @@ BOOL WINAPI SetupDiSetClassInstallParamsW( PSP_CLASSINSTALL_HEADER ClassInstallParams, DWORD ClassInstallParamsSize) { - FIXME("%p %p %x %u\n",DeviceInfoSet, DeviceInfoData, + FIXME("%p %p %x %lu\n",DeviceInfoSet, DeviceInfoData, ClassInstallParams->InstallFunction, ClassInstallParamsSize); return FALSE; } @@ -3743,12 +3743,12 @@ static BOOL call_coinstallers(WCHAR *list, DI_FUNCTION function, HDEVINFO devinf memset(&coinst_ctx, 0, sizeof(coinst_ctx)); TRACE("Calling co-installer %p.\n", coinst_proc); ret = coinst_proc(function, devinfo, device_data, &coinst_ctx); - TRACE("Co-installer %p returned %#x.\n", coinst_proc, ret); + TRACE("Co-installer %p returned %#lx.\n", coinst_proc, ret); if (ret == ERROR_DI_POSTPROCESSING_REQUIRED) FIXME("Co-installer postprocessing not implemented.\n"); else if (ret) { - ERR("Co-installer returned error %#x.\n", ret); + ERR("Co-installer returned error %#lx.\n", ret); FreeLibrary(module); SetLastError(ret); return FALSE; @@ -3841,7 +3841,7 @@ BOOL WINAPI SetupDiCallClassInstaller(DI_FUNCTION function, HDEVINFO devinfo, SP { TRACE("Calling class installer %p.\n", classinst_proc); ret = classinst_proc(function, devinfo, device_data); - TRACE("Class installer %p returned %#x.\n", classinst_proc, ret); + TRACE("Class installer %p returned %#lx.\n", classinst_proc, ret); } FreeLibrary(module); } @@ -3997,7 +3997,7 @@ BOOL WINAPI SetupDiSetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_ WCHAR property_hkey_path[44]; LSTATUS ls; - TRACE("%p %p %p %#x %p %d %#x\n", devinfo, device_data, key, type, buffer, size, flags); + TRACE("%p %p %p %#lx %p %ld %#lx\n", devinfo, device_data, key, type, buffer, size, flags); if (!(device = get_device(devinfo, device_data))) return FALSE; @@ -4076,7 +4076,7 @@ HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, HKEY key = INVALID_HANDLE_VALUE; LONG l; - TRACE("devinfo %p, device_data %p, scope %d, profile %d, type %d, access %#x.\n", + TRACE("devinfo %p, device_data %p, scope %ld, profile %ld, type %ld, access %#lx.\n", devinfo, device_data, Scope, HwProfile, KeyType, samDesired); if (!(device = get_device(devinfo, device_data))) @@ -4099,7 +4099,7 @@ HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, return INVALID_HANDLE_VALUE; } if (Scope != DICS_FLAG_GLOBAL) - FIXME("unimplemented for scope %d\n", Scope); + FIXME("unimplemented for scope %ld\n", Scope); switch (KeyType) { case DIREG_DEV: @@ -4109,7 +4109,7 @@ HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, l = open_driver_key(device, samDesired, &key); break; default: - FIXME("Unhandled type %#x.\n", KeyType); + FIXME("Unhandled type %#lx.\n", KeyType); l = ERROR_CALL_NOT_IMPLEMENTED; } SetLastError(l == ERROR_FILE_NOT_FOUND ? ERROR_KEY_DOES_NOT_EXIST : l); @@ -4125,7 +4125,7 @@ BOOL WINAPI SetupDiDeleteDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat struct device *device; LONG l; - TRACE("devinfo %p, device_data %p, scope %d, profile %d, type %d.\n", + TRACE("devinfo %p, device_data %p, scope %ld, profile %ld, type %ld.\n", devinfo, device_data, Scope, HwProfile, KeyType); if (!(device = get_device(devinfo, device_data))) @@ -4148,7 +4148,7 @@ BOOL WINAPI SetupDiDeleteDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat return FALSE; } if (Scope != DICS_FLAG_GLOBAL) - FIXME("unimplemented for scope %d\n", Scope); + FIXME("unimplemented for scope %ld\n", Scope); switch (KeyType) { case DIREG_DRV: @@ -4162,7 +4162,7 @@ BOOL WINAPI SetupDiDeleteDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat l = RegDeleteKeyW(device->key, DeviceParameters); break; default: - FIXME("Unhandled type %#x.\n", KeyType); + FIXME("Unhandled type %#lx.\n", KeyType); l = ERROR_CALL_NOT_IMPLEMENTED; } SetLastError(l); @@ -4176,7 +4176,7 @@ CONFIGRET WINAPI CM_Get_Device_IDA(DEVINST devnode, char *buffer, ULONG len, ULO { struct device *device = get_devnode_device(devnode); - TRACE("%u, %p, %u, %#x\n", devnode, buffer, len, flags); + TRACE("%lu, %p, %lu, %#lx\n", devnode, buffer, len, flags); if (!device) return CR_NO_SUCH_DEVINST; @@ -4193,7 +4193,7 @@ CONFIGRET WINAPI CM_Get_Device_IDW(DEVINST devnode, WCHAR *buffer, ULONG len, UL { struct device *device = get_devnode_device(devnode); - TRACE("%u, %p, %u, %#x\n", devnode, buffer, len, flags); + TRACE("%lu, %p, %lu, %#lx\n", devnode, buffer, len, flags); if (!device) return CR_NO_SUCH_DEVINST; @@ -4210,7 +4210,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_Size(ULONG *len, DEVINST devnode, ULONG flags) { struct device *device = get_devnode_device(devnode); - TRACE("%p, %u, %#x\n", len, devnode, flags); + TRACE("%p, %lu, %#lx\n", len, devnode, flags); if (!device) return CR_NO_SUCH_DEVINST; @@ -4386,7 +4386,7 @@ static LSTATUS get_device_property(struct device *device, const DEVPROPKEY *prop default: *prop_type = DEVPROP_TYPE_EMPTY; value_size = 0; - FIXME("Unhandled error %#x\n", ls); + FIXME("Unhandled error %#lx\n", ls); break; } @@ -4406,7 +4406,7 @@ BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_ struct device *device; LSTATUS ls; - TRACE("%p, %p, %p, %p, %p, %d, %p, %#x\n", devinfo, device_data, prop_key, prop_type, prop_buff, prop_buff_size, + TRACE("%p, %p, %p, %p, %p, %ld, %p, %#lx\n", devinfo, device_data, prop_key, prop_type, prop_buff, prop_buff_size, required_size, flags); if (!(device = get_device(devinfo, device_data))) @@ -4427,7 +4427,7 @@ CONFIGRET WINAPI CM_Get_DevNode_Property_ExW(DEVINST devnode, const DEVPROPKEY * struct device *device = get_devnode_device(devnode); LSTATUS ls; - TRACE("%u, %p, %p, %p, %p, %#x, %p\n", devnode, prop_key, prop_type, prop_buff, prop_buff_size, + TRACE("%lu, %p, %p, %p, %p, %#lx, %p\n", devnode, prop_key, prop_type, prop_buff, prop_buff_size, flags, machine); if (machine) @@ -4517,13 +4517,13 @@ BOOL WINAPI SetupDiInstallDeviceInterfaces(HDEVINFO devinfo, SP_DEVINFO_DATA *de if (!(iface = SETUPDI_CreateDeviceInterface(device, &iface_guid, refstr))) { - ERR("Failed to create device interface, error %#x.\n", GetLastError()); + ERR("Failed to create device interface, error %#lx.\n", GetLastError()); continue; } if ((l = create_iface_key(iface, KEY_ALL_ACCESS, &iface_key))) { - ERR("Failed to create interface key, error %u.\n", l); + ERR("Failed to create interface key, error %lu.\n", l); continue; } @@ -4708,7 +4708,7 @@ static void enum_compat_drivers_from_file(struct device *device, const WCHAR *pa SetupGetStringFieldW(&ctx, 0, driver.description, ARRAY_SIZE(driver.description), NULL); SetupGetStringFieldW(&ctx, 1, driver.section, ARRAY_SIZE(driver.section), NULL); - TRACE("Found compatible driver: rank %#x manufacturer %s, desc %s.\n", + TRACE("Found compatible driver: rank %#lx manufacturer %s, desc %s.\n", driver.rank, debugstr_w(driver.manufacturer), debugstr_w(driver.description)); driver_count++; @@ -4731,11 +4731,11 @@ BOOL WINAPI SetupDiBuildDriverInfoList(HDEVINFO devinfo, SP_DEVINFO_DATA *device { struct device *device; - TRACE("devinfo %p, device_data %p, type %#x.\n", devinfo, device_data, type); + TRACE("devinfo %p, device_data %p, type %#lx.\n", devinfo, device_data, type); if (type != SPDIT_COMPATDRIVER) { - FIXME("Unhandled type %#x.\n", type); + FIXME("Unhandled type %#lx.\n", type); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -4832,12 +4832,12 @@ BOOL WINAPI SetupDiEnumDriverInfoW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat { struct device *device; - TRACE("devinfo %p, device_data %p, type %#x, index %u, driver_data %p.\n", + TRACE("devinfo %p, device_data %p, type %#lx, index %lu, driver_data %p.\n", devinfo, device_data, type, index, driver_data); if (type != SPDIT_COMPATDRIVER) { - FIXME("Unhandled type %#x.\n", type); + FIXME("Unhandled type %#lx.\n", type); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -4898,7 +4898,7 @@ BOOL WINAPI SetupDiSelectBestCompatDrv(HDEVINFO devinfo, SP_DEVINFO_DATA *device best = device->drivers + i; } - TRACE("selected driver: rank %#x manufacturer %s, desc %s.\n", + TRACE("selected driver: rank %#lx manufacturer %s, desc %s.\n", best->rank, debugstr_w(best->manufacturer), debugstr_w(best->description)); device->selected_driver = best; @@ -4953,7 +4953,7 @@ BOOL WINAPI SetupDiGetDriverInfoDetailW(HDEVINFO devinfo, SP_DEVINFO_DATA *devic HANDLE file; HINF hinf; - TRACE("devinfo %p, device_data %p, driver_data %p, detail_data %p, size %u, ret_size %p.\n", + TRACE("devinfo %p, device_data %p, driver_data %p, detail_data %p, size %lu, ret_size %p.\n", devinfo, device_data, driver_data, detail_data, size, ret_size); if ((detail_data || size) && size < sizeof(SP_DRVINFO_DETAIL_DATA_W)) @@ -5026,7 +5026,7 @@ BOOL WINAPI SetupDiGetDriverInfoDetailA(HDEVINFO devinfo, SP_DEVINFO_DATA *devic HANDLE file; HINF hinf; - TRACE("devinfo %p, device_data %p, driver_data %p, detail_data %p, size %u, ret_size %p.\n", + TRACE("devinfo %p, device_data %p, driver_data %p, detail_data %p, size %lu, ret_size %p.\n", devinfo, device_data, driver_data, detail_data, size, ret_size); if ((detail_data || size) && size < sizeof(SP_DRVINFO_DETAIL_DATA_A)) @@ -5261,12 +5261,12 @@ BOOL WINAPI SetupDiInstallDevice(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data) if (!StartServiceW(service, 0, NULL) && GetLastError() != ERROR_SERVICE_ALREADY_RUNNING) { - ERR("Failed to start service %s for device %s, error %u.\n", + ERR("Failed to start service %s for device %s, error %lu.\n", debugstr_w(svc_name), debugstr_w(device->instanceId), GetLastError()); } if (!ControlService(service, SERVICE_CONTROL_REENUMERATE_ROOT_DEVICES, &status)) { - ERR("Failed to control service %s for device %s, error %u.\n", + ERR("Failed to control service %s for device %s, error %lu.\n", debugstr_w(svc_name), debugstr_w(device->instanceId), GetLastError()); } CloseServiceHandle(service); diff --git a/dlls/setupapi/dialog.c b/dlls/setupapi/dialog.c index 494525f11a7..5a0eadcb760 100644 --- a/dlls/setupapi/dialog.c +++ b/dlls/setupapi/dialog.c @@ -101,7 +101,7 @@ static void promptdisk_ok(HWND hwnd, struct promptdisk_params *params) if(params->PathRequiredSize) { *params->PathRequiredSize = requiredSize; - TRACE("returning PathRequiredSize=%d\n",*params->PathRequiredSize); + TRACE("returning PathRequiredSize=%ld\n",*params->PathRequiredSize); } if(!params->PathBuffer) { @@ -187,7 +187,7 @@ UINT WINAPI SetupPromptForDiskA(HWND hwndParent, PCSTR DialogTitle, PCSTR DiskNa WCHAR *FileSoughtW, *TagFileW, PathBufferW[MAX_PATH]; UINT ret, length; - TRACE("%p, %s, %s, %s, %s, %s, 0x%08x, %p, %d, %p\n", hwndParent, debugstr_a(DialogTitle), + TRACE("%p, %s, %s, %s, %s, %s, 0x%08lx, %p, %ld, %p\n", hwndParent, debugstr_a(DialogTitle), debugstr_a(DiskName), debugstr_a(PathToSource), debugstr_a(FileSought), debugstr_a(TagFile), DiskPromptStyle, PathBuffer, PathBufferSize, PathRequiredSize); @@ -231,7 +231,7 @@ UINT WINAPI SetupPromptForDiskW(HWND hwndParent, PCWSTR DialogTitle, PCWSTR Disk struct promptdisk_params params; UINT ret; - TRACE("%p, %s, %s, %s, %s, %s, 0x%08x, %p, %d, %p\n", hwndParent, debugstr_w(DialogTitle), + TRACE("%p, %s, %s, %s, %s, %s, 0x%08lx, %p, %ld, %p\n", hwndParent, debugstr_w(DialogTitle), debugstr_w(DiskName), debugstr_w(PathToSource), debugstr_w(FileSought), debugstr_w(TagFile), DiskPromptStyle, PathBuffer, PathBufferSize, PathRequiredSize); diff --git a/dlls/setupapi/dirid.c b/dlls/setupapi/dirid.c index b28e8b9dffd..a044652773f 100644 --- a/dlls/setupapi/dirid.c +++ b/dlls/setupapi/dirid.c @@ -180,7 +180,7 @@ static const WCHAR *create_printer_dirid( DWORD dirid ) return create_system_dirid( DIRID_COLOR ); case 66004: /* asp files directory */ default: - FIXME( "unsupported dirid %d\n", dirid ); + FIXME( "unsupported dirid %ld\n", dirid ); return get_unknown_dirid(); } len = (lstrlenW(buffer) + 1) * sizeof(WCHAR); @@ -195,7 +195,7 @@ static const WCHAR *get_csidl_dir( DWORD csidl ) if (!SHGetSpecialFolderPathW( NULL, buffer, csidl, TRUE )) { - FIXME( "CSIDL %x not found\n", csidl ); + FIXME( "CSIDL %lx not found\n", csidl ); return get_unknown_dirid(); } len = (lstrlenW(buffer) + 1) * sizeof(WCHAR); diff --git a/dlls/setupapi/diskspace.c b/dlls/setupapi/diskspace.c index f5e79d5327c..f7f6a22ce2d 100644 --- a/dlls/setupapi/diskspace.c +++ b/dlls/setupapi/diskspace.c @@ -53,7 +53,7 @@ HDSKSPC WINAPI SetupCreateDiskSpaceListW(PVOID Reserved1, DWORD Reserved2, UINT WCHAR *ptr; LPDISKSPACELIST list=NULL; - TRACE("(%p, %u, 0x%08x)\n", Reserved1, Reserved2, Flags); + TRACE("(%p, %lu, 0x%08x)\n", Reserved1, Reserved2, Flags); if (Reserved1 || Reserved2 || Flags & ~SPDSL_IGNORE_DISK) { diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index a4b8df4dfb4..075e12f5629 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -395,7 +395,7 @@ static void create_directories( const WCHAR *name ) { *p = 0; if (!CreateDirectoryW(path, NULL)) - TRACE("Couldn't create directory %s - error: %d\n", wine_dbgstr_w(path), GetLastError()); + TRACE("Couldn't create directory %s - error: %ld\n", wine_dbgstr_w(path), GetLastError()); *p = '\\'; p = wcschr(p+1, '\\'); } @@ -507,7 +507,7 @@ static HANDLE create_dest_file( const WCHAR *name, BOOL delete ) h = CreateFileW( name, GENERIC_WRITE, 0, NULL, CREATE_NEW, 0, NULL ); if (h == INVALID_HANDLE_VALUE) - ERR( "failed to create %s (error=%u)\n", debugstr_w(name), GetLastError() ); + ERR( "failed to create %s (error=%lu)\n", debugstr_w(name), GetLastError() ); } return h; } @@ -697,7 +697,7 @@ static BOOL create_manifest( const xmlstr_t *arch, const xmlstr_t *name, const x { TRACE( "creating %s\n", debugstr_w(path) ); ret = (WriteFile( handle, data, len, &written, NULL ) && written == len); - if (!ret) ERR( "failed to write to %s (error=%u)\n", debugstr_w(path), GetLastError() ); + if (!ret) ERR( "failed to write to %s (error=%lu)\n", debugstr_w(path), GetLastError() ); CloseHandle( handle ); if (!ret) DeleteFileW( path ); } @@ -868,7 +868,7 @@ static void register_fake_dll( const WCHAR *name, const void *data, size_t size, if (!registrar) { - ERR( "failed to create IRegistrar: %x\n", hr ); + ERR( "failed to create IRegistrar: %lx\n", hr ); return; } } @@ -879,7 +879,7 @@ static void register_fake_dll( const WCHAR *name, const void *data, size_t size, GetEnvironmentVariableW( L"SystemRoot", buffer, ARRAY_SIZE(buffer) ); IRegistrar_AddReplacement( registrar, L"SystemRoot", buffer ); EnumResourceNamesW( module, L"WINE_REGISTRY", register_resource, (LONG_PTR)&hr ); - if (FAILED(hr)) ERR( "failed to register %s: %x\n", debugstr_w(name), hr ); + if (FAILED(hr)) ERR( "failed to register %s: %lx\n", debugstr_w(name), hr ); } /* copy a fake dll file to the dest directory */ @@ -914,7 +914,7 @@ static int install_fake_dll( WCHAR *dest, WCHAR *file, BOOL delete, struct list TRACE( "%s -> %s\n", debugstr_w(file), debugstr_w(dest) ); ret = (WriteFile( h, data, size, &written, NULL ) && written == size); - if (!ret) ERR( "failed to write to %s (error=%u)\n", debugstr_w(dest), GetLastError() ); + if (!ret) ERR( "failed to write to %s (error=%lu)\n", debugstr_w(dest), GetLastError() ); CloseHandle( h ); if (ret) register_fake_dll( dest, data, size, delay_copy ); else DeleteFileW( dest ); @@ -948,7 +948,7 @@ static void delay_copy_files( struct list *delay_copy ) if (h && h != INVALID_HANDLE_VALUE) { ret = (WriteFile( h, data, size, &written, NULL ) && written == size); - if (!ret) ERR( "failed to write to %s (error=%u)\n", debugstr_w(copy->dest), GetLastError() ); + if (!ret) ERR( "failed to write to %s (error=%lu)\n", debugstr_w(copy->dest), GetLastError() ); CloseHandle( h ); if (!ret) DeleteFileW( copy->dest ); } @@ -1070,7 +1070,7 @@ BOOL create_fake_dll( const WCHAR *name, const WCHAR *source ) ret = (WriteFile( h, buffer, size, &written, NULL ) && written == size); if (ret) register_fake_dll( name, buffer, size, &delay_copy ); - else ERR( "failed to write to %s (error=%u)\n", debugstr_w(name), GetLastError() ); + else ERR( "failed to write to %s (error=%lu)\n", debugstr_w(name), GetLastError() ); } else { diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 3a72c5f527d..532ac6c36a6 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -394,7 +394,7 @@ static BOOL do_reg_operation( HKEY hkey, const WCHAR *value, INFCONTEXT *context if (type == REG_DWORD) { DWORD dw = str ? wcstoul( str, NULL, 0 ) : 0; - TRACE( "setting dword %s to %x\n", debugstr_w(value), dw ); + TRACE( "setting dword %s to %lx\n", debugstr_w(value), dw ); RegSetValueExW( hkey, value, 0, type, (BYTE *)&dw, sizeof(dw) ); } else @@ -414,7 +414,7 @@ static BOOL do_reg_operation( HKEY hkey, const WCHAR *value, INFCONTEXT *context if (size) { if (!(data = HeapAlloc( GetProcessHeap(), 0, size ))) return FALSE; - TRACE( "setting binary data %s len %d\n", debugstr_w(value), size ); + TRACE( "setting binary data %s len %ld\n", debugstr_w(value), size ); SetupGetBinaryField( context, 5, data, size, NULL ); } RegSetValueExW( hkey, value, 0, type, data, size ); @@ -601,7 +601,7 @@ static BOOL do_register_dll( struct register_dll_info *info, const WCHAR *path, if (FAILED(res)) { - WARN( "calling %s in %s returned error %x\n", entry_point, debugstr_w(path), res ); + WARN( "calling %s in %s returned error %lx\n", entry_point, debugstr_w(path), res ); status.FailureCode = SPREG_REGSVR; status.Win32Error = res; goto done; @@ -625,7 +625,7 @@ static BOOL do_register_dll( struct register_dll_info *info, const WCHAR *path, if (FAILED(res)) { - WARN( "calling DllInstall in %s returned error %x\n", debugstr_w(path), res ); + WARN( "calling DllInstall in %s returned error %lx\n", debugstr_w(path), res ); status.FailureCode = SPREG_REGSVR; status.Win32Error = res; goto done; @@ -968,7 +968,7 @@ static BOOL iterate_section_fields( HINF hinf, PCWSTR section, PCWSTR key, goto done; if (!callback( hinf, buffer, arg )) { - WARN("callback failed for %s %s err %d\n", + WARN("callback failed for %s %s err %ld\n", debugstr_w(section), debugstr_w(buffer), GetLastError() ); goto done; } @@ -1331,7 +1331,7 @@ static BOOL add_service( SC_HANDLE scm, HINF hinf, const WCHAR *name, const WCHA /* FIXME: Dependencies field */ /* FIXME: Security field */ - TRACE( "service %s display %s type %x start %x error %x binary %s order %s startname %s flags %x\n", + TRACE( "service %s display %s type %x start %x error %x binary %s order %s startname %s flags %lx\n", debugstr_w(name), debugstr_w(display_name), service_type, start_type, error_control, debugstr_w(binary_path), debugstr_w(load_order), debugstr_w(start_name), flags ); @@ -1406,7 +1406,7 @@ static BOOL add_service( SC_HANDLE scm, HINF hinf, const WCHAR *name, const WCHA CloseServiceHandle( service ); done: - if (!service) WARN( "failed err %u\n", GetLastError() ); + if (!service) WARN( "failed err %lu\n", GetLastError() ); HeapFree( GetProcessHeap(), 0, binary_path ); HeapFree( GetProcessHeap(), 0, display_name ); HeapFree( GetProcessHeap(), 0, start_name ); @@ -1430,7 +1430,7 @@ static BOOL del_service( SC_HANDLE scm, HINF hinf, const WCHAR *name, DWORD flag if (!(service = OpenServiceW( scm, name, SERVICE_STOP | DELETE ))) { if (GetLastError() == ERROR_SERVICE_DOES_NOT_EXIST) return TRUE; - WARN( "cannot open %s err %u\n", debugstr_w(name), GetLastError() ); + WARN( "cannot open %s err %lu\n", debugstr_w(name), GetLastError() ); return FALSE; } if (flags & SPSVCINST_STOPSERVICE) ControlService( service, SERVICE_CONTROL_STOP, &status ); @@ -1558,7 +1558,7 @@ BOOL WINAPI SetupGetInfFileListW(PCWSTR dir, DWORD style, PWSTR buffer, if (style & ~( INF_STYLE_OLDNT | INF_STYLE_WIN4 | INF_STYLE_CACHE_ENABLE | INF_STYLE_CACHE_DISABLE )) { - FIXME( "unknown inf_style(s) 0x%x\n", + FIXME( "unknown inf_style(s) 0x%lx\n", style & ~( INF_STYLE_OLDNT | INF_STYLE_WIN4 | INF_STYLE_CACHE_ENABLE | INF_STYLE_CACHE_DISABLE )); if( outsize ) *outsize = 1; diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 4d3ced2e4ae..f9d34b5353d 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -811,7 +811,7 @@ DWORD WINAPI CMP_WaitNoPendingInstallEvents( DWORD dwTimeout ) if (!warned) { - FIXME("%d\n", dwTimeout); + FIXME("%ld\n", dwTimeout); warned = TRUE; } return WAIT_OBJECT_0; @@ -844,7 +844,7 @@ BOOL WINAPI SetupCopyOEMInfA( PCSTR source, PCSTR location, LPWSTR destW = NULL, sourceW = NULL, locationW = NULL; DWORD size; - TRACE("%s, %s, %d, %d, %p, %d, %p, %p\n", debugstr_a(source), debugstr_a(location), + TRACE("%s, %s, %ld, %ld, %p, %ld, %p, %p\n", debugstr_a(source), debugstr_a(location), media_type, style, dest, buffer_size, required_size, component); if (dest && !(destW = MyMalloc( buffer_size * sizeof(WCHAR) ))) return FALSE; @@ -972,7 +972,7 @@ BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location, DWORD size; HINF hinf; - TRACE("%s, %s, %d, %d, %p, %d, %p, %p\n", debugstr_w(source), debugstr_w(location), + TRACE("%s, %s, %ld, %ld, %p, %ld, %p, %p\n", debugstr_w(source), debugstr_w(location), media_type, style, dest, buffer_size, required_size, filepart); if (!source) @@ -1113,7 +1113,7 @@ BOOL WINAPI SetupUninstallOEMInfA( PCSTR inf_file, DWORD flags, PVOID reserved ) BOOL ret; WCHAR *inf_fileW = NULL; - TRACE("%s, 0x%08x, %p\n", debugstr_a(inf_file), flags, reserved); + TRACE("%s, 0x%08lx, %p\n", debugstr_a(inf_file), flags, reserved); if (inf_file && !(inf_fileW = strdupAtoW( inf_file ))) return FALSE; ret = SetupUninstallOEMInfW( inf_fileW, flags, reserved ); @@ -1129,7 +1129,7 @@ BOOL WINAPI SetupUninstallOEMInfW( PCWSTR inf_file, DWORD flags, PVOID reserved static const WCHAR infW[] = {'\\','i','n','f','\\',0}; WCHAR target[MAX_PATH]; - TRACE("%s, 0x%08x, %p\n", debugstr_w(inf_file), flags, reserved); + TRACE("%s, 0x%08lx, %p\n", debugstr_w(inf_file), flags, reserved); if (!inf_file) { @@ -1313,7 +1313,7 @@ BOOL WINAPI SetupGetFileCompressionInfoExA( PCSTR source, PSTR name, DWORD len, DWORD nb_chars = 0; LPSTR nameA; - TRACE("%s, %p, %d, %p, %p, %p, %p\n", debugstr_a(source), name, len, required, + TRACE("%s, %p, %ld, %p, %p, %p, %p\n", debugstr_a(source), name, len, required, source_size, target_size, type); if (!source || !(sourceW = MultiByteToUnicode( source, CP_ACP ))) return FALSE; @@ -1373,7 +1373,7 @@ BOOL WINAPI SetupGetFileCompressionInfoExW( PCWSTR source, PWSTR name, DWORD len BOOL ret = FALSE; DWORD source_len; - TRACE("%s, %p, %d, %p, %p, %p, %p\n", debugstr_w(source), name, len, required, + TRACE("%s, %p, %ld, %p, %p, %p, %p\n", debugstr_w(source), name, len, required, source_size, target_size, type); if (!source) return FALSE; @@ -1498,7 +1498,7 @@ static DWORD decompress_file_lz( LPCWSTR source, LPCWSTR target ) if ((error = LZCopy( src, dst )) >= 0) ret = ERROR_SUCCESS; else { - WARN("failed to decompress file %d\n", error); + WARN("failed to decompress file %ld\n", error); ret = ERROR_INVALID_DATA; } diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index c81a712ad84..5c3fad6e8e6 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -1341,7 +1341,7 @@ LONG WINAPI SetupGetLineCountW( HINF hinf, PCWSTR section ) if (ret == -1) ret = 0; ret += file->sections[section_index]->nb_lines; } - TRACE( "(%p,%s) returning %d\n", hinf, debugstr_w(section), ret ); + TRACE( "(%p,%s) returning %ld\n", hinf, debugstr_w(section), ret ); SetLastError( (ret == -1) ? ERROR_SECTION_NOT_FOUND : 0 ); return ret; } @@ -1384,7 +1384,7 @@ BOOL WINAPI SetupGetLineByIndexW( HINF hinf, PCWSTR section, DWORD index, INFCON context->Section = section_index; context->Line = index; SetLastError( 0 ); - TRACE( "(%p,%s): returning %d/%d\n", + TRACE( "(%p,%s): returning %d/%ld\n", hinf, debugstr_w(section), section_index, index ); return TRUE; } @@ -1728,7 +1728,7 @@ BOOL WINAPI SetupGetStringFieldA( PINFCONTEXT context, DWORD index, PSTR buffer, } PARSER_string_substA( file, field->text, buffer, size ); - TRACE( "context %p/%p/%d/%d index %d returning %s\n", + TRACE( "context %p/%p/%d/%d index %ld returning %s\n", context->Inf, context->CurrentInf, context->Section, context->Line, index, debugstr_a(buffer) ); } @@ -1759,7 +1759,7 @@ BOOL WINAPI SetupGetStringFieldW( PINFCONTEXT context, DWORD index, PWSTR buffer } PARSER_string_substW( file, field->text, buffer, size ); - TRACE( "context %p/%p/%d/%d index %d returning %s\n", + TRACE( "context %p/%p/%d/%d index %ld returning %s\n", context->Inf, context->CurrentInf, context->Section, context->Line, index, debugstr_w(buffer) ); } @@ -1858,7 +1858,7 @@ BOOL WINAPI SetupGetBinaryField( PINFCONTEXT context, DWORD index, BYTE *buffer, } buffer[i - index] = value; } - TRACE( "%p/%p/%d/%d index %d\n", + TRACE( "%p/%p/%d/%d index %ld\n", context->Inf, context->CurrentInf, context->Section, context->Line, index ); return TRUE; } diff --git a/dlls/setupapi/query.c b/dlls/setupapi/query.c index 828d8a1145a..b25bd883cc6 100644 --- a/dlls/setupapi/query.c +++ b/dlls/setupapi/query.c @@ -168,7 +168,7 @@ BOOL WINAPI SetupGetInfInformationW(LPCVOID InfSpec, DWORD SearchControl, BOOL ret; DWORD infSize; - TRACE("(%p, %d, %p, %d, %p)\n", InfSpec, SearchControl, ReturnBuffer, + TRACE("(%p, %ld, %p, %ld, %p)\n", InfSpec, SearchControl, ReturnBuffer, ReturnBufferSize, RequiredSize); if (!InfSpec) @@ -195,7 +195,7 @@ BOOL WINAPI SetupGetInfInformationW(LPCVOID InfSpec, DWORD SearchControl, inf = search_for_inf(InfSpec, SearchControl); break; case INFINFO_INF_PATH_LIST_SEARCH: - FIXME("Unhandled search control: %d\n", SearchControl); + FIXME("Unhandled search control: %ld\n", SearchControl); if (RequiredSize) *RequiredSize = 0; @@ -289,7 +289,7 @@ BOOL WINAPI SetupQueryInfFileInformationW(PSP_INF_INFORMATION InfInformation, DWORD len; LPWSTR ptr; - TRACE("(%p, %u, %p, %d, %p) Stub!\n", InfInformation, InfIndex, + TRACE("(%p, %u, %p, %ld, %p) Stub!\n", InfInformation, InfIndex, ReturnBuffer, ReturnBufferSize, RequiredSize); if (!InfInformation) @@ -333,7 +333,7 @@ BOOL WINAPI SetupGetSourceFileLocationA( HINF hinf, PINFCONTEXT context, PCSTR f DWORD required; INT size; - TRACE("%p, %p, %s, %p, %p, 0x%08x, %p\n", hinf, context, debugstr_a(filename), source_id, + TRACE("%p, %p, %s, %p, %p, 0x%08lx, %p\n", hinf, context, debugstr_a(filename), source_id, buffer, buffer_size, required_size); if (filename && *filename && !(filenameW = strdupAtoW( filename ))) @@ -410,7 +410,7 @@ BOOL WINAPI SetupGetSourceFileLocationW( HINF hinf, PINFCONTEXT context, PCWSTR INFCONTEXT ctx; WCHAR *end, *source_id_str; - TRACE("%p, %p, %s, %p, %p, 0x%08x, %p\n", hinf, context, debugstr_w(filename), source_id, + TRACE("%p, %p, %s, %p, %p, 0x%08lx, %p\n", hinf, context, debugstr_w(filename), source_id, buffer, buffer_size, required_size); if (!context) context = &ctx; @@ -454,7 +454,7 @@ BOOL WINAPI SetupGetSourceInfoA( HINF hinf, UINT source_id, UINT info, DWORD required; INT size; - TRACE("%p, %d, %d, %p, %d, %p\n", hinf, source_id, info, buffer, buffer_size, + TRACE("%p, %d, %d, %p, %ld, %p\n", hinf, source_id, info, buffer, buffer_size, required_size); if (!SetupGetSourceInfoW( hinf, source_id, info, NULL, 0, &required )) @@ -498,7 +498,7 @@ BOOL WINAPI SetupGetSourceInfoW( HINF hinf, UINT source_id, UINT info, static const WCHAR fmt[] = {'%','d',0}; DWORD index; - TRACE("%p, %d, %d, %p, %d, %p\n", hinf, source_id, info, buffer, buffer_size, + TRACE("%p, %d, %d, %p, %ld, %p\n", hinf, source_id, info, buffer, buffer_size, required_size); swprintf( source_id_str, ARRAY_SIZE(source_id_str), fmt, source_id ); @@ -545,7 +545,7 @@ BOOL WINAPI SetupGetTargetPathA( HINF hinf, PINFCONTEXT context, PCSTR section, DWORD required; INT size; - TRACE("%p, %p, %s, %p, 0x%08x, %p\n", hinf, context, debugstr_a(section), buffer, + TRACE("%p, %p, %s, %p, 0x%08lx, %p\n", hinf, context, debugstr_a(section), buffer, buffer_size, required_size); if (section && !(sectionW = strdupAtoW( section ))) @@ -598,7 +598,7 @@ BOOL WINAPI SetupGetTargetPathW( HINF hinf, PINFCONTEXT context, PCWSTR section, unsigned int size; BOOL ret = FALSE; - TRACE("%p, %p, %s, %p, 0x%08x, %p\n", hinf, context, debugstr_w(section), buffer, + TRACE("%p, %p, %s, %p, 0x%08lx, %p\n", hinf, context, debugstr_w(section), buffer, buffer_size, required_size); if (context) ret = SetupFindFirstLineW( hinf, destination_dirs, NULL, context ); @@ -646,7 +646,7 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationA( if (OriginalFileInfo->cbSize != sizeof(*OriginalFileInfo)) { - WARN("incorrect OriginalFileInfo->cbSize of %d\n", OriginalFileInfo->cbSize); + WARN("incorrect OriginalFileInfo->cbSize of %ld\n", OriginalFileInfo->cbSize); SetLastError( ERROR_INVALID_USER_BUFFER ); return FALSE; } @@ -684,7 +684,7 @@ BOOL WINAPI SetupQueryInfOriginalFileInformationW( if (OriginalFileInfo->cbSize != sizeof(*OriginalFileInfo)) { - WARN("incorrect OriginalFileInfo->cbSize of %d\n", OriginalFileInfo->cbSize); + WARN("incorrect OriginalFileInfo->cbSize of %ld\n", OriginalFileInfo->cbSize); SetLastError(ERROR_INVALID_USER_BUFFER); return FALSE; } @@ -726,7 +726,7 @@ BOOL WINAPI SetupGetInfDriverStoreLocationW( PCWSTR LocaleName, PWSTR ReturnBuffer, DWORD ReturnBufferSize, PDWORD RequiredSize) { - FIXME("stub: %s %p %s %p %u %p\n", debugstr_w(FileName), AlternativePlatformInfo, debugstr_w(LocaleName), ReturnBuffer, ReturnBufferSize, RequiredSize); + FIXME("stub: %s %p %s %p %lu %p\n", debugstr_w(FileName), AlternativePlatformInfo, debugstr_w(LocaleName), ReturnBuffer, ReturnBufferSize, RequiredSize); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; diff --git a/dlls/setupapi/queue.c b/dlls/setupapi/queue.c index 1773a4df3d7..f6c83d30e1d 100644 --- a/dlls/setupapi/queue.c +++ b/dlls/setupapi/queue.c @@ -792,7 +792,7 @@ BOOL WINAPI SetupQueueCopySectionW( HSPFILEQ queue, PCWSTR src_root, HINF hinf, BOOL ret = FALSE; DWORD len; - TRACE("queue %p, src_root %s, hinf %p, hlist %p, section %s, style %#x.\n", + TRACE("queue %p, src_root %s, hinf %p, hlist %p, section %s, style %#lx.\n", queue, debugstr_w(src_root), hinf, hlist, debugstr_w(section), style); if (!src_root) @@ -1068,7 +1068,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, BOOL rc = FALSE; BOOL docopy = TRUE; - TRACE("copy %s to %s style 0x%x\n",debugstr_w(source),debugstr_w(target),style); + TRACE("copy %s to %s style 0x%lx\n",debugstr_w(source),debugstr_w(target),style); /* before copy processing */ if (style & SP_COPY_REPLACEONLY) @@ -1126,7 +1126,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, { FILEPATHS_W filepaths; - TRACE("Versions: Source %i.%i target %i.%i\n", + TRACE("Versions: Source %li.%li target %li.%li\n", SourceInfo->dwFileVersionMS, SourceInfo->dwFileVersionLS, TargetInfo->dwFileVersionMS, TargetInfo->dwFileVersionLS); @@ -1179,7 +1179,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, if (style & (SP_COPY_NODECOMP | SP_COPY_LANGUAGEAWARE | SP_COPY_FORCE_IN_USE | SP_COPY_NOSKIP | SP_COPY_WARNIFSKIP)) { - ERR("Unsupported style(s) 0x%x\n",style); + ERR("Unsupported style(s) 0x%lx\n",style); } if (docopy) @@ -1201,7 +1201,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style, DeleteFileW(temp_file); } } - if (!rc) WARN( "failed to copy, err %u\n", GetLastError() ); + if (!rc) WARN( "failed to copy, err %lu\n", GetLastError() ); } else SetLastError(ERROR_SUCCESS); @@ -1226,7 +1226,7 @@ BOOL WINAPI SetupInstallFileExA( HINF hinf, PINFCONTEXT inf_context, PCSTR sourc struct callback_WtoA_context ctx; UNICODE_STRING sourceW, rootW, destW; - TRACE("%p %p %s %s %s %x %p %p %p\n", hinf, inf_context, debugstr_a(source), debugstr_a(root), + TRACE("%p %p %s %s %s %lx %p %p %p\n", hinf, inf_context, debugstr_a(source), debugstr_a(root), debugstr_a(dest), style, handler, context, in_use); sourceW.Buffer = rootW.Buffer = destW.Buffer = NULL; @@ -1277,7 +1277,7 @@ BOOL WINAPI SetupInstallFileExW( HINF hinf, PINFCONTEXT inf_context, PCWSTR sour WCHAR *buffer, *p, *inf_source = NULL, dest_path[MAX_PATH]; DWORD len; - TRACE("%p %p %s %s %s %x %p %p %p\n", hinf, inf_context, debugstr_w(source), debugstr_w(root), + TRACE("%p %p %s %s %s %lx %p %p %p\n", hinf, inf_context, debugstr_w(source), debugstr_w(root), debugstr_w(dest), style, handler, context, in_use); if (in_use) FIXME("no file in use support\n"); @@ -1598,7 +1598,7 @@ BOOL WINAPI SetupScanFileQueueA( HSPFILEQ handle, DWORD flags, HWND window, { struct callback_WtoA_context ctx; - TRACE("%p %x %p %p %p %p\n", handle, flags, window, handler, context, result); + TRACE("%p %lx %p %p %p %p\n", handle, flags, window, handler, context, result); ctx.orig_context = context; ctx.orig_handler = handler; @@ -1619,7 +1619,7 @@ BOOL WINAPI SetupScanFileQueueW( HSPFILEQ handle, DWORD flags, HWND window, UINT notification = 0; BOOL ret = FALSE; - TRACE("%p %x %p %p %p %p\n", handle, flags, window, handler, context, result); + TRACE("%p %lx %p %p %p %p\n", handle, flags, window, handler, context, result); if (!queue->copy_queue.count) return TRUE; @@ -1628,7 +1628,7 @@ BOOL WINAPI SetupScanFileQueueW( HSPFILEQ handle, DWORD flags, HWND window, if (flags & ~(SPQ_SCAN_USE_CALLBACK | SPQ_SCAN_USE_CALLBACKEX)) { - FIXME("flags %x not fully implemented\n", flags); + FIXME("flags %lx not fully implemented\n", flags); } paths.Source = paths.Target = NULL; @@ -1780,10 +1780,10 @@ UINT WINAPI SetupDefaultQueueCallbackA( PVOID context, UINT notification, TRACE( "end queue\n" ); return 0; case SPFILENOTIFY_STARTSUBQUEUE: - TRACE( "start subqueue %ld count %ld\n", param1, param2 ); + TRACE( "start subqueue %Id count %Id\n", param1, param2 ); return TRUE; case SPFILENOTIFY_ENDSUBQUEUE: - TRACE( "end subqueue %ld\n", param1 ); + TRACE( "end subqueue %Id\n", param1 ); return 0; case SPFILENOTIFY_STARTDELETE: TRACE( "start delete %s\n", debugstr_a(paths->Target) ); @@ -1823,7 +1823,7 @@ UINT WINAPI SetupDefaultQueueCallbackA( PVOID context, UINT notification, return FILEOP_DOIT; } default: - FIXME( "notification %d params %lx,%lx\n", notification, param1, param2 ); + FIXME( "notification %d params %Ix,%Ix\n", notification, param1, param2 ); break; } return 0; @@ -1848,10 +1848,10 @@ UINT WINAPI SetupDefaultQueueCallbackW( PVOID context, UINT notification, TRACE( "end queue\n" ); return 0; case SPFILENOTIFY_STARTSUBQUEUE: - TRACE( "start subqueue %ld count %ld\n", param1, param2 ); + TRACE( "start subqueue %Id count %Id\n", param1, param2 ); return TRUE; case SPFILENOTIFY_ENDSUBQUEUE: - TRACE( "end subqueue %ld\n", param1 ); + TRACE( "end subqueue %Id\n", param1 ); return 0; case SPFILENOTIFY_STARTDELETE: TRACE( "start delete %s\n", debugstr_w(paths->Target) ); @@ -1892,7 +1892,7 @@ UINT WINAPI SetupDefaultQueueCallbackW( PVOID context, UINT notification, return FILEOP_DOIT; } default: - FIXME( "notification %d params %lx,%lx\n", notification, param1, param2 ); + FIXME( "notification %d params %Ix,%Ix\n", notification, param1, param2 ); break; } return 0; diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index d4d475c98cb..59f5f06635e 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -180,7 +180,7 @@ static INT_PTR CDECL sc_FNNOTIFY_A(FDINOTIFICATIONTYPE fdint, PFDINOTIFICATION p case fdintPARTIAL_FILE: return 0; case fdintCOPY_FILE: - TRACE("Copy file %s, length %d, date %#x, time %#x, attributes %#x.\n", + TRACE("Copy file %s, length %ld, date %#x, time %#x, attributes %#x.\n", debugstr_a(pfdin->psz1), pfdin->cb, pfdin->date, pfdin->time, pfdin->attribs); fici.NameInCabinet = pfdin->psz1; fici.FileSize = pfdin->cb; @@ -261,7 +261,7 @@ BOOL WINAPI SetupIterateCabinetA(const char *file, DWORD reserved, HFDI hfdi; BOOL ret; - TRACE("file %s, reserved %#x, callback %p, context %p.\n", + TRACE("file %s, reserved %#lx, callback %p, context %p.\n", debugstr_a(file), reserved, callback, context); if (!file) diff --git a/dlls/setupapi/stringtable.c b/dlls/setupapi/stringtable.c index f1ce69ce5dc..15fa6db1fa2 100644 --- a/dlls/setupapi/stringtable.c +++ b/dlls/setupapi/stringtable.c @@ -132,7 +132,7 @@ HSTRING_TABLE WINAPI StringTableInitializeEx(ULONG max_extra_size, DWORD reserve { struct stringtable *table; - TRACE("(%d %x)\n", max_extra_size, reserved); + TRACE("(%ld %lx)\n", max_extra_size, reserved); table = MyMalloc(sizeof(*table)); if (!table) return NULL; @@ -255,7 +255,7 @@ BOOL WINAPI StringTableGetExtraData(HSTRING_TABLE hTable, ULONG id, void *extra, struct stringtable *table = (struct stringtable*)hTable; char *extraptr; - TRACE("%p %u %p %u\n", table, id, extra, extra_size); + TRACE("%p %lu %p %lu\n", table, id, extra, extra_size); if (!table) return FALSE; @@ -300,7 +300,7 @@ DWORD WINAPI StringTableLookUpStringEx(HSTRING_TABLE hTable, LPWSTR string, DWOR DWORD offset; int cmp; - TRACE("%p->%p %s %x %p, %x\n", table, table->data, debugstr_w(string), flags, extra, extra_size); + TRACE("%p->%p %s %lx %p, %lx\n", table, table->data, debugstr_w(string), flags, extra, extra_size); if (!table) return -1; @@ -385,7 +385,7 @@ DWORD WINAPI StringTableAddStringEx(HSTRING_TABLE hTable, LPWSTR string, WCHAR *ptrW; int len; - TRACE("%p %s %x %p, %u\n", hTable, debugstr_w(string), flags, extra, extra_size); + TRACE("%p %s %lx %p, %lu\n", hTable, debugstr_w(string), flags, extra, extra_size); if (!table) return -1; @@ -476,7 +476,7 @@ BOOL WINAPI StringTableSetExtraData(HSTRING_TABLE hTable, DWORD id, void *extra, struct stringtable *table = (struct stringtable*)hTable; char *extraptr; - TRACE("%p %d %p %u\n", hTable, id, extra, extra_size); + TRACE("%p %ld %p %lu\n", hTable, id, extra, extra_size); if (!table) return FALSE; @@ -515,7 +515,7 @@ LPWSTR WINAPI StringTableStringFromId(HSTRING_TABLE hTable, ULONG id) struct stringtable *table = (struct stringtable*)hTable; static WCHAR empty[] = {0}; - TRACE("%p %d\n", table, id); + TRACE("%p %ld\n", table, id); if (!table) return NULL; @@ -548,7 +548,7 @@ BOOL WINAPI StringTableStringFromIdEx(HSTRING_TABLE hTable, ULONG id, LPWSTR buf WCHAR *ptrW; int len; - TRACE("%p %x %p %p\n", table, id, buff, buflen); + TRACE("%p %lx %p %p\n", table, id, buff, buflen); if (!table) { *buflen = 0; diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 7eb0666f651..af058b8eac8 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -55,7 +55,7 @@ CONFIGRET WINAPI CM_Connect_MachineW(PCWSTR name, PHMACHINE machine) */ CONFIGRET WINAPI CM_Create_DevNodeA(PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, DEVINST dnParent, ULONG ulFlags) { - FIXME("(%p %s 0x%08x 0x%08x) stub\n", pdnDevInst, pDeviceID, dnParent, ulFlags); + FIXME("(%p %s 0x%08lx 0x%08lx) stub\n", pdnDevInst, pDeviceID, dnParent, ulFlags); return CR_SUCCESS; } @@ -64,7 +64,7 @@ CONFIGRET WINAPI CM_Create_DevNodeA(PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, */ CONFIGRET WINAPI CM_Create_DevNodeW(PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, DEVINST dnParent, ULONG ulFlags) { - FIXME("(%p %s 0x%08x 0x%08x) stub\n", pdnDevInst, debugstr_w(pDeviceID), dnParent, ulFlags); + FIXME("(%p %s 0x%08lx 0x%08lx) stub\n", pdnDevInst, debugstr_w(pDeviceID), dnParent, ulFlags); return CR_SUCCESS; } @@ -85,7 +85,7 @@ CONFIGRET WINAPI CM_Open_DevNode_Key( DEVINST dnDevInst, REGSAM access, ULONG ulHardwareProfile, REGDISPOSITION disposition, PHKEY phkDevice, ULONG ulFlags) { - FIXME("0x%08x 0x%08x 0x%08x 0x%08x %p 0x%08x : stub\n", dnDevInst, access, ulHardwareProfile, + FIXME("0x%08lx 0x%08lx 0x%08lx 0x%08lx %p 0x%08lx : stub\n", dnDevInst, access, ulHardwareProfile, disposition, phkDevice, ulFlags); return CR_SUCCESS; } @@ -96,7 +96,7 @@ CONFIGRET WINAPI CM_Open_DevNode_Key( CONFIGRET WINAPI CM_Get_Child( PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags) { - FIXME("%p 0x%08x 0x%08x: stub\n", pdnDevInst, dnDevInst, ulFlags); + FIXME("%p 0x%08lx 0x%08lx: stub\n", pdnDevInst, dnDevInst, ulFlags); return CR_SUCCESS; } @@ -106,7 +106,7 @@ CONFIGRET WINAPI CM_Get_Child( CONFIGRET WINAPI CM_Get_Child_Ex( PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags, HMACHINE hMachine) { - FIXME("%p 0x%08x 0x%08x %p: stub\n", pdnDevInst, dnDevInst, ulFlags, hMachine); + FIXME("%p 0x%08lx 0x%08lx %p: stub\n", pdnDevInst, dnDevInst, ulFlags, hMachine); return CR_SUCCESS; } @@ -116,7 +116,7 @@ CONFIGRET WINAPI CM_Get_Child_Ex( DWORD WINAPI CM_Get_Device_ID_ExA( DEVINST dnDevInst, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags, HMACHINE hMachine) { - FIXME("0x%08x %p 0x%08x 0x%08x %p: stub\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine); + FIXME("0x%08lx %p 0x%08lx 0x%08lx %p: stub\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine); return CR_SUCCESS; } @@ -126,7 +126,7 @@ DWORD WINAPI CM_Get_Device_ID_ExA( DWORD WINAPI CM_Get_Device_ID_ExW( DEVINST dnDevInst, PWCHAR Buffer, ULONG BufferLen, ULONG ulFlags, HMACHINE hMachine) { - FIXME("0x%08x %p 0x%08x 0x%08x %p: stub\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine); + FIXME("0x%08lx %p 0x%08lx 0x%08lx %p: stub\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine); return CR_SUCCESS; } @@ -136,7 +136,7 @@ DWORD WINAPI CM_Get_Device_ID_ExW( CONFIGRET WINAPI CM_Get_Device_ID_ListA( PCSTR pszFilter, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags ) { - FIXME("%s %p %d 0x%08x: stub\n", debugstr_a(pszFilter), Buffer, BufferLen, ulFlags); + FIXME("%s %p %ld 0x%08lx: stub\n", debugstr_a(pszFilter), Buffer, BufferLen, ulFlags); if (BufferLen >= 2) Buffer[0] = Buffer[1] = 0; return CR_SUCCESS; @@ -148,7 +148,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_ListA( CONFIGRET WINAPI CM_Get_Device_ID_ListW( PCWSTR pszFilter, PWCHAR Buffer, ULONG BufferLen, ULONG ulFlags ) { - FIXME("%s %p %d 0x%08x: stub\n", debugstr_w(pszFilter), Buffer, BufferLen, ulFlags); + FIXME("%s %p %ld 0x%08lx: stub\n", debugstr_w(pszFilter), Buffer, BufferLen, ulFlags); if (BufferLen >= 2) Buffer[0] = Buffer[1] = 0; return CR_SUCCESS; @@ -159,7 +159,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_ListW( */ CONFIGRET WINAPI CM_Get_Device_ID_List_SizeA( PULONG pulLen, PCSTR pszFilter, ULONG ulFlags ) { - FIXME("%p %s 0x%08x: stub\n", pulLen, debugstr_a(pszFilter), ulFlags); + FIXME("%p %s 0x%08lx: stub\n", pulLen, debugstr_a(pszFilter), ulFlags); return CR_SUCCESS; } @@ -169,7 +169,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_SizeA( PULONG pulLen, PCSTR pszFilter, */ CONFIGRET WINAPI CM_Get_Device_ID_List_SizeW( PULONG pulLen, PCWSTR pszFilter, ULONG ulFlags ) { - FIXME("%p %s 0x%08x: stub\n", pulLen, debugstr_w(pszFilter), ulFlags); + FIXME("%p %s 0x%08lx: stub\n", pulLen, debugstr_w(pszFilter), ulFlags); return CR_SUCCESS; } @@ -179,7 +179,7 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_SizeW( PULONG pulLen, PCWSTR pszFilter, */ DWORD WINAPI CM_Get_Parent(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags) { - FIXME("%p 0x%08x 0x%08x stub\n", pdnDevInst, dnDevInst, ulFlags); + FIXME("%p 0x%08lx 0x%08lx stub\n", pdnDevInst, dnDevInst, ulFlags); if(pdnDevInst) *pdnDevInst = 0; return CR_NO_SUCH_DEVNODE; @@ -190,7 +190,7 @@ DWORD WINAPI CM_Get_Parent(PDEVINST pdnDevInst, DEVINST dnDevInst, ULONG ulFlags */ HSPFILELOG WINAPI SetupInitializeFileLogW(LPCWSTR LogFileName, DWORD Flags) { - FIXME("Stub %s, 0x%x\n",debugstr_w(LogFileName),Flags); + FIXME("Stub %s, 0x%lx\n",debugstr_w(LogFileName),Flags); return INVALID_HANDLE_VALUE; } @@ -199,7 +199,7 @@ HSPFILELOG WINAPI SetupInitializeFileLogW(LPCWSTR LogFileName, DWORD Flags) */ HSPFILELOG WINAPI SetupInitializeFileLogA(LPCSTR LogFileName, DWORD Flags) { - FIXME("Stub %s, 0x%x\n",debugstr_a(LogFileName),Flags); + FIXME("Stub %s, 0x%lx\n",debugstr_a(LogFileName),Flags); return INVALID_HANDLE_VALUE; } @@ -217,7 +217,7 @@ BOOL WINAPI SetupTerminateFileLog(HANDLE FileLogHandle) */ BOOL WINAPI RegistryDelnode(DWORD x, DWORD y) { - FIXME("%08x %08x: stub\n", x, y); + FIXME("%08lx %08lx: stub\n", x, y); return FALSE; } @@ -235,7 +235,7 @@ INT WINAPI SetupPromptReboot( HSPFILEQ file_queue, HWND owner, BOOL scan_only ) */ BOOL WINAPI SetupQueryDrivesInDiskSpaceListA(HDSKSPC disk_space, PSTR return_buffer, DWORD return_buffer_size, PDWORD required_size) { - FIXME("%p, %p, %d, %p: stub\n", disk_space, return_buffer, return_buffer_size, required_size); + FIXME("%p, %p, %ld, %p: stub\n", disk_space, return_buffer, return_buffer_size, required_size); return FALSE; } @@ -244,7 +244,7 @@ BOOL WINAPI SetupQueryDrivesInDiskSpaceListA(HDSKSPC disk_space, PSTR return_buf */ BOOL WINAPI SetupQueryDrivesInDiskSpaceListW(HDSKSPC disk_space, PWSTR return_buffer, DWORD return_buffer_size, PDWORD required_size) { - FIXME("%p, %p, %d, %p: stub\n", disk_space, return_buffer, return_buffer_size, required_size); + FIXME("%p, %p, %ld, %p: stub\n", disk_space, return_buffer, return_buffer_size, required_size); return FALSE; } @@ -253,7 +253,7 @@ BOOL WINAPI SetupQueryDrivesInDiskSpaceListW(HDSKSPC disk_space, PWSTR return_bu */ BOOL WINAPI SetupAddToSourceListA(DWORD flags, PCSTR source) { - FIXME("0x%08x %s: stub\n", flags, debugstr_a(source)); + FIXME("0x%08lx %s: stub\n", flags, debugstr_a(source)); return TRUE; } @@ -262,7 +262,7 @@ BOOL WINAPI SetupAddToSourceListA(DWORD flags, PCSTR source) */ BOOL WINAPI SetupAddToSourceListW(DWORD flags, PCWSTR source) { - FIXME("0x%08x %s: stub\n", flags, debugstr_w(source)); + FIXME("0x%08lx %s: stub\n", flags, debugstr_w(source)); return TRUE; } @@ -271,7 +271,7 @@ BOOL WINAPI SetupAddToSourceListW(DWORD flags, PCWSTR source) */ BOOL WINAPI SetupSetSourceListA(DWORD flags, PCSTR *list, UINT count) { - FIXME("0x%08x %p %d: stub\n", flags, list, count); + FIXME("0x%08lx %p %d: stub\n", flags, list, count); return FALSE; } @@ -280,7 +280,7 @@ BOOL WINAPI SetupSetSourceListA(DWORD flags, PCSTR *list, UINT count) */ BOOL WINAPI SetupSetSourceListW(DWORD flags, PCWSTR *list, UINT count) { - FIXME("0x%08x %p %d: stub\n", flags, list, count); + FIXME("0x%08lx %p %d: stub\n", flags, list, count); return FALSE; } @@ -316,7 +316,7 @@ BOOL WINAPI SetupDiGetClassImageIndex(PSP_CLASSIMAGELIST_DATA ClassImageListData */ CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, ULONG ulFlags) { - FIXME("%p %s 0x%08x: stub\n", pdnDevInst, debugstr_a(pDeviceID), ulFlags); + FIXME("%p %s 0x%08lx: stub\n", pdnDevInst, debugstr_a(pDeviceID), ulFlags); return CR_FAILURE; } @@ -326,7 +326,7 @@ CONFIGRET WINAPI CM_Locate_DevNodeA(PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, */ CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, ULONG ulFlags) { - FIXME("%p %s 0x%08x: stub\n", pdnDevInst, debugstr_w(pDeviceID), ulFlags); + FIXME("%p %s 0x%08lx: stub\n", pdnDevInst, debugstr_w(pDeviceID), ulFlags); return CR_FAILURE; } @@ -336,7 +336,7 @@ CONFIGRET WINAPI CM_Locate_DevNodeW(PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, */ CONFIGRET WINAPI CM_Locate_DevNode_ExA(PDEVINST pdnDevInst, DEVINSTID_A pDeviceID, ULONG ulFlags, HMACHINE hMachine) { - FIXME("%p %s 0x%08x %p: stub\n", pdnDevInst, debugstr_a(pDeviceID), ulFlags, hMachine); + FIXME("%p %s 0x%08lx %p: stub\n", pdnDevInst, debugstr_a(pDeviceID), ulFlags, hMachine); return CR_FAILURE; } @@ -346,7 +346,7 @@ CONFIGRET WINAPI CM_Locate_DevNode_ExA(PDEVINST pdnDevInst, DEVINSTID_A pDeviceI */ CONFIGRET WINAPI CM_Locate_DevNode_ExW(PDEVINST pdnDevInst, DEVINSTID_W pDeviceID, ULONG ulFlags, HMACHINE hMachine) { - FIXME("%p %s 0x%08x %p: stub\n", pdnDevInst, debugstr_w(pDeviceID), ulFlags, hMachine); + FIXME("%p %s 0x%08lx %p: stub\n", pdnDevInst, debugstr_w(pDeviceID), ulFlags, hMachine); return CR_FAILURE; } @@ -357,7 +357,7 @@ CONFIGRET WINAPI CM_Locate_DevNode_ExW(PDEVINST pdnDevInst, DEVINSTID_W pDeviceI CONFIGRET WINAPI CM_Get_Device_Interface_List_SizeA(PULONG len, LPGUID class, DEVINSTID_A id, ULONG flags) { - FIXME("%p %p %s 0x%08x: stub\n", len, class, debugstr_a(id), flags); + FIXME("%p %p %s 0x%08lx: stub\n", len, class, debugstr_a(id), flags); return CR_FAILURE; } @@ -367,7 +367,7 @@ CONFIGRET WINAPI CM_Get_Device_Interface_List_SizeA(PULONG len, LPGUID class, DE CONFIGRET WINAPI CM_Get_Device_Interface_List_SizeW(PULONG len, LPGUID class, DEVINSTID_W id, ULONG flags) { - FIXME("%p %p %s 0x%08x: stub\n", len, class, debugstr_w(id), flags); + FIXME("%p %p %s 0x%08lx: stub\n", len, class, debugstr_w(id), flags); return CR_FAILURE; } @@ -377,7 +377,7 @@ CONFIGRET WINAPI CM_Get_Device_Interface_List_SizeW(PULONG len, LPGUID class, DE CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExA(PULONG len, LPGUID class, DEVINSTID_A id, ULONG flags, HMACHINE machine) { - FIXME("%p %p %s 0x%08x %p: stub\n", len, class, debugstr_a(id), flags, machine); + FIXME("%p %p %s 0x%08lx %p: stub\n", len, class, debugstr_a(id), flags, machine); return CR_FAILURE; } @@ -387,7 +387,7 @@ CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExA(PULONG len, LPGUID class, CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExW(PULONG len, LPGUID class, DEVINSTID_W id, ULONG flags, HMACHINE machine) { - FIXME("%p %p %s 0x%08x %p: stub\n", len, class, debugstr_w(id), flags, machine); + FIXME("%p %p %s 0x%08lx %p: stub\n", len, class, debugstr_w(id), flags, machine); return CR_FAILURE; } @@ -397,7 +397,7 @@ CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExW(PULONG len, LPGUID class, CONFIGRET WINAPI CM_Get_Device_Interface_AliasA(const char *interface, GUID *class, char *name, ULONG *len, ULONG flags) { - FIXME("%s %p %p %p 0x%08x: stub\n", debugstr_a(interface), class, name, len, flags); + FIXME("%s %p %p %p 0x%08lx: stub\n", debugstr_a(interface), class, name, len, flags); return CR_FAILURE; } @@ -407,7 +407,7 @@ CONFIGRET WINAPI CM_Get_Device_Interface_AliasA(const char *interface, GUID *cla CONFIGRET WINAPI CM_Get_Device_Interface_AliasW(const WCHAR *interface, GUID *class, WCHAR *name, ULONG *len, ULONG flags) { - FIXME("%s %p %p %p 0x%08x: stub\n", debugstr_w(interface), class, name, len, flags); + FIXME("%s %p %p %p 0x%08lx: stub\n", debugstr_w(interface), class, name, len, flags); return CR_FAILURE; } @@ -417,7 +417,7 @@ CONFIGRET WINAPI CM_Get_Device_Interface_AliasW(const WCHAR *interface, GUID *cl CONFIGRET WINAPI CM_Get_DevNode_Registry_Property_ExA(DEVINST dev, ULONG prop, PULONG regdatatype, PVOID buf, PULONG len, ULONG flags, HMACHINE machine) { - FIXME("0x%08x %u %p %p %p 0x%08x %p: stub\n", dev, prop, regdatatype, buf, len, flags, machine); + FIXME("0x%08lx %lu %p %p %p 0x%08lx %p: stub\n", dev, prop, regdatatype, buf, len, flags, machine); return CR_FAILURE; } @@ -427,7 +427,7 @@ CONFIGRET WINAPI CM_Get_DevNode_Registry_Property_ExA(DEVINST dev, ULONG prop, P CONFIGRET WINAPI CM_Get_DevNode_Registry_Property_ExW(DEVINST dev, ULONG prop, PULONG regdatatype, PVOID buf, PULONG len, ULONG flags, HMACHINE machine) { - FIXME("0x%08x %u %p %p %p 0x%08x %p: stub\n", dev, prop, regdatatype, buf, len, flags, machine); + FIXME("0x%08lx %lu %p %p %p 0x%08lx %p: stub\n", dev, prop, regdatatype, buf, len, flags, machine); return CR_FAILURE; } @@ -455,7 +455,7 @@ CONFIGRET WINAPI CM_Get_DevNode_Registry_PropertyW(DEVINST dev, ULONG prop, PULO CONFIGRET WINAPI CM_Get_DevNode_Status(ULONG *status, ULONG *problem, DEVINST dev, ULONG flags) { - FIXME("%p %p 0x%08x 0x%08x: stub\n", status, problem, dev, flags); + FIXME("%p %p 0x%08lx 0x%08lx: stub\n", status, problem, dev, flags); return CR_FAILURE; } @@ -465,7 +465,7 @@ CONFIGRET WINAPI CM_Get_DevNode_Status(ULONG *status, ULONG *problem, DEVINST de CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(ULONG *status, ULONG *problem, DEVINST dev, ULONG flags, HMACHINE machine) { - FIXME("%p %p 0x%08x 0x%08x %p: stub\n", status, problem, dev, flags, machine); + FIXME("%p %p 0x%08lx 0x%08lx %p: stub\n", status, problem, dev, flags, machine); return CR_FAILURE; } @@ -474,7 +474,7 @@ CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(ULONG *status, ULONG *problem, DEVINST */ CONFIGRET WINAPI CM_Enumerate_Classes(ULONG index, LPGUID class, ULONG flags) { - FIXME("%u %p 0x%08x: stub\n", index, class, flags); + FIXME("%lu %p 0x%08lx: stub\n", index, class, flags); return CR_NO_SUCH_VALUE; } @@ -484,7 +484,7 @@ CONFIGRET WINAPI CM_Enumerate_Classes(ULONG index, LPGUID class, ULONG flags) CONFIGRET WINAPI CM_Get_Class_Registry_PropertyA(LPGUID class, ULONG prop, PULONG regdatatype, PVOID buf, ULONG len, ULONG flags, HMACHINE machine) { - FIXME("%p %u %p %p %u 0x%08x %p: stub\n", class, prop, regdatatype, buf, len, flags, machine); + FIXME("%p %lu %p %p %lu 0x%08lx %p: stub\n", class, prop, regdatatype, buf, len, flags, machine); return CR_FAILURE; } @@ -494,7 +494,7 @@ CONFIGRET WINAPI CM_Get_Class_Registry_PropertyA(LPGUID class, ULONG prop, PULON CONFIGRET WINAPI CM_Get_Class_Registry_PropertyW(LPGUID class, ULONG prop, PULONG regdatatype, PVOID buf, ULONG len, ULONG flags, HMACHINE machine) { - FIXME("%p %u %p %p %u 0x%08x %p: stub\n", class, prop, regdatatype, buf, len, flags, machine); + FIXME("%p %lu %p %p %lu 0x%08lx %p: stub\n", class, prop, regdatatype, buf, len, flags, machine); return CR_FAILURE; } @@ -504,7 +504,7 @@ CONFIGRET WINAPI CM_Get_Class_Registry_PropertyW(LPGUID class, ULONG prop, PULON CONFIGRET WINAPI CM_Get_Sibling( PDEVINST pdnDevInst, DEVINST DevInst, ULONG ulFlags) { - FIXME("%p 0x%08x 0x%08x: stub\n", pdnDevInst, DevInst, ulFlags); + FIXME("%p 0x%08lx 0x%08lx: stub\n", pdnDevInst, DevInst, ulFlags); return CR_FAILURE; } @@ -514,19 +514,19 @@ CONFIGRET WINAPI CM_Get_Sibling( CONFIGRET WINAPI CM_Get_Sibling_Ex( PDEVINST pdnDevInst, DEVINST DevInst, ULONG ulFlags, HMACHINE hMachine) { - FIXME("%p 0x%08x 0x%08x %p: stub\n", pdnDevInst, DevInst, ulFlags, hMachine); + FIXME("%p 0x%08lx 0x%08lx %p: stub\n", pdnDevInst, DevInst, ulFlags, hMachine); return CR_FAILURE; } CONFIGRET WINAPI CM_Reenumerate_DevNode(DEVINST dnDevInst, ULONG ulFlags) { - FIXME("0x%08x 0x%08x: stub\n", dnDevInst, ulFlags); + FIXME("0x%08lx 0x%08lx: stub\n", dnDevInst, ulFlags); return CR_FAILURE; } CONFIGRET WINAPI CM_Reenumerate_DevNode_Ex(DEVINST dnDevInst, ULONG ulFlags, HMACHINE machine) { - FIXME("0x%08x 0x%08x %p: stub\n", dnDevInst, ulFlags, machine); + FIXME("0x%08lx 0x%08lx %p: stub\n", dnDevInst, ulFlags, machine); return CR_FAILURE; } @@ -536,7 +536,7 @@ CONFIGRET WINAPI CM_Reenumerate_DevNode_Ex(DEVINST dnDevInst, ULONG ulFlags, HMA CONFIGRET WINAPI CM_Set_Class_Registry_PropertyA(LPGUID class, ULONG prop, LPCVOID buf, ULONG len, ULONG flags, HMACHINE machine) { - FIXME("%p %u %p %u 0x%08x %p: stub\n", class, prop, buf, len, flags, machine); + FIXME("%p %lu %p %lu 0x%08lx %p: stub\n", class, prop, buf, len, flags, machine); return CR_FAILURE; } @@ -546,7 +546,7 @@ CONFIGRET WINAPI CM_Set_Class_Registry_PropertyA(LPGUID class, ULONG prop, LPCVO CONFIGRET WINAPI CM_Set_Class_Registry_PropertyW(LPGUID class, ULONG prop, LPCVOID buf, ULONG len, ULONG flags, HMACHINE machine) { - FIXME("%p %u %p %u 0x%08x %p: stub\n", class, prop, buf, len, flags, machine); + FIXME("%p %lu %p %lu 0x%08lx %p: stub\n", class, prop, buf, len, flags, machine); return CR_FAILURE; } @@ -564,7 +564,7 @@ BOOL WINAPI SetupLogFileW( PCWSTR OtherInfo, DWORD Flags ) { - FIXME("(%p, %s, '%s', '%s', %d, %s, %s, %s, %d): stub\n", FileLogHandle, + FIXME("(%p, %s, '%s', '%s', %ld, %s, %s, %s, %ld): stub\n", FileLogHandle, debugstr_w(LogSectionName), debugstr_w(SourceFileName), debugstr_w(TargetFileName), Checksum, debugstr_w(DiskTagfile), debugstr_w(DiskDescription), debugstr_w(OtherInfo), Flags); @@ -587,7 +587,7 @@ BOOL WINAPI SetupLogFileA( PCSTR OtherInfo, DWORD Flags ) { - FIXME("(%p, %p, '%s', '%s', %d, %p, %p, %p, %d): stub\n", FileLogHandle, + FIXME("(%p, %p, '%s', '%s', %ld, %p, %p, %p, %ld): stub\n", FileLogHandle, LogSectionName, SourceFileName, TargetFileName, Checksum, DiskTagfile, DiskDescription, OtherInfo, Flags); @@ -601,7 +601,7 @@ BOOL WINAPI SetupLogFileA( BOOL WINAPI SetupDiDestroyDriverInfoList(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD DriverType) { - FIXME("%p %p %d\n", DeviceInfoSet, DeviceInfoData, DriverType); + FIXME("%p %p %ld\n", DeviceInfoSet, DeviceInfoData, DriverType); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; @@ -612,7 +612,7 @@ BOOL WINAPI SetupDiDestroyDriverInfoList(HDEVINFO DeviceInfoSet, PSP_DEVINFO_DAT */ INT WINAPI SetupDiDrawMiniIcon(HDC hdc, RECT rc, INT MiniIconIndex, DWORD Flags) { - FIXME("(%p, %s, %d, %x) stub\n", hdc, wine_dbgstr_rect(&rc), MiniIconIndex, Flags); + FIXME("(%p, %s, %d, %lx) stub\n", hdc, wine_dbgstr_rect(&rc), MiniIconIndex, Flags); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; @@ -655,7 +655,7 @@ BOOL WINAPI SetupDiSetSelectedDevice(HDEVINFO SetupDiSetSelectedDevice, PSP_DEVI */ CONFIGRET WINAPI CM_Request_Device_EjectA(DEVINST dev, PPNP_VETO_TYPE type, LPSTR name, ULONG length, ULONG flags) { - FIXME("(0x%08x, %p, %p, %u, 0x%08x) stub\n", dev, type, name, length, flags); + FIXME("(0x%08lx, %p, %p, %lu, 0x%08lx) stub\n", dev, type, name, length, flags); return CR_SUCCESS; } @@ -664,6 +664,6 @@ CONFIGRET WINAPI CM_Request_Device_EjectA(DEVINST dev, PPNP_VETO_TYPE type, LPST */ CONFIGRET WINAPI CM_Request_Device_EjectW(DEVINST dev, PPNP_VETO_TYPE type, LPWSTR name, ULONG length, ULONG flags) { - FIXME("(0x%08x, %p, %p, %u, 0x%08x) stub\n", dev, type, name, length, flags); + FIXME("(0x%08lx, %p, %p, %lu, 0x%08lx) stub\n", dev, type, name, length, flags); return CR_SUCCESS; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/setupx.dll16/Makefile.in | 1 - dlls/setupx.dll16/devinst16.c | 2 +- dlls/setupx.dll16/setupx_main.c | 4 ++-- dlls/setupx.dll16/virtcopy.c | 6 +++--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/setupx.dll16/Makefile.in b/dlls/setupx.dll16/Makefile.in index 3d7de3d3dff..d7d6555baf0 100644 --- a/dlls/setupx.dll16/Makefile.in +++ b/dlls/setupx.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = setupx.dll16 IMPORTS = setupapi user32 advapi32 diff --git a/dlls/setupx.dll16/devinst16.c b/dlls/setupx.dll16/devinst16.c index 55f38b021eb..9775c19329f 100644 --- a/dlls/setupx.dll16/devinst16.c +++ b/dlls/setupx.dll16/devinst16.c @@ -104,7 +104,7 @@ RETERR16 WINAPI DiCreateDeviceInfo16(LPLPDEVICE_INFO16 lplpdi, LPCSTR lpszClassName, HWND16 hwndParent) { LPDEVICE_INFO16 lpdi; - FIXME("(%p %s %08x %x %s %s %x): stub\n", lplpdi, + FIXME("(%p %s %08lx %x %s %s %x): stub\n", lplpdi, debugstr_a(lpszDescription), dnDevnode, hkey, debugstr_a(lpszRegsubkey), debugstr_a(lpszClassName), hwndParent); lpdi = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DEVICE_INFO16)); diff --git a/dlls/setupx.dll16/setupx_main.c b/dlls/setupx.dll16/setupx_main.c index 9245ead9c59..19de9480ee3 100644 --- a/dlls/setupx.dll16/setupx_main.c +++ b/dlls/setupx.dll16/setupx_main.c @@ -86,7 +86,7 @@ DWORD WINAPI SURegQueryValueEx( HKEY hkey, LPSTR lpszValueName, LPDWORD lpdwReserved, LPDWORD lpdwType, LPBYTE lpbData, LPDWORD lpcbData ) { - FIXME("(%p,%s,%p,%p,%p,%d), semi-stub.\n",hkey,debugstr_a(lpszValueName), + FIXME("(%p,%s,%p,%p,%p,%ld), semi-stub.\n",hkey,debugstr_a(lpszValueName), lpdwReserved,lpdwType,lpbData,lpcbData?*lpcbData:0); return RegQueryValueExA( hkey, lpszValueName, lpdwReserved, lpdwType, lpbData, lpcbData ); @@ -608,7 +608,7 @@ RETERR16 WINAPI CtlGetLddPath16(LOGDISKID16 ldid, LPSTR szPath) */ RETERR16 WINAPI DiInstallClass16(LPCSTR lpszInfFileName, DWORD dwFlags) { - FIXME("(%s, %u), stub.\n", lpszInfFileName, dwFlags); + FIXME("(%s, %lu), stub.\n", lpszInfFileName, dwFlags); return 0; } diff --git a/dlls/setupx.dll16/virtcopy.c b/dlls/setupx.dll16/virtcopy.c index d6bcab6611f..552db5a9895 100644 --- a/dlls/setupx.dll16/virtcopy.c +++ b/dlls/setupx.dll16/virtcopy.c @@ -408,7 +408,7 @@ LPCSTR WINAPI VcpExplain16(LPVIRTNODE lpVn, DWORD dwWhat) } break; default: - FIXME("%d unimplemented !\n", dwWhat); + FIXME("%ld unimplemented !\n", dwWhat); strcpy(buffer, "Unknown error"); break; } @@ -517,7 +517,7 @@ RETERR16 WINAPI vcpDefCallbackProc16(LPVOID lpvObj, UINT16 uMsg, WPARAM wParam, { static int count = 0; if (count < 10) - FIXME("(%p, %04x, %04lx, %08lx, %08lx) - what to do here ?\n", + FIXME("(%p, %04x, %04x, %08lx, %08lx) - what to do here ?\n", lpvObj, uMsg, wParam, lParam, lParamRef); count++; return OK; @@ -669,7 +669,7 @@ RETERR16 WINAPI vcpUICallbackProc16(LPVOID lpvObj, UINT16 uMsg, WPARAM wParam, RETERR16 res = VCPN_OK; if (count < 5) - FIXME("(%p, %04x, %04lx, %08lx, %08lx) - semi-stub\n", + FIXME("(%p, %04x, %04x, %08lx, %08lx) - semi-stub\n", lpvObj, uMsg, wParam, lParam, lParamRef); count++; switch (uMsg)
participants (2)
-
Eric Pouech -
Huw Davies