[PATCH 01/21] dlls/ncrypt: enable compilation with long types
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ncrypt/Makefile.in | 1 - dlls/ncrypt/main.c | 30 +++++++++++++++--------------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/ncrypt/Makefile.in b/dlls/ncrypt/Makefile.in index 120187ef61c..ad3ed409961 100644 --- a/dlls/ncrypt/Makefile.in +++ b/dlls/ncrypt/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES IMPORTLIB = ncrypt MODULE = ncrypt.dll diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index f23b239d93f..28f46ac0af9 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -31,7 +31,7 @@ SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCR const WCHAR *algid, const WCHAR *name, DWORD keyspec, DWORD flags) { - FIXME("(0x%lx, %p, %s, %s, 0x%08x, 0x%08x): stub\n", provider, key, wine_dbgstr_w(algid), + FIXME("(0x%Ix, %p, %s, %s, 0x%08lx, 0x%08lx): stub\n", provider, key, wine_dbgstr_w(algid), wine_dbgstr_w(name), keyspec, flags); return NTE_NOT_SUPPORTED; } @@ -39,21 +39,21 @@ SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCR SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD insize, void *padding, BYTE *output, DWORD outsize, DWORD *result, DWORD flags) { - FIXME("(0x%lx, %p, %u, %p, %p, %u, %p, 0x%08x): stub\n", key, input, insize, padding, + FIXME("(0x%Ix, %p, %lu, %p, %p, %lu, %p, 0x%08lx): stub\n", key, input, insize, padding, output, outsize, result, flags); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptDeleteKey(NCRYPT_KEY_HANDLE key, DWORD flags) { - FIXME("(0x%lx, 0x%08x): stub\n", key, flags); + FIXME("(0x%Ix, 0x%08lx): stub\n", key, flags); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD insize, void *padding, BYTE *output, DWORD outsize, DWORD *result, DWORD flags) { - FIXME("(0x%lx, %p, %u, %p, %p, %u, %p, 0x%08x): stub\n", key, input, insize, padding, + FIXME("(0x%Ix, %p, %lu, %p, %p, %lu, %p, 0x%08lx): stub\n", key, input, insize, padding, output, outsize, result, flags); return NTE_NOT_SUPPORTED; } @@ -62,20 +62,20 @@ SECURITY_STATUS WINAPI NCryptEnumAlgorithms(NCRYPT_PROV_HANDLE provider, DWORD a DWORD *alg_count, NCryptAlgorithmName **alg_list, DWORD flags) { - FIXME("(0x%lx, 0x%08x, %p, %p, 0x%08x): stub\n", provider, alg_ops, alg_count, alg_list, flags); + FIXME("(0x%Ix, 0x%08lx, %p, %p, 0x%08lx): stub\n", provider, alg_ops, alg_count, alg_list, flags); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptEnumKeys(NCRYPT_PROV_HANDLE provider, const WCHAR *scope, NCryptKeyName **key_name, PVOID *enum_state, DWORD flags) { - FIXME("(0x%lx, %p, %p, %p, 0x%08x): stub\n", provider, scope, key_name, enum_state, flags); + FIXME("(0x%Ix, %p, %p, %p, 0x%08lx): stub\n", provider, scope, key_name, enum_state, flags); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE key, DWORD flags) { - FIXME("(0x%lx, 0x%08x): stub\n", key, flags); + FIXME("(0x%Ix, 0x%08lx): stub\n", key, flags); return NTE_NOT_SUPPORTED; } @@ -87,14 +87,14 @@ SECURITY_STATUS WINAPI NCryptFreeBuffer(PVOID buf) SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE object) { - FIXME("(0x%lx): stub\n", object); + FIXME("(0x%Ix): stub\n", object); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE object, const WCHAR *property, PBYTE output, DWORD outsize, DWORD *result, DWORD flags) { - FIXME("(0x%lx, %s, %p, %u, %p, 0x%08x): stub\n", object, wine_dbgstr_w(property), output, outsize, + FIXME("(0x%Ix, %s, %p, %lu, %p, 0x%08lx): stub\n", object, wine_dbgstr_w(property), output, outsize, result, flags); return NTE_NOT_SUPPORTED; } @@ -103,7 +103,7 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H const WCHAR *type, NCryptBufferDesc *params, NCRYPT_KEY_HANDLE *key, PBYTE data, DWORD datasize, DWORD flags) { - FIXME("(0x%lx, 0x%lx, %s, %p, %p, %p, %u, 0x%08x): stub\n", provider, decrypt_key, + FIXME("(0x%Ix, 0x%Ix, %s, %p, %p, %p, %lu, 0x%08lx): stub\n", provider, decrypt_key, wine_dbgstr_w(type), params, key, data, datasize, flags); return NTE_NOT_SUPPORTED; @@ -112,33 +112,33 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const WCHAR *algid, DWORD flags) { - FIXME("(0x%lx, %s, 0x%08x): stub\n", provider, wine_dbgstr_w(algid), flags); + FIXME("(0x%Ix, %s, 0x%08lx): stub\n", provider, wine_dbgstr_w(algid), flags); return NTE_NOT_SUPPORTED; } BOOL WINAPI NCryptIsKeyHandle(NCRYPT_KEY_HANDLE hKey) { - FIXME("(0x%lx): stub\n", hKey); + FIXME("(0x%Ix): stub\n", hKey); return FALSE; } SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, const WCHAR *name, DWORD keyspec, DWORD flags) { - FIXME("(0x%lx, %p, %s, 0x%08x, 0x%08x): stub\n", provider, key, wine_dbgstr_w(name), keyspec, flags); + FIXME("(0x%Ix, %p, %s, 0x%08lx, 0x%08lx): stub\n", provider, key, wine_dbgstr_w(name), keyspec, flags); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, const WCHAR *name, DWORD flags) { - FIXME("(%p, %s, %u): stub\n", provider, wine_dbgstr_w(name), flags); + FIXME("(%p, %s, %lu): stub\n", provider, wine_dbgstr_w(name), flags); return NTE_NOT_SUPPORTED; } SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE object, const WCHAR *property, PBYTE input, DWORD insize, DWORD flags) { - FIXME("(%lx, %s, %p, %u, 0x%08x): stub\n", object, wine_dbgstr_w(property), input, insize, + FIXME("(%Ix, %s, %p, %lu, 0x%08lx): stub\n", object, wine_dbgstr_w(property), input, insize, flags); return NTE_NOT_SUPPORTED; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/nddeapi/Makefile.in | 1 - dlls/nddeapi/nddeapi.c | 36 ++++++++++++++++++------------------ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/nddeapi/Makefile.in b/dlls/nddeapi/Makefile.in index 31c2c4a2cba..6a335119b62 100644 --- a/dlls/nddeapi/Makefile.in +++ b/dlls/nddeapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = nddeapi.dll IMPORTLIB = nddeapi diff --git a/dlls/nddeapi/nddeapi.c b/dlls/nddeapi/nddeapi.c index 84c636affb0..263f2fd93be 100644 --- a/dlls/nddeapi/nddeapi.c +++ b/dlls/nddeapi/nddeapi.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(nddeapi); UINT WINAPI NDdeShareAddA(LPSTR lpszServer, UINT nLevel, PSECURITY_DESCRIPTOR pSD, LPBYTE lpBuffer, DWORD cBufSize) { - TRACE("(%s, %u, %p, %p, %u)\n", debugstr_a(lpszServer), nLevel, pSD, lpBuffer, cBufSize); + TRACE("(%s, %u, %p, %p, %lu)\n", debugstr_a(lpszServer), nLevel, pSD, lpBuffer, cBufSize); return NDDE_NOT_IMPLEMENTED; } @@ -61,7 +61,7 @@ UINT WINAPI NDdeShareDelA(LPSTR lpszServer, LPSTR lpszShareName, UINT wReserved) UINT WINAPI NDdeShareEnumA(LPSTR lpszServer, UINT nLevel, LPBYTE lpBuffer, DWORD cBufSize, LPDWORD lpnEntriesRead, LPDWORD lpcbTotalAvailable) { - TRACE("(%s, %u, %p, %u, %p, %p)\n", debugstr_a(lpszServer), nLevel, lpBuffer, cBufSize, + TRACE("(%s, %u, %p, %lu, %p, %p)\n", debugstr_a(lpszServer), nLevel, lpBuffer, cBufSize, lpnEntriesRead, lpcbTotalAvailable); return NDDE_NOT_IMPLEMENTED; @@ -74,7 +74,7 @@ UINT WINAPI NDdeShareEnumA(LPSTR lpszServer, UINT nLevel, LPBYTE lpBuffer, DWORD UINT WINAPI NDdeShareGetInfoA(LPSTR lpszServer, LPSTR lpszShareName, UINT nLevel, LPBYTE lpBuffer, DWORD cBufSize, LPDWORD lpnTotalAvailable, LPWORD lpnItems) { - TRACE("(%s, %s, %u, %p, %u, %p, %p)\n", debugstr_a(lpszServer), debugstr_a(lpszShareName), nLevel, + TRACE("(%s, %s, %u, %p, %lu, %p, %p)\n", debugstr_a(lpszServer), debugstr_a(lpszShareName), nLevel, lpBuffer, cBufSize, lpnTotalAvailable, lpnItems); return NDDE_NOT_IMPLEMENTED; @@ -87,7 +87,7 @@ UINT WINAPI NDdeShareGetInfoA(LPSTR lpszServer, LPSTR lpszShareName, UINT nLevel UINT WINAPI NDdeShareSetInfoA(LPSTR lpszServer, LPSTR lpszShareName, UINT nLevel, LPBYTE lpBuffer, DWORD cBufSize, WORD sParmNum) { - TRACE("(%s, %s, %u, %p, %u, %u)\n", debugstr_a(lpszServer), debugstr_a(lpszShareName), nLevel, + TRACE("(%s, %s, %u, %p, %lu, %u)\n", debugstr_a(lpszServer), debugstr_a(lpszShareName), nLevel, lpBuffer, cBufSize, sParmNum); return NDDE_NOT_IMPLEMENTED; @@ -99,7 +99,7 @@ UINT WINAPI NDdeShareSetInfoA(LPSTR lpszServer, LPSTR lpszShareName, UINT nLevel */ UINT WINAPI NDdeGetErrorStringA(UINT uErrorCode, LPSTR lpszErrorString, DWORD cBufSize) { - TRACE("(%u, %p, %d)\n", uErrorCode, lpszErrorString, cBufSize); + TRACE("(%u, %p, %ld)\n", uErrorCode, lpszErrorString, cBufSize); return NDDE_NOT_IMPLEMENTED; } @@ -133,7 +133,7 @@ BOOL WINAPI NDdeIsValidAppTopicListA(LPSTR targetTopic) UINT WINAPI NDdeGetShareSecurityA(LPSTR lpszServer, LPSTR lpszShareName, SECURITY_INFORMATION si, PSECURITY_DESCRIPTOR pSD, DWORD cbSD, LPDWORD lpcbsdRequired) { - TRACE("(%s, %s, %u, %p, %u, %p)\n", debugstr_a(lpszServer), debugstr_a(lpszShareName), + TRACE("(%s, %s, %lu, %p, %lu, %p)\n", debugstr_a(lpszServer), debugstr_a(lpszShareName), si, pSD, cbSD, lpcbsdRequired); return NDDE_NOT_IMPLEMENTED; @@ -146,7 +146,7 @@ UINT WINAPI NDdeGetShareSecurityA(LPSTR lpszServer, LPSTR lpszShareName, SECURIT UINT WINAPI NDdeSetShareSecurityA(LPSTR lpszServer, LPSTR lpszShareName, SECURITY_INFORMATION si, PSECURITY_DESCRIPTOR pSD) { - TRACE("(%s, %s, %u, %p)\n", debugstr_a(lpszServer), debugstr_a(lpszShareName), si, pSD); + TRACE("(%s, %s, %lu, %p)\n", debugstr_a(lpszServer), debugstr_a(lpszShareName), si, pSD); return NDDE_NOT_IMPLEMENTED; } @@ -170,7 +170,7 @@ UINT WINAPI NDdeGetTrustedShareA(LPSTR lpszServer, LPSTR lpszShareName, LPDWORD */ UINT WINAPI NDdeSetTrustedShareA(LPSTR lpszServer, LPSTR lpszShareName, DWORD dwTrustOptions) { - TRACE("(%s, %s, 0x%08x)\n", debugstr_a(lpszServer), debugstr_a(lpszShareName), dwTrustOptions); + TRACE("(%s, %s, 0x%08lx)\n", debugstr_a(lpszServer), debugstr_a(lpszShareName), dwTrustOptions); return NDDE_NOT_IMPLEMENTED; } @@ -182,7 +182,7 @@ UINT WINAPI NDdeSetTrustedShareA(LPSTR lpszServer, LPSTR lpszShareName, DWORD dw UINT WINAPI NDdeTrustedShareEnumA(LPSTR lpszServer, UINT nLevel, LPBYTE lpBuffer, DWORD cBufSize, LPDWORD lpnEntriesRead, LPDWORD lpcbTotalAvailable) { - TRACE("(%s, %u, %p, %u, %p, %p)\n", debugstr_a(lpszServer), nLevel, lpBuffer, cBufSize, + TRACE("(%s, %u, %p, %lu, %p, %p)\n", debugstr_a(lpszServer), nLevel, lpBuffer, cBufSize, lpnEntriesRead, lpcbTotalAvailable); return NDDE_NOT_IMPLEMENTED; @@ -195,7 +195,7 @@ UINT WINAPI NDdeTrustedShareEnumA(LPSTR lpszServer, UINT nLevel, LPBYTE lpBuffer UINT WINAPI NDdeShareAddW(LPWSTR lpszServer, UINT nLevel, PSECURITY_DESCRIPTOR pSD, LPBYTE lpBuffer, DWORD cBufSize) { - TRACE("(%s, %u, %p, %p, %u)\n", debugstr_w(lpszServer), nLevel, pSD, lpBuffer, cBufSize); + TRACE("(%s, %u, %p, %p, %lu)\n", debugstr_w(lpszServer), nLevel, pSD, lpBuffer, cBufSize); return NDDE_NOT_IMPLEMENTED; } @@ -218,7 +218,7 @@ UINT WINAPI NDdeShareDelW(LPWSTR lpszServer, LPWSTR lpszShareName, UINT wReserve UINT WINAPI NDdeShareEnumW(LPWSTR lpszServer, UINT nLevel, LPBYTE lpBuffer, DWORD cBufSize, LPDWORD lpnEntriesRead, LPDWORD lpcbTotalAvailable) { - TRACE("(%s, %u, %p, %u, %p, %p)\n", debugstr_w(lpszServer), nLevel, lpBuffer, cBufSize, + TRACE("(%s, %u, %p, %lu, %p, %p)\n", debugstr_w(lpszServer), nLevel, lpBuffer, cBufSize, lpnEntriesRead, lpcbTotalAvailable); return NDDE_NOT_IMPLEMENTED; @@ -231,7 +231,7 @@ UINT WINAPI NDdeShareEnumW(LPWSTR lpszServer, UINT nLevel, LPBYTE lpBuffer, DWOR UINT WINAPI NDdeShareGetInfoW(LPWSTR lpszServer, LPWSTR lpszShareName, UINT nLevel, LPBYTE lpBuffer, DWORD cBufSize, LPDWORD lpnTotalAvailable, LPWORD lpnItems) { - TRACE("(%s, %s, %u, %p, %u, %p, %p)\n", debugstr_w(lpszServer), debugstr_w(lpszShareName), nLevel, + TRACE("(%s, %s, %u, %p, %lu, %p, %p)\n", debugstr_w(lpszServer), debugstr_w(lpszShareName), nLevel, lpBuffer, cBufSize, lpnTotalAvailable, lpnItems); return NDDE_NOT_IMPLEMENTED; @@ -244,7 +244,7 @@ UINT WINAPI NDdeShareGetInfoW(LPWSTR lpszServer, LPWSTR lpszShareName, UINT nLev UINT WINAPI NDdeShareSetInfoW(LPWSTR lpszServer, LPWSTR lpszShareName, UINT nLevel, LPBYTE lpBuffer, DWORD cBufSize, WORD sParmNum) { - TRACE("(%s, %s, %u, %p, %u, %u)\n", debugstr_w(lpszServer), debugstr_w(lpszShareName), nLevel, + TRACE("(%s, %s, %u, %p, %lu, %u)\n", debugstr_w(lpszServer), debugstr_w(lpszShareName), nLevel, lpBuffer, cBufSize, sParmNum); return NDDE_NOT_IMPLEMENTED; @@ -256,7 +256,7 @@ UINT WINAPI NDdeShareSetInfoW(LPWSTR lpszServer, LPWSTR lpszShareName, UINT nLev */ UINT WINAPI NDdeGetErrorStringW(UINT uErrorCode, LPWSTR lpszErrorString, DWORD cBufSize) { - FIXME("(%u, %p, %d): stub!\n", uErrorCode, lpszErrorString, cBufSize); + FIXME("(%u, %p, %ld): stub!\n", uErrorCode, lpszErrorString, cBufSize); return NDDE_NOT_IMPLEMENTED; } @@ -290,7 +290,7 @@ BOOL WINAPI NDdeIsValidAppTopicListW(LPWSTR targetTopic) UINT WINAPI NDdeGetShareSecurityW(LPWSTR lpszServer, LPWSTR lpszShareName, SECURITY_INFORMATION si, PSECURITY_DESCRIPTOR pSD, DWORD cbSD, LPDWORD lpcbsdRequired) { - TRACE("(%s, %s, %u, %p, %u, %p)\n", debugstr_w(lpszServer), debugstr_w(lpszShareName), + TRACE("(%s, %s, %lu, %p, %lu, %p)\n", debugstr_w(lpszServer), debugstr_w(lpszShareName), si, pSD, cbSD, lpcbsdRequired); return NDDE_NOT_IMPLEMENTED; @@ -303,7 +303,7 @@ UINT WINAPI NDdeGetShareSecurityW(LPWSTR lpszServer, LPWSTR lpszShareName, SECUR UINT WINAPI NDdeSetShareSecurityW(LPWSTR lpszServer, LPWSTR lpszShareName, SECURITY_INFORMATION si, PSECURITY_DESCRIPTOR pSD) { - TRACE("(%s, %s, %u, %p)\n", debugstr_w(lpszServer), debugstr_w(lpszShareName), si, pSD); + TRACE("(%s, %s, %lu, %p)\n", debugstr_w(lpszServer), debugstr_w(lpszShareName), si, pSD); return NDDE_NOT_IMPLEMENTED; } @@ -327,7 +327,7 @@ UINT WINAPI NDdeGetTrustedShareW(LPWSTR lpszServer, LPWSTR lpszShareName, LPDWOR */ UINT WINAPI NDdeSetTrustedShareW(LPWSTR lpszServer, LPWSTR lpszShareName, DWORD dwTrustOptions) { - TRACE("(%s, %s, 0x%08x)\n", debugstr_w(lpszServer), debugstr_w(lpszShareName), dwTrustOptions); + TRACE("(%s, %s, 0x%08lx)\n", debugstr_w(lpszServer), debugstr_w(lpszShareName), dwTrustOptions); return NDDE_NOT_IMPLEMENTED; } @@ -339,7 +339,7 @@ UINT WINAPI NDdeSetTrustedShareW(LPWSTR lpszServer, LPWSTR lpszShareName, DWORD UINT WINAPI NDdeTrustedShareEnumW(LPWSTR lpszServer, UINT nLevel, LPBYTE lpBuffer, DWORD cBufSize, LPDWORD lpnEntriesRead, LPDWORD lpcbTotalAvailable) { - TRACE("(%s, %u, %p, %u, %p, %p)\n", debugstr_w(lpszServer), nLevel, lpBuffer, cBufSize, + TRACE("(%s, %u, %p, %lu, %p, %p)\n", debugstr_w(lpszServer), nLevel, lpBuffer, cBufSize, lpnEntriesRead, lpcbTotalAvailable); return NDDE_NOT_IMPLEMENTED;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ndis.sys/Makefile.in | 1 - dlls/ndis.sys/main.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/ndis.sys/Makefile.in b/dlls/ndis.sys/Makefile.in index 5d1d7973155..baeae05d5c4 100644 --- a/dlls/ndis.sys/Makefile.in +++ b/dlls/ndis.sys/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ndis.sys IMPORTS = advapi32 ntoskrnl iphlpapi diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index a0d2581aaa9..b5ce2fd8f5b 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -88,7 +88,7 @@ static void query_global_stats(IRP *irp, const MIB_IF_ROW2 *netdev) } default: - FIXME( "Unsupported OID %x\n", oid ); + FIXME( "Unsupported OID %lx\n", oid ); irp->IoStatus.u.Status = STATUS_INVALID_PARAMETER; break; } @@ -100,7 +100,7 @@ static NTSTATUS WINAPI ndis_ioctl(DEVICE_OBJECT *device, IRP *irp) MIB_IF_ROW2 *netdev = device->DeviceExtension; NTSTATUS status; - TRACE( "ioctl %x insize %u outsize %u\n", + TRACE( "ioctl %lx insize %lu outsize %lu\n", irpsp->Parameters.DeviceIoControl.IoControlCode, irpsp->Parameters.DeviceIoControl.InputBufferLength, irpsp->Parameters.DeviceIoControl.OutputBufferLength ); @@ -111,7 +111,7 @@ static NTSTATUS WINAPI ndis_ioctl(DEVICE_OBJECT *device, IRP *irp) query_global_stats(irp, netdev); break; default: - FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); + FIXME( "ioctl %lx not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); irp->IoStatus.u.Status = STATUS_NOT_SUPPORTED; break; } @@ -153,7 +153,7 @@ static int add_device(DRIVER_OBJECT *driver, const WCHAR *guidstrW, MIB_IF_ROW2 status = IoCreateSymbolicLink( &link, &name ); if (status) { - FIXME( "failed to create device error %x\n", status ); + FIXME( "failed to create device error %lx\n", status ); return 0; } @@ -200,7 +200,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) NDIS_STATUS WINAPI NdisAllocateMemoryWithTag(void **address, UINT length, ULONG tag) { - FIXME("(%p, %u, %u): stub\n", address, length, tag); + FIXME("(%p, %u, %lu): stub\n", address, length, tag); return NDIS_STATUS_FAILURE; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/netapi32/Makefile.in | 2 - dlls/netapi32/nbt.c | 2 - dlls/netapi32/netapi32.c | 140 +++++++++++++++++++++++---------------------- dlls/netapi32/netbios.c | 10 ++- 4 files changed, 77 insertions(+), 77 deletions(-) diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in index 91e7049617f..1f97d9797b9 100644 --- a/dlls/netapi32/Makefile.in +++ b/dlls/netapi32/Makefile.in @@ -1,4 +1,4 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES -D_SVRAPI_ +EXTRADEFS = -D_SVRAPI_ MODULE = netapi32.dll UNIXLIB = netapi32.so IMPORTLIB = netapi32 diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index c96faf8bc3c..c364a116fca 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -1098,7 +1098,7 @@ static UCHAR NetBTSend(void *adapt, void *sess, PNCB ncb) } else if (bytesSent < NBSS_HDRSIZE + ncb->ncb_length) { - FIXME("Only sent %d bytes (of %d), hanging up session\n", bytesSent, + FIXME("Only sent %ld bytes (of %d), hanging up session\n", bytesSent, NBSS_HDRSIZE + ncb->ncb_length); NetBIOSHangupSession(ncb); ret = NRC_SABORT; diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index b66b37933e9..e1c465c2243 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -92,7 +92,7 @@ static BOOL NETAPI_IsLocalComputer( LMCSTR name ) 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: @@ -126,7 +126,7 @@ NET_API_STATUS WINAPI NetServerEnum( LPDWORD resume_handle ) { - FIXME("Stub (%s %d %p %d %p %p %d %s %p)\n", debugstr_w(servername), + FIXME("Stub (%s %ld %p %ld %p %p %ld %s %p)\n", debugstr_w(servername), level, bufptr, prefmaxlen, entriesread, totalentries, servertype, debugstr_w(domain), resume_handle); @@ -147,7 +147,7 @@ NET_API_STATUS WINAPI NetServerEnumEx( LMCSTR domain, LMCSTR FirstNameToReturn) { - FIXME("Stub (%s %d %p %d %p %p %d %s %s)\n", + FIXME("Stub (%s %ld %p %ld %p %p %ld %s %s)\n", debugstr_w(ServerName), Level, Bufptr, PrefMaxlen, EntriesRead, totalentries, servertype, debugstr_w(domain), debugstr_w(FirstNameToReturn)); @@ -166,7 +166,7 @@ NET_API_STATUS WINAPI NetServerDiskEnum( LPDWORD totalentries, LPDWORD Resume_Handle) { - FIXME("Stub (%s %d %p %d %p %p %p)\n", debugstr_w(ServerName), + FIXME("Stub (%s %ld %p %ld %p %p %p)\n", debugstr_w(ServerName), Level, Bufptr, PrefMaxlen, EntriesRead, totalentries, Resume_Handle); return ERROR_NO_BROWSER_SERVERS_FOUND; @@ -180,7 +180,7 @@ NET_API_STATUS WINAPI NetServerGetInfo(LMSTR servername, DWORD level, LPBYTE* bu NET_API_STATUS ret; BOOL local = NETAPI_IsLocalComputer( servername ); - TRACE("%s %d %p\n", debugstr_w( servername ), level, bufptr ); + TRACE("%s %ld %p\n", debugstr_w( servername ), level, bufptr ); if (!local) { @@ -242,7 +242,7 @@ NET_API_STATUS WINAPI NetServerGetInfo(LMSTR servername, DWORD level, LPBYTE* bu } default: - FIXME("level %d unimplemented\n", level); + FIXME("level %ld unimplemented\n", level); ret = ERROR_INVALID_LEVEL; } return ret; @@ -264,7 +264,7 @@ NET_API_STATUS WINAPI NetStatisticsGet(LMSTR server, LMSTR service, } *stat; void *dataptr; - TRACE("(server %s, service %s, level %d, options %d, buffer %p): stub\n", + TRACE("(server %s, service %s, level %ld, options %ld, buffer %p): stub\n", debugstr_w(server), debugstr_w(service), level, options, bufptr); res = NetApiBufferAllocate(sizeof(*stat), &dataptr); @@ -300,7 +300,7 @@ NET_API_STATUS WINAPI NetStatisticsGet(LMSTR server, LMSTR service, NET_API_STATUS WINAPI NetUseEnum(LMSTR server, DWORD level, LPBYTE* bufptr, DWORD prefmaxsize, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resumehandle) { - FIXME("stub (%p, %d, %p, %d, %p, %p, %p)\n", server, level, bufptr, prefmaxsize, + FIXME("stub (%p, %ld, %p, %ld, %p, %p, %p)\n", server, level, bufptr, prefmaxsize, entriesread, totalentries, resumehandle); return ERROR_NOT_SUPPORTED; } @@ -313,7 +313,7 @@ NET_API_STATUS WINAPI NetScheduleJobAdd(LPCWSTR server, LPBYTE bufptr, LPDWORD j NET_API_STATUS WINAPI NetScheduleJobDel(LPCWSTR server, DWORD minjobid, DWORD maxjobid) { - TRACE("(%s, %u, %u)\n", debugstr_w(server), minjobid, maxjobid); + TRACE("(%s, %lu, %lu)\n", debugstr_w(server), minjobid, maxjobid); return NetrJobDel(server, minjobid, maxjobid); } @@ -323,7 +323,7 @@ NET_API_STATUS WINAPI NetScheduleJobEnum(LPCWSTR server, LPBYTE* bufptr, DWORD p AT_ENUM_CONTAINER container; NET_API_STATUS ret; - TRACE("(%s, %p, %u, %p, %p, %p)\n", debugstr_w(server), bufptr, prefmaxsize, entriesread, totalentries, resumehandle); + TRACE("(%s, %p, %lu, %p, %p, %p)\n", debugstr_w(server), bufptr, prefmaxsize, entriesread, totalentries, resumehandle); container.EntriesRead = 0; container.Buffer = NULL; @@ -338,13 +338,13 @@ NET_API_STATUS WINAPI NetScheduleJobEnum(LPCWSTR server, LPBYTE* bufptr, DWORD p NET_API_STATUS WINAPI NetScheduleJobGetInfo(LPCWSTR server, DWORD jobid, LPBYTE *bufptr) { - TRACE("(%s, %u, %p)\n", debugstr_w(server), jobid, bufptr); + TRACE("(%s, %lu, %p)\n", debugstr_w(server), jobid, bufptr); return NetrJobGetInfo(server, jobid, (LPAT_INFO *)bufptr); } NET_API_STATUS WINAPI NetUseGetInfo(LMSTR server, LMSTR name, DWORD level, LPBYTE *bufptr) { - FIXME("stub (%p, %p, %d, %p)\n", server, name, level, bufptr); + FIXME("stub (%p, %p, %ld, %p)\n", server, name, level, bufptr); return ERROR_NOT_SUPPORTED; } @@ -354,7 +354,7 @@ NET_API_STATUS WINAPI NetUseGetInfo(LMSTR server, LMSTR name, DWORD level, LPBYT */ NET_API_STATUS WINAPI NetApiBufferAllocate(DWORD ByteCount, LPVOID* Buffer) { - TRACE("(%d, %p)\n", ByteCount, Buffer); + TRACE("(%ld, %p)\n", ByteCount, Buffer); if (Buffer == NULL) return ERROR_INVALID_PARAMETER; *Buffer = HeapAlloc(GetProcessHeap(), 0, ByteCount); @@ -380,7 +380,7 @@ NET_API_STATUS WINAPI NetApiBufferFree(LPVOID Buffer) NET_API_STATUS WINAPI NetApiBufferReallocate(LPVOID OldBuffer, DWORD NewByteCount, LPVOID* NewBuffer) { - TRACE("(%p, %d, %p)\n", OldBuffer, NewByteCount, NewBuffer); + TRACE("(%p, %ld, %p)\n", OldBuffer, NewByteCount, NewBuffer); if (NewByteCount) { if (OldBuffer) @@ -408,7 +408,7 @@ NET_API_STATUS WINAPI NetApiBufferSize(LPVOID Buffer, LPDWORD ByteCount) if (Buffer == NULL) return ERROR_INVALID_PARAMETER; dw = HeapSize(GetProcessHeap(), 0, Buffer); - TRACE("size: %d\n", dw); + TRACE("size: %ld\n", dw); if (dw != 0xFFFFFFFF) *ByteCount = dw; else @@ -447,7 +447,7 @@ NET_API_STATUS WINAPI NetSessionEnum(LMSTR servername, LMSTR UncClientName, LMSTR username, DWORD level, LPBYTE* bufptr, DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resume_handle) { - FIXME("Stub (%s %s %s %d %p %d %p %p %p)\n", debugstr_w(servername), + FIXME("Stub (%s %s %s %ld %p %ld %p %p %p)\n", debugstr_w(servername), debugstr_w(UncClientName), debugstr_w(username), level, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); @@ -474,7 +474,7 @@ NET_API_STATUS WINAPI NetSessionEnum(LMSTR servername, LMSTR UncClientName, NET_API_STATUS WINAPI NetShareEnum( LMSTR servername, DWORD level, LPBYTE* bufptr, DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resume_handle) { - FIXME("Stub (%s %d %p %d %p %p %p)\n", debugstr_w(servername), level, bufptr, + FIXME("Stub (%s %ld %p %ld %p %p %p)\n", debugstr_w(servername), level, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); return ERROR_NOT_SUPPORTED; @@ -487,7 +487,7 @@ NET_API_STATUS WINAPI NetShareDel(LMSTR servername, LMSTR netname, DWORD reserve { BOOL local = NETAPI_IsLocalComputer( servername ); - TRACE("%s %s %d\n", debugstr_w(servername), debugstr_w(netname), reserved); + TRACE("%s %s %ld\n", debugstr_w(servername), debugstr_w(netname), reserved); if (!local) { @@ -499,7 +499,7 @@ NET_API_STATUS WINAPI NetShareDel(LMSTR servername, LMSTR netname, DWORD reserve FIXME( "remote computers not supported\n" ); } - FIXME("%s %s %d\n", debugstr_w(servername), debugstr_w(netname), reserved); + FIXME("%s %s %ld\n", debugstr_w(servername), debugstr_w(netname), reserved); return NERR_Success; } @@ -509,7 +509,7 @@ NET_API_STATUS WINAPI NetShareDel(LMSTR servername, LMSTR netname, DWORD reserve NET_API_STATUS WINAPI NetShareGetInfo(LMSTR servername, LMSTR netname, DWORD level, LPBYTE *bufptr) { - FIXME("Stub (%s %s %d %p)\n", debugstr_w(servername), + FIXME("Stub (%s %s %ld %p)\n", debugstr_w(servername), debugstr_w(netname),level, bufptr); return NERR_NetNameNotFound; } @@ -522,7 +522,7 @@ NET_API_STATUS WINAPI NetShareAdd(LMSTR servername, { BOOL local = NETAPI_IsLocalComputer( servername ); - TRACE("%s %d %p %p\n", debugstr_w(servername), level, buf, parm_err); + TRACE("%s %ld %p %p\n", debugstr_w(servername), level, buf, parm_err); if (!local) { @@ -534,7 +534,7 @@ NET_API_STATUS WINAPI NetShareAdd(LMSTR servername, FIXME( "remote computers not supported\n" ); } - FIXME("%s %d %p %p\n", debugstr_w(servername), level, buf, parm_err); + FIXME("%s %ld %p %p\n", debugstr_w(servername), level, buf, parm_err); return ERROR_NOT_SUPPORTED; } @@ -546,7 +546,7 @@ NET_API_STATUS WINAPI NetFileEnum( DWORD Level, LPBYTE* BufPtr, DWORD PrefMaxLen, LPDWORD EntriesRead, LPDWORD TotalEntries, PDWORD_PTR ResumeHandle) { - FIXME("(%s, %s, %s, %u): stub\n", debugstr_w(ServerName), debugstr_w(BasePath), + FIXME("(%s, %s, %s, %lu): stub\n", debugstr_w(ServerName), debugstr_w(BasePath), debugstr_w(UserName), Level); return ERROR_NOT_SUPPORTED; } @@ -732,7 +732,7 @@ NetWkstaTransportEnum(LMSTR ServerName, DWORD level, PBYTE* pbuf, { NET_API_STATUS ret; - TRACE(":%s, 0x%08x, %p, 0x%08x, %p, %p, %p\n", debugstr_w(ServerName), + TRACE(":%s, 0x%08lx, %p, 0x%08lx, %p, %p, %p\n", debugstr_w(ServerName), level, pbuf, prefmaxlen, read_entries, total_entries,hresume); if (!NETAPI_IsLocalComputer(ServerName)) { @@ -773,7 +773,7 @@ NetWkstaTransportEnum(LMSTR ServerName, DWORD level, PBYTE* pbuf, break; } default: - TRACE("Invalid level %d is specified\n", level); + TRACE("Invalid level %ld is specified\n", level); ret = ERROR_INVALID_LEVEL; } } @@ -788,7 +788,7 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level, { NET_API_STATUS nastatus; - TRACE("(%s, %d, %p)\n", debugstr_w(reserved), level, bufptr); + TRACE("(%s, %ld, %p)\n", debugstr_w(reserved), level, bufptr); switch (level) { case 0: @@ -856,7 +856,7 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level, &PolicyHandle); if (NtStatus != STATUS_SUCCESS) { - TRACE("LsaOpenPolicyFailed with NT status %x\n", + TRACE("LsaOpenPolicyFailed with NT status %lx\n", LsaNtStatusToWinError(NtStatus)); NetApiBufferFree(ui0); return ERROR_NOT_ENOUGH_MEMORY; @@ -920,7 +920,7 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LMSTR reserved, DWORD level, break; } default: - TRACE("Invalid level %d is specified\n", level); + TRACE("Invalid level %ld is specified\n", level); return ERROR_INVALID_LEVEL; } return NERR_Success; @@ -934,7 +934,7 @@ NetWkstaUserEnum(LMSTR servername, DWORD level, LPBYTE* bufptr, DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resumehandle) { - FIXME("(%s, %d, %p, %d, %p, %p, %p): stub!\n", debugstr_w(servername), + FIXME("(%s, %ld, %p, %ld, %p, %p, %p): stub!\n", debugstr_w(servername), level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle); return ERROR_INVALID_PARAMETER; } @@ -982,7 +982,7 @@ NET_API_STATUS WINAPI NetWkstaGetInfo( LMSTR servername, DWORD level, NET_API_STATUS ret; BOOL local = NETAPI_IsLocalComputer( servername ); - TRACE("%s %d %p\n", debugstr_w( servername ), level, bufptr ); + TRACE("%s %ld %p\n", debugstr_w( servername ), level, bufptr ); if (!local) { @@ -1067,7 +1067,7 @@ NET_API_STATUS WINAPI NetWkstaGetInfo( LMSTR servername, DWORD level, } default: - FIXME("level %d unimplemented\n", level); + FIXME("level %ld unimplemented\n", level); ret = ERROR_INVALID_LEVEL; } return ret; @@ -1107,7 +1107,7 @@ NET_API_STATUS NET_API_FUNCTION NetUserGetGroups( LPDWORD entriesread, LPDWORD totalentries) { - FIXME("%s %s %d %p %d %p %p stub\n", debugstr_w(servername), + FIXME("%s %s %ld %p %ld %p %p stub\n", debugstr_w(servername), debugstr_w(username), level, bufptr, prefixmaxlen, entriesread, totalentries); @@ -1213,7 +1213,7 @@ NET_API_STATUS WINAPI NetUserAdd(LPCWSTR servername, NET_API_STATUS status; struct sam_user * su = NULL; - FIXME("(%s, %d, %p, %p) stub!\n", debugstr_w(servername), level, bufptr, parm_err); + FIXME("(%s, %ld, %p, %p) stub!\n", debugstr_w(servername), level, bufptr, parm_err); if((status = NETAPI_ValidateServername(servername)) != NERR_Success) return status; @@ -1268,7 +1268,7 @@ NET_API_STATUS WINAPI NetUserAdd(LPCWSTR servername, return NERR_Success; } default: - TRACE("Invalid level %d specified.\n", level); + TRACE("Invalid level %ld specified.\n", level); status = ERROR_INVALID_LEVEL; break; } @@ -1312,7 +1312,7 @@ NetUserGetInfo(LPCWSTR servername, LPCWSTR username, DWORD level, LPBYTE* bufptr) { NET_API_STATUS status; - TRACE("(%s, %s, %d, %p)\n", debugstr_w(servername), debugstr_w(username), + TRACE("(%s, %s, %ld, %p)\n", debugstr_w(servername), debugstr_w(username), level, bufptr); status = NETAPI_ValidateServername(servername); if (status != NERR_Success) @@ -1466,11 +1466,11 @@ NetUserGetInfo(LPCWSTR servername, LPCWSTR username, DWORD level, case 1052: case 1053: { - FIXME("Level %d is not implemented\n", level); + FIXME("Level %ld is not implemented\n", level); return NERR_InternalError; } default: - TRACE("Invalid level %d is specified\n", level); + TRACE("Invalid level %ld is specified\n", level); return ERROR_INVALID_LEVEL; } return NERR_Success; @@ -1490,7 +1490,7 @@ NetUserGetLocalGroups(LPCWSTR servername, LPCWSTR username, DWORD level, LOCALGROUP_USERS_INFO_0* info; DWORD size; - FIXME("(%s, %s, %d, %08x, %p %d, %p, %p) stub!\n", + FIXME("(%s, %s, %ld, %08lx, %p %ld, %p, %p) stub!\n", debugstr_w(servername), debugstr_w(username), level, flags, bufptr, prefmaxlen, entriesread, totalentries); @@ -1548,7 +1548,7 @@ NetUserEnum(LPCWSTR servername, DWORD level, DWORD filter, LPBYTE* bufptr, WCHAR user[UNLEN + 1]; DWORD size, len = ARRAY_SIZE(user); - TRACE("(%s, %u, 0x%x, %p, %u, %p, %p, %p)\n", debugstr_w(servername), level, + TRACE("(%s, %lu, 0x%lx, %p, %lu, %p, %p, %p)\n", debugstr_w(servername), level, filter, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); status = NETAPI_ValidateServername(servername); @@ -1634,7 +1634,7 @@ NetUserEnum(LPCWSTR servername, DWORD level, DWORD filter, LPBYTE* bufptr, break; } default: - FIXME("level %u not supported\n", level); + FIXME("level %lu not supported\n", level); return ERROR_INVALID_LEVEL; } return NERR_Success; @@ -1760,7 +1760,7 @@ NetQueryDisplayInformation( DWORD PreferredMaximumLength, LPDWORD ReturnedEntryCount, PVOID *SortedBuffer) { - TRACE("(%s, %d, %d, %d, %d, %p, %p)\n", debugstr_w(ServerName), + TRACE("(%s, %ld, %ld, %ld, %ld, %p, %p)\n", debugstr_w(ServerName), Level, Index, EntriesRequested, PreferredMaximumLength, ReturnedEntryCount, SortedBuffer); @@ -1792,7 +1792,7 @@ NetQueryDisplayInformation( */ int records = 3; - FIXME("Level %d partially implemented\n", Level); + FIXME("Level %ld partially implemented\n", Level); *ReturnedEntryCount = records; comment_sz = 1; full_name_sz = 1; @@ -1852,12 +1852,12 @@ NetQueryDisplayInformation( case 2: case 3: { - FIXME("Level %d is not implemented\n", Level); + FIXME("Level %ld is not implemented\n", Level); break; } default: - TRACE("Invalid level %d is specified\n", Level); + TRACE("Invalid level %ld is specified\n", Level); return ERROR_INVALID_LEVEL; } return NERR_Success; @@ -1910,7 +1910,7 @@ NET_API_STATUS WINAPI NetGroupEnum(LPCWSTR servername, DWORD level, LPBYTE *bufptr, DWORD prefmaxlen, LPDWORD entriesread, LPDWORD totalentries, LPDWORD resume_handle) { - FIXME("(%s, %d, %p, %d, %p, %p, %p) stub!\n", debugstr_w(servername), + FIXME("(%s, %ld, %p, %ld, %p, %p, %p) stub!\n", debugstr_w(servername), level, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); return ERROR_ACCESS_DENIED; } @@ -1921,7 +1921,7 @@ NetGroupEnum(LPCWSTR servername, DWORD level, LPBYTE *bufptr, DWORD prefmaxlen, */ NET_API_STATUS WINAPI NetGroupGetInfo(LPCWSTR servername, LPCWSTR groupname, DWORD level, LPBYTE *bufptr) { - FIXME("(%s, %s, %d, %p) stub!\n", debugstr_w(servername), debugstr_w(groupname), level, bufptr); + FIXME("(%s, %s, %ld, %p) stub!\n", debugstr_w(servername), debugstr_w(groupname), level, bufptr); return ERROR_ACCESS_DENIED; } @@ -1954,7 +1954,7 @@ NET_API_STATUS WINAPI NetGroupGetInfo(LPCWSTR servername, LPCWSTR groupname, DWO NET_API_STATUS WINAPI NetUserModalsGet( LPCWSTR szServer, DWORD level, LPBYTE *pbuffer) { - TRACE("(%s %d %p)\n", debugstr_w(szServer), level, pbuffer); + TRACE("(%s %ld %p)\n", debugstr_w(szServer), level, pbuffer); switch (level) { @@ -1987,7 +1987,7 @@ NET_API_STATUS WINAPI NetUserModalsGet( &policyHandle); if (ntStatus != STATUS_SUCCESS) { - WARN("LsaOpenPolicy failed with NT status %x\n", + WARN("LsaOpenPolicy failed with NT status %lx\n", LsaNtStatusToWinError(ntStatus)); return ntStatus; } @@ -1997,7 +1997,7 @@ NET_API_STATUS WINAPI NetUserModalsGet( (PVOID *)&domainInfo); if (ntStatus != STATUS_SUCCESS) { - WARN("LsaQueryInformationPolicy failed with NT status %x\n", + WARN("LsaQueryInformationPolicy failed with NT status %lx\n", LsaNtStatusToWinError(ntStatus)); LsaClose(policyHandle); return ntStatus; @@ -2040,7 +2040,7 @@ NET_API_STATUS WINAPI NetUserModalsGet( *pbuffer = NULL; return NERR_InternalError; default: - TRACE("Invalid level %d is specified\n", level); + TRACE("Invalid level %ld is specified\n", level); *pbuffer = NULL; return ERROR_INVALID_LEVEL; } @@ -2093,13 +2093,13 @@ NET_API_STATUS WINAPI NetUserChangePassword(LPCWSTR domainname, LPCWSTR username NET_API_STATUS WINAPI NetUseAdd(LMSTR servername, DWORD level, LPBYTE bufptr, LPDWORD parm_err) { - FIXME("%s %d %p %p stub\n", debugstr_w(servername), level, bufptr, parm_err); + FIXME("%s %ld %p %p stub\n", debugstr_w(servername), level, bufptr, parm_err); return NERR_Success; } NET_API_STATUS WINAPI NetUseDel(LMSTR servername, LMSTR usename, DWORD forcecond) { - FIXME("%s %s %d stub\n", debugstr_w(servername), debugstr_w(usename), forcecond); + FIXME("%s %s %ld stub\n", debugstr_w(servername), debugstr_w(usename), forcecond); return NERR_Success; } @@ -2135,7 +2135,7 @@ static DWORD get_dc_info(const WCHAR *domain, WCHAR *dc, WCHAR *ip) wcscat( name, domain ); ret = DnsQuery_W(name, DNS_TYPE_SRV, DNS_QUERY_STANDARD, NULL, &rec, NULL); - TRACE("DnsQuery_W(%s) => %d\n", wine_dbgstr_w(domain), ret); + TRACE("DnsQuery_W(%s) => %ld\n", wine_dbgstr_w(domain), ret); if (ret == ERROR_SUCCESS) { TRACE("target %s, port %d\n", wine_dbgstr_w(rec->Data.Srv.pNameTarget), rec->Data.Srv.wPort); @@ -2145,7 +2145,7 @@ static DWORD get_dc_info(const WCHAR *domain, WCHAR *dc, WCHAR *ip) /* IPv4 */ ret = DnsQuery_W(dc, DNS_TYPE_A, DNS_QUERY_STANDARD, NULL, &rec, NULL); - TRACE("DnsQuery_W(%s) => %d\n", wine_dbgstr_w(dc), ret); + TRACE("DnsQuery_W(%s) => %ld\n", wine_dbgstr_w(dc), ret); if (ret == ERROR_SUCCESS) { SOCKADDR_IN addr; @@ -2156,7 +2156,7 @@ static DWORD get_dc_info(const WCHAR *domain, WCHAR *dc, WCHAR *ip) size = IP6_ADDRESS_STRING_LENGTH; ret = WSAAddressToStringW((SOCKADDR *)&addr, sizeof(addr), NULL, ip, &size); if (!ret) - TRACE("WSAAddressToStringW => %d, %s\n", ret, wine_dbgstr_w(ip)); + TRACE("WSAAddressToStringW => %ld, %s\n", ret, wine_dbgstr_w(ip)); DnsRecordListFree(rec, DnsFreeRecordList); @@ -2165,7 +2165,7 @@ static DWORD get_dc_info(const WCHAR *domain, WCHAR *dc, WCHAR *ip) /* IPv6 */ ret = DnsQuery_W(dc, DNS_TYPE_AAAA, DNS_QUERY_STANDARD, NULL, &rec, NULL); - TRACE("DnsQuery_W(%s) => %d\n", wine_dbgstr_w(dc), ret); + TRACE("DnsQuery_W(%s) => %ld\n", wine_dbgstr_w(dc), ret); if (ret == ERROR_SUCCESS) { SOCKADDR_IN6 addr; @@ -2177,7 +2177,7 @@ static DWORD get_dc_info(const WCHAR *domain, WCHAR *dc, WCHAR *ip) size = IP6_ADDRESS_STRING_LENGTH; ret = WSAAddressToStringW((SOCKADDR *)&addr, sizeof(addr), NULL, ip, &size); if (!ret) - TRACE("WSAAddressToStringW => %d, %s\n", ret, wine_dbgstr_w(ip)); + TRACE("WSAAddressToStringW => %ld, %s\n", ret, wine_dbgstr_w(ip)); DnsRecordListFree(rec, DnsFreeRecordList); } @@ -2197,7 +2197,7 @@ DWORD WINAPI DsGetDcNameW(LPCWSTR computer, LPCWSTR domain, GUID *domain_guid, WCHAR dc[NS_MAXDNAME], ip[IP6_ADDRESS_STRING_LENGTH]; DWORD size; - FIXME("(%s, %s, %s, %s, %08x, %p): semi-stub\n", debugstr_w(computer), + FIXME("(%s, %s, %s, %s, %08lx, %p): semi-stub\n", debugstr_w(computer), debugstr_w(domain), debugstr_guid(domain_guid), debugstr_w(site), flags, dc_info); if (!dc_info) return ERROR_INVALID_PARAMETER; @@ -2264,7 +2264,7 @@ DWORD WINAPI DsGetDcNameA(LPCSTR ComputerName, LPCSTR AvoidDCName, GUID* DomainGuid, LPCSTR SiteName, ULONG Flags, PDOMAIN_CONTROLLER_INFOA *DomainControllerInfo) { - FIXME("(%s, %s, %s, %s, %08x, %p): stub\n", debugstr_a(ComputerName), + FIXME("(%s, %s, %s, %s, %08lx, %p): stub\n", debugstr_a(ComputerName), debugstr_a(AvoidDCName), debugstr_guid(DomainGuid), debugstr_a(SiteName), Flags, DomainControllerInfo); return ERROR_CALL_NOT_IMPLEMENTED; @@ -2341,7 +2341,7 @@ DWORD WINAPI DsRoleGetPrimaryDomainInformation( POLICY_VIEW_LOCAL_INFORMATION, &PolicyHandle); if (NtStatus != STATUS_SUCCESS) { - TRACE("LsaOpenPolicyFailed with NT status %x\n", + TRACE("LsaOpenPolicyFailed with NT status %lx\n", LsaNtStatusToWinError(NtStatus)); return ERROR_OUTOFMEMORY; } @@ -2382,7 +2382,7 @@ NET_API_STATUS WINAPI NetLocalGroupAdd( LPBYTE buf, LPDWORD parm_err) { - FIXME("(%s %d %p %p) stub!\n", debugstr_w(servername), level, buf, + FIXME("(%s %ld %p %p) stub!\n", debugstr_w(servername), level, buf, parm_err); return NERR_Success; } @@ -2410,7 +2410,7 @@ NET_API_STATUS WINAPI NetLocalGroupAddMembers( LPBYTE buf, DWORD totalentries) { - FIXME("(%s %s %d %p %d) stub!\n", debugstr_w(servername), + FIXME("(%s %s %ld %p %ld) stub!\n", debugstr_w(servername), debugstr_w(groupname), level, buf, totalentries); return NERR_Success; } @@ -2449,7 +2449,7 @@ NET_API_STATUS WINAPI NetLocalGroupDelMembers( LPBYTE buf, DWORD totalentries) { - FIXME("(%s %s %d %p %d) stub!\n", debugstr_w(servername), + FIXME("(%s %s %ld %p %ld) stub!\n", debugstr_w(servername), debugstr_w(groupname), level, buf, totalentries); return NERR_Success; } @@ -2466,7 +2466,7 @@ NET_API_STATUS WINAPI NetLocalGroupEnum( LPDWORD totalentries, PDWORD_PTR resumehandle) { - FIXME("(%s %d %p %d %p %p %p) stub!\n", debugstr_w(servername), + FIXME("(%s %ld %p %ld %p %p %p) stub!\n", debugstr_w(servername), level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle); *entriesread = 0; *totalentries = 0; @@ -2486,7 +2486,7 @@ NET_API_STATUS WINAPI NetLocalGroupGetInfo( LOCALGROUP_INFO_1* info; DWORD size; - FIXME("(%s %s %d %p) semi-stub!\n", debugstr_w(servername), + FIXME("(%s %s %ld %p) semi-stub!\n", debugstr_w(servername), debugstr_w(groupname), level, bufptr); size = sizeof(*info) + sizeof(WCHAR) * (lstrlenW(groupname)+1) + sizeof(commentW); @@ -2516,7 +2516,7 @@ NET_API_STATUS WINAPI NetLocalGroupGetMembers( LPDWORD totalentries, PDWORD_PTR resumehandle) { - FIXME("(%s %s %d %p %d, %p %p %p) stub!\n", debugstr_w(servername), + FIXME("(%s %s %ld %p %ld, %p %p %p) stub!\n", debugstr_w(servername), debugstr_w(localgroupname), level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle); @@ -2567,7 +2567,7 @@ NET_API_STATUS WINAPI NetLocalGroupSetInfo( LPBYTE buf, LPDWORD parm_err) { - FIXME("(%s %s %d %p %p) stub!\n", debugstr_w(servername), + FIXME("(%s %s %ld %p %p) stub!\n", debugstr_w(servername), debugstr_w(groupname), level, buf, parm_err); return NERR_Success; } @@ -2582,7 +2582,7 @@ NET_API_STATUS WINAPI NetLocalGroupSetMembers( LPBYTE buf, DWORD totalentries) { - FIXME("(%s %s %d %p %d) stub!\n", debugstr_w(servername), + FIXME("(%s %s %ld %p %ld) stub!\n", debugstr_w(servername), debugstr_w(groupname), level, buf, totalentries); return NERR_Success; } @@ -2764,7 +2764,7 @@ DWORD WINAPI DavGetUNCFromHTTPPath(const WCHAR *http_path, WCHAR *buf, DWORD *bu */ DWORD WINAPI DsEnumerateDomainTrustsA(LPSTR server, ULONG flags, PDS_DOMAIN_TRUSTSA* domains, PULONG count) { - FIXME("(%s, 0x%04x, %p, %p): stub\n", debugstr_a(server), flags, domains, count); + FIXME("(%s, 0x%04lx, %p, %p): stub\n", debugstr_a(server), flags, domains, count); return ERROR_NO_LOGON_SERVERS; } @@ -2773,7 +2773,7 @@ DWORD WINAPI DsEnumerateDomainTrustsA(LPSTR server, ULONG flags, PDS_DOMAIN_TRUS */ DWORD WINAPI DsEnumerateDomainTrustsW(LPWSTR server, ULONG flags, PDS_DOMAIN_TRUSTSW* domains, PULONG count) { - FIXME("(%s, 0x%04x, %p, %p): stub\n", debugstr_w(server), flags, domains, count); + FIXME("(%s, 0x%04lx, %p, %p): stub\n", debugstr_w(server), flags, domains, count); return ERROR_NO_LOGON_SERVERS; } diff --git a/dlls/netapi32/netbios.c b/dlls/netapi32/netbios.c index 83375f39f92..e74c9bf1b0f 100644 --- a/dlls/netapi32/netbios.c +++ b/dlls/netapi32/netbios.c @@ -132,7 +132,7 @@ BOOL NetBIOSRegisterTransport(ULONG id, NetBIOSTransport *transport) { BOOL ret; - TRACE(": transport 0x%08x, p %p\n", id, transport); + TRACE(": transport 0x%08lx, p %p\n", id, transport); if (!transport) ret = FALSE; else if (gNumTransports >= ARRAY_SIZE(gTransports)) @@ -149,7 +149,7 @@ BOOL NetBIOSRegisterTransport(ULONG id, NetBIOSTransport *transport) { if (gTransports[i].id == id) { - WARN("Replacing NetBIOS transport ID %d\n", id); + WARN("Replacing NetBIOS transport ID %ld\n", id); memcpy(&gTransports[i].transport, transport, sizeof(NetBIOSTransport)); ret = TRUE; @@ -177,7 +177,7 @@ BOOL NetBIOSRegisterAdapter(ULONG transport, DWORD ifIndex, void *data) BOOL ret; UCHAR i; - TRACE(": transport 0x%08x, ifIndex 0x%08x, data %p\n", transport, ifIndex, + TRACE(": transport 0x%08lx, ifIndex 0x%08lx, data %p\n", transport, ifIndex, data); for (i = 0; i < gNumTransports && gTransports[i].id != transport; i++) ; @@ -185,7 +185,7 @@ BOOL NetBIOSRegisterAdapter(ULONG transport, DWORD ifIndex, void *data) { NetBIOSTransport *transportPtr = &gTransports[i].transport; - TRACE(": found transport %p for id 0x%08x\n", transportPtr, transport); + TRACE(": found transport %p for id 0x%08lx\n", transportPtr, transport); EnterCriticalSection(&gNBTable.cs); ret = FALSE; @@ -296,7 +296,7 @@ UCHAR NetBIOSNumAdapters(void) void NetBIOSEnumAdapters(ULONG transport, NetBIOSEnumAdaptersCallback cb, void *closure) { - TRACE("transport 0x%08x, callback %p, closure %p\n", transport, cb, + TRACE("transport 0x%08lx, callback %p, closure %p\n", transport, cb, closure); if (cb) {
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/netcfgx/Makefile.in | 1 - dlls/netcfgx/main.c | 2 +- dlls/netcfgx/netcfg.c | 6 +++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/netcfgx/Makefile.in b/dlls/netcfgx/Makefile.in index 127110f8b05..7d4b3b5a203 100644 --- a/dlls/netcfgx/Makefile.in +++ b/dlls/netcfgx/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = netcfgx.dll IMPORTS = uuid diff --git a/dlls/netcfgx/main.c b/dlls/netcfgx/main.c index f8ca2b9c594..d3dcf4a73e3 100644 --- a/dlls/netcfgx/main.c +++ b/dlls/netcfgx/main.c @@ -98,7 +98,7 @@ static HRESULT WINAPI netcfgcf_CreateInstance(IClassFactory *iface,LPUNKNOWN pOu } else { - WARN("Cannot create an instance object. 0x%08x\n", hr); + WARN("Cannot create an instance object. 0x%08lx\n", hr); } return hr; } diff --git a/dlls/netcfgx/netcfg.c b/dlls/netcfgx/netcfg.c index 90bfe750d68..c64c248609f 100644 --- a/dlls/netcfgx/netcfg.c +++ b/dlls/netcfgx/netcfg.c @@ -75,7 +75,7 @@ static ULONG WINAPI netcfg_AddRef(INetCfg *iface) NetConfiguration *This = impl_from_INetCfg(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("%p ref=%u\n", This, ref); + TRACE("%p ref=%lu\n", This, ref); return ref; } @@ -85,7 +85,7 @@ static ULONG WINAPI netcfg_Release(INetCfg *iface) NetConfiguration *This = impl_from_INetCfg(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("%p ref=%u\n", This, ref); + TRACE("%p ref=%lu\n", This, ref); if (ref == 0) { @@ -190,7 +190,7 @@ static HRESULT WINAPI netcfglock_AcquireWriteLock(INetCfgLock *iface, DWORD cmsT LPCWSTR pszwClientDescription, LPWSTR *ppszwClientDescription) { NetConfiguration *This = impl_from_INetCfgLock(iface); - FIXME("%p %d %s %p\n", This, cmsTimeout, debugstr_w(pszwClientDescription), ppszwClientDescription); + FIXME("%p %ld %s %p\n", This, cmsTimeout, debugstr_w(pszwClientDescription), ppszwClientDescription); return S_OK; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/netio.sys/Makefile.in | 1 - dlls/netio.sys/netio.c | 52 ++++++++++++++++++++++---------------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/netio.sys/Makefile.in b/dlls/netio.sys/Makefile.in index c8ddc1fb066..1cbac91c037 100644 --- a/dlls/netio.sys/Makefile.in +++ b/dlls/netio.sys/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = netio.sys IMPORTLIB = netio IMPORTS = ntoskrnl ws2_32 diff --git a/dlls/netio.sys/netio.c b/dlls/netio.sys/netio.c index fe73b06b978..cad6dc32f1f 100644 --- a/dlls/netio.sys/netio.c +++ b/dlls/netio.sys/netio.c @@ -133,7 +133,7 @@ static NTSTATUS sock_error_to_ntstatus(DWORD err) case WSAECONNABORTED: return STATUS_CONNECTION_ABORTED; case WSAHOST_NOT_FOUND: return STATUS_NOT_FOUND; default: - FIXME("Unmapped error %u.\n", err); + FIXME("Unmapped error %lu.\n", err); return STATUS_UNSUCCESSFUL; } } @@ -218,7 +218,7 @@ static struct wsk_pending_io *find_pending_io(struct wsk_socket_internal *socket static void dispatch_pending_io(struct wsk_pending_io *io, NTSTATUS status, ULONG_PTR information) { - TRACE("io %p, status %#x, information %#lx.\n", io, status, information); + TRACE("io %p, status %#lx, information %#Ix.\n", io, status, information); io->irp->IoStatus.Information = information; dispatch_irp(io->irp, status); @@ -229,8 +229,8 @@ static NTSTATUS WINAPI wsk_control_socket(WSK_SOCKET *socket, WSK_CONTROL_SOCKET ULONG control_code, ULONG level, SIZE_T input_size, void *input_buffer, SIZE_T output_size, void *output_buffer, SIZE_T *output_size_returned, IRP *irp) { - FIXME("socket %p, request_type %u, control_code %#x, level %u, input_size %lu, input_buffer %p, " - "output_size %lu, output_buffer %p, output_size_returned %p, irp %p stub.\n", + FIXME("socket %p, request_type %u, control_code %#lx, level %lu, input_size %Iu, input_buffer %p, " + "output_size %Iu, output_buffer %p, output_size_returned %p, irp %p stub.\n", socket, request_type, control_code, level, input_size, input_buffer, output_size, output_buffer, output_size_returned, irp); @@ -286,7 +286,7 @@ static NTSTATUS WINAPI wsk_bind(WSK_SOCKET *socket, SOCKADDR *local_address, ULO struct wsk_socket_internal *s = wsk_socket_internal_from_wsk_socket(socket); NTSTATUS status; - TRACE("socket %p, local_address %p, flags %#x, irp %p.\n", + TRACE("socket %p, local_address %p, flags %#lx, irp %p.\n", socket, local_address, flags, irp); if (!irp) @@ -302,7 +302,7 @@ static NTSTATUS WINAPI wsk_bind(WSK_SOCKET *socket, SOCKADDR *local_address, ULO if (status == STATUS_SUCCESS) s->bound = TRUE; - TRACE("status %#x.\n", status); + TRACE("status %#lx.\n", status); irp->IoStatus.Information = 0; dispatch_irp(irp, status); return STATUS_PENDING; @@ -357,7 +357,7 @@ static void WINAPI accept_callback(TP_CALLBACK_INSTANCE *instance, void *socket_ struct wsk_pending_io *io; DWORD size; - TRACE("instance %p, socket %p, wait %p, wait_result %#x.\n", instance, socket, wait, wait_result); + TRACE("instance %p, socket %p, wait %p, wait_result %#lx.\n", instance, socket, wait, wait_result); lock_socket(socket); context = &socket->callback_context.listen_socket_callback_context; @@ -412,7 +412,7 @@ static NTSTATUS WINAPI wsk_accept(WSK_SOCKET *listen_socket, ULONG flags, void * DWORD size; int error; - TRACE("listen_socket %p, flags %#x, accept_socket_context %p, accept_socket_dispatch %p, " + TRACE("listen_socket %p, flags %#lx, accept_socket_context %p, accept_socket_dispatch %p, " "local_address %p, remote_address %p, irp %p.\n", listen_socket, flags, accept_socket_context, accept_socket_dispatch, local_address, remote_address, irp); @@ -505,7 +505,7 @@ static void WINAPI connect_callback(TP_CALLBACK_INSTANCE *instance, void *socket struct wsk_pending_io *io; DWORD size; - TRACE("instance %p, socket %p, wait %p, wait_result %#x.\n", instance, socket, wait, wait_result); + TRACE("instance %p, socket %p, wait %p, wait_result %#lx.\n", instance, socket, wait, wait_result); lock_socket(socket); io = find_pending_io(socket, wait); @@ -537,7 +537,7 @@ static NTSTATUS WINAPI wsk_connect(WSK_SOCKET *socket, SOCKADDR *remote_address, struct wsk_pending_io *io; int error; - TRACE("socket %p, remote_address %p, flags %#x, irp %p.\n", + TRACE("socket %p, remote_address %p, flags %#lx, irp %p.\n", socket, remote_address, flags, irp); if (!irp) @@ -592,7 +592,7 @@ static void WINAPI send_receive_callback(TP_CALLBACK_INSTANCE *instance, void *s struct wsk_pending_io *io; DWORD length, flags; - TRACE("instance %p, socket %p, wait %p, wait_result %#x.\n", instance, socket, wait, wait_result); + TRACE("instance %p, socket %p, wait %p, wait_result %#lx.\n", instance, socket, wait, wait_result); lock_socket(socket); io = find_pending_io(socket, wait); @@ -614,7 +614,7 @@ static NTSTATUS do_send_receive(WSK_SOCKET *socket, WSK_BUF *wsk_buf, ULONG flag DWORD length; int error; - TRACE("socket %p, buffer %p, flags %#x, irp %p, is_send %#x.\n", + TRACE("socket %p, buffer %p, flags %#lx, irp %p, is_send %#x.\n", socket, wsk_buf, flags, irp, is_send); if (!irp) @@ -632,7 +632,7 @@ static NTSTATUS do_send_receive(WSK_SOCKET *socket, WSK_BUF *wsk_buf, ULONG flag } if (flags) - FIXME("flags %#x not implemented.\n", flags); + FIXME("flags %#lx not implemented.\n", flags); lock_socket(s); if (!(io = allocate_pending_io(s, send_receive_callback, irp))) @@ -669,21 +669,21 @@ static NTSTATUS do_send_receive(WSK_SOCKET *socket, WSK_BUF *wsk_buf, ULONG flag static NTSTATUS WINAPI wsk_send(WSK_SOCKET *socket, WSK_BUF *buffer, ULONG flags, IRP *irp) { - TRACE("socket %p, buffer %p, flags %#x, irp %p.\n", socket, buffer, flags, irp); + TRACE("socket %p, buffer %p, flags %#lx, irp %p.\n", socket, buffer, flags, irp); return do_send_receive(socket, buffer, flags, irp, TRUE); } static NTSTATUS WINAPI wsk_receive(WSK_SOCKET *socket, WSK_BUF *buffer, ULONG flags, IRP *irp) { - TRACE("socket %p, buffer %p, flags %#x, irp %p.\n", socket, buffer, flags, irp); + TRACE("socket %p, buffer %p, flags %#lx, irp %p.\n", socket, buffer, flags, irp); return do_send_receive(socket, buffer, flags, irp, FALSE); } static NTSTATUS WINAPI wsk_disconnect(WSK_SOCKET *socket, WSK_BUF *buffer, ULONG flags, IRP *irp) { - FIXME("socket %p, buffer %p, flags %#x, irp %p stub.\n", socket, buffer, flags, irp); + FIXME("socket %p, buffer %p, flags %#lx, irp %p stub.\n", socket, buffer, flags, irp); return STATUS_NOT_IMPLEMENTED; } @@ -698,7 +698,7 @@ static NTSTATUS WINAPI wsk_release(WSK_SOCKET *socket, WSK_DATA_INDICATION *data static NTSTATUS WINAPI wsk_connext_ex(WSK_SOCKET *socket, SOCKADDR *remote_address, WSK_BUF *buffer, ULONG flags, IRP *irp) { - FIXME("socket %p, remote_address %p, buffer %p, flags %#x, irp %p stub.\n", + FIXME("socket %p, remote_address %p, buffer %p, flags %#lx, irp %p stub.\n", socket, remote_address, buffer, flags, irp); return STATUS_NOT_IMPLEMENTED; @@ -745,7 +745,7 @@ static NTSTATUS WINAPI wsk_socket(WSK_CLIENT *client, ADDRESS_FAMILY address_fam NTSTATUS status; SOCKET s; - TRACE("client %p, address_family %#x, socket_type %#x, protocol %#x, flags %#x, socket_context %p, dispatch %p, " + TRACE("client %p, address_family %#x, socket_type %#x, protocol %#lx, flags %#lx, socket_context %p, dispatch %p, " "owning_process %p, owning_thread %p, security_descriptor %p, irp %p.\n", client, address_family, socket_type, protocol, flags, socket_context, dispatch, owning_process, owning_thread, security_descriptor, irp); @@ -790,7 +790,7 @@ static NTSTATUS WINAPI wsk_socket(WSK_CLIENT *client, ADDRESS_FAMILY address_fam break; default: - FIXME("Flags %#x not implemented.\n", flags); + FIXME("Flags %#lx not implemented.\n", flags); closesocket(s); heap_free(socket); status = STATUS_NOT_IMPLEMENTED; @@ -812,8 +812,8 @@ static NTSTATUS WINAPI wsk_socket_connect(WSK_CLIENT *client, USHORT socket_type const WSK_CLIENT_CONNECTION_DISPATCH *dispatch, PEPROCESS owning_process, PETHREAD owning_thread, SECURITY_DESCRIPTOR *security_descriptor, IRP *irp) { - FIXME("client %p, socket_type %#x, protocol %#x, local_address %p, remote_address %p, " - "flags %#x, socket_context %p, dispatch %p, owning_process %p, owning_thread %p, " + FIXME("client %p, socket_type %#x, protocol %#lx, local_address %p, remote_address %p, " + "flags %#lx, socket_context %p, dispatch %p, owning_process %p, owning_thread %p, " "security_descriptor %p, irp %p stub.\n", client, socket_type, protocol, local_address, remote_address, flags, socket_context, dispatch, owning_process, owning_thread, security_descriptor, irp); @@ -826,7 +826,7 @@ static NTSTATUS WINAPI wsk_control_client(WSK_CLIENT *client, ULONG control_code IRP *irp ) { - FIXME("client %p, control_code %#x, input_size %lu, input_buffer %p, output_size %lu, " + FIXME("client %p, control_code %#lx, input_size %Iu, input_buffer %p, output_size %Iu, " "output_buffer %p, output_size_returned %p, irp %p, stub.\n", client, control_code, input_size, input_buffer, output_size, output_buffer, output_size_returned, irp); @@ -868,7 +868,7 @@ static NTSTATUS WINAPI wsk_get_address_info(WSK_CLIENT *client, UNICODE_STRING * struct wsk_get_address_info_context *context; NTSTATUS status; - TRACE("client %p, node_name %p, service_name %p, name_space %#x, provider %p, hints %p, " + TRACE("client %p, node_name %p, service_name %p, name_space %#lx, provider %p, hints %p, " "result %p, owning_process %p, owning_thread %p, irp %p.\n", client, node_name, service_name, name_space, provider, hints, result, owning_process, owning_thread, irp); @@ -915,8 +915,8 @@ static NTSTATUS WINAPI wsk_get_name_info(WSK_CLIENT *client, SOCKADDR *sock_addr UNICODE_STRING *node_name, UNICODE_STRING *service_name, ULONG flags, PEPROCESS owning_process, PETHREAD owning_thread, IRP *irp) { - FIXME("client %p, sock_addr %p, sock_addr_length %u, node_name %p, service_name %p, " - "flags %#x, owning_process %p, owning_thread %p, irp %p stub.\n", + FIXME("client %p, sock_addr %p, sock_addr_length %lu, node_name %p, service_name %p, " + "flags %#lx, owning_process %p, owning_thread %p, irp %p stub.\n", client, sock_addr, sock_addr_length, node_name, service_name, flags, owning_process, owning_thread, irp); @@ -939,7 +939,7 @@ NTSTATUS WINAPI WskCaptureProviderNPI(WSK_REGISTRATION *wsk_registration, ULONG { WSK_CLIENT *client = wsk_registration->ReservedRegistrationContext; - TRACE("wsk_registration %p, wait_timeout %u, wsk_provider_npi %p.\n", + TRACE("wsk_registration %p, wait_timeout %lu, wsk_provider_npi %p.\n", wsk_registration, wait_timeout, wsk_provider_npi); wsk_provider_npi->Client = client;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/netprofm/Makefile.in | 1 - dlls/netprofm/list.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/netprofm/Makefile.in b/dlls/netprofm/Makefile.in index ebb644c0b4f..c491c483c3a 100644 --- a/dlls/netprofm/Makefile.in +++ b/dlls/netprofm/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = netprofm.dll IMPORTS = iphlpapi diff --git a/dlls/netprofm/list.c b/dlls/netprofm/list.c index 40d2fd9763c..254cf60c263 100644 --- a/dlls/netprofm/list.c +++ b/dlls/netprofm/list.c @@ -226,7 +226,7 @@ static HRESULT WINAPI connection_point_Unadvise( struct connection_point *cp = impl_from_IConnectionPoint( iface ); struct sink_entry *iter; - TRACE( "%p, %d\n", cp, cookie ); + TRACE( "%p, %ld\n", cp, cookie ); LIST_FOR_EACH_ENTRY( iter, &cp->sinks, struct sink_entry, entry ) { @@ -779,7 +779,7 @@ static HRESULT WINAPI networks_enum_Next( struct networks_enum *iter = impl_from_IEnumNetworks( iface ); ULONG i = 0; - TRACE( "%p, %u %p %p\n", iter, count, ret, fetched ); + TRACE( "%p, %lu %p %p\n", iter, count, ret, fetched ); if (fetched) *fetched = 0; if (!count) return S_OK; @@ -802,7 +802,7 @@ static HRESULT WINAPI networks_enum_Skip( { struct networks_enum *iter = impl_from_IEnumNetworks( iface ); - TRACE( "%p, %u\n", iter, count); + TRACE( "%p, %lu\n", iter, count); if (!count) return S_OK; if (!iter->cursor) return S_FALSE; @@ -999,7 +999,7 @@ static HRESULT WINAPI connections_enum_Next( struct connections_enum *iter = impl_from_IEnumNetworkConnections( iface ); ULONG i = 0; - TRACE( "%p, %u %p %p\n", iter, count, ret, fetched ); + TRACE( "%p, %lu %p %p\n", iter, count, ret, fetched ); if (!ret) return E_POINTER; *ret = NULL; @@ -1024,7 +1024,7 @@ static HRESULT WINAPI connections_enum_Skip( { struct connections_enum *iter = impl_from_IEnumNetworkConnections( iface ); - TRACE( "%p, %u\n", iter, count); + TRACE( "%p, %lu\n", iter, count); if (!count) return S_OK; if (!iter->cursor) return S_FALSE;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/newdev/Makefile.in | 1 - dlls/newdev/main.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/newdev/Makefile.in b/dlls/newdev/Makefile.in index 25f2fea0518..c447a388614 100644 --- a/dlls/newdev/Makefile.in +++ b/dlls/newdev/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = newdev.dll IMPORTLIB = newdev IMPORTS = setupapi diff --git a/dlls/newdev/main.c b/dlls/newdev/main.c index 72e7cbc690d..54f572c3d08 100644 --- a/dlls/newdev/main.c +++ b/dlls/newdev/main.c @@ -101,11 +101,11 @@ BOOL WINAPI UpdateDriverForPlugAndPlayDevicesW(HWND parent, const WCHAR *hardwar DIF_NEWDEVICEWIZARD_FINISHINSTALL, }; - TRACE("parent %p, hardware_id %s, inf_path %s, flags %#x, reboot %p.\n", + TRACE("parent %p, hardware_id %s, inf_path %s, flags %#lx, reboot %p.\n", parent, debugstr_w(hardware_id), debugstr_w(inf_path), flags, reboot); if (flags) - FIXME("Unhandled flags %#x.\n", flags); + FIXME("Unhandled flags %#lx.\n", flags); if (reboot) *reboot = FALSE; @@ -154,7 +154,7 @@ BOOL WINAPI UpdateDriverForPlugAndPlayDevicesW(HWND parent, const WCHAR *hardwar */ BOOL WINAPI DiInstallDriverA(HWND parent, const char *inf_path, DWORD flags, BOOL *reboot) { - FIXME("parent %p, inf_path %s, flags %#x, reboot %p, stub!\n", parent, debugstr_a(inf_path), flags, reboot); + FIXME("parent %p, inf_path %s, flags %#lx, reboot %p, stub!\n", parent, debugstr_a(inf_path), flags, reboot); return TRUE; } @@ -163,6 +163,6 @@ BOOL WINAPI DiInstallDriverA(HWND parent, const char *inf_path, DWORD flags, BOO */ BOOL WINAPI DiInstallDriverW(HWND parent, const WCHAR *inf_path, DWORD flags, BOOL *reboot) { - FIXME("parent %p, inf_path %s, flags %#x, reboot %p, stub!\n", parent, debugstr_w(inf_path), flags, reboot); + FIXME("parent %p, inf_path %s, flags %#lx, reboot %p, stub!\n", parent, debugstr_w(inf_path), flags, reboot); return TRUE; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntdsapi/Makefile.in | 1 - dlls/ntdsapi/ntdsapi.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdsapi/Makefile.in b/dlls/ntdsapi/Makefile.in index 350a1e2aa5b..263b0d45333 100644 --- a/dlls/ntdsapi/Makefile.in +++ b/dlls/ntdsapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ntdsapi.dll IMPORTLIB = ntdsapi IMPORTS = user32 diff --git a/dlls/ntdsapi/ntdsapi.c b/dlls/ntdsapi/ntdsapi.c index 2438197a7a3..a6b6c90c9d7 100644 --- a/dlls/ntdsapi/ntdsapi.c +++ b/dlls/ntdsapi/ntdsapi.c @@ -218,7 +218,7 @@ DWORD WINAPI DsClientMakeSpnForTargetServerW(LPCWSTR class, LPCWSTR name, DWORD DWORD WINAPI DsCrackNamesA(HANDLE handle, DS_NAME_FLAGS flags, DS_NAME_FORMAT offered, DS_NAME_FORMAT desired, DWORD num, const CHAR **names, PDS_NAME_RESULTA *result) { - FIXME("(%p %u %u %u %u %p %p stub\n", handle, flags, offered, desired, num, names, result); + FIXME("(%p %u %u %u %lu %p %p stub\n", handle, flags, offered, desired, num, names, result); return ERROR_CALL_NOT_IMPLEMENTED; } @@ -228,6 +228,6 @@ DWORD WINAPI DsCrackNamesA(HANDLE handle, DS_NAME_FLAGS flags, DS_NAME_FORMAT of DWORD WINAPI DsCrackNamesW(HANDLE handle, DS_NAME_FLAGS flags, DS_NAME_FORMAT offered, DS_NAME_FORMAT desired, DWORD num, const WCHAR **names, PDS_NAME_RESULTW *result) { - FIXME("(%p %u %u %u %u %p %p stub\n", handle, flags, offered, desired, num, names, result); + FIXME("(%p %u %u %u %lu %p %p stub\n", handle, flags, offered, desired, num, names, result); return ERROR_CALL_NOT_IMPLEMENTED; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntoskrnl.exe/Makefile.in | 1 dlls/ntoskrnl.exe/instr.c | 30 +++++---- dlls/ntoskrnl.exe/ntoskrnl.c | 132 +++++++++++++++++++++-------------------- dlls/ntoskrnl.exe/pnp.c | 62 ++++++++++--------- dlls/ntoskrnl.exe/sync.c | 26 ++++---- 5 files changed, 125 insertions(+), 126 deletions(-) diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in index 1bbe6f2615f..e7b070bb750 100644 --- a/dlls/ntoskrnl.exe/Makefile.in +++ b/dlls/ntoskrnl.exe/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ntoskrnl.exe IMPORTLIB = ntoskrnl IMPORTS = advapi32 hal msvcrt diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c index f6c775e2597..8f1aa4d45a3 100644 --- a/dlls/ntoskrnl.exe/instr.c +++ b/dlls/ntoskrnl.exe/instr.c @@ -353,7 +353,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) { int reg = (instr[2] >> 3) & 7; DWORD *data = get_reg_address( context, instr[2] ); - TRACE( "mov cr%u,%s at 0x%08x\n", reg, reg_names[instr[2] & 7], context->Eip ); + TRACE( "mov cr%u,%s at 0x%08lx\n", reg, reg_names[instr[2] & 7], context->Eip ); switch (reg) { case 0: *data = CR0_PE|CR0_ET|CR0_NE|CR0_WP|CR0_AM|CR0_PG; break; @@ -369,7 +369,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) { int reg = (instr[2] >> 3) & 7; DWORD *data = get_reg_address( context, instr[2] ); - TRACE( "mov dr%u,%s at 0x%08x\n", reg, reg_names[instr[2] & 7], context->Eip ); + TRACE( "mov dr%u,%s at 0x%08lx\n", reg, reg_names[instr[2] & 7], context->Eip ); switch (reg) { case 0: *data = context->Dr0; break; @@ -387,7 +387,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) { int reg = (instr[2] >> 3) & 7; DWORD *data = get_reg_address( context, instr[2] ); - TRACE( "mov %s,cr%u at 0x%08x, %s=%08x\n", reg_names[instr[2] & 7], + TRACE( "mov %s,cr%u at 0x%08lx, %s=%08lx\n", reg_names[instr[2] & 7], reg, context->Eip, reg_names[instr[2] & 7], *data ); switch (reg) { @@ -404,7 +404,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) { int reg = (instr[2] >> 3) & 7; DWORD *data = get_reg_address( context, instr[2] ); - TRACE( "mov %s,dr%u at 0x%08x %s=%08x\n", reg_names[instr[2] & 7], + TRACE( "mov %s,dr%u at 0x%08lx %s=%08lx\n", reg_names[instr[2] & 7], reg, context->Eip, reg_names[instr[2] & 7], *data ); switch (reg) { @@ -735,7 +735,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) int reg = REGMODRM_REG( instr[2], rex ); int rm = REGMODRM_RM( instr[2], rex ); DWORD64 *data = get_int_reg( context, rm ); - TRACE( "mov cr%u,%s at %lx\n", reg, reg_names[rm], context->Rip ); + TRACE( "mov cr%u,%s at %Ix\n", reg, reg_names[rm], context->Rip ); switch (reg) { case 0: *data = 0x10; break; /* FIXME: set more bits ? */ @@ -753,7 +753,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) int reg = REGMODRM_REG( instr[2], rex ); int rm = REGMODRM_RM( instr[2], rex ); DWORD64 *data = get_int_reg( context, rm ); - TRACE( "mov dr%u,%s at %lx\n", reg, reg_names[rm], context->Rip ); + TRACE( "mov dr%u,%s at %Ix\n", reg, reg_names[rm], context->Rip ); switch (reg) { case 0: *data = context->Dr0; break; @@ -774,7 +774,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) int reg = REGMODRM_REG( instr[2], rex ); int rm = REGMODRM_RM( instr[2], rex ); DWORD64 *data = get_int_reg( context, rm ); - TRACE( "mov %s,cr%u at %lx, %s=%lx\n", reg_names[rm], reg, context->Rip, reg_names[rm], *data ); + TRACE( "mov %s,cr%u at %Ix, %s=%Ix\n", reg_names[rm], reg, context->Rip, reg_names[rm], *data ); switch (reg) { case 0: break; @@ -792,7 +792,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) int reg = REGMODRM_REG( instr[2], rex ); int rm = REGMODRM_RM( instr[2], rex ); DWORD64 *data = get_int_reg( context, rm ); - TRACE( "mov %s,dr%u at %lx, %s=%lx\n", reg_names[rm], reg, context->Rip, reg_names[rm], *data ); + TRACE( "mov %s,dr%u at %Ix, %s=%Ix\n", reg_names[rm], reg, context->Rip, reg_names[rm], *data ); switch (reg) { case 0: context->Dr0 = *data; break; @@ -811,7 +811,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) case 0x32: /* rdmsr */ { ULONG reg = context->Rcx; - TRACE("rdmsr CR 0x%08x\n", reg); + TRACE("rdmsr CR 0x%08lx\n", reg); switch (reg) { case MSR_LSTAR: @@ -822,7 +822,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context ) break; } default: - FIXME("reg %#x, returning 0.\n", reg); + FIXME("reg %#lx, returning 0.\n", reg); context->Rdx = 0; context->Rax = 0; break; @@ -935,14 +935,14 @@ LONG CALLBACK vectored_handler( EXCEPTION_POINTERS *ptrs ) { if (emulate_instruction( record, context ) == ExceptionContinueExecution) { - TRACE( "next instruction rip=%lx\n", context->Rip ); - TRACE( " rax=%016lx rbx=%016lx rcx=%016lx rdx=%016lx\n", + TRACE( "next instruction rip=%Ix\n", context->Rip ); + TRACE( " rax=%016Ix rbx=%016Ix rcx=%016Ix rdx=%016Ix\n", context->Rax, context->Rbx, context->Rcx, context->Rdx ); - TRACE( " rsi=%016lx rdi=%016lx rbp=%016lx rsp=%016lx\n", + TRACE( " rsi=%016Ix rdi=%016Ix rbp=%016Ix rsp=%016Ix\n", context->Rsi, context->Rdi, context->Rbp, context->Rsp ); - TRACE( " r8=%016lx r9=%016lx r10=%016lx r11=%016lx\n", + TRACE( " r8=%016Ix r9=%016Ix r10=%016Ix r11=%016Ix\n", context->R8, context->R9, context->R10, context->R11 ); - TRACE( " r12=%016lx r13=%016lx r14=%016lx r15=%016lx\n", + TRACE( " r12=%016Ix r13=%016Ix r14=%016Ix r15=%016Ix\n", context->R12, context->R13, context->R14, context->R15 ); return EXCEPTION_CONTINUE_EXECUTION; diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 38a25bc5092..f8e1c24bb49 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -173,7 +173,7 @@ void *alloc_kernel_object( POBJECT_TYPE type, HANDLE handle, SIZE_T size, LONG r status = wine_server_call( req ); } SERVER_END_REQ; - if (status) FIXME( "set_object_reference failed: %#x\n", status ); + if (status) FIXME( "set_object_reference failed: %#lx\n", status ); } header->ref = ref; @@ -200,7 +200,7 @@ void WINAPI ObDereferenceObject( void *obj ) EnterCriticalSection( &obref_cs ); ref = --header->ref; - TRACE( "(%p) ref=%u\n", obj, ref ); + TRACE( "(%p) ref=%lu\n", obj, ref ); if (!ref) { if (header->type->release) @@ -236,7 +236,7 @@ void ObReferenceObject( void *obj ) EnterCriticalSection( &obref_cs ); ref = ++header->ref; - TRACE( "(%p) ref=%u\n", obj, ref ); + TRACE( "(%p) ref=%lu\n", obj, ref ); if (ref == 1) { SERVER_START_REQ( grab_kernel_object ) @@ -357,7 +357,7 @@ NTSTATUS WINAPI ObReferenceObjectByHandle( HANDLE handle, ACCESS_MASK access, { NTSTATUS status; - TRACE( "%p %x %p %d %p %p\n", handle, access, type, mode, ptr, info ); + TRACE( "%p %lx %p %d %p %p\n", handle, access, type, mode, ptr, info ); if (mode != KernelMode) { @@ -379,7 +379,7 @@ NTSTATUS WINAPI ObOpenObjectByPointer( void *obj, ULONG attr, ACCESS_STATE *acce { NTSTATUS status; - TRACE( "%p %x %p %x %p %d %p\n", obj, attr, access_state, access, type, mode, handle ); + TRACE( "%p %lx %p %lx %p %d %p\n", obj, attr, access_state, access, type, mode, handle ); if (mode != KernelMode) { @@ -387,7 +387,7 @@ NTSTATUS WINAPI ObOpenObjectByPointer( void *obj, ULONG attr, ACCESS_STATE *acce return STATUS_NOT_IMPLEMENTED; } - if (attr & ~OBJ_KERNEL_HANDLE) FIXME( "attr %#x not supported\n", attr ); + if (attr & ~OBJ_KERNEL_HANDLE) FIXME( "attr %#lx not supported\n", attr ); if (access_state) FIXME( "access_state not implemented\n" ); if (type && ObGetObjectType( obj ) != type) return STATUS_OBJECT_TYPE_MISMATCH; @@ -541,7 +541,7 @@ static NTSTATUS dispatch_irp( DEVICE_OBJECT *device, IRP *irp, struct dispatch_c device->CurrentIrp = NULL; if (status != STATUS_PENDING && !irp_data->complete) - ERR( "dispatch routine returned %#x but didn't complete the IRP\n", status ); + ERR( "dispatch routine returned %#lx but didn't complete the IRP\n", status ); return status; } @@ -640,7 +640,7 @@ static NTSTATUS dispatch_read( struct dispatch_context *context ) device = IoGetAttachedDevice( file->DeviceObject ); - TRACE( "device %p file %p size %u\n", device, file, out_size ); + TRACE( "device %p file %p size %lu\n", device, file, out_size ); if (!(out_buff = HeapAlloc( GetProcessHeap(), 0, out_size ))) return STATUS_NO_MEMORY; @@ -678,7 +678,7 @@ static NTSTATUS dispatch_write( struct dispatch_context *context ) device = IoGetAttachedDevice( file->DeviceObject ); - TRACE( "device %p file %p size %u\n", device, file, context->in_size ); + TRACE( "device %p file %p size %lu\n", device, file, context->in_size ); offset.QuadPart = context->params.write.pos; @@ -742,7 +742,7 @@ static NTSTATUS dispatch_ioctl( struct dispatch_context *context ) device = IoGetAttachedDevice( file->DeviceObject ); - TRACE( "ioctl %x device %p file %p in_size %u out_size %u\n", + TRACE( "ioctl %x device %p file %p in_size %lu out_size %lu\n", context->params.ioctl.code, device, file, context->in_size, out_size ); if (out_size) @@ -805,7 +805,7 @@ static NTSTATUS dispatch_volume( struct dispatch_context *context ) device = IoGetAttachedDevice( file->DeviceObject ); - TRACE( "class 0x%x device %p file %p in_size %u out_size %u\n", + TRACE( "class 0x%x device %p file %p in_size %lu out_size %lu\n", context->params.volume.info_class, device, file, context->in_size, out_size ); if (!(out_buff = HeapAlloc( GetProcessHeap(), 0, out_size ))) return STATUS_NO_MEMORY; @@ -1073,7 +1073,7 @@ NTSTATUS WINAPI IoAllocateDriverObjectExtension( PDRIVER_OBJECT DriverObject, ULONG DriverObjectExtensionSize, PVOID *DriverObjectExtension ) { - FIXME( "stub: %p, %p, %u, %p\n", DriverObject, ClientIdentificationAddress, + FIXME( "stub: %p, %p, %lu, %p\n", DriverObject, ClientIdentificationAddress, DriverObjectExtensionSize, DriverObjectExtension ); return STATUS_NOT_IMPLEMENTED; } @@ -1112,7 +1112,7 @@ void WINAPI IoReuseIrp(IRP *irp, NTSTATUS iostatus) { UCHAR AllocationFlags; - TRACE("irp %p, iostatus %#x.\n", irp, iostatus); + TRACE("irp %p, iostatus %#lx.\n", irp, iostatus); AllocationFlags = irp->AllocationFlags; IoInitializeIrp(irp, irp->Size, irp->StackCount); @@ -1216,7 +1216,7 @@ PMDL WINAPI IoAllocateMdl( PVOID va, ULONG length, BOOLEAN secondary, BOOLEAN ch SIZE_T mdl_size; PMDL mdl; - TRACE("(%p, %u, %i, %i, %p)\n", va, length, secondary, charge_quota, irp); + TRACE("(%p, %lu, %i, %i, %p)\n", va, length, secondary, charge_quota, irp); if (charge_quota) FIXME("Charge quota is not yet supported\n"); @@ -1359,7 +1359,7 @@ PIRP WINAPI IoBuildDeviceIoControlRequest( ULONG code, PDEVICE_OBJECT device, PIO_STACK_LOCATION irpsp; MDL *mdl; - TRACE( "%x, %p, %p, %u, %p, %u, %u, %p, %p\n", + TRACE( "%lx, %p, %p, %lu, %p, %lu, %u, %p, %p\n", code, device, in_buff, in_len, out_buff, out_len, internal, event, iosb ); if (device == NULL) @@ -1419,7 +1419,7 @@ PIRP WINAPI IoBuildAsynchronousFsdRequest(ULONG majorfunc, DEVICE_OBJECT *device PIRP irp; PIO_STACK_LOCATION irpsp; - TRACE( "(%d %p %p %d %p %p)\n", majorfunc, device, buffer, length, startoffset, iosb ); + TRACE( "(%ld %p %p %ld %p %p)\n", majorfunc, device, buffer, length, startoffset, iosb ); if (!(irp = IoAllocateIrp( device->StackSize, FALSE ))) return NULL; @@ -1473,7 +1473,7 @@ PIRP WINAPI IoBuildSynchronousFsdRequest(ULONG majorfunc, PDEVICE_OBJECT device, { IRP *irp; - TRACE("(%d %p %p %d %p %p)\n", majorfunc, device, buffer, length, startoffset, iosb); + TRACE("(%ld %p %p %ld %p %p)\n", majorfunc, device, buffer, length, startoffset, iosb); irp = IoBuildAsynchronousFsdRequest( majorfunc, device, buffer, length, startoffset, iosb ); if (!irp) return NULL; @@ -1619,7 +1619,7 @@ NTSTATUS WINAPI IoCreateDeviceSecure( DRIVER_OBJECT *driver, ULONG ext_size, PCUNICODE_STRING sddl, LPCGUID guid, DEVICE_OBJECT **ret_device ) { - FIXME( "(%p, %u, %s, %u, %x, %u, %s, %s, %p): semi-stub\n", + FIXME( "(%p, %lu, %s, %lu, %lx, %u, %s, %s, %p): semi-stub\n", driver, ext_size, debugstr_us(name), type, characteristics, exclusive, debugstr_us(sddl), wine_dbgstr_guid(guid), ret_device ); @@ -1642,7 +1642,7 @@ NTSTATUS WINAPI IoCreateDevice( DRIVER_OBJECT *driver, ULONG ext_size, static unsigned int auto_idx = 0; WCHAR autoW[17]; - TRACE( "(%p, %u, %s, %u, %x, %u, %p)\n", + TRACE( "(%p, %lu, %s, %lu, %lx, %u, %p)\n", driver, ext_size, debugstr_us(name), type, characteristics, exclusive, ret_device ); if (!(wine_device = alloc_kernel_object( IoDeviceObjectType, NULL, sizeof(struct wine_device) + ext_size, 1 ))) @@ -1811,7 +1811,7 @@ NTSTATUS WINAPI IoGetDeviceInterfaces( const GUID *InterfaceClassGuid, PDEVICE_OBJECT PhysicalDeviceObject, ULONG Flags, PWSTR *SymbolicLinkList ) { - FIXME( "stub: %s %p %x %p\n", debugstr_guid(InterfaceClassGuid), + FIXME( "stub: %s %p %lx %p\n", debugstr_guid(InterfaceClassGuid), PhysicalDeviceObject, Flags, SymbolicLinkList ); return STATUS_NOT_IMPLEMENTED; } @@ -1825,7 +1825,7 @@ NTSTATUS WINAPI IoGetDeviceObjectPointer( UNICODE_STRING *name, ACCESS_MASK acc static DEVICE_OBJECT stub_device; static DRIVER_OBJECT stub_driver; - FIXME( "stub: %s %x %p %p\n", debugstr_us(name), access, file, device ); + FIXME( "stub: %s %lx %p %p\n", debugstr_us(name), access, file, device ); stub_device.StackSize = 0x80; /* minimum value to appease SecuROM 5.x */ stub_device.DriverObject = &stub_driver; @@ -1854,7 +1854,7 @@ NTSTATUS WINAPI IoCallDriver( DEVICE_OBJECT *device, IRP *irp ) status = dispatch( device, irp ); - TRACE_(relay)( "\1Ret driver dispatch %p (device=%p,irp=%p) retval=%08x\n", + TRACE_(relay)( "\1Ret driver dispatch %p (device=%p,irp=%p) retval=%08lx\n", dispatch, device, irp, status ); return status; @@ -2024,7 +2024,7 @@ NTSTATUS WINAPI IoReportResourceForDetection( DRIVER_OBJECT *drv_obj, CM_RESOURC DEVICE_OBJECT *dev_obj, CM_RESOURCE_LIST *dev_list, ULONG dev_size, BOOLEAN *conflict ) { - FIXME( "(%p, %p, %u, %p, %p, %u, %p): stub\n", drv_obj, drv_list, drv_size, + FIXME( "(%p, %p, %lu, %p, %p, %lu, %p): stub\n", drv_obj, drv_list, drv_size, dev_obj, dev_list, dev_size, conflict ); return STATUS_NOT_IMPLEMENTED; @@ -2038,7 +2038,7 @@ NTSTATUS WINAPI IoReportResourceUsage( UNICODE_STRING *name, DRIVER_OBJECT *drv_ ULONG drv_size, DRIVER_OBJECT *dev_obj, CM_RESOURCE_LIST *dev_list, ULONG dev_size, BOOLEAN overwrite, BOOLEAN *conflict ) { - FIXME( "(%s, %p, %p, %u, %p, %p, %u, %d, %p): stub\n", debugstr_us(name), + FIXME( "(%s, %p, %p, %lu, %p, %p, %lu, %d, %p): stub\n", debugstr_us(name), drv_obj, drv_list, drv_size, dev_obj, dev_list, dev_size, overwrite, conflict ); return STATUS_NOT_IMPLEMENTED; @@ -2085,7 +2085,7 @@ VOID WINAPI IoCompleteRequest( IRP *irp, UCHAR priority_boost ) { TRACE( "calling %p( %p, %p, %p )\n", routine, device, irp, irpsp->Context ); stat = routine( device, irp, irpsp->Context ); - TRACE( "CompletionRoutine returned %x\n", stat ); + TRACE( "CompletionRoutine returned %lx\n", stat ); if (STATUS_MORE_PROCESSING_REQUIRED == stat) return; } @@ -2211,7 +2211,7 @@ PVOID WINAPI ExAllocatePoolWithTag( POOL_TYPE type, SIZE_T size, ULONG tag ) { /* FIXME: handle page alignment constraints */ void *ret = HeapAlloc( ntoskrnl_heap, 0, size ); - TRACE( "%lu pool %u -> %p\n", size, type, ret ); + TRACE( "%Iu pool %u -> %p\n", size, type, ret ); return ret; } @@ -2301,7 +2301,7 @@ void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST lookaside, ULONG tag, USHORT depth) { - TRACE( "%p, %p, %p, %u, %lu, %u, %u\n", lookaside, allocate, free, flags, size, tag, depth ); + TRACE( "%p, %p, %p, %lu, %Iu, %lu, %u\n", lookaside, allocate, free, flags, size, tag, depth ); initialize_lookaside_list( &lookaside->L, allocate, free, NonPagedPool | flags, size, tag ); } @@ -2316,7 +2316,7 @@ void WINAPI ExInitializePagedLookasideList(PPAGED_LOOKASIDE_LIST lookaside, ULONG tag, USHORT depth) { - TRACE( "%p, %p, %p, %u, %lu, %u, %u\n", lookaside, allocate, free, flags, size, tag, depth ); + TRACE( "%p, %p, %p, %lu, %Iu, %lu, %u\n", lookaside, allocate, free, flags, size, tag, depth ); initialize_lookaside_list( &lookaside->L, allocate, free, PagedPool | flags, size, tag ); } @@ -2354,7 +2354,7 @@ NTSTATUS WINAPI ExInitializeZone(PZONE_HEADER Zone, PVOID InitialSegment, ULONG InitialSegmentSize) { - FIXME( "stub: %p, %u, %p, %u\n", Zone, BlockSize, InitialSegment, InitialSegmentSize ); + FIXME( "stub: %p, %lu, %p, %lu\n", Zone, BlockSize, InitialSegment, InitialSegmentSize ); return STATUS_NOT_IMPLEMENTED; } @@ -2435,7 +2435,7 @@ NTSTATUS WINAPI PsLookupProcessByProcessId( HANDLE processid, PEPROCESS *process */ HANDLE WINAPI PsGetProcessId(PEPROCESS process) { - TRACE( "%p -> %lx\n", process, process->info.UniqueProcessId ); + TRACE( "%p -> %Ix\n", process, process->info.UniqueProcessId ); return (HANDLE)process->info.UniqueProcessId; } @@ -2636,7 +2636,7 @@ ULONG WINAPI KeQueryTimeIncrement(void) */ KPRIORITY WINAPI KeSetPriorityThread( PKTHREAD Thread, KPRIORITY Priority ) { - FIXME("(%p %d)\n", Thread, Priority); + FIXME("(%p %ld)\n", Thread, Priority); return Priority; } @@ -2654,7 +2654,7 @@ KAFFINITY WINAPI KeSetSystemAffinityThreadEx(KAFFINITY affinity) PKTHREAD thread = KeGetCurrentThread(); GROUP_AFFINITY old, new; - TRACE("affinity %#lx.\n", affinity); + TRACE("affinity %#Ix.\n", affinity); affinity &= system_affinity; @@ -2686,7 +2686,7 @@ void WINAPI KeRevertToUserAffinityThreadEx(KAFFINITY affinity) PRKTHREAD thread = KeGetCurrentThread(); GROUP_AFFINITY new; - TRACE("affinity %#lx.\n", affinity); + TRACE("affinity %#Ix.\n", affinity); affinity &= system_affinity; @@ -2712,7 +2712,7 @@ VOID WINAPI IoRegisterFileSystem(PDEVICE_OBJECT DeviceObject) NTSTATUS WINAPI KeExpandKernelStackAndCalloutEx(PEXPAND_STACK_CALLOUT callout, void *parameter, SIZE_T size, BOOLEAN wait, void *context) { - WARN("(%p %p %lu %x %p) semi-stub: ignoring stack expand\n", callout, parameter, size, wait, context); + WARN("(%p %p %Iu %x %p) semi-stub: ignoring stack expand\n", callout, parameter, size, wait, context); callout(parameter); return STATUS_SUCCESS; } @@ -2738,7 +2738,7 @@ VOID WINAPI IoUnregisterFileSystem(PDEVICE_OBJECT DeviceObject) */ PVOID WINAPI MmAllocateNonCachedMemory( SIZE_T size ) { - TRACE( "%lu\n", size ); + TRACE( "%Iu\n", size ); return VirtualAlloc( NULL, size, MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE|PAGE_NOCACHE ); } @@ -2747,7 +2747,7 @@ PVOID WINAPI MmAllocateNonCachedMemory( SIZE_T size ) */ PVOID WINAPI MmAllocateContiguousMemory( SIZE_T size, PHYSICAL_ADDRESS highest_valid_address ) { - FIXME( "%lu, %s stub\n", size, wine_dbgstr_longlong(highest_valid_address.QuadPart) ); + FIXME( "%Iu, %s stub\n", size, wine_dbgstr_longlong(highest_valid_address.QuadPart) ); return NULL; } @@ -2770,7 +2770,7 @@ PVOID WINAPI MmAllocateContiguousMemorySpecifyCache( SIZE_T size, PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS lowaddress, PHYSICAL_ADDRESS highaddress, PHYSICAL_ADDRESS skipbytes, SIZE_T size) { - FIXME("%s %s %s %lu: stub\n", wine_dbgstr_longlong(lowaddress.QuadPart), wine_dbgstr_longlong(highaddress.QuadPart), + FIXME("%s %s %s %Iu: stub\n", wine_dbgstr_longlong(lowaddress.QuadPart), wine_dbgstr_longlong(highaddress.QuadPart), wine_dbgstr_longlong(skipbytes.QuadPart), size); return NULL; } @@ -2790,7 +2790,7 @@ NTSTATUS WINAPI MmCreateSection( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTR LARGE_INTEGER *size, ULONG protect, ULONG alloc_attr, HANDLE file, FILE_OBJECT *file_obj ) { - FIXME("%p %#x %p %s %#x %#x %p %p: stub\n", handle, access, attr, + FIXME("%p %#lx %p %s %#lx %#lx %p %p: stub\n", handle, access, attr, wine_dbgstr_longlong(size->QuadPart), protect, alloc_attr, file, file_obj); return STATUS_NOT_IMPLEMENTED; } @@ -2800,7 +2800,7 @@ NTSTATUS WINAPI MmCreateSection( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTR */ void WINAPI MmFreeNonCachedMemory( void *addr, SIZE_T size ) { - TRACE( "%p %lu\n", addr, size ); + TRACE( "%p %Iu\n", addr, size ); VirtualFree( addr, 0, MEM_RELEASE ); } @@ -2839,7 +2839,7 @@ PHYSICAL_ADDRESS WINAPI MmGetPhysicalAddress(void *virtual_address) */ PVOID WINAPI MmMapIoSpace( PHYSICAL_ADDRESS PhysicalAddress, DWORD NumberOfBytes, DWORD CacheType ) { - FIXME( "stub: 0x%08x%08x, %d, %d\n", PhysicalAddress.u.HighPart, PhysicalAddress.u.LowPart, NumberOfBytes, CacheType ); + FIXME( "stub: 0x%08lx%08lx, %ld, %ld\n", PhysicalAddress.u.HighPart, PhysicalAddress.u.LowPart, NumberOfBytes, CacheType ); return NULL; } @@ -2858,7 +2858,7 @@ VOID WINAPI MmLockPagableSectionByHandle(PVOID ImageSectionHandle) PVOID WINAPI MmMapLockedPagesSpecifyCache(PMDLX MemoryDescriptorList, KPROCESSOR_MODE AccessMode, MEMORY_CACHING_TYPE CacheType, PVOID BaseAddress, ULONG BugCheckOnFailure, MM_PAGE_PRIORITY Priority) { - FIXME("(%p, %u, %u, %p, %u, %u): stub\n", MemoryDescriptorList, AccessMode, CacheType, BaseAddress, BugCheckOnFailure, Priority); + FIXME("(%p, %u, %u, %p, %lu, %u): stub\n", MemoryDescriptorList, AccessMode, CacheType, BaseAddress, BugCheckOnFailure, Priority); return NULL; } @@ -2921,7 +2921,7 @@ void WINAPI MmUnlockPages(PMDLX MemoryDescriptorList) */ VOID WINAPI MmUnmapIoSpace( PVOID BaseAddress, SIZE_T NumberOfBytes ) { - FIXME( "stub: %p, %lu\n", BaseAddress, NumberOfBytes ); + FIXME( "stub: %p, %Iu\n", BaseAddress, NumberOfBytes ); } @@ -2940,7 +2940,7 @@ NTSTATUS WINAPI ObReferenceObjectByName( UNICODE_STRING *ObjectName, struct wine_driver *driver; struct wine_rb_entry *entry; - TRACE("mostly-stub:%s %i %p %i %p %i %p %p\n", debugstr_us(ObjectName), + TRACE("mostly-stub:%s %li %p %li %p %i %p %p\n", debugstr_us(ObjectName), Attributes, AccessState, DesiredAccess, ObjectType, AccessMode, ParseContext, Object); @@ -2980,7 +2980,7 @@ NTSTATUS WINAPI ObOpenObjectByName(POBJECT_ATTRIBUTES attr, POBJECT_TYPE type, NTSTATUS status; void *object; - TRACE( "attr(%p %s %x) %p %u %p %u %p %p\n", attr->RootDirectory, debugstr_us(attr->ObjectName), + TRACE( "attr(%p %s %lx) %p %u %p %lu %p %p\n", attr->RootDirectory, debugstr_us(attr->ObjectName), attr->Attributes, type, mode, access_state, access, ctx, handle ); if (mode != KernelMode) @@ -3009,7 +3009,7 @@ NTSTATUS WINAPI ObReferenceObjectByPointer(void *obj, ACCESS_MASK access, POBJECT_TYPE type, KPROCESSOR_MODE mode) { - FIXME("(%p, %x, %p, %d): stub\n", obj, access, type, mode); + FIXME("(%p, %lx, %p, %d): stub\n", obj, access, type, mode); return STATUS_NOT_IMPLEMENTED; } @@ -3247,7 +3247,7 @@ NTSTATUS WINAPI PsReferenceProcessFilePointer(PEPROCESS process, FILE_OBJECT **f */ NTSTATUS WINAPI PsTerminateSystemThread(NTSTATUS status) { - TRACE("status %#x.\n", status); + TRACE("status %#lx.\n", status); ExitThread( status ); } @@ -3321,7 +3321,7 @@ BOOLEAN WINAPI MmIsThisAnNtAsSystem(void) */ NTSTATUS WINAPI MmProtectMdlSystemAddress(PMDL MemoryDescriptorList, ULONG NewProtect) { - FIXME("(%p, %u) stub\n", MemoryDescriptorList, NewProtect); + FIXME("(%p, %lu) stub\n", MemoryDescriptorList, NewProtect); return STATUS_SUCCESS; } @@ -3375,7 +3375,7 @@ VOID WINAPI READ_REGISTER_BUFFER_UCHAR(PUCHAR Register, PUCHAR Buffer, ULONG Cou */ NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT DeviceObject, ULONG Action) { - FIXME("(%p %u) stub\n", DeviceObject, Action); + FIXME("(%p %lu) stub\n", DeviceObject, Action); return STATUS_SUCCESS; } @@ -3384,7 +3384,7 @@ NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT DeviceObject, ULONG Acti */ NTSTATUS WINAPI IoWMIOpenBlock(LPCGUID guid, ULONG desired_access, PVOID *data_block_obj) { - FIXME("(%p %u %p) stub\n", guid, desired_access, data_block_obj); + FIXME("(%p %lu %p) stub\n", guid, desired_access, data_block_obj); return STATUS_NOT_IMPLEMENTED; } @@ -3417,7 +3417,7 @@ BOOLEAN WINAPI IoSetThreadHardErrorMode(BOOLEAN EnableHardErrors) */ BOOLEAN WINAPI Ke386IoSetAccessProcess(PEPROCESS *process, ULONG flag) { - FIXME("(%p %d) stub\n", process, flag); + FIXME("(%p %ld) stub\n", process, flag); return FALSE; } @@ -3426,7 +3426,7 @@ BOOLEAN WINAPI Ke386IoSetAccessProcess(PEPROCESS *process, ULONG flag) */ BOOLEAN WINAPI Ke386SetIoAccessMap(ULONG flag, PVOID buffer) { - FIXME("(%d %p) stub\n", flag, buffer); + FIXME("(%ld %p) stub\n", flag, buffer); return FALSE; } @@ -3446,7 +3446,7 @@ NTSTATUS WINAPI ObQueryNameString( void *object, OBJECT_NAME_INFORMATION *name, HANDLE handle; NTSTATUS ret; - TRACE("object %p, name %p, size %u, ret_size %p.\n", object, name, size, ret_size); + TRACE("object %p, name %p, size %lu, ret_size %p.\n", object, name, size, ret_size); if ((ret = ObOpenObjectByPointer( object, 0, NULL, 0, NULL, KernelMode, &handle ))) return ret; @@ -3463,7 +3463,7 @@ NTSTATUS WINAPI IoRegisterPlugPlayNotification(IO_NOTIFICATION_EVENT_CATEGORY ca PDRIVER_OBJECT driver, PDRIVER_NOTIFICATION_CALLBACK_ROUTINE callback, PVOID context, PVOID *notification) { - FIXME("(%u %u %p %p %p %p %p) stub\n", category, flags, data, driver, callback, context, notification); + FIXME("(%u %lu %p %p %p %p %p) stub\n", category, flags, data, driver, callback, context, notification); return STATUS_SUCCESS; } @@ -3529,7 +3529,7 @@ void WINAPI KeBugCheck(ULONG code) */ void WINAPI KeBugCheckEx(ULONG code, ULONG_PTR param1, ULONG_PTR param2, ULONG_PTR param3, ULONG_PTR param4) { - ERR( "%x %lx %lx %lx %lx\n", code, param1, param2, param3, param4 ); + ERR( "%lx %Ix %Ix %Ix %Ix\n", code, param1, param2, param3, param4 ); ExitProcess( code ); } @@ -3538,7 +3538,7 @@ void WINAPI KeBugCheckEx(ULONG code, ULONG_PTR param1, ULONG_PTR param2, ULONG_P */ void WINAPI ProbeForRead(void *address, SIZE_T length, ULONG alignment) { - FIXME("(%p %lu %u) stub\n", address, length, alignment); + FIXME("(%p %Iu %lu) stub\n", address, length, alignment); } /*********************************************************************** @@ -3546,7 +3546,7 @@ void WINAPI ProbeForRead(void *address, SIZE_T length, ULONG alignment) */ void WINAPI ProbeForWrite(void *address, SIZE_T length, ULONG alignment) { - FIXME("(%p %lu %u) stub\n", address, length, alignment); + FIXME("(%p %Iu %lu) stub\n", address, length, alignment); } /*********************************************************************** @@ -3753,7 +3753,7 @@ static HMODULE load_driver( const WCHAR *driver_name, const UNICODE_STRING *keyn if (RegOpenKeyW( HKEY_LOCAL_MACHINE, keyname->Buffer + 18 /* skip \registry\machine */, &driver_hkey )) { - ERR( "cannot open key %s, err=%u\n", wine_dbgstr_w(keyname->Buffer), GetLastError() ); + ERR( "cannot open key %s, err=%lu\n", wine_dbgstr_w(keyname->Buffer), GetLastError() ); return NULL; } @@ -3870,7 +3870,7 @@ static NTSTATUS WINAPI init_driver( DRIVER_OBJECT *driver_object, UNICODE_STRING status = driver_object->DriverInit( driver_object, keyname ); - TRACE_(relay)( "\1Ret driver init %p (obj=%p,str=%s) retval=%08x\n", + TRACE_(relay)( "\1Ret driver init %p (obj=%p,str=%s) retval=%08lx\n", driver_object->DriverInit, driver_object, wine_dbgstr_w(keyname->Buffer), status ); TRACE( "init done for %s obj %p\n", wine_dbgstr_w(driver_name), driver_object ); @@ -3935,7 +3935,7 @@ NTSTATUS WINAPI ZwLoadDriver( const UNICODE_STRING *service_name ) RtlFreeUnicodeString( &drv_name ); if (status != STATUS_SUCCESS) { - ERR( "failed to create driver %s: %08x\n", debugstr_us(service_name), status ); + ERR( "failed to create driver %s: %08lx\n", debugstr_us(service_name), status ); goto error; } @@ -4076,7 +4076,7 @@ NTSTATUS WINAPI FsRtlRegisterFileSystemFilterCallbacks( DRIVER_OBJECT *object, P BOOLEAN WINAPI SeSinglePrivilegeCheck(LUID privilege, KPROCESSOR_MODE mode) { static int once; - if (!once++) FIXME("stub: %08x%08x %u\n", privilege.HighPart, privilege.LowPart, mode); + if (!once++) FIXME("stub: %08lx%08lx %u\n", privilege.HighPart, privilege.LowPart, mode); return TRUE; } @@ -4112,7 +4112,7 @@ void WINAPI KeFlushQueuedDpcs(void) */ NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG component, ULONG level) { - FIXME("stub: %d %d\n", component, level); + FIXME("stub: %ld %ld\n", component, level); return STATUS_NOT_IMPLEMENTED; } @@ -4132,7 +4132,7 @@ NTSTATUS WINAPI MmCopyVirtualMemory(PEPROCESS fromprocess, void *fromaddress, PE void *toaddress, SIZE_T bufsize, KPROCESSOR_MODE mode, SIZE_T *copied) { - FIXME("fromprocess %p, fromaddress %p, toprocess %p, toaddress %p, bufsize %lu, mode %d, copied %p stub.\n", + FIXME("fromprocess %p, fromaddress %p, toprocess %p, toaddress %p, bufsize %Iu, mode %d, copied %p stub.\n", fromprocess, fromaddress, toprocess, toaddress, bufsize, mode, copied); *copied = 0; @@ -4201,7 +4201,7 @@ NTSTATUS WINAPI ExUuidCreate(UUID *uuid) */ ULONG WINAPI ExSetTimerResolution(ULONG time, BOOLEAN set_resolution) { - FIXME("stub: %u %d\n", time, set_resolution); + FIXME("stub: %lu %d\n", time, set_resolution); return KeQueryTimeIncrement(); } @@ -4230,7 +4230,7 @@ BOOLEAN WINAPI IoIs32bitProcess(IRP *irp) */ BOOLEAN WINAPI RtlIsNtDdiVersionAvailable(ULONG version) { - FIXME("stub: %d\n", version); + FIXME("stub: %ld\n", version); return FALSE; } @@ -4406,7 +4406,7 @@ void * WINAPI PsGetProcessSectionBaseAddress(PEPROCESS process) if ((status = ObOpenObjectByPointer(process, 0, NULL, PROCESS_ALL_ACCESS, NULL, KernelMode, &h))) { - WARN("Error opening process object, status %#x.\n", status); + WARN("Error opening process object, status %#lx.\n", status); return NULL; } @@ -4417,7 +4417,7 @@ void * WINAPI PsGetProcessSectionBaseAddress(PEPROCESS process) if (status || size != sizeof(image_base)) { - WARN("Error reading process memory, status %#x, size %lu.\n", status, size); + WARN("Error reading process memory, status %#lx, size %Iu.\n", status, size); return NULL; } diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index ee1402e0e49..5d9ca2dca38 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); static inline const char *debugstr_propkey( const DEVPROPKEY *id ) { if (!id) return "(null)"; - return wine_dbg_sprintf( "{%s,%04x}", wine_dbgstr_guid( &id->fmtid ), id->pid ); + return wine_dbg_sprintf( "{%s,%04lx}", wine_dbgstr_guid( &id->fmtid ), id->pid ); } #define MAX_SERVICE_NAME 260 @@ -125,7 +125,7 @@ static NTSTATUS get_device_instance_id( DEVICE_OBJECT *device, WCHAR *buffer ) if ((status = get_device_id( device, BusQueryDeviceID, &id ))) { - ERR("Failed to get device ID, status %#x.\n", status); + ERR("Failed to get device ID, status %#lx.\n", status); return status; } @@ -134,7 +134,7 @@ static NTSTATUS get_device_instance_id( DEVICE_OBJECT *device, WCHAR *buffer ) if ((status = get_device_id( device, BusQueryInstanceID, &id ))) { - ERR("Failed to get instance ID, status %#x.\n", status); + ERR("Failed to get instance ID, status %#lx.\n", status); return status; } @@ -199,7 +199,7 @@ static void load_function_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVINF status = ZwLoadDriver( &string ); if (status != STATUS_SUCCESS && status != STATUS_IMAGE_ALREADY_LOADED) { - ERR("Failed to load driver %s, status %#x.\n", debugstr_w(driver), status); + ERR("Failed to load driver %s, status %#lx.\n", debugstr_w(driver), status); return; } @@ -218,12 +218,12 @@ static void load_function_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVINF status = driver_obj->DriverExtension->AddDevice( driver_obj, device ); else status = STATUS_NOT_IMPLEMENTED; - TRACE("AddDevice routine %p returned %#x.\n", driver_obj->DriverExtension->AddDevice, status); + TRACE("AddDevice routine %p returned %#lx.\n", driver_obj->DriverExtension->AddDevice, status); ObDereferenceObject( driver_obj ); if (status != STATUS_SUCCESS) - ERR("AddDevice failed for driver %s, status %#x.\n", debugstr_w(driver), status); + ERR("AddDevice failed for driver %s, status %#lx.\n", debugstr_w(driver), status); } /* Return the total number of characters in a REG_MULTI_SZ string, including @@ -257,7 +257,7 @@ static BOOL install_device_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVIN if ((status = get_device_id( device, BusQueryHardwareIDs, &ids )) || !ids) { - ERR("Failed to get hardware IDs, status %#x.\n", status); + ERR("Failed to get hardware IDs, status %#lx.\n", status); return FALSE; } @@ -267,7 +267,7 @@ static BOOL install_device_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVIN if ((status = get_device_id( device, BusQueryCompatibleIDs, &ids )) || !ids) { - ERR("Failed to get compatible IDs, status %#x.\n", status); + ERR("Failed to get compatible IDs, status %#lx.\n", status); return FALSE; } @@ -277,7 +277,7 @@ static BOOL install_device_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVIN if (!SetupDiBuildDriverInfoList( set, sp_device, SPDIT_COMPATDRIVER )) { - ERR("Failed to build compatible driver list, error %#x.\n", GetLastError()); + ERR("Failed to build compatible driver list, error %#lx.\n", GetLastError()); return FALSE; } @@ -285,7 +285,7 @@ static BOOL install_device_driver( DEVICE_OBJECT *device, HDEVINFO set, SP_DEVIN { if (!SetupDiCallClassInstaller(dif_list[i], set, sp_device) && GetLastError() != ERROR_DI_DO_DEFAULT) { - WARN("Install function %#x failed, error %#x.\n", dif_list[i], GetLastError()); + WARN("Install function %#lx failed, error %#lx.\n", dif_list[i], GetLastError()); return FALSE; } } @@ -319,7 +319,7 @@ static void enumerate_new_device( DEVICE_OBJECT *device, HDEVINFO set ) if (!SetupDiCreateDeviceInfoW( set, device_instance_id, &GUID_NULL, NULL, NULL, 0, &sp_device ) && !SetupDiOpenDeviceInfoW( set, device_instance_id, NULL, 0, &sp_device )) { - ERR("Failed to create or open device %s, error %#x.\n", debugstr_w(device_instance_id), GetLastError()); + ERR("Failed to create or open device %s, error %#lx.\n", debugstr_w(device_instance_id), GetLastError()); return; } @@ -337,7 +337,7 @@ static void enumerate_new_device( DEVICE_OBJECT *device, HDEVINFO set ) if ((status = get_device_caps( device, &caps ))) { - ERR("Failed to get caps for device %s, status %#x.\n", debugstr_w(device_instance_id), status); + ERR("Failed to get caps for device %s, status %#lx.\n", debugstr_w(device_instance_id), status); return; } @@ -419,12 +419,12 @@ static void handle_bus_relations( DEVICE_OBJECT *parent ) relations = (DEVICE_RELATIONS *)irp_status.Information; if (irp_status.u.Status) { - ERR("Failed to enumerate child devices, status %#x.\n", irp_status.u.Status); + ERR("Failed to enumerate child devices, status %#lx.\n", irp_status.u.Status); SetupDiDestroyDeviceInfoList( set ); return; } - TRACE("Got %u devices.\n", relations->Count); + TRACE("Got %lu devices.\n", relations->Count); for (i = 0; i < relations->Count; ++i) { @@ -488,7 +488,7 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP NTSTATUS status; HDEVINFO set; - TRACE("device %p, property %u, length %u, buffer %p, needed %p.\n", + TRACE("device %p, property %u, length %lu, buffer %p, needed %p.\n", device, property, length, buffer, needed); switch (property) @@ -500,7 +500,7 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP status = get_device_id( device, BusQueryInstanceID, &id ); if (status != STATUS_SUCCESS) { - ERR("Failed to get instance ID, status %#x.\n", status); + ERR("Failed to get instance ID, status %#lx.\n", status); break; } @@ -607,13 +607,13 @@ NTSTATUS WINAPI IoGetDeviceProperty( DEVICE_OBJECT *device, DEVICE_REGISTRY_PROP if ((set = SetupDiCreateDeviceInfoList( &GUID_NULL, NULL )) == INVALID_HANDLE_VALUE) { - ERR("Failed to create device list, error %#x.\n", GetLastError()); + ERR("Failed to create device list, error %#lx.\n", GetLastError()); return GetLastError(); } if (!SetupDiOpenDeviceInfoW( set, device_instance_id, NULL, 0, &sp_device)) { - ERR("Failed to open device, error %#x.\n", GetLastError()); + ERR("Failed to open device, error %#lx.\n", GetLastError()); SetupDiDestroyDeviceInfoList( set ); return GetLastError(); } @@ -676,7 +676,7 @@ static void send_devicechange( DWORD code, void *data, unsigned int size ) } __EXCEPT(rpc_filter) { - WARN("Failed to send event, exception %#x.\n", GetExceptionCode()); + WARN("Failed to send event, exception %#lx.\n", GetExceptionCode()); } __ENDTRY } @@ -811,7 +811,7 @@ NTSTATUS WINAPI IoSetDevicePropertyData( DEVICE_OBJECT *device, const DEVPROPKEY NTSTATUS status; HDEVINFO set; - TRACE( "device %p, property_key %s, lcid %#x, flags %#x, type %#x, size %u, data %p.\n", + TRACE( "device %p, property_key %s, lcid %#lx, flags %#lx, type %#lx, size %lu, data %p.\n", device, debugstr_propkey(property_key), lcid, flags, type, size, data ); /* flags is always treated as PLUGPLAY_PROPERTY_PERSISTENT starting with Win 8 / 2012 */ @@ -822,20 +822,20 @@ NTSTATUS WINAPI IoSetDevicePropertyData( DEVICE_OBJECT *device, const DEVPROPKEY if ((set = SetupDiCreateDeviceInfoList( &GUID_NULL, NULL )) == INVALID_HANDLE_VALUE) { - ERR( "Failed to create device list, error %#x.\n", GetLastError() ); + ERR( "Failed to create device list, error %#lx.\n", GetLastError() ); return GetLastError(); } if (!SetupDiOpenDeviceInfoW( set, device_instance_id, NULL, 0, &sp_device )) { - ERR( "Failed to open device, error %#x.\n", GetLastError() ); + ERR( "Failed to open device, error %#lx.\n", GetLastError() ); SetupDiDestroyDeviceInfoList( set ); return GetLastError(); } if (!SetupDiSetDevicePropertyW( set, &sp_device, property_key, type, data, size, 0 )) { - ERR( "Failed to set property, error %#x.\n", GetLastError() ); + ERR( "Failed to set property, error %#lx.\n", GetLastError() ); SetupDiDestroyDeviceInfoList( set ); return GetLastError(); } @@ -874,7 +874,7 @@ NTSTATUS WINAPI IoRegisterDeviceInterface(DEVICE_OBJECT *device, const GUID *cla if (!SetupDiCreateDeviceInfoW( set, device_instance_id, class_guid, NULL, NULL, 0, &sp_device ) && !SetupDiOpenDeviceInfoW( set, device_instance_id, NULL, 0, &sp_device )) { - ERR("Failed to create device %s, error %#x.\n", debugstr_w(device_instance_id), GetLastError()); + ERR("Failed to create device %s, error %#lx.\n", debugstr_w(device_instance_id), GetLastError()); return GetLastError(); } @@ -935,11 +935,11 @@ NTSTATUS WINAPI IoOpenDeviceRegistryKey( DEVICE_OBJECT *device, ULONG type, ACCE NTSTATUS status; HDEVINFO set; - TRACE("device %p, type %#x, access %#x, key %p.\n", device, type, access, key); + TRACE("device %p, type %#lx, access %#lx, key %p.\n", device, type, access, key); if ((status = get_device_instance_id( device, device_instance_id ))) { - ERR("Failed to get device instance ID, error %#x.\n", status); + ERR("Failed to get device instance ID, error %#lx.\n", status); return status; } @@ -1098,17 +1098,17 @@ void pnp_manager_start(void) RtlInitUnicodeString( &driver_nameU, driver_nameW ); if ((status = IoCreateDriver( &driver_nameU, pnp_manager_driver_entry ))) - ERR("Failed to create PnP manager driver, status %#x.\n", status); + ERR("Failed to create PnP manager driver, status %#lx.\n", status); 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 = 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); } void pnp_manager_stop_driver( struct wine_driver *driver ) @@ -1146,7 +1146,7 @@ void CDECL wine_enumerate_root_devices( const WCHAR *driver_name ) set = SetupDiGetClassDevsW( NULL, rootW, NULL, DIGCF_ALLCLASSES ); if (set == INVALID_HANDLE_VALUE) { - ERR("Failed to build device set, error %#x.\n", GetLastError()); + ERR("Failed to build device set, error %#lx.\n", GetLastError()); return; } @@ -1174,7 +1174,7 @@ void CDECL wine_enumerate_root_devices( const WCHAR *driver_name ) if ((status = IoCreateDevice( pnp_manager, sizeof(struct root_pnp_device), NULL, FILE_DEVICE_CONTROLLER, FILE_AUTOGENERATED_DEVICE_NAME, FALSE, &device ))) { - ERR("Failed to create root-enumerated PnP device %s, status %#x.\n", debugstr_w(id), status); + ERR("Failed to create root-enumerated PnP device %s, status %#lx.\n", debugstr_w(id), status); continue; } diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 13e2d3e7559..b8239b0cd7d 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -52,7 +52,7 @@ NTSTATUS WINAPI KeWaitForMultipleObjects(ULONG count, void *pobjs[], NTSTATUS ret; ULONG i; - TRACE("count %u, objs %p, wait_type %u, reason %u, mode %d, alertable %u, timeout %p, wait_blocks %p.\n", + TRACE("count %lu, objs %p, wait_type %u, reason %u, mode %d, alertable %u, timeout %p, wait_blocks %p.\n", count, objs, wait_type, reason, mode, alertable, timeout, wait_blocks); /* We co-opt DISPATCHER_HEADER.WaitListHead: @@ -239,7 +239,7 @@ LONG WINAPI KeSetEvent( PRKEVENT event, KPRIORITY increment, BOOLEAN wait ) HANDLE handle; LONG ret = 0; - TRACE("event %p, increment %d, wait %u.\n", event, increment, wait); + TRACE("event %p, increment %ld, wait %u.\n", event, increment, wait); if (event->Header.WaitListHead.Blink != INVALID_HANDLE_VALUE) { @@ -328,7 +328,7 @@ LONG WINAPI KeReadStateEvent( PRKEVENT event ) */ void WINAPI KeInitializeSemaphore( PRKSEMAPHORE semaphore, LONG count, LONG limit ) { - TRACE("semaphore %p, count %d, limit %d.\n", semaphore, count, limit); + TRACE("semaphore %p, count %ld, limit %ld.\n", semaphore, count, limit); semaphore->Header.Type = TYPE_SEMAPHORE; semaphore->Header.SignalState = count; @@ -346,7 +346,7 @@ LONG WINAPI KeReleaseSemaphore( PRKSEMAPHORE semaphore, KPRIORITY increment, HANDLE handle; LONG ret; - TRACE("semaphore %p, increment %d, count %d, wait %u.\n", + TRACE("semaphore %p, increment %ld, count %ld, wait %u.\n", semaphore, increment, count, wait); EnterCriticalSection( &sync_cs ); @@ -372,7 +372,7 @@ POBJECT_TYPE ExSemaphoreObjectType = &semaphore_type; */ void WINAPI KeInitializeMutex( PRKMUTEX mutex, ULONG level ) { - TRACE("mutex %p, level %u.\n", mutex, level); + TRACE("mutex %p, level %lu.\n", mutex, level); mutex->Header.Type = TYPE_MUTEX; mutex->Header.SignalState = 1; @@ -450,7 +450,7 @@ BOOLEAN WINAPI KeSetTimerEx( KTIMER *timer, LARGE_INTEGER duetime, LONG period, { BOOL ret; - TRACE("timer %p, duetime %s, period %d, dpc %p.\n", + TRACE("timer %p, duetime %s, period %ld, dpc %p.\n", timer, wine_dbgstr_longlong(duetime.QuadPart), period, dpc); EnterCriticalSection( &sync_cs ); @@ -1150,7 +1150,7 @@ void WINAPI ExReleaseResourceForThreadLite( ERESOURCE *resource, ERESOURCE_THREA OWNER_ENTRY *entry; KIRQL irql; - TRACE("resource %p, thread %#lx.\n", resource, thread); + TRACE("resource %p, thread %#Ix.\n", resource, thread); KeAcquireSpinLock( &resource->SpinLock, &irql ); @@ -1166,7 +1166,7 @@ void WINAPI ExReleaseResourceForThreadLite( ERESOURCE *resource, ERESOURCE_THREA } else { - ERR("Trying to release %p for thread %#lx, but resource is exclusively owned by %#lx.\n", + ERR("Trying to release %p for thread %#Ix, but resource is exclusively owned by %#Ix.\n", resource, thread, resource->OwnerEntry.OwnerThread); return; } @@ -1181,7 +1181,7 @@ void WINAPI ExReleaseResourceForThreadLite( ERESOURCE *resource, ERESOURCE_THREA } else { - ERR("Trying to release %p for thread %#lx, but resource is not owned by that thread.\n", resource, thread); + ERR("Trying to release %p for thread %#Ix, but resource is not owned by that thread.\n", resource, thread); return; } } @@ -1299,7 +1299,7 @@ ULONG WINAPI ExIsResourceAcquiredSharedLite( ERESOURCE *resource ) void WINAPI IoInitializeRemoveLockEx( IO_REMOVE_LOCK *lock, ULONG tag, ULONG max_minutes, ULONG max_count, ULONG size ) { - TRACE("lock %p, tag %#x, max_minutes %u, max_count %u, size %u.\n", + TRACE("lock %p, tag %#lx, max_minutes %lu, max_count %lu, size %lu.\n", lock, tag, max_minutes, max_count, size); KeInitializeEvent( &lock->Common.RemoveEvent, NotificationEvent, FALSE ); @@ -1313,7 +1313,7 @@ void WINAPI IoInitializeRemoveLockEx( IO_REMOVE_LOCK *lock, ULONG tag, NTSTATUS WINAPI IoAcquireRemoveLockEx( IO_REMOVE_LOCK *lock, void *tag, const char *file, ULONG line, ULONG size ) { - TRACE("lock %p, tag %p, file %s, line %u, size %u.\n", lock, tag, debugstr_a(file), line, size); + TRACE("lock %p, tag %p, file %s, line %lu, size %lu.\n", lock, tag, debugstr_a(file), line, size); if (lock->Common.Removed) return STATUS_DELETE_PENDING; @@ -1329,7 +1329,7 @@ void WINAPI IoReleaseRemoveLockEx( IO_REMOVE_LOCK *lock, void *tag, ULONG size ) { LONG count; - TRACE("lock %p, tag %p, size %u.\n", lock, tag, size); + TRACE("lock %p, tag %p, size %lu.\n", lock, tag, size); if (!(count = InterlockedDecrement( &lock->Common.IoCount )) && lock->Common.Removed) KeSetEvent( &lock->Common.RemoveEvent, IO_NO_INCREMENT, FALSE ); @@ -1344,7 +1344,7 @@ void WINAPI IoReleaseRemoveLockAndWaitEx( IO_REMOVE_LOCK *lock, void *tag, ULONG { LONG count; - TRACE("lock %p, tag %p, size %u.\n", lock, tag, size); + TRACE("lock %p, tag %p, size %lu.\n", lock, tag, size); lock->Common.Removed = TRUE;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ntprint/Makefile.in | 1 - dlls/ntprint/ntprint.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/ntprint/Makefile.in b/dlls/ntprint/Makefile.in index bdfe69a69e6..2ca355140d9 100644 --- a/dlls/ntprint/Makefile.in +++ b/dlls/ntprint/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ntprint.dll IMPORTS = winspool diff --git a/dlls/ntprint/ntprint.c b/dlls/ntprint/ntprint.c index 6a4cb57c7f6..e89929a0ba1 100644 --- a/dlls/ntprint/ntprint.c +++ b/dlls/ntprint/ntprint.c @@ -51,7 +51,7 @@ HANDLE WINAPI PSetupCreateMonitorInfo(DWORD unknown1, WCHAR *server) DWORD needed; DWORD res; - TRACE("(%d, %s)\n", unknown1, debugstr_w(server)); + TRACE("(%ld, %s)\n", unknown1, debugstr_w(server)); mi = HeapAlloc(GetProcessHeap(), 0, sizeof(monitorinfo_t)); if (!mi) { @@ -71,7 +71,7 @@ HANDLE WINAPI PSetupCreateMonitorInfo(DWORD unknown1, WCHAR *server) return NULL; } - TRACE("=> %p (%u monitors installed)\n", mi, mi->installed); + TRACE("=> %p (%lu monitors installed)\n", mi, mi->installed); return mi; } @@ -118,14 +118,14 @@ BOOL WINAPI PSetupEnumMonitor(HANDLE monitorinfo, DWORD index, LPWSTR buffer, LP LPWSTR nameW; DWORD len; - TRACE("(%p, %u, %p, %p) => %d\n", mi, index, buffer, psize, psize ? *psize : 0); + TRACE("(%p, %lu, %p, %p) => %ld\n", mi, index, buffer, psize, psize ? *psize : 0); if (index < mi->installed) { nameW = mi->mi2[index].pName; len = lstrlenW(nameW) + 1; if (len <= *psize) { memcpy(buffer, nameW, len * sizeof(WCHAR)); - TRACE("#%u: %s\n", index, debugstr_w(buffer)); + TRACE("#%lu: %s\n", index, debugstr_w(buffer)); return TRUE; } *psize = len;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/odbc32/Makefile.in | 1 - dlls/odbc32/proxyodbc.c | 34 +++++++++++++++++----------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dlls/odbc32/Makefile.in b/dlls/odbc32/Makefile.in index 75ac6d1f309..def7b4b5d67 100644 --- a/dlls/odbc32/Makefile.in +++ b/dlls/odbc32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = odbc32.dll UNIXLIB = odbc32.so IMPORTLIB = odbc32 diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 573a5b280a2..c1cb44c29fc 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -107,14 +107,14 @@ static void ODBC_ReplicateODBCInstToRegistry (SQLHENV hEnv) if ((reg_ret = RegSetValueExA (hDrivers, desc, 0, REG_SZ, (const BYTE *)"Installed", 10)) != ERROR_SUCCESS) { - TRACE ("Error %d replicating driver %s\n", + TRACE ("Error %ld replicating driver %s\n", reg_ret, desc); success = FALSE; } } else if (reg_ret != ERROR_SUCCESS) { - TRACE ("Error %d checking for %s in drivers\n", + TRACE ("Error %ld checking for %s in drivers\n", reg_ret, desc); success = FALSE; } @@ -131,12 +131,12 @@ static void ODBC_ReplicateODBCInstToRegistry (SQLHENV hEnv) */ if ((reg_ret = RegCloseKey (hThis)) != ERROR_SUCCESS) - TRACE ("Error %d closing %s key\n", reg_ret, + TRACE ("Error %ld closing %s key\n", reg_ret, desc); } else { - TRACE ("Error %d ensuring driver key %s\n", + TRACE ("Error %ld ensuring driver key %s\n", reg_ret, desc); success = FALSE; } @@ -155,21 +155,21 @@ static void ODBC_ReplicateODBCInstToRegistry (SQLHENV hEnv) } if ((reg_ret = RegCloseKey (hDrivers)) != ERROR_SUCCESS) { - TRACE ("Error %d closing hDrivers\n", reg_ret); + TRACE ("Error %ld closing hDrivers\n", reg_ret); } } else { - TRACE ("Error %d opening HKLM\\S\\O\\OI\\Drivers\n", reg_ret); + TRACE ("Error %ld opening HKLM\\S\\O\\OI\\Drivers\n", reg_ret); } if ((reg_ret = RegCloseKey (hODBCInst)) != ERROR_SUCCESS) { - TRACE ("Error %d closing HKLM\\S\\O\\ODBCINST.INI\n", reg_ret); + TRACE ("Error %ld closing HKLM\\S\\O\\ODBCINST.INI\n", reg_ret); } } else { - TRACE ("Error %d opening HKLM\\S\\O\\ODBCINST.INI\n", reg_ret); + TRACE ("Error %ld opening HKLM\\S\\O\\ODBCINST.INI\n", reg_ret); } if (!success) { @@ -242,26 +242,26 @@ static void ODBC_ReplicateODBCToRegistry (BOOL is_user, SQLHENV hEnv) if ((reg_ret = RegSetValueExA (hDSN, DRIVERKEY, 0, REG_SZ, (LPBYTE)desc, sizedesc)) != ERROR_SUCCESS) { - TRACE ("Error %d replicating description of " + TRACE ("Error %ld replicating description of " "%s(%s)\n", reg_ret, dsn, desc); success = FALSE; } } else if (reg_ret != ERROR_SUCCESS) { - TRACE ("Error %d checking for description of %s\n", + TRACE ("Error %ld checking for description of %s\n", reg_ret, dsn); success = FALSE; } if ((reg_ret = RegCloseKey (hDSN)) != ERROR_SUCCESS) { - TRACE ("Error %d closing %s DSN key %s\n", + TRACE ("Error %ld closing %s DSN key %s\n", reg_ret, which, dsn); } } else { - TRACE ("Error %d opening %s DSN key %s\n", + TRACE ("Error %ld opening %s DSN key %s\n", reg_ret, which, dsn); success = FALSE; } @@ -281,13 +281,13 @@ static void ODBC_ReplicateODBCToRegistry (BOOL is_user, SQLHENV hEnv) } if ((reg_ret = RegCloseKey (hODBC)) != ERROR_SUCCESS) { - TRACE ("Error %d closing %s ODBC.INI registry key\n", reg_ret, + TRACE ("Error %ld closing %s ODBC.INI registry key\n", reg_ret, which); } } else { - TRACE ("Error %d creating/opening %s ODBC.INI registry key\n", + TRACE ("Error %ld creating/opening %s ODBC.INI registry key\n", reg_ret, which); } if (!success) @@ -421,7 +421,7 @@ SQLRETURN WINAPI SQLAllocHandleStd(SQLSMALLINT HandleType, SQLHANDLE InputHandle static const char *debugstr_sqllen( SQLLEN len ) { #ifdef _WIN64 - return wine_dbg_sprintf( "%ld", len ); + return wine_dbg_sprintf( "%Id", len ); #else return wine_dbg_sprintf( "%d", len ); #endif @@ -448,7 +448,7 @@ SQLRETURN WINAPI SQLBindCol(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnNumber, static const char *debugstr_sqlulen( SQLULEN len ) { #ifdef _WIN64 - return wine_dbg_sprintf( "%lu", len ); + return wine_dbg_sprintf( "%Iu", len ); #else return wine_dbg_sprintf( "%u", len ); #endif @@ -2648,7 +2648,7 @@ SQLRETURN WINAPI SQLGetDiagRecA(SQLSMALLINT HandleType, SQLHANDLE Handle, SQLSMA */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) { - TRACE("proxy ODBC: %p,%x,%p\n", hinstDLL, reason, reserved); + TRACE("proxy ODBC: %p,%lx,%p\n", hinstDLL, reason, reserved); switch (reason) {
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/odbccp32/Makefile.in | 1 - dlls/odbccp32/odbccp32.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/odbccp32/Makefile.in b/dlls/odbccp32/Makefile.in index ec36870b114..77308270728 100644 --- a/dlls/odbccp32/Makefile.in +++ b/dlls/odbccp32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = odbccp32.dll IMPORTLIB = odbccp32 IMPORTS = uuid advapi32 diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 1c46584cd29..131cb158ed6 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -108,7 +108,7 @@ static inline WCHAR *heap_strdupAtoW(const char *str) BOOL WINAPI ODBCCPlApplet( LONG i, LONG j, LONG * p1, LONG * p2) { clear_errors(); - FIXME( "( %d %d %p %p) : stub!\n", i, j, p1, p2); + FIXME( "( %ld %ld %p %p) : stub!\n", i, j, p1, p2); return FALSE; } @@ -977,7 +977,7 @@ static void write_registry_values(const WCHAR *regkey, const WCHAR *driver, cons /* Store Usage */ size = sizeof(usagecount); RegGetValueA(hkeydriver, NULL, "UsageCount", RRF_RT_DWORD, &type, &usagecount, &size); - TRACE("Usage count %d\n", usagecount); + TRACE("Usage count %ld\n", usagecount); for (; *p; p += lstrlenW(p) + 1) { @@ -1399,14 +1399,14 @@ BOOL WINAPI SQLManageDataSources(HWND hwnd) SQLRETURN WINAPI SQLPostInstallerErrorW(DWORD fErrorCode, LPCWSTR szErrorMsg) { - FIXME("%u %s\n", fErrorCode, debugstr_w(szErrorMsg)); + FIXME("%lu %s\n", fErrorCode, debugstr_w(szErrorMsg)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } SQLRETURN WINAPI SQLPostInstallerError(DWORD fErrorCode, LPCSTR szErrorMsg) { - FIXME("%u %s\n", fErrorCode, debugstr_a(szErrorMsg)); + FIXME("%lu %s\n", fErrorCode, debugstr_a(szErrorMsg)); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -1460,7 +1460,7 @@ BOOL WINAPI SQLRemoveDriverW(LPCWSTR drivername, BOOL remove_dsn, LPDWORD usage_ size = sizeof(usagecount); RegGetValueA(hkeydriver, NULL, "UsageCount", RRF_RT_DWORD, &type, &usagecount, &size); - TRACE("Usage count %d\n", usagecount); + TRACE("Usage count %ld\n", usagecount); count = usagecount - 1; if (count) { @@ -1584,7 +1584,7 @@ BOOL WINAPI SQLRemoveTranslatorW(const WCHAR *translator, DWORD *usage_count) size = sizeof(usagecount); RegGetValueA(hkeydriver, NULL, "UsageCount", RRF_RT_DWORD, &type, &usagecount, &size); - TRACE("Usage count %d\n", usagecount); + TRACE("Usage count %ld\n", usagecount); count = usagecount - 1; if (count) {
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ole2disp.dll16/Makefile.in | 1 - dlls/ole2disp.dll16/ole2disp.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/ole2disp.dll16/Makefile.in b/dlls/ole2disp.dll16/Makefile.in index c1dbbea0df7..86100fe146a 100644 --- a/dlls/ole2disp.dll16/Makefile.in +++ b/dlls/ole2disp.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ole2disp.dll16 EXTRADLLFLAGS = -m16 -Wb,--main-module,oleaut32.dll diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 53239598418..8318ae863e5 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -253,7 +253,7 @@ HRESULT WINAPI SafeArrayAllocData16(SAFEARRAY16 *sa) */ HRESULT WINAPI SafeArrayDestroyDescriptor16(SEGPTR s) { - TRACE("0x%08x\n", s); + TRACE("0x%08lx\n", s); if (s) { @@ -479,7 +479,7 @@ HRESULT WINAPI CreateDispTypeInfo16( LCID lcid, ITypeInfo **pptinfo) { - FIXME("(%p,%d,%p),stub\n",pidata,lcid,pptinfo); + FIXME("(%p,%ld,%p),stub\n",pidata,lcid,pptinfo); return E_NOTIMPL; } @@ -503,7 +503,7 @@ HRESULT WINAPI CreateStdDispatch16( HRESULT WINAPI RegisterActiveObject16( IUnknown *punk, REFCLSID rclsid, DWORD dwFlags, unsigned long *pdwRegister ) { - FIXME("(%p,%s,0x%08x,%p):stub\n",punk,debugstr_guid(rclsid),dwFlags,pdwRegister); + FIXME("(%p,%s,0x%08lx,%p):stub\n",punk,debugstr_guid(rclsid),dwFlags,pdwRegister); return E_NOTIMPL; } @@ -512,7 +512,7 @@ HRESULT WINAPI RegisterActiveObject16( */ HRESULT WINAPI VariantChangeTypeEx16(VARIANTARG *dest, const VARIANTARG *src, LCID lcid, USHORT flags, VARTYPE vt) { - FIXME("stub: %p %p %d %d %d\n", dest, src, lcid, flags, vt); + FIXME("stub: %p %p %ld %d %d\n", dest, src, lcid, flags, vt); return E_INVALIDARG; } @@ -521,7 +521,7 @@ HRESULT WINAPI VariantChangeTypeEx16(VARIANTARG *dest, const VARIANTARG *src, LC */ HRESULT WINAPI SetErrorInfo16(ULONG dwReserved, IErrorInfo *perrinfo) { - FIXME("stub: (%d, %p)\n", dwReserved, perrinfo); + FIXME("stub: (%ld, %p)\n", dwReserved, perrinfo); return E_INVALIDARG; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/ole2.dll16/Makefile.in | 1 - dlls/ole2.dll16/memlockbytes.c | 6 +++--- dlls/ole2.dll16/ole2.c | 12 ++++++------ 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/ole2.dll16/Makefile.in b/dlls/ole2.dll16/Makefile.in index 1003f29c589..bb9fa89fd69 100644 --- a/dlls/ole2.dll16/Makefile.in +++ b/dlls/ole2.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = ole2.dll16 IMPORTS = uuid ole32 user32 gdi32 EXTRADLLFLAGS = -m16 -Wb,--main-module,ole32.dll diff --git a/dlls/ole2.dll16/memlockbytes.c b/dlls/ole2.dll16/memlockbytes.c index 9a246efdd15..d5ae041d6a2 100644 --- a/dlls/ole2.dll16/memlockbytes.c +++ b/dlls/ole2.dll16/memlockbytes.c @@ -273,7 +273,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_ReadAt( ULONG bytesReadBuffer = 0; ULONG bytesToReadFromBuffer; - TRACE("(%p,%d,%p,%d,%p)\n",This,ulOffset.u.LowPart,pv,cb,pcbRead); + TRACE("(%p,%ld,%p,%ld,%p)\n",This,ulOffset.u.LowPart,pv,cb,pcbRead); /* * If the caller is not interested in the number of bytes read, * we use another buffer to avoid "if" statements in the code. @@ -339,7 +339,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_SetSize( HGLOBALLockBytesImpl16* const This = impl_from_ILockBytes16(iface); HGLOBAL16 supportHandle; - TRACE("(%p,%d)\n",This,libNewSize.u.LowPart); + TRACE("(%p,%ld)\n",This,libNewSize.u.LowPart); /* * As documented. */ @@ -384,7 +384,7 @@ HRESULT CDECL HGLOBALLockBytesImpl16_WriteAt( ULARGE_INTEGER newSize; ULONG bytesWritten = 0; - TRACE("(%p,%d,%p,%d,%p)\n",This,ulOffset.u.LowPart,pv,cb,pcbWritten); + TRACE("(%p,%ld,%p,%ld,%p)\n",This,ulOffset.u.LowPart,pv,cb,pcbWritten); /* * If the caller is not interested in the number of bytes written, * we use another buffer to avoid "if" statements in the code. diff --git a/dlls/ole2.dll16/ole2.c b/dlls/ole2.dll16/ole2.c index 04b40b08635..8812bd21f0a 100644 --- a/dlls/ole2.dll16/ole2.c +++ b/dlls/ole2.dll16/ole2.c @@ -95,7 +95,7 @@ HRESULT WINAPI DllGetClassObject16(REFCLSID rclsid, REFIID iid, LPVOID *ppv) */ HRESULT WINAPI GetRunningObjectTable16(DWORD reserved, LPRUNNINGOBJECTTABLE *pprot) { - FIXME("(%d,%p),stub!\n",reserved,pprot); + FIXME("(%ld,%p),stub!\n",reserved,pprot); return E_NOTIMPL; } @@ -232,7 +232,7 @@ HRESULT WINAPI OleLoad16( SEGPTR pClientSite, LPVOID* ppvObj) { - FIXME("(%x,%s,%x,%p), stub!\n", pStg, debugstr_guid(riid), pClientSite, ppvObj); + FIXME("(%lx,%s,%lx,%p), stub!\n", pStg, debugstr_guid(riid), pClientSite, ppvObj); return E_NOTIMPL; } @@ -305,7 +305,7 @@ HRESULT WINAPI ReadClassStg16(SEGPTR pstg, CLSID *pclsid) HRESULT hres; DWORD args[3]; - TRACE("(%x, %p)\n", pstg, pclsid); + TRACE("(%lx, %p)\n", pstg, pclsid); if (!pclsid) return E_INVALIDARG16; @@ -330,7 +330,7 @@ HRESULT WINAPI ReadClassStg16(SEGPTR pstg, CLSID *pclsid) (LPDWORD)&hres )) { WOWGlobalUnlockFree16(args[1]); - ERR("CallTo16 IStorage16::Stat() failed, hres %x\n",hres); + ERR("CallTo16 IStorage16::Stat() failed, hres %lx\n",hres); return hres; } memcpy(&statstg, MapSL(args[1]), sizeof(STATSTG16)); @@ -352,7 +352,7 @@ HRESULT WINAPI ReadClassStm16(SEGPTR stream, CLSID *clsid) HRESULT hres; DWORD args[4]; - TRACE("(0x%x, %p)\n", stream, clsid); + TRACE("(0x%lx, %p)\n", stream, clsid); if (!clsid) return E_INVALIDARG16; @@ -386,7 +386,7 @@ HRESULT WINAPI ReadClassStm16(SEGPTR stream, CLSID *clsid) } else { - ERR("CallTo16 IStream16::Read() failed, hres %x\n", hres); + ERR("CallTo16 IStream16::Read() failed, hres %lx\n", hres); hres = E_FAIL; } WOWGlobalUnlockFree16(args[1]);
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/olecli32/Makefile.in | 1 - dlls/olecli32/olecli_main.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/olecli32/Makefile.in b/dlls/olecli32/Makefile.in index 54dc54d02ac..0eca46ff269 100644 --- a/dlls/olecli32/Makefile.in +++ b/dlls/olecli32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = olecli32.dll IMPORTLIB = olecli32 IMPORTS = ole32 gdi32 diff --git a/dlls/olecli32/olecli_main.c b/dlls/olecli32/olecli_main.c index ebffc0fda6a..38ffd48b0f0 100644 --- a/dlls/olecli32/olecli_main.c +++ b/dlls/olecli32/olecli_main.c @@ -88,7 +88,7 @@ static LONG OLE_current_handle; */ OLESTATUS WINAPI OleSavedClientDoc(LHCLIENTDOC hDoc) { - FIXME("(%d: stub\n", hDoc); + FIXME("(%ld: stub\n", hDoc); return OLE_OK; } @@ -108,7 +108,7 @@ OLESTATUS WINAPI OleRegisterClientDoc(LPCSTR classname, LPCSTR docname, */ OLESTATUS WINAPI OleRenameClientDoc(LHCLIENTDOC hDoc, LPCSTR newName) { - FIXME("(%d,%s,...): stub\n",hDoc, newName); + FIXME("(%ld,%s,...): stub\n",hDoc, newName); return OLE_OK; } @@ -117,7 +117,7 @@ OLESTATUS WINAPI OleRenameClientDoc(LHCLIENTDOC hDoc, LPCSTR newName) */ OLESTATUS WINAPI OleRevokeClientDoc(LHCLIENTDOC hServerDoc) { - FIXME("(%d): stub\n",hServerDoc); + FIXME("(%ld): stub\n",hServerDoc); return OLE_OK; } @@ -128,7 +128,7 @@ OLESTATUS WINAPI OleCreateLinkFromClip( LPCSTR name,LPOLECLIENT olecli,LHCLIENTDOC hclientdoc,LPCSTR xname, _LPOLEOBJECT *lpoleob,OLEOPT_RENDER render,OLECLIPFORMAT clipformat ) { - FIXME("(%s,%p,%08x,%s,%p,%d,%d): stub!\n", + FIXME("(%s,%p,%08lx,%s,%p,%d,%ld): stub!\n", name,olecli,hclientdoc,xname,lpoleob,render,clipformat); return OLE_OK; } @@ -137,7 +137,7 @@ OLESTATUS WINAPI OleCreateLinkFromClip( * OleQueryLinkFromClip [OLECLI32.9] */ OLESTATUS WINAPI OleQueryLinkFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) { - FIXME("(%s,%d,%d): stub!\n",name,render,clipformat); + FIXME("(%s,%d,%ld): stub!\n",name,render,clipformat); return OLE_OK; } @@ -145,7 +145,7 @@ OLESTATUS WINAPI OleQueryLinkFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFO * OleQueryCreateFromClip [OLECLI32.10] */ OLESTATUS WINAPI OleQueryCreateFromClip(LPCSTR name,OLEOPT_RENDER render,OLECLIPFORMAT clipformat) { - FIXME("(%s,%d,%d): stub!\n",name,render,clipformat); + FIXME("(%s,%d,%ld): stub!\n",name,render,clipformat); return OLE_OK; } @@ -185,7 +185,7 @@ OLESTATUS WINAPI OleCreateFromClip( LPCSTR name,LPOLECLIENT olecli,LHCLIENTDOC hclientdoc,LPCSTR xname, _LPOLEOBJECT *lpoleob,OLEOPT_RENDER render, OLECLIPFORMAT clipformat ) { - FIXME("(%s,%p,%08x,%s,%p,%d,%d): stub!\n", + FIXME("(%s,%p,%08lx,%s,%p,%d,%ld): stub!\n", name,olecli,hclientdoc,xname,lpoleob,render,clipformat); /* clipb type, object kreieren entsprechend etc. */ return OLE_OK;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/olecli.dll16/Makefile.in | 1 - dlls/olecli.dll16/olecli.c | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/olecli.dll16/Makefile.in b/dlls/olecli.dll16/Makefile.in index deb080b7282..40a2446b61e 100644 --- a/dlls/olecli.dll16/Makefile.in +++ b/dlls/olecli.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = olecli.dll16 IMPORTS = gdi32 EXTRADLLFLAGS = -m16 -Wb,--main-module,olecli32.dll diff --git a/dlls/olecli.dll16/olecli.c b/dlls/olecli.dll16/olecli.c index 599312e5491..805d9ecee4b 100644 --- a/dlls/olecli.dll16/olecli.c +++ b/dlls/olecli.dll16/olecli.c @@ -89,7 +89,7 @@ static LONG OLE_current_handle; */ OLESTATUS WINAPI OleSavedClientDoc16(LHCLIENTDOC hDoc) { - FIXME("(%d: stub\n", hDoc); + FIXME("(%ld: stub\n", hDoc); return OLE_OK; } @@ -109,7 +109,7 @@ OLESTATUS WINAPI OleRegisterClientDoc16(LPCSTR classname, LPCSTR docname, */ OLESTATUS WINAPI OleRenameClientDoc16(LHCLIENTDOC hDoc, LPCSTR newName) { - FIXME("(%d,%s,...): stub\n",hDoc, newName); + FIXME("(%ld,%s,...): stub\n",hDoc, newName); return OLE_OK; } @@ -118,7 +118,7 @@ OLESTATUS WINAPI OleRenameClientDoc16(LHCLIENTDOC hDoc, LPCSTR newName) */ OLESTATUS WINAPI OleRevokeClientDoc16(LHCLIENTDOC hServerDoc) { - FIXME("(%d): stub\n",hServerDoc); + FIXME("(%ld): stub\n",hServerDoc); return OLE_OK; } @@ -127,7 +127,7 @@ OLESTATUS WINAPI OleRevokeClientDoc16(LHCLIENTDOC hServerDoc) */ OLESTATUS WINAPI OleRevertClientDoc16(LHCLIENTDOC hServerDoc) { - FIXME("(%d): stub\n", hServerDoc); + FIXME("(%ld): stub\n", hServerDoc); return OLE_OK; } @@ -136,7 +136,7 @@ OLESTATUS WINAPI OleRevertClientDoc16(LHCLIENTDOC hServerDoc) */ OLESTATUS WINAPI OleEnumObjects16(LHCLIENTDOC hServerDoc, SEGPTR data) { - FIXME("(%d, %04x:%04x): stub\n", hServerDoc, HIWORD(data), + FIXME("(%ld, %04x:%04x): stub\n", hServerDoc, HIWORD(data), LOWORD(data)); return OLE_OK; } @@ -148,7 +148,7 @@ OLESTATUS WINAPI OleCreateLinkFromClip16( LPCSTR name, SEGPTR olecli, LHCLIENTDO LPCSTR xname, SEGPTR lpoleob, UINT16 render, UINT16 clipformat ) { - FIXME("(%s, %04x:%04x, %d, %s, %04x:%04x, %d, %d): stub!\n", + FIXME("(%s, %04x:%04x, %ld, %s, %04x:%04x, %d, %d): stub!\n", name, HIWORD(olecli), LOWORD(olecli), hclientdoc, xname, HIWORD(lpoleob), LOWORD(lpoleob), render, clipformat); return OLE_OK; @@ -195,7 +195,7 @@ OLESTATUS WINAPI OleCreateFromClip16( LPCSTR name, SEGPTR olecli, LHCLIENTDOC hc LPCSTR xname, SEGPTR lpoleob, UINT16 render, UINT16 clipformat ) { - FIXME("(%s, %04x:%04x, %d, %s, %04x:%04x, %d, %d): stub!\n", + FIXME("(%s, %04x:%04x, %ld, %s, %04x:%04x, %d, %d): stub!\n", name, HIWORD(olecli), LOWORD(olecli), hclientdoc, xname, HIWORD(lpoleob), LOWORD(lpoleob), render, clipformat); return OLE_OK;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/oledb32/Makefile.in | 1 - dlls/oledb32/convert.c | 10 +++++----- dlls/oledb32/datainit.c | 22 +++++++++++----------- dlls/oledb32/dslocator.c | 30 +++++++++++++++--------------- dlls/oledb32/errorinfo.c | 16 ++++++++-------- dlls/oledb32/rowpos.c | 8 ++++---- 6 files changed, 43 insertions(+), 44 deletions(-) diff --git a/dlls/oledb32/Makefile.in b/dlls/oledb32/Makefile.in index ec07aa6d656..58e8f7b519d 100644 --- a/dlls/oledb32/Makefile.in +++ b/dlls/oledb32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = oledb32.dll IMPORTS = uuid oleaut32 ole32 comctl32 user32 advapi32 diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 9bd93b6ca66..b8db8f06d8b 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -170,7 +170,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, VARIANT tmp; HRESULT hr; - TRACE("(%p)->(%d, %d, %ld, %p, %p, %p, %ld, %d, %p, %d, %d, %x)\n", This, + TRACE("(%p)->(%d, %d, %Id, %p, %p, %p, %Id, %ld, %p, %d, %d, %lx)\n", This, src_type, dst_type, src_len, dst_len, src, dst, dst_max_len, src_status, dst_status, precision, scale, flags); @@ -1113,7 +1113,7 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, hr = SafeArrayAccessData(V_ARRAY((VARIANT*)src), (VOID**)&data); if(FAILED(hr)) { - ERR("SafeArrayAccessData Failed = 0x%08x\n", hr); + ERR("SafeArrayAccessData Failed = 0x%08lx\n", hr); return hr; } @@ -1613,7 +1613,7 @@ static HRESULT WINAPI dcinfo_GetInfo(IDCInfo *iface, ULONG num, DCINFOTYPE types ULONG i; DCINFO *infos; - TRACE("(%p)->(%d, %p, %p)\n", This, num, types, info_ptr); + TRACE("(%p)->(%ld, %p, %p)\n", This, num, types, info_ptr); *info_ptr = infos = CoTaskMemAlloc(num * sizeof(*infos)); if(!infos) return E_OUTOFMEMORY; @@ -1641,7 +1641,7 @@ static HRESULT WINAPI dcinfo_SetInfo(IDCInfo* iface, ULONG num, DCINFO info[]) ULONG i; HRESULT hr = S_OK; - TRACE("(%p)->(%d, %p)\n", This, num, info); + TRACE("(%p)->(%ld, %p)\n", This, num, info); for(i = 0; i < num; i++) { @@ -1658,7 +1658,7 @@ static HRESULT WINAPI dcinfo_SetInfo(IDCInfo* iface, ULONG num, DCINFO info[]) break; default: - FIXME("Unhandled info type %d (vt %x)\n", info[i].eInfoType, V_VT(&info[i].vData)); + FIXME("Unhandled info type %ld (vt %x)\n", info[i].eInfoType, V_VT(&info[i].vData)); } } return hr; diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index 08bc60bce92..0438375202b 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -111,7 +111,7 @@ static HRESULT WINAPI dbprops_GetProperties(IDBProperties *iface, ULONG cPropert { dbinit *This = impl_from_IDBProperties(iface); - FIXME("(%p)->(%d %p %p %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); + FIXME("(%p)->(%ld %p %p %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertySets, prgPropertySets); return E_NOTIMPL; } @@ -122,7 +122,7 @@ static HRESULT WINAPI dbprops_GetPropertyInfo(IDBProperties *iface, ULONG cPrope { dbinit *This = impl_from_IDBProperties(iface); - FIXME("(%p)->(%d %p %p %p %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, + FIXME("(%p)->(%ld %p %p %p %p)\n", This, cPropertyIDSets, rgPropertyIDSets, pcPropertyInfoSets, prgPropertyInfoSets, ppDescBuffer); return E_NOTIMPL; @@ -133,7 +133,7 @@ static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG cPropert { dbinit *This = impl_from_IDBProperties(iface); - FIXME("(%p)->(%d %p)\n", This, cPropertySets, rgPropertySets); + FIXME("(%p)->(%ld %p)\n", This, cPropertySets, rgPropertySets); return E_NOTIMPL; } @@ -343,7 +343,7 @@ static HRESULT convert_dbproperty_mode(const WCHAR *src, VARIANT *dest) { V_VT(dest) = VT_I4; V_I4(dest) = prop->value; - TRACE("%s = %#x\n", debugstr_w(src), prop->value); + TRACE("%s = %#lx\n", debugstr_w(src), prop->value); return S_OK; } @@ -698,7 +698,7 @@ HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID IDBProperties_Release(dbprops); if (FAILED(hr)) { - WARN("GetProperties failed for datasource, 0x%08x\n", hr); + WARN("GetProperties failed for datasource, 0x%08lx\n", hr); return hr; } @@ -754,7 +754,7 @@ HRESULT get_data_source(IUnknown *outer, DWORD clsctx, LPWSTR initstring, REFIID free_dbpropset(1, propset); if (FAILED(hr)) { - ERR("SetProperties failed, 0x%08x\n", hr); + ERR("SetProperties failed, 0x%08lx\n", hr); datasource_release(datasource_created, datasource); return hr; } @@ -768,7 +768,7 @@ static HRESULT WINAPI datainit_GetDataSource(IDataInitialize *iface, IUnknown *o { datainit *This = impl_from_IDataInitialize(iface); - TRACE("(%p)->(%p 0x%x %s %s %p)\n", This, outer, clsctx, debugstr_w(initstring), debugstr_guid(riid), datasource); + TRACE("(%p)->(%p 0x%lx %s %s %p)\n", This, outer, clsctx, debugstr_w(initstring), debugstr_guid(riid), datasource); return get_data_source(outer, clsctx, initstring, riid, datasource); } @@ -889,7 +889,7 @@ static HRESULT WINAPI datainit_GetInitializationString(IDataInitialize *iface, I hr = IDBProperties_GetProperties(props, 1, &propidset, &count, &propset); if (FAILED(hr)) { - WARN("failed to get data source properties, 0x%08x\n", hr); + WARN("failed to get data source properties, 0x%08lx\n", hr); CoTaskMemFree(progid); return hr; } @@ -956,7 +956,7 @@ static HRESULT WINAPI datainit_CreateDBInstance(IDataInitialize *iface, REFCLSID { datainit *This = impl_from_IDataInitialize(iface); - TRACE("(%p)->(%s %p 0x%08x %s %s %p)\n", This, debugstr_guid(provider), outer, clsctx, debugstr_w(reserved), + TRACE("(%p)->(%s %p 0x%08lx %s %s %p)\n", This, debugstr_guid(provider), outer, clsctx, debugstr_w(reserved), debugstr_guid(riid), datasource); return CoCreateInstance(provider, outer, clsctx, riid, (void**)datasource); @@ -967,7 +967,7 @@ static HRESULT WINAPI datainit_CreateDBInstanceEx(IDataInitialize *iface, REFCLS { datainit *This = impl_from_IDataInitialize(iface); - FIXME("(%p)->(%s %p %#x %s %p %u %p)\n", This, debugstr_guid(provider), outer, clsctx, + FIXME("(%p)->(%s %p %#lx %s %p %lu %p)\n", This, debugstr_guid(provider), outer, clsctx, debugstr_w(reserved), server_info, cmq, results); return E_NOTIMPL; @@ -988,7 +988,7 @@ static HRESULT WINAPI datainit_WriteStringToStorage(IDataInitialize *iface, LPWS { datainit *This = impl_from_IDataInitialize(iface); - FIXME("(%p)->(%s %s %d)\n", This, debugstr_w(pwszFileName), debugstr_w(pwszInitializationString), dwCreationDisposition); + FIXME("(%p)->(%s %s %ld)\n", This, debugstr_w(pwszFileName), debugstr_w(pwszInitializationString), dwCreationDisposition); return E_NOTIMPL; } diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index d35e1eb116f..722032bc18b 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -89,7 +89,7 @@ static BOOL initialize_datasource(struct datasource *data) hr = CoCreateInstance(&data->clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IDBProperties, (void**)&data->provider); if (FAILED(hr)) { - WARN("Datasource cannot be created (0x%08x)\n", hr); + WARN("Datasource cannot be created (0x%08lx)\n", hr); return FALSE; } @@ -100,7 +100,7 @@ static BOOL initialize_datasource(struct datasource *data) hr = IDBProperties_GetPropertyInfo(data->provider, 1, &propidset, &infocount, &data->propinfoset, &data->description); if (FAILED(hr)) { - WARN("Failed to get DB Properties (0x%08x)\n", hr); + WARN("Failed to get DB Properties (0x%08lx)\n", hr); IDBProperties_Release(data->provider); data->provider = NULL; @@ -180,7 +180,7 @@ static HRESULT WINAPI dslocator_QueryInterface(IDataSourceLocator *iface, REFIID static ULONG WINAPI dslocator_AddRef(IDataSourceLocator *iface) { DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); - TRACE("(%p)->%u\n",This,This->ref); + TRACE("(%p)->%lu\n",This,This->ref); return InterlockedIncrement(&This->ref); } @@ -189,7 +189,7 @@ static ULONG WINAPI dslocator_Release(IDataSourceLocator *iface) DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->%u\n",This,ref+1); + TRACE("(%p)->%lu\n",This,ref+1); if (!ref) { @@ -212,7 +212,7 @@ static HRESULT WINAPI dslocator_GetTypeInfo(IDataSourceLocator *iface, UINT iTIn { DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); - FIXME("(%p)->(%u %u %p)\n", This, iTInfo, lcid, ppTInfo); + FIXME("(%p)->(%u %lu %p)\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; } @@ -222,7 +222,7 @@ static HRESULT WINAPI dslocator_GetIDsOfNames(IDataSourceLocator *iface, REFIID { DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); - FIXME("(%p)->(%s %p %u %u %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + FIXME("(%p)->(%s %p %u %lu %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); return E_NOTIMPL; } @@ -232,7 +232,7 @@ static HRESULT WINAPI dslocator_Invoke(IDataSourceLocator *iface, DISPID dispIdM { DSLocatorImpl *This = impl_from_IDataSourceLocator(iface); - FIXME("(%p)->(%d %s %d %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + FIXME("(%p)->(%ld %s %ld %d %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return E_NOTIMPL; @@ -331,7 +331,7 @@ static void add_connections_providers(HWND lv) static INT_PTR CALLBACK data_link_properties_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { - TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); + TRACE("(%p, %08x, %08Ix, %08Ix)\n", hwnd, msg, wp, lp); switch (msg) { @@ -479,7 +479,7 @@ static void connection_toggle_controls(HWND parent) static INT_PTR CALLBACK data_link_connection_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { - TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); + TRACE("(%p, %08x, %08Ix, %08Ix)\n", hwnd, msg, wp, lp); switch (msg) { @@ -551,7 +551,7 @@ static void advanced_fill_permission_list(HWND parent) static INT_PTR CALLBACK data_link_advanced_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { - TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); + TRACE("(%p, %08x, %08Ix, %08Ix)\n", hwnd, msg, wp, lp); switch (msg) { @@ -595,7 +595,7 @@ static void create_page_all_columns(HWND lv) static INT_PTR CALLBACK data_link_all_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { - TRACE("(%p, %08x, %08lx, %08lx)\n", hwnd, msg, wp, lp); + TRACE("(%p, %08x, %08Ix, %08Ix)\n", hwnd, msg, wp, lp); switch (msg) { @@ -712,7 +712,7 @@ static ULONG WINAPI datainitialize_Release(IDataInitialize *iface) static HRESULT WINAPI datainitialize_GetDataSource(IDataInitialize *iface, IUnknown *outer, DWORD context, LPWSTR initstring, REFIID riid, IUnknown **datasource) { - TRACE("(%p)->(%p %#x %s %s %p)\n", iface, outer, context, debugstr_w(initstring), debugstr_guid(riid), + TRACE("(%p)->(%p %#lx %s %s %p)\n", iface, outer, context, debugstr_w(initstring), debugstr_guid(riid), datasource); return get_data_source(outer, context, initstring, riid, datasource); @@ -728,7 +728,7 @@ static HRESULT WINAPI datainitialize_GetInitializationString(IDataInitialize *if static HRESULT WINAPI datainitialize_CreateDBInstance(IDataInitialize *iface, REFCLSID prov, IUnknown *outer, DWORD clsctx, LPWSTR reserved, REFIID riid, IUnknown **datasource) { - FIXME("(%p)->(%s %p %#x %p %s %p): stub\n", iface, debugstr_guid(prov), outer, clsctx, reserved, + FIXME("(%p)->(%s %p %#lx %p %s %p): stub\n", iface, debugstr_guid(prov), outer, clsctx, reserved, debugstr_guid(riid), datasource); return E_NOTIMPL; } @@ -736,7 +736,7 @@ static HRESULT WINAPI datainitialize_CreateDBInstance(IDataInitialize *iface, RE static HRESULT WINAPI datainitialize_CreateDBInstanceEx(IDataInitialize *iface, REFCLSID prov, IUnknown *outer, DWORD clsctx, LPWSTR reserved, COSERVERINFO *server_info, DWORD cmq, MULTI_QI *results) { - FIXME("(%p)->(%s %p %#x %p %p %u %p): stub\n", iface, debugstr_guid(prov), outer, clsctx, reserved, + FIXME("(%p)->(%s %p %#lx %p %p %lu %p): stub\n", iface, debugstr_guid(prov), outer, clsctx, reserved, server_info, cmq, results); return E_NOTIMPL; } @@ -750,7 +750,7 @@ static HRESULT WINAPI datainitialize_LoadStringFromStorage(IDataInitialize *ifac static HRESULT WINAPI datainitialize_WriteStringToStorage(IDataInitialize *iface, LPWSTR filename, LPWSTR initstring, DWORD disposition) { - FIXME("(%p)->(%s %s %#x): stub\n", iface, debugstr_w(filename), debugstr_w(initstring), disposition); + FIXME("(%p)->(%s %s %#lx): stub\n", iface, debugstr_w(filename), debugstr_w(initstring), disposition); return E_NOTIMPL; } diff --git a/dlls/oledb32/errorinfo.c b/dlls/oledb32/errorinfo.c index 9987b2113bf..b6e0d10e8e0 100644 --- a/dlls/oledb32/errorinfo.c +++ b/dlls/oledb32/errorinfo.c @@ -96,7 +96,7 @@ static HRESULT WINAPI errorrecords_QueryInterface(IErrorInfo* iface, REFIID riid static ULONG WINAPI errorrecords_AddRef(IErrorInfo* iface) { errorrecords *This = impl_from_IErrorInfo(iface); - TRACE("(%p)->%u\n",This,This->ref); + TRACE("(%p)->%lu\n",This,This->ref); return InterlockedIncrement(&This->ref); } @@ -105,7 +105,7 @@ static ULONG WINAPI errorrecords_Release(IErrorInfo* iface) errorrecords *This = impl_from_IErrorInfo(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->%u\n",This,ref+1); + TRACE("(%p)->%lu\n",This,ref+1); if (!ref) { @@ -268,7 +268,7 @@ static HRESULT WINAPI errorrec_AddErrorRecord(IErrorRecords *iface, ERRORINFO *p struct ErrorEntry *entry; HRESULT hr; - TRACE("(%p)->(%p %d %p %p %d)\n", This, pErrorInfo, dwLookupID, pdispparams, punkCustomError, dwDynamicErrorID); + TRACE("(%p)->(%p %ld %p %p %ld)\n", This, pErrorInfo, dwLookupID, pdispparams, punkCustomError, dwDynamicErrorID); if(!pErrorInfo) return E_INVALIDARG; @@ -313,7 +313,7 @@ static HRESULT WINAPI errorrec_GetBasicErrorInfo(IErrorRecords *iface, ULONG ind { errorrecords *This = impl_from_IErrorRecords(iface); - TRACE("(%p)->(%u %p)\n", This, index, info); + TRACE("(%p)->(%lu %p)\n", This, index, info); if (!info) return E_INVALIDARG; @@ -331,7 +331,7 @@ static HRESULT WINAPI errorrec_GetCustomErrorObject(IErrorRecords *iface, ULONG { errorrecords *This = impl_from_IErrorRecords(iface); - TRACE("(%p)->(%u %s %p)\n", This, index, debugstr_guid(riid), object); + TRACE("(%p)->(%lu %s %p)\n", This, index, debugstr_guid(riid), object); if (!object) return E_INVALIDARG; @@ -353,7 +353,7 @@ static HRESULT WINAPI errorrec_GetErrorInfo(IErrorRecords *iface, ULONG index, { errorrecords *This = impl_from_IErrorRecords(iface); - FIXME("(%p)->(%u %d, %p)\n", This, index, lcid, ppErrorInfo); + FIXME("(%p)->(%lu %ld, %p)\n", This, index, lcid, ppErrorInfo); if (!ppErrorInfo) return E_INVALIDARG; @@ -368,7 +368,7 @@ static HRESULT WINAPI errorrec_GetErrorParameters(IErrorRecords *iface, ULONG in { errorrecords *This = impl_from_IErrorRecords(iface); - TRACE("(%p)->(%u %p)\n", This, index, pdispparams); + TRACE("(%p)->(%lu %p)\n", This, index, pdispparams); if (!pdispparams) return E_INVALIDARG; @@ -391,7 +391,7 @@ static HRESULT WINAPI errorrec_GetRecordCount(IErrorRecords *iface, ULONG *count *count = This->count; - TRACE("<--(%u)\n", *count); + TRACE("<--(%lu)\n", *count); return S_OK; } diff --git a/dlls/oledb32/rowpos.c b/dlls/oledb32/rowpos.c index c922f93f908..bc42f33f851 100644 --- a/dlls/oledb32/rowpos.c +++ b/dlls/oledb32/rowpos.c @@ -136,7 +136,7 @@ static ULONG WINAPI rowpos_AddRef(IRowPosition* iface) { rowpos *This = impl_from_IRowPosition(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("(%p)->(%ld)\n", This, ref); return ref; } @@ -145,7 +145,7 @@ static ULONG WINAPI rowpos_Release(IRowPosition* iface) rowpos *This = impl_from_IRowPosition(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("(%p)->(%ld)\n", This, ref); if (ref == 0) { @@ -230,7 +230,7 @@ static HRESULT WINAPI rowpos_SetRowPosition(IRowPosition *iface, HCHAPTER chapte DBREASON reason; HRESULT hr; - TRACE("(%p)->(%lx %lx %d)\n", This, chapter, row, flags); + TRACE("(%p)->(%Ix %Ix %ld)\n", This, chapter, row, flags); if (!This->cleared) return E_UNEXPECTED; @@ -425,7 +425,7 @@ static HRESULT WINAPI rowpos_cp_Unadvise(IConnectionPoint *iface, DWORD cookie) { rowpos_cp *This = impl_from_IConnectionPoint(iface); - TRACE("(%p)->(%d)\n", This, cookie); + TRACE("(%p)->(%ld)\n", This, cookie); if (!cookie || cookie > This->sinks_size || !This->sinks[cookie-1]) return CONNECT_E_NOCONNECTION;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/oledlg/Makefile.in | 1 - dlls/oledlg/oledlg_main.c | 2 +- dlls/oledlg/pastespl.c | 16 ++++++++-------- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/oledlg/Makefile.in b/dlls/oledlg/Makefile.in index 1d1113a7876..4a16469a456 100644 --- a/dlls/oledlg/Makefile.in +++ b/dlls/oledlg/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = oledlg.dll IMPORTLIB = oledlg IMPORTS = ole32 comdlg32 user32 advapi32 diff --git a/dlls/oledlg/oledlg_main.c b/dlls/oledlg/oledlg_main.c index df53ad709ad..33e62f64935 100644 --- a/dlls/oledlg/oledlg_main.c +++ b/dlls/oledlg/oledlg_main.c @@ -84,7 +84,7 @@ static void register_messages(void) */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) { - TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, fImpLoad); + TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad); switch(fdwReason) { case DLL_PROCESS_ATTACH: diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index 2593fd559d2..b716036f15f 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -78,7 +78,7 @@ static void dump_ps_flags(DWORD flags) strcat(flagstr, "|"); } } - TRACE("flags %08x %s\n", flags, flagstr); + TRACE("flags %08lx %s\n", flags, flagstr); } static void dump_pastespecial(const OLEUIPASTESPECIALW *ps) @@ -87,7 +87,7 @@ static void dump_pastespecial(const OLEUIPASTESPECIALW *ps) UINT j; dump_ps_flags(ps->dwFlags); - TRACE("hwnd %p caption %s hook %p custdata %lx\n", + TRACE("hwnd %p caption %s hook %p custdata %Ix\n", ps->hWndOwner, debugstr_w(ps->lpszCaption), ps->lpfnHook, ps->lCustData); if(IS_INTRESOURCE(ps->lpszTemplate)) TRACE("hinst %p template %04x hresource %p\n", ps->hInstance, (WORD)(ULONG_PTR)ps->lpszTemplate, ps->hResource); @@ -96,16 +96,16 @@ static void dump_pastespecial(const OLEUIPASTESPECIALW *ps) TRACE("dataobj %p arrpasteent %p cpasteent %d arrlinktype %p clinktype %d\n", ps->lpSrcDataObj, ps->arrPasteEntries, ps->cPasteEntries, ps->arrLinkTypes, ps->cLinkTypes); - TRACE("cclsidex %d lpclsidex %p nselect %d flink %d hmetapict %p size(%d,%d)\n", + TRACE("cclsidex %d lpclsidex %p nselect %d flink %d hmetapict %p size(%ld,%ld)\n", ps->cClsidExclude, ps->lpClsidExclude, ps->nSelectedIndex, ps->fLink, ps->hMetaPict, ps->sizel.cx, ps->sizel.cy); for(i = 0; i < ps->cPasteEntries; i++) { - TRACE("arrPasteEntries[%d]: cFormat %08x pTargetDevice %p dwAspect %d lindex %d tymed %d\n", + TRACE("arrPasteEntries[%d]: cFormat %08x pTargetDevice %p dwAspect %ld lindex %ld tymed %ld\n", i, ps->arrPasteEntries[i].fmtetc.cfFormat, ps->arrPasteEntries[i].fmtetc.ptd, ps->arrPasteEntries[i].fmtetc.dwAspect, ps->arrPasteEntries[i].fmtetc.lindex, ps->arrPasteEntries[i].fmtetc.tymed); - TRACE("\tformat name %s result text %s flags %04x\n", debugstr_w(ps->arrPasteEntries[i].lpstrFormatName), + TRACE("\tformat name %s result text %s flags %04lx\n", debugstr_w(ps->arrPasteEntries[i].lpstrFormatName), debugstr_w(ps->arrPasteEntries[i].lpstrResultText), ps->arrPasteEntries[i].dwFlags); } for(i = 0; i < ps->cLinkTypes; i++) @@ -228,7 +228,7 @@ static DWORD init_pastelist(HWND hdlg, OLEUIPASTESPECIALW *ps) /* The native version grabs only the first 20 fmts and we do the same */ hr = IEnumFORMATETC_Next(penum, ARRAY_SIZE(fmts), fmts, &fetched); - TRACE("got %d formats hr %08x\n", fetched, hr); + TRACE("got %ld formats hr %08lx\n", fetched, hr); if(SUCCEEDED(hr)) { @@ -271,7 +271,7 @@ static DWORD init_linklist(HWND hdlg, OLEUIPASTESPECIALW *ps) if(hr == S_OK) supported_mask |= 1 << link; } - TRACE("supported_mask %02x\n", supported_mask); + TRACE("supported_mask %02lx\n", supported_mask); for(req_fmt = 0; req_fmt < ps->cPasteEntries; req_fmt++) { DWORD linktypes; @@ -515,7 +515,7 @@ static INT_PTR CALLBACK ps_dlg_proc(HWND hdlg, UINT msg, WPARAM wp, LPARAM lp) static const WCHAR prop_name[] = {'W','i','n','e','_','S','t','r','u','c','t','u','r','e',0}; ps_struct_t *ps_struct; - TRACE("(%p, %04x, %08lx, %08lx)\n", hdlg, msg, wp, lp); + TRACE("(%p, %04x, %08Ix, %08Ix)\n", hdlg, msg, wp, lp); ps_struct = GetPropW(hdlg, prop_name);
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/olesvr32/Makefile.in | 1 - dlls/olesvr32/olesvr_main.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/olesvr32/Makefile.in b/dlls/olesvr32/Makefile.in index 5efc297a7aa..0cea1ad4654 100644 --- a/dlls/olesvr32/Makefile.in +++ b/dlls/olesvr32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = olesvr32.dll IMPORTLIB = olesvr32 diff --git a/dlls/olesvr32/olesvr_main.c b/dlls/olesvr32/olesvr_main.c index 0ca83ba86e7..e977a7765ee 100644 --- a/dlls/olesvr32/olesvr_main.c +++ b/dlls/olesvr32/olesvr_main.c @@ -134,7 +134,7 @@ static LONG OLE_current_handle; */ OLESTATUS WINAPI OleBlockServer(LHSERVER hServer) { - FIXME("(%d): stub\n",hServer); + FIXME("(%ld): stub\n",hServer); return OLE_OK; } @@ -143,7 +143,7 @@ OLESTATUS WINAPI OleBlockServer(LHSERVER hServer) */ OLESTATUS WINAPI OleUnblockServer(LHSERVER hServer, BOOL *block) { - FIXME("(%d): stub\n",hServer); + FIXME("(%ld): stub\n",hServer); /* no more blocked messages :) */ *block=FALSE; return OLE_OK; @@ -154,7 +154,7 @@ OLESTATUS WINAPI OleUnblockServer(LHSERVER hServer, BOOL *block) */ OLESTATUS WINAPI OleRevokeServerDoc(LHSERVERDOC hServerDoc) { - FIXME("(%d): stub\n",hServerDoc); + FIXME("(%ld): stub\n",hServerDoc); return OLE_OK; } @@ -174,7 +174,7 @@ OLESTATUS WINAPI OleRegisterServerDoc( LHSERVER hServer, LPCSTR docname, LPOLESERVERDOC document, LHSERVERDOC *hRet) { - FIXME("(%d,%s): stub\n", hServer, docname); + FIXME("(%ld,%s): stub\n", hServer, docname); *hRet=++OLE_current_handle; return OLE_OK; } @@ -185,7 +185,7 @@ OLESTATUS WINAPI OleRegisterServerDoc( LHSERVER hServer, LPCSTR docname, */ OLESTATUS WINAPI OleRenameServerDoc(LHSERVERDOC hDoc, LPCSTR newName) { - FIXME("(%d,%s): stub.\n",hDoc, newName); + FIXME("(%ld,%s): stub.\n",hDoc, newName); return OLE_OK; } @@ -195,7 +195,7 @@ OLESTATUS WINAPI OleRenameServerDoc(LHSERVERDOC hDoc, LPCSTR newName) */ OLESTATUS WINAPI OleRevertServerDoc(LHSERVERDOC hDoc) { - FIXME("(%d): stub.\n", hDoc); + FIXME("(%ld): stub.\n", hDoc); return OLE_OK; } @@ -205,7 +205,7 @@ OLESTATUS WINAPI OleRevertServerDoc(LHSERVERDOC hDoc) */ OLESTATUS WINAPI OleSavedServerDoc(LHSERVERDOC hDoc) { - FIXME("(%d): stub.\n", hDoc); + FIXME("(%ld): stub.\n", hDoc); return OLE_OK; } @@ -215,6 +215,6 @@ OLESTATUS WINAPI OleSavedServerDoc(LHSERVERDOC hDoc) */ OLESTATUS WINAPI OleRevokeServer(LHSERVER hServer) { - FIXME("(%d): stub.\n", hServer); + FIXME("(%ld): stub.\n", hServer); return OLE_OK; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/olesvr.dll16/Makefile.in | 1 - dlls/olesvr.dll16/olesvr.c | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/olesvr.dll16/Makefile.in b/dlls/olesvr.dll16/Makefile.in index 49c07bdcc76..d894b588007 100644 --- a/dlls/olesvr.dll16/Makefile.in +++ b/dlls/olesvr.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = olesvr.dll16 IMPORTS = gdi32 EXTRADLLFLAGS = -m16 -Wb,--main-module,olesvr32.dll diff --git a/dlls/olesvr.dll16/olesvr.c b/dlls/olesvr.dll16/olesvr.c index 44e68228f4c..aee28df4340 100644 --- a/dlls/olesvr.dll16/olesvr.c +++ b/dlls/olesvr.dll16/olesvr.c @@ -148,7 +148,7 @@ OLESTATUS WINAPI OleRegisterServer16( LPCSTR name, LPOLESERVER serverStruct, */ OLESTATUS WINAPI OleRevokeServer16(LHSERVER hServer) { - FIXME("%d - stub\n",hServer); + FIXME("%ld - stub\n",hServer); return OLE_OK; } @@ -157,7 +157,7 @@ OLESTATUS WINAPI OleRevokeServer16(LHSERVER hServer) */ OLESTATUS WINAPI OleBlockServer16(LHSERVER hServer) { - FIXME("(%d): stub\n",hServer); + FIXME("(%ld): stub\n",hServer); return OLE_OK; } @@ -166,7 +166,7 @@ OLESTATUS WINAPI OleBlockServer16(LHSERVER hServer) */ OLESTATUS WINAPI OleUnblockServer16(LHSERVER hServer, BOOL16 *block) { - FIXME("(%d): stub\n",hServer); + FIXME("(%ld): stub\n",hServer); /* no more blocked messages :) */ *block=FALSE; return OLE_OK; @@ -179,7 +179,7 @@ OLESTATUS WINAPI OleRegisterServerDoc16( LHSERVER hServer, LPCSTR docname, LPOLESERVERDOC document, LHSERVERDOC *hRet) { - FIXME("(%d,%s): stub\n",hServer, docname); + FIXME("(%ld,%s): stub\n",hServer, docname); *hRet=++OLE_current_handle; return OLE_OK; } @@ -189,7 +189,7 @@ OLESTATUS WINAPI OleRegisterServerDoc16( LHSERVER hServer, LPCSTR docname, */ OLESTATUS WINAPI OleRevokeServerDoc16(LHSERVERDOC hServerDoc) { - FIXME("%d - stub\n",hServerDoc); + FIXME("%ld - stub\n",hServerDoc); return OLE_OK; } @@ -199,7 +199,7 @@ OLESTATUS WINAPI OleRevokeServerDoc16(LHSERVERDOC hServerDoc) */ OLESTATUS WINAPI OleRenameServerDoc16(LHSERVERDOC hDoc, LPCSTR newName) { - FIXME("(%d,%s): stub.\n", hDoc, newName); + FIXME("(%ld,%s): stub.\n", hDoc, newName); return OLE_OK; } @@ -209,7 +209,7 @@ OLESTATUS WINAPI OleRenameServerDoc16(LHSERVERDOC hDoc, LPCSTR newName) */ OLESTATUS WINAPI OleRevertServerDoc16(LHSERVERDOC hDoc) { - FIXME("(%d): stub.\n", hDoc); + FIXME("(%ld): stub.\n", hDoc); return OLE_OK; } @@ -219,6 +219,6 @@ OLESTATUS WINAPI OleRevertServerDoc16(LHSERVERDOC hDoc) */ OLESTATUS WINAPI OleSavedServerDoc16(LHSERVERDOC hDoc) { - FIXME("(%d): stub.\n", hDoc); + FIXME("(%ld): stub.\n", hDoc); return OLE_OK; }
participants (1)
-
Eric Pouech