Module: wine Branch: master Commit: 36d88d929f55d09353a1c3c150bd1ba1b4d300fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=36d88d929f55d09353a1c3c150...
Author: Michael Stefaniuc mstefani@redhat.de Date: Sun Oct 8 18:58:22 2006 +0200
devenum: Win64 printf format warning fixes.
---
dlls/devenum/Makefile.in | 1 - dlls/devenum/createdevenum.c | 4 ++-- dlls/devenum/devenum_main.c | 4 ++-- dlls/devenum/mediacatenum.c | 28 ++++++++++++++-------------- dlls/devenum/parsedisplayname.c | 2 +- 5 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/dlls/devenum/Makefile.in b/dlls/devenum/Makefile.in index 398d13b..257c0fb 100644 --- a/dlls/devenum/Makefile.in +++ b/dlls/devenum/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ MODULE = devenum.dll IMPORTS = ole32 oleaut32 avicap32 winmm user32 advapi32 kernel32 EXTRALIBS = -lstrmiids -luuid -EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \ createdevenum.c \ diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 086240c..b9c1605 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -110,7 +110,7 @@ HRESULT WINAPI DEVENUM_ICreateDevEnum_Cr HKEY hbasekey; CreateDevEnumImpl *This = (CreateDevEnumImpl *)iface;
- TRACE("(%p)->(%s, %p, %lx)\n\tDeviceClass:\t%s\n", This, debugstr_guid(clsidDeviceClass), ppEnumMoniker, dwFlags, debugstr_guid(clsidDeviceClass)); + TRACE("(%p)->(%s, %p, %x)\n\tDeviceClass:\t%s\n", This, debugstr_guid(clsidDeviceClass), ppEnumMoniker, dwFlags, debugstr_guid(clsidDeviceClass));
if (!ppEnumMoniker) return E_POINTER; @@ -243,7 +243,7 @@ static HRESULT DEVENUM_CreateSpecialCate
if (!LoadStringW(DEVENUM_hInstance, IDS_DEVENUM_DS, szDSoundNameFormat, sizeof(szDSoundNameFormat)/sizeof(szDSoundNameFormat[0])-1)) { - ERR("Couldn't get string resource (GetLastError() is %ld)\n", GetLastError()); + ERR("Couldn't get string resource (GetLastError() is %d)\n", GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); }
diff --git a/dlls/devenum/devenum_main.c b/dlls/devenum/devenum_main.c index 4a45971..3d8566d 100644 --- a/dlls/devenum/devenum_main.c +++ b/dlls/devenum/devenum_main.c @@ -48,7 +48,7 @@ const WCHAR clsid_keyname[6] = { 'C', 'L */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) { - TRACE("%p 0x%lx %p\n", hinstDLL, fdwReason, fImpLoad); + TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, fImpLoad);
switch(fdwReason) { case DLL_PROCESS_ATTACH: @@ -382,6 +382,6 @@ static void DEVENUM_RegisterQuartz() { HRESULT hr = pDllRegisterServer(); if (FAILED(hr)) - ERR("Failed to register Quartz. Error was 0x%lx)\n", hr); + ERR("Failed to register Quartz. Error was 0x%x)\n", hr); } } diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index efe08c1..93e9328 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -129,7 +129,7 @@ static HRESULT WINAPI DEVENUM_IPropertyB { res = E_INVALIDARG; /* assume we cannot coerce into right type */
- TRACE("Read %ld bytes (%s)\n", received, type == REG_SZ ? debugstr_w((LPWSTR)pData) : "binary data"); + TRACE("Read %d bytes (%s)\n", received, type == REG_SZ ? debugstr_w((LPWSTR)pData) : "binary data");
switch (type) { @@ -151,7 +151,7 @@ static HRESULT WINAPI DEVENUM_IPropertyB } break; case REG_DWORD: - TRACE("REG_DWORD: %lx\n", *(DWORD *)pData); + TRACE("REG_DWORD: %x\n", *(DWORD *)pData); switch (V_VT(pVar)) { case VT_EMPTY: @@ -170,7 +170,7 @@ static HRESULT WINAPI DEVENUM_IPropertyB void * pArrayElements; bound.lLbound = 0; bound.cElements = received; - TRACE("REG_BINARY: len = %ld\n", received); + TRACE("REG_BINARY: len = %d\n", received); switch (V_VT(pVar)) { case VT_EMPTY: @@ -194,12 +194,12 @@ static HRESULT WINAPI DEVENUM_IPropertyB } } if (res == E_INVALIDARG) - FIXME("Variant type %x not supported for regtype %lx\n", V_VT(pVar), type); + FIXME("Variant type %x not supported for regtype %x\n", V_VT(pVar), type); }
HeapFree(GetProcessHeap(), 0, pData);
- TRACE("<- %lx\n", res); + TRACE("<- %x\n", res); return res; }
@@ -226,7 +226,7 @@ static HRESULT WINAPI DEVENUM_IPropertyB break; case VT_I4: case VT_UI4: - TRACE("writing %lu\n", V_UNION(pVar, ulVal)); + TRACE("writing %u\n", V_UNION(pVar, ulVal)); lpData = (LPVOID)&V_UNION(pVar, ulVal); dwType = REG_DWORD; cbData = sizeof(DWORD); @@ -239,7 +239,7 @@ static HRESULT WINAPI DEVENUM_IPropertyB res = SafeArrayGetLBound(V_UNION(pVar, parray), 1, &lLbound); res = SafeArrayGetUBound(V_UNION(pVar, parray), 1, &lUbound); cbData = (lUbound - lLbound + 1) /* * sizeof(BYTE)*/; - TRACE("cbData: %ld\n", cbData); + TRACE("cbData: %d\n", cbData); res = SafeArrayAccessData(V_UNION(pVar, parray), &lpData); break; } @@ -449,7 +449,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatM IPropertyBag_Release(pProp); }
- TRACE("<- 0x%lx\n", res); + TRACE("<- 0x%x\n", res);
return res; } @@ -486,7 +486,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatM IMoniker** ppmkToLeft, IMoniker** ppmkReduced) { - TRACE("(%p, %ld, %p, %p)\n", pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced); + TRACE("(%p, %d, %p, %p)\n", pbc, dwReduceHowFar, ppmkToLeft, ppmkReduced);
if (ppmkToLeft) *ppmkToLeft = NULL; @@ -730,7 +730,7 @@ static ULONG WINAPI DEVENUM_IEnumMoniker EnumMonikerImpl *This = (EnumMonikerImpl *)iface; ULONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p)->() AddRef from %ld\n", iface, ref - 1); + TRACE("(%p)->() AddRef from %d\n", iface, ref - 1);
return ref; } @@ -743,7 +743,7 @@ static ULONG WINAPI DEVENUM_IEnumMoniker EnumMonikerImpl *This = (EnumMonikerImpl *)iface; ULONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p)->() Release from %ld\n", iface, ref + 1); + TRACE("(%p)->() Release from %d\n", iface, ref + 1);
if (!ref) { @@ -763,7 +763,7 @@ static HRESULT WINAPI DEVENUM_IEnumMonik MediaCatMoniker * pMoniker; EnumMonikerImpl *This = (EnumMonikerImpl *)iface;
- TRACE("(%p)->(%ld, %p, %p)\n", iface, celt, rgelt, pceltFetched); + TRACE("(%p)->(%d, %p, %p)\n", iface, celt, rgelt, pceltFetched);
while (fetched < celt) { @@ -787,7 +787,7 @@ static HRESULT WINAPI DEVENUM_IEnumMonik
This->index += fetched;
- TRACE("-- fetched %ld\n", fetched); + TRACE("-- fetched %d\n", fetched);
if (pceltFetched) *pceltFetched = fetched; @@ -802,7 +802,7 @@ static HRESULT WINAPI DEVENUM_IEnumMonik { EnumMonikerImpl *This = (EnumMonikerImpl *)iface;
- TRACE("(%p)->(%ld)\n", iface, celt); + TRACE("(%p)->(%d)\n", iface, celt);
This->index += celt;
diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c index 091ad08..0305c98 100644 --- a/dlls/devenum/parsedisplayname.c +++ b/dlls/devenum/parsedisplayname.c @@ -149,7 +149,7 @@ static HRESULT WINAPI DEVENUM_IParseDisp
CoTaskMemFree(pszClass);
- TRACE("-- returning: %lx\n", res); + TRACE("-- returning: %x\n", res); return res; }