[PATCH 10/28] dlls/qmgr: enable compilation with long types
Eric Pouech
eric.pouech at gmail.com
Thu Feb 17 00:11:19 CST 2022
Signed-off-by: Eric Pouech <eric.pouech at 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;
}
More information about the wine-devel
mailing list