[PATCH 01/21] dlls/mapi32: enable compilation with long types
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mapi32/Makefile.in | 1 - dlls/mapi32/mapi32_main.c | 16 ++++++++------- dlls/mapi32/prop.c | 48 +++++++++++++++++++++++---------------------- dlls/mapi32/sendmail.c | 6 +++--- dlls/mapi32/util.c | 18 ++++++++--------- 5 files changed, 44 insertions(+), 45 deletions(-) diff --git a/dlls/mapi32/Makefile.in b/dlls/mapi32/Makefile.in index c6bc57f0ad8..3811fd1904b 100644 --- a/dlls/mapi32/Makefile.in +++ b/dlls/mapi32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mapi32.dll IMPORTLIB = mapi32 IMPORTS = uuid shlwapi shell32 user32 advapi32 diff --git a/dlls/mapi32/mapi32_main.c b/dlls/mapi32/mapi32_main.c index ac830626795..3b9d202bf13 100644 --- a/dlls/mapi32/mapi32_main.c +++ b/dlls/mapi32/mapi32_main.c @@ -41,7 +41,7 @@ DECLSPEC_HIDDEN HINSTANCE hInstMAPI32; */ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) { - TRACE("(%p,%d,%p)\n", hinstDLL, fdwReason, fImpLoad); + TRACE("(%p,%ld,%p)\n", hinstDLL, fdwReason, fImpLoad); switch (fdwReason) { @@ -52,7 +52,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) break; case DLL_PROCESS_DETACH: if (fImpLoad) break; - TRACE("DLL_PROCESS_DETACH: %d objects remaining\n", MAPI_ObjectCount); + TRACE("DLL_PROCESS_DETACH: %ld objects remaining\n", MAPI_ObjectCount); unload_mapi_providers(); break; } @@ -68,7 +68,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { HRESULT ret = mapiFunctions.DllGetClassObject(rclsid, iid, ppv); - TRACE("ret: %x\n", ret); + TRACE("ret: %lx\n", ret); return ret; } @@ -97,7 +97,7 @@ HRESULT WINAPI DllCanUnloadNow(void) if (mapiFunctions.DllCanUnloadNow) { ret = mapiFunctions.DllCanUnloadNow(); - TRACE("(): provider returns %d\n", ret); + TRACE("(): provider returns %ld\n", ret); } return MAPI_ObjectCount == 0 ? ret : S_FALSE; @@ -129,7 +129,7 @@ HRESULT WINAPI MAPIInitialize(LPVOID init) ULONG WINAPI MAPILogon(ULONG_PTR uiparam, LPSTR profile, LPSTR password, FLAGS flags, ULONG reserved, LPLHANDLE session) { - TRACE("(0x%08Ix %s %p 0x%08x 0x%08x %p)\n", uiparam, + TRACE("(0x%08Ix %s %p 0x%08lx 0x%08lx %p)\n", uiparam, debugstr_a(profile), password, flags, reserved, session); if (mapiFunctions.MAPILogon) @@ -149,7 +149,7 @@ ULONG WINAPI MAPILogon(ULONG_PTR uiparam, LPSTR profile, LPSTR password, ULONG WINAPI MAPILogoff(LHANDLE session, ULONG_PTR uiparam, FLAGS flags, ULONG reserved ) { - TRACE("(0x%08Ix 0x%08Ix 0x%08x 0x%08x)\n", session, + TRACE("(0x%08Ix 0x%08Ix 0x%08lx 0x%08lx)\n", session, uiparam, flags, reserved); if (mapiFunctions.MAPILogoff) @@ -167,7 +167,7 @@ ULONG WINAPI MAPILogoff(LHANDLE session, ULONG_PTR uiparam, FLAGS flags, HRESULT WINAPI MAPILogonEx(ULONG_PTR uiparam, LPWSTR profile, LPWSTR password, ULONG flags, LPMAPISESSION *session) { - TRACE("(0x%08Ix %s %p 0x%08x %p)\n", uiparam, + TRACE("(0x%08Ix %s %p 0x%08lx %p)\n", uiparam, debugstr_w(profile), password, flags, session); if (mapiFunctions.MAPILogonEx) @@ -206,7 +206,7 @@ HRESULT WINAPI MAPIAdminProfiles(ULONG ulFlags, LPPROFADMIN *lppProfAdmin) if (mapiFunctions.MAPIAdminProfiles) return mapiFunctions.MAPIAdminProfiles(ulFlags, lppProfAdmin); - FIXME("(%u, %p): stub\n", ulFlags, lppProfAdmin); + FIXME("(%lu, %p): stub\n", ulFlags, lppProfAdmin); *lppProfAdmin = NULL; return E_FAIL; } diff --git a/dlls/mapi32/prop.c b/dlls/mapi32/prop.c index b217035e2c0..95176829f7e 100644 --- a/dlls/mapi32/prop.c +++ b/dlls/mapi32/prop.c @@ -299,7 +299,7 @@ ULONG WINAPI UlPropSize(LPSPropValue lpProp) */ BOOL WINAPI FPropContainsProp(LPSPropValue lpHaystack, LPSPropValue lpNeedle, ULONG ulFuzzy) { - TRACE("(%p,%p,0x%08x)\n", lpHaystack, lpNeedle, ulFuzzy); + TRACE("(%p,%p,0x%08lx)\n", lpHaystack, lpNeedle, ulFuzzy); if (FBadProp(lpHaystack) || FBadProp(lpNeedle) || PROP_TYPE(lpHaystack->ulPropTag) != PROP_TYPE(lpNeedle->ulPropTag)) @@ -400,7 +400,7 @@ BOOL WINAPI FPropCompareProp(LPSPropValue lpPropLeft, ULONG ulOp, LPSPropValue l { LONG iCmp; - TRACE("(%p,%d,%p)\n", lpPropLeft, ulOp, lpPropRight); + TRACE("(%p,%ld,%p)\n", lpPropLeft, ulOp, lpPropRight); if (ulOp > RELOP_RE || FBadProp(lpPropLeft) || FBadProp(lpPropRight)) return FALSE; @@ -442,7 +442,7 @@ LONG WINAPI LPropCompareProp(LPSPropValue lpPropLeft, LPSPropValue lpPropRight) { LONG iRet; - TRACE("(%p->0x%08x,%p->0x%08x)\n", lpPropLeft, lpPropLeft->ulPropTag, + TRACE("(%p->0x%08lx,%p->0x%08lx)\n", lpPropLeft, lpPropLeft->ulPropTag, lpPropRight, lpPropRight->ulPropTag); /* If the properties are not the same, sort by property type */ @@ -514,7 +514,7 @@ LONG WINAPI LPropCompareProp(LPSPropValue lpPropLeft, LPSPropValue lpPropRight) return memcmp(lpPropLeft->Value.lpguid, lpPropRight->Value.lpguid, sizeof(GUID)); } - FIXME("Unhandled property type %d\n", PROP_TYPE(lpPropLeft->ulPropTag)); + FIXME("Unhandled property type %ld\n", PROP_TYPE(lpPropLeft->ulPropTag)); return 0; } @@ -538,7 +538,7 @@ HRESULT WINAPI HrGetOneProp(LPMAPIPROP lpIProp, ULONG ulPropTag, LPSPropValue *l ULONG ulCount; HRESULT hRet; - TRACE("(%p,%d,%p)\n", lpIProp, ulPropTag, lppProp); + TRACE("(%p,%ld,%p)\n", lpIProp, ulPropTag, lppProp); pta.cValues = 1u; pta.aulPropTag[0] = ulPropTag; @@ -593,7 +593,7 @@ HRESULT WINAPI HrSetOneProp(LPMAPIPROP lpIProp, LPSPropValue lpProp) { BOOL bRet = FALSE; - TRACE("(%p,%d)\n", lpIProp, ulPropTag); + TRACE("(%p,%ld)\n", lpIProp, ulPropTag); if (lpIProp) { @@ -638,7 +638,7 @@ HRESULT WINAPI HrSetOneProp(LPMAPIPROP lpIProp, LPSPropValue lpProp) */ LPSPropValue WINAPI PpropFindProp(LPSPropValue lpProps, ULONG cValues, ULONG ulPropTag) { - TRACE("(%p,%d,%d)\n", lpProps, cValues, ulPropTag); + TRACE("(%p,%ld,%ld)\n", lpProps, cValues, ulPropTag); if (lpProps && cValues) { @@ -1075,7 +1075,7 @@ SCODE WINAPI ScRelocProps(int cValues, LPSPropValue lpProps, LPVOID lpOld, */ LPSPropValue WINAPI LpValFindProp(ULONG ulPropTag, ULONG cValues, LPSPropValue lpProps) { - TRACE("(%d,%d,%p)\n", ulPropTag, cValues, lpProps); + TRACE("(%ld,%ld,%p)\n", ulPropTag, cValues, lpProps); if (lpProps && cValues) { @@ -1139,7 +1139,7 @@ BOOL WINAPI FBadRglpszA(LPSTR *lppszStrs, ULONG ulCount) { ULONG i; - TRACE("(%p,%d)\n", lppszStrs, ulCount); + TRACE("(%p,%ld)\n", lppszStrs, ulCount); if (!ulCount) return FALSE; @@ -1164,7 +1164,7 @@ BOOL WINAPI FBadRglpszW(LPWSTR *lppszStrs, ULONG ulCount) { ULONG i; - TRACE("(%p,%d)\n", lppszStrs, ulCount); + TRACE("(%p,%ld)\n", lppszStrs, ulCount); if (!ulCount) return FALSE; @@ -1220,7 +1220,7 @@ BOOL WINAPI FBadRowSet(LPSRowSet lpRowSet) */ ULONG WINAPI FBadPropTag(ULONG ulPropTag) { - TRACE("(0x%08x)\n", ulPropTag); + TRACE("(0x%08lx)\n", ulPropTag); switch (ulPropTag & (~MV_FLAG & PROP_TYPE_MASK)) { @@ -1532,7 +1532,7 @@ static ULONG WINAPI IPropData_fnAddRef(LPPROPDATA iface) { IPropDataImpl *This = impl_from_IPropData(iface); - TRACE("(%p)->(count before=%u)\n", This, This->lRef); + TRACE("(%p)->(count before=%lu)\n", This, This->lRef); return InterlockedIncrement(&This->lRef); } @@ -1548,7 +1548,7 @@ static ULONG WINAPI IPropData_fnRelease(LPPROPDATA iface) IPropDataImpl *This = impl_from_IPropData(iface); LONG lRef; - TRACE("(%p)->(count before=%u)\n", This, This->lRef); + TRACE("(%p)->(count before=%lu)\n", This, This->lRef); lRef = InterlockedDecrement(&This->lRef); if (!lRef) @@ -1596,7 +1596,7 @@ static ULONG WINAPI IPropData_fnRelease(LPPROPDATA iface) static HRESULT WINAPI IPropData_fnGetLastError(LPPROPDATA iface, HRESULT hRes, ULONG ulFlags, LPMAPIERROR *lppError) { - TRACE("(%p,0x%08X,0x%08X,%p)\n", iface, hRes, ulFlags, lppError); + TRACE("(%p,0x%08lX,0x%08lX,%p)\n", iface, hRes, ulFlags, lppError); if (!lppError || SUCCEEDED(hRes) || (ulFlags & ~MAPI_UNICODE)) return MAPI_E_INVALID_PARAMETER; @@ -1620,7 +1620,7 @@ static HRESULT WINAPI IPropData_fnGetLastError(LPPROPDATA iface, HRESULT hRes, U */ static HRESULT WINAPI IPropData_fnSaveChanges(LPPROPDATA iface, ULONG ulFlags) { - TRACE("(%p,0x%08X)\n", iface, ulFlags); + TRACE("(%p,0x%08lX)\n", iface, ulFlags); /* Since this object is not transacted we do not need to implement this */ /* FIXME: Should we set the access levels to clean? */ @@ -1658,7 +1658,7 @@ static HRESULT WINAPI IPropData_fnGetProps(LPPROPDATA iface, LPSPropTagArray lpT ULONG i; HRESULT hRet = S_OK; - TRACE("(%p,%p,0x%08x,%p,%p) stub\n", iface, lpTags, ulFlags, + TRACE("(%p,%p,0x%08lx,%p,%p) stub\n", iface, lpTags, ulFlags, lpCount, lppProps); if (!iface || ulFlags & ~MAPI_UNICODE || !lpTags || *lpCount || !lppProps) @@ -1724,7 +1724,7 @@ static HRESULT WINAPI IPropData_fnGetPropList(LPPROPDATA iface, ULONG ulFlags, ULONG i; HRESULT hRet; - TRACE("(%p,0x%08x,%p) stub\n", iface, ulFlags, lppTags); + TRACE("(%p,0x%08lx,%p) stub\n", iface, ulFlags, lppTags); if (!iface || ulFlags & ~MAPI_UNICODE || !lppTags) return MAPI_E_INVALID_PARAMETER; @@ -1766,7 +1766,7 @@ static HRESULT WINAPI IPropData_fnGetPropList(LPPROPDATA iface, ULONG ulFlags, static HRESULT WINAPI IPropData_fnOpenProperty(LPPROPDATA iface, ULONG ulPropTag, LPCIID iid, ULONG ulOpts, ULONG ulFlags, LPUNKNOWN *lpUnk) { - FIXME("(%p,%u,%s,%u,0x%08x,%p) stub\n", iface, ulPropTag, + FIXME("(%p,%lu,%s,%lu,0x%08lx,%p) stub\n", iface, ulPropTag, debugstr_guid(iid), ulOpts, ulFlags, lpUnk); return MAPI_E_NO_SUPPORT; } @@ -1795,7 +1795,7 @@ static HRESULT WINAPI IPropData_fnSetProps(LPPROPDATA iface, ULONG ulValues, LPS HRESULT hRet = S_OK; ULONG i; - TRACE("(%p,%u,%p,%p)\n", iface, ulValues, lpProps, lppProbs); + TRACE("(%p,%lu,%p,%p)\n", iface, ulValues, lpProps, lppProbs); if (!iface || !lpProps) return MAPI_E_INVALID_PARAMETER; @@ -1963,7 +1963,7 @@ static HRESULT WINAPI IPropData_fnCopyTo(LPPROPDATA iface, ULONG niids, LPCIID l LPVOID lpDstObj, ULONG ulFlags, LPSPropProblemArray *lppProbs) { - FIXME("(%p,%u,%p,%p,%x,%p,%s,%p,0x%08X,%p) stub\n", iface, niids, + FIXME("(%p,%lu,%p,%p,%lx,%p,%s,%p,0x%08lX,%p) stub\n", iface, niids, lpiidExcl, lpPropsExcl, ulParam, lpIProgress, debugstr_guid(lpIfaceIid), lpDstObj, ulFlags, lppProbs); return MAPI_E_NO_SUPPORT; @@ -1982,7 +1982,7 @@ static HRESULT WINAPI IPropData_fnCopyProps(LPPROPDATA iface, LPSPropTagArray lp LPCIID lpIface, LPVOID lpDstObj, ULONG ulFlags, LPSPropProblemArray *lppProbs) { - FIXME("(%p,%p,%x,%p,%s,%p,0x%08X,%p) stub\n", iface, lpInclProps, + FIXME("(%p,%p,%lx,%p,%s,%p,0x%08lX,%p) stub\n", iface, lpInclProps, ulParam, lpIProgress, debugstr_guid(lpIface), lpDstObj, ulFlags, lppProbs); return MAPI_E_NO_SUPPORT; @@ -2015,7 +2015,7 @@ static HRESULT WINAPI IPropData_fnGetNamesFromIDs(LPPROPDATA iface, LPSPropTagAr LPGUID iid, ULONG ulFlags, ULONG *lpCount, LPMAPINAMEID **lpppNames) { - FIXME("(%p,%p,%s,0x%08X,%p,%p) stub\n", iface, lppPropTags, + FIXME("(%p,%p,%s,0x%08lX,%p,%p) stub\n", iface, lppPropTags, debugstr_guid(iid), ulFlags, lpCount, lpppNames); return MAPI_E_NO_SUPPORT; } @@ -2045,7 +2045,7 @@ static HRESULT WINAPI IPropData_fnGetIDsFromNames(LPPROPDATA iface, ULONG ulName LPMAPINAMEID *lppNames, ULONG ulFlags, LPSPropTagArray *lppPropTags) { - FIXME("(%p,%d,%p,0x%08X,%p) stub\n", + FIXME("(%p,%ld,%p,0x%08lX,%p) stub\n", iface, ulNames, lppNames, ulFlags, lppPropTags); return MAPI_E_NO_SUPPORT; } @@ -2069,7 +2069,7 @@ IPropData_fnHrSetObjAccess(LPPROPDATA iface, ULONG ulAccess) { IPropDataImpl *This = impl_from_IPropData(iface); - TRACE("(%p,%x)\n", iface, ulAccess); + TRACE("(%p,%lx)\n", iface, ulAccess); if (!iface || ulAccess < IPROP_READONLY || ulAccess > IPROP_READWRITE) return MAPI_E_INVALID_PARAMETER; diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index e1b7a682088..04266efed8c 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -107,7 +107,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM /* Attempt to log on via Extended MAPI */ ret = MAPILogonEx(0, NULL, NULL, MAPI_EXTENDED | MAPI_USE_DEFAULT | MAPI_NEW_SESSION, &session); - TRACE("MAPILogonEx: %x\n", ret); + TRACE("MAPILogonEx: %lx\n", ret); if (ret != S_OK) { @@ -361,7 +361,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM size += read; } - TRACE("%d bytes written of attachment\n", size); + TRACE("%ld bytes written of attachment\n", size); IStream_Commit(stream, STGC_DEFAULT); IStream_Release(stream); @@ -436,7 +436,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM break; default: - TRACE("ShowForm failure: %x\n", ret); + TRACE("ShowForm failure: %lx\n", ret); break; } } diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index 8f0036e6873..3cd18bb5d88 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -69,7 +69,7 @@ SCODE WINAPI ScInitMapiUtil(ULONG ulReserved) if (mapiFunctions.ScInitMapiUtil) return mapiFunctions.ScInitMapiUtil(ulReserved); - FIXME("(0x%08x)stub!\n", ulReserved); + FIXME("(0x%08lx)stub!\n", ulReserved); if (ulReserved) return MAPI_E_INVALID_PARAMETER; return S_OK; @@ -126,7 +126,7 @@ SCODE WINAPI MAPIAllocateBuffer(ULONG cbSize, LPVOID *lppBuffer) { LPMAPIALLOCBUFFER lpBuff; - TRACE("(%d,%p)\n", cbSize, lppBuffer); + TRACE("(%ld,%p)\n", cbSize, lppBuffer); if (mapiFunctions.MAPIAllocateBuffer) return mapiFunctions.MAPIAllocateBuffer(cbSize, lppBuffer); @@ -169,7 +169,7 @@ SCODE WINAPI MAPIAllocateMore(ULONG cbSize, LPVOID lpOrig, LPVOID *lppBuffer) { LPMAPIALLOCBUFFER lpBuff = lpOrig; - TRACE("(%d,%p,%p)\n", cbSize, lpOrig, lppBuffer); + TRACE("(%ld,%p,%p)\n", cbSize, lpOrig, lppBuffer); if (mapiFunctions.MAPIAllocateMore) return mapiFunctions.MAPIAllocateMore(cbSize, lpOrig, lppBuffer); @@ -242,7 +242,7 @@ HRESULT WINAPI WrapProgress(PVOID unk1, PVOID unk2, PVOID unk3, PVOID unk4, PVOI */ HRESULT WINAPI HrDispatchNotifications(ULONG flags) { - FIXME("(%08x)\n", flags); + FIXME("(%08lx)\n", flags); return S_OK; } @@ -465,7 +465,7 @@ INT WINAPI MNLS_CompareStringW(DWORD dwCp, LPCWSTR lpszLeft, LPCWSTR lpszRight) { INT ret; - TRACE("0x%08x,%s,%s\n", dwCp, debugstr_w(lpszLeft), debugstr_w(lpszRight)); + TRACE("0x%08lx,%s,%s\n", dwCp, debugstr_w(lpszLeft), debugstr_w(lpszRight)); ret = MNLS_lstrcmpW(lpszLeft, lpszRight); return ret < 0 ? CSTR_LESS_THAN : ret ? CSTR_GREATER_THAN : CSTR_EQUAL; } @@ -717,7 +717,7 @@ HRESULT WINAPI OpenStreamOnFile(LPALLOCATEBUFFER lpAlloc, LPFREEBUFFER lpFree, DWORD dwMode = STGM_READWRITE, dwAttributes = 0; HRESULT hRet; - TRACE("(%p,%p,0x%08x,%s,%s,%p)\n", lpAlloc, lpFree, ulFlags, + TRACE("(%p,%p,0x%08lx,%s,%s,%p)\n", lpAlloc, lpFree, ulFlags, debugstr_a((LPSTR)lpszPath), debugstr_a((LPSTR)lpszPrefix), lppStream); if (mapiFunctions.OpenStreamOnFile) @@ -883,7 +883,7 @@ BOOL WINAPI FGetComponentPath(LPCSTR component, LPCSTR qualifier, LPSTR dll_path BOOL ret = FALSE; HMODULE hmsi; - TRACE("%s %s %p %u %d\n", component, qualifier, dll_path, dll_path_length, install); + TRACE("%s %s %p %lu %d\n", component, qualifier, dll_path, dll_path_length, install); if (mapiFunctions.FGetComponentPath) return mapiFunctions.FGetComponentPath(component, qualifier, dll_path, dll_path_length, install); @@ -937,7 +937,7 @@ HRESULT WINAPI HrQueryAllRows(LPMAPITABLE lpTable, LPSPropTagArray lpPropTags, if (mapiFunctions.HrQueryAllRows) return mapiFunctions.HrQueryAllRows(lpTable, lpPropTags, lpRestriction, lpSortOrderSet, crowsMax, lppRows); - FIXME("(%p, %p, %p, %p, %d, %p): stub\n", lpTable, lpPropTags, lpRestriction, lpSortOrderSet, crowsMax, lppRows); + FIXME("(%p, %p, %p, %p, %ld, %p): stub\n", lpTable, lpPropTags, lpRestriction, lpSortOrderSet, crowsMax, lppRows); *lppRows = NULL; return MAPI_E_CALL_FAILED; } @@ -950,7 +950,7 @@ HRESULT WINAPI WrapCompressedRTFStream(LPSTREAM compressed, ULONG flags, LPSTREA if (mapiFunctions.WrapCompressedRTFStream) return mapiFunctions.WrapCompressedRTFStream(compressed, flags, uncompressed); - FIXME("(%p, 0x%08x, %p): stub\n", compressed, flags, uncompressed); + FIXME("(%p, 0x%08lx, %p): stub\n", compressed, flags, uncompressed); return MAPI_E_NO_SUPPORT; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mciavi32/Makefile.in | 1 dlls/mciavi32/info.c | 50 +++++++++--------- dlls/mciavi32/mciavi.c | 60 +++++++++++----------- dlls/mciavi32/mmoutput.c | 124 +++++++++++++++++++++++---------------------- dlls/mciavi32/wnd.c | 10 ++-- 5 files changed, 122 insertions(+), 123 deletions(-) diff --git a/dlls/mciavi32/Makefile.in b/dlls/mciavi32/Makefile.in index 6a165050f2b..e7fe6ba5760 100644 --- a/dlls/mciavi32/Makefile.in +++ b/dlls/mciavi32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mciavi32.dll IMPORTS = msvfw32 winmm user32 gdi32 diff --git a/dlls/mciavi32/info.c b/dlls/mciavi32/info.c index d6039129549..286753f6487 100644 --- a/dlls/mciavi32/info.c +++ b/dlls/mciavi32/info.c @@ -39,9 +39,9 @@ static DWORD MCIAVI_ConvertFrameToTimeFormat(WINE_MCIAVI* wma, DWORD val, LPDWOR ret = val; break; default: - WARN("Bad time format %u!\n", wma->dwMciTimeFormat); + WARN("Bad time format %lu!\n", wma->dwMciTimeFormat); } - TRACE("val=%u=0x%08x [tf=%u] => ret=%u\n", val, val, wma->dwMciTimeFormat, ret); + TRACE("val=%lu=0x%08lx [tf=%lu] => ret=%lu\n", val, val, wma->dwMciTimeFormat, ret); *lpRet = 0; return ret; } @@ -61,9 +61,9 @@ DWORD MCIAVI_ConvertTimeFormatToFrame(WINE_MCIAVI* wma, DWORD val) ret = val; break; default: - WARN("Bad time format %u!\n", wma->dwMciTimeFormat); + WARN("Bad time format %lu!\n", wma->dwMciTimeFormat); } - TRACE("val=%u=0x%08x [tf=%u] => ret=%u\n", val, val, wma->dwMciTimeFormat, ret); + TRACE("val=%lu=0x%08lx [tf=%lu] => ret=%lu\n", val, val, wma->dwMciTimeFormat, ret); return ret; } @@ -75,7 +75,7 @@ DWORD MCIAVI_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS l WINE_MCIAVI* wma = MCIAVI_mciGetOpenDev(wDevID); DWORD ret = MCIERR_UNSUPPORTED_FUNCTION; - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -173,7 +173,7 @@ DWORD MCIAVI_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS l break; /* w2k does not know MAX_WINDOWS or MAX/MINIMUM_RATE */ default: - FIXME("Unknown capability (%08x) !\n", lpParms->dwItem); + FIXME("Unknown capability (%08lx) !\n", lpParms->dwItem); break; } } @@ -196,7 +196,7 @@ DWORD MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSW lpParms) if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; if (dwFlags & MCI_TEST) return 0; - TRACE("buf=%p, len=%u\n", lpParms->lpstrReturn, lpParms->dwRetSize); + TRACE("buf=%p, len=%lu\n", lpParms->lpstrReturn, lpParms->dwRetSize); EnterCriticalSection(&wma->cs); @@ -207,7 +207,7 @@ DWORD MCIAVI_mciInfo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_INFO_PARMSW lpParms) else if (dwFlags & MCI_INFO_FILE) str = wma->lpFileName; else { - WARN("Don't know this info command (%u)\n", dwFlags); + WARN("Don't know this info command (%lu)\n", dwFlags); ret = MCIERR_UNRECOGNIZED_COMMAND; } if (!ret) { @@ -242,7 +242,7 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) wma->dwMciTimeFormat = MCI_FORMAT_FRAMES; break; default: - WARN("Bad time format %u!\n", lpParms->dwTimeFormat); + WARN("Bad time format %lu!\n", lpParms->dwTimeFormat); LeaveCriticalSection(&wma->cs); return MCIERR_BAD_TIME_FORMAT; } @@ -284,7 +284,7 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) break; default: szAudio = " audio unknown"; - WARN("Unknown audio channel %u\n", lpParms->dwAudio); + WARN("Unknown audio channel %lu\n", lpParms->dwAudio); break; } } @@ -319,7 +319,7 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) break; default: szAudio = " audio unknown"; - WARN("Unknown audio channel %u\n", lpParms->dwAudio); + WARN("Unknown audio channel %lu\n", lpParms->dwAudio); break; } } @@ -342,12 +342,12 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) case MCI_DGV_FF_MPEG: FIXME("Setting file format (%s) to 'MPEG'\n", str); break; case MCI_DGV_FF_RDIB: FIXME("Setting file format (%s) to 'RLE DIB'\n", str); break; case MCI_DGV_FF_RJPEG: FIXME("Setting file format (%s) to 'RJPEG'\n", str); break; - default: FIXME("Setting unknown file format (%s): %d\n", str, lpParms->dwFileFormat); + default: FIXME("Setting unknown file format (%s): %ld\n", str, lpParms->dwFileFormat); } } if (dwFlags & MCI_DGV_SET_SPEED) { - FIXME("Setting speed to %d\n", lpParms->dwSpeed); + FIXME("Setting speed to %ld\n", lpParms->dwSpeed); } LeaveCriticalSection(&wma->cs); @@ -373,7 +373,7 @@ DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpPar switch (lpParms->dwItem) { case MCI_STATUS_CURRENT_TRACK: lpParms->dwReturn = 1; - TRACE("MCI_STATUS_CURRENT_TRACK => %lu\n", lpParms->dwReturn); + TRACE("MCI_STATUS_CURRENT_TRACK => %Iu\n", lpParms->dwReturn); break; case MCI_STATUS_LENGTH: if (!wma->hFile) { @@ -383,7 +383,7 @@ DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpPar } /* only one track in file is currently handled, so don't take care of MCI_TRACK flag */ lpParms->dwReturn = MCIAVI_ConvertFrameToTimeFormat(wma, wma->mah.dwTotalFrames, &ret); - TRACE("MCI_STATUS_LENGTH => %lu\n", lpParms->dwReturn); + TRACE("MCI_STATUS_LENGTH => %Iu\n", lpParms->dwReturn); break; case MCI_STATUS_MODE: lpParms->dwReturn = MAKEMCIRESOURCE(wma->dwStatus, wma->dwStatus); @@ -397,7 +397,7 @@ DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpPar break; case MCI_STATUS_NUMBER_OF_TRACKS: lpParms->dwReturn = 1; - TRACE("MCI_STATUS_NUMBER_OF_TRACKS => %lu\n", lpParms->dwReturn); + TRACE("MCI_STATUS_NUMBER_OF_TRACKS => %Iu\n", lpParms->dwReturn); break; case MCI_STATUS_POSITION: if (!wma->hFile) { @@ -409,7 +409,7 @@ DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpPar lpParms->dwReturn = MCIAVI_ConvertFrameToTimeFormat(wma, (dwFlags & MCI_STATUS_START) ? 0 : wma->dwCurrVideoFrame, &ret); - TRACE("MCI_STATUS_POSITION %s => %lu\n", + TRACE("MCI_STATUS_POSITION %s => %Iu\n", (dwFlags & MCI_STATUS_START) ? "start" : "current", lpParms->dwReturn); break; case MCI_STATUS_READY: @@ -458,11 +458,11 @@ DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpPar #endif case MCI_DGV_STATUS_BITSPERPEL: lpParms->dwReturn = wma->inbih->biBitCount; - TRACE("MCI_DGV_STATUS_BITSPERPEL => %lu\n", lpParms->dwReturn); + TRACE("MCI_DGV_STATUS_BITSPERPEL => %Iu\n", lpParms->dwReturn); break; case MCI_DGV_STATUS_HPAL: lpParms->dwReturn = 0; - TRACE("MCI_DGV_STATUS_HPAL => %lx\n", lpParms->dwReturn); + TRACE("MCI_DGV_STATUS_HPAL => %Ix\n", lpParms->dwReturn); break; case MCI_DGV_STATUS_HWND: lpParms->dwReturn = (DWORD_PTR)wma->hWndPaint; @@ -488,12 +488,12 @@ DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpPar break; case MCI_DGV_STATUS_SPEED: lpParms->dwReturn = 1000; - TRACE("MCI_DGV_STATUS_SPEED = %lu\n", lpParms->dwReturn); + TRACE("MCI_DGV_STATUS_SPEED = %Iu\n", lpParms->dwReturn); break; case MCI_DGV_STATUS_FRAME_RATE: /* FIXME: 1000 is a settable speed multiplier */ lpParms->dwReturn = MulDiv(1000000,1000,wma->mah.dwMicroSecPerFrame); - TRACE("MCI_DGV_STATUS_FRAME_RATE = %lu\n", lpParms->dwReturn); + TRACE("MCI_DGV_STATUS_FRAME_RATE = %Iu\n", lpParms->dwReturn); break; case MCI_DGV_STATUS_FORWARD: lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); @@ -511,7 +511,7 @@ DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpPar break; case MCI_DGV_STATUS_AUDIO_STREAM: lpParms->dwReturn = wma->audio_stream_n; - TRACE("MCI_DGV_STATUS_AUDIO_STREAM => %lu\n", lpParms->dwReturn); + TRACE("MCI_DGV_STATUS_AUDIO_STREAM => %Iu\n", lpParms->dwReturn); break; #if 0 case MCI_DGV_STATUS_KEY_COLOR: @@ -536,15 +536,15 @@ DWORD MCIAVI_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMSW lpPar case MCI_DGV_STATUS_VOLUME: #endif default: - FIXME("Unknown command %08X !\n", lpParms->dwItem); - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + FIXME("Unknown command %08lX !\n", lpParms->dwItem); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); LeaveCriticalSection(&wma->cs); return MCIERR_UNSUPPORTED_FUNCTION; } } if (dwFlags & MCI_NOTIFY) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); + TRACE("MCI_NOTIFY_SUCCESSFUL %08IX !\n", lpParms->dwCallback); mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), wDevID, MCI_NOTIFY_SUCCESSFUL); } diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 7a1657f79eb..64a1a0fbd7d 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -103,7 +103,7 @@ static DWORD MCIAVI_drvClose(DWORD dwDevID) { WINE_MCIAVI *wma; - TRACE("%04x\n", dwDevID); + TRACE("%04lx\n", dwDevID); /* finish all outstanding things */ MCIAVI_mciClose(dwDevID, MCI_WAIT, NULL); @@ -137,7 +137,7 @@ static DWORD MCIAVI_drvConfigure(DWORD dwDevID) { WINE_MCIAVI *wma; - TRACE("%04x\n", dwDevID); + TRACE("%04lx\n", dwDevID); MCIAVI_mciStop(dwDevID, MCI_WAIT, NULL); @@ -214,7 +214,7 @@ static DWORD MCIAVI_mciOpen(UINT wDevID, DWORD dwFlags, WINE_MCIAVI *wma; LRESULT dwRet = 0; - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpOpenParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpOpenParms); if (lpOpenParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -306,7 +306,7 @@ DWORD MCIAVI_mciClose(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) WINE_MCIAVI *wma; DWORD dwRet = 0; - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); wma = MCIAVI_mciGetOpenDev(wDevID); if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -477,7 +477,7 @@ mci_play_done: wma->dwStatus = MCI_MODE_STOP; if (dwFlags & MCI_NOTIFY) { - TRACE("MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); + TRACE("MCI_NOTIFY_SUCCESSFUL %08IX !\n", lpParms->dwCallback); mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), wma->wDevID, MCI_NOTIFY_SUCCESSFUL); } @@ -503,9 +503,9 @@ static DWORD WINAPI MCIAVI_mciPlay_thread(LPVOID arg) struct MCIAVI_play_data *data = (struct MCIAVI_play_data *)arg; DWORD ret; - TRACE("In thread before async play command (id %u, flags %08x)\n", data->wma->wDevID, data->flags); + TRACE("In thread before async play command (id %u, flags %08lx)\n", data->wma->wDevID, data->flags); ret = MCIAVI_player(data->wma, data->flags, &data->params); - TRACE("In thread after async play command (id %u, flags %08x)\n", data->wma->wDevID, data->flags); + TRACE("In thread after async play command (id %u, flags %08lx)\n", data->wma->wDevID, data->flags); HeapFree(GetProcessHeap(), 0, data); return ret; @@ -545,7 +545,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms DWORD dwRet; DWORD dwFromFrame, dwToFrame; - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -555,7 +555,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms if (dwFlags & MCI_TEST) return 0; if (dwFlags & (MCI_MCIAVI_PLAY_WINDOW|MCI_MCIAVI_PLAY_FULLBY2)) - FIXME("Unsupported flag %08x\n", dwFlags); + FIXME("Unsupported flag %08lx\n", dwFlags); EnterCriticalSection(&wma->cs); @@ -582,7 +582,7 @@ static DWORD MCIAVI_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms if (dwToFrame >= wma->dwPlayableVideoFrames) dwToFrame = wma->dwPlayableVideoFrames - 1; - TRACE("Playing from frame=%u to frame=%u\n", dwFromFrame, dwToFrame); + TRACE("Playing from frame=%lu to frame=%lu\n", dwFromFrame, dwToFrame); wma->dwCurrVideoFrame = dwFromFrame; wma->dwToVideoFrame = dwToFrame; @@ -637,7 +637,7 @@ static DWORD MCIAVI_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPa WINE_MCIAVI *wma; DWORD dwRet = 0; - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); wma = MCIAVI_mciGetOpenDev(wDevID); if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -645,7 +645,7 @@ static DWORD MCIAVI_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPa EnterCriticalSection(&wma->cs); - TRACE("current status %04x\n", wma->dwStatus); + TRACE("current status %04lx\n", wma->dwStatus); switch (wma->dwStatus) { case MCI_MODE_PLAY: @@ -690,7 +690,7 @@ static DWORD MCIAVI_mciPause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP { WINE_MCIAVI *wma; - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); wma = MCIAVI_mciGetOpenDev(wDevID); if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -717,7 +717,7 @@ static DWORD MCIAVI_mciResume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lp { WINE_MCIAVI *wma; - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); wma = MCIAVI_mciGetOpenDev(wDevID); if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -745,7 +745,7 @@ static DWORD MCIAVI_mciSeek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms WINE_MCIAVI *wma; DWORD position; - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -772,7 +772,7 @@ static DWORD MCIAVI_mciSeek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms EnterCriticalSection(&wma->cs); wma->dwCurrVideoFrame = position; - TRACE("Seeking to frame=%u\n", wma->dwCurrVideoFrame); + TRACE("Seeking to frame=%lu\n", wma->dwCurrVideoFrame); if (dwFlags & MCI_NOTIFY) { mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), @@ -789,7 +789,7 @@ static DWORD MCIAVI_mciLoad(UINT wDevID, DWORD dwFlags, LPMCI_DGV_LOAD_PARMSW lp { WINE_MCIAVI *wma; - FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -806,7 +806,7 @@ static DWORD MCIAVI_mciRealize(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS l { WINE_MCIAVI *wma; - FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -824,7 +824,7 @@ static DWORD MCIAVI_mciUpdate(UINT wDevID, DWORD dwFlags, LPMCI_DGV_UPDATE_PARMS { WINE_MCIAVI *wma; - TRACE("%04x, %08x, %p\n", wDevID, dwFlags, lpParms); + TRACE("%04x, %08lx, %p\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -851,7 +851,7 @@ static DWORD MCIAVI_mciStep(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STEP_PARMS lpP DWORD position; int delta = 1; - TRACE("(%04x, %08x, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lx, %p)\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -869,7 +869,7 @@ static DWORD MCIAVI_mciStep(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STEP_PARMS lpP EnterCriticalSection(&wma->cs); wma->dwCurrVideoFrame = position; - TRACE("Stepping to frame=%u\n", wma->dwCurrVideoFrame); + TRACE("Stepping to frame=%lu\n", wma->dwCurrVideoFrame); if (dwFlags & MCI_NOTIFY) { mciDriverNotify(HWND_32(LOWORD(lpParms->dwCallback)), @@ -886,7 +886,7 @@ static DWORD MCIAVI_mciCue(UINT wDevID, DWORD dwFlags, LPMCI_DGV_CUE_PARMS lpPar { WINE_MCIAVI *wma; - FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -905,7 +905,7 @@ static DWORD MCIAVI_mciBreak(UINT wDevID, DWORD dwFlags, LPMCI_BREAK_PARMS lpPar { WINE_MCIAVI *wma; - TRACE("(%04x, %08x, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lx, %p)\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -931,7 +931,7 @@ static DWORD MCIAVI_mciSetAudio(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETAUDIO_P if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - FIXME("(%04x, %08x, %p) Item %04x: stub\n", wDevID, dwFlags, lpParms, dwFlags & MCI_DGV_SETAUDIO_ITEM ? lpParms->dwItem : 0); + FIXME("(%04x, %08lx, %p) Item %04lx: stub\n", wDevID, dwFlags, lpParms, dwFlags & MCI_DGV_SETAUDIO_ITEM ? lpParms->dwItem : 0); wma = MCIAVI_mciGetOpenDev(wDevID); if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -946,7 +946,7 @@ static DWORD MCIAVI_mciSignal(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SIGNAL_PARMS { WINE_MCIAVI *wma; - FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -965,7 +965,7 @@ static DWORD MCIAVI_mciSetVideo(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETVIDEO_P if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - FIXME("(%04x, %08x, %p) Item %04x: stub\n", wDevID, dwFlags, lpParms, dwFlags & MCI_DGV_SETVIDEO_ITEM ? lpParms->dwItem : 0); + FIXME("(%04x, %08lx, %p) Item %04lx: stub\n", wDevID, dwFlags, lpParms, dwFlags & MCI_DGV_SETVIDEO_ITEM ? lpParms->dwItem : 0); wma = MCIAVI_mciGetOpenDev(wDevID); if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -980,7 +980,7 @@ static DWORD MCIAVI_mciConfigure(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS { WINE_MCIAVI *wma; - FIXME("(%04x, %08x, %p) : stub\n", wDevID, dwFlags, lpParms); + FIXME("(%04x, %08lx, %p) : stub\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -1001,7 +1001,7 @@ static DWORD MCIAVI_mciConfigure(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS LRESULT CALLBACK MCIAVI_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2) { - TRACE("(%08lX, %p, %08X, %08lX, %08lX)\n", + TRACE("(%08IX, %p, %08X, %08IX, %08IX)\n", dwDevID, hDriv, wMsg, dwParam1, dwParam2); switch (wMsg) { @@ -1063,11 +1063,11 @@ LRESULT CALLBACK MCIAVI_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_SAVE: case MCI_UNDO: case MCI_UNFREEZE: - TRACE("Unsupported function [0x%x] flags=%08x\n", wMsg, (DWORD)dwParam1); + TRACE("Unsupported function [0x%x] flags=%08lx\n", wMsg, (DWORD)dwParam1); return MCIERR_UNSUPPORTED_FUNCTION; case MCI_SPIN: case MCI_ESCAPE: - WARN("Unsupported command [0x%x] %08x\n", wMsg, (DWORD)dwParam1); + WARN("Unsupported command [0x%x] %08lx\n", wMsg, (DWORD)dwParam1); break; case MCI_OPEN: case MCI_CLOSE: diff --git a/dlls/mciavi32/mmoutput.c b/dlls/mciavi32/mmoutput.c index ee0481c59c7..ec2751e6d9a 100644 --- a/dlls/mciavi32/mmoutput.c +++ b/dlls/mciavi32/mmoutput.c @@ -39,17 +39,17 @@ static BOOL MCIAVI_GetInfoAudio(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCK HIBYTE(HIWORD(wma->ash_audio.fccHandler))); else TRACE("ash.fccHandler=0, no handler specified\n"); - TRACE("ash.dwFlags=%d\n", wma->ash_audio.dwFlags); + TRACE("ash.dwFlags=%ld\n", wma->ash_audio.dwFlags); TRACE("ash.wPriority=%d\n", wma->ash_audio.wPriority); TRACE("ash.wLanguage=%d\n", wma->ash_audio.wLanguage); - TRACE("ash.dwInitialFrames=%d\n", wma->ash_audio.dwInitialFrames); - TRACE("ash.dwScale=%d\n", wma->ash_audio.dwScale); - TRACE("ash.dwRate=%d\n", wma->ash_audio.dwRate); - TRACE("ash.dwStart=%d\n", wma->ash_audio.dwStart); - TRACE("ash.dwLength=%d\n", wma->ash_audio.dwLength); - TRACE("ash.dwSuggestedBufferSize=%d\n", wma->ash_audio.dwSuggestedBufferSize); - TRACE("ash.dwQuality=%d\n", wma->ash_audio.dwQuality); - TRACE("ash.dwSampleSize=%d\n", wma->ash_audio.dwSampleSize); + TRACE("ash.dwInitialFrames=%ld\n", wma->ash_audio.dwInitialFrames); + TRACE("ash.dwScale=%ld\n", wma->ash_audio.dwScale); + TRACE("ash.dwRate=%ld\n", wma->ash_audio.dwRate); + TRACE("ash.dwStart=%ld\n", wma->ash_audio.dwStart); + TRACE("ash.dwLength=%ld\n", wma->ash_audio.dwLength); + TRACE("ash.dwSuggestedBufferSize=%ld\n", wma->ash_audio.dwSuggestedBufferSize); + TRACE("ash.dwQuality=%ld\n", wma->ash_audio.dwQuality); + TRACE("ash.dwSampleSize=%ld\n", wma->ash_audio.dwSampleSize); TRACE("ash.rcFrame=(%d,%d,%d,%d)\n", wma->ash_audio.rcFrame.top, wma->ash_audio.rcFrame.left, wma->ash_audio.rcFrame.bottom, wma->ash_audio.rcFrame.right); @@ -62,7 +62,7 @@ static BOOL MCIAVI_GetInfoAudio(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCK return FALSE; } if (mmckInfo.cksize < sizeof(WAVEFORMAT)) { - WARN("Size of strf chunk (%d) < audio format struct\n", mmckInfo.cksize); + WARN("Size of strf chunk (%ld) < audio format struct\n", mmckInfo.cksize); return FALSE; } wma->lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); @@ -75,8 +75,8 @@ static BOOL MCIAVI_GetInfoAudio(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCK TRACE("waveFormat.wFormatTag=%d\n", wma->lpWaveFormat->wFormatTag); TRACE("waveFormat.nChannels=%d\n", wma->lpWaveFormat->nChannels); - TRACE("waveFormat.nSamplesPerSec=%d\n", wma->lpWaveFormat->nSamplesPerSec); - TRACE("waveFormat.nAvgBytesPerSec=%d\n", wma->lpWaveFormat->nAvgBytesPerSec); + TRACE("waveFormat.nSamplesPerSec=%ld\n", wma->lpWaveFormat->nSamplesPerSec); + TRACE("waveFormat.nAvgBytesPerSec=%ld\n", wma->lpWaveFormat->nAvgBytesPerSec); TRACE("waveFormat.nBlockAlign=%d\n", wma->lpWaveFormat->nBlockAlign); TRACE("waveFormat.wBitsPerSample=%d\n", wma->lpWaveFormat->wBitsPerSample); if (mmckInfo.cksize >= sizeof(WAVEFORMATEX)) @@ -97,17 +97,17 @@ static BOOL MCIAVI_GetInfoVideo(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCK HIBYTE(LOWORD(wma->ash_video.fccHandler)), LOBYTE(HIWORD(wma->ash_video.fccHandler)), HIBYTE(HIWORD(wma->ash_video.fccHandler))); - TRACE("ash.dwFlags=%d\n", wma->ash_video.dwFlags); + TRACE("ash.dwFlags=%ld\n", wma->ash_video.dwFlags); TRACE("ash.wPriority=%d\n", wma->ash_video.wPriority); TRACE("ash.wLanguage=%d\n", wma->ash_video.wLanguage); - TRACE("ash.dwInitialFrames=%d\n", wma->ash_video.dwInitialFrames); - TRACE("ash.dwScale=%d\n", wma->ash_video.dwScale); - TRACE("ash.dwRate=%d\n", wma->ash_video.dwRate); - TRACE("ash.dwStart=%d\n", wma->ash_video.dwStart); - TRACE("ash.dwLength=%d\n", wma->ash_video.dwLength); - TRACE("ash.dwSuggestedBufferSize=%d\n", wma->ash_video.dwSuggestedBufferSize); - TRACE("ash.dwQuality=%d\n", wma->ash_video.dwQuality); - TRACE("ash.dwSampleSize=%d\n", wma->ash_video.dwSampleSize); + TRACE("ash.dwInitialFrames=%ld\n", wma->ash_video.dwInitialFrames); + TRACE("ash.dwScale=%ld\n", wma->ash_video.dwScale); + TRACE("ash.dwRate=%ld\n", wma->ash_video.dwRate); + TRACE("ash.dwStart=%ld\n", wma->ash_video.dwStart); + TRACE("ash.dwLength=%ld\n", wma->ash_video.dwLength); + TRACE("ash.dwSuggestedBufferSize=%ld\n", wma->ash_video.dwSuggestedBufferSize); + TRACE("ash.dwQuality=%ld\n", wma->ash_video.dwQuality); + TRACE("ash.dwSampleSize=%ld\n", wma->ash_video.dwSampleSize); TRACE("ash.rcFrame=(%d,%d,%d,%d)\n", wma->ash_video.rcFrame.top, wma->ash_video.rcFrame.left, wma->ash_video.rcFrame.bottom, wma->ash_video.rcFrame.right); @@ -128,17 +128,17 @@ static BOOL MCIAVI_GetInfoVideo(WINE_MCIAVI* wma, const MMCKINFO* mmckList, MMCK mmioRead(wma->hFile, (LPSTR)wma->inbih, mmckInfo.cksize); - TRACE("bih.biSize=%d\n", wma->inbih->biSize); - TRACE("bih.biWidth=%d\n", wma->inbih->biWidth); - TRACE("bih.biHeight=%d\n", wma->inbih->biHeight); + TRACE("bih.biSize=%ld\n", wma->inbih->biSize); + TRACE("bih.biWidth=%ld\n", wma->inbih->biWidth); + TRACE("bih.biHeight=%ld\n", wma->inbih->biHeight); TRACE("bih.biPlanes=%d\n", wma->inbih->biPlanes); TRACE("bih.biBitCount=%d\n", wma->inbih->biBitCount); - TRACE("bih.biCompression=%x\n", wma->inbih->biCompression); - TRACE("bih.biSizeImage=%d\n", wma->inbih->biSizeImage); - TRACE("bih.biXPelsPerMeter=%d\n", wma->inbih->biXPelsPerMeter); - TRACE("bih.biYPelsPerMeter=%d\n", wma->inbih->biYPelsPerMeter); - TRACE("bih.biClrUsed=%d\n", wma->inbih->biClrUsed); - TRACE("bih.biClrImportant=%d\n", wma->inbih->biClrImportant); + TRACE("bih.biCompression=%lx\n", wma->inbih->biCompression); + TRACE("bih.biSizeImage=%ld\n", wma->inbih->biSizeImage); + TRACE("bih.biXPelsPerMeter=%ld\n", wma->inbih->biXPelsPerMeter); + TRACE("bih.biYPelsPerMeter=%ld\n", wma->inbih->biYPelsPerMeter); + TRACE("bih.biClrUsed=%ld\n", wma->inbih->biClrUsed); + TRACE("bih.biClrImportant=%ld\n", wma->inbih->biClrImportant); SetRect(&wma->source, 0, 0, wma->inbih->biWidth, wma->inbih->biHeight); wma->dest = wma->source; @@ -175,7 +175,7 @@ static BOOL MCIAVI_AddFrame(WINE_MCIAVI* wma, LPMMCKINFO mmck, stream_n <<= 4; stream_n |= (p[1] <= '9') ? (p[1] - '0') : (tolower(p[1]) - 'a' + 10); - TRACE("ckid %4.4s (stream #%d)\n", (LPSTR)&mmck->ckid, stream_n); + TRACE("ckid %4.4s (stream #%ld)\n", (LPSTR)&mmck->ckid, stream_n); /* Some (rare?) AVI files have video streams name XXYY where XX = stream number and YY = TWOCC * of the last 2 characters of the biCompression member of the BITMAPINFOHEADER structure. @@ -197,11 +197,11 @@ static BOOL MCIAVI_AddFrame(WINE_MCIAVI* wma, LPMMCKINFO mmck, case cktypePALchange: if (stream_n != wma->video_stream_n) { - TRACE("data belongs to another video stream #%d\n", stream_n); + TRACE("data belongs to another video stream #%ld\n", stream_n); return FALSE; } - TRACE("Adding video frame[%d]: %d bytes\n", + TRACE("Adding video frame[%ld]: %ld bytes\n", alb->numVideoFrames, mmck->cksize); if (alb->numVideoFrames < wma->dwPlayableVideoFrames) { @@ -217,11 +217,11 @@ static BOOL MCIAVI_AddFrame(WINE_MCIAVI* wma, LPMMCKINFO mmck, case cktypeWAVEbytes: if (stream_n != wma->audio_stream_n) { - TRACE("data belongs to another audio stream #%d\n", stream_n); + TRACE("data belongs to another audio stream #%ld\n", stream_n); return FALSE; } - TRACE("Adding audio frame[%d]: %d bytes\n", + TRACE("Adding audio frame[%ld]: %ld bytes\n", alb->numAudioBlocks, mmck->cksize); if (wma->lpWaveFormat) { if (alb->numAudioBlocks >= alb->numAudioAllocated) { @@ -286,16 +286,16 @@ BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma) mmioRead(wma->hFile, (LPSTR)&wma->mah, sizeof(wma->mah)); - TRACE("mah.dwMicroSecPerFrame=%d\n", wma->mah.dwMicroSecPerFrame); - TRACE("mah.dwMaxBytesPerSec=%d\n", wma->mah.dwMaxBytesPerSec); - TRACE("mah.dwPaddingGranularity=%d\n", wma->mah.dwPaddingGranularity); - TRACE("mah.dwFlags=%d\n", wma->mah.dwFlags); - TRACE("mah.dwTotalFrames=%d\n", wma->mah.dwTotalFrames); - TRACE("mah.dwInitialFrames=%d\n", wma->mah.dwInitialFrames); - TRACE("mah.dwStreams=%d\n", wma->mah.dwStreams); - TRACE("mah.dwSuggestedBufferSize=%d\n", wma->mah.dwSuggestedBufferSize); - TRACE("mah.dwWidth=%d\n", wma->mah.dwWidth); - TRACE("mah.dwHeight=%d\n", wma->mah.dwHeight); + TRACE("mah.dwMicroSecPerFrame=%ld\n", wma->mah.dwMicroSecPerFrame); + TRACE("mah.dwMaxBytesPerSec=%ld\n", wma->mah.dwMaxBytesPerSec); + TRACE("mah.dwPaddingGranularity=%ld\n", wma->mah.dwPaddingGranularity); + TRACE("mah.dwFlags=%ld\n", wma->mah.dwFlags); + TRACE("mah.dwTotalFrames=%ld\n", wma->mah.dwTotalFrames); + TRACE("mah.dwInitialFrames=%ld\n", wma->mah.dwInitialFrames); + TRACE("mah.dwStreams=%ld\n", wma->mah.dwStreams); + TRACE("mah.dwSuggestedBufferSize=%ld\n", wma->mah.dwSuggestedBufferSize); + TRACE("mah.dwWidth=%ld\n", wma->mah.dwWidth); + TRACE("mah.dwHeight=%ld\n", wma->mah.dwHeight); mmioAscend(wma->hFile, &mmckInfo, 0); @@ -320,7 +320,7 @@ BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma) mmioRead(wma->hFile, (LPSTR)&strh, sizeof(strh)); - TRACE("Stream #%d fccType %4.4s\n", stream_n, (LPSTR)&strh.fccType); + TRACE("Stream #%ld fccType %4.4s\n", stream_n, (LPSTR)&strh.fccType); if (strh.fccType == streamtypeVIDEO) { @@ -399,18 +399,18 @@ BOOL MCIAVI_GetInfo(WINE_MCIAVI* wma) mmioAscend(wma->hFile, &mmckInfo, 0); } if (alb.numVideoFrames != wma->dwPlayableVideoFrames) { - WARN("AVI header says %d frames, we found %d video frames, reducing playable frames\n", + WARN("AVI header says %ld frames, we found %ld video frames, reducing playable frames\n", wma->dwPlayableVideoFrames, alb.numVideoFrames); wma->dwPlayableVideoFrames = alb.numVideoFrames; } wma->dwPlayableAudioBlocks = alb.numAudioBlocks; if (alb.inVideoSize > wma->ash_video.dwSuggestedBufferSize) { - WARN("inVideoSize=%d suggestedSize=%d\n", alb.inVideoSize, wma->ash_video.dwSuggestedBufferSize); + WARN("inVideoSize=%ld suggestedSize=%ld\n", alb.inVideoSize, wma->ash_video.dwSuggestedBufferSize); wma->ash_video.dwSuggestedBufferSize = alb.inVideoSize; } if (alb.inAudioSize > wma->ash_audio.dwSuggestedBufferSize) { - WARN("inAudioSize=%d suggestedSize=%d\n", alb.inAudioSize, wma->ash_audio.dwSuggestedBufferSize); + WARN("inAudioSize=%ld suggestedSize=%ld\n", alb.inAudioSize, wma->ash_audio.dwSuggestedBufferSize); wma->ash_audio.dwSuggestedBufferSize = alb.inAudioSize; } @@ -463,17 +463,17 @@ BOOL MCIAVI_OpenVideo(WINE_MCIAVI* wma) return FALSE; } - TRACE("bih.biSize=%d\n", wma->outbih->biSize); - TRACE("bih.biWidth=%d\n", wma->outbih->biWidth); - TRACE("bih.biHeight=%d\n", wma->outbih->biHeight); + TRACE("bih.biSize=%ld\n", wma->outbih->biSize); + TRACE("bih.biWidth=%ld\n", wma->outbih->biWidth); + TRACE("bih.biHeight=%ld\n", wma->outbih->biHeight); TRACE("bih.biPlanes=%d\n", wma->outbih->biPlanes); TRACE("bih.biBitCount=%d\n", wma->outbih->biBitCount); - TRACE("bih.biCompression=%x\n", wma->outbih->biCompression); - TRACE("bih.biSizeImage=%d\n", wma->outbih->biSizeImage); - TRACE("bih.biXPelsPerMeter=%d\n", wma->outbih->biXPelsPerMeter); - TRACE("bih.biYPelsPerMeter=%d\n", wma->outbih->biYPelsPerMeter); - TRACE("bih.biClrUsed=%d\n", wma->outbih->biClrUsed); - TRACE("bih.biClrImportant=%d\n", wma->outbih->biClrImportant); + TRACE("bih.biCompression=%lx\n", wma->outbih->biCompression); + TRACE("bih.biSizeImage=%ld\n", wma->outbih->biSizeImage); + TRACE("bih.biXPelsPerMeter=%ld\n", wma->outbih->biXPelsPerMeter); + TRACE("bih.biYPelsPerMeter=%ld\n", wma->outbih->biYPelsPerMeter); + TRACE("bih.biClrUsed=%ld\n", wma->outbih->biClrUsed); + TRACE("bih.biClrImportant=%ld\n", wma->outbih->biClrImportant); wma->outdata = HeapAlloc(GetProcessHeap(), 0, wma->outbih->biSizeImage); if (!wma->outdata) { @@ -512,7 +512,7 @@ static void CALLBACK MCIAVI_waveCallback(HWAVEOUT hwo, UINT uMsg, DWORD_PTR dwIn break; case WOM_DONE: InterlockedIncrement(&wma->dwEventCount); - TRACE("Returning waveHdr=%lx\n", dwParam1); + TRACE("Returning waveHdr=%Ix\n", dwParam1); SetEvent(wma->hEvent); break; default: @@ -531,7 +531,7 @@ DWORD MCIAVI_OpenAudio(WINE_MCIAVI* wma, unsigned* nHdr, LPWAVEHDR* pWaveHdr) dwRet = waveOutOpen((HWAVEOUT *)&wma->hWave, WAVE_MAPPER, wma->lpWaveFormat, (DWORD_PTR)MCIAVI_waveCallback, wma->wDevID, CALLBACK_FUNCTION); if (dwRet != 0) { - TRACE("Can't open low level audio device %d\n", dwRet); + TRACE("Can't open low level audio device %ld\n", dwRet); dwRet = MCIERR_DEVICE_OPEN; wma->hWave = 0; goto cleanUp; @@ -576,7 +576,7 @@ void MCIAVI_PlayAudioBlocks(WINE_MCIAVI* wma, unsigned nHdr, LPWAVEHDR waveHdr) { if (!wma->lpAudioIndex) return; - TRACE("%d (ec=%u)\n", wma->lpAudioIndex[wma->dwCurrAudioBlock].dwOffset, wma->dwEventCount); + TRACE("%ld (ec=%lu)\n", wma->lpAudioIndex[wma->dwCurrAudioBlock].dwOffset, wma->dwEventCount); /* push as many blocks as possible => audio gets priority */ while (wma->dwStatus != MCI_MODE_STOP && wma->dwStatus != MCI_MODE_NOT_READY && @@ -609,7 +609,7 @@ double MCIAVI_PaintFrame(WINE_MCIAVI* wma, HDC hDC) if (!hDC || !wma->inbih) return 0; - TRACE("Painting frame %u (cached %u)\n", wma->dwCurrVideoFrame, wma->dwCachedFrame); + TRACE("Painting frame %lu (cached %lu)\n", wma->dwCurrVideoFrame, wma->dwCachedFrame); if (wma->dwCurrVideoFrame != wma->dwCachedFrame) { diff --git a/dlls/mciavi32/wnd.c b/dlls/mciavi32/wnd.c index d48dbb1357a..643478f018d 100644 --- a/dlls/mciavi32/wnd.c +++ b/dlls/mciavi32/wnd.c @@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mciavi); static LRESULT WINAPI MCIAVI_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hWnd, uMsg, wParam, lParam); + TRACE("hwnd=%p msg=%x wparam=%Ix lparam=%Ix\n", hWnd, uMsg, wParam, lParam); switch (uMsg) { case WM_CREATE: @@ -137,7 +137,7 @@ BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARM ULongToPtr(wma->wDevID)); wma->hWndPaint = wma->hWnd; - TRACE("(%04x, %08X, %p, style %x, parent %p, dimensions %dx%d, hwnd %p)\n", wma->wDevID, + TRACE("(%04x, %08lX, %p, style %lx, parent %p, dimensions %ldx%ld, hwnd %p)\n", wma->wDevID, dwFlags, lpParms, dwStyle, hParent, rc.right - rc.left, rc.bottom - rc.top, wma->hWnd); return wma->hWnd != 0; } @@ -150,7 +150,7 @@ DWORD MCIAVI_mciPut(UINT wDevID, DWORD dwFlags, LPMCI_DGV_PUT_PARMS lpParms) WINE_MCIAVI* wma = MCIAVI_mciGetOpenDev(wDevID); RECT rc; - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -206,7 +206,7 @@ DWORD MCIAVI_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lpParms) WINE_MCIAVI* wma = MCIAVI_mciGetOpenDev(wDevID); RECT rc; - TRACE("(%04x, %08x, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lx, %p)\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -273,7 +273,7 @@ DWORD MCIAVI_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMSW lpPar { WINE_MCIAVI* wma = MCIAVI_mciGetOpenDev(wDevID); - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wma == NULL) return MCIERR_INVALID_DEVICE_ID;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mcicda/Makefile.in | 1 - dlls/mcicda/mcicda.c | 82 ++++++++++++++++++++++++----------------------- 2 files changed, 41 insertions(+), 42 deletions(-) diff --git a/dlls/mcicda/Makefile.in b/dlls/mcicda/Makefile.in index 39e15b9a0ef..fad06893dc1 100644 --- a/dlls/mcicda/Makefile.in +++ b/dlls/mcicda/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mcicda.dll IMPORTS = winmm user32 diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index ea7e2a6261d..2f6eaaadc58 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -95,10 +95,10 @@ static BOOL device_io(HANDLE dev, DWORD code, void *inbuffer, DWORD insize, void XX(IOCTL_CDROM_RESUME_AUDIO); XX(IOCTL_STORAGE_EJECT_MEDIA); XX(IOCTL_STORAGE_LOAD_MEDIA); - default: str = wine_dbg_sprintf("UNKNOWN (0x%x)", code); + default: str = wine_dbg_sprintf("UNKNOWN (0x%lx)", code); }; #undef XX - TRACE("Device %p, Code %s -> Return %d, Bytes %u\n", dev, str, ret, *retsize); + TRACE("Device %p, Code %s -> Return %d, Bytes %lu\n", dev, str, ret, *retsize); return ret; } @@ -145,7 +145,7 @@ static DWORD CALLBACK MCICDA_playLoop(void *ptr) if (SUCCEEDED(hr)) { if (rdInfo.SectorCount > 0) { if (!device_io(wmcda->handle, IOCTL_CDROM_RAW_READ, &rdInfo, sizeof(rdInfo), cdData, lockLen, &br, NULL)) - WARN("CD read failed at sector %d: 0x%x\n", wmcda->start, GetLastError()); + WARN("CD read failed at sector %ld: 0x%lx\n", wmcda->start, GetLastError()); } if (rdInfo.SectorCount*RAW_SECTOR_SIZE < lockLen) { if(endPos == ~0u) endPos = lastPos; @@ -319,7 +319,7 @@ static int MCICDA_GetError(WINE_MCICDAUDIO* wmcda) case ERROR_NOT_SUPPORTED: case ERROR_IO_DEVICE: return MCIERR_HARDWARE; default: - FIXME("Unknown mode %u\n", GetLastError()); + FIXME("Unknown mode %lu\n", GetLastError()); } return MCIERR_DRIVER_INTERNAL; } @@ -335,12 +335,12 @@ static DWORD MCICDA_CalcFrame(WINE_MCICDAUDIO* wmcda, DWORD dwTime) DWORD br; BYTE* addr; - TRACE("(%p, %08X, %u);\n", wmcda, wmcda->dwTimeFormat, dwTime); + TRACE("(%p, %08lX, %lu);\n", wmcda, wmcda->dwTimeFormat, dwTime); switch (wmcda->dwTimeFormat) { case MCI_FORMAT_MILLISECONDS: dwFrame = ((dwTime - 1) * CDFRAMES_PERSEC + 500) / 1000; - TRACE("MILLISECONDS %u\n", dwFrame); + TRACE("MILLISECONDS %lu\n", dwFrame); break; case MCI_FORMAT_MSF: TRACE("MSF %02u:%02u:%02u\n", @@ -384,12 +384,12 @@ static DWORD MCICDA_CalcTime(WINE_MCICDAUDIO* wmcda, DWORD tf, DWORD dwFrame, LP CDROM_TOC toc; DWORD br; - TRACE("(%p, %08X, %u);\n", wmcda, tf, dwFrame); + TRACE("(%p, %08lX, %lu);\n", wmcda, tf, dwFrame); switch (tf) { case MCI_FORMAT_MILLISECONDS: dwTime = (dwFrame * 1000) / CDFRAMES_PERSEC + 1; - TRACE("MILLISECONDS %u\n", dwTime); + TRACE("MILLISECONDS %lu\n", dwTime); *lpRet = 0; break; case MCI_FORMAT_MSF: @@ -397,7 +397,7 @@ static DWORD MCICDA_CalcTime(WINE_MCICDAUDIO* wmcda, DWORD tf, DWORD dwFrame, LP wSeconds = (dwFrame - CDFRAMES_PERMIN * wMinutes) / CDFRAMES_PERSEC; wFrames = dwFrame - CDFRAMES_PERMIN * wMinutes - CDFRAMES_PERSEC * wSeconds; dwTime = MCI_MAKE_MSF(wMinutes, wSeconds, wFrames); - TRACE("MSF %02u:%02u:%02u -> dwTime=%u\n", + TRACE("MSF %02u:%02u:%02u -> dwTime=%lu\n", wMinutes, wSeconds, wFrames, dwTime); *lpRet = MCI_COLONIZED3_RETURN; break; @@ -408,7 +408,7 @@ static DWORD MCICDA_CalcTime(WINE_MCICDAUDIO* wmcda, DWORD tf, DWORD dwFrame, LP return 0; if (dwFrame < FRAME_OF_TOC(toc, toc.FirstTrack) || dwFrame > FRAME_OF_TOC(toc, toc.LastTrack + 1)) { - ERR("Out of range value %u [%u,%u]\n", + ERR("Out of range value %lu [%u,%u]\n", dwFrame, FRAME_OF_TOC(toc, toc.FirstTrack), FRAME_OF_TOC(toc, toc.LastTrack + 1)); *lpRet = 0; @@ -443,7 +443,7 @@ static DWORD MCICDA_Open(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpOpenPar WINE_MCICDAUDIO* wmcda = (WINE_MCICDAUDIO*)mciGetDriverData(wDevID); WCHAR root[7], drive = 0; - TRACE("(%04X, %08X, %p);\n", wDevID, dwFlags, lpOpenParms); + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpOpenParms); if (lpOpenParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -533,7 +533,7 @@ static DWORD MCICDA_Close(UINT wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParm { WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); - TRACE("(%04X, %08X, %p);\n", wDevID, dwParam, lpParms); + TRACE("(%04X, %08lX, %p);\n", wDevID, dwParam, lpParms); if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -556,13 +556,13 @@ static DWORD MCICDA_GetDevCaps(UINT wDevID, DWORD dwFlags, WINE_MCICDAUDIO* wmcda = (WINE_MCICDAUDIO*)mciGetDriverData(wDevID); DWORD ret = 0; - TRACE("(%04X, %08X, %p);\n", wDevID, dwFlags, lpParms); + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; if (dwFlags & MCI_GETDEVCAPS_ITEM) { - TRACE("MCI_GETDEVCAPS_ITEM dwItem=%08X;\n", lpParms->dwItem); + TRACE("MCI_GETDEVCAPS_ITEM dwItem=%08lX;\n", lpParms->dwItem); switch (lpParms->dwItem) { case MCI_GETDEVCAPS_CAN_RECORD: @@ -602,14 +602,14 @@ static DWORD MCICDA_GetDevCaps(UINT wDevID, DWORD dwFlags, ret = MCI_RESOURCE_RETURNED; break; default: - WARN("Unsupported %x devCaps item\n", lpParms->dwItem); + WARN("Unsupported %lx devCaps item\n", lpParms->dwItem); return MCIERR_UNSUPPORTED_FUNCTION; } } else { TRACE("No GetDevCaps-Item !\n"); return MCIERR_MISSING_PARAMETER; } - TRACE("lpParms->dwReturn=%08X;\n", lpParms->dwReturn); + TRACE("lpParms->dwReturn=%08lX;\n", lpParms->dwReturn); if (dwFlags & MCI_NOTIFY) { MCICDA_Notify(lpParms->dwCallback, wmcda, MCI_NOTIFY_SUCCESSFUL); } @@ -656,13 +656,13 @@ static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms) DWORD ret = 0; WCHAR buffer[16]; - TRACE("(%04X, %08X, %p);\n", wDevID, dwFlags, lpParms); + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL || lpParms->lpstrReturn == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; - TRACE("buf=%p, len=%u\n", lpParms->lpstrReturn, lpParms->dwRetSize); + TRACE("buf=%p, len=%lu\n", lpParms->lpstrReturn, lpParms->dwRetSize); if (dwFlags & MCI_INFO_PRODUCT) { str = L"Wine's audio CD"; @@ -682,7 +682,7 @@ static DWORD MCICDA_Info(UINT wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW lpParms) swprintf(buffer, ARRAY_SIZE(buffer), L"%lu", res); str = buffer; } else { - WARN("Don't know this info command (%u)\n", dwFlags); + WARN("Don't know this info command (%lu)\n", dwFlags); ret = MCIERR_MISSING_PARAMETER; } if (!ret) { @@ -710,13 +710,13 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm CDROM_TOC toc; DWORD br; - TRACE("(%04X, %08X, %p);\n", wDevID, dwFlags, lpParms); + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; if (dwFlags & MCI_STATUS_ITEM) { - TRACE("dwItem = %x\n", lpParms->dwItem); + TRACE("dwItem = %lx\n", lpParms->dwItem); switch (lpParms->dwItem) { case MCI_STATUS_CURRENT_TRACK: fmt.Format = IOCTL_CDROM_CURRENT_POSITION; @@ -727,14 +727,14 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm /* alt. data.CurrentPosition.TrackNumber = 1; -- what native yields */ } lpParms->dwReturn = data.CurrentPosition.TrackNumber; - TRACE("CURRENT_TRACK=%lu\n", lpParms->dwReturn); + TRACE("CURRENT_TRACK=%Iu\n", lpParms->dwReturn); break; case MCI_STATUS_LENGTH: if (!MCICDA_ReadTOC(wmcda, &toc, &br)) return MCICDA_GetError(wmcda); if (dwFlags & MCI_TRACK) { - TRACE("MCI_TRACK #%u LENGTH=??? !\n", lpParms->dwTrack); + TRACE("MCI_TRACK #%lu LENGTH=??? !\n", lpParms->dwTrack); if (lpParms->dwTrack < toc.FirstTrack || lpParms->dwTrack > toc.LastTrack) return MCIERR_OUTOFRANGE; lpParms->dwReturn = FRAME_OF_TOC(toc, lpParms->dwTrack + 1) - @@ -755,11 +755,11 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm ? MCI_FORMAT_MSF : wmcda->dwTimeFormat, lpParms->dwReturn, &ret); - TRACE("LENGTH=%lu\n", lpParms->dwReturn); + TRACE("LENGTH=%Iu\n", lpParms->dwReturn); break; case MCI_STATUS_MODE: lpParms->dwReturn = MCICDA_GetStatus(wmcda); - TRACE("MCI_STATUS_MODE=%08lX\n", lpParms->dwReturn); + TRACE("MCI_STATUS_MODE=%08IX\n", lpParms->dwReturn); lpParms->dwReturn = MAKEMCIRESOURCE(lpParms->dwReturn, lpParms->dwReturn); ret = MCI_RESOURCE_RETURNED; break; @@ -774,7 +774,7 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm return MCICDA_GetError(wmcda); lpParms->dwReturn = toc.LastTrack - toc.FirstTrack + 1; - TRACE("MCI_STATUS_NUMBER_OF_TRACKS = %lu\n", lpParms->dwReturn); + TRACE("MCI_STATUS_NUMBER_OF_TRACKS = %Iu\n", lpParms->dwReturn); if (lpParms->dwReturn == (WORD)-1) return MCICDA_GetError(wmcda); break; @@ -794,7 +794,7 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm if (lpParms->dwTrack < toc.FirstTrack || lpParms->dwTrack > toc.LastTrack) return MCIERR_OUTOFRANGE; lpParms->dwReturn = FRAME_OF_TOC(toc, lpParms->dwTrack); - TRACE("get MCI_TRACK #%u !\n", lpParms->dwTrack); + TRACE("get MCI_TRACK #%lu !\n", lpParms->dwTrack); break; case 0: fmt.Format = IOCTL_CDROM_CURRENT_POSITION; @@ -808,7 +808,7 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm return MCIERR_FLAGS_NOT_COMPATIBLE; } lpParms->dwReturn = MCICDA_CalcTime(wmcda, wmcda->dwTimeFormat, lpParms->dwReturn, &ret); - TRACE("MCI_STATUS_POSITION=%08lX\n", lpParms->dwReturn); + TRACE("MCI_STATUS_POSITION=%08IX\n", lpParms->dwReturn); break; case MCI_STATUS_READY: TRACE("MCI_STATUS_READY !\n"); @@ -845,10 +845,10 @@ static DWORD MCICDA_Status(UINT wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParm MCI_CDA_TRACK_OTHER : MCI_CDA_TRACK_AUDIO; /* FIXME: MAKEMCIRESOURCE "audio" | "other", localised */ } - TRACE("MCI_CDA_STATUS_TYPE_TRACK[%d]=%ld\n", lpParms->dwTrack, lpParms->dwReturn); + TRACE("MCI_CDA_STATUS_TYPE_TRACK[%ld]=%Id\n", lpParms->dwTrack, lpParms->dwReturn); break; default: - FIXME("unknown command %08X !\n", lpParms->dwItem); + FIXME("unknown command %08lX !\n", lpParms->dwItem); return MCIERR_UNSUPPORTED_FUNCTION; } } else return MCIERR_MISSING_PARAMETER; @@ -902,7 +902,7 @@ static DWORD MCICDA_Play(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) SUB_Q_CHANNEL_DATA data; CDROM_TOC toc; - TRACE("(%04X, %08X, %p);\n", wDevID, dwFlags, lpParms); + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -917,7 +917,7 @@ static DWORD MCICDA_Play(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) start = MCICDA_CalcFrame(wmcda, lpParms->dwFrom); if ( (ret=MCICDA_SkipDataTracks(wmcda, &start)) ) return ret; - TRACE("MCI_FROM=%08X -> %u\n", lpParms->dwFrom, start); + TRACE("MCI_FROM=%08lX -> %lu\n", lpParms->dwFrom, start); } else { fmt.Format = IOCTL_CDROM_CURRENT_POSITION; if (!device_io(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), @@ -932,12 +932,12 @@ static DWORD MCICDA_Play(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) end = MCICDA_CalcFrame(wmcda, lpParms->dwTo); if ( (ret=MCICDA_SkipDataTracks(wmcda, &end)) ) return ret; - TRACE("MCI_TO=%08X -> %u\n", lpParms->dwTo, end); + TRACE("MCI_TO=%08lX -> %lu\n", lpParms->dwTo, end); } else { end = FRAME_OF_TOC(toc, toc.LastTrack + 1) - 1; } if (end < start) return MCIERR_OUTOFRANGE; - TRACE("Playing from %u to %u\n", start, end); + TRACE("Playing from %lu to %lu\n", start, end); oldcb = InterlockedExchangePointer(&wmcda->hCallback, (dwFlags & MCI_NOTIFY) ? HWND_32(LOWORD(lpParms->dwCallback)) : NULL); @@ -1081,7 +1081,7 @@ static DWORD MCICDA_Stop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms HANDLE oldcb; DWORD br; - TRACE("(%04X, %08X, %p);\n", wDevID, dwFlags, lpParms); + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -1119,7 +1119,7 @@ static DWORD MCICDA_Pause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParm HANDLE oldcb; DWORD br; - TRACE("(%04X, %08X, %p);\n", wDevID, dwFlags, lpParms); + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -1148,7 +1148,7 @@ static DWORD MCICDA_Resume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPar WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); DWORD br; - TRACE("(%04X, %08X, %p);\n", wDevID, dwFlags, lpParms); + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -1177,7 +1177,7 @@ static DWORD MCICDA_Seek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms) DWORD br, position, ret; CDROM_TOC toc; - TRACE("(%04X, %08X, %p);\n", wDevID, dwFlags, lpParms); + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -1210,7 +1210,7 @@ static DWORD MCICDA_Seek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms) return ret; break; case MCI_TO: - TRACE("Seeking to %u\n", lpParms->dwTo); + TRACE("Seeking to %lu\n", lpParms->dwTo); at = MCICDA_CalcFrame(wmcda, lpParms->dwTo); if ( (ret=MCICDA_SkipDataTracks(wmcda, &at)) ) return ret; @@ -1260,7 +1260,7 @@ static DWORD MCICDA_Set(UINT wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms) { WINE_MCICDAUDIO* wmcda = MCICDA_GetOpenDrv(wDevID); - TRACE("(%04X, %08X, %p);\n", wDevID, dwFlags, lpParms); + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (wmcda == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -1293,7 +1293,7 @@ static DWORD MCICDA_Set(UINT wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms) wmcda->dwTimeFormat = lpParms->dwTimeFormat; } if (dwFlags & MCI_SET_AUDIO) /* one xp machine ignored it */ - TRACE("SET_AUDIO %X %x\n", dwFlags, lpParms->dwAudio); + TRACE("SET_AUDIO %lX %lx\n", dwFlags, lpParms->dwAudio); if (dwFlags & MCI_NOTIFY) MCICDA_Notify(lpParms->dwCallback, wmcda, MCI_NOTIFY_SUCCESSFUL);
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mciqtz32/Makefile.in | 1 dlls/mciqtz32/mciqtz.c | 130 +++++++++++++++++++++++---------------------- 2 files changed, 65 insertions(+), 66 deletions(-) diff --git a/dlls/mciqtz32/Makefile.in b/dlls/mciqtz32/Makefile.in index 45bb1c7a518..4aa7e113cd5 100644 --- a/dlls/mciqtz32/Makefile.in +++ b/dlls/mciqtz32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mciqtz32.dll IMPORTS = strmiids oleaut32 ole32 winmm user32 gdi32 diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 487a0d820cd..a7ec0b78f33 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -101,7 +101,7 @@ static DWORD MCIQTZ_drvClose(DWORD dwDevID) { WINE_MCIQTZ* wma; - TRACE("(%04x)\n", dwDevID); + TRACE("(%04lx)\n", dwDevID); wma = MCIQTZ_mciGetOpenDev(dwDevID); @@ -126,7 +126,7 @@ static DWORD MCIQTZ_drvConfigure(DWORD dwDevID) { WINE_MCIQTZ* wma; - TRACE("(%04x)\n", dwDevID); + TRACE("(%04lx)\n", dwDevID); wma = MCIQTZ_mciGetOpenDev(dwDevID); if (!wma) @@ -164,7 +164,7 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, DWORD style = 0; RECT rc = { 0, 0, 0, 0 }; - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpOpenParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpOpenParms); if(!lpOpenParms) return MCIERR_NULL_PARAMETER_BLOCK; @@ -180,48 +180,48 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, hr = CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IGraphBuilder, (LPVOID*)&wma->pgraph); if (FAILED(hr)) { - TRACE("Cannot create filtergraph (hr = %x)\n", hr); + TRACE("Cannot create filtergraph (hr = %lx)\n", hr); goto err; } hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IMediaControl, (LPVOID*)&wma->pmctrl); if (FAILED(hr)) { - TRACE("Cannot get IMediaControl interface (hr = %x)\n", hr); + TRACE("Cannot get IMediaControl interface (hr = %lx)\n", hr); goto err; } hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IMediaSeeking, (void**)&wma->seek); if (FAILED(hr)) { - TRACE("Cannot get IMediaSeeking interface (hr = %x)\n", hr); + TRACE("Cannot get IMediaSeeking interface (hr = %lx)\n", hr); goto err; } hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IMediaEvent, (void**)&wma->mevent); if (FAILED(hr)) { - TRACE("Cannot get IMediaEvent interface (hr = %x)\n", hr); + TRACE("Cannot get IMediaEvent interface (hr = %lx)\n", hr); goto err; } hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IVideoWindow, (void**)&wma->vidwin); if (FAILED(hr)) { - TRACE("Cannot get IVideoWindow interface (hr = %x)\n", hr); + TRACE("Cannot get IVideoWindow interface (hr = %lx)\n", hr); goto err; } hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IBasicVideo, (void**)&wma->vidbasic); if (FAILED(hr)) { - TRACE("Cannot get IBasicVideo interface (hr = %x)\n", hr); + TRACE("Cannot get IBasicVideo interface (hr = %lx)\n", hr); goto err; } hr = IGraphBuilder_QueryInterface(wma->pgraph, &IID_IBasicAudio, (void**)&wma->audio); if (FAILED(hr)) { - TRACE("Cannot get IBasicAudio interface (hr = %x)\n", hr); + TRACE("Cannot get IBasicAudio interface (hr = %lx)\n", hr); goto err; } if (!(dwFlags & MCI_OPEN_ELEMENT) || (dwFlags & MCI_OPEN_ELEMENT_ID)) { - TRACE("Wrong dwFlags %x\n", dwFlags); + TRACE("Wrong dwFlags %lx\n", dwFlags); goto err; } @@ -234,7 +234,7 @@ static DWORD MCIQTZ_mciOpen(UINT wDevID, DWORD dwFlags, hr = IGraphBuilder_RenderFile(wma->pgraph, lpOpenParms->lpstrElementName, NULL); if (FAILED(hr)) { - TRACE("Cannot render file (hr = %x)\n", hr); + TRACE("Cannot render file (hr = %lx)\n", hr); goto err; } @@ -298,7 +298,7 @@ static DWORD MCIQTZ_mciClose(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP { WINE_MCIQTZ* wma; - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) @@ -353,7 +353,7 @@ static DWORD CALLBACK MCIQTZ_notifyThread(LPVOID parm) do { hr = IMediaEvent_GetEvent(wma->mevent, &event_code, &p1, &p2, 0); if (SUCCEEDED(hr)) { - TRACE("got event_code = 0x%02x\n", event_code); + TRACE("got event_code = 0x%02lx\n", event_code); IMediaEvent_FreeEventParams(wma->mevent, event_code, p1, p2); } } while (hr == S_OK && event_code != EC_COMPLETE); @@ -384,7 +384,7 @@ static DWORD CALLBACK MCIQTZ_notifyThread(LPVOID parm) hr = IMediaControl_Stop(wma->pmctrl); if (FAILED(hr)) { - TRACE("Cannot stop filtergraph (hr = %x)\n", hr); + TRACE("Cannot stop filtergraph (hr = %lx)\n", hr); ret = MCIERR_INTERNAL; } @@ -401,7 +401,7 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms GUID format; DWORD start_flags; - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); if(!lpParms) return MCIERR_NULL_PARAMETER_BLOCK; @@ -443,7 +443,7 @@ static DWORD MCIQTZ_mciPlay(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms hr = IMediaControl_Run(wma->pmctrl); if (FAILED(hr)) { - TRACE("Cannot run filtergraph (hr = %x)\n", hr); + TRACE("Cannot run filtergraph (hr = %lx)\n", hr); return MCIERR_INTERNAL; } @@ -466,7 +466,7 @@ static DWORD MCIQTZ_mciSeek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms HRESULT hr; LONGLONG newpos; - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); if(!lpParms) return MCIERR_NULL_PARAMETER_BLOCK; @@ -492,7 +492,7 @@ static DWORD MCIQTZ_mciSeek(UINT wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms hr = IMediaSeeking_SetPositions(wma->seek, &newpos, AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); if (FAILED(hr)) { - FIXME("Cannot set position (hr = %x)\n", hr); + FIXME("Cannot set position (hr = %lx)\n", hr); return MCIERR_INTERNAL; } @@ -509,7 +509,7 @@ static DWORD MCIQTZ_mciStop(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpPa { WINE_MCIQTZ* wma; - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) @@ -539,7 +539,7 @@ static DWORD MCIQTZ_mciPause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP WINE_MCIQTZ* wma; HRESULT hr; - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) @@ -547,7 +547,7 @@ static DWORD MCIQTZ_mciPause(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpP hr = IMediaControl_Pause(wma->pmctrl); if (FAILED(hr)) { - TRACE("Cannot pause filtergraph (hr = %x)\n", hr); + TRACE("Cannot pause filtergraph (hr = %lx)\n", hr); return MCIERR_INTERNAL; } @@ -562,7 +562,7 @@ static DWORD MCIQTZ_mciResume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lp WINE_MCIQTZ* wma; HRESULT hr; - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); wma = MCIQTZ_mciGetOpenDev(wDevID); if (!wma) @@ -570,7 +570,7 @@ static DWORD MCIQTZ_mciResume(UINT wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lp hr = IMediaControl_Run(wma->pmctrl); if (FAILED(hr)) { - TRACE("Cannot run filtergraph (hr = %x)\n", hr); + TRACE("Cannot run filtergraph (hr = %lx)\n", hr); return MCIERR_INTERNAL; } @@ -584,7 +584,7 @@ static DWORD MCIQTZ_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_P { WINE_MCIQTZ* wma; - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); if(!lpParms) return MCIERR_NULL_PARAMETER_BLOCK; @@ -599,74 +599,74 @@ static DWORD MCIQTZ_mciGetDevCaps(UINT wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_P switch (lpParms->dwItem) { case MCI_GETDEVCAPS_CAN_RECORD: lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - TRACE("MCI_GETDEVCAPS_CAN_RECORD = %08x\n", lpParms->dwReturn); + TRACE("MCI_GETDEVCAPS_CAN_RECORD = %08lx\n", lpParms->dwReturn); break; case MCI_GETDEVCAPS_HAS_AUDIO: lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); - TRACE("MCI_GETDEVCAPS_HAS_AUDIO = %08x\n", lpParms->dwReturn); + TRACE("MCI_GETDEVCAPS_HAS_AUDIO = %08lx\n", lpParms->dwReturn); break; case MCI_GETDEVCAPS_HAS_VIDEO: lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); - TRACE("MCI_GETDEVCAPS_HAS_VIDEO = %08x\n", lpParms->dwReturn); + TRACE("MCI_GETDEVCAPS_HAS_VIDEO = %08lx\n", lpParms->dwReturn); break; case MCI_GETDEVCAPS_DEVICE_TYPE: lpParms->dwReturn = MAKEMCIRESOURCE(MCI_DEVTYPE_DIGITAL_VIDEO, MCI_DEVTYPE_DIGITAL_VIDEO); - TRACE("MCI_GETDEVCAPS_DEVICE_TYPE = %08x\n", lpParms->dwReturn); + TRACE("MCI_GETDEVCAPS_DEVICE_TYPE = %08lx\n", lpParms->dwReturn); break; case MCI_GETDEVCAPS_USES_FILES: lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); - TRACE("MCI_GETDEVCAPS_USES_FILES = %08x\n", lpParms->dwReturn); + TRACE("MCI_GETDEVCAPS_USES_FILES = %08lx\n", lpParms->dwReturn); break; case MCI_GETDEVCAPS_COMPOUND_DEVICE: lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); - TRACE("MCI_GETDEVCAPS_COMPOUND_DEVICE = %08x\n", lpParms->dwReturn); + TRACE("MCI_GETDEVCAPS_COMPOUND_DEVICE = %08lx\n", lpParms->dwReturn); break; case MCI_GETDEVCAPS_CAN_EJECT: lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - TRACE("MCI_GETDEVCAPS_EJECT = %08x\n", lpParms->dwReturn); + TRACE("MCI_GETDEVCAPS_EJECT = %08lx\n", lpParms->dwReturn); break; case MCI_GETDEVCAPS_CAN_PLAY: lpParms->dwReturn = MAKEMCIRESOURCE(TRUE, MCI_TRUE); - TRACE("MCI_GETDEVCAPS_CAN_PLAY = %08x\n", lpParms->dwReturn); + TRACE("MCI_GETDEVCAPS_CAN_PLAY = %08lx\n", lpParms->dwReturn); break; case MCI_GETDEVCAPS_CAN_SAVE: lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - TRACE("MCI_GETDEVCAPS_CAN_SAVE = %08x\n", lpParms->dwReturn); + TRACE("MCI_GETDEVCAPS_CAN_SAVE = %08lx\n", lpParms->dwReturn); break; case MCI_DGV_GETDEVCAPS_CAN_REVERSE: lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - TRACE("MCI_DGV_GETDEVCAPS_CAN_REVERSE = %08x\n", lpParms->dwReturn); + TRACE("MCI_DGV_GETDEVCAPS_CAN_REVERSE = %08lx\n", lpParms->dwReturn); break; case MCI_DGV_GETDEVCAPS_CAN_STRETCH: lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); /* FIXME */ - TRACE("MCI_DGV_GETDEVCAPS_CAN_STRETCH = %08x\n", lpParms->dwReturn); + TRACE("MCI_DGV_GETDEVCAPS_CAN_STRETCH = %08lx\n", lpParms->dwReturn); break; case MCI_DGV_GETDEVCAPS_CAN_LOCK: lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - TRACE("MCI_DGV_GETDEVCAPS_CAN_LOCK = %08x\n", lpParms->dwReturn); + TRACE("MCI_DGV_GETDEVCAPS_CAN_LOCK = %08lx\n", lpParms->dwReturn); break; case MCI_DGV_GETDEVCAPS_CAN_FREEZE: lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - TRACE("MCI_DGV_GETDEVCAPS_CAN_FREEZE = %08x\n", lpParms->dwReturn); + TRACE("MCI_DGV_GETDEVCAPS_CAN_FREEZE = %08lx\n", lpParms->dwReturn); break; case MCI_DGV_GETDEVCAPS_CAN_STR_IN: lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - TRACE("MCI_DGV_GETDEVCAPS_CAN_STRETCH_INPUT = %08x\n", lpParms->dwReturn); + TRACE("MCI_DGV_GETDEVCAPS_CAN_STRETCH_INPUT = %08lx\n", lpParms->dwReturn); break; case MCI_DGV_GETDEVCAPS_HAS_STILL: lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); - TRACE("MCI_DGV_GETDEVCAPS_HAS_STILL = %08x\n", lpParms->dwReturn); + TRACE("MCI_DGV_GETDEVCAPS_HAS_STILL = %08lx\n", lpParms->dwReturn); break; case MCI_DGV_GETDEVCAPS_CAN_TEST: lpParms->dwReturn = MAKEMCIRESOURCE(FALSE, MCI_FALSE); /* FIXME */ - TRACE("MCI_DGV_GETDEVCAPS_CAN_TEST = %08x\n", lpParms->dwReturn); + TRACE("MCI_DGV_GETDEVCAPS_CAN_TEST = %08lx\n", lpParms->dwReturn); break; case MCI_DGV_GETDEVCAPS_MAX_WINDOWS: lpParms->dwReturn = 1; - TRACE("MCI_DGV_GETDEVCAPS_MAX_WINDOWS = %u\n", lpParms->dwReturn); + TRACE("MCI_DGV_GETDEVCAPS_MAX_WINDOWS = %lu\n", lpParms->dwReturn); return 0; default: - WARN("Unknown capability %08x\n", lpParms->dwItem); + WARN("Unknown capability %08lx\n", lpParms->dwItem); /* Fall through */ case MCI_DGV_GETDEVCAPS_MAXIMUM_RATE: /* unknown to w2k */ case MCI_DGV_GETDEVCAPS_MINIMUM_RATE: /* unknown to w2k */ @@ -683,7 +683,7 @@ static DWORD MCIQTZ_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpPar { WINE_MCIQTZ* wma; - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); if(!lpParms) return MCIERR_NULL_PARAMETER_BLOCK; @@ -703,7 +703,7 @@ static DWORD MCIQTZ_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpPar wma->time_format = MCI_FORMAT_FRAMES; break; default: - WARN("Bad time format %u\n", lpParms->dwTimeFormat); + WARN("Bad time format %lu\n", lpParms->dwTimeFormat); return MCIERR_BAD_TIME_FORMAT; } } @@ -726,7 +726,7 @@ static DWORD MCIQTZ_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpPar FIXME("MCI_SET_AUDIO_RIGHT not implemented yet\n"); if (dwFlags & ~0x7f03 /* All MCI_SET flags mask */) - ERR("Unknown flags %08x\n", dwFlags & ~0x7f03); + ERR("Unknown flags %08lx\n", dwFlags & ~0x7f03); return 0; } @@ -740,7 +740,7 @@ static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMS HRESULT hr; DWORD ret = MCI_INTEGER_RETURNED; - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); if(!lpParms) return MCIERR_NULL_PARAMETER_BLOCK; @@ -761,17 +761,17 @@ static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMS switch (wma->time_format) { case MCI_FORMAT_MILLISECONDS: format = TIME_FORMAT_MEDIA_TIME; break; case MCI_FORMAT_FRAMES: format = TIME_FORMAT_FRAME; break; - default: ERR("Unhandled format %x\n", wma->time_format); break; + default: ERR("Unhandled format %lx\n", wma->time_format); break; } hr = IMediaSeeking_SetTimeFormat(wma->seek, &format); if (FAILED(hr)) { - FIXME("Cannot set time format (hr = %x)\n", hr); + FIXME("Cannot set time format (hr = %lx)\n", hr); lpParms->dwReturn = 0; break; } hr = IMediaSeeking_GetDuration(wma->seek, &duration); if (FAILED(hr) || duration < 0) { - FIXME("Cannot read duration (hr = %x)\n", hr); + FIXME("Cannot read duration (hr = %lx)\n", hr); lpParms->dwReturn = 0; } else if (wma->time_format != MCI_FORMAT_MILLISECONDS) lpParms->dwReturn = duration; @@ -784,7 +784,7 @@ static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMS hr = IMediaSeeking_GetCurrentPosition(wma->seek, &curpos); if (FAILED(hr)) { - FIXME("Cannot get position (hr = %x)\n", hr); + FIXME("Cannot get position (hr = %lx)\n", hr); return MCIERR_INTERNAL; } lpParms->dwReturn = curpos / 10000; @@ -822,7 +822,7 @@ static DWORD MCIQTZ_mciStatus(UINT wDevID, DWORD dwFlags, LPMCI_DGV_STATUS_PARMS FIXME("MCI_STATUS_CURRENT_TRACK not implemented yet\n"); return MCIERR_UNRECOGNIZED_COMMAND; default: - FIXME("Unknown command %08X\n", lpParms->dwItem); + FIXME("Unknown command %08lX\n", lpParms->dwItem); return MCIERR_UNRECOGNIZED_COMMAND; } @@ -843,7 +843,7 @@ static DWORD MCIQTZ_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lp RECT rc; DWORD ret = MCIERR_UNRECOGNIZED_COMMAND; - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); if(!lpParms) return MCIERR_NULL_PARAMETER_BLOCK; @@ -908,7 +908,7 @@ static DWORD MCIQTZ_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMS { WINE_MCIQTZ *wma = MCIQTZ_mciGetOpenDev(wDevID); - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); if(!lpParms) return MCIERR_NULL_PARAMETER_BLOCK; @@ -955,7 +955,7 @@ static DWORD MCIQTZ_mciPut(UINT wDevID, DWORD dwFlags, MCI_GENERIC_PARMS *lpParm MCI_DGV_RECT_PARMS *rectparms; HRESULT hr; - TRACE("(%04x, %08X, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lX, %p)\n", wDevID, dwFlags, lpParms); if(!lpParms) return MCIERR_NULL_PARAMETER_BLOCK; @@ -980,7 +980,7 @@ static DWORD MCIQTZ_mciPut(UINT wDevID, DWORD dwFlags, MCI_GENERIC_PARMS *lpParm rectparms->rc.right - rectparms->rc.left, rectparms->rc.bottom - rectparms->rc.top); if(FAILED(hr)) - WARN("IVideoWindow_SetWindowPosition failed: 0x%x\n", hr); + WARN("IVideoWindow_SetWindowPosition failed: 0x%lx\n", hr); dwFlags &= ~MCI_DGV_PUT_DESTINATION; } @@ -991,7 +991,7 @@ static DWORD MCIQTZ_mciPut(UINT wDevID, DWORD dwFlags, MCI_GENERIC_PARMS *lpParm } if (dwFlags) - FIXME("No support for some flags: 0x%x\n", dwFlags); + FIXME("No support for some flags: 0x%lx\n", dwFlags); return 0; } @@ -1004,7 +1004,7 @@ static DWORD MCIQTZ_mciUpdate(UINT wDevID, DWORD dwFlags, LPMCI_DGV_UPDATE_PARMS WINE_MCIQTZ *wma; DWORD res = 0; - TRACE("%04x, %08x, %p\n", wDevID, dwFlags, lpParms); + TRACE("%04x, %08lx, %p\n", wDevID, dwFlags, lpParms); if(!lpParms) return MCIERR_NULL_PARAMETER_BLOCK; @@ -1035,7 +1035,7 @@ static DWORD MCIQTZ_mciUpdate(UINT wDevID, DWORD dwFlags, LPMCI_DGV_UPDATE_PARMS IMediaControl_Pause(wma->pmctrl); IMediaControl_GetState(wma->pmctrl, -1, &state); if (FAILED(hr = IBasicVideo_GetCurrentImage(wma->vidbasic, &size, NULL))) { - WARN("Could not get image size (hr = %x)\n", hr); + WARN("Could not get image size (hr = %lx)\n", hr); goto out; } data = HeapAlloc(GetProcessHeap(), 0, size); @@ -1056,7 +1056,7 @@ out: IVideoWindow_put_Visible(wma->vidwin, visible); } else if (dwFlags) - FIXME("Unhandled flags %x\n", dwFlags); + FIXME("Unhandled flags %lx\n", dwFlags); return res; } @@ -1068,7 +1068,7 @@ static DWORD MCIQTZ_mciSetAudio(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETAUDIO_P WINE_MCIQTZ *wma; DWORD ret = 0; - TRACE("(%04x, %08x, %p)\n", wDevID, dwFlags, lpParms); + TRACE("(%04x, %08lx, %p)\n", wDevID, dwFlags, lpParms); if(!lpParms) return MCIERR_NULL_PARAMETER_BLOCK; @@ -1078,7 +1078,7 @@ static DWORD MCIQTZ_mciSetAudio(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETAUDIO_P return MCIERR_INVALID_DEVICE_ID; if (!(dwFlags & MCI_DGV_SETAUDIO_ITEM)) { - FIXME("Unknown flags (%08x)\n", dwFlags); + FIXME("Unknown flags (%08lx)\n", dwFlags); return 0; } @@ -1101,13 +1101,13 @@ static DWORD MCIQTZ_mciSetAudio(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETAUDIO_P TRACE("Setting volume to %ld\n", vol); hr = IBasicAudio_put_Volume(wma->audio, vol); if (FAILED(hr)) { - WARN("Cannot set volume (hr = %x)\n", hr); + WARN("Cannot set volume (hr = %lx)\n", hr); ret = MCIERR_INTERNAL; } } break; default: - FIXME("Unknown item %08x\n", lpParms->dwItem); + FIXME("Unknown item %08lx\n", lpParms->dwItem); break; } } @@ -1125,7 +1125,7 @@ static DWORD MCIQTZ_mciSetAudio(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETAUDIO_P LRESULT CALLBACK MCIQTZ_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2) { - TRACE("(%08lX, %p, %08X, %08lX, %08lX)\n", + TRACE("(%08IX, %p, %08X, %08IX, %08IX)\n", dwDevID, hDriv, wMsg, dwParam1, dwParam2); switch (wMsg) {
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mciseq/Makefile.in | 1 - dlls/mciseq/mcimidi.c | 78 ++++++++++++++++++++++++----------------------- 2 files changed, 39 insertions(+), 40 deletions(-) diff --git a/dlls/mciseq/Makefile.in b/dlls/mciseq/Makefile.in index 8495d02cca6..161a3deb994 100644 --- a/dlls/mciseq/Makefile.in +++ b/dlls/mciseq/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mciseq.dll IMPORTS = winmm user32 diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index f1a262e178c..4211ed5ca4a 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -252,7 +252,7 @@ static DWORD MIDI_mciReadNextEvent(WINE_MCIMIDI* wmm, MCI_MIDITRACK* mmt) DWORD tmp; if (mmioSeek(wmm->hFile, mmt->dwIndex, SEEK_SET) != mmt->dwIndex) { - WARN("Can't seek at %08X\n", mmt->dwIndex); + WARN("Can't seek at %08lX\n", mmt->dwIndex); return MCIERR_INVALID_FILE; } evtLength = MIDI_mciReadVaryLen(wmm, &evtPulse) + 1; /* > 0 */ @@ -380,7 +380,7 @@ static DWORD MIDI_mciReadMTrk(WINE_MCIMIDI* wmm, MCI_MIDITRACK* mmt) } mmt->dwLength = mmt->dwEventPulse; - TRACE("Track %u has %u bytes and %u pulses\n", mmt->wTrackNr, toberead, mmt->dwLength); + TRACE("Track %u has %lu bytes and %lu pulses\n", mmt->wTrackNr, toberead, mmt->dwLength); /* reset track data */ mmt->wStatus = 1; /* ok, playing */ @@ -388,7 +388,7 @@ static DWORD MIDI_mciReadMTrk(WINE_MCIMIDI* wmm, MCI_MIDITRACK* mmt) mmt->dwEventPulse = 0; if (mmioSeek(wmm->hFile, 0, SEEK_CUR) != mmt->dwLast) { - WARN("Ouch, out of sync seek=%u track=%u\n", + WARN("Ouch, out of sync seek=%lu track=%lu\n", mmioSeek(wmm->hFile, 0, SEEK_CUR), mmt->dwLast); /* position at end of this track, to be ready to read next track */ mmioSeek(wmm->hFile, mmt->dwLast, SEEK_SET); @@ -406,10 +406,10 @@ static DWORD MIDI_mciReadMThd(WINE_MCIMIDI* wmm, DWORD dwOffset) FOURCC fourcc; WORD nt; - TRACE("(%p, %08X);\n", wmm, dwOffset); + TRACE("(%p, %08lX);\n", wmm, dwOffset); if (mmioSeek(wmm->hFile, dwOffset, SEEK_SET) != dwOffset) { - WARN("Can't seek at %08X begin of 'MThd'\n", dwOffset); + WARN("Can't seek at %08lX begin of 'MThd'\n", dwOffset); return MCIERR_INVALID_FILE; } if (mmioRead(wmm->hFile, (HPSTR)&fourcc, sizeof(FOURCC)) != sizeof(FOURCC)) @@ -429,7 +429,7 @@ static DWORD MIDI_mciReadMThd(WINE_MCIMIDI* wmm, DWORD dwOffset) return MCIERR_INVALID_FILE; } - TRACE("toberead=0x%08X, wFormat=0x%04X nTracks=0x%04X nDivision=0x%04X\n", + TRACE("toberead=0x%08lX, wFormat=0x%04X nTracks=0x%04X nDivision=0x%04X\n", toberead, wmm->wFormat, wmm->nTracks, wmm->nDivision); /* MS doc says that the MIDI MCI time format must be put by default to the format @@ -499,7 +499,7 @@ static DWORD MIDI_mciReadMThd(WINE_MCIMIDI* wmm, DWORD dwOffset) toberead -= 3 * sizeof(WORD); if (toberead > 0) { - TRACE("Size of MThd > 6, skipping %d extra bytes\n", toberead); + TRACE("Size of MThd > 6, skipping %ld extra bytes\n", toberead); mmioSeek(wmm->hFile, toberead, SEEK_CUR); } @@ -576,7 +576,7 @@ static DWORD MIDI_ConvertTimeFormatToMS(WINE_MCIMIDI* wmm, DWORD val) HIBYTE(LOWORD(val)) * TIME_MS_IN_ONE_MINUTE + LOBYTE(LOWORD(val)) * TIME_MS_IN_ONE_HOUR; break; default: - WARN("Bad time format %u!\n", wmm->dwMciTimeFormat); + WARN("Bad time format %lu!\n", wmm->dwMciTimeFormat); } /* TRACE("val=%u=0x%08x [tf=%u] => ret=%u\n", val, val, wmm->dwMciTimeFormat, ret); @@ -624,7 +624,7 @@ static DWORD MIDI_ConvertMSToTimeFormat(WINE_MCIMIDI* wmm, DWORD _val) ret = (f << 24) | (s << 16) | (m << 8) | (h << 0); break; default: - WARN("Bad time format %u!\n", wmm->dwMciTimeFormat); + WARN("Bad time format %lu!\n", wmm->dwMciTimeFormat); } /* TRACE("val=%u [tf=%u] => ret=%u=0x%08x\n", _val, wmm->dwMciTimeFormat, ret, ret); @@ -658,7 +658,7 @@ static DWORD MIDI_mciOpen(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_OPEN_PARMSW lp { DWORD dwRet = 0; - TRACE("(%d, %08X, %p)\n", wmm->wDevID, dwFlags, lpParms); + TRACE("(%d, %08lX, %p)\n", wmm->wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (dwFlags & MCI_OPEN_SHAREABLE) @@ -712,7 +712,7 @@ static DWORD MIDI_mciOpen(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_OPEN_PARMSW lp if (mmioDescend(wmm->hFile, &ckMainRIFF, NULL, 0) != 0) { dwRet = MCIERR_INVALID_FILE; } else { - TRACE("ParentChunk ckid=%.4s fccType=%.4s cksize=%08X\n", + TRACE("ParentChunk ckid=%.4s fccType=%.4s cksize=%08lX\n", (LPSTR)&ckMainRIFF.ckid, (LPSTR)&ckMainRIFF.fccType, ckMainRIFF.cksize); if (ckMainRIFF.ckid == FOURCC_RIFF && ckMainRIFF.fccType == mmioFOURCC('R', 'M', 'I', 'D')) { @@ -761,7 +761,7 @@ static DWORD MIDI_mciStop(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_GENERIC_PARMS { DWORD dwRet = 0; - TRACE("(%d, %08X, %p);\n", wmm->wDevID, dwFlags, lpParms); + TRACE("(%d, %08lX, %p);\n", wmm->wDevID, dwFlags, lpParms); if (wmm->dwStatus != MCI_MODE_STOP) { HANDLE old = InterlockedExchangePointer(&wmm->hCallback, NULL); @@ -793,7 +793,7 @@ static DWORD MIDI_mciStop(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_GENERIC_PARMS static DWORD MIDI_mciClose(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) { - TRACE("(%d, %08X, %p);\n", wmm->wDevID, dwFlags, lpParms); + TRACE("(%d, %08lX, %p);\n", wmm->wDevID, dwFlags, lpParms); if (wmm->dwStatus != MCI_MODE_STOP) { /* mciStop handles MCI_NOTIFY_ABORTED */ @@ -904,7 +904,7 @@ static DWORD MIDI_player(WINE_MCIMIDI* wmm, DWORD dwFlags) if (doPlay && !wmm->wStartedPlaying) { wmm->dwStartTicks = GetTickCount() - MIDI_ConvertPulseToMS(wmm, wmm->dwPulse); wmm->wStartedPlaying = TRUE; - TRACE("Setting dwStartTicks to %u\n", wmm->dwStartTicks); + TRACE("Setting dwStartTicks to %lu\n", wmm->dwStartTicks); } if (hiPulse > wmm->dwPulse) { @@ -913,8 +913,8 @@ static DWORD MIDI_player(WINE_MCIMIDI* wmm, DWORD dwFlags) DWORD togo = wmm->dwStartTicks + wmm->dwPositionMS; DWORD tc = GetTickCount(); - TRACE("Pulses hi=0x%08x <> cur=0x%08x\n", hiPulse, wmm->dwPulse); - TRACE("Wait until %u => %u ms\n", + TRACE("Pulses hi=0x%08lx <> cur=0x%08lx\n", hiPulse, wmm->dwPulse); + TRACE("Wait until %lu => %lu ms\n", tc - wmm->dwStartTicks, togo - wmm->dwStartTicks); if (tc < togo) Sleep(togo - tc); @@ -1001,7 +1001,7 @@ static DWORD MIDI_player(WINE_MCIMIDI* wmm, DWORD dwFlags) MIDI_mciReadByte(wmm, &tbt); value = ((DWORD)tbt) << 16; MIDI_mciReadByte(wmm, &tbt); value |= ((DWORD)tbt) << 8; MIDI_mciReadByte(wmm, &tbt); value |= ((DWORD)tbt) << 0; - TRACE("Setting tempo to %d (BPM=%d)\n", wmm->dwTempo, (value) ? (60000000 / value) : 0); + TRACE("Setting tempo to %ld (BPM=%ld)\n", wmm->dwTempo, (value) ? (60000000 / value) : 0); wmm->dwTempo = value; } break; @@ -1009,7 +1009,7 @@ static DWORD MIDI_player(WINE_MCIMIDI* wmm, DWORD dwFlags) if (mmt->wTrackNr != 0 && wmm->wFormat == 1) { WARN("For format #1 MIDI files, SMPTE track start can only be expressed on track #0 (%u)\n", mmt->wTrackNr); } if (mmt->dwEventPulse != 0) { - WARN("SMPTE track start can only be expressed at start of track (%u)\n", mmt->dwEventPulse); + WARN("SMPTE track start can only be expressed at start of track (%lu)\n", mmt->dwEventPulse); } else { BYTE h, m, s, f, ff; @@ -1139,7 +1139,7 @@ static DWORD MIDI_mciPlay(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_PLAY_PARMS lpP DWORD dwRet; HANDLE oldcb; - TRACE("(%d, %08X, %p);\n", wmm->wDevID, dwFlags, lpParms); + TRACE("(%d, %08lX, %p);\n", wmm->wDevID, dwFlags, lpParms); if (wmm->hFile == 0) { WARN("Can't play: no file %s!\n", debugstr_w(wmm->lpstrElementName)); @@ -1171,7 +1171,7 @@ static DWORD MIDI_mciPlay(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_PLAY_PARMS lpP wmm->dwEndMS = dwEndMS; } - TRACE("Playing from %u to %u\n", dwStartMS, dwEndMS); + TRACE("Playing from %lu to %lu\n", dwStartMS, dwEndMS); if ((dwFlags & MCI_NOTIFY) && lpParms) { oldcb = InterlockedExchangePointer(&wmm->hCallback, HWND_32(LOWORD(lpParms->dwCallback))); @@ -1194,7 +1194,7 @@ static DWORD MIDI_mciPlay(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_PLAY_PARMS lpP */ static DWORD MIDI_mciPause(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) { - TRACE("(%d, %08X, %p);\n", wmm->wDevID, dwFlags, lpParms); + TRACE("(%d, %08lX, %p);\n", wmm->wDevID, dwFlags, lpParms); if (wmm->dwStatus == MCI_MODE_PLAY) { /* stop all notes */ @@ -1213,7 +1213,7 @@ static DWORD MIDI_mciPause(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_GENERIC_PARMS */ static DWORD MIDI_mciResume(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) { - TRACE("(%d, %08X, %p);\n", wmm->wDevID, dwFlags, lpParms); + TRACE("(%d, %08lX, %p);\n", wmm->wDevID, dwFlags, lpParms); if (wmm->dwStatus == MCI_MODE_PAUSE) { wmm->wStartedPlaying = FALSE; @@ -1229,7 +1229,7 @@ static DWORD MIDI_mciResume(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_GENERIC_PARM */ static DWORD MIDI_mciSet(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_SEQ_SET_PARMS lpParms) { - TRACE("(%d, %08X, %p);\n", wmm->wDevID, dwFlags, lpParms); + TRACE("(%d, %08lX, %p);\n", wmm->wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -1252,7 +1252,7 @@ static DWORD MIDI_mciSet(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_SEQ_SET_PARMS l wmm->dwMciTimeFormat = MCI_FORMAT_SMPTE_30; break; default: - WARN("Bad time format %u!\n", lpParms->dwTimeFormat); + WARN("Bad time format %lu!\n", lpParms->dwTimeFormat); return MCIERR_BAD_TIME_FORMAT; } } @@ -1283,7 +1283,7 @@ static DWORD MIDI_mciSet(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_SEQ_SET_PARMS l case MCI_SET_AUDIO_ALL: TRACE("MCI_SET_AUDIO_ALL !\n"); break; case MCI_SET_AUDIO_LEFT: TRACE("MCI_SET_AUDIO_LEFT !\n"); break; case MCI_SET_AUDIO_RIGHT: TRACE("MCI_SET_AUDIO_RIGHT !\n"); break; - default: WARN("Unknown audio channel %u\n", lpParms->dwAudio); break; + default: WARN("Unknown audio channel %lu\n", lpParms->dwAudio); break; } } @@ -1294,7 +1294,7 @@ static DWORD MIDI_mciSet(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_SEQ_SET_PARMS l if (dwFlags & MCI_SEQ_SET_OFFSET) TRACE("MCI_SEQ_SET_OFFSET !\n"); if (dwFlags & MCI_SEQ_SET_PORT) { - TRACE("MCI_SEQ_SET_PORT = %d\n", lpParms->dwPort); + TRACE("MCI_SEQ_SET_PORT = %ld\n", lpParms->dwPort); if ((UINT16)lpParms->dwPort != (UINT16)MIDI_MAPPER && (UINT16)lpParms->dwPort >= midiOutGetNumDevs()) /* FIXME: input/output port distinction? */ @@ -1316,7 +1316,7 @@ static DWORD MIDI_mciStatus(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_STATUS_PARMS { DWORD ret = 0; - TRACE("(%d, %08X, %p);\n", wmm->wDevID, dwFlags, lpParms); + TRACE("(%d, %08lX, %p);\n", wmm->wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -1325,7 +1325,7 @@ static DWORD MIDI_mciStatus(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_STATUS_PARMS case MCI_STATUS_CURRENT_TRACK: /* FIXME in Format 2 */ lpParms->dwReturn = 1; - TRACE("MCI_STATUS_CURRENT_TRACK => %lu\n", lpParms->dwReturn); + TRACE("MCI_STATUS_CURRENT_TRACK => %Iu\n", lpParms->dwReturn); break; case MCI_STATUS_LENGTH: if ((dwFlags & MCI_TRACK) && wmm->wFormat == 2) { @@ -1338,7 +1338,7 @@ static DWORD MIDI_mciStatus(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_STATUS_PARMS } lpParms->dwReturn = MIDI_ConvertMSToTimeFormat(wmm, lpParms->dwReturn); /* FIXME: ret = MCI_COLONIZED4_RETURN if SMPTE */ - TRACE("MCI_STATUS_LENGTH => %lu\n", lpParms->dwReturn); + TRACE("MCI_STATUS_LENGTH => %Iu\n", lpParms->dwReturn); break; case MCI_STATUS_MODE: TRACE("MCI_STATUS_MODE => %u\n", wmm->dwStatus); @@ -1352,14 +1352,14 @@ static DWORD MIDI_mciStatus(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_STATUS_PARMS break; case MCI_STATUS_NUMBER_OF_TRACKS: lpParms->dwReturn = (wmm->wFormat == 2) ? wmm->nTracks : 1; - TRACE("MCI_STATUS_NUMBER_OF_TRACKS => %lu\n", lpParms->dwReturn); + TRACE("MCI_STATUS_NUMBER_OF_TRACKS => %Iu\n", lpParms->dwReturn); break; case MCI_STATUS_POSITION: /* FIXME: check MCI_TRACK == 1 if set */ lpParms->dwReturn = MIDI_ConvertMSToTimeFormat(wmm, (dwFlags & MCI_STATUS_START) ? 0 : wmm->dwPositionMS); /* FIXME: ret = MCI_COLONIZED4_RETURN if SMPTE */ - TRACE("MCI_STATUS_POSITION %s => %lu\n", + TRACE("MCI_STATUS_POSITION %s => %Iu\n", (dwFlags & MCI_STATUS_START) ? "start" : "current", lpParms->dwReturn); break; case MCI_STATUS_READY: @@ -1417,7 +1417,7 @@ static DWORD MIDI_mciStatus(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_STATUS_PARMS lpParms->dwReturn = wmm->dwTempo; break; default: - FIXME("Unknown command %08X !\n", lpParms->dwItem); + FIXME("Unknown command %08lX !\n", lpParms->dwItem); return MCIERR_UNSUPPORTED_FUNCTION; } } else { @@ -1436,7 +1436,7 @@ static DWORD MIDI_mciGetDevCaps(WINE_MCIMIDI* wmm, DWORD dwFlags, { DWORD ret; - TRACE("(%d, %08X, %p);\n", wmm->wDevID, dwFlags, lpParms); + TRACE("(%d, %08lX, %p);\n", wmm->wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -1488,7 +1488,7 @@ static DWORD MIDI_mciGetDevCaps(WINE_MCIMIDI* wmm, DWORD dwFlags, ret = MCI_RESOURCE_RETURNED; break; default: - FIXME("Unknown capability (%08x) !\n", lpParms->dwItem); + FIXME("Unknown capability (%08lx) !\n", lpParms->dwItem); return MCIERR_UNRECOGNIZED_COMMAND; } } else { @@ -1508,12 +1508,12 @@ static DWORD MIDI_mciInfo(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_INFO_PARMSW lp LPCWSTR str = 0; DWORD ret = 0; - TRACE("(%d, %08X, %p);\n", wmm->wDevID, dwFlags, lpParms); + TRACE("(%d, %08lX, %p);\n", wmm->wDevID, dwFlags, lpParms); if (lpParms == NULL || lpParms->lpstrReturn == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - TRACE("buf=%p, len=%u\n", lpParms->lpstrReturn, lpParms->dwRetSize); + TRACE("buf=%p, len=%lu\n", lpParms->lpstrReturn, lpParms->dwRetSize); switch (dwFlags & ~(MCI_WAIT|MCI_NOTIFY)) { case MCI_INFO_PRODUCT: str = L"Wine's MIDI sequencer"; break; @@ -1521,7 +1521,7 @@ static DWORD MIDI_mciInfo(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_INFO_PARMSW lp case MCI_INFO_COPYRIGHT: str = wmm->lpstrCopyright; break; case MCI_INFO_NAME: str = wmm->lpstrName; break; default: - WARN("Don't know this info command (%u)\n", dwFlags); + WARN("Don't know this info command (%lu)\n", dwFlags); return MCIERR_MISSING_PARAMETER; /* not MCIERR_FLAGS_... */ } if (!ret) { @@ -1543,7 +1543,7 @@ static DWORD MIDI_mciSeek(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_SEEK_PARMS lpP { DWORD position; - TRACE("(%d, %08X, %p);\n", wmm->wDevID, dwFlags, lpParms); + TRACE("(%d, %08lX, %p);\n", wmm->wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -1561,7 +1561,7 @@ static DWORD MIDI_mciSeek(WINE_MCIMIDI* wmm, DWORD dwFlags, LPMCI_SEEK_PARMS lpP wmm->dwPositionMS = 0xFFFFFFFF; /* FIXME */ } - TRACE("Seeking to position=%u ms\n", wmm->dwPositionMS); + TRACE("Seeking to position=%lu ms\n", wmm->dwPositionMS); if (dwFlags & MCI_NOTIFY) MIDI_mciNotify(lpParms->dwCallback, wmm, MCI_NOTIFY_SUCCESSFUL);
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mciwave/Makefile.in | 1 dlls/mciwave/mciwave.c | 128 +++++++++++++++++++++++----------------------- 2 files changed, 64 insertions(+), 65 deletions(-) diff --git a/dlls/mciwave/Makefile.in b/dlls/mciwave/Makefile.in index 8f1e01e7542..7df953858a3 100644 --- a/dlls/mciwave/Makefile.in +++ b/dlls/mciwave/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mciwave.dll IMPORTS = winmm user32 diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index 13dd927cd42..1d9abce84a3 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -84,10 +84,10 @@ static DWORD CALLBACK MCI_SCAStarter(LPVOID arg) struct SCA* sca = (struct SCA*)arg; DWORD ret; - TRACE("In thread before async command (%08x,%08lx,%08lx)\n", + TRACE("In thread before async command (%08x,%08Ix,%08Ix)\n", sca->wDevID, sca->dwParam1, sca->dwParam2); ret = sca->cmd(sca->wDevID, sca->dwParam1 | MCI_WAIT, sca->dwParam2, sca->evt); - TRACE("In thread after async command (%08x,%08lx,%08lx)\n", + TRACE("In thread after async command (%08x,%08Ix,%08Ix)\n", sca->wDevID, sca->dwParam1, sca->dwParam2); HeapFree(GetProcessHeap(), 0, sca); return ret; @@ -239,9 +239,9 @@ static DWORD WAVE_ConvertByteToTimeFormat(WINE_MCIWAVE* wmw, DWORD val) ret = MulDiv(val,wmw->lpWaveFormat->nSamplesPerSec,wmw->lpWaveFormat->nAvgBytesPerSec); break; default: - WARN("Bad time format %u!\n", wmw->dwMciTimeFormat); + WARN("Bad time format %lu!\n", wmw->dwMciTimeFormat); } - TRACE("val=%u=0x%08x [tf=%u] => ret=%u\n", val, val, wmw->dwMciTimeFormat, ret); + TRACE("val=%lu=0x%08lx [tf=%lu] => ret=%lu\n", val, val, wmw->dwMciTimeFormat, ret); return ret; } @@ -266,9 +266,9 @@ static DWORD WAVE_ConvertTimeFormatToByte(WINE_MCIWAVE* wmw, DWORD val) ret = MulDiv(val,wmw->lpWaveFormat->nAvgBytesPerSec,wmw->lpWaveFormat->nSamplesPerSec); break; default: - WARN("Bad time format %u!\n", wmw->dwMciTimeFormat); + WARN("Bad time format %lu!\n", wmw->dwMciTimeFormat); } - TRACE("val=%u=0x%08x [tf=%u] => ret=%u\n", val, val, wmw->dwMciTimeFormat, ret); + TRACE("val=%lu=0x%08lx [tf=%lu] => ret=%lu\n", val, val, wmw->dwMciTimeFormat, ret); return ret; } @@ -284,7 +284,7 @@ static DWORD WAVE_mciReadFmt(WINE_MCIWAVE* wmw, const MMCKINFO* pckMainRIFF) mmckInfo.ckid = mmioFOURCC('f', 'm', 't', ' '); if (mmioDescend(wmw->hFile, &mmckInfo, pckMainRIFF, MMIO_FINDCHUNK) != 0) return MCIERR_INVALID_FILE; - TRACE("Chunk Found ckid=%.4s fccType=%.4s cksize=%08X\n", + TRACE("Chunk Found ckid=%.4s fccType=%.4s cksize=%08lX\n", (LPSTR)&mmckInfo.ckid, (LPSTR)&mmckInfo.fccType, mmckInfo.cksize); pwfx = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); @@ -297,8 +297,8 @@ static DWORD WAVE_mciReadFmt(WINE_MCIWAVE* wmw, const MMCKINFO* pckMainRIFF) } TRACE("wFormatTag=%04X !\n", pwfx->wFormatTag); TRACE("nChannels=%d\n", pwfx->nChannels); - TRACE("nSamplesPerSec=%d\n", pwfx->nSamplesPerSec); - TRACE("nAvgBytesPerSec=%d\n", pwfx->nAvgBytesPerSec); + TRACE("nSamplesPerSec=%ld\n", pwfx->nSamplesPerSec); + TRACE("nAvgBytesPerSec=%ld\n", pwfx->nAvgBytesPerSec); TRACE("nBlockAlign=%d\n", pwfx->nBlockAlign); TRACE("wBitsPerSample=%u !\n", pwfx->wBitsPerSample); if (r >= sizeof(WAVEFORMATEX)) @@ -316,7 +316,7 @@ static DWORD WAVE_mciReadFmt(WINE_MCIWAVE* wmw, const MMCKINFO* pckMainRIFF) TRACE("can't find data chunk\n"); return MCIERR_INVALID_FILE; } - TRACE("Chunk Found ckid=%.4s fccType=%.4s cksize=%08X\n", + TRACE("Chunk Found ckid=%.4s fccType=%.4s cksize=%08lX\n", (LPSTR)&wmw->ckWaveData.ckid, (LPSTR)&wmw->ckWaveData.fccType, wmw->ckWaveData.cksize); return 0; } @@ -376,7 +376,7 @@ static DWORD WAVE_mciCreateRIFFSkeleton(WINE_MCIWAVE* wmw) wmw->lpWaveFormat->nSamplesPerSec * wmw->lpWaveFormat->nBlockAlign) { DWORD speed = wmw->lpWaveFormat->nSamplesPerSec * wmw->lpWaveFormat->nBlockAlign; - WARN("Incorrect nAvgBytesPerSec (%d), setting it to %d\n", + WARN("Incorrect nAvgBytesPerSec (%ld), setting it to %ld\n", wmw->lpWaveFormat->nAvgBytesPerSec, speed); wmw->lpWaveFormat->nAvgBytesPerSec = speed; } @@ -491,7 +491,7 @@ static LRESULT WAVE_mciOpenFile(WINE_MCIWAVE* wmw, LPCWSTR filename) if (mmioDescend(wmw->hFile, lpckMainRIFF, NULL, 0) != 0) { dwRet = MCIERR_INVALID_FILE; } else { - TRACE("ParentChunk ckid=%.4s fccType=%.4s cksize=%08X\n", + TRACE("ParentChunk ckid=%.4s fccType=%.4s cksize=%08lX\n", (LPSTR)&(lpckMainRIFF->ckid), (LPSTR) &(lpckMainRIFF->fccType), (lpckMainRIFF->cksize)); @@ -516,7 +516,7 @@ static LRESULT WAVE_mciOpen(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_WAVE_OPEN_P DWORD dwRet = 0; WINE_MCIWAVE* wmw = (WINE_MCIWAVE*)mciGetDriverData(wDevID); - TRACE("(%04X, %08X, %p)\n", wDevID, dwFlags, lpOpenParms); + TRACE("(%04X, %08lX, %p)\n", wDevID, dwFlags, lpOpenParms); if (lpOpenParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -582,7 +582,7 @@ static DWORD WAVE_mciCue(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS { WINE_MCIWAVE* wmw = WAVE_mciGetOpenDev(wDevID); - TRACE("(%u, %08X, %p);\n", wDevID, dwFlags, lpParms); + TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); /* Tests on systems without sound drivers show that Cue, like * Record and Play, opens winmm, returning MCIERR_WAVE_xyPUTSUNSUITABLE. @@ -620,7 +620,7 @@ static DWORD WAVE_mciStop(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS DWORD dwRet = 0; WINE_MCIWAVE* wmw = WAVE_mciGetOpenDev(wDevID); - TRACE("(%u, %08X, %p);\n", wDevID, dwFlags, lpParms); + TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -662,7 +662,7 @@ static DWORD WAVE_mciClose(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARM DWORD dwRet = 0; WINE_MCIWAVE* wmw = WAVE_mciGetOpenDev(wDevID); - TRACE("(%u, %08X, %p);\n", wDevID, dwFlags, lpParms); + TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -709,7 +709,7 @@ static void CALLBACK WAVE_mciPlayCallback(HWAVEOUT hwo, UINT uMsg, break; case WOM_DONE: InterlockedIncrement(&wmw->dwEventCount); - TRACE("Returning waveHdr=%lx\n", dwParam1); + TRACE("Returning waveHdr=%Ix\n", dwParam1); SetEvent(wmw->hEvent); break; default: @@ -747,7 +747,7 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, HANDLE oldcb; int whidx; - TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); + TRACE("(%u, %08IX, %p);\n", wDevID, dwFlags, lpParms); if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -787,7 +787,7 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, } if (wmw->lpWaveFormat->nAvgBytesPerSec != wmw->lpWaveFormat->nSamplesPerSec * wmw->lpWaveFormat->nBlockAlign) { - WARN("Incorrect nAvgBytesPerSec (%d), setting it to %d\n", + WARN("Incorrect nAvgBytesPerSec (%ld), setting it to %ld\n", wmw->lpWaveFormat->nAvgBytesPerSec, wmw->lpWaveFormat->nSamplesPerSec * wmw->lpWaveFormat->nBlockAlign); @@ -823,7 +823,7 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, (DWORD_PTR)lpParms, sizeof(MCI_PLAY_PARMS)); } - TRACE("Playing from byte=%u to byte=%u\n", wmw->dwPosition, end); + TRACE("Playing from byte=%lu to byte=%lu\n", wmw->dwPosition, end); oldcb = InterlockedExchangePointer(&wmw->hCallback, (dwFlags & MCI_NOTIFY) ? HWND_32(LOWORD(lpParms->dwCallback)) : NULL); @@ -845,7 +845,7 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, (DWORD_PTR)WAVE_mciPlayCallback, (DWORD_PTR)wmw, CALLBACK_FUNCTION); if (dwRet != 0) { - TRACE("Can't open low level audio device %d\n", dwRet); + TRACE("Can't open low level audio device %ld\n", dwRet); dwRet = MCIERR_DEVICE_OPEN; wmw->hWave = 0; goto cleanUp; @@ -875,13 +875,13 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, } wmw->dwEventCount = 1L; /* for first buffer */ - TRACE("Playing (normalized) from byte=%u for %u bytes\n", wmw->dwPosition, left); + TRACE("Playing (normalized) from byte=%lu for %lu bytes\n", wmw->dwPosition, left); if (hEvent) SetEvent(hEvent); /* FIXME: this doesn't work if wmw->dwPosition != 0 */ while (left > 0 && wmw->dwStatus != MCI_MODE_STOP && wmw->dwStatus != MCI_MODE_NOT_READY) { count = mmioRead(wmw->hFile, waveHdr[whidx].lpData, min(bufsize, left)); - TRACE("mmioRead bufsize=%d count=%d\n", bufsize, count); + TRACE("mmioRead bufsize=%ld count=%ld\n", bufsize, count); if (count < 1) break; /* count is always <= bufsize, so this is correct regarding the @@ -889,17 +889,17 @@ static DWORD WAVE_mciPlay(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt, */ waveHdr[whidx].dwBufferLength = count; waveHdr[whidx].dwFlags &= ~WHDR_DONE; - TRACE("before WODM_WRITE lpWaveHdr=%p dwBufferLength=%u\n", + TRACE("before WODM_WRITE lpWaveHdr=%p dwBufferLength=%lu\n", &waveHdr[whidx], waveHdr[whidx].dwBufferLength); dwRet = waveOutWrite(wmw->hWave, &waveHdr[whidx], sizeof(WAVEHDR)); if (dwRet) { - ERR("Aborting play loop, WODM_WRITE error %d\n", dwRet); + ERR("Aborting play loop, WODM_WRITE error %ld\n", dwRet); dwRet = MCIERR_HARDWARE; break; } left -= count; wmw->dwPosition += count; - TRACE("after WODM_WRITE dwPosition=%u\n", wmw->dwPosition); + TRACE("after WODM_WRITE dwPosition=%lu\n", wmw->dwPosition); /* InterlockedDecrement if and only if waveOutWrite is successful */ WAVE_mciPlayWaitDone(wmw); whidx ^= 1; @@ -968,7 +968,7 @@ static void CALLBACK WAVE_mciRecordCallback(HWAVEOUT hwo, UINT uMsg, buffers that are outstanding. Queueing up more sometimes causes waveInClose to fail. */ waveInAddBuffer(wmw->hWave, lpWaveHdr, sizeof(*lpWaveHdr)); - TRACE("after mmioWrite dwPosition=%u\n", wmw->dwPosition); + TRACE("after mmioWrite dwPosition=%lu\n", wmw->dwPosition); } SetEvent(wmw->hEvent); @@ -1007,7 +1007,7 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt WINE_MCIWAVE* wmw = WAVE_mciGetOpenDev(wDevID); HANDLE oldcb; - TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); + TRACE("(%u, %08IX, %p);\n", wDevID, dwFlags, lpParms); if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@ -1059,7 +1059,7 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt } if (end==wmw->dwPosition) return MMSYSERR_NOERROR; /* FIXME: NOTIFY */ - TRACE("Recording from byte=%u to byte=%u\n", wmw->dwPosition, end); + TRACE("Recording from byte=%lu to byte=%lu\n", wmw->dwPosition, end); oldcb = InterlockedExchangePointer(&wmw->hCallback, (dwFlags & MCI_NOTIFY) ? HWND_32(LOWORD(lpParms->dwCallback)) : NULL); @@ -1083,7 +1083,7 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt (DWORD_PTR)WAVE_mciRecordCallback, (DWORD_PTR)wmw, CALLBACK_FUNCTION); if (dwRet != MMSYSERR_NOERROR) { - TRACE("Can't open low level audio device %d\n", dwRet); + TRACE("Can't open low level audio device %ld\n", dwRet); dwRet = MCIERR_DEVICE_OPEN; wmw->hWave = 0; goto cleanUp; @@ -1115,7 +1115,7 @@ static DWORD WAVE_mciRecord(MCIDEVICEID wDevID, DWORD_PTR dwFlags, DWORD_PTR pmt wmw->hEvent = CreateEventW(NULL, FALSE, FALSE, NULL); wmw->dwEventCount = 1L; /* for first buffer */ - TRACE("Recording (normalized) from byte=%u for %u bytes\n", wmw->dwPosition, end - wmw->dwPosition); + TRACE("Recording (normalized) from byte=%lu for %lu bytes\n", wmw->dwPosition, end - wmw->dwPosition); waveInStart(wmw->hWave); @@ -1168,7 +1168,7 @@ static DWORD WAVE_mciPause(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARM DWORD dwRet; WINE_MCIWAVE* wmw = WAVE_mciGetOpenDev(wDevID); - TRACE("(%u, %08X, %p);\n", wDevID, dwFlags, lpParms); + TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -1177,7 +1177,7 @@ static DWORD WAVE_mciPause(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARM dwRet = waveOutPause(wmw->hWave); if (dwRet==MMSYSERR_NOERROR) wmw->dwStatus = MCI_MODE_PAUSE; else { /* When playthread was not started yet, winmm not opened, error 5 MMSYSERR_INVALHANDLE */ - ERR("waveOutPause error %d\n",dwRet); + ERR("waveOutPause error %ld\n",dwRet); dwRet = MCIERR_INTERNAL; } break; @@ -1185,7 +1185,7 @@ static DWORD WAVE_mciPause(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PARM dwRet = waveInStop(wmw->hWave); if (dwRet==MMSYSERR_NOERROR) wmw->dwStatus = MCI_MODE_PAUSE; else { - ERR("waveInStop error %d\n",dwRet); + ERR("waveInStop error %ld\n",dwRet); dwRet = MCIERR_INTERNAL; } break; @@ -1208,7 +1208,7 @@ static DWORD WAVE_mciResume(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PAR WINE_MCIWAVE* wmw = WAVE_mciGetOpenDev(wDevID); DWORD dwRet; - TRACE("(%u, %08X, %p);\n", wDevID, dwFlags, lpParms); + TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -1219,14 +1219,14 @@ static DWORD WAVE_mciResume(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_GENERIC_PAR dwRet = waveInStart(wmw->hWave); if (dwRet==MMSYSERR_NOERROR) wmw->dwStatus = MCI_MODE_RECORD; else { - ERR("waveInStart error %d\n",dwRet); + ERR("waveInStart error %ld\n",dwRet); dwRet = MCIERR_INTERNAL; } } else { dwRet = waveOutRestart(wmw->hWave); if (dwRet==MMSYSERR_NOERROR) wmw->dwStatus = MCI_MODE_PLAY; else { - ERR("waveOutRestart error %d\n",dwRet); + ERR("waveOutRestart error %ld\n",dwRet); dwRet = MCIERR_INTERNAL; } } @@ -1251,7 +1251,7 @@ static DWORD WAVE_mciSeek(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lp WINE_MCIWAVE* wmw = WAVE_mciGetOpenDev(wDevID); DWORD position, dwRet; - TRACE("(%04X, %08X, %p);\n", wDevID, dwFlags, lpParms); + TRACE("(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -1279,7 +1279,7 @@ static DWORD WAVE_mciSeek(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lp position *= wmw->lpWaveFormat->nBlockAlign; } wmw->dwPosition = position; - TRACE("Seeking to position=%u bytes\n", position); + TRACE("Seeking to position=%lu bytes\n", position); if (dwFlags & MCI_NOTIFY) WAVE_mciNotify(lpParms->dwCallback, wmw, MCI_NOTIFY_SUCCESSFUL); @@ -1294,7 +1294,7 @@ static DWORD WAVE_mciSet(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_WAVE_SET_PARMS { WINE_MCIWAVE* wmw = WAVE_mciGetOpenDev(wDevID); - TRACE("(%u, %08X, %p);\n", wDevID, dwFlags, lpParms); + TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -1314,7 +1314,7 @@ static DWORD WAVE_mciSet(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_WAVE_SET_PARMS wmw->dwMciTimeFormat = MCI_FORMAT_SAMPLES; break; default: - WARN("Bad time format %u!\n", lpParms->dwTimeFormat); + WARN("Bad time format %lu!\n", lpParms->dwTimeFormat); return MCIERR_BAD_TIME_FORMAT; } } @@ -1345,7 +1345,7 @@ static DWORD WAVE_mciSet(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_WAVE_SET_PARMS case MCI_SET_AUDIO_ALL: TRACE("MCI_SET_AUDIO_ALL !\n"); break; case MCI_SET_AUDIO_LEFT: TRACE("MCI_SET_AUDIO_LEFT !\n"); break; case MCI_SET_AUDIO_RIGHT: TRACE("MCI_SET_AUDIO_RIGHT !\n"); break; - default: WARN("Unknown audio channel %u\n", lpParms->dwAudio); break; + default: WARN("Unknown audio channel %lu\n", lpParms->dwAudio); break; } } if (dwFlags & MCI_WAVE_INPUT) { @@ -1386,7 +1386,7 @@ static DWORD WAVE_mciSet(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_WAVE_SET_PARMS if (dwFlags & MCI_WAVE_SET_AVGBYTESPERSEC) { if (wmw->lpWaveFormat != &wmw->wfxRef) return MCIERR_NONAPPLICABLE_FUNCTION; wmw->wfxRef.nAvgBytesPerSec = lpParms->nAvgBytesPerSec; - TRACE("MCI_WAVE_SET_AVGBYTESPERSEC = %d\n", wmw->wfxRef.nAvgBytesPerSec); + TRACE("MCI_WAVE_SET_AVGBYTESPERSEC = %ld\n", wmw->wfxRef.nAvgBytesPerSec); } if (dwFlags & MCI_WAVE_SET_BITSPERSAMPLE) { if (wmw->lpWaveFormat != &wmw->wfxRef) return MCIERR_NONAPPLICABLE_FUNCTION; @@ -1406,7 +1406,7 @@ static DWORD WAVE_mciSet(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_WAVE_SET_PARMS if (dwFlags & MCI_WAVE_SET_SAMPLESPERSEC) { if (wmw->lpWaveFormat != &wmw->wfxRef) return MCIERR_NONAPPLICABLE_FUNCTION; wmw->wfxRef.nSamplesPerSec = lpParms->nSamplesPerSec; - TRACE("MCI_WAVE_SET_SAMPLESPERSEC = %d\n", wmw->wfxRef.nSamplesPerSec); + TRACE("MCI_WAVE_SET_SAMPLESPERSEC = %ld\n", wmw->wfxRef.nSamplesPerSec); } if (dwFlags & MCI_NOTIFY) WAVE_mciNotify(lpParms->dwCallback, wmw, MCI_NOTIFY_SUCCESSFUL); @@ -1421,7 +1421,7 @@ static DWORD WAVE_mciSave(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_SAVE_PARMSW l WINE_MCIWAVE* wmw = WAVE_mciGetOpenDev(wDevID); DWORD ret = MCIERR_FILE_NOT_SAVED, tmpRet; - TRACE("%d, %08X, %p);\n", wDevID, dwFlags, lpParms); + TRACE("%d, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -1473,7 +1473,7 @@ static DWORD WAVE_mciStatus(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_STATUS_PARM WINE_MCIWAVE* wmw = WAVE_mciGetOpenDev(wDevID); DWORD ret = 0; - TRACE("(%u, %08X, %p);\n", wDevID, dwFlags, lpParms); + TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; if (!(dwFlags & MCI_STATUS_ITEM)) return MCIERR_MISSING_PARAMETER; @@ -1482,7 +1482,7 @@ static DWORD WAVE_mciStatus(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_STATUS_PARM switch (lpParms->dwItem) { case MCI_STATUS_CURRENT_TRACK: lpParms->dwReturn = 1; - TRACE("MCI_STATUS_CURRENT_TRACK => %lu\n", lpParms->dwReturn); + TRACE("MCI_STATUS_CURRENT_TRACK => %Iu\n", lpParms->dwReturn); break; case MCI_STATUS_LENGTH: if (!wmw->hFile) { @@ -1491,7 +1491,7 @@ static DWORD WAVE_mciStatus(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_STATUS_PARM } /* only one track in file is currently handled, so don't take care of MCI_TRACK flag */ lpParms->dwReturn = WAVE_ConvertByteToTimeFormat(wmw, wmw->ckWaveData.cksize); - TRACE("MCI_STATUS_LENGTH => %lu\n", lpParms->dwReturn); + TRACE("MCI_STATUS_LENGTH => %Iu\n", lpParms->dwReturn); break; case MCI_STATUS_MODE: TRACE("MCI_STATUS_MODE => %u\n", wmw->dwStatus); @@ -1506,7 +1506,7 @@ static DWORD WAVE_mciStatus(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_STATUS_PARM case MCI_STATUS_NUMBER_OF_TRACKS: /* only one track in file is currently handled, so don't take care of MCI_TRACK flag */ lpParms->dwReturn = 1; - TRACE("MCI_STATUS_NUMBER_OF_TRACKS => %lu\n", lpParms->dwReturn); + TRACE("MCI_STATUS_NUMBER_OF_TRACKS => %Iu\n", lpParms->dwReturn); break; case MCI_STATUS_POSITION: if (!wmw->hFile) { @@ -1516,7 +1516,7 @@ static DWORD WAVE_mciStatus(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_STATUS_PARM /* only one track in file is currently handled, so don't take care of MCI_TRACK flag */ lpParms->dwReturn = WAVE_ConvertByteToTimeFormat(wmw, (dwFlags & MCI_STATUS_START) ? 0 : wmw->dwPosition); - TRACE("MCI_STATUS_POSITION %s => %lu\n", + TRACE("MCI_STATUS_POSITION %s => %Iu\n", (dwFlags & MCI_STATUS_START) ? "start" : "current", lpParms->dwReturn); break; case MCI_STATUS_READY: @@ -1527,7 +1527,7 @@ static DWORD WAVE_mciStatus(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_STATUS_PARM break; case MCI_STATUS_TIME_FORMAT: lpParms->dwReturn = MAKEMCIRESOURCE(wmw->dwMciTimeFormat, MCI_FORMAT_RETURN_BASE + wmw->dwMciTimeFormat); - TRACE("MCI_STATUS_TIME_FORMAT => %lu\n", lpParms->dwReturn); + TRACE("MCI_STATUS_TIME_FORMAT => %Iu\n", lpParms->dwReturn); ret = MCI_RESOURCE_RETURNED; break; case MCI_WAVE_INPUT: @@ -1557,34 +1557,34 @@ static DWORD WAVE_mciStatus(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_STATUS_PARM lpParms->dwReturn = MAKEMCIRESOURCE(WAVE_FORMAT_PCM, WAVE_FORMAT_PCM_S); ret = MCI_RESOURCE_RETURNED; } - TRACE("MCI_WAVE_FORMATTAG => %lu\n", lpParms->dwReturn); + TRACE("MCI_WAVE_FORMATTAG => %Iu\n", lpParms->dwReturn); break; case MCI_WAVE_STATUS_AVGBYTESPERSEC: lpParms->dwReturn = wmw->lpWaveFormat->nAvgBytesPerSec; - TRACE("MCI_WAVE_STATUS_AVGBYTESPERSEC => %lu\n", lpParms->dwReturn); + TRACE("MCI_WAVE_STATUS_AVGBYTESPERSEC => %Iu\n", lpParms->dwReturn); break; case MCI_WAVE_STATUS_BITSPERSAMPLE: lpParms->dwReturn = wmw->lpWaveFormat->wBitsPerSample; - TRACE("MCI_WAVE_STATUS_BITSPERSAMPLE => %lu\n", lpParms->dwReturn); + TRACE("MCI_WAVE_STATUS_BITSPERSAMPLE => %Iu\n", lpParms->dwReturn); break; case MCI_WAVE_STATUS_BLOCKALIGN: lpParms->dwReturn = wmw->lpWaveFormat->nBlockAlign; - TRACE("MCI_WAVE_STATUS_BLOCKALIGN => %lu\n", lpParms->dwReturn); + TRACE("MCI_WAVE_STATUS_BLOCKALIGN => %Iu\n", lpParms->dwReturn); break; case MCI_WAVE_STATUS_CHANNELS: lpParms->dwReturn = wmw->lpWaveFormat->nChannels; - TRACE("MCI_WAVE_STATUS_CHANNELS => %lu\n", lpParms->dwReturn); + TRACE("MCI_WAVE_STATUS_CHANNELS => %Iu\n", lpParms->dwReturn); break; case MCI_WAVE_STATUS_SAMPLESPERSEC: lpParms->dwReturn = wmw->lpWaveFormat->nSamplesPerSec; - TRACE("MCI_WAVE_STATUS_SAMPLESPERSEC => %lu\n", lpParms->dwReturn); + TRACE("MCI_WAVE_STATUS_SAMPLESPERSEC => %Iu\n", lpParms->dwReturn); break; case MCI_WAVE_STATUS_LEVEL: TRACE("MCI_WAVE_STATUS_LEVEL !\n"); lpParms->dwReturn = 0xAAAA5555; break; default: - WARN("unknown command %08X !\n", lpParms->dwItem); + WARN("unknown command %08lX !\n", lpParms->dwItem); return MCIERR_UNSUPPORTED_FUNCTION; } } @@ -1602,7 +1602,7 @@ static DWORD WAVE_mciGetDevCaps(MCIDEVICEID wDevID, DWORD dwFlags, WINE_MCIWAVE* wmw = WAVE_mciGetOpenDev(wDevID); DWORD ret = 0; - TRACE("(%u, %08X, %p);\n", wDevID, dwFlags, lpParms); + TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; if (wmw == NULL) return MCIERR_INVALID_DEVICE_ID; @@ -1652,7 +1652,7 @@ static DWORD WAVE_mciGetDevCaps(MCIDEVICEID wDevID, DWORD dwFlags, lpParms->dwReturn = waveOutGetNumDevs(); break; default: - FIXME("Unknown capability (%08x) !\n", lpParms->dwItem); + FIXME("Unknown capability (%08lx) !\n", lpParms->dwItem); return MCIERR_UNRECOGNIZED_COMMAND; } } else { @@ -1673,12 +1673,12 @@ static DWORD WAVE_mciInfo(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW l LPCWSTR str = 0; WINE_MCIWAVE* wmw = WAVE_mciGetOpenDev(wDevID); - TRACE("(%u, %08X, %p);\n", wDevID, dwFlags, lpParms); + TRACE("(%u, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (!lpParms || !lpParms->lpstrReturn) return MCIERR_NULL_PARAMETER_BLOCK; - TRACE("buf=%p, len=%u\n", lpParms->lpstrReturn, lpParms->dwRetSize); + TRACE("buf=%p, len=%lu\n", lpParms->lpstrReturn, lpParms->dwRetSize); if (wmw == NULL) { ret = MCIERR_INVALID_DEVICE_ID; @@ -1689,7 +1689,7 @@ static DWORD WAVE_mciInfo(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW l case MCI_WAVE_INPUT: str = L"Wine Wave In"; break; case MCI_WAVE_OUTPUT: str = L"Wine Wave Out"; break; default: - WARN("Don't know this info command (%u)\n", dwFlags); + WARN("Don't know this info command (%lu)\n", dwFlags); ret = MCIERR_UNRECOGNIZED_KEYWORD; } } @@ -1711,7 +1711,7 @@ static DWORD WAVE_mciInfo(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_INFO_PARMSW l LRESULT CALLBACK MCIWAVE_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2) { - TRACE("(%08lX, %p, %08X, %08lX, %08lX)\n", + TRACE("(%08IX, %p, %08X, %08IX, %08IX)\n", dwDevID, hDriv, wMsg, dwParam1, dwParam2); switch (wMsg) {
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mfplat/Makefile.in | 1 dlls/mfplat/buffer.c | 28 ++++---- dlls/mfplat/main.c | 144 +++++++++++++++++++++--------------------- dlls/mfplat/mediatype.c | 36 +++++------ dlls/mfplat/mfplat_private.h | 4 + dlls/mfplat/queue.c | 8 +- dlls/mfplat/sample.c | 26 ++++---- 7 files changed, 123 insertions(+), 124 deletions(-) diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in index f4ef8e5649c..4515d652c58 100644 --- a/dlls/mfplat/Makefile.in +++ b/dlls/mfplat/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mfplat.dll IMPORTLIB = mfplat IMPORTS = advapi32 ole32 mfuuid propsys rtworkq kernelbase diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index e9990f85853..a912c61a3ac 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -146,7 +146,7 @@ static ULONG WINAPI memory_buffer_AddRef(IMFMediaBuffer *iface) struct buffer *buffer = impl_from_IMFMediaBuffer(iface); ULONG refcount = InterlockedIncrement(&buffer->refcount); - TRACE("%p, refcount %u.\n", buffer, refcount); + TRACE("%p, refcount %lu.\n", buffer, refcount); return refcount; } @@ -156,7 +156,7 @@ static ULONG WINAPI memory_buffer_Release(IMFMediaBuffer *iface) struct buffer *buffer = impl_from_IMFMediaBuffer(iface); ULONG refcount = InterlockedDecrement(&buffer->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -221,7 +221,7 @@ static HRESULT WINAPI memory_buffer_SetCurrentLength(IMFMediaBuffer *iface, DWOR { struct buffer *buffer = impl_from_IMFMediaBuffer(iface); - TRACE("%p, %u.\n", iface, current_length); + TRACE("%p, %lu.\n", iface, current_length); if (current_length > buffer->max_length) return E_INVALIDARG; @@ -443,7 +443,7 @@ static HRESULT WINAPI d3d9_surface_buffer_SetCurrentLength(IMFMediaBuffer *iface { struct buffer *buffer = impl_from_IMFMediaBuffer(iface); - TRACE("%p, %u.\n", iface, current_length); + TRACE("%p, %lu.\n", iface, current_length); buffer->current_length = current_length; @@ -595,14 +595,14 @@ static HRESULT WINAPI memory_2d_buffer_GetContiguousLength(IMF2DBuffer2 *iface, static HRESULT WINAPI memory_2d_buffer_ContiguousCopyTo(IMF2DBuffer2 *iface, BYTE *dest_buffer, DWORD dest_length) { - FIXME("%p, %p, %u.\n", iface, dest_buffer, dest_length); + FIXME("%p, %p, %lu.\n", iface, dest_buffer, dest_length); return E_NOTIMPL; } static HRESULT WINAPI memory_2d_buffer_ContiguousCopyFrom(IMF2DBuffer2 *iface, const BYTE *src_buffer, DWORD src_length) { - FIXME("%p, %p, %u.\n", iface, src_buffer, src_length); + FIXME("%p, %p, %lu.\n", iface, src_buffer, src_length); return E_NOTIMPL; } @@ -889,7 +889,7 @@ static HRESULT dxgi_surface_buffer_create_readback_texture(struct buffer *buffer texture_desc.MiscFlags = 0; texture_desc.MipLevels = 1; if (FAILED(hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &buffer->dxgi_surface.rb_texture))) - WARN("Failed to create readback texture, hr %#x.\n", hr); + WARN("Failed to create readback texture, hr %#lx.\n", hr); ID3D11Device_Release(device); @@ -914,7 +914,7 @@ static HRESULT dxgi_surface_buffer_map(struct buffer *buffer) if (FAILED(hr = ID3D11DeviceContext_Map(immediate_context, (ID3D11Resource *)buffer->dxgi_surface.rb_texture, 0, D3D11_MAP_READ_WRITE, 0, &buffer->dxgi_surface.map_desc))) { - WARN("Failed to map readback texture, hr %#x.\n", hr); + WARN("Failed to map readback texture, hr %#lx.\n", hr); } ID3D11DeviceContext_Release(immediate_context); @@ -1016,7 +1016,7 @@ static HRESULT WINAPI dxgi_surface_buffer_SetCurrentLength(IMFMediaBuffer *iface { struct buffer *buffer = impl_from_IMFMediaBuffer(iface); - TRACE("%p, %u.\n", iface, current_length); + TRACE("%p, %lu.\n", iface, current_length); buffer->current_length = current_length; @@ -1438,7 +1438,7 @@ static HRESULT create_dxgi_surface_buffer(IUnknown *surface, unsigned int sub_re if (FAILED(hr = IUnknown_QueryInterface(surface, &IID_ID3D11Texture2D, (void **)&texture))) { - WARN("Failed to get texture interface, hr %#x.\n", hr); + WARN("Failed to get texture interface, hr %#lx.\n", hr); return hr; } @@ -1490,7 +1490,7 @@ static HRESULT create_dxgi_surface_buffer(IUnknown *surface, unsigned int sub_re */ HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer) { - TRACE("%u, %p.\n", max_length, buffer); + TRACE("%lu, %p.\n", max_length, buffer); return create_1d_buffer(max_length, MF_1_BYTE_ALIGNMENT, buffer); } @@ -1500,7 +1500,7 @@ HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer) */ HRESULT WINAPI MFCreateAlignedMemoryBuffer(DWORD max_length, DWORD alignment, IMFMediaBuffer **buffer) { - TRACE("%u, %u, %p.\n", max_length, alignment, buffer); + TRACE("%lu, %lu, %p.\n", max_length, alignment, buffer); return create_1d_buffer(max_length, alignment, buffer); } @@ -1510,7 +1510,7 @@ HRESULT WINAPI MFCreateAlignedMemoryBuffer(DWORD max_length, DWORD alignment, IM */ HRESULT WINAPI MFCreate2DMediaBuffer(DWORD width, DWORD height, DWORD fourcc, BOOL bottom_up, IMFMediaBuffer **buffer) { - TRACE("%u, %u, %s, %d, %p.\n", width, height, debugstr_fourcc(fourcc), bottom_up, buffer); + TRACE("%lu, %lu, %s, %d, %p.\n", width, height, debugstr_fourcc(fourcc), bottom_up, buffer); return create_2d_buffer(width, height, fourcc, bottom_up, buffer); } @@ -1558,7 +1558,7 @@ HRESULT WINAPI MFCreateMediaBufferFromMediaType(IMFMediaType *media_type, LONGLO HRESULT hr; GUID major; - TRACE("%p, %s, %u, %u, %p.\n", media_type, debugstr_time(duration), min_length, alignment, buffer); + TRACE("%p, %s, %lu, %lu, %p.\n", media_type, debugstr_time(duration), min_length, alignment, buffer); if (!media_type) return E_INVALIDARG; diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 72dd0915447..1992776595d 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -180,7 +180,7 @@ static ULONG WINAPI transform_activate_AddRef(IMFActivate *iface) struct transform_activate *activate = impl_from_IMFActivate(iface); ULONG refcount = InterlockedIncrement(&activate->attributes.ref); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -190,7 +190,7 @@ static ULONG WINAPI transform_activate_Release(IMFActivate *iface) struct transform_activate *activate = impl_from_IMFActivate(iface); ULONG refcount = InterlockedDecrement(&activate->attributes.ref); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -1193,7 +1193,7 @@ static HRESULT mft_enum(GUID category, UINT32 flags, const MFT_REGISTER_TYPE_INF if (FAILED(hr = MFGetPluginControl(&plugin_control))) { - WARN("Failed to get plugin control instance, hr %#x.\n", hr); + WARN("Failed to get plugin control instance, hr %#lx.\n", hr); return hr; } @@ -1516,7 +1516,7 @@ static HRESULT mft_get_attributes(HKEY hkey, IMFAttributes **ret) if (!RegQueryValueExW(hkey, L"Attributes", NULL, NULL, blob, &size)) { if (FAILED(hr = MFInitAttributesFromBlob(attributes, blob, size))) - WARN("Failed to initialize attributes, hr %#x.\n", hr); + WARN("Failed to initialize attributes, hr %#lx.\n", hr); } free(blob); @@ -1588,7 +1588,7 @@ HRESULT WINAPI MFStartup(ULONG version, DWORD flags) #define MF_VERSION_XP MAKELONG( MF_API_VERSION, 1 ) #define MF_VERSION_WIN7 MAKELONG( MF_API_VERSION, 2 ) - TRACE("%#x, %#x.\n", version, flags); + TRACE("%#lx, %#lx.\n", version, flags); if (version != MF_VERSION_XP && version != MF_VERSION_WIN7) return MF_E_BAD_STARTUP_VERSION; @@ -1615,7 +1615,7 @@ HRESULT WINAPI MFShutdown(void) */ HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG srcstride, DWORD width, DWORD lines) { - TRACE("%p, %d, %p, %d, %u, %u.\n", dest, deststride, src, srcstride, width, lines); + TRACE("%p, %ld, %p, %ld, %lu, %lu.\n", dest, deststride, src, srcstride, width, lines); while (lines--) { @@ -2309,7 +2309,7 @@ static const char *debugstr_eventid(DWORD event) }; struct event_id *ret = bsearch(&event, event_ids, ARRAY_SIZE(event_ids), sizeof(*event_ids), debug_event_id); - return ret ? wine_dbg_sprintf("%s", ret->name) : wine_dbg_sprintf("%u", event); + return ret ? wine_dbg_sprintf("%s", ret->name) : wine_dbg_sprintf("%lu", event); } static inline struct attributes *impl_from_IMFAttributes(IMFAttributes *iface) @@ -2339,7 +2339,7 @@ static ULONG WINAPI mfattributes_AddRef(IMFAttributes *iface) struct attributes *attributes = impl_from_IMFAttributes(iface); ULONG refcount = InterlockedIncrement(&attributes->ref); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); return refcount; } @@ -2349,7 +2349,7 @@ static ULONG WINAPI mfattributes_Release(IMFAttributes *iface) struct attributes *attributes = impl_from_IMFAttributes(iface); ULONG refcount = InterlockedDecrement(&attributes->ref); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); if (!refcount) { @@ -3727,7 +3727,7 @@ static ULONG WINAPI async_stream_op_AddRef(IUnknown *iface) struct async_stream_op *op = impl_async_stream_op_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&op->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); return refcount; } @@ -3737,7 +3737,7 @@ static ULONG WINAPI async_stream_op_Release(IUnknown *iface) struct async_stream_op *op = impl_async_stream_op_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&op->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); if (!refcount) { @@ -3899,7 +3899,7 @@ static ULONG WINAPI bytestream_AddRef(IMFByteStream *iface) struct bytestream *stream = impl_from_IMFByteStream(iface); ULONG refcount = InterlockedIncrement(&stream->attributes.ref); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); return refcount; } @@ -3910,7 +3910,7 @@ static ULONG WINAPI bytestream_Release(IMFByteStream *iface) ULONG refcount = InterlockedDecrement(&stream->attributes.ref); struct async_stream_op *cur, *cur2; - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); if (!refcount) { @@ -4027,7 +4027,7 @@ static HRESULT WINAPI bytestream_file_Read(IMFByteStream *iface, BYTE *buffer, U HRESULT hr = S_OK; BOOL ret; - TRACE("%p, %p, %u, %p.\n", iface, buffer, size, read_len); + TRACE("%p, %p, %lu, %p.\n", iface, buffer, size, read_len); EnterCriticalSection(&stream->cs); @@ -4051,7 +4051,7 @@ static HRESULT WINAPI bytestream_BeginRead(IMFByteStream *iface, BYTE *data, ULO { struct bytestream *stream = impl_from_IMFByteStream(iface); - TRACE("%p, %p, %u, %p, %p.\n", iface, data, size, callback, state); + TRACE("%p, %p, %lu, %p, %p.\n", iface, data, size, callback, state); return bytestream_create_io_request(stream, ASYNC_STREAM_OP_READ, data, size, callback, state); } @@ -4067,7 +4067,7 @@ static HRESULT WINAPI bytestream_EndRead(IMFByteStream *iface, IMFAsyncResult *r static HRESULT WINAPI bytestream_Write(IMFByteStream *iface, const BYTE *data, ULONG count, ULONG *written) { - FIXME("%p, %p, %u, %p\n", iface, data, count, written); + FIXME("%p, %p, %lu, %p\n", iface, data, count, written); return E_NOTIMPL; } @@ -4077,7 +4077,7 @@ static HRESULT WINAPI bytestream_BeginWrite(IMFByteStream *iface, const BYTE *da { struct bytestream *stream = impl_from_IMFByteStream(iface); - TRACE("%p, %p, %u, %p, %p.\n", iface, data, size, callback, state); + TRACE("%p, %p, %lu, %p, %p.\n", iface, data, size, callback, state); return bytestream_create_io_request(stream, ASYNC_STREAM_OP_WRITE, data, size, callback, state); } @@ -4094,7 +4094,7 @@ static HRESULT WINAPI bytestream_EndWrite(IMFByteStream *iface, IMFAsyncResult * static HRESULT WINAPI bytestream_Seek(IMFByteStream *iface, MFBYTESTREAM_SEEK_ORIGIN seek, LONGLONG offset, DWORD flags, QWORD *current) { - FIXME("%p, %u, %s, 0x%08x, %p\n", iface, seek, wine_dbgstr_longlong(offset), flags, current); + FIXME("%p, %u, %s, 0x%08lx, %p\n", iface, seek, wine_dbgstr_longlong(offset), flags, current); return E_NOTIMPL; } @@ -4217,7 +4217,7 @@ static HRESULT WINAPI bytestream_stream_Read(IMFByteStream *iface, BYTE *buffer, LARGE_INTEGER position; HRESULT hr; - TRACE("%p, %p, %u, %p.\n", iface, buffer, size, read_len); + TRACE("%p, %p, %lu, %p.\n", iface, buffer, size, read_len); EnterCriticalSection(&stream->cs); @@ -4239,7 +4239,7 @@ static HRESULT WINAPI bytestream_stream_Write(IMFByteStream *iface, const BYTE * LARGE_INTEGER position; HRESULT hr; - TRACE("%p, %p, %u, %p.\n", iface, buffer, size, written); + TRACE("%p, %p, %lu, %p.\n", iface, buffer, size, written); EnterCriticalSection(&stream->cs); @@ -4261,7 +4261,7 @@ static HRESULT WINAPI bytestream_stream_Seek(IMFByteStream *iface, MFBYTESTREAM_ struct bytestream *stream = impl_from_IMFByteStream(iface); HRESULT hr = S_OK; - TRACE("%p, %u, %s, %#x, %p.\n", iface, origin, wine_dbgstr_longlong(offset), flags, current); + TRACE("%p, %u, %s, %#lx, %p.\n", iface, origin, wine_dbgstr_longlong(offset), flags, current); EnterCriticalSection(&stream->cs); @@ -4831,7 +4831,7 @@ static ULONG WINAPI bytestream_wrapper_AddRef(IMFByteStream *iface) struct bytestream_wrapper *wrapper = impl_wrapper_from_IMFByteStream(iface); ULONG refcount = InterlockedIncrement(&wrapper->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); return refcount; } @@ -4841,7 +4841,7 @@ static ULONG WINAPI bytestream_wrapper_Release(IMFByteStream *iface) struct bytestream_wrapper *wrapper = impl_wrapper_from_IMFByteStream(iface); ULONG refcount = InterlockedDecrement(&wrapper->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); if (!refcount) { @@ -4939,7 +4939,7 @@ static HRESULT WINAPI bytestream_wrapper_Read(IMFByteStream *iface, BYTE *data, { struct bytestream_wrapper *wrapper = impl_wrapper_from_IMFByteStream(iface); - TRACE("%p, %p, %u, %p.\n", iface, data, count, byte_read); + TRACE("%p, %p, %lu, %p.\n", iface, data, count, byte_read); return wrapper->is_closed ? MF_E_INVALIDREQUEST : IMFByteStream_Read(wrapper->stream, data, count, byte_read); @@ -4950,7 +4950,7 @@ static HRESULT WINAPI bytestream_wrapper_BeginRead(IMFByteStream *iface, BYTE *d { struct bytestream_wrapper *wrapper = impl_wrapper_from_IMFByteStream(iface); - TRACE("%p, %p, %u, %p, %p.\n", iface, data, size, callback, state); + TRACE("%p, %p, %lu, %p, %p.\n", iface, data, size, callback, state); return wrapper->is_closed ? MF_E_INVALIDREQUEST : IMFByteStream_BeginRead(wrapper->stream, data, size, callback, state); @@ -4970,7 +4970,7 @@ static HRESULT WINAPI bytestream_wrapper_Write(IMFByteStream *iface, const BYTE { struct bytestream_wrapper *wrapper = impl_wrapper_from_IMFByteStream(iface); - TRACE("%p, %p, %u, %p.\n", iface, data, count, written); + TRACE("%p, %p, %lu, %p.\n", iface, data, count, written); return wrapper->is_closed ? MF_E_INVALIDREQUEST : IMFByteStream_Write(wrapper->stream, data, count, written); @@ -4981,7 +4981,7 @@ static HRESULT WINAPI bytestream_wrapper_BeginWrite(IMFByteStream *iface, const { struct bytestream_wrapper *wrapper = impl_wrapper_from_IMFByteStream(iface); - TRACE("%p, %p, %u, %p, %p.\n", iface, data, size, callback, state); + TRACE("%p, %p, %lu, %p, %p.\n", iface, data, size, callback, state); return wrapper->is_closed ? MF_E_INVALIDREQUEST : IMFByteStream_BeginWrite(wrapper->stream, data, size, callback, state); @@ -5002,7 +5002,7 @@ static HRESULT WINAPI bytestream_wrapper_Seek(IMFByteStream *iface, MFBYTESTREAM { struct bytestream_wrapper *wrapper = impl_wrapper_from_IMFByteStream(iface); - TRACE("%p, %u, %s, %#x, %p.\n", iface, seek, wine_dbgstr_longlong(offset), flags, current); + TRACE("%p, %u, %s, %#lx, %p.\n", iface, seek, wine_dbgstr_longlong(offset), flags, current); return wrapper->is_closed ? MF_E_INVALIDREQUEST : IMFByteStream_Seek(wrapper->stream, seek, offset, flags, current); @@ -5223,7 +5223,7 @@ static HRESULT WINAPI bytestream_wrapper_events_GetEvent(IMFMediaEventGenerator { struct bytestream_wrapper *wrapper = impl_wrapper_from_IMFMediaEventGenerator(iface); - TRACE("%p, %#x, %p.\n", iface, flags, event); + TRACE("%p, %#lx, %p.\n", iface, flags, event); return IMFMediaEventGenerator_GetEvent(wrapper->event_generator, flags, event); } @@ -5251,7 +5251,7 @@ static HRESULT WINAPI bytestream_wrapper_events_QueueEvent(IMFMediaEventGenerato { struct bytestream_wrapper *wrapper = impl_wrapper_from_IMFMediaEventGenerator(iface); - TRACE("%p, %d, %s, %#x, %s.\n", iface, type, debugstr_guid(ext_type), hr, debugstr_propvar(value)); + TRACE("%p, %ld, %s, %#lx, %s.\n", iface, type, debugstr_guid(ext_type), hr, debugstr_propvar(value)); return IMFMediaEventGenerator_QueueEvent(wrapper->event_generator, type, ext_type, hr, value); } @@ -5354,7 +5354,7 @@ static HRESULT WINAPI bytestream_wrapper_propstore_GetAt(IPropertyStore *iface, { struct bytestream_wrapper *wrapper = impl_wrapper_from_IPropertyStore(iface); - TRACE("%p, %u, %p.\n", iface, prop, key); + TRACE("%p, %lu, %p.\n", iface, prop, key); return IPropertyStore_GetAt(wrapper->propstore, prop, key); } @@ -5800,39 +5800,39 @@ static ULONG WINAPI MFPluginControl_Release(IMFPluginControl *iface) static HRESULT WINAPI MFPluginControl_GetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type, const WCHAR *selector, CLSID *clsid) { - FIXME("(%d %s %p)\n", plugin_type, debugstr_w(selector), clsid); + FIXME("(%ld %s %p)\n", plugin_type, debugstr_w(selector), clsid); return E_NOTIMPL; } static HRESULT WINAPI MFPluginControl_GetPreferredClsidByIndex(IMFPluginControl *iface, DWORD plugin_type, DWORD index, WCHAR **selector, CLSID *clsid) { - FIXME("(%d %d %p %p)\n", plugin_type, index, selector, clsid); + FIXME("(%ld %ld %p %p)\n", plugin_type, index, selector, clsid); return E_NOTIMPL; } static HRESULT WINAPI MFPluginControl_SetPreferredClsid(IMFPluginControl *iface, DWORD plugin_type, const WCHAR *selector, const CLSID *clsid) { - FIXME("(%d %s %s)\n", plugin_type, debugstr_w(selector), debugstr_guid(clsid)); + FIXME("(%ld %s %s)\n", plugin_type, debugstr_w(selector), debugstr_guid(clsid)); return E_NOTIMPL; } static HRESULT WINAPI MFPluginControl_IsDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid) { - FIXME("(%d %s)\n", plugin_type, debugstr_guid(clsid)); + FIXME("(%ld %s)\n", plugin_type, debugstr_guid(clsid)); return E_NOTIMPL; } static HRESULT WINAPI MFPluginControl_GetDisabledByIndex(IMFPluginControl *iface, DWORD plugin_type, DWORD index, CLSID *clsid) { - FIXME("(%d %d %p)\n", plugin_type, index, clsid); + FIXME("(%ld %ld %p)\n", plugin_type, index, clsid); return E_NOTIMPL; } static HRESULT WINAPI MFPluginControl_SetDisabled(IMFPluginControl *iface, DWORD plugin_type, REFCLSID clsid, BOOL disabled) { - FIXME("(%d %s %x)\n", plugin_type, debugstr_guid(clsid), disabled); + FIXME("(%ld %s %x)\n", plugin_type, debugstr_guid(clsid), disabled); return E_NOTIMPL; } @@ -6384,7 +6384,7 @@ static HRESULT resolver_create_scheme_handler(const WCHAR *scheme, DWORD flags, HRESULT hr = MF_E_UNSUPPORTED_SCHEME; unsigned int i; - TRACE("%s, %#x, %p.\n", debugstr_w(scheme), flags, handler); + TRACE("%s, %#lx, %p.\n", debugstr_w(scheme), flags, handler); *handler = NULL; @@ -6554,7 +6554,7 @@ static ULONG WINAPI source_resolver_AddRef(IMFSourceResolver *iface) struct source_resolver *resolver = impl_from_IMFSourceResolver(iface); ULONG refcount = InterlockedIncrement(&resolver->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); return refcount; } @@ -6565,7 +6565,7 @@ static ULONG WINAPI source_resolver_Release(IMFSourceResolver *iface) ULONG refcount = InterlockedDecrement(&resolver->refcount); struct resolver_queued_result *result, *result2; - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); if (!refcount) { @@ -6592,7 +6592,7 @@ static HRESULT WINAPI source_resolver_CreateObjectFromURL(IMFSourceResolver *ifa RTWQASYNCRESULT *data; HRESULT hr; - TRACE("%p, %s, %#x, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, obj_type, object); + TRACE("%p, %s, %#lx, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, obj_type, object); if (!url || !obj_type || !object) return E_POINTER; @@ -6633,7 +6633,7 @@ static HRESULT WINAPI source_resolver_CreateObjectFromByteStream(IMFSourceResolv RTWQASYNCRESULT *data; HRESULT hr; - TRACE("%p, %p, %s, %#x, %p, %p, %p.\n", iface, stream, debugstr_w(url), flags, props, obj_type, object); + TRACE("%p, %p, %s, %#lx, %p, %p, %p.\n", iface, stream, debugstr_w(url), flags, props, obj_type, object); if (!stream || !obj_type || !object) return E_POINTER; @@ -6674,7 +6674,7 @@ static HRESULT WINAPI source_resolver_BeginCreateObjectFromURL(IMFSourceResolver IRtwqAsyncResult *result; HRESULT hr; - TRACE("%p, %s, %#x, %p, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, cancel_cookie, callback, state); + TRACE("%p, %s, %#lx, %p, %p, %p, %p.\n", iface, debugstr_w(url), flags, props, cancel_cookie, callback, state); if (FAILED(hr = resolver_get_scheme_handler(url, flags, &handler))) return hr; @@ -6718,7 +6718,7 @@ static HRESULT WINAPI source_resolver_BeginCreateObjectFromByteStream(IMFSourceR IRtwqAsyncResult *result; HRESULT hr; - TRACE("%p, %p, %s, %#x, %p, %p, %p, %p.\n", iface, stream, debugstr_w(url), flags, props, cancel_cookie, + TRACE("%p, %p, %s, %#lx, %p, %p, %p, %p.\n", iface, stream, debugstr_w(url), flags, props, cancel_cookie, callback, state); if (FAILED(hr = resolver_get_bytestream_handler(stream, url, flags, &handler))) @@ -6864,7 +6864,7 @@ static ULONG WINAPI mfmediaevent_AddRef(IMFMediaEvent *iface) struct media_event *event = impl_from_IMFMediaEvent(iface); ULONG refcount = InterlockedIncrement(&event->attributes.ref); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -6874,7 +6874,7 @@ static ULONG WINAPI mfmediaevent_Release(IMFMediaEvent *iface) struct media_event *event = impl_from_IMFMediaEvent(iface); ULONG refcount = InterlockedDecrement(&event->attributes.ref); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -7254,7 +7254,7 @@ HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HR struct media_event *object; HRESULT hr; - TRACE("%s, %s, %#x, %s, %p.\n", debugstr_eventid(type), debugstr_guid(extended_type), status, + TRACE("%s, %s, %#lx, %s, %p.\n", debugstr_eventid(type), debugstr_guid(extended_type), status, debugstr_propvar(value), event); object = malloc(sizeof(*object)); @@ -7363,7 +7363,7 @@ static ULONG WINAPI eventqueue_AddRef(IMFMediaEventQueue *iface) struct event_queue *queue = impl_from_IMFMediaEventQueue(iface); ULONG refcount = InterlockedIncrement(&queue->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -7373,7 +7373,7 @@ static ULONG WINAPI eventqueue_Release(IMFMediaEventQueue *iface) struct event_queue *queue = impl_from_IMFMediaEventQueue(iface); ULONG refcount = InterlockedDecrement(&queue->refcount); - TRACE("%p, refcount %u.\n", queue, refcount); + TRACE("%p, refcount %lu.\n", queue, refcount); if (!refcount) { @@ -7538,7 +7538,7 @@ static HRESULT WINAPI eventqueue_QueueEventParamVar(IMFMediaEventQueue *iface, M IMFMediaEvent *event; HRESULT hr; - TRACE("%p, %s, %s, %#x, %s\n", iface, debugstr_eventid(event_type), debugstr_guid(extended_type), status, + TRACE("%p, %s, %s, %#lx, %s\n", iface, debugstr_eventid(event_type), debugstr_guid(extended_type), status, debugstr_propvar(value)); if (FAILED(hr = MFCreateMediaEvent(event_type, extended_type, status, value, &event))) @@ -7557,7 +7557,7 @@ static HRESULT WINAPI eventqueue_QueueEventParamUnk(IMFMediaEventQueue *iface, M PROPVARIANT value; HRESULT hr; - TRACE("%p, %s, %s, %#x, %p.\n", iface, debugstr_eventid(event_type), debugstr_guid(extended_type), status, unk); + TRACE("%p, %s, %s, %#lx, %p.\n", iface, debugstr_eventid(event_type), debugstr_guid(extended_type), status, unk); value.vt = VT_UNKNOWN; value.punkVal = unk; @@ -7680,7 +7680,7 @@ static ULONG WINAPI collection_AddRef(IMFCollection *iface) struct collection *collection = impl_from_IMFCollection(iface); ULONG refcount = InterlockedIncrement(&collection->refcount); - TRACE("%p, %d.\n", collection, refcount); + TRACE("%p, %ld.\n", collection, refcount); return refcount; } @@ -7690,7 +7690,7 @@ static ULONG WINAPI collection_Release(IMFCollection *iface) struct collection *collection = impl_from_IMFCollection(iface); ULONG refcount = InterlockedDecrement(&collection->refcount); - TRACE("%p, %d.\n", collection, refcount); + TRACE("%p, %ld.\n", collection, refcount); if (!refcount) { @@ -7720,7 +7720,7 @@ static HRESULT WINAPI collection_GetElement(IMFCollection *iface, DWORD idx, IUn { struct collection *collection = impl_from_IMFCollection(iface); - TRACE("%p, %u, %p.\n", iface, idx, element); + TRACE("%p, %lu, %p.\n", iface, idx, element); if (!element) return E_POINTER; @@ -7757,7 +7757,7 @@ static HRESULT WINAPI collection_RemoveElement(IMFCollection *iface, DWORD idx, struct collection *collection = impl_from_IMFCollection(iface); size_t count; - TRACE("%p, %u, %p.\n", iface, idx, element); + TRACE("%p, %lu, %p.\n", iface, idx, element); if (!element) return E_POINTER; @@ -7780,7 +7780,7 @@ static HRESULT WINAPI collection_InsertElementAt(IMFCollection *iface, DWORD idx struct collection *collection = impl_from_IMFCollection(iface); size_t i; - TRACE("%p, %u, %p.\n", iface, idx, element); + TRACE("%p, %lu, %p.\n", iface, idx, element); if (!mf_array_reserve((void **)&collection->elements, &collection->capacity, idx + 1, sizeof(*collection->elements))) @@ -7858,7 +7858,7 @@ HRESULT WINAPI MFCreateCollection(IMFCollection **collection) */ void *WINAPI MFHeapAlloc(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type) { - TRACE("%lu, %#x, %s, %d, %#x.\n", size, flags, debugstr_a(file), line, type); + TRACE("%Iu, %#lx, %s, %d, %#x.\n", size, flags, debugstr_a(file), line, type); return HeapAlloc(GetProcessHeap(), flags, size); } @@ -7903,7 +7903,7 @@ static ULONG WINAPI system_clock_AddRef(IMFClock *iface) struct system_clock *clock = impl_from_IMFClock(iface); ULONG refcount = InterlockedIncrement(&clock->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -7913,7 +7913,7 @@ static ULONG WINAPI system_clock_Release(IMFClock *iface) struct system_clock *clock = impl_from_IMFClock(iface); ULONG refcount = InterlockedDecrement(&clock->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) free(clock); @@ -7934,7 +7934,7 @@ static HRESULT WINAPI system_clock_GetClockCharacteristics(IMFClock *iface, DWOR static HRESULT WINAPI system_clock_GetCorrelatedTime(IMFClock *iface, DWORD reserved, LONGLONG *clock_time, MFTIME *system_time) { - TRACE("%p, %#x, %p, %p.\n", iface, reserved, clock_time, system_time); + TRACE("%p, %#lx, %p, %p.\n", iface, reserved, clock_time, system_time); *clock_time = *system_time = MFGetSystemTime(); @@ -7952,7 +7952,7 @@ static HRESULT WINAPI system_clock_GetContinuityKey(IMFClock *iface, DWORD *key) static HRESULT WINAPI system_clock_GetState(IMFClock *iface, DWORD reserved, MFCLOCK_STATE *state) { - TRACE("%p, %#x, %p.\n", iface, reserved, state); + TRACE("%p, %#lx, %p.\n", iface, reserved, state); *state = MFCLOCK_STATE_RUNNING; @@ -8032,7 +8032,7 @@ static ULONG WINAPI system_time_source_AddRef(IMFPresentationTimeSource *iface) struct system_time_source *source = impl_from_IMFPresentationTimeSource(iface); ULONG refcount = InterlockedIncrement(&source->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -8042,7 +8042,7 @@ static ULONG WINAPI system_time_source_Release(IMFPresentationTimeSource *iface) struct system_time_source *source = impl_from_IMFPresentationTimeSource(iface); ULONG refcount = InterlockedDecrement(&source->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -8070,7 +8070,7 @@ static HRESULT WINAPI system_time_source_GetCorrelatedTime(IMFPresentationTimeSo struct system_time_source *source = impl_from_IMFPresentationTimeSource(iface); HRESULT hr; - TRACE("%p, %#x, %p, %p.\n", iface, reserved, clock_time, system_time); + TRACE("%p, %#lx, %p, %p.\n", iface, reserved, clock_time, system_time); EnterCriticalSection(&source->cs); if (SUCCEEDED(hr = IMFClock_GetCorrelatedTime(source->clock, 0, clock_time, system_time))) @@ -8102,7 +8102,7 @@ static HRESULT WINAPI system_time_source_GetState(IMFPresentationTimeSource *ifa { struct system_time_source *source = impl_from_IMFPresentationTimeSource(iface); - TRACE("%p, %#x, %p.\n", iface, reserved, state); + TRACE("%p, %#lx, %p.\n", iface, reserved, state); EnterCriticalSection(&source->cs); *state = source->state; @@ -8405,7 +8405,7 @@ static ULONG WINAPI async_create_file_callback_AddRef(IRtwqAsyncCallback *iface) struct async_create_file *async = impl_from_create_file_IRtwqAsyncCallback(iface); ULONG refcount = InterlockedIncrement(&async->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -8415,7 +8415,7 @@ static ULONG WINAPI async_create_file_callback_Release(IRtwqAsyncCallback *iface struct async_create_file *async = impl_from_create_file_IRtwqAsyncCallback(iface); ULONG refcount = InterlockedDecrement(&async->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -8702,7 +8702,7 @@ static ULONG WINAPI property_store_AddRef(IPropertyStore *iface) struct property_store *store = impl_from_IPropertyStore(iface); ULONG refcount = InterlockedIncrement(&store->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); return refcount; } @@ -8712,7 +8712,7 @@ static ULONG WINAPI property_store_Release(IPropertyStore *iface) struct property_store *store = impl_from_IPropertyStore(iface); ULONG refcount = InterlockedDecrement(&store->refcount); - TRACE("%p, refcount %d.\n", iface, refcount); + TRACE("%p, refcount %ld.\n", iface, refcount); if (!refcount) { @@ -8743,7 +8743,7 @@ static HRESULT WINAPI property_store_GetAt(IPropertyStore *iface, DWORD index, P { struct property_store *store = impl_from_IPropertyStore(iface); - TRACE("%p, %u, %p.\n", iface, index, key); + TRACE("%p, %lu, %p.\n", iface, index, key); EnterCriticalSection(&store->cs); @@ -8935,7 +8935,7 @@ static ULONG WINAPI dxgi_device_manager_AddRef(IMFDXGIDeviceManager *iface) struct dxgi_device_manager *manager = impl_from_IMFDXGIDeviceManager(iface); ULONG refcount = InterlockedIncrement(&manager->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -8945,7 +8945,7 @@ static ULONG WINAPI dxgi_device_manager_Release(IMFDXGIDeviceManager *iface) struct dxgi_device_manager *manager = impl_from_IMFDXGIDeviceManager(iface); ULONG refcount = InterlockedDecrement(&manager->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index b77db17189f..a63ae6eafaf 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -138,7 +138,7 @@ static ULONG WINAPI mediatype_AddRef(IMFMediaType *iface) struct media_type *media_type = impl_from_IMFMediaType(iface); ULONG refcount = InterlockedIncrement(&media_type->attributes.ref); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -148,7 +148,7 @@ static ULONG WINAPI mediatype_Release(IMFMediaType *iface) struct media_type *media_type = impl_from_IMFMediaType(iface); ULONG refcount = InterlockedDecrement(&media_type->attributes.ref); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -977,7 +977,7 @@ static const MFVIDEOFORMAT * WINAPI video_mediatype_GetVideoFormat(IMFVideoMedia CoTaskMemFree(media_type->video_format); if (FAILED(hr = MFCreateMFVideoFormatFromMFMediaType(&media_type->IMFMediaType_iface, &media_type->video_format, &size))) - WARN("Failed to create format description, hr %#x.\n", hr); + WARN("Failed to create format description, hr %#lx.\n", hr); return media_type->video_format; } @@ -985,7 +985,7 @@ static const MFVIDEOFORMAT * WINAPI video_mediatype_GetVideoFormat(IMFVideoMedia static HRESULT WINAPI video_mediatype_GetVideoRepresentation(IMFVideoMediaType *iface, GUID representation, void **data, LONG stride) { - FIXME("%p, %s, %p, %d.\n", iface, debugstr_guid(&representation), data, stride); + FIXME("%p, %s, %p, %ld.\n", iface, debugstr_guid(&representation), data, stride); return E_NOTIMPL; } @@ -1379,7 +1379,7 @@ static const WAVEFORMATEX * WINAPI audio_mediatype_GetAudioFormat(IMFAudioMediaT if (FAILED(hr = MFCreateWaveFormatExFromMFMediaType(&media_type->IMFMediaType_iface, &media_type->audio_format, &size, MFWaveFormatExConvertFlag_Normal))) { - WARN("Failed to create wave format description, hr %#x.\n", hr); + WARN("Failed to create wave format description, hr %#lx.\n", hr); } return media_type->audio_format; @@ -1496,7 +1496,7 @@ static ULONG WINAPI stream_descriptor_AddRef(IMFStreamDescriptor *iface) struct stream_desc *stream_desc = impl_from_IMFStreamDescriptor(iface); ULONG refcount = InterlockedIncrement(&stream_desc->attributes.ref); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -1507,7 +1507,7 @@ static ULONG WINAPI stream_descriptor_Release(IMFStreamDescriptor *iface) ULONG refcount = InterlockedDecrement(&stream_desc->attributes.ref); unsigned int i; - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -1953,7 +1953,7 @@ static HRESULT WINAPI mediatype_handler_GetMediaTypeByIndex(IMFMediaTypeHandler { struct stream_desc *stream_desc = impl_from_IMFMediaTypeHandler(iface); - TRACE("%p, %u, %p.\n", iface, index, type); + TRACE("%p, %lu, %p.\n", iface, index, type); if (index >= stream_desc->media_types_count) return MF_E_NO_MORE_TYPES; @@ -2044,7 +2044,7 @@ HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD count, unsigned int i; HRESULT hr; - TRACE("%d, %d, %p, %p.\n", identifier, count, types, descriptor); + TRACE("%ld, %ld, %p, %p.\n", identifier, count, types, descriptor); if (!count) return E_INVALIDARG; @@ -2102,7 +2102,7 @@ static ULONG WINAPI presentation_descriptor_AddRef(IMFPresentationDescriptor *if struct presentation_desc *presentation_desc = impl_from_IMFPresentationDescriptor(iface); ULONG refcount = InterlockedIncrement(&presentation_desc->attributes.ref); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -2113,7 +2113,7 @@ static ULONG WINAPI presentation_descriptor_Release(IMFPresentationDescriptor *i ULONG refcount = InterlockedDecrement(&presentation_desc->attributes.ref); unsigned int i; - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -2431,7 +2431,7 @@ static HRESULT WINAPI presentation_descriptor_GetStreamDescriptorByIndex(IMFPres { struct presentation_desc *presentation_desc = impl_from_IMFPresentationDescriptor(iface); - TRACE("%p, %u, %p, %p.\n", iface, index, selected, descriptor); + TRACE("%p, %lu, %p, %p.\n", iface, index, selected, descriptor); if (index >= presentation_desc->count) return E_INVALIDARG; @@ -2450,7 +2450,7 @@ static HRESULT WINAPI presentation_descriptor_SelectStream(IMFPresentationDescri { struct presentation_desc *presentation_desc = impl_from_IMFPresentationDescriptor(iface); - TRACE("%p, %u.\n", iface, index); + TRACE("%p, %lu.\n", iface, index); if (index >= presentation_desc->count) return E_INVALIDARG; @@ -2466,7 +2466,7 @@ static HRESULT WINAPI presentation_descriptor_DeselectStream(IMFPresentationDesc { struct presentation_desc *presentation_desc = impl_from_IMFPresentationDescriptor(iface); - TRACE("%p, %u.\n", iface, index); + TRACE("%p, %lu.\n", iface, index); if (index >= presentation_desc->count) return E_INVALIDARG; @@ -2578,7 +2578,7 @@ HRESULT WINAPI MFCreatePresentationDescriptor(DWORD count, IMFStreamDescriptor * unsigned int i; HRESULT hr; - TRACE("%u, %p, %p.\n", count, descriptors, out); + TRACE("%lu, %p, %p.\n", count, descriptors, out); if (!count) return E_INVALIDARG; @@ -2683,7 +2683,7 @@ HRESULT WINAPI MFGetStrideForBitmapInfoHeader(DWORD fourcc, DWORD width, LONG *s struct uncompressed_video_format *format; GUID subtype; - TRACE("%s, %u, %p.\n", debugstr_fourcc(fourcc), width, stride); + TRACE("%s, %lu, %p.\n", debugstr_fourcc(fourcc), width, stride); memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); subtype.Data1 = fourcc; @@ -2750,7 +2750,7 @@ HRESULT WINAPI MFGetPlaneSize(DWORD fourcc, DWORD width, DWORD height, DWORD *si unsigned int stride; GUID subtype; - TRACE("%s, %u, %u, %p.\n", debugstr_fourcc(fourcc), width, height, size); + TRACE("%s, %lu, %lu, %p.\n", debugstr_fourcc(fourcc), width, height, size); memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); subtype.Data1 = fourcc; @@ -3511,7 +3511,7 @@ HRESULT WINAPI MFInitVideoFormat_RGB(MFVIDEOFORMAT *format, DWORD width, DWORD h { unsigned int transfer_function; - TRACE("%p, %u, %u, %#x.\n", format, width, height, d3dformat); + TRACE("%p, %lu, %lu, %#lx.\n", format, width, height, d3dformat); if (!format) return E_INVALIDARG; diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index b646d9e7cbb..dc29545df73 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -128,7 +128,7 @@ static inline const char *debugstr_propvar(const PROPVARIANT *v) case VT_NULL: return wine_dbg_sprintf("%p {VT_NULL}", v); case VT_UI4: - return wine_dbg_sprintf("%p {VT_UI4: %d}", v, v->ulVal); + return wine_dbg_sprintf("%p {VT_UI4: %ld}", v, v->ulVal); case VT_UI8: return wine_dbg_sprintf("%p {VT_UI8: %s}", v, wine_dbgstr_longlong(v->uhVal.QuadPart)); case VT_I8: @@ -178,7 +178,7 @@ static inline const char *debugstr_fourcc(DWORD format) return wine_dbg_sprintf("%s", wine_dbgstr_an(formats[i].name, -1)); } - return wine_dbg_sprintf("%#x", format); + return wine_dbg_sprintf("%#lx", format); } return wine_dbgstr_an((char *)&format, 4); diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 42bceb5811d..6ee0df37dce 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -41,7 +41,7 @@ HRESULT WINAPI MFPutWorkItem(DWORD queue, IMFAsyncCallback *callback, IUnknown * IRtwqAsyncResult *result; HRESULT hr; - TRACE("%#x, %p, %p.\n", queue, callback, state); + TRACE("%#lx, %p, %p.\n", queue, callback, state); if (FAILED(hr = RtwqCreateAsyncResult(NULL, (IRtwqAsyncCallback *)callback, state, &result))) return hr; @@ -61,7 +61,7 @@ HRESULT WINAPI MFPutWorkItem2(DWORD queue, LONG priority, IMFAsyncCallback *call IRtwqAsyncResult *result; HRESULT hr; - TRACE("%#x, %d, %p, %p.\n", queue, priority, callback, state); + TRACE("%#lx, %ld, %p, %p.\n", queue, priority, callback, state); if (FAILED(hr = RtwqCreateAsyncResult(NULL, (IRtwqAsyncCallback *)callback, state, &result))) return hr; @@ -78,7 +78,7 @@ HRESULT WINAPI MFPutWorkItem2(DWORD queue, LONG priority, IMFAsyncCallback *call */ HRESULT WINAPI MFPutWorkItemEx(DWORD queue, IMFAsyncResult *result) { - TRACE("%#x, %p\n", queue, result); + TRACE("%#lx, %p\n", queue, result); return RtwqPutWorkItem(queue, 0, (IRtwqAsyncResult *)result); } @@ -88,7 +88,7 @@ HRESULT WINAPI MFPutWorkItemEx(DWORD queue, IMFAsyncResult *result) */ HRESULT WINAPI MFPutWorkItemEx2(DWORD queue, LONG priority, IMFAsyncResult *result) { - TRACE("%#x, %d, %p\n", queue, priority, result); + TRACE("%#lx, %ld, %p\n", queue, priority, result); return RtwqPutWorkItem(queue, priority, (IRtwqAsyncResult *)result); } diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 099db498f2d..8ef80eb5f24 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -150,7 +150,7 @@ static ULONG WINAPI sample_AddRef(IMFSample *iface) struct sample *sample = impl_from_IMFSample(iface); ULONG refcount = InterlockedIncrement(&sample->attributes.ref); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -171,7 +171,7 @@ static ULONG WINAPI sample_Release(IMFSample *iface) struct sample *sample = impl_from_IMFSample(iface); ULONG refcount = InterlockedDecrement(&sample->attributes.ref); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) release_sample_object(sample); @@ -194,14 +194,14 @@ static ULONG WINAPI sample_tracked_Release(IMFSample *iface) /* Call could fail if queue system is not initialized, it's not critical. */ if (FAILED(hr = RtwqInvokeCallback(tracked_result))) - WARN("Failed to invoke tracking callback, hr %#x.\n", hr); + WARN("Failed to invoke tracking callback, hr %#lx.\n", hr); IRtwqAsyncResult_Release(tracked_result); } LeaveCriticalSection(&sample->attributes.cs); refcount = InterlockedDecrement(&sample->attributes.ref); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) release_sample_object(sample); @@ -497,7 +497,7 @@ static HRESULT WINAPI sample_SetSampleFlags(IMFSample *iface, DWORD flags) { struct sample *sample = impl_from_IMFSample(iface); - TRACE("%p, %#x.\n", iface, flags); + TRACE("%p, %#lx.\n", iface, flags); EnterCriticalSection(&sample->attributes.cs); sample->flags = flags; @@ -589,7 +589,7 @@ static HRESULT WINAPI sample_GetBufferByIndex(IMFSample *iface, DWORD index, IMF struct sample *sample = impl_from_IMFSample(iface); HRESULT hr = S_OK; - TRACE("%p, %u, %p.\n", iface, index, buffer); + TRACE("%p, %lu, %p.\n", iface, index, buffer); EnterCriticalSection(&sample->attributes.cs); if (index < sample->buffer_count) @@ -741,7 +741,7 @@ static HRESULT WINAPI sample_RemoveBufferByIndex(IMFSample *iface, DWORD index) struct sample *sample = impl_from_IMFSample(iface); HRESULT hr = S_OK; - TRACE("%p, %u.\n", iface, index); + TRACE("%p, %lu.\n", iface, index); EnterCriticalSection(&sample->attributes.cs); if (index < sample->buffer_count) @@ -1097,7 +1097,7 @@ static ULONG WINAPI sample_allocator_AddRef(IMFVideoSampleAllocatorEx *iface) struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocatorEx(iface); ULONG refcount = InterlockedIncrement(&allocator->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -1167,7 +1167,7 @@ static ULONG WINAPI sample_allocator_Release(IMFVideoSampleAllocatorEx *iface) struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocatorEx(iface); ULONG refcount = InterlockedDecrement(&allocator->refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -1265,7 +1265,7 @@ static HRESULT sample_allocator_get_surface_service(struct sample_allocator *all if (FAILED(hr = IDirect3DDeviceManager9_GetVideoService(allocator->d3d9_device_manager, service->hdevice, &IID_IDirectXVideoProcessorService, (void **)&service->dxva_service))) { - WARN("Failed to get DXVA processor service, hr %#x.\n", hr); + WARN("Failed to get DXVA processor service, hr %#lx.\n", hr); IDirect3DDeviceManager9_CloseDeviceHandle(allocator->d3d9_device_manager, service->hdevice); } } @@ -1277,7 +1277,7 @@ static HRESULT sample_allocator_get_surface_service(struct sample_allocator *all if (FAILED(hr = IMFDXGIDeviceManager_GetVideoService(allocator->dxgi_device_manager, service->hdevice, &IID_ID3D11Device, (void **)&service->d3d11_device))) { - WARN("Failed to get D3D11 device, hr %#x.\n", hr); + WARN("Failed to get D3D11 device, hr %#lx.\n", hr); IMFDXGIDeviceManager_CloseDeviceHandle(allocator->dxgi_device_manager, service->hdevice); } } @@ -1487,7 +1487,7 @@ static HRESULT WINAPI sample_allocator_InitializeSampleAllocator(IMFVideoSampleA struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocatorEx(iface); HRESULT hr; - TRACE("%p, %u, %p.\n", iface, sample_count, media_type); + TRACE("%p, %lu, %p.\n", iface, sample_count, media_type); if (!sample_count) return E_INVALIDARG; @@ -1584,7 +1584,7 @@ static HRESULT WINAPI sample_allocator_InitializeSampleAllocatorEx(IMFVideoSampl struct sample_allocator *allocator = impl_from_IMFVideoSampleAllocatorEx(iface); HRESULT hr; - TRACE("%p, %u, %u, %p, %p.\n", iface, initial_sample_count, max_sample_count, attributes, media_type); + TRACE("%p, %lu, %lu, %p, %p.\n", iface, initial_sample_count, max_sample_count, attributes, media_type); EnterCriticalSection(&allocator->cs);
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mfreadwrite/Makefile.in | 1 dlls/mfreadwrite/reader.c | 88 +++++++++++++++++++++--------------------- dlls/mfreadwrite/writer.c | 20 +++++----- 3 files changed, 54 insertions(+), 55 deletions(-) diff --git a/dlls/mfreadwrite/Makefile.in b/dlls/mfreadwrite/Makefile.in index 31c2c5a39c1..440d5ba96cd 100644 --- a/dlls/mfreadwrite/Makefile.in +++ b/dlls/mfreadwrite/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mfreadwrite.dll IMPORTLIB = mfreadwrite IMPORTS = mfuuid uuid mfplat ole32 diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index 13fcc4278cc..bdf2e7f5a6f 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -316,7 +316,7 @@ static HRESULT media_event_get_object(IMFMediaEvent *event, REFIID riid, void ** PropVariantInit(&value); if (FAILED(hr = IMFMediaEvent_GetValue(event, &value))) { - WARN("Failed to get event value, hr %#x.\n", hr); + WARN("Failed to get event value, hr %#lx.\n", hr); return hr; } @@ -403,7 +403,7 @@ static void source_reader_response_ready(struct source_reader *reader, struct st { command->u.sample.stream_index = stream->index; if (FAILED(hr = MFPutWorkItem(reader->queue, &reader->async_commands_callback, &command->IUnknown_iface))) - WARN("Failed to submit async result, hr %#x.\n", hr); + WARN("Failed to submit async result, hr %#lx.\n", hr); IUnknown_Release(&command->IUnknown_iface); } } @@ -440,7 +440,7 @@ static void source_reader_copy_sample_buffer(IMFSample *src, IMFSample *dst) if (SUCCEEDED(IMFSample_GetBufferByIndex(dst, 0, &buffer))) { if (FAILED(hr = IMFSample_CopyToBuffer(src, buffer))) - WARN("Failed to copy a buffer, hr %#x.\n", hr); + WARN("Failed to copy a buffer, hr %#lx.\n", hr); IMFMediaBuffer_Release(buffer); } } @@ -497,7 +497,7 @@ static HRESULT source_reader_request_sample(struct source_reader *reader, struct if (stream->stream && !(stream->flags & STREAM_FLAG_SAMPLE_REQUESTED)) { if (FAILED(hr = IMFMediaStream_RequestSample(stream->stream, NULL))) - WARN("Sample request failed, hr %#x.\n", hr); + WARN("Sample request failed, hr %#lx.\n", hr); else { stream->flags |= STREAM_FLAG_SAMPLE_REQUESTED; @@ -516,7 +516,7 @@ static HRESULT source_reader_new_stream_handler(struct source_reader *reader, IM if (FAILED(hr = media_event_get_object(event, &IID_IMFMediaStream, (void **)&stream))) { - WARN("Failed to get stream object, hr %#x.\n", hr); + WARN("Failed to get stream object, hr %#lx.\n", hr); return hr; } @@ -524,7 +524,7 @@ static HRESULT source_reader_new_stream_handler(struct source_reader *reader, IM if (FAILED(hr = media_stream_get_id(stream, &id))) { - WARN("Unidentified stream %p, hr %#x.\n", stream, hr); + WARN("Unidentified stream %p, hr %#lx.\n", stream, hr); IMFMediaStream_Release(stream); return hr; } @@ -542,7 +542,7 @@ static HRESULT source_reader_new_stream_handler(struct source_reader *reader, IM if (FAILED(hr = IMFMediaStream_BeginGetEvent(stream, &reader->stream_events_callback, (IUnknown *)stream))) { - WARN("Failed to subscribe to stream events, hr %#x.\n", hr); + WARN("Failed to subscribe to stream events, hr %#lx.\n", hr); } if (reader->streams[i].requests) @@ -554,7 +554,7 @@ static HRESULT source_reader_new_stream_handler(struct source_reader *reader, IM } if (i == reader->stream_count) - WARN("Stream with id %#x was not present in presentation descriptor.\n", id); + WARN("Stream with id %#lx was not present in presentation descriptor.\n", id); LeaveCriticalSection(&reader->cs); @@ -581,7 +581,7 @@ static HRESULT source_reader_source_state_handler(struct source_reader *reader, reader->flags &= ~SOURCE_READER_SEEKING; break; default: - WARN("Unhandled event %d.\n", event_type); + WARN("Unhandled event %ld.\n", event_type); } LeaveCriticalSection(&reader->cs); @@ -610,7 +610,7 @@ static HRESULT WINAPI source_reader_source_events_callback_Invoke(IMFAsyncCallba IMFMediaEvent_GetType(event, &event_type); - TRACE("Got event %u.\n", event_type); + TRACE("Got event %lu.\n", event_type); switch (event_type) { @@ -640,7 +640,7 @@ static HRESULT WINAPI source_reader_source_events_callback_Invoke(IMFAsyncCallba } if (FAILED(hr)) - WARN("Failed while handling %d event, hr %#x.\n", event_type, hr); + WARN("Failed while handling %ld event, hr %#lx.\n", event_type, hr); IMFMediaEvent_Release(event); @@ -683,7 +683,7 @@ static HRESULT source_reader_pull_stream_samples(struct source_reader *reader, s if (FAILED(hr = IMFTransform_GetOutputStreamInfo(stream->decoder.transform, 0, &stream_info))) { - WARN("Failed to get output stream info, hr %#x.\n", hr); + WARN("Failed to get output stream info, hr %#lx.\n", hr); return hr; } @@ -751,7 +751,7 @@ static HRESULT source_reader_process_sample(struct source_reader *reader, struct { if (FAILED(hr = IMFTransform_ProcessInput(stream->decoder.transform, 0, sample, 0))) { - WARN("Transform failed to process input, hr %#x.\n", hr); + WARN("Transform failed to process input, hr %#lx.\n", hr); return hr; } @@ -759,7 +759,7 @@ static HRESULT source_reader_process_sample(struct source_reader *reader, struct return S_OK; } else - WARN("Transform failed to process output, hr %#x.\n", hr); + WARN("Transform failed to process output, hr %#lx.\n", hr); return hr; } @@ -776,13 +776,13 @@ static HRESULT source_reader_media_sample_handler(struct source_reader *reader, if (FAILED(hr = media_event_get_object(event, &IID_IMFSample, (void **)&sample))) { - WARN("Failed to get sample object, hr %#x.\n", hr); + WARN("Failed to get sample object, hr %#lx.\n", hr); return hr; } if (FAILED(hr = media_stream_get_id(stream, &id))) { - WARN("Unidentified stream %p, hr %#x.\n", stream, hr); + WARN("Unidentified stream %p, hr %#lx.\n", stream, hr); IMFSample_Release(sample); return hr; } @@ -805,7 +805,7 @@ static HRESULT source_reader_media_sample_handler(struct source_reader *reader, } if (i == reader->stream_count) - WARN("Stream with id %#x was not present in presentation descriptor.\n", id); + WARN("Stream with id %#lx was not present in presentation descriptor.\n", id); LeaveCriticalSection(&reader->cs); @@ -828,7 +828,7 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re if (FAILED(hr = media_stream_get_id(stream, &id))) { - WARN("Unidentified stream %p, hr %#x.\n", stream, hr); + WARN("Unidentified stream %p, hr %#lx.\n", stream, hr); return hr; } @@ -850,7 +850,7 @@ static HRESULT source_reader_media_stream_state_handler(struct source_reader *re MFT_MESSAGE_COMMAND_DRAIN, 0))) { if ((hr = source_reader_pull_stream_samples(reader, stream)) != MF_E_TRANSFORM_NEED_MORE_INPUT) - WARN("Failed to pull pending samples, hr %#x.\n", hr); + WARN("Failed to pull pending samples, hr %#lx.\n", hr); } while (stream->requests) @@ -906,7 +906,7 @@ static HRESULT WINAPI source_reader_stream_events_callback_Invoke(IMFAsyncCallba IMFMediaEvent_GetType(event, &event_type); - TRACE("Got event %u.\n", event_type); + TRACE("Got event %lu.\n", event_type); switch (event_type) { @@ -925,7 +925,7 @@ static HRESULT WINAPI source_reader_stream_events_callback_Invoke(IMFAsyncCallba } if (FAILED(hr)) - WARN("Failed while handling %d event, hr %#x.\n", event_type, hr); + WARN("Failed while handling %ld event, hr %#lx.\n", event_type, hr); IMFMediaEvent_Release(event); @@ -1387,7 +1387,7 @@ static ULONG WINAPI src_reader_AddRef(IMFSourceReader *iface) struct source_reader *reader = impl_from_IMFSourceReader(iface); ULONG refcount = InterlockedIncrement(&reader->public_refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); return refcount; } @@ -1413,7 +1413,7 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) struct source_reader *reader = impl_from_IMFSourceReader(iface); ULONG refcount = InterlockedDecrement(&reader->public_refcount); - TRACE("%p, refcount %u.\n", iface, refcount); + TRACE("%p, refcount %lu.\n", iface, refcount); if (!refcount) { @@ -1440,7 +1440,7 @@ static HRESULT WINAPI src_reader_GetStreamSelection(IMFSourceReader *iface, DWOR { struct source_reader *reader = impl_from_IMFSourceReader(iface); - TRACE("%p, %#x, %p.\n", iface, index, selected); + TRACE("%p, %#lx, %p.\n", iface, index, selected); switch (index) { @@ -1464,7 +1464,7 @@ static HRESULT WINAPI src_reader_SetStreamSelection(IMFSourceReader *iface, DWOR BOOL selection_changed = FALSE, selected; unsigned int i; - TRACE("%p, %#x, %d.\n", iface, index, selection); + TRACE("%p, %#lx, %d.\n", iface, index, selection); selection = !!selection; @@ -1567,7 +1567,7 @@ static HRESULT WINAPI src_reader_GetNativeMediaType(IMFSourceReader *iface, DWOR { struct source_reader *reader = impl_from_IMFSourceReader(iface); - TRACE("%p, %#x, %#x, %p.\n", iface, index, type_index, type); + TRACE("%p, %#lx, %#lx, %p.\n", iface, index, type_index, type); return source_reader_get_native_media_type(reader, index, type_index, type); } @@ -1577,7 +1577,7 @@ static HRESULT WINAPI src_reader_GetCurrentMediaType(IMFSourceReader *iface, DWO struct source_reader *reader = impl_from_IMFSourceReader(iface); HRESULT hr; - TRACE("%p, %#x, %p.\n", iface, index, type); + TRACE("%p, %#lx, %p.\n", iface, index, type); switch (index) { @@ -1680,7 +1680,7 @@ static HRESULT source_reader_setup_sample_allocator(struct source_reader *reader { if (FAILED(hr = MFCreateVideoSampleAllocatorEx(&IID_IMFVideoSampleAllocatorEx, (void **)&stream->allocator))) { - WARN("Failed to create sample allocator, hr %#x.\n", hr); + WARN("Failed to create sample allocator, hr %#lx.\n", hr); return hr; } } @@ -1688,17 +1688,17 @@ static HRESULT source_reader_setup_sample_allocator(struct source_reader *reader IMFVideoSampleAllocatorEx_UninitializeSampleAllocator(stream->allocator); if (FAILED(hr = IMFVideoSampleAllocatorEx_SetDirectXManager(stream->allocator, reader->device_manager))) { - WARN("Failed to set device manager, hr %#x.\n", hr); + WARN("Failed to set device manager, hr %#lx.\n", hr); return hr; } if (FAILED(hr = IMFVideoSampleAllocatorEx_InitializeSampleAllocatorEx(stream->allocator, 2, 8, NULL, stream->current))) - WARN("Failed to initialize sample allocator, hr %#x.\n", hr); + WARN("Failed to initialize sample allocator, hr %#lx.\n", hr); if (SUCCEEDED(IMFVideoSampleAllocatorEx_QueryInterface(stream->allocator, &IID_IMFVideoSampleAllocatorCallback, (void **)&callback))) { if (FAILED(hr = IMFVideoSampleAllocatorCallback_SetCallback(callback, &stream->notify_cb))) - WARN("Failed to set allocator callback, hr %#x.\n", hr); + WARN("Failed to set allocator callback, hr %#lx.\n", hr); IMFVideoSampleAllocatorCallback_Release(callback); } @@ -1719,13 +1719,13 @@ static HRESULT source_reader_configure_decoder(struct source_reader *reader, DWO if (FAILED(hr = CoCreateInstance(clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IMFTransform, (void **)&transform))) { - WARN("Failed to create transform object, hr %#x.\n", hr); + WARN("Failed to create transform object, hr %#lx.\n", hr); return hr; } if (FAILED(hr = IMFTransform_SetInputType(transform, 0, input_type, 0))) { - WARN("Failed to set decoder input type, hr %#x.\n", hr); + WARN("Failed to set decoder input type, hr %#lx.\n", hr); IMFTransform_Release(transform); return hr; } @@ -1748,7 +1748,7 @@ static HRESULT source_reader_configure_decoder(struct source_reader *reader, DWO } if (FAILED(hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *)reader->streams[index].current))) - WARN("Failed to copy attributes, hr %#x.\n", hr); + WARN("Failed to copy attributes, hr %#lx.\n", hr); if (SUCCEEDED(IMFMediaType_GetMajorType(type, &major)) && IsEqualGUID(&major, &MFMediaType_Audio)) IMFMediaType_GetUINT32(type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &block_alignment); IMFMediaType_Release(type); @@ -1838,7 +1838,7 @@ static HRESULT WINAPI src_reader_SetCurrentMediaType(IMFSourceReader *iface, DWO struct source_reader *reader = impl_from_IMFSourceReader(iface); HRESULT hr; - TRACE("%p, %#x, %p, %p.\n", iface, index, reserved, type); + TRACE("%p, %#lx, %p, %p.\n", iface, index, reserved, type); switch (index) { @@ -1964,7 +1964,7 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind { stream->requests++; if (FAILED(hr = source_reader_request_sample(reader, stream))) - WARN("Failed to request a sample, hr %#x.\n", hr); + WARN("Failed to request a sample, hr %#lx.\n", hr); if (stream->stream && !(stream->flags & STREAM_FLAG_SAMPLE_REQUESTED)) { *stream_flags = MF_SOURCE_READERF_ERROR; @@ -1986,7 +1986,7 @@ static HRESULT source_reader_read_sample(struct source_reader *reader, DWORD ind } } - TRACE("Stream %u, got sample %p, flags %#x.\n", *actual_index, *sample, *stream_flags); + TRACE("Stream %lu, got sample %p, flags %#lx.\n", *actual_index, *sample, *stream_flags); return hr; } @@ -2023,7 +2023,7 @@ static HRESULT WINAPI src_reader_ReadSample(IMFSourceReader *iface, DWORD index, struct source_reader *reader = impl_from_IMFSourceReader(iface); HRESULT hr; - TRACE("%p, %#x, %#x, %p, %p, %p, %p\n", iface, index, flags, actual_index, stream_flags, timestamp, sample); + TRACE("%p, %#lx, %#lx, %p, %p, %p, %p\n", iface, index, flags, actual_index, stream_flags, timestamp, sample); EnterCriticalSection(&reader->cs); @@ -2084,7 +2084,7 @@ static HRESULT WINAPI src_reader_Flush(IMFSourceReader *iface, DWORD index) struct source_reader *reader = impl_from_IMFSourceReader(iface); HRESULT hr; - TRACE("%p, %#x.\n", iface, index); + TRACE("%p, %#lx.\n", iface, index); EnterCriticalSection(&reader->cs); @@ -2105,7 +2105,7 @@ static HRESULT WINAPI src_reader_GetServiceForStream(IMFSourceReader *iface, DWO IUnknown *obj = NULL; HRESULT hr = S_OK; - TRACE("%p, %#x, %s, %s, %p\n", iface, index, debugstr_guid(service), debugstr_guid(riid), object); + TRACE("%p, %#lx, %s, %s, %p\n", iface, index, debugstr_guid(service), debugstr_guid(riid), object); EnterCriticalSection(&reader->cs); @@ -2168,7 +2168,7 @@ static HRESULT WINAPI src_reader_GetPresentationAttribute(IMFSourceReader *iface BOOL selected; HRESULT hr; - TRACE("%p, %#x, %s, %p.\n", iface, index, debugstr_guid(guid), value); + TRACE("%p, %#lx, %s, %p.\n", iface, index, debugstr_guid(guid), value); switch (index) { @@ -2250,7 +2250,7 @@ static DWORD reader_get_first_stream_index(IMFPresentationDescriptor *descriptor IMFMediaTypeHandler_Release(handler); if (FAILED(hr)) { - WARN("Failed to get stream major type, hr %#x.\n", hr); + WARN("Failed to get stream major type, hr %#lx.\n", hr); continue; } @@ -2367,7 +2367,7 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri break; if (FAILED(hr = IMFStreamDescriptor_GetStreamIdentifier(sd, &object->streams[i].id))) - WARN("Failed to get stream identifier, hr %#x.\n", hr); + WARN("Failed to get stream identifier, hr %#lx.\n", hr); hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &handler); IMFStreamDescriptor_Release(sd); @@ -2442,7 +2442,7 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri } if (FAILED(hr = MFLockSharedWorkQueue(L"", 0, NULL, &object->queue))) - WARN("Failed to acquired shared queue, hr %#x.\n", hr); + WARN("Failed to acquired shared queue, hr %#lx.\n", hr); if (SUCCEEDED(hr)) hr = IMFSourceReader_QueryInterface(&object->IMFSourceReader_iface, riid, out); diff --git a/dlls/mfreadwrite/writer.c b/dlls/mfreadwrite/writer.c index 6807ee26fbe..1f33c0791ec 100644 --- a/dlls/mfreadwrite/writer.c +++ b/dlls/mfreadwrite/writer.c @@ -61,7 +61,7 @@ static ULONG WINAPI sink_writer_AddRef(IMFSinkWriter *iface) struct sink_writer *writer = impl_from_IMFSinkWriter(iface); ULONG refcount = InterlockedIncrement(&writer->refcount); - TRACE("%p, %u.\n", iface, refcount); + TRACE("%p, %lu.\n", iface, refcount); return refcount; } @@ -71,7 +71,7 @@ static ULONG WINAPI sink_writer_Release(IMFSinkWriter *iface) struct sink_writer *writer = impl_from_IMFSinkWriter(iface); ULONG refcount = InterlockedDecrement(&writer->refcount); - TRACE("%p, %u.\n", iface, refcount); + TRACE("%p, %lu.\n", iface, refcount); if (!refcount) { @@ -91,7 +91,7 @@ static HRESULT WINAPI sink_writer_AddStream(IMFSinkWriter *iface, IMFMediaType * static HRESULT WINAPI sink_writer_SetInputMediaType(IMFSinkWriter *iface, DWORD index, IMFMediaType *type, IMFAttributes *parameters) { - FIXME("%p, %u, %p, %p.\n", iface, index, type, parameters); + FIXME("%p, %lu, %p, %p.\n", iface, index, type, parameters); return E_NOTIMPL; } @@ -105,35 +105,35 @@ static HRESULT WINAPI sink_writer_BeginWriting(IMFSinkWriter *iface) static HRESULT WINAPI sink_writer_WriteSample(IMFSinkWriter *iface, DWORD index, IMFSample *sample) { - FIXME("%p, %u, %p.\n", iface, index, sample); + FIXME("%p, %lu, %p.\n", iface, index, sample); return E_NOTIMPL; } static HRESULT WINAPI sink_writer_SendStreamTick(IMFSinkWriter *iface, DWORD index, LONGLONG timestamp) { - FIXME("%p, %u, %s.\n", iface, index, wine_dbgstr_longlong(timestamp)); + FIXME("%p, %lu, %s.\n", iface, index, wine_dbgstr_longlong(timestamp)); return E_NOTIMPL; } static HRESULT WINAPI sink_writer_PlaceMarker(IMFSinkWriter *iface, DWORD index, void *context) { - FIXME("%p, %u, %p.\n", iface, index, context); + FIXME("%p, %lu, %p.\n", iface, index, context); return E_NOTIMPL; } static HRESULT WINAPI sink_writer_NotifyEndOfSegment(IMFSinkWriter *iface, DWORD index) { - FIXME("%p, %u.\n", iface, index); + FIXME("%p, %lu.\n", iface, index); return E_NOTIMPL; } static HRESULT WINAPI sink_writer_Flush(IMFSinkWriter *iface, DWORD index) { - FIXME("%p, %u.\n", iface, index); + FIXME("%p, %lu.\n", iface, index); return E_NOTIMPL; } @@ -148,14 +148,14 @@ static HRESULT WINAPI sink_writer_Finalize(IMFSinkWriter *iface) static HRESULT WINAPI sink_writer_GetServiceForStream(IMFSinkWriter *iface, DWORD index, REFGUID service, REFIID riid, void **object) { - FIXME("%p, %u, %s, %s, %p.\n", iface, index, debugstr_guid(service), debugstr_guid(riid), object); + FIXME("%p, %lu, %s, %s, %p.\n", iface, index, debugstr_guid(service), debugstr_guid(riid), object); return E_NOTIMPL; } static HRESULT WINAPI sink_writer_GetStatistics(IMFSinkWriter *iface, DWORD index, MF_SINK_WRITER_STATISTICS *stats) { - FIXME("%p, %u, %p.\n", iface, index, stats); + FIXME("%p, %lu, %p.\n", iface, index, stats); return E_NOTIMPL; }
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/midimap/Makefile.in | 1 - dlls/midimap/midimap.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/midimap/Makefile.in b/dlls/midimap/Makefile.in index d02c7eca7b3..c0e66f4341e 100644 --- a/dlls/midimap/Makefile.in +++ b/dlls/midimap/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = midimap.dll IMPORTS = winmm user32 advapi32 diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 53eeadee915..12555f5309a 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -286,7 +286,7 @@ static DWORD modOpen(DWORD_PTR *lpdwUser, LPMIDIOPENDESC lpDesc, DWORD dwFlags) { MIDIMAPDATA* mom = HeapAlloc(GetProcessHeap(), 0, sizeof(MIDIMAPDATA)); - TRACE("(%p %p %08x)\n", lpdwUser, lpDesc, dwFlags); + TRACE("(%p %p %08lx)\n", lpdwUser, lpDesc, dwFlags); if (!mom) return MMSYSERR_NOMEM; if (!lpDesc) { @@ -432,7 +432,7 @@ static DWORD modData(MIDIMAPDATA* mom, DWORD_PTR dwParam) } break; default: - FIXME("ooch %lx\n", dwParam); + FIXME("ooch %Ix\n", dwParam); } return ret; @@ -523,7 +523,7 @@ static LRESULT MIDIMAP_drvClose(void); DWORD WINAPI MIDIMAP_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("(%u, %04X, %08lX, %08lX, %08lX);\n", + TRACE("(%u, %04X, %08IX, %08IX, %08IX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg)
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mlang/Makefile.in | 1 dlls/mlang/mlang.c | 116 ++++++++++++++++++++++++------------------------ 2 files changed, 58 insertions(+), 59 deletions(-) diff --git a/dlls/mlang/Makefile.in b/dlls/mlang/Makefile.in index 4c9ab1df594..abee2a2d8b5 100644 --- a/dlls/mlang/Makefile.in +++ b/dlls/mlang/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mlang.dll IMPORTLIB = mlang IMPORTS = uuid ole32 gdi32 advapi32 diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 82fa9a0515e..e0d0be2ad8e 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -955,7 +955,7 @@ HRESULT WINAPI ConvertINetMultiByteToUnicode( { INT src_len = -1; - TRACE("%p %d %s %p %p %p\n", pdwMode, dwEncoding, + TRACE("%p %ld %s %p %p %p\n", pdwMode, dwEncoding, debugstr_a(pSrcStr), pcSrcSize, pDstStr, pcDstSize); if (!pcDstSize) @@ -1022,7 +1022,7 @@ HRESULT WINAPI ConvertINetUnicodeToMultiByte( INT destsz, size; INT src_len = -1; - TRACE("%p %d %s %p %p %p\n", pdwMode, dwEncoding, + TRACE("%p %ld %s %p %p %p\n", pdwMode, dwEncoding, debugstr_w(pSrcStr), pcSrcSize, pDstStr, pcDstSize); if (!pcDstSize) @@ -1106,7 +1106,7 @@ HRESULT WINAPI ConvertINetString( LPINT pcDstSize ) { - TRACE("%p %d %d %s %p %p %p\n", pdwMode, dwSrcEncoding, dwDstEncoding, + TRACE("%p %ld %ld %s %p %p %p\n", pdwMode, dwSrcEncoding, dwDstEncoding, debugstr_a(pSrcStr), pcSrcSize, pDstStr, pcDstSize); if (dwSrcEncoding == CP_UNICODE) @@ -1131,7 +1131,7 @@ HRESULT WINAPI ConvertINetString( LPWSTR pDstStrW; HRESULT hr; - TRACE("convert %s from %d to %d\n", debugstr_a(pSrcStr), dwSrcEncoding, dwDstEncoding); + TRACE("convert %s from %ld to %ld\n", debugstr_a(pSrcStr), dwSrcEncoding, dwDstEncoding); hr = ConvertINetMultiByteToUnicode(pdwMode, dwSrcEncoding, pSrcStr, pcSrcSize, NULL, &cDstSizeW); if (hr != S_OK) @@ -1178,7 +1178,7 @@ HRESULT WINAPI IsConvertINetStringAvailable( { UINT src_family, dst_family; - TRACE("%d %d\n", dwSrcEncoding, dwDstEncoding); + TRACE("%ld %ld\n", dwSrcEncoding, dwDstEncoding); if (GetFamilyCodePage(dwSrcEncoding, &src_family) != S_OK || GetFamilyCodePage(dwDstEncoding, &dst_family) != S_OK) @@ -1251,7 +1251,7 @@ HRESULT WINAPI LcidToRfc1766A( LPSTR pszRfc1766, INT nChar) { - TRACE("%04x %p %u\n", lcid, pszRfc1766, nChar); + TRACE("%04lx %p %u\n", lcid, pszRfc1766, nChar); if (!pszRfc1766) return E_INVALIDARG; @@ -1263,7 +1263,7 @@ HRESULT WINAPI LcidToRfc1766W( LPWSTR pszRfc1766, INT nChar) { - TRACE("%04x %p %u\n", lcid, pszRfc1766, nChar); + TRACE("%04lx %p %u\n", lcid, pszRfc1766, nChar); if (!pszRfc1766) return E_INVALIDARG; @@ -1517,7 +1517,7 @@ static HRESULT WINAPI MLANGCF_CreateInstance(IClassFactory *iface, IUnknown *pOu hres = IUnknown_QueryInterface(punk, riid, ppobj); IUnknown_Release(punk); } - TRACE("returning (%p) -> %x\n", *ppobj, hres); + TRACE("returning (%p) -> %lx\n", *ppobj, hres); return hres; } @@ -1625,7 +1625,7 @@ static HRESULT WINAPI fnIEnumCodePage_QueryInterface( || IsEqualGUID(riid, &IID_IEnumCodePage)) { IEnumCodePage_AddRef(iface); - TRACE("Returning IID_IEnumCodePage %p ref = %d\n", This, This->ref); + TRACE("Returning IID_IEnumCodePage %p ref = %ld\n", This, This->ref); *ppvObject = &This->IEnumCodePage_iface; return S_OK; } @@ -1647,7 +1647,7 @@ static ULONG WINAPI fnIEnumCodePage_Release( EnumCodePage_impl *This = impl_from_IEnumCodePage( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("%p ref = %d\n", This, ref); + TRACE("%p ref = %ld\n", This, ref); if (ref == 0) { TRACE("Destroying %p\n", This); @@ -1676,7 +1676,7 @@ static HRESULT WINAPI fnIEnumCodePage_Next( ULONG i; EnumCodePage_impl *This = impl_from_IEnumCodePage( iface ); - TRACE("%p %u %p %p\n", This, celt, rgelt, pceltFetched); + TRACE("%p %lu %p %p\n", This, celt, rgelt, pceltFetched); if (!pceltFetched) return S_FALSE; *pceltFetched = 0; @@ -1694,7 +1694,7 @@ static HRESULT WINAPI fnIEnumCodePage_Next( for (i = 0; i < celt; i++) { - TRACE("#%u: %08x %u %u %s %s %s %s %s %s %d\n", + TRACE("#%lu: %08lx %u %u %s %s %s %s %s %s %d\n", i, rgelt[i].dwFlags, rgelt[i].uiCodePage, rgelt[i].uiFamilyCodePage, wine_dbgstr_w(rgelt[i].wszDescription), @@ -1725,7 +1725,7 @@ static HRESULT WINAPI fnIEnumCodePage_Skip( { EnumCodePage_impl *This = impl_from_IEnumCodePage( iface ); - TRACE("%p %u\n", This, celt); + TRACE("%p %lu\n", This, celt); if (celt >= This->total) return S_FALSE; @@ -1751,7 +1751,7 @@ static HRESULT EnumCodePage_create( MLang_impl* mlang, DWORD grfFlags, MIMECPINFO *cpinfo; UINT i, n; - TRACE("%p, %08x, %04x, %p\n", mlang, grfFlags, LangId, ppEnumCodePage); + TRACE("%p, %08lx, %04x, %p\n", mlang, grfFlags, LangId, ppEnumCodePage); if (!grfFlags) /* enumerate internal data base of encodings */ grfFlags = MIMECONTF_MIME_LATEST; @@ -1783,7 +1783,7 @@ static HRESULT EnumCodePage_create( MLang_impl* mlang, DWORD grfFlags, } } - TRACE("enumerated %d codepages with flags %08x\n", ecp->total, grfFlags); + TRACE("enumerated %ld codepages with flags %08lx\n", ecp->total, grfFlags); *ppEnumCodePage = &ecp->IEnumCodePage_iface; @@ -1818,7 +1818,7 @@ static HRESULT WINAPI fnIEnumScript_QueryInterface( || IsEqualGUID(riid, &IID_IEnumScript)) { IEnumScript_AddRef(iface); - TRACE("Returning IID_IEnumScript %p ref = %d\n", This, This->ref); + TRACE("Returning IID_IEnumScript %p ref = %ld\n", This, This->ref); *ppvObject = &This->IEnumScript_iface; return S_OK; } @@ -1840,7 +1840,7 @@ static ULONG WINAPI fnIEnumScript_Release( EnumScript_impl *This = impl_from_IEnumScript( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("%p ref = %d\n", This, ref); + TRACE("%p ref = %ld\n", This, ref); if (ref == 0) { TRACE("Destroying %p\n", This); @@ -1868,7 +1868,7 @@ static HRESULT WINAPI fnIEnumScript_Next( { EnumScript_impl *This = impl_from_IEnumScript( iface ); - TRACE("%p %u %p %p\n", This, celt, rgelt, pceltFetched); + TRACE("%p %lu %p %p\n", This, celt, rgelt, pceltFetched); if (!pceltFetched || !rgelt) return E_FAIL; @@ -1903,7 +1903,7 @@ static HRESULT WINAPI fnIEnumScript_Skip( { EnumScript_impl *This = impl_from_IEnumScript( iface ); - TRACE("%p %u\n", This, celt); + TRACE("%p %lu\n", This, celt); if (celt >= This->total) return S_FALSE; @@ -1928,7 +1928,7 @@ static HRESULT EnumScript_create( MLang_impl* mlang, DWORD dwFlags, EnumScript_impl *es; UINT i; - TRACE("%p, %08x, %04x, %p\n", mlang, dwFlags, LangId, ppEnumScript); + TRACE("%p, %08lx, %04x, %p\n", mlang, dwFlags, LangId, ppEnumScript); if (!dwFlags) /* enumerate all available scripts */ dwFlags = SCRIPTCONTF_SCRIPT_USER | SCRIPTCONTF_SCRIPT_HIDE | SCRIPTCONTF_SCRIPT_SYSTEM; @@ -1953,7 +1953,7 @@ static HRESULT EnumScript_create( MLang_impl* mlang, DWORD dwFlags, es->script_info[i].wszProportionalFont, MAX_MIMEFACE_NAME); } - TRACE("enumerated %d scripts with flags %08x\n", es->total, dwFlags); + TRACE("enumerated %ld scripts with flags %08lx\n", es->total, dwFlags); *ppEnumScript = &es->IEnumScript_iface; @@ -2049,7 +2049,7 @@ static HRESULT WINAPI fnIMLangFontLink_MapFont( HFONT hSrcFont, HFONT* phDestFont) { - TRACE("(%p)->%p %08x %p %p\n",iface, hDC, dwCodePages, hSrcFont, phDestFont); + TRACE("(%p)->%p %08lx %p %p\n",iface, hDC, dwCodePages, hSrcFont, phDestFont); return map_font(hDC, dwCodePages, hSrcFont, phDestFont); } @@ -2165,7 +2165,7 @@ static HRESULT WINAPI fnIMultiLanguage_EnumCodePages( { MLang_impl *This = impl_from_IMultiLanguage( iface ); - TRACE("%p %08x %p\n", This, grfFlags, ppEnumCodePage); + TRACE("%p %08lx %p\n", This, grfFlags, ppEnumCodePage); return EnumCodePage_create( This, grfFlags, 0, ppEnumCodePage ); } @@ -2284,7 +2284,7 @@ static HRESULT WINAPI fnIEnumRfc1766_QueryInterface( || IsEqualGUID(riid, &IID_IEnumRfc1766)) { IEnumRfc1766_AddRef(iface); - TRACE("Returning IID_IEnumRfc1766 %p ref = %d\n", This, This->ref); + TRACE("Returning IID_IEnumRfc1766 %p ref = %ld\n", This, This->ref); *ppvObject = &This->IEnumRfc1766_iface; return S_OK; } @@ -2306,7 +2306,7 @@ static ULONG WINAPI fnIEnumRfc1766_Release( EnumRfc1766_impl *This = impl_from_IEnumRfc1766( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("%p ref = %d\n", This, ref); + TRACE("%p ref = %ld\n", This, ref); if (ref == 0) { TRACE("Destroying %p\n", This); @@ -2335,7 +2335,7 @@ static HRESULT WINAPI fnIEnumRfc1766_Next( ULONG i; EnumRfc1766_impl *This = impl_from_IEnumRfc1766( iface ); - TRACE("%p %u %p %p\n", This, celt, rgelt, pceltFetched); + TRACE("%p %lu %p %p\n", This, celt, rgelt, pceltFetched); if (!pceltFetched) return S_FALSE; *pceltFetched = 0; @@ -2353,7 +2353,7 @@ static HRESULT WINAPI fnIEnumRfc1766_Next( for (i = 0; i < celt; i++) { - TRACE("#%u: %08x %s %s\n", + TRACE("#%lu: %08lx %s %s\n", i, rgelt[i].lcid, wine_dbgstr_w(rgelt[i].wszRfc1766), wine_dbgstr_w(rgelt[i].wszLocaleName)); @@ -2378,7 +2378,7 @@ static HRESULT WINAPI fnIEnumRfc1766_Skip( { EnumRfc1766_impl *This = impl_from_IEnumRfc1766( iface ); - TRACE("%p %u\n", This, celt); + TRACE("%p %lu\n", This, celt); if (celt >= This->total) return S_FALSE; @@ -2462,7 +2462,7 @@ static HRESULT EnumRfc1766_create(LANGID LangId, IEnumRfc1766 **ppEnum) EnumSystemLocalesW(enum_locales_proc, 0/*LOCALE_SUPPORTED*/); TlsSetValue(MLANG_tls_index, NULL); - TRACE("enumerated %d rfc1766 structures\n", data.total); + TRACE("enumerated %ld rfc1766 structures\n", data.total); if (!data.total) { @@ -2498,7 +2498,7 @@ static HRESULT WINAPI fnIMultiLanguage_GetRfc1766Info( { LCTYPE type = LOCALE_SLANGUAGE; - TRACE("(%p, 0x%04x, %p)\n", iface, Locale, pRfc1766Info); + TRACE("(%p, 0x%04lx, %p)\n", iface, Locale, pRfc1766Info); if (!pRfc1766Info) return E_INVALIDARG; @@ -2513,7 +2513,7 @@ static HRESULT WINAPI fnIMultiLanguage_GetRfc1766Info( else { if (!SUBLANGID(Locale)) { - TRACE("SUBLANGID missing in 0x%04x\n", Locale); + TRACE("SUBLANGID missing in 0x%04lx\n", Locale); return E_FAIL; } } @@ -2625,7 +2625,7 @@ static ULONG WINAPI fnIMultiLanguage3_Release( IMultiLanguage3* iface ) MLang_impl *This = impl_from_IMultiLanguage3( iface ); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%d)\n", This, ref); + TRACE("(%p)->(%ld)\n", This, ref); if (ref == 0) { HeapFree(GetProcessHeap(), 0, This); @@ -2676,7 +2676,7 @@ static void fill_cp_info(const struct mlang_data *ml_data, UINT index, MIMECPINF MultiByteToWideChar(CP_ACP, 0, ml_data->proportional_font, -1, mime_cp_info->wszProportionalFont, ARRAY_SIZE(mime_cp_info->wszProportionalFont)); - TRACE("%08x %u %u %s %s %s %s %s %s %d\n", + TRACE("%08lx %u %u %s %s %s %s %s %s %d\n", mime_cp_info->dwFlags, mime_cp_info->uiCodePage, mime_cp_info->uiFamilyCodePage, wine_dbgstr_w(mime_cp_info->wszDescription), @@ -2730,7 +2730,7 @@ static HRESULT WINAPI fnIMultiLanguage3_EnumCodePages( { MLang_impl *This = impl_from_IMultiLanguage3( iface ); - TRACE("%p %08x %04x %p\n", This, grfFlags, LangId, ppEnumCodePage); + TRACE("%p %08lx %04x %p\n", This, grfFlags, LangId, ppEnumCodePage); return EnumCodePage_create( This, grfFlags, LangId, ppEnumCodePage ); } @@ -2858,7 +2858,7 @@ static HRESULT WINAPI fnIMultiLanguage3_GetRfc1766FromLcid( { WCHAR buf[MAX_RFC1766_NAME]; - TRACE("%p %04x %p\n", iface, lcid, pbstrRfc1766); + TRACE("%p %04lx %p\n", iface, lcid, pbstrRfc1766); if (!pbstrRfc1766) return E_INVALIDARG; @@ -2914,7 +2914,7 @@ static HRESULT WINAPI fnIMultiLanguage3_GetRfc1766Info( static LANGID last_lang = -1; LCTYPE type = LOCALE_SLANGUAGE; - TRACE("(%p, 0x%04x, 0x%04x, %p)\n", iface, Locale, LangId, pRfc1766Info); + TRACE("(%p, 0x%04lx, 0x%04x, %p)\n", iface, Locale, LangId, pRfc1766Info); if (!pRfc1766Info) return E_INVALIDARG; @@ -2929,7 +2929,7 @@ static HRESULT WINAPI fnIMultiLanguage3_GetRfc1766Info( else { if (!SUBLANGID(Locale)) { - TRACE("SUBLANGID missing in 0x%04x\n", Locale); + TRACE("SUBLANGID missing in 0x%04lx\n", Locale); return E_FAIL; } } @@ -2961,7 +2961,7 @@ static HRESULT WINAPI fnIMultiLanguage3_CreateConvertCharset( { HRESULT hr; - TRACE("(%u %u 0x%08x %p)\n", src_cp, dst_cp, prop, convert_charset); + TRACE("(%u %u 0x%08lx %p)\n", src_cp, dst_cp, prop, convert_charset); hr = MLangConvertCharset_create(NULL, (void**)convert_charset); if (FAILED(hr)) return hr; @@ -2984,7 +2984,7 @@ static HRESULT WINAPI fnIMultiLanguage3_ConvertStringInIStream( STATSTG stat; HRESULT hr; - TRACE("%p %0x8 %s %u %u %p %p\n", + TRACE("%p %0lx8 %s %lu %lu %p %p\n", pdwMode, dwFlag, debugstr_w(lpFallBack), dwSrcEncoding, dwDstEncoding, pstmIn, pstmOut); FIXME("dwFlag and lpFallBack not handled\n"); @@ -3029,7 +3029,7 @@ static HRESULT WINAPI fnIMultiLanguage3_ConvertStringToUnicodeEx( WCHAR* lpFallBack) { if (dwFlag || lpFallBack) - FIXME("Ignoring dwFlag (0x%x/%d) and lpFallBack (%p)\n", + FIXME("Ignoring dwFlag (0x%lx/%ld) and lpFallBack (%p)\n", dwFlag, dwFlag, lpFallBack); return ConvertINetMultiByteToUnicode(pdwMode, dwEncoding, @@ -3113,7 +3113,7 @@ static HRESULT WINAPI fnIMultiLanguage3_GetCodePageDescription( /* Find first instance */ unsigned int i,n; - TRACE ("%u, %04x, %p, %d\n", uiCodePage, lcid, lpWideCharStr, cchWideChar); + TRACE ("%u, %04lx, %p, %d\n", uiCodePage, lcid, lpWideCharStr, cchWideChar); for (i = 0; i < ARRAY_SIZE(mlang_data); i++) { for (n = 0; n < mlang_data[i].number_of_cp; n++) @@ -3171,7 +3171,7 @@ static HRESULT WINAPI fnIMultiLanguage3_EnumScripts( { MLang_impl *This = impl_from_IMultiLanguage3( iface ); - TRACE("%p %08x %04x %p\n", This, dwFlags, LangId, ppEnumScript); + TRACE("%p %08lx %04x %p\n", This, dwFlags, LangId, ppEnumScript); return EnumScript_create( This, dwFlags, LangId, ppEnumScript ); } @@ -3185,7 +3185,7 @@ static HRESULT WINAPI fnIMultiLanguage3_ValidateCodePageEx( unsigned int i; MLang_impl *This = impl_from_IMultiLanguage3( iface ); - TRACE("%p %u %p %08x\n", This, uiCodePage, hwnd, dwfIODControl); + TRACE("%p %u %p %08lx\n", This, uiCodePage, hwnd, dwfIODControl); /* quick check for kernel32 supported code pages */ if (IsValidCodePage(uiCodePage)) @@ -3221,7 +3221,7 @@ static HRESULT WINAPI fnIMultiLanguage3_DetectOutboundCodePage( { MLang_impl *This = impl_from_IMultiLanguage3( iface ); - FIXME("(%p)->(%08x %s %p %u %p %p(%u) %s)\n", This, dwFlags, debugstr_w(lpWideCharStr), + FIXME("(%p)->(%08lx %s %p %u %p %p(%u) %s)\n", This, dwFlags, debugstr_w(lpWideCharStr), puiPreferredCodePages, nPreferredCodePages, puiDetectedCodePages, pnDetectedCodePages, pnDetectedCodePages ? *pnDetectedCodePages : 0, debugstr_w(lpSpecialChar)); @@ -3246,7 +3246,7 @@ static HRESULT WINAPI fnIMultiLanguage3_DetectOutboundCodePageInIStream( { MLang_impl *This = impl_from_IMultiLanguage3( iface ); - FIXME("(%p)->(%08x %p %p %u %p %p(%u) %s)\n", This, dwFlags, pStrIn, + FIXME("(%p)->(%08lx %p %p %u %p %p(%u) %s)\n", This, dwFlags, pStrIn, puiPreferredCodePages, nPreferredCodePages, puiDetectedCodePages, pnDetectedCodePages, pnDetectedCodePages ? *pnDetectedCodePages : 0, debugstr_w(lpSpecialChar)); @@ -3362,7 +3362,7 @@ static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* iface, LONG i; DWORD cps = 0; - TRACE("(%p)->(%s:%d %x %p %p)\n", This, debugstr_wn(src, src_len), src_len, priority_cp, + TRACE("(%p)->(%s:%ld %lx %p %p)\n", This, debugstr_wn(src, src_len), src_len, priority_cp, codepages, ret_len); if (codepages) *codepages = 0; @@ -3405,7 +3405,7 @@ static HRESULT WINAPI fnIMLangFontLink2_CodePageToCodePages(IMLangFontLink2* ifa if (rc) { *codepages = cs.fs.fsCsb[0]; - TRACE("resulting codepages 0x%x\n", *codepages); + TRACE("resulting codepages 0x%lx\n", *codepages); return S_OK; } @@ -3423,7 +3423,7 @@ static HRESULT WINAPI fnIMLangFontLink2_CodePagesToCodePage(IMLangFontLink2* ifa BOOL rc; UINT i; - TRACE("(%p)->(0x%x %u %p)\n", This, codepages, def_codepage, codepage); + TRACE("(%p)->(0x%lx %u %p)\n", This, codepages, def_codepage, codepage); *codepage = 0; @@ -3472,7 +3472,7 @@ static HRESULT WINAPI fnIMLangFontLink2_GetFontCodePages(IMLangFontLink2 *iface, SelectObject(hdc, old_font); *codepages = fontsig.fsCsb[0]; - TRACE("ret 0x%x\n", fontsig.fsCsb[0]); + TRACE("ret 0x%lx\n", fontsig.fsCsb[0]); return S_OK; } @@ -3497,7 +3497,7 @@ static HRESULT WINAPI fnIMLangFontLink2_MapFont(IMLangFontLink2* This, { HFONT old_font; - TRACE("(%p)->%p %08x %04x %p\n",This, hDC, dwCodePages, chSrc, pFont); + TRACE("(%p)->%p %08lx %04x %p\n",This, hDC, dwCodePages, chSrc, pFont); if (!hDC) return E_FAIL; @@ -3549,7 +3549,7 @@ static HRESULT WINAPI fnIMLangFontLink2_GetScriptFontInfo(IMLangFontLink2* This, { UINT i, j; - TRACE("(%p)->%u %x %p %p\n", This, sid, dwFlags, puiFonts, pScriptFont); + TRACE("(%p)->%u %lx %p %p\n", This, sid, dwFlags, puiFonts, pScriptFont); if (!dwFlags) dwFlags = SCRIPTCONTF_PROPORTIONAL_FONT; @@ -3658,7 +3658,7 @@ static HRESULT WINAPI fnIMLangLineBreakConsole_BreakLineML( LONG* plLineLen, LONG* plSkipLen) { - FIXME("(%p)->%p %i %i %i %i %p %p\n", iface, pSrcMLStr, lSrcPos, lSrcLen, cMinColumns, cMaxColumns, plLineLen, plSkipLen); + FIXME("(%p)->%p %li %li %li %li %p %p\n", iface, pSrcMLStr, lSrcPos, lSrcLen, cMinColumns, cMaxColumns, plLineLen, plSkipLen); return E_NOTIMPL; } @@ -3671,7 +3671,7 @@ static HRESULT WINAPI fnIMLangLineBreakConsole_BreakLineW( LONG* pcchLine, LONG* pcchSkip ) { - FIXME("(%p)->%i %s %i %i %p %p\n", iface, locale, debugstr_wn(pszSrc,cchSrc), cchSrc, cMaxColumns, pcchLine, pcchSkip); + FIXME("(%p)->%li %s %li %li %p %p\n", iface, locale, debugstr_wn(pszSrc,cchSrc), cchSrc, cMaxColumns, pcchLine, pcchSkip); *pcchLine = cchSrc; *pcchSkip = 0; @@ -3690,7 +3690,7 @@ static HRESULT WINAPI fnIMLangLineBreakConsole_BreakLineA( { LONG i, line = cchSrc, skip = 0; - FIXME("(%p)->%i %i %s %i %i %p %p\n", iface, locale, uCodePage, debugstr_an(pszSrc,cchSrc), cchSrc, cMaxColumns, pcchLine, pcchSkip); + FIXME("(%p)->%li %i %s %li %li %p %p\n", iface, locale, uCodePage, debugstr_an(pszSrc,cchSrc), cchSrc, cMaxColumns, pcchLine, pcchSkip); if (uCodePage == CP_USASCII && cchSrc > cMaxColumns) { @@ -3757,7 +3757,7 @@ static ULONG WINAPI MLangConvertCharset_AddRef(IMLangConvertCharset *iface) { struct convert_charset *This = impl_from_IMLangConvertCharset(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); return ref; } @@ -3766,7 +3766,7 @@ static ULONG WINAPI MLangConvertCharset_Release(IMLangConvertCharset *iface) struct convert_charset *This = impl_from_IMLangConvertCharset(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p)->(%u)\n", This, ref); + TRACE("(%p)->(%lu)\n", This, ref); if (!ref) { HeapFree(GetProcessHeap(), 0, This); @@ -3781,11 +3781,11 @@ static HRESULT WINAPI MLangConvertCharset_Initialize(IMLangConvertCharset *iface { struct convert_charset *This = impl_from_IMLangConvertCharset(iface); - TRACE("(%p)->(%u %u 0x%08x)\n", This, src_cp, dst_cp, prop); + TRACE("(%p)->(%u %u 0x%08lx)\n", This, src_cp, dst_cp, prop); prop &= ~MLCONVCHARF_USEDEFCHAR; if (prop) - FIXME("property 0x%08x not supported\n", prop); + FIXME("property 0x%08lx not supported\n", prop); This->src_cp = src_cp; This->dst_cp = dst_cp;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mmdevapi/Makefile.in | 1 - dlls/mmdevapi/audiovolume.c | 4 +-- dlls/mmdevapi/devenum.c | 66 +++++++++++++++++++++--------------------- dlls/mmdevapi/main.c | 12 ++++---- dlls/mmdevapi/spatialaudio.c | 38 ++++++++++++------------ 5 files changed, 60 insertions(+), 61 deletions(-) diff --git a/dlls/mmdevapi/Makefile.in b/dlls/mmdevapi/Makefile.in index d61fce75a0e..b60372b812b 100644 --- a/dlls/mmdevapi/Makefile.in +++ b/dlls/mmdevapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mmdevapi.dll IMPORTS = uuid ole32 oleaut32 user32 advapi32 diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 6f403cf348a..bbaba7750b3 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -78,7 +78,7 @@ static ULONG WINAPI AEV_AddRef(IAudioEndpointVolumeEx *iface) { AEVImpl *This = impl_from_IAudioEndpointVolumeEx(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) new ref %u\n", This, ref); + TRACE("(%p) new ref %lu\n", This, ref); return ref; } @@ -86,7 +86,7 @@ static ULONG WINAPI AEV_Release(IAudioEndpointVolumeEx *iface) { AEVImpl *This = impl_from_IAudioEndpointVolumeEx(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) new ref %u\n", This, ref); + TRACE("(%p) new ref %lu\n", This, ref); if (!ref) AudioEndpointVolume_Destroy(This); return ref; diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index b17572425f3..ed1daa85d35 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -117,14 +117,14 @@ static HRESULT MMDevPropStore_OpenPropKey(const GUID *guid, DWORD flow, HKEY *pr StringFromGUID2(guid, buffer, 39); if ((ret = RegOpenKeyExW(flow == eRender ? key_render : key_capture, buffer, 0, KEY_READ|KEY_WRITE|KEY_WOW64_64KEY, &key)) != ERROR_SUCCESS) { - WARN("Opening key %s failed with %u\n", debugstr_w(buffer), ret); + WARN("Opening key %s failed with %lu\n", debugstr_w(buffer), ret); return E_FAIL; } ret = RegOpenKeyExW(key, L"Properties", 0, KEY_READ|KEY_WRITE|KEY_WOW64_64KEY, propkey); RegCloseKey(key); if (ret != ERROR_SUCCESS) { - WARN("Opening key Properties failed with %u\n", ret); + WARN("Opening key Properties failed with %lu\n", ret); return E_FAIL; } return S_OK; @@ -148,7 +148,7 @@ static HRESULT MMDevice_GetPropValue(const GUID *devguid, DWORD flow, REFPROPERT ret = RegGetValueW(regkey, NULL, buffer, RRF_RT_ANY, &type, NULL, &size); if (ret != ERROR_SUCCESS) { - WARN("Reading %s returned %d\n", debugstr_w(buffer), ret); + WARN("Reading %s returned %ld\n", debugstr_w(buffer), ret); RegCloseKey(regkey); PropVariantClear(pv); return S_OK; @@ -184,7 +184,7 @@ static HRESULT MMDevice_GetPropValue(const GUID *devguid, DWORD flow, REFPROPERT break; } default: - ERR("Unknown/unhandled type: %u\n", type); + ERR("Unknown/unhandled type: %lu\n", type); PropVariantClear(pv); break; } @@ -216,7 +216,7 @@ static HRESULT MMDevice_SetPropValue(const GUID *devguid, DWORD flow, REFPROPERT case VT_BLOB: { ret = RegSetValueExW(regkey, buffer, 0, REG_BINARY, pv->blob.pBlobData, pv->blob.cbSize); - TRACE("Blob %p %u\n", pv->blob.pBlobData, pv->blob.cbSize); + TRACE("Blob %p %lu\n", pv->blob.pBlobData, pv->blob.cbSize); break; } @@ -232,7 +232,7 @@ static HRESULT MMDevice_SetPropValue(const GUID *devguid, DWORD flow, REFPROPERT break; } RegCloseKey(regkey); - TRACE("Writing %s returned %u\n", debugstr_w(buffer), ret); + TRACE("Writing %s returned %lu\n", debugstr_w(buffer), ret); return hr; } @@ -387,7 +387,7 @@ HRESULT load_devices_from_reg(void) { RegCloseKey(key_capture); key_render = key_capture = NULL; - WARN("Couldn't create key: %u\n", ret); + WARN("Couldn't create key: %lu\n", ret); return E_FAIL; } @@ -529,7 +529,7 @@ static ULONG WINAPI MMDevice_AddRef(IMMDevice *iface) LONG ref; ref = InterlockedIncrement(&This->ref); - TRACE("Refcount now %i\n", ref); + TRACE("Refcount now %li\n", ref); return ref; } @@ -539,7 +539,7 @@ static ULONG WINAPI MMDevice_Release(IMMDevice *iface) LONG ref; ref = InterlockedDecrement(&This->ref); - TRACE("Refcount now %i\n", ref); + TRACE("Refcount now %li\n", ref); return ref; } @@ -548,7 +548,7 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls HRESULT hr = E_NOINTERFACE; MMDevice *This = impl_from_IMMDevice(iface); - TRACE("(%p)->(%s, %x, %p, %p)\n", iface, debugstr_guid(riid), clsctx, params, ppv); + TRACE("(%p)->(%s, %lx, %p, %p)\n", iface, debugstr_guid(riid), clsctx, params, ppv); if (!ppv) return E_POINTER; @@ -630,14 +630,14 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls if (FAILED(hr)) *ppv = NULL; - TRACE("Returning %08x\n", hr); + TRACE("Returning %08lx\n", hr); return hr; } static HRESULT WINAPI MMDevice_OpenPropertyStore(IMMDevice *iface, DWORD access, IPropertyStore **ppv) { MMDevice *This = impl_from_IMMDevice(iface); - TRACE("(%p)->(%x,%p)\n", This, access, ppv); + TRACE("(%p)->(%lx,%p)\n", This, access, ppv); if (!ppv) return E_POINTER; @@ -773,7 +773,7 @@ static ULONG WINAPI MMDevCol_AddRef(IMMDeviceCollection *iface) { MMDevColImpl *This = impl_from_IMMDeviceCollection(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("Refcount now %i\n", ref); + TRACE("Refcount now %li\n", ref); return ref; } @@ -781,7 +781,7 @@ static ULONG WINAPI MMDevCol_Release(IMMDeviceCollection *iface) { MMDevColImpl *This = impl_from_IMMDeviceCollection(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("Refcount now %i\n", ref); + TRACE("Refcount now %li\n", ref); if (!ref) MMDevCol_Destroy(This); return ref; @@ -878,7 +878,7 @@ static ULONG WINAPI MMDevEnum_AddRef(IMMDeviceEnumerator *iface) { MMDevEnumImpl *This = impl_from_IMMDeviceEnumerator(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("Refcount now %i\n", ref); + TRACE("Refcount now %li\n", ref); return ref; } @@ -886,14 +886,14 @@ static ULONG WINAPI MMDevEnum_Release(IMMDeviceEnumerator *iface) { MMDevEnumImpl *This = impl_from_IMMDeviceEnumerator(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("Refcount now %i\n", ref); + TRACE("Refcount now %li\n", ref); return ref; } static HRESULT WINAPI MMDevEnum_EnumAudioEndpoints(IMMDeviceEnumerator *iface, EDataFlow flow, DWORD mask, IMMDeviceCollection **devices) { MMDevEnumImpl *This = impl_from_IMMDeviceEnumerator(iface); - TRACE("(%p)->(%u,%u,%p)\n", This, flow, mask, devices); + TRACE("(%p)->(%u,%lu,%p)\n", This, flow, mask, devices); if (!devices) return E_POINTER; *devices = NULL; @@ -1011,7 +1011,7 @@ static HRESULT WINAPI MMDevEnum_GetDevice(IMMDeviceEnumerator *iface, const WCHA hr = IMMDevice_GetId(dev, &str); if (FAILED(hr)) { - WARN("GetId failed: %08x\n", hr); + WARN("GetId failed: %08lx\n", hr); continue; } @@ -1073,7 +1073,7 @@ static BOOL notify_if_changed(EDataFlow flow, ERole role, HKEY key, if(def_dev){ hr = IMMDevice_GetId(def_dev, &id); if(FAILED(hr)){ - ERR("GetId failed: %08x\n", hr); + ERR("GetId failed: %08lx\n", hr); return FALSE; } }else @@ -1106,7 +1106,7 @@ static BOOL notify_if_changed(EDataFlow flow, ERole role, HKEY key, if(def_dev){ hr = IMMDevice_GetId(def_dev, &id); if(FAILED(hr)){ - ERR("GetId failed: %08x\n", hr); + ERR("GetId failed: %08lx\n", hr); return FALSE; } }else @@ -1132,7 +1132,7 @@ static DWORD WINAPI notif_thread_proc(void *user) if(RegCreateKeyExW(HKEY_CURRENT_USER, reg_key, 0, NULL, 0, MAXIMUM_ALLOWED, NULL, &key, NULL) != ERROR_SUCCESS){ - ERR("RegCreateKeyEx failed: %u\n", GetLastError()); + ERR("RegCreateKeyEx failed: %lu\n", GetLastError()); return 1; } @@ -1155,7 +1155,7 @@ static DWORD WINAPI notif_thread_proc(void *user) while(1){ if(RegNotifyChangeKeyValue(key, FALSE, REG_NOTIFY_CHANGE_LAST_SET, NULL, FALSE) != ERROR_SUCCESS){ - ERR("RegNotifyChangeKeyValue failed: %u\n", GetLastError()); + ERR("RegNotifyChangeKeyValue failed: %lu\n", GetLastError()); RegCloseKey(key); g_notif_thread = NULL; return 1; @@ -1205,7 +1205,7 @@ static HRESULT WINAPI MMDevEnum_RegisterEndpointNotificationCallback(IMMDeviceEn if(!g_notif_thread){ g_notif_thread = CreateThread(NULL, 0, notif_thread_proc, NULL, 0, NULL); if(!g_notif_thread) - ERR("CreateThread failed: %u\n", GetLastError()); + ERR("CreateThread failed: %lu\n", GetLastError()); } LeaveCriticalSection(&g_notif_lock); @@ -1264,7 +1264,7 @@ static HRESULT MMDevPropStore_Create(MMDevice *parent, DWORD access, IPropertySt && access != STGM_WRITE && access != STGM_READWRITE) { - WARN("Invalid access %08x\n", access); + WARN("Invalid access %08lx\n", access); return E_INVALIDARG; } This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); @@ -1305,7 +1305,7 @@ static ULONG WINAPI MMDevPropStore_AddRef(IPropertyStore *iface) { MMDevPropStore *This = impl_from_IPropertyStore(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("Refcount now %i\n", ref); + TRACE("Refcount now %li\n", ref); return ref; } @@ -1313,7 +1313,7 @@ static ULONG WINAPI MMDevPropStore_Release(IPropertyStore *iface) { MMDevPropStore *This = impl_from_IPropertyStore(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("Refcount now %i\n", ref); + TRACE("Refcount now %li\n", ref); if (!ref) MMDevPropStore_Destroy(This); return ref; @@ -1341,7 +1341,7 @@ static HRESULT WINAPI MMDevPropStore_GetCount(IPropertyStore *iface, DWORD *npro i++; } while (1); RegCloseKey(propkey); - TRACE("Returning %i\n", i); + TRACE("Returning %li\n", i); *nprops = i; return S_OK; } @@ -1354,7 +1354,7 @@ static HRESULT WINAPI MMDevPropStore_GetAt(IPropertyStore *iface, DWORD prop, PR HRESULT hr; HKEY propkey; - TRACE("(%p)->(%u,%p)\n", iface, prop, key); + TRACE("(%p)->(%lu,%p)\n", iface, prop, key); if (!key) return E_POINTER; @@ -1365,7 +1365,7 @@ static HRESULT WINAPI MMDevPropStore_GetAt(IPropertyStore *iface, DWORD prop, PR if (RegEnumValueW(propkey, prop, buffer, &len, NULL, NULL, NULL, NULL) != ERROR_SUCCESS || len <= 39) { - WARN("GetAt %u failed\n", prop); + WARN("GetAt %lu failed\n", prop); return E_INVALIDARG; } RegCloseKey(propkey); @@ -1378,7 +1378,7 @@ static HRESULT WINAPI MMDevPropStore_GetAt(IPropertyStore *iface, DWORD prop, PR static HRESULT WINAPI MMDevPropStore_GetValue(IPropertyStore *iface, REFPROPERTYKEY key, PROPVARIANT *pv) { MMDevPropStore *This = impl_from_IPropertyStore(iface); - TRACE("(%p)->(\"%s,%u\", %p)\n", This, key ? debugstr_guid(&key->fmtid) : NULL, key ? key->pid : 0, pv); + TRACE("(%p)->(\"%s,%lu\", %p)\n", This, key ? debugstr_guid(&key->fmtid) : NULL, key ? key->pid : 0, pv); if (!key || !pv) return E_POINTER; @@ -1403,7 +1403,7 @@ static HRESULT WINAPI MMDevPropStore_GetValue(IPropertyStore *iface, REFPROPERTY static HRESULT WINAPI MMDevPropStore_SetValue(IPropertyStore *iface, REFPROPERTYKEY key, REFPROPVARIANT pv) { MMDevPropStore *This = impl_from_IPropertyStore(iface); - TRACE("(%p)->(\"%s,%u\", %p)\n", This, key ? debugstr_guid(&key->fmtid) : NULL, key ? key->pid : 0, pv); + TRACE("(%p)->(\"%s,%lu\", %p)\n", This, key ? debugstr_guid(&key->fmtid) : NULL, key ? key->pid : 0, pv); if (!key || !pv) return E_POINTER; @@ -1506,7 +1506,7 @@ static ULONG WINAPI info_device_ps_Release(IPropertyStore *iface) static HRESULT WINAPI info_device_ps_GetValue(IPropertyStore *iface, REFPROPERTYKEY key, PROPVARIANT *pv) { - TRACE("(static)->(\"%s,%u\", %p)\n", debugstr_guid(&key->fmtid), key ? key->pid : 0, pv); + TRACE("(static)->(\"%s,%lu\", %p)\n", debugstr_guid(&key->fmtid), key ? key->pid : 0, pv); if (!key || !pv) return E_POINTER; @@ -1554,7 +1554,7 @@ static ULONG WINAPI info_device_Release(IMMDevice *iface) static HRESULT WINAPI info_device_OpenPropertyStore(IMMDevice *iface, DWORD access, IPropertyStore **ppv) { - TRACE("(static)->(%x, %p)\n", access, ppv); + TRACE("(static)->(%lx, %p)\n", access, ppv); *ppv = &info_device_ps; return S_OK; } diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 358c1697a23..a814433810a 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -75,7 +75,7 @@ static BOOL load_driver(const WCHAR *name, DriverFuncs *driver) driver->module = LoadLibraryW(driver_module); if(!driver->module){ - TRACE("Unable to load %s: %u\n", wine_dbgstr_w(driver_module), + TRACE("Unable to load %s: %lu\n", wine_dbgstr_w(driver_module), GetLastError()); return FALSE; } @@ -159,7 +159,7 @@ static BOOL WINAPI init_driver(INIT_ONCE *once, void *param, void **context) BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + TRACE("(0x%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved); switch (fdwReason) { @@ -335,7 +335,7 @@ static ULONG WINAPI activate_async_op_AddRef(IActivateAudioInterfaceAsyncOperati { struct activate_async_op *This = impl_from_IActivateAudioInterfaceAsyncOperation(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount now %i\n", This, ref); + TRACE("(%p) refcount now %li\n", This, ref); return ref; } @@ -343,7 +343,7 @@ static ULONG WINAPI activate_async_op_Release(IActivateAudioInterfaceAsyncOperat { struct activate_async_op *This = impl_from_IActivateAudioInterfaceAsyncOperation(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount now %i\n", This, ref); + TRACE("(%p) refcount now %li\n", This, ref); if (!ref) { if(This->result_iface) IUnknown_Release(This->result_iface); @@ -399,7 +399,7 @@ static HRESULT get_mmdevice_by_activatepath(const WCHAR *path, IMMDevice **mmdev hr = MMDevEnum_Create(&IID_IMMDeviceEnumerator, (void**)&devenum); if (FAILED(hr)) { - WARN("Failed to create MMDeviceEnumerator: %08x\n", hr); + WARN("Failed to create MMDeviceEnumerator: %08lx\n", hr); return hr; } @@ -419,7 +419,7 @@ static HRESULT get_mmdevice_by_activatepath(const WCHAR *path, IMMDevice **mmdev } if (FAILED(hr)) { - WARN("Failed to get requested device (%s): %08x\n", debugstr_w(path), hr); + WARN("Failed to get requested device (%s): %08lx\n", debugstr_w(path), hr); *mmdev = NULL; hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); } diff --git a/dlls/mmdevapi/spatialaudio.c b/dlls/mmdevapi/spatialaudio.c index 12ddd5e790a..d77e0a6755c 100644 --- a/dlls/mmdevapi/spatialaudio.c +++ b/dlls/mmdevapi/spatialaudio.c @@ -146,7 +146,7 @@ static ULONG WINAPI SAO_AddRef(ISpatialAudioObject *iface) { SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) new ref %u\n", This, ref); + TRACE("(%p) new ref %lu\n", This, ref); return ref; } @@ -154,7 +154,7 @@ static ULONG WINAPI SAO_Release(ISpatialAudioObject *iface) { SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) new ref %u\n", This, ref); + TRACE("(%p) new ref %lu\n", This, ref); if(!ref){ EnterCriticalSection(&This->sa_stream->lock); list_remove(&This->entry); @@ -272,7 +272,7 @@ static ULONG WINAPI SAORS_AddRef(ISpatialAudioObjectRenderStream *iface) { SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) new ref %u\n", This, ref); + TRACE("(%p) new ref %lu\n", This, ref); return ref; } @@ -280,7 +280,7 @@ static ULONG WINAPI SAORS_Release(ISpatialAudioObjectRenderStream *iface) { SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) new ref %u\n", This, ref); + TRACE("(%p) new ref %lu\n", This, ref); if(!ref){ IAudioClient_Stop(This->client); if(This->update_frames != ~0 && This->update_frames > 0) @@ -325,7 +325,7 @@ static HRESULT WINAPI SAORS_Start(ISpatialAudioObjectRenderStream *iface) hr = IAudioClient_Start(This->client); if(FAILED(hr)){ - WARN("IAudioClient::Start failed: %08x\n", hr); + WARN("IAudioClient::Start failed: %08lx\n", hr); return hr; } @@ -341,7 +341,7 @@ static HRESULT WINAPI SAORS_Stop(ISpatialAudioObjectRenderStream *iface) hr = IAudioClient_Stop(This->client); if(FAILED(hr)){ - WARN("IAudioClient::Stop failed: %08x\n", hr); + WARN("IAudioClient::Stop failed: %08lx\n", hr); return hr; } @@ -377,7 +377,7 @@ static HRESULT WINAPI SAORS_BeginUpdatingAudioObjects(ISpatialAudioObjectRenderS if(This->update_frames > 0){ hr = IAudioRenderClient_GetBuffer(This->render, This->update_frames, (BYTE **)&This->buf); if(FAILED(hr)){ - WARN("GetBuffer failed: %08x\n", hr); + WARN("GetBuffer failed: %08lx\n", hr); This->update_frames = ~0; LeaveCriticalSection(&This->lock); return hr; @@ -441,7 +441,7 @@ static HRESULT WINAPI SAORS_EndUpdatingAudioObjects(ISpatialAudioObjectRenderStr hr = IAudioRenderClient_ReleaseBuffer(This->render, This->update_frames, 0); if(FAILED(hr)) - WARN("ReleaseBuffer failed: %08x\n", hr); + WARN("ReleaseBuffer failed: %08lx\n", hr); } This->update_frames = ~0; @@ -538,7 +538,7 @@ static ULONG WINAPI SAC_AddRef(ISpatialAudioClient *iface) { SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) new ref %u\n", This, ref); + TRACE("(%p) new ref %lu\n", This, ref); return ref; } @@ -546,7 +546,7 @@ static ULONG WINAPI SAC_Release(ISpatialAudioClient *iface) { SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) new ref %u\n", This, ref); + TRACE("(%p) new ref %lu\n", This, ref); if (!ref) { IMMDevice_Release(This->mmdev); heap_free(This); @@ -637,12 +637,12 @@ static const char *debugstr_fmtex(const WAVEFORMATEX *fmt) static char buf[2048]; if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)fmt; - snprintf(buf, sizeof(buf), "tag: 0x%x (%s), ch: %u (mask: 0x%x), rate: %u, depth: %u", + snprintf(buf, sizeof(buf), "tag: 0x%x (%s), ch: %u (mask: 0x%lx), rate: %lu, depth: %u", fmt->wFormatTag, debugstr_guid(&fmtex->SubFormat), fmt->nChannels, fmtex->dwChannelMask, fmt->nSamplesPerSec, fmt->wBitsPerSample); }else{ - snprintf(buf, sizeof(buf), "tag: 0x%x, ch: %u, rate: %u, depth: %u", + snprintf(buf, sizeof(buf), "tag: 0x%x, ch: %u, rate: %lu, depth: %u", fmt->wFormatTag, fmt->nChannels, fmt->nSamplesPerSec, fmt->wBitsPerSample); } @@ -694,13 +694,13 @@ static HRESULT activate_stream(SpatialAudioStreamImpl *stream) hr = IMMDevice_Activate(stream->sa_client->mmdev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&stream->client); if(FAILED(hr)){ - WARN("Activate failed: %08x\n", hr); + WARN("Activate failed: %08lx\n", hr); return hr; } hr = IAudioClient_GetDevicePeriod(stream->client, &period, NULL); if(FAILED(hr)){ - WARN("GetDevicePeriod failed: %08x\n", hr); + WARN("GetDevicePeriod failed: %08lx\n", hr); IAudioClient_Release(stream->client); return hr; } @@ -721,21 +721,21 @@ static HRESULT activate_stream(SpatialAudioStreamImpl *stream) AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST, period, 0, &stream->stream_fmtex.Format, NULL); if(FAILED(hr)){ - WARN("Initialize failed: %08x\n", hr); + WARN("Initialize failed: %08lx\n", hr); IAudioClient_Release(stream->client); return hr; } hr = IAudioClient_SetEventHandle(stream->client, stream->params.EventHandle); if(FAILED(hr)){ - WARN("SetEventHandle failed: %08x\n", hr); + WARN("SetEventHandle failed: %08lx\n", hr); IAudioClient_Release(stream->client); return hr; } hr = IAudioClient_GetService(stream->client, &IID_IAudioRenderClient, (void**)&stream->render); if(FAILED(hr)){ - WARN("GetService(AudioRenderClient) failed: %08x\n", hr); + WARN("GetService(AudioRenderClient) failed: %08lx\n", hr); IAudioClient_Release(stream->client); return hr; } @@ -931,7 +931,7 @@ HRESULT SpatialAudioClient_Create(IMMDevice *mmdev, ISpatialAudioClient **out) hr = IMMDevice_Activate(mmdev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&aclient); if(FAILED(hr)){ - WARN("Activate failed: %08x\n", hr); + WARN("Activate failed: %08lx\n", hr); heap_free(obj); return hr; } @@ -962,7 +962,7 @@ HRESULT SpatialAudioClient_Create(IMMDevice *mmdev, ISpatialAudioClient **out) sizeof(WAVEFORMATEX) + closest->cbSize); CoTaskMemFree(closest); } else if(hr != S_OK){ - WARN("Checking supported formats failed: %08x\n", hr); + WARN("Checking supported formats failed: %08lx\n", hr); heap_free(obj); return hr; }
Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> On Mon, Feb 14, 2022 at 09:27:50AM +0100, Eric Pouech wrote:
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com>
--- dlls/mmdevapi/Makefile.in | 1 - dlls/mmdevapi/audiovolume.c | 4 +-- dlls/mmdevapi/devenum.c | 66 +++++++++++++++++++++--------------------- dlls/mmdevapi/main.c | 12 ++++---- dlls/mmdevapi/spatialaudio.c | 38 ++++++++++++------------ 5 files changed, 60 insertions(+), 61 deletions(-)
diff --git a/dlls/mmdevapi/Makefile.in b/dlls/mmdevapi/Makefile.in index d61fce75a0e..b60372b812b 100644 --- a/dlls/mmdevapi/Makefile.in +++ b/dlls/mmdevapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mmdevapi.dll IMPORTS = uuid ole32 oleaut32 user32 advapi32
diff --git a/dlls/mmdevapi/audiovolume.c b/dlls/mmdevapi/audiovolume.c index 6f403cf348a..bbaba7750b3 100644 --- a/dlls/mmdevapi/audiovolume.c +++ b/dlls/mmdevapi/audiovolume.c @@ -78,7 +78,7 @@ static ULONG WINAPI AEV_AddRef(IAudioEndpointVolumeEx *iface) { AEVImpl *This = impl_from_IAudioEndpointVolumeEx(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) new ref %u\n", This, ref); + TRACE("(%p) new ref %lu\n", This, ref); return ref; }
@@ -86,7 +86,7 @@ static ULONG WINAPI AEV_Release(IAudioEndpointVolumeEx *iface) { AEVImpl *This = impl_from_IAudioEndpointVolumeEx(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) new ref %u\n", This, ref); + TRACE("(%p) new ref %lu\n", This, ref); if (!ref) AudioEndpointVolume_Destroy(This); return ref; diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index b17572425f3..ed1daa85d35 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -117,14 +117,14 @@ static HRESULT MMDevPropStore_OpenPropKey(const GUID *guid, DWORD flow, HKEY *pr StringFromGUID2(guid, buffer, 39); if ((ret = RegOpenKeyExW(flow == eRender ? key_render : key_capture, buffer, 0, KEY_READ|KEY_WRITE|KEY_WOW64_64KEY, &key)) != ERROR_SUCCESS) { - WARN("Opening key %s failed with %u\n", debugstr_w(buffer), ret); + WARN("Opening key %s failed with %lu\n", debugstr_w(buffer), ret); return E_FAIL; } ret = RegOpenKeyExW(key, L"Properties", 0, KEY_READ|KEY_WRITE|KEY_WOW64_64KEY, propkey); RegCloseKey(key); if (ret != ERROR_SUCCESS) { - WARN("Opening key Properties failed with %u\n", ret); + WARN("Opening key Properties failed with %lu\n", ret); return E_FAIL; } return S_OK; @@ -148,7 +148,7 @@ static HRESULT MMDevice_GetPropValue(const GUID *devguid, DWORD flow, REFPROPERT ret = RegGetValueW(regkey, NULL, buffer, RRF_RT_ANY, &type, NULL, &size); if (ret != ERROR_SUCCESS) { - WARN("Reading %s returned %d\n", debugstr_w(buffer), ret); + WARN("Reading %s returned %ld\n", debugstr_w(buffer), ret); RegCloseKey(regkey); PropVariantClear(pv); return S_OK; @@ -184,7 +184,7 @@ static HRESULT MMDevice_GetPropValue(const GUID *devguid, DWORD flow, REFPROPERT break; } default: - ERR("Unknown/unhandled type: %u\n", type); + ERR("Unknown/unhandled type: %lu\n", type); PropVariantClear(pv); break; } @@ -216,7 +216,7 @@ static HRESULT MMDevice_SetPropValue(const GUID *devguid, DWORD flow, REFPROPERT case VT_BLOB: { ret = RegSetValueExW(regkey, buffer, 0, REG_BINARY, pv->blob.pBlobData, pv->blob.cbSize); - TRACE("Blob %p %u\n", pv->blob.pBlobData, pv->blob.cbSize); + TRACE("Blob %p %lu\n", pv->blob.pBlobData, pv->blob.cbSize);
break; } @@ -232,7 +232,7 @@ static HRESULT MMDevice_SetPropValue(const GUID *devguid, DWORD flow, REFPROPERT break; } RegCloseKey(regkey); - TRACE("Writing %s returned %u\n", debugstr_w(buffer), ret); + TRACE("Writing %s returned %lu\n", debugstr_w(buffer), ret); return hr; }
@@ -387,7 +387,7 @@ HRESULT load_devices_from_reg(void) { RegCloseKey(key_capture); key_render = key_capture = NULL; - WARN("Couldn't create key: %u\n", ret); + WARN("Couldn't create key: %lu\n", ret); return E_FAIL; }
@@ -529,7 +529,7 @@ static ULONG WINAPI MMDevice_AddRef(IMMDevice *iface) LONG ref;
ref = InterlockedIncrement(&This->ref); - TRACE("Refcount now %i\n", ref); + TRACE("Refcount now %li\n", ref); return ref; }
@@ -539,7 +539,7 @@ static ULONG WINAPI MMDevice_Release(IMMDevice *iface) LONG ref;
ref = InterlockedDecrement(&This->ref); - TRACE("Refcount now %i\n", ref); + TRACE("Refcount now %li\n", ref); return ref; }
@@ -548,7 +548,7 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls HRESULT hr = E_NOINTERFACE; MMDevice *This = impl_from_IMMDevice(iface);
- TRACE("(%p)->(%s, %x, %p, %p)\n", iface, debugstr_guid(riid), clsctx, params, ppv); + TRACE("(%p)->(%s, %lx, %p, %p)\n", iface, debugstr_guid(riid), clsctx, params, ppv);
if (!ppv) return E_POINTER; @@ -630,14 +630,14 @@ static HRESULT WINAPI MMDevice_Activate(IMMDevice *iface, REFIID riid, DWORD cls if (FAILED(hr)) *ppv = NULL;
- TRACE("Returning %08x\n", hr); + TRACE("Returning %08lx\n", hr); return hr; }
static HRESULT WINAPI MMDevice_OpenPropertyStore(IMMDevice *iface, DWORD access, IPropertyStore **ppv) { MMDevice *This = impl_from_IMMDevice(iface); - TRACE("(%p)->(%x,%p)\n", This, access, ppv); + TRACE("(%p)->(%lx,%p)\n", This, access, ppv);
if (!ppv) return E_POINTER; @@ -773,7 +773,7 @@ static ULONG WINAPI MMDevCol_AddRef(IMMDeviceCollection *iface) { MMDevColImpl *This = impl_from_IMMDeviceCollection(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("Refcount now %i\n", ref); + TRACE("Refcount now %li\n", ref); return ref; }
@@ -781,7 +781,7 @@ static ULONG WINAPI MMDevCol_Release(IMMDeviceCollection *iface) { MMDevColImpl *This = impl_from_IMMDeviceCollection(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("Refcount now %i\n", ref); + TRACE("Refcount now %li\n", ref); if (!ref) MMDevCol_Destroy(This); return ref; @@ -878,7 +878,7 @@ static ULONG WINAPI MMDevEnum_AddRef(IMMDeviceEnumerator *iface) { MMDevEnumImpl *This = impl_from_IMMDeviceEnumerator(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("Refcount now %i\n", ref); + TRACE("Refcount now %li\n", ref); return ref; }
@@ -886,14 +886,14 @@ static ULONG WINAPI MMDevEnum_Release(IMMDeviceEnumerator *iface) { MMDevEnumImpl *This = impl_from_IMMDeviceEnumerator(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("Refcount now %i\n", ref); + TRACE("Refcount now %li\n", ref); return ref; }
static HRESULT WINAPI MMDevEnum_EnumAudioEndpoints(IMMDeviceEnumerator *iface, EDataFlow flow, DWORD mask, IMMDeviceCollection **devices) { MMDevEnumImpl *This = impl_from_IMMDeviceEnumerator(iface); - TRACE("(%p)->(%u,%u,%p)\n", This, flow, mask, devices); + TRACE("(%p)->(%u,%lu,%p)\n", This, flow, mask, devices); if (!devices) return E_POINTER; *devices = NULL; @@ -1011,7 +1011,7 @@ static HRESULT WINAPI MMDevEnum_GetDevice(IMMDeviceEnumerator *iface, const WCHA hr = IMMDevice_GetId(dev, &str); if (FAILED(hr)) { - WARN("GetId failed: %08x\n", hr); + WARN("GetId failed: %08lx\n", hr); continue; }
@@ -1073,7 +1073,7 @@ static BOOL notify_if_changed(EDataFlow flow, ERole role, HKEY key, if(def_dev){ hr = IMMDevice_GetId(def_dev, &id); if(FAILED(hr)){ - ERR("GetId failed: %08x\n", hr); + ERR("GetId failed: %08lx\n", hr); return FALSE; } }else @@ -1106,7 +1106,7 @@ static BOOL notify_if_changed(EDataFlow flow, ERole role, HKEY key, if(def_dev){ hr = IMMDevice_GetId(def_dev, &id); if(FAILED(hr)){ - ERR("GetId failed: %08x\n", hr); + ERR("GetId failed: %08lx\n", hr); return FALSE; } }else @@ -1132,7 +1132,7 @@ static DWORD WINAPI notif_thread_proc(void *user)
if(RegCreateKeyExW(HKEY_CURRENT_USER, reg_key, 0, NULL, 0, MAXIMUM_ALLOWED, NULL, &key, NULL) != ERROR_SUCCESS){ - ERR("RegCreateKeyEx failed: %u\n", GetLastError()); + ERR("RegCreateKeyEx failed: %lu\n", GetLastError()); return 1; }
@@ -1155,7 +1155,7 @@ static DWORD WINAPI notif_thread_proc(void *user) while(1){ if(RegNotifyChangeKeyValue(key, FALSE, REG_NOTIFY_CHANGE_LAST_SET, NULL, FALSE) != ERROR_SUCCESS){ - ERR("RegNotifyChangeKeyValue failed: %u\n", GetLastError()); + ERR("RegNotifyChangeKeyValue failed: %lu\n", GetLastError()); RegCloseKey(key); g_notif_thread = NULL; return 1; @@ -1205,7 +1205,7 @@ static HRESULT WINAPI MMDevEnum_RegisterEndpointNotificationCallback(IMMDeviceEn if(!g_notif_thread){ g_notif_thread = CreateThread(NULL, 0, notif_thread_proc, NULL, 0, NULL); if(!g_notif_thread) - ERR("CreateThread failed: %u\n", GetLastError()); + ERR("CreateThread failed: %lu\n", GetLastError()); }
LeaveCriticalSection(&g_notif_lock); @@ -1264,7 +1264,7 @@ static HRESULT MMDevPropStore_Create(MMDevice *parent, DWORD access, IPropertySt && access != STGM_WRITE && access != STGM_READWRITE) { - WARN("Invalid access %08x\n", access); + WARN("Invalid access %08lx\n", access); return E_INVALIDARG; } This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); @@ -1305,7 +1305,7 @@ static ULONG WINAPI MMDevPropStore_AddRef(IPropertyStore *iface) { MMDevPropStore *This = impl_from_IPropertyStore(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("Refcount now %i\n", ref); + TRACE("Refcount now %li\n", ref); return ref; }
@@ -1313,7 +1313,7 @@ static ULONG WINAPI MMDevPropStore_Release(IPropertyStore *iface) { MMDevPropStore *This = impl_from_IPropertyStore(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("Refcount now %i\n", ref); + TRACE("Refcount now %li\n", ref); if (!ref) MMDevPropStore_Destroy(This); return ref; @@ -1341,7 +1341,7 @@ static HRESULT WINAPI MMDevPropStore_GetCount(IPropertyStore *iface, DWORD *npro i++; } while (1); RegCloseKey(propkey); - TRACE("Returning %i\n", i); + TRACE("Returning %li\n", i); *nprops = i; return S_OK; } @@ -1354,7 +1354,7 @@ static HRESULT WINAPI MMDevPropStore_GetAt(IPropertyStore *iface, DWORD prop, PR HRESULT hr; HKEY propkey;
- TRACE("(%p)->(%u,%p)\n", iface, prop, key); + TRACE("(%p)->(%lu,%p)\n", iface, prop, key); if (!key) return E_POINTER;
@@ -1365,7 +1365,7 @@ static HRESULT WINAPI MMDevPropStore_GetAt(IPropertyStore *iface, DWORD prop, PR if (RegEnumValueW(propkey, prop, buffer, &len, NULL, NULL, NULL, NULL) != ERROR_SUCCESS || len <= 39) { - WARN("GetAt %u failed\n", prop); + WARN("GetAt %lu failed\n", prop); return E_INVALIDARG; } RegCloseKey(propkey); @@ -1378,7 +1378,7 @@ static HRESULT WINAPI MMDevPropStore_GetAt(IPropertyStore *iface, DWORD prop, PR static HRESULT WINAPI MMDevPropStore_GetValue(IPropertyStore *iface, REFPROPERTYKEY key, PROPVARIANT *pv) { MMDevPropStore *This = impl_from_IPropertyStore(iface); - TRACE("(%p)->(\"%s,%u\", %p)\n", This, key ? debugstr_guid(&key->fmtid) : NULL, key ? key->pid : 0, pv); + TRACE("(%p)->(\"%s,%lu\", %p)\n", This, key ? debugstr_guid(&key->fmtid) : NULL, key ? key->pid : 0, pv);
if (!key || !pv) return E_POINTER; @@ -1403,7 +1403,7 @@ static HRESULT WINAPI MMDevPropStore_GetValue(IPropertyStore *iface, REFPROPERTY static HRESULT WINAPI MMDevPropStore_SetValue(IPropertyStore *iface, REFPROPERTYKEY key, REFPROPVARIANT pv) { MMDevPropStore *This = impl_from_IPropertyStore(iface); - TRACE("(%p)->(\"%s,%u\", %p)\n", This, key ? debugstr_guid(&key->fmtid) : NULL, key ? key->pid : 0, pv); + TRACE("(%p)->(\"%s,%lu\", %p)\n", This, key ? debugstr_guid(&key->fmtid) : NULL, key ? key->pid : 0, pv);
if (!key || !pv) return E_POINTER; @@ -1506,7 +1506,7 @@ static ULONG WINAPI info_device_ps_Release(IPropertyStore *iface) static HRESULT WINAPI info_device_ps_GetValue(IPropertyStore *iface, REFPROPERTYKEY key, PROPVARIANT *pv) { - TRACE("(static)->(\"%s,%u\", %p)\n", debugstr_guid(&key->fmtid), key ? key->pid : 0, pv); + TRACE("(static)->(\"%s,%lu\", %p)\n", debugstr_guid(&key->fmtid), key ? key->pid : 0, pv);
if (!key || !pv) return E_POINTER; @@ -1554,7 +1554,7 @@ static ULONG WINAPI info_device_Release(IMMDevice *iface) static HRESULT WINAPI info_device_OpenPropertyStore(IMMDevice *iface, DWORD access, IPropertyStore **ppv) { - TRACE("(static)->(%x, %p)\n", access, ppv); + TRACE("(static)->(%lx, %p)\n", access, ppv); *ppv = &info_device_ps; return S_OK; } diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 358c1697a23..a814433810a 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -75,7 +75,7 @@ static BOOL load_driver(const WCHAR *name, DriverFuncs *driver)
driver->module = LoadLibraryW(driver_module); if(!driver->module){ - TRACE("Unable to load %s: %u\n", wine_dbgstr_w(driver_module), + TRACE("Unable to load %s: %lu\n", wine_dbgstr_w(driver_module), GetLastError()); return FALSE; } @@ -159,7 +159,7 @@ static BOOL WINAPI init_driver(INIT_ONCE *once, void *param, void **context)
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved); + TRACE("(0x%p, %ld, %p)\n", hinstDLL, fdwReason, lpvReserved);
switch (fdwReason) { @@ -335,7 +335,7 @@ static ULONG WINAPI activate_async_op_AddRef(IActivateAudioInterfaceAsyncOperati { struct activate_async_op *This = impl_from_IActivateAudioInterfaceAsyncOperation(iface); LONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) refcount now %i\n", This, ref); + TRACE("(%p) refcount now %li\n", This, ref); return ref; }
@@ -343,7 +343,7 @@ static ULONG WINAPI activate_async_op_Release(IActivateAudioInterfaceAsyncOperat { struct activate_async_op *This = impl_from_IActivateAudioInterfaceAsyncOperation(iface); LONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) refcount now %i\n", This, ref); + TRACE("(%p) refcount now %li\n", This, ref); if (!ref) { if(This->result_iface) IUnknown_Release(This->result_iface); @@ -399,7 +399,7 @@ static HRESULT get_mmdevice_by_activatepath(const WCHAR *path, IMMDevice **mmdev
hr = MMDevEnum_Create(&IID_IMMDeviceEnumerator, (void**)&devenum); if (FAILED(hr)) { - WARN("Failed to create MMDeviceEnumerator: %08x\n", hr); + WARN("Failed to create MMDeviceEnumerator: %08lx\n", hr); return hr; }
@@ -419,7 +419,7 @@ static HRESULT get_mmdevice_by_activatepath(const WCHAR *path, IMMDevice **mmdev }
if (FAILED(hr)) { - WARN("Failed to get requested device (%s): %08x\n", debugstr_w(path), hr); + WARN("Failed to get requested device (%s): %08lx\n", debugstr_w(path), hr); *mmdev = NULL; hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); } diff --git a/dlls/mmdevapi/spatialaudio.c b/dlls/mmdevapi/spatialaudio.c index 12ddd5e790a..d77e0a6755c 100644 --- a/dlls/mmdevapi/spatialaudio.c +++ b/dlls/mmdevapi/spatialaudio.c @@ -146,7 +146,7 @@ static ULONG WINAPI SAO_AddRef(ISpatialAudioObject *iface) { SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) new ref %u\n", This, ref); + TRACE("(%p) new ref %lu\n", This, ref); return ref; }
@@ -154,7 +154,7 @@ static ULONG WINAPI SAO_Release(ISpatialAudioObject *iface) { SpatialAudioObjectImpl *This = impl_from_ISpatialAudioObject(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) new ref %u\n", This, ref); + TRACE("(%p) new ref %lu\n", This, ref); if(!ref){ EnterCriticalSection(&This->sa_stream->lock); list_remove(&This->entry); @@ -272,7 +272,7 @@ static ULONG WINAPI SAORS_AddRef(ISpatialAudioObjectRenderStream *iface) { SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) new ref %u\n", This, ref); + TRACE("(%p) new ref %lu\n", This, ref); return ref; }
@@ -280,7 +280,7 @@ static ULONG WINAPI SAORS_Release(ISpatialAudioObjectRenderStream *iface) { SpatialAudioStreamImpl *This = impl_from_ISpatialAudioObjectRenderStream(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) new ref %u\n", This, ref); + TRACE("(%p) new ref %lu\n", This, ref); if(!ref){ IAudioClient_Stop(This->client); if(This->update_frames != ~0 && This->update_frames > 0) @@ -325,7 +325,7 @@ static HRESULT WINAPI SAORS_Start(ISpatialAudioObjectRenderStream *iface)
hr = IAudioClient_Start(This->client); if(FAILED(hr)){ - WARN("IAudioClient::Start failed: %08x\n", hr); + WARN("IAudioClient::Start failed: %08lx\n", hr); return hr; }
@@ -341,7 +341,7 @@ static HRESULT WINAPI SAORS_Stop(ISpatialAudioObjectRenderStream *iface)
hr = IAudioClient_Stop(This->client); if(FAILED(hr)){ - WARN("IAudioClient::Stop failed: %08x\n", hr); + WARN("IAudioClient::Stop failed: %08lx\n", hr); return hr; }
@@ -377,7 +377,7 @@ static HRESULT WINAPI SAORS_BeginUpdatingAudioObjects(ISpatialAudioObjectRenderS if(This->update_frames > 0){ hr = IAudioRenderClient_GetBuffer(This->render, This->update_frames, (BYTE **)&This->buf); if(FAILED(hr)){ - WARN("GetBuffer failed: %08x\n", hr); + WARN("GetBuffer failed: %08lx\n", hr); This->update_frames = ~0; LeaveCriticalSection(&This->lock); return hr; @@ -441,7 +441,7 @@ static HRESULT WINAPI SAORS_EndUpdatingAudioObjects(ISpatialAudioObjectRenderStr
hr = IAudioRenderClient_ReleaseBuffer(This->render, This->update_frames, 0); if(FAILED(hr)) - WARN("ReleaseBuffer failed: %08x\n", hr); + WARN("ReleaseBuffer failed: %08lx\n", hr); }
This->update_frames = ~0; @@ -538,7 +538,7 @@ static ULONG WINAPI SAC_AddRef(ISpatialAudioClient *iface) { SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p) new ref %u\n", This, ref); + TRACE("(%p) new ref %lu\n", This, ref); return ref; }
@@ -546,7 +546,7 @@ static ULONG WINAPI SAC_Release(ISpatialAudioClient *iface) { SpatialAudioImpl *This = impl_from_ISpatialAudioClient(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p) new ref %u\n", This, ref); + TRACE("(%p) new ref %lu\n", This, ref); if (!ref) { IMMDevice_Release(This->mmdev); heap_free(This); @@ -637,12 +637,12 @@ static const char *debugstr_fmtex(const WAVEFORMATEX *fmt) static char buf[2048]; if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ const WAVEFORMATEXTENSIBLE *fmtex = (const WAVEFORMATEXTENSIBLE *)fmt; - snprintf(buf, sizeof(buf), "tag: 0x%x (%s), ch: %u (mask: 0x%x), rate: %u, depth: %u", + snprintf(buf, sizeof(buf), "tag: 0x%x (%s), ch: %u (mask: 0x%lx), rate: %lu, depth: %u", fmt->wFormatTag, debugstr_guid(&fmtex->SubFormat), fmt->nChannels, fmtex->dwChannelMask, fmt->nSamplesPerSec, fmt->wBitsPerSample); }else{ - snprintf(buf, sizeof(buf), "tag: 0x%x, ch: %u, rate: %u, depth: %u", + snprintf(buf, sizeof(buf), "tag: 0x%x, ch: %u, rate: %lu, depth: %u", fmt->wFormatTag, fmt->nChannels, fmt->nSamplesPerSec, fmt->wBitsPerSample); } @@ -694,13 +694,13 @@ static HRESULT activate_stream(SpatialAudioStreamImpl *stream) hr = IMMDevice_Activate(stream->sa_client->mmdev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&stream->client); if(FAILED(hr)){ - WARN("Activate failed: %08x\n", hr); + WARN("Activate failed: %08lx\n", hr); return hr; }
hr = IAudioClient_GetDevicePeriod(stream->client, &period, NULL); if(FAILED(hr)){ - WARN("GetDevicePeriod failed: %08x\n", hr); + WARN("GetDevicePeriod failed: %08lx\n", hr); IAudioClient_Release(stream->client); return hr; } @@ -721,21 +721,21 @@ static HRESULT activate_stream(SpatialAudioStreamImpl *stream) AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST, period, 0, &stream->stream_fmtex.Format, NULL); if(FAILED(hr)){ - WARN("Initialize failed: %08x\n", hr); + WARN("Initialize failed: %08lx\n", hr); IAudioClient_Release(stream->client); return hr; }
hr = IAudioClient_SetEventHandle(stream->client, stream->params.EventHandle); if(FAILED(hr)){ - WARN("SetEventHandle failed: %08x\n", hr); + WARN("SetEventHandle failed: %08lx\n", hr); IAudioClient_Release(stream->client); return hr; }
hr = IAudioClient_GetService(stream->client, &IID_IAudioRenderClient, (void**)&stream->render); if(FAILED(hr)){ - WARN("GetService(AudioRenderClient) failed: %08x\n", hr); + WARN("GetService(AudioRenderClient) failed: %08lx\n", hr); IAudioClient_Release(stream->client); return hr; } @@ -931,7 +931,7 @@ HRESULT SpatialAudioClient_Create(IMMDevice *mmdev, ISpatialAudioClient **out) hr = IMMDevice_Activate(mmdev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&aclient); if(FAILED(hr)){ - WARN("Activate failed: %08x\n", hr); + WARN("Activate failed: %08lx\n", hr); heap_free(obj); return hr; } @@ -962,7 +962,7 @@ HRESULT SpatialAudioClient_Create(IMMDevice *mmdev, ISpatialAudioClient **out) sizeof(WAVEFORMATEX) + closest->cbSize); CoTaskMemFree(closest); } else if(hr != S_OK){ - WARN("Checking supported formats failed: %08x\n", hr); + WARN("Checking supported formats failed: %08lx\n", hr); heap_free(obj); return hr; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mmdevldr.vxd/Makefile.in | 1 - dlls/mmdevldr.vxd/mmdevldr.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mmdevldr.vxd/Makefile.in b/dlls/mmdevldr.vxd/Makefile.in index 934a68048d1..096ae7c598d 100644 --- a/dlls/mmdevldr.vxd/Makefile.in +++ b/dlls/mmdevldr.vxd/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mmdevldr.vxd C_SRCS = \ diff --git a/dlls/mmdevldr.vxd/mmdevldr.c b/dlls/mmdevldr.vxd/mmdevldr.c index 1396861e88f..98ab2217b00 100644 --- a/dlls/mmdevldr.vxd/mmdevldr.c +++ b/dlls/mmdevldr.vxd/mmdevldr.c @@ -37,7 +37,7 @@ BOOL WINAPI MMDEVLDR_DeviceIoControl(DWORD dwIoControlCode, LPDWORD lpcbBytesReturned, LPOVERLAPPED lpOverlapped) { - FIXME("(%d,%p,%d,%p,%d,%p,%p): stub\n", + FIXME("(%ld,%p,%ld,%p,%ld,%p,%p): stub\n", dwIoControlCode, lpvInBuffer,cbInBuffer, lpvOutBuffer,cbOutBuffer,
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mmsystem.dll16/Makefile.in | 1 - dlls/mmsystem.dll16/driver.c | 4 +-- dlls/mmsystem.dll16/mci16.c | 4 +-- dlls/mmsystem.dll16/message16.c | 36 +++++++++++++------------- dlls/mmsystem.dll16/mmio16.c | 6 ++-- dlls/mmsystem.dll16/mmsystem.c | 54 ++++++++++++++++++++------------------- 6 files changed, 52 insertions(+), 53 deletions(-) diff --git a/dlls/mmsystem.dll16/Makefile.in b/dlls/mmsystem.dll16/Makefile.in index 9723d4d821d..1eb0ce98c1d 100644 --- a/dlls/mmsystem.dll16/Makefile.in +++ b/dlls/mmsystem.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mmsystem.dll16 IMPORTS = winmm user32 diff --git a/dlls/mmsystem.dll16/driver.c b/dlls/mmsystem.dll16/driver.c index d35af7d07f0..05d45fee10e 100644 --- a/dlls/mmsystem.dll16/driver.c +++ b/dlls/mmsystem.dll16/driver.c @@ -97,7 +97,7 @@ static inline LRESULT DRIVER_SendMessage(LPWINE_DRIVER lpDrv, UINT16 msg, WORD args[8]; DWORD ret; - TRACE("Before CallDriverProc proc=%p driverID=%08x wMsg=%04x p1=%08lx p2=%08lx\n", + TRACE("Before CallDriverProc proc=%p driverID=%08lx wMsg=%04x p1=%08lx p2=%08lx\n", lpDrv->lpDrvProc, lpDrv->dwDriverID, msg, lParam1, lParam2); args[7] = HIWORD(lpDrv->dwDriverID); @@ -321,7 +321,7 @@ HMODULE16 WINAPI DrvGetModuleHandle16(HDRVR16 hDrvr) LRESULT WINAPI DrvDefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg, LPARAM lParam1, LPARAM lParam2) { - TRACE("devID=0x%08x hDrv=0x%04x wMsg=%04x lP1=0x%08lx lP2=0x%08lx\n", + TRACE("devID=0x%08lx hDrv=0x%04x wMsg=%04x lP1=0x%08lx lP2=0x%08lx\n", dwDevID, hDriv, wMsg, lParam1, lParam2); switch(wMsg) { diff --git a/dlls/mmsystem.dll16/mci16.c b/dlls/mmsystem.dll16/mci16.c index d7a356d527b..8acd5fe436d 100644 --- a/dlls/mmsystem.dll16/mci16.c +++ b/dlls/mmsystem.dll16/mci16.c @@ -610,7 +610,7 @@ BOOL16 WINAPI mciSetYieldProc16(UINT16 uDeviceID, YIELDPROC16 fpYieldProc, DWORD struct mci_thunk* thunk; BOOL ret; - TRACE("(%u, %p, %08x)\n", uDeviceID, fpYieldProc, dwYieldData); + TRACE("(%u, %p, %08lx)\n", uDeviceID, fpYieldProc, dwYieldData); if (!(thunk = MCI_AddThunk(uDeviceID, fpYieldProc))) return FALSE; @@ -680,7 +680,7 @@ DWORD WINAPI mciSendCommand16(UINT16 wDevID, UINT16 wMsg, DWORD dwParam1, DWORD BOOL to32; DWORD_PTR dwParam2 = p2; - TRACE("(%04X, %s, %08X, %08lX)\n", wDevID, MCI_MessageToString(wMsg), dwParam1, dwParam2); + TRACE("(%04X, %s, %08lX, %08lX)\n", wDevID, MCI_MessageToString(wMsg), dwParam1, dwParam2); switch (wMsg) { case MCI_CLOSE: diff --git a/dlls/mmsystem.dll16/message16.c b/dlls/mmsystem.dll16/message16.c index 90ef2ac5b57..5a722bb6691 100644 --- a/dlls/mmsystem.dll16/message16.c +++ b/dlls/mmsystem.dll16/message16.c @@ -127,7 +127,7 @@ static void MMSYSTDRV_MidiIn_MapCB(DWORD uMsg, DWORD_PTR* dwUser, D } break; default: - ERR("Unknown msg %u\n", uMsg); + ERR("Unknown msg %lu\n", uMsg); } } @@ -206,7 +206,7 @@ static MMSYSTEM_MapType MMSYSTDRV_MidiOut_Map16To32W (DWORD wMsg, DWORD_PTR* lp *lpParam2 = offsetof(MIDIHDR,dwOffset); /* dwBufferLength can be reduced between prepare & write */ if (wMsg == MODM_LONGDATA && mh32->dwBufferLength < mh16->dwBufferLength) { - ERR("Size of buffer has been increased from %d to %d, keeping initial value\n", + ERR("Size of buffer has been increased from %ld to %ld, keeping initial value\n", mh32->dwBufferLength, mh16->dwBufferLength); } else mh32->dwBufferLength = mh16->dwBufferLength; @@ -217,7 +217,7 @@ static MMSYSTEM_MapType MMSYSTDRV_MidiOut_Map16To32W (DWORD wMsg, DWORD_PTR* lp case MODM_CACHEPATCHES: case MODM_CACHEDRUMPATCHES: default: - FIXME("NIY: no conversion yet for %u [%lx,%lx]\n", wMsg, *lpParam1, *lpParam2); + FIXME("NIY: no conversion yet for %lu [%lx,%lx]\n", wMsg, *lpParam1, *lpParam2); break; } return ret; @@ -284,7 +284,7 @@ static MMSYSTEM_MapType MMSYSTDRV_MidiOut_UnMap16To32W(DWORD wMsg, DWORD_PTR* l case MODM_CACHEPATCHES: case MODM_CACHEDRUMPATCHES: default: - FIXME("NIY: no conversion yet for %u [%lx,%lx]\n", wMsg, *lpParam1, *lpParam2); + FIXME("NIY: no conversion yet for %lu [%lx,%lx]\n", wMsg, *lpParam1, *lpParam2); break; } return ret; @@ -316,7 +316,7 @@ static void MMSYSTDRV_MidiOut_MapCB(DWORD uMsg, DWORD_PTR* dwUser, DWORD_PTR* d } break; default: - ERR("Unknown msg %u\n", uMsg); + ERR("Unknown msg %lu\n", uMsg); } } @@ -414,7 +414,7 @@ static MMSYSTEM_MapType MMSYSTDRV_WaveIn_Map16To32W (DWORD wMsg, DWORD_PTR* lp *lpParam2 = sizeof(WAVEHDR); /* dwBufferLength can be reduced between prepare & write */ if (wMsg == WIDM_ADDBUFFER && wh32->dwBufferLength < wh16->dwBufferLength) { - ERR("Size of buffer has been increased from %d to %d, keeping initial value\n", + ERR("Size of buffer has been increased from %ld to %ld, keeping initial value\n", wh32->dwBufferLength, wh16->dwBufferLength); } else wh32->dwBufferLength = wh16->dwBufferLength; @@ -427,7 +427,7 @@ static MMSYSTEM_MapType MMSYSTDRV_WaveIn_Map16To32W (DWORD wMsg, DWORD_PTR* lp ret = MMSYSTEM_MAP_OK; break; default: - FIXME("NIY: no conversion yet for %u [%lx,%lx]\n", wMsg, *lpParam1, *lpParam2); + FIXME("NIY: no conversion yet for %lu [%lx,%lx]\n", wMsg, *lpParam1, *lpParam2); break; } return ret; @@ -497,7 +497,7 @@ static MMSYSTEM_MapType MMSYSTDRV_WaveIn_UnMap16To32W(DWORD wMsg, DWORD_PTR* lp } break; default: - FIXME("NIY: no conversion yet for %u [%lx,%lx]\n", wMsg, *lpParam1, *lpParam2); + FIXME("NIY: no conversion yet for %lu [%lx,%lx]\n", wMsg, *lpParam1, *lpParam2); break; } return ret; @@ -526,7 +526,7 @@ static void MMSYSTDRV_WaveIn_MapCB(DWORD uMsg, DWORD_PTR* dwUser, DWORD_PTR* } break; default: - ERR("Unknown msg %u\n", uMsg); + ERR("Unknown msg %lu\n", uMsg); } } @@ -634,7 +634,7 @@ static MMSYSTEM_MapType MMSYSTDRV_WaveOut_Map16To32W (DWORD wMsg, DWORD_PTR* l *lpParam2 = sizeof(WAVEHDR); /* dwBufferLength can be reduced between prepare & write */ if (wMsg == WODM_WRITE && wh32->dwBufferLength < wh16->dwBufferLength) { - ERR("Size of buffer has been increased from %d to %d, keeping initial value\n", + ERR("Size of buffer has been increased from %ld to %ld, keeping initial value\n", wh32->dwBufferLength, wh16->dwBufferLength); } else wh32->dwBufferLength = wh16->dwBufferLength; @@ -646,7 +646,7 @@ static MMSYSTEM_MapType MMSYSTDRV_WaveOut_Map16To32W (DWORD wMsg, DWORD_PTR* l ret = MMSYSTEM_MAP_OK; break; default: - FIXME("NIY: no conversion yet for %u [%lx,%lx]\n", wMsg, *lpParam1, *lpParam2); + FIXME("NIY: no conversion yet for %lu [%lx,%lx]\n", wMsg, *lpParam1, *lpParam2); break; } return ret; @@ -726,7 +726,7 @@ static MMSYSTEM_MapType MMSYSTDRV_WaveOut_UnMap16To32W(DWORD wMsg, DWORD_PTR* l } break; default: - FIXME("NIY: no conversion yet for %u [%lx,%lx]\n", wMsg, *lpParam1, *lpParam2); + FIXME("NIY: no conversion yet for %lu [%lx,%lx]\n", wMsg, *lpParam1, *lpParam2); break; } return ret; @@ -754,7 +754,7 @@ static void MMSYSTDRV_WaveOut_MapCB(DWORD uMsg, DWORD_PTR* dwUser, DWORD_PTR* d } break; default: - ERR("Unknown msg %u\n", uMsg); + ERR("Unknown msg %lu\n", uMsg); } } @@ -819,16 +819,16 @@ static LRESULT CALLBACK MMSYSTDRV_Callback3216(struct mmsystdrv_thunk* thunk, HD TRACE("Null !\n"); break; case CALLBACK_WINDOW: - TRACE("Window(%04X) handle=%p!\n", thunk->callback, hDev); + TRACE("Window(%04lX) handle=%p!\n", thunk->callback, hDev); PostMessageA((HWND)thunk->callback, wMsg, (WPARAM)hDev, dwParam1); break; case CALLBACK_TASK: /* aka CALLBACK_THREAD */ - TRACE("Task(%04x) !\n", thunk->callback); + TRACE("Task(%04lx) !\n", thunk->callback); PostThreadMessageA(thunk->callback, wMsg, (WPARAM)hDev, dwParam1); break; case CALLBACK_FUNCTION: /* 16 bit func, call it */ - TRACE("Function (16 bit) %x!\n", thunk->callback); + TRACE("Function (16 bit) %lx!\n", thunk->callback); args[7] = HDRVR_16(hDev); args[6] = wMsg; @@ -840,11 +840,11 @@ static LRESULT CALLBACK MMSYSTDRV_Callback3216(struct mmsystdrv_thunk* thunk, HD args[0] = LOWORD(dwParam2); return WOWCallback16Ex(thunk->callback, WCB16_PASCAL, sizeof(args), args, NULL); case CALLBACK_EVENT: - TRACE("Event(%08x) !\n", thunk->callback); + TRACE("Event(%08lx) !\n", thunk->callback); SetEvent((HANDLE)thunk->callback); break; default: - WARN("Unknown callback type %x\n", thunk->flags); + WARN("Unknown callback type %lx\n", thunk->flags); return FALSE; } TRACE("Done\n"); diff --git a/dlls/mmsystem.dll16/mmio16.c b/dlls/mmsystem.dll16/mmio16.c index 366d4a573b6..971157d8f17 100644 --- a/dlls/mmsystem.dll16/mmio16.c +++ b/dlls/mmsystem.dll16/mmio16.c @@ -88,7 +88,7 @@ static LRESULT MMIO_Map32To16(DWORD wMsg, LPARAM* lp1, LPARAM* lp2) break; default: if (wMsg < MMIOM_USER) - TRACE("Not a mappable message (%d)\n", wMsg); + TRACE("Not a mappable message (%ld)\n", wMsg); } return MMSYSERR_NOERROR; } @@ -116,7 +116,7 @@ static LRESULT MMIO_UnMap32To16(DWORD wMsg, LPARAM lParam1, LPARAM lParam2, break; default: if (wMsg < MMIOM_USER) - TRACE("Not a mappable message (%d)\n", wMsg); + TRACE("Not a mappable message (%ld)\n", wMsg); } return MMSYSERR_NOERROR; } @@ -552,7 +552,7 @@ LPMMIOPROC16 WINAPI mmioInstallIOProc16(FOURCC fccIOProc, LPMMIOPROC16 pIOProc, } break; default: - FIXME("Unsupported flags %08x\n", dwFlags); + FIXME("Unsupported flags %08lx\n", dwFlags); pIOProc = NULL; } LeaveCriticalSection(&mmio_cs); diff --git a/dlls/mmsystem.dll16/mmsystem.c b/dlls/mmsystem.dll16/mmsystem.c index 445fc48d50e..3538d942bc4 100644 --- a/dlls/mmsystem.dll16/mmsystem.c +++ b/dlls/mmsystem.dll16/mmsystem.c @@ -113,7 +113,7 @@ MMRESULT16 WINAPI timeGetSystemTime16(LPMMTIME16 lpTime, UINT16 wSize) lpTime->wType = TIME_MS; lpTime->u.ms = GetTickCount(); - TRACE("=> %u\n", lpTime->u.ms); + TRACE("=> %lu\n", lpTime->u.ms); } return 0; @@ -437,7 +437,7 @@ UINT16 WINAPI mixerGetControlDetails16(HMIXEROBJ16 hmix, DWORD ret = MMSYSERR_NOTENABLED; SEGPTR sppaDetails; - TRACE("(%04x, %p, %08x)\n", hmix, lpmcd, fdwDetails); + TRACE("(%04x, %p, %08lx)\n", hmix, lpmcd, fdwDetails); if (lpmcd == NULL || lpmcd->cbStruct != sizeof(*lpmcd)) return MMSYSERR_INVALPARAM; @@ -463,7 +463,7 @@ UINT16 WINAPI mixerGetLineControls16(HMIXEROBJ16 hmix, unsigned int i; LPMIXERCONTROL16 lpmc16; - TRACE("(%04x, %p, %08x)\n", hmix, lpmlc16, fdwControls); + TRACE("(%04x, %p, %08lx)\n", hmix, lpmlc16, fdwControls); if (lpmlc16 == NULL || lpmlc16->cbStruct != sizeof(*lpmlc16) || lpmlc16->cbmxctrl != sizeof(MIXERCONTROL16)) @@ -519,7 +519,7 @@ UINT16 WINAPI mixerGetLineInfo16(HMIXEROBJ16 hmix, LPMIXERLINE16 lpmli16, MIXERLINEA mliA; UINT ret; - TRACE("(%04x, %p, %08x)\n", hmix, lpmli16, fdwInfo); + TRACE("(%04x, %p, %08lx)\n", hmix, lpmli16, fdwInfo); if (lpmli16 == NULL || lpmli16->cbStruct != sizeof(*lpmli16)) return MMSYSERR_INVALPARAM; @@ -547,7 +547,7 @@ UINT16 WINAPI mixerGetLineInfo16(HMIXEROBJ16 hmix, LPMIXERLINE16 lpmli16, strcpy(mliA.Target.szPname, lpmli16->Target.szPname); break; default: - FIXME("Unsupported fdwControls=0x%08x\n", fdwInfo); + FIXME("Unsupported fdwControls=0x%08lx\n", fdwInfo); } ret = mixerGetLineInfoA(HMIXEROBJ_32(hmix), &mliA, fdwInfo); @@ -580,7 +580,7 @@ UINT16 WINAPI mixerSetControlDetails16(HMIXEROBJ16 hmix, LPMIXERCONTROLDETAILS16 lpmcd, DWORD fdwDetails) { - TRACE("(%04x, %p, %08x)\n", hmix, lpmcd, fdwDetails); + TRACE("(%04x, %p, %08lx)\n", hmix, lpmcd, fdwDetails); return MMSYSERR_NOTENABLED; } @@ -651,7 +651,7 @@ UINT16 WINAPI auxSetVolume16(UINT16 uDeviceID, DWORD dwVolume) */ DWORD WINAPI auxOutMessage16(UINT16 uDeviceID, UINT16 uMessage, DWORD dw1, DWORD dw2) { - TRACE("(%04X, %04X, %08X, %08X)\n", uDeviceID, uMessage, dw1, dw2); + TRACE("(%04X, %04X, %08lX, %08lX)\n", uDeviceID, uMessage, dw1, dw2); switch (uMessage) { case AUXDM_GETNUMDEVS: @@ -663,7 +663,7 @@ DWORD WINAPI auxOutMessage16(UINT16 uDeviceID, UINT16 uMessage, DWORD dw1, DWORD case AUXDM_GETDEVCAPS: return auxGetDevCaps16(uDeviceID, MapSL(dw1), dw2); default: - TRACE("(%04x, %04x, %08x, %08x): unhandled message\n", + TRACE("(%04x, %04x, %08lx, %08lx): unhandled message\n", uDeviceID, uMessage, dw1, dw2); break; } @@ -764,7 +764,7 @@ UINT16 WINAPI midiOutPrepareHeader16(HMIDIOUT16 hMidiOut, /* [in] */ SEGPTR lpsegMidiOutHdr, /* [???] */ UINT16 uSize) /* [in] */ { - TRACE("(%04X, %08x, %d)\n", hMidiOut, lpsegMidiOutHdr, uSize); + TRACE("(%04X, %08lx, %d)\n", hMidiOut, lpsegMidiOutHdr, uSize); return MMSYSTDRV_Message(HMIDIOUT_32(hMidiOut), MODM_PREPARE, lpsegMidiOutHdr, uSize); } @@ -778,7 +778,7 @@ UINT16 WINAPI midiOutUnprepareHeader16(HMIDIOUT16 hMidiOut, /* [in] */ { LPMIDIHDR16 lpMidiOutHdr = MapSL(lpsegMidiOutHdr); - TRACE("(%04X, %08x, %d)\n", hMidiOut, lpsegMidiOutHdr, uSize); + TRACE("(%04X, %08lx, %d)\n", hMidiOut, lpsegMidiOutHdr, uSize); if (!(lpMidiOutHdr->dwFlags & MHDR_PREPARED)) { return MMSYSERR_NOERROR; @@ -802,7 +802,7 @@ UINT16 WINAPI midiOutLongMsg16(HMIDIOUT16 hMidiOut, /* [in] */ SEGPTR lpsegMidiOutHdr, /* [???] */ UINT16 uSize) /* [in] */ { - TRACE("(%04X, %08x, %d)\n", hMidiOut, lpsegMidiOutHdr, uSize); + TRACE("(%04X, %08lx, %d)\n", hMidiOut, lpsegMidiOutHdr, uSize); return MMSYSTDRV_Message(HMIDIOUT_32(hMidiOut), MODM_LONGDATA, lpsegMidiOutHdr, uSize); } @@ -870,7 +870,7 @@ UINT16 WINAPI midiOutGetID16(HMIDIOUT16 hMidiOut, UINT16* lpuDeviceID) DWORD WINAPI midiOutMessage16(HMIDIOUT16 hMidiOut, UINT16 uMessage, DWORD dwParam1, DWORD dwParam2) { - TRACE("(%04X, %04X, %08X, %08X)\n", hMidiOut, uMessage, dwParam1, dwParam2); + TRACE("(%04X, %04X, %08lX, %08lX)\n", hMidiOut, uMessage, dwParam1, dwParam2); switch (uMessage) { case MODM_OPEN: @@ -967,7 +967,7 @@ UINT16 WINAPI midiInPrepareHeader16(HMIDIIN16 hMidiIn, /* [in] */ SEGPTR lpsegMidiInHdr, /* [???] */ UINT16 uSize) /* [in] */ { - TRACE("(%04X, %08x, %d)\n", hMidiIn, lpsegMidiInHdr, uSize); + TRACE("(%04X, %08lx, %d)\n", hMidiIn, lpsegMidiInHdr, uSize); return MMSYSTDRV_Message(HMIDIIN_32(hMidiIn), MIDM_PREPARE, lpsegMidiInHdr, uSize); } @@ -981,7 +981,7 @@ UINT16 WINAPI midiInUnprepareHeader16(HMIDIIN16 hMidiIn, /* [in] */ { LPMIDIHDR16 lpMidiInHdr = MapSL(lpsegMidiInHdr); - TRACE("(%04X, %08x, %d)\n", hMidiIn, lpsegMidiInHdr, uSize); + TRACE("(%04X, %08lx, %d)\n", hMidiIn, lpsegMidiInHdr, uSize); if (!(lpMidiInHdr->dwFlags & MHDR_PREPARED)) { return MMSYSERR_NOERROR; @@ -997,7 +997,7 @@ UINT16 WINAPI midiInAddBuffer16(HMIDIIN16 hMidiIn, /* [in] */ SEGPTR lpsegMidiInHdr, /* [???] */ UINT16 uSize) /* [in] */ { - TRACE("(%04X, %08x, %d)\n", hMidiIn, lpsegMidiInHdr, uSize); + TRACE("(%04X, %08lx, %d)\n", hMidiIn, lpsegMidiInHdr, uSize); return MMSYSTDRV_Message(HMIDIIN_32(hMidiIn), MIDM_ADDBUFFER, lpsegMidiInHdr, uSize); } @@ -1046,7 +1046,7 @@ UINT16 WINAPI midiInGetID16(HMIDIIN16 hMidiIn, UINT16* lpuDeviceID) DWORD WINAPI midiInMessage16(HMIDIIN16 hMidiIn, UINT16 uMessage, DWORD dwParam1, DWORD dwParam2) { - TRACE("(%04X, %04X, %08X, %08X)\n", hMidiIn, uMessage, dwParam1, dwParam2); + TRACE("(%04X, %04X, %08lX, %08lX)\n", hMidiIn, uMessage, dwParam1, dwParam2); switch (uMessage) { case MIDM_OPEN: @@ -1271,7 +1271,7 @@ UINT16 WINAPI waveOutPrepareHeader16(HWAVEOUT16 hWaveOut, /* [in] */ SEGPTR lpsegWaveOutHdr, /* [???] */ UINT16 uSize) /* [in] */ { - TRACE("(%04X, %08x, %u);\n", hWaveOut, lpsegWaveOutHdr, uSize); + TRACE("(%04X, %08lx, %u);\n", hWaveOut, lpsegWaveOutHdr, uSize); if (lpsegWaveOutHdr == 0) return MMSYSERR_INVALPARAM; @@ -1287,7 +1287,7 @@ UINT16 WINAPI waveOutUnprepareHeader16(HWAVEOUT16 hWaveOut, /* [in] */ { LPWAVEHDR lpWaveOutHdr = MapSL(lpsegWaveOutHdr); - TRACE("(%04X, %08x, %u);\n", hWaveOut, lpsegWaveOutHdr, uSize); + TRACE("(%04X, %08lx, %u);\n", hWaveOut, lpsegWaveOutHdr, uSize); if (!(lpWaveOutHdr->dwFlags & WHDR_PREPARED)) { return MMSYSERR_NOERROR; @@ -1303,7 +1303,7 @@ UINT16 WINAPI waveOutWrite16(HWAVEOUT16 hWaveOut, /* [in] */ SEGPTR lpsegWaveOutHdr, /* [???] */ UINT16 uSize) /* [in] */ { - TRACE("(%04X, %08x, %u);\n", hWaveOut, lpsegWaveOutHdr, uSize); + TRACE("(%04X, %08lx, %u);\n", hWaveOut, lpsegWaveOutHdr, uSize); return MMSYSTDRV_Message(HWAVEOUT_32(hWaveOut), WODM_WRITE, lpsegWaveOutHdr, uSize); } @@ -1447,7 +1447,7 @@ UINT16 WINAPI waveOutGetID16(HWAVEOUT16 hWaveOut, UINT16* lpuDeviceID) DWORD WINAPI waveOutMessage16(HWAVEOUT16 hWaveOut, UINT16 uMessage, DWORD dwParam1, DWORD dwParam2) { - TRACE("(%04x, %u, %d, %d)\n", hWaveOut, uMessage, dwParam1, dwParam2); + TRACE("(%04x, %u, %ld, %ld)\n", hWaveOut, uMessage, dwParam1, dwParam2); if ((DWORD_PTR)hWaveOut < waveOutGetNumDevs()) { @@ -1568,7 +1568,7 @@ UINT16 WINAPI waveInUnprepareHeader16(HWAVEIN16 hWaveIn, /* [in] */ { LPWAVEHDR lpWaveInHdr = MapSL(lpsegWaveInHdr); - TRACE("(%04X, %08x, %u);\n", hWaveIn, lpsegWaveInHdr, uSize); + TRACE("(%04X, %08lx, %u);\n", hWaveIn, lpsegWaveInHdr, uSize); if (lpWaveInHdr == NULL) return MMSYSERR_INVALPARAM; @@ -1586,7 +1586,7 @@ UINT16 WINAPI waveInAddBuffer16(HWAVEIN16 hWaveIn, /* [in] */ SEGPTR lpsegWaveInHdr, /* [???] */ UINT16 uSize) /* [in] */ { - TRACE("(%04X, %08x, %u);\n", hWaveIn, lpsegWaveInHdr, uSize); + TRACE("(%04X, %08lx, %u);\n", hWaveIn, lpsegWaveInHdr, uSize); if (lpsegWaveInHdr == 0) return MMSYSERR_INVALPARAM; @@ -1670,7 +1670,7 @@ UINT16 WINAPI waveInGetID16(HWAVEIN16 hWaveIn, UINT16* lpuDeviceID) DWORD WINAPI waveInMessage16(HWAVEIN16 hWaveIn, UINT16 uMessage, DWORD dwParam1, DWORD dwParam2) { - TRACE("(%04x, %u, %d, %d)\n", hWaveIn, uMessage, dwParam1, dwParam2); + TRACE("(%04x, %u, %ld, %ld)\n", hWaveIn, uMessage, dwParam1, dwParam2); if ((DWORD_PTR)hWaveIn < waveInGetNumDevs()) { @@ -1705,7 +1705,7 @@ HINSTANCE16 WINAPI mmTaskCreate16(SEGPTR spProc, HINSTANCE16 *lphMmTask, DWORD d DWORD showCmd = 0x40002; LOADPARAMS16 lp; - TRACE("(%08x, %p, %08x);\n", spProc, lphMmTask, dwPmt); + TRACE("(%08lx, %p, %08lx);\n", spProc, lphMmTask, dwPmt); /* This to work requires NE modules to be started with a binary command line * which is not currently the case. A patch exists but has never been committed. * A workaround would be to integrate code for mmtask.tsk into Wine, but @@ -1859,7 +1859,7 @@ static void MMSYSTEM_ThreadBlock(WINE_MMTHREAD* lpMMThd) } break; default: - WARN("S2.x unsupported ret val 0x%08x\n", ret); + WARN("S2.x unsupported ret val 0x%08lx\n", ret); } TRACE("S3\n"); } @@ -1941,7 +1941,7 @@ LRESULT WINAPI mmThreadCreate16(FARPROC16 fpThreadAddr, LPHANDLE16 lpHndl, DWORD HANDLE16 hndl; LRESULT ret; - TRACE("(%p, %p, %08x, %08x)!\n", fpThreadAddr, lpHndl, dwPmt, dwFlags); + TRACE("(%p, %p, %08lx, %08lx)!\n", fpThreadAddr, lpHndl, dwPmt, dwFlags); hndl = GlobalAlloc16(GMEM_SHARE|GMEM_ZEROINIT, sizeof(WINE_MMTHREAD)); @@ -1993,7 +1993,7 @@ LRESULT WINAPI mmThreadCreate16(FARPROC16 fpThreadAddr, LPHANDLE16 lpHndl, DWORD ret = 2; } else { SetThreadPriority(lpMMThd->hThread, THREAD_PRIORITY_TIME_CRITICAL); - TRACE("Got a nice thread hndl=%p id=0x%08x\n", lpMMThd->hThread, lpMMThd->dwThreadID); + TRACE("Got a nice thread hndl=%p id=0x%08lx\n", lpMMThd->hThread, lpMMThd->dwThreadID); ret = 0; } } else {
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/monodebg.vxd/Makefile.in | 1 - dlls/monodebg.vxd/monodebg.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/monodebg.vxd/Makefile.in b/dlls/monodebg.vxd/Makefile.in index f076568c1c8..ccbfdba36e4 100644 --- a/dlls/monodebg.vxd/Makefile.in +++ b/dlls/monodebg.vxd/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = monodebg.vxd C_SRCS = \ diff --git a/dlls/monodebg.vxd/monodebg.c b/dlls/monodebg.vxd/monodebg.c index 715c29601c4..e625a050e1a 100644 --- a/dlls/monodebg.vxd/monodebg.c +++ b/dlls/monodebg.vxd/monodebg.c @@ -46,7 +46,7 @@ BOOL WINAPI MONODEBG_DeviceIoControl(DWORD dwIoControlCode, ERR("%s\n",debugstr_a(lpvInBuffer)); break; default: - FIXME("(%d,%p,%d,%p,%d,%p,%p): stub\n", + FIXME("(%ld,%p,%ld,%p,%ld,%p,%p): stub\n", dwIoControlCode, lpvInBuffer,cbInBuffer, lpvOutBuffer,cbOutBuffer,
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mountmgr.sys/Makefile.in | 1 - dlls/mountmgr.sys/dbus.c | 6 +++--- dlls/mountmgr.sys/device.c | 18 +++++++++--------- dlls/mountmgr.sys/mountmgr.c | 8 ++++---- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/mountmgr.sys/Makefile.in b/dlls/mountmgr.sys/Makefile.in index 66918d3a750..612ac71f869 100644 --- a/dlls/mountmgr.sys/Makefile.in +++ b/dlls/mountmgr.sys/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mountmgr.sys UNIXLIB = mountmgr.so IMPORTS = uuid advapi32 ntoskrnl diff --git a/dlls/mountmgr.sys/dbus.c b/dlls/mountmgr.sys/dbus.c index 70b2f0c1592..81c9f89d246 100644 --- a/dlls/mountmgr.sys/dbus.c +++ b/dlls/mountmgr.sys/dbus.c @@ -753,7 +753,7 @@ static DBusMessage *dhcp4_config_option_request( const char *unix_name, const ch return reply; } -static const char *map_option( ULONG option ) +static const char *map_option( unsigned option ) { switch (option) { @@ -792,7 +792,7 @@ NTSTATUS dhcp_request( void *args ) ptr->S_un.S_addr = inet_addr( value ); params->req->offset = params->offset; params->req->size = sizeof(*ptr); - TRACE( "returning %08x\n", *(DWORD *)ptr ); + TRACE( "returning %08x\n", *(unsigned int*)ptr ); } ret = sizeof(*ptr); break; @@ -814,7 +814,7 @@ NTSTATUS dhcp_request( void *args ) break; } default: - FIXME( "option %u not supported\n", params->req->id ); + FIXME( "option %u not supported\n", (unsigned int)params->req->id ); break; } diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index b8a0040195d..50b2f38bbd8 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -717,7 +717,7 @@ static NTSTATUS create_disk_device( enum device_type type, struct disk_device ** } else { - FIXME( "IoCreateDevice %s got %x\n", debugstr_w(name.Buffer), status ); + FIXME( "IoCreateDevice %s got %lx\n", debugstr_w(name.Buffer), status ); RtlFreeUnicodeString( &name ); } return status; @@ -890,7 +890,7 @@ static BOOL get_volume_device_info( struct volume *volume ) if (!(name = wine_get_dos_file_name( unix_device ))) { - ERR("Failed to convert %s to NT, err %u\n", debugstr_a(unix_device), GetLastError()); + ERR("Failed to convert %s to NT, err %lu\n", debugstr_a(unix_device), GetLastError()); return FALSE; } handle = CreateFileW( name, GENERIC_READ | SYNCHRONIZE, FILE_SHARE_READ | FILE_SHARE_WRITE, @@ -898,7 +898,7 @@ static BOOL get_volume_device_info( struct volume *volume ) RtlFreeHeap( GetProcessHeap(), 0, name ); if (handle == INVALID_HANDLE_VALUE) { - WARN("Failed to open %s, err %u\n", debugstr_a(unix_device), GetLastError()); + WARN("Failed to open %s, err %lu\n", debugstr_a(unix_device), GetLastError()); return FALSE; } @@ -1008,7 +1008,7 @@ static NTSTATUS set_volume_info( struct volume *volume, struct dos_drive *drive, get_filesystem_serial( volume ); } - TRACE("fs_type %#x, label %s, serial %08x\n", volume->fs_type, debugstr_w(volume->label), volume->serial); + TRACE("fs_type %#x, label %s, serial %08lx\n", volume->fs_type, debugstr_w(volume->label), volume->serial); if (guid && memcmp( &volume->guid, guid, sizeof(volume->guid) )) { @@ -1526,7 +1526,7 @@ NTSTATUS query_unix_drive( void *buff, SIZE_T insize, SIZE_T outsize, IO_STATUS_ ptr += strlen(ptr) + 1; } - TRACE( "returning %c: dev %s mount %s type %u\n", + TRACE( "returning %c: dev %s mount %s type %lu\n", letter, debugstr_a(device), debugstr_a(mount_point), type ); iosb->Information = ptr - (char *)output; @@ -1622,7 +1622,7 @@ static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp ) struct volume *volume; NTSTATUS status; - TRACE( "volume query %x length %u\n", info_class, length ); + TRACE( "volume query %x length %lu\n", info_class, length ); EnterCriticalSection( &device_section ); volume = dev->volume; @@ -1722,7 +1722,7 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) struct disk_device *dev = 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 ); @@ -1794,7 +1794,7 @@ static NTSTATUS WINAPI harddisk_ioctl( DEVICE_OBJECT *device, IRP *irp ) default: { ULONG code = irpsp->Parameters.DeviceIoControl.IoControlCode; - FIXME("Unsupported ioctl %x (device=%x access=%x func=%x method=%x)\n", + FIXME("Unsupported ioctl %lx (device=%lx access=%lx func=%lx method=%lx)\n", code, code >> 16, (code >> 14) & 3, (code >> 2) & 0xfff, code & 3); status = STATUS_NOT_SUPPORTED; break; @@ -1864,7 +1864,7 @@ static BOOL create_port_device( DRIVER_OBJECT *driver, int n, const char *unix_p status = IoCreateDevice( driver, 0, &nt_name, 0, 0, FALSE, &dev_obj ); if (status != STATUS_SUCCESS) { - FIXME( "IoCreateDevice %s got %x\n", debugstr_w(nt_name.Buffer), status ); + FIXME( "IoCreateDevice %s got %lx\n", debugstr_w(nt_name.Buffer), status ); return FALSE; } swprintf( symlink_buffer, ARRAY_SIZE(symlink_buffer), symlink_format, n ); diff --git a/dlls/mountmgr.sys/mountmgr.c b/dlls/mountmgr.sys/mountmgr.c index 1be55bee419..1f9bd56a384 100644 --- a/dlls/mountmgr.sys/mountmgr.c +++ b/dlls/mountmgr.sys/mountmgr.c @@ -251,7 +251,7 @@ static NTSTATUS define_unix_drive( const void *in_buff, SIZE_T insize ) { enum device_type type = DEVICE_UNKNOWN; - TRACE( "defining %c: dev %s mount %s type %u\n", + TRACE( "defining %c: dev %s mount %s type %lu\n", letter, debugstr_a(device), debugstr_a(mount_point), input->type ); switch (input->type) { @@ -467,7 +467,7 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) NTSTATUS status; ULONG info = 0; - 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 ); @@ -592,7 +592,7 @@ static NTSTATUS WINAPI mountmgr_ioctl( DEVICE_OBJECT *device, IRP *irp ) else status = STATUS_INVALID_PARAMETER; break; default: - FIXME( "ioctl %x not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); + FIXME( "ioctl %lx not supported\n", irpsp->Parameters.DeviceIoControl.IoControlCode ); status = STATUS_NOT_SUPPORTED; break; } @@ -641,7 +641,7 @@ NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) status = IoCreateSymbolicLink( &linkW, &nameW ); if (status) { - FIXME( "failed to create device error %x\n", status ); + FIXME( "failed to create device error %lx\n", status ); return status; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mp3dmod/Makefile.in | 1 - dlls/mp3dmod/mp3dmod.c | 40 ++++++++++++++++++++-------------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/mp3dmod/Makefile.in b/dlls/mp3dmod/Makefile.in index 4220efc3171..dabbb1dfeae 100644 --- a/dlls/mp3dmod/Makefile.in +++ b/dlls/mp3dmod/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mp3dmod.dll IMPORTS = $(MPG123_PE_LIBS) dmoguids msdmo ole32 uuid wmcodecdspuuid kernelbase EXTRAINCL = $(MPG123_PE_CFLAGS) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index adcee393806..12c34421ce9 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -87,7 +87,7 @@ static ULONG WINAPI Unknown_AddRef(IUnknown *iface) struct mp3_decoder *This = impl_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&This->ref); - TRACE("(%p) AddRef from %d\n", This, refcount - 1); + TRACE("(%p) AddRef from %ld\n", This, refcount - 1); return refcount; } @@ -97,7 +97,7 @@ static ULONG WINAPI Unknown_Release(IUnknown *iface) struct mp3_decoder *This = impl_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&This->ref); - TRACE("(%p) Release from %d\n", This, refcount + 1); + TRACE("(%p) Release from %ld\n", This, refcount + 1); if (!refcount) { @@ -152,7 +152,7 @@ static HRESULT WINAPI MediaObject_GetStreamCount(IMediaObject *iface, DWORD *inp static HRESULT WINAPI MediaObject_GetInputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) { - TRACE("iface %p, index %u, flags %p.\n", iface, index, flags); + TRACE("iface %p, index %lu, flags %p.\n", iface, index, flags); *flags = 0; @@ -161,7 +161,7 @@ static HRESULT WINAPI MediaObject_GetInputStreamInfo(IMediaObject *iface, DWORD static HRESULT WINAPI MediaObject_GetOutputStreamInfo(IMediaObject *iface, DWORD index, DWORD *flags) { - TRACE("iface %p, index %u, flags %p.\n", iface, index, flags); + TRACE("iface %p, index %lu, flags %p.\n", iface, index, flags); *flags = 0; @@ -170,7 +170,7 @@ static HRESULT WINAPI MediaObject_GetOutputStreamInfo(IMediaObject *iface, DWORD static HRESULT WINAPI MediaObject_GetInputType(IMediaObject *iface, DWORD index, DWORD type_index, DMO_MEDIA_TYPE *type) { - TRACE("iface %p, index %u, type_index %u, type %p.\n", iface, index, type_index, type); + TRACE("iface %p, index %lu, type_index %lu, type %p.\n", iface, index, type_index, type); if (type_index) return DMO_E_NO_MORE_ITEMS; @@ -191,7 +191,7 @@ static HRESULT WINAPI MediaObject_GetOutputType(IMediaObject *iface, DWORD index const WAVEFORMATEX *input_format; WAVEFORMATEX *format; - TRACE("iface %p, index %u, type_index %u, type %p.\n", iface, index, type_index, type); + TRACE("iface %p, index %lu, type_index %lu, type %p.\n", iface, index, type_index, type); if (!dmo->intype_set) return DMO_E_TYPE_NOT_SET; @@ -224,7 +224,7 @@ static HRESULT WINAPI MediaObject_SetInputType(IMediaObject *iface, DWORD index, { struct mp3_decoder *dmo = impl_from_IMediaObject(iface); - TRACE("iface %p, index %u, type %p, flags %#x.\n", iface, index, type, flags); + TRACE("iface %p, index %lu, type %p, flags %#lx.\n", iface, index, type, flags); if (flags & DMO_SET_TYPEF_CLEAR) { @@ -257,7 +257,7 @@ static HRESULT WINAPI MediaObject_SetOutputType(IMediaObject *iface, DWORD index long enc; int err; - TRACE("(%p)->(%d, %p, %#x)\n", iface, index, type, flags); + TRACE("(%p)->(%ld, %p, %#lx)\n", iface, index, type, flags); if (flags & DMO_SET_TYPEF_CLEAR) { @@ -286,7 +286,7 @@ static HRESULT WINAPI MediaObject_SetOutputType(IMediaObject *iface, DWORD index err = mpg123_format(This->mh, format->nSamplesPerSec, format->nChannels, enc); if (err != MPG123_OK) { - ERR("Failed to set format: %u channels, %u samples/sec, %u bits/sample.\n", + ERR("Failed to set format: %u channels, %lu samples/sec, %u bits/sample.\n", format->nChannels, format->nSamplesPerSec, format->wBitsPerSample); return DMO_E_TYPE_NOT_ACCEPTED; } @@ -299,14 +299,14 @@ static HRESULT WINAPI MediaObject_SetOutputType(IMediaObject *iface, DWORD index static HRESULT WINAPI MediaObject_GetInputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) { - FIXME("(%p)->(%d, %p) stub!\n", iface, index, type); + FIXME("(%p)->(%ld, %p) stub!\n", iface, index, type); return E_NOTIMPL; } static HRESULT WINAPI MediaObject_GetOutputCurrentType(IMediaObject *iface, DWORD index, DMO_MEDIA_TYPE *type) { - FIXME("(%p)->(%d, %p) stub!\n", iface, index, type); + FIXME("(%p)->(%ld, %p) stub!\n", iface, index, type); return E_NOTIMPL; } @@ -316,7 +316,7 @@ static HRESULT WINAPI MediaObject_GetInputSizeInfo(IMediaObject *iface, { struct mp3_decoder *dmo = impl_from_IMediaObject(iface); - TRACE("iface %p, index %u, size %p, lookahead %p, alignment %p.\n", iface, index, size, lookahead, alignment); + TRACE("iface %p, index %lu, size %p, lookahead %p, alignment %p.\n", iface, index, size, lookahead, alignment); if (!dmo->intype_set || !dmo->outtype_set) return DMO_E_TYPE_NOT_SET; @@ -330,7 +330,7 @@ static HRESULT WINAPI MediaObject_GetOutputSizeInfo(IMediaObject *iface, DWORD i { struct mp3_decoder *dmo = impl_from_IMediaObject(iface); - TRACE("iface %p, index %u, size %p, alignment %p.\n", iface, index, size, alignment); + TRACE("iface %p, index %lu, size %p, alignment %p.\n", iface, index, size, alignment); if (!dmo->intype_set || !dmo->outtype_set) return DMO_E_TYPE_NOT_SET; @@ -342,14 +342,14 @@ static HRESULT WINAPI MediaObject_GetOutputSizeInfo(IMediaObject *iface, DWORD i static HRESULT WINAPI MediaObject_GetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME *latency) { - FIXME("(%p)->(%d, %p) stub!\n", iface, index, latency); + FIXME("(%p)->(%ld, %p) stub!\n", iface, index, latency); return E_NOTIMPL; } static HRESULT WINAPI MediaObject_SetInputMaxLatency(IMediaObject *iface, DWORD index, REFERENCE_TIME latency) { - FIXME("(%p)->(%d, %s) stub!\n", iface, index, wine_dbgstr_longlong(latency)); + FIXME("(%p)->(%ld, %s) stub!\n", iface, index, wine_dbgstr_longlong(latency)); return E_NOTIMPL; } @@ -395,7 +395,7 @@ static HRESULT WINAPI MediaObject_FreeStreamingResources(IMediaObject *iface) static HRESULT WINAPI MediaObject_GetInputStatus(IMediaObject *iface, DWORD index, DWORD *flags) { - FIXME("(%p)->(%d, %p) stub!\n", iface, index, flags); + FIXME("(%p)->(%ld, %p) stub!\n", iface, index, flags); return E_NOTIMPL; } @@ -409,7 +409,7 @@ static HRESULT WINAPI MediaObject_ProcessInput(IMediaObject *iface, DWORD index, DWORD len; int err; - TRACE("(%p)->(%d, %p, %#x, %s, %s)\n", iface, index, buffer, flags, + TRACE("(%p)->(%ld, %p, %#lx, %s, %s)\n", iface, index, buffer, flags, wine_dbgstr_longlong(timestamp), wine_dbgstr_longlong(timelength)); if (This->buffer) @@ -458,7 +458,7 @@ static HRESULT WINAPI MediaObject_ProcessOutput(IMediaObject *iface, DWORD flags BYTE *data; int err; - TRACE("(%p)->(%#x, %d, %p, %p)\n", iface, flags, count, buffers, status); + TRACE("(%p)->(%#lx, %ld, %p, %p)\n", iface, flags, count, buffers, status); if (count > 1) FIXME("Multiple buffers not handled.\n"); @@ -513,7 +513,7 @@ static HRESULT WINAPI MediaObject_ProcessOutput(IMediaObject *iface, DWORD flags else if (err != MPG123_OK) ERR("mpg123_read() returned %d\n", err); if (written < framesize) - ERR("short write: %Id/%u\n", written, framesize); + ERR("short write: %Id/%lu\n", written, framesize); got_data = 1; @@ -537,7 +537,7 @@ static HRESULT WINAPI MediaObject_ProcessOutput(IMediaObject *iface, DWORD flags static HRESULT WINAPI MediaObject_Lock(IMediaObject *iface, LONG lock) { - FIXME("(%p)->(%d) stub!\n", iface, lock); + FIXME("(%p)->(%ld) stub!\n", iface, lock); return E_NOTIMPL; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mprapi/Makefile.in | 1 - dlls/mprapi/mprapi.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mprapi/Makefile.in b/dlls/mprapi/Makefile.in index fe164b39429..c97e316deb5 100644 --- a/dlls/mprapi/Makefile.in +++ b/dlls/mprapi/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mprapi.dll IMPORTLIB = mprapi diff --git a/dlls/mprapi/mprapi.c b/dlls/mprapi/mprapi.c index b3d641fe108..8af9ebf0152 100644 --- a/dlls/mprapi/mprapi.c +++ b/dlls/mprapi/mprapi.c @@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mprapi); */ DWORD APIENTRY MprAdminGetErrorString(DWORD mprerror, LPWSTR *localstr) { - FIXME("(0x%x/%u, %p): stub!\n", mprerror, mprerror, localstr); + FIXME("(0x%lx/%lu, %p): stub!\n", mprerror, mprerror, localstr); *localstr = NULL; return ERROR_MR_MID_NOT_FOUND;
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/mpr/Makefile.in | 1 - dlls/mpr/multinet.c | 4 +-- dlls/mpr/nps.c | 18 ++++++------- dlls/mpr/pwcache.c | 2 + dlls/mpr/wnet.c | 72 +++++++++++++++++++++++++------------------------- 5 files changed, 48 insertions(+), 49 deletions(-) diff --git a/dlls/mpr/Makefile.in b/dlls/mpr/Makefile.in index f7e3b9edb39..8a74786cd22 100644 --- a/dlls/mpr/Makefile.in +++ b/dlls/mpr/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = mpr.dll IMPORTLIB = mpr IMPORTS = user32 advapi32 diff --git a/dlls/mpr/multinet.c b/dlls/mpr/multinet.c index f05cd214ef5..715fdf3aa79 100644 --- a/dlls/mpr/multinet.c +++ b/dlls/mpr/multinet.c @@ -66,7 +66,7 @@ DWORD WINAPI MultinetGetConnectionPerformanceW( */ DWORD WINAPI MultinetGetErrorTextA( DWORD x, DWORD y, DWORD z ) { - FIXME( "(%x, %x, %x): stub\n", x, y, z ); + FIXME( "(%lx, %lx, %lx): stub\n", x, y, z ); return 0; } @@ -75,6 +75,6 @@ DWORD WINAPI MultinetGetErrorTextA( DWORD x, DWORD y, DWORD z ) */ DWORD WINAPI MultinetGetErrorTextW( DWORD x, DWORD y, DWORD z ) { - FIXME( "(%x, %x, %x ): stub\n", x, y, z ); + FIXME( "(%lx, %lx, %lx ): stub\n", x, y, z ); return 0; } diff --git a/dlls/mpr/nps.c b/dlls/mpr/nps.c index 84ea08ec3c2..abdc97c4614 100644 --- a/dlls/mpr/nps.c +++ b/dlls/mpr/nps.c @@ -44,7 +44,7 @@ static INT_PTR WINAPI NPS_ProxyPasswordDialog( if( uMsg == WM_INITDIALOG ) { - TRACE("WM_INITDIALOG (%08lx)\n", lParam); + TRACE("WM_INITDIALOG (%08Ix)\n", lParam); /* save the parameter list */ lpAuthDlgStruct = (LPAUTHDLGSTRUCTA) lParam; @@ -148,7 +148,7 @@ DWORD WINAPI NPSGetSectionNameA( HPROVIDER hProvider, LPCSTR *lpszSectionName ) */ DWORD WINAPI NPSSetExtendedErrorA( DWORD NetSpecificError, LPSTR lpExtendedErrorText ) { - FIXME( "(%08x, %s): stub\n", NetSpecificError, debugstr_a(lpExtendedErrorText) ); + FIXME( "(%08lx, %s): stub\n", NetSpecificError, debugstr_a(lpExtendedErrorText) ); return WN_NOT_SUPPORTED; } @@ -183,7 +183,7 @@ DWORD WINAPI NPSDeviceGetNumberA( LPSTR lpLocalName, LPDWORD lpdwNumber, LPDWORD */ DWORD WINAPI NPSDeviceGetStringA( DWORD dwNumber, DWORD dwType, LPSTR lpLocalName, LPDWORD lpdwBufferSize ) { - FIXME( "(%d, %d, %p, %p): stub\n", dwNumber, dwType, lpLocalName, lpdwBufferSize ); + FIXME( "(%ld, %ld, %p, %p): stub\n", dwNumber, dwType, lpLocalName, lpdwBufferSize ); return WN_NOT_SUPPORTED; } @@ -210,7 +210,7 @@ LPVOID WINAPI NPSNotifyGetContextA( NOTIFYCALLBACK pfNotifyCallBack ) */ DWORD WINAPI PwdGetPasswordStatusA( LPCSTR lpProvider, DWORD dwIndex, LPDWORD status ) { - FIXME("%s %d %p\n", debugstr_a(lpProvider), dwIndex, status ); + FIXME("%s %ld %p\n", debugstr_a(lpProvider), dwIndex, status ); *status = 0; return WN_SUCCESS; } @@ -220,7 +220,7 @@ DWORD WINAPI PwdGetPasswordStatusA( LPCSTR lpProvider, DWORD dwIndex, LPDWORD st */ DWORD WINAPI PwdGetPasswordStatusW( LPCWSTR lpProvider, DWORD dwIndex, LPDWORD status ) { - FIXME("%s %d %p\n", debugstr_w(lpProvider), dwIndex, status ); + FIXME("%s %ld %p\n", debugstr_w(lpProvider), dwIndex, status ); *status = 0; return WN_SUCCESS; } @@ -230,7 +230,7 @@ DWORD WINAPI PwdGetPasswordStatusW( LPCWSTR lpProvider, DWORD dwIndex, LPDWORD s */ DWORD WINAPI PwdSetPasswordStatusA( LPCSTR lpProvider, DWORD dwIndex, DWORD status ) { - FIXME("%s %d %d\n", debugstr_a(lpProvider), dwIndex, status ); + FIXME("%s %ld %ld\n", debugstr_a(lpProvider), dwIndex, status ); return WN_SUCCESS; } @@ -239,7 +239,7 @@ DWORD WINAPI PwdSetPasswordStatusA( LPCSTR lpProvider, DWORD dwIndex, DWORD stat */ DWORD WINAPI PwdSetPasswordStatusW( LPCWSTR lpProvider, DWORD dwIndex, DWORD status ) { - FIXME("%s %d %d\n", debugstr_w(lpProvider), dwIndex, status ); + FIXME("%s %ld %ld\n", debugstr_w(lpProvider), dwIndex, status ); return WN_SUCCESS; } @@ -260,7 +260,7 @@ typedef struct _CHANGEPWDINFOW { */ DWORD WINAPI PwdChangePasswordA( LPCSTR lpProvider, HWND hWnd, DWORD flags, LPCHANGEPWDINFOA info ) { - FIXME("%s %p %x %p\n", debugstr_a(lpProvider), hWnd, flags, info ); + FIXME("%s %p %lx %p\n", debugstr_a(lpProvider), hWnd, flags, info ); return WN_SUCCESS; } @@ -269,6 +269,6 @@ DWORD WINAPI PwdChangePasswordA( LPCSTR lpProvider, HWND hWnd, DWORD flags, LPCH */ DWORD WINAPI PwdChangePasswordW( LPCWSTR lpProvider, HWND hWnd, DWORD flags, LPCHANGEPWDINFOW info ) { - FIXME("%s %p %x %p\n", debugstr_w(lpProvider), hWnd, flags, info ); + FIXME("%s %p %lx %p\n", debugstr_w(lpProvider), hWnd, flags, info ); return WN_SUCCESS; } diff --git a/dlls/mpr/pwcache.c b/dlls/mpr/pwcache.c index f330a2a000a..5a2692a5901 100644 --- a/dlls/mpr/pwcache.c +++ b/dlls/mpr/pwcache.c @@ -249,7 +249,7 @@ UINT WINAPI WNetEnumCachedPasswords( PASSWORD_CACHE_ENTRY *entry; CHAR val[256], prefix[6]; - WARN( "(%s, %d, %d, %p, 0x%08x) totally insecure\n", + WARN( "(%s, %d, %d, %p, 0x%08lx) totally insecure\n", debugstr_an(pbPrefix,cbPrefix), cbPrefix, nType, enumPasswordProc, param ); diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 27dd1be15b5..999a2a0e80c 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -185,7 +185,7 @@ static void _tryLoadProvider(PCWSTR provider) provider->getCaps = getCaps; provider->dwSpecVersion = getCaps(WNNC_SPEC_VERSION); provider->dwNetType = getCaps(WNNC_NET_TYPE); - TRACE("net type is 0x%08x\n", provider->dwNetType); + TRACE("net type is 0x%08lx\n", provider->dwNetType); provider->dwEnumScopes = getCaps(WNNC_ENUMERATION); if (provider->dwEnumScopes) { @@ -569,7 +569,7 @@ static DWORD _thunkNetResourceArrayWToA(const NETRESOURCEW *lpNetArrayIn, } } ret = numToThunk < *lpcCount ? WN_MORE_DATA : WN_SUCCESS; - TRACE("numToThunk is %d, *lpcCount is %d, returning %d\n", numToThunk, + TRACE("numToThunk is %ld, *lpcCount is %ld, returning %ld\n", numToThunk, *lpcCount, ret); return ret; } @@ -654,7 +654,7 @@ static DWORD _thunkNetResourceArrayAToW(const NETRESOURCEA *lpNetArrayIn, } } ret = numToThunk < *lpcCount ? WN_MORE_DATA : WN_SUCCESS; - TRACE("numToThunk is %d, *lpcCount is %d, returning %d\n", numToThunk, + TRACE("numToThunk is %ld, *lpcCount is %ld, returning %ld\n", numToThunk, *lpcCount, ret); return ret; } @@ -669,7 +669,7 @@ DWORD WINAPI WNetOpenEnumA( DWORD dwScope, DWORD dwType, DWORD dwUsage, { DWORD ret; - TRACE( "(%08X, %08X, %08X, %p, %p)\n", + TRACE( "(%08lX, %08lX, %08lX, %p, %p)\n", dwScope, dwType, dwUsage, lpNet, lphEnum ); if (!lphEnum) @@ -715,7 +715,7 @@ DWORD WINAPI WNetOpenEnumA( DWORD dwScope, DWORD dwType, DWORD dwUsage, } if (ret) SetLastError(ret); - TRACE("Returning %d\n", ret); + TRACE("Returning %ld\n", ret); return ret; } @@ -761,7 +761,7 @@ DWORD WINAPI WNetOpenEnumW( DWORD dwScope, DWORD dwType, DWORD dwUsage, { DWORD ret; - TRACE( "(%08X, %08X, %08X, %p, %p)\n", + TRACE( "(%08lX, %08lX, %08lX, %p, %p)\n", dwScope, dwType, dwUsage, lpNet, lphEnum ); if (!lphEnum) @@ -873,13 +873,13 @@ DWORD WINAPI WNetOpenEnumW( DWORD dwScope, DWORD dwType, DWORD dwUsage, } break; default: - WARN("unknown scope 0x%08x\n", dwScope); + WARN("unknown scope 0x%08lx\n", dwScope); ret = WN_BAD_VALUE; } } if (ret) SetLastError(ret); - TRACE("Returning %d\n", ret); + TRACE("Returning %ld\n", ret); return ret; } @@ -934,7 +934,7 @@ DWORD WINAPI WNetEnumResourceA( HANDLE hEnum, LPDWORD lpcCount, } if (ret) SetLastError(ret); - TRACE("Returning %d\n", ret); + TRACE("Returning %ld\n", ret); return ret; } @@ -1015,7 +1015,7 @@ static DWORD _enumerateProvidersW(PWNetEnumerator enumerator, LPDWORD lpcCount, *lpcCount = count; ret = count > 0 ? WN_SUCCESS : WN_MORE_DATA; } - TRACE("Returning %d\n", ret); + TRACE("Returning %ld\n", ret); return ret; } @@ -1106,7 +1106,7 @@ static DWORD _enumerateGlobalPassthroughW(PWNetEnumerator enumerator, enumerator->providerDone = TRUE; } } - TRACE("Returning %d\n", ret); + TRACE("Returning %ld\n", ret); return ret; } @@ -1145,10 +1145,10 @@ static DWORD _enumerateGlobalW(PWNetEnumerator enumerator, LPDWORD lpcCount, lpBufferSize); break; default: - WARN("unexpected scope 0x%08x\n", enumerator->dwScope); + WARN("unexpected scope 0x%08lx\n", enumerator->dwScope); ret = WN_NO_MORE_ENTRIES; } - TRACE("Returning %d\n", ret); + TRACE("Returning %ld\n", ret); return ret; } @@ -1250,7 +1250,7 @@ static DWORD _enumerateContextW(PWNetEnumerator enumerator, LPDWORD lpcCount, *lpBufferSize = bytesNeeded; } } - TRACE("Returning %d\n", ret); + TRACE("Returning %ld\n", ret); return ret; } @@ -1373,7 +1373,7 @@ static DWORD _enumerateConnectedW(PWNetEnumerator enumerator, DWORD* user_count, HeapFree(GetProcessHeap(), 0, buffer); - TRACE("Returning %d\n", ret); + TRACE("Returning %ld\n", ret); return ret; } @@ -1585,7 +1585,7 @@ DWORD WINAPI WNetEnumResourceW( HANDLE hEnum, LPDWORD lpcCount, } if (ret) SetLastError(ret); - TRACE("Returning %d\n", ret); + TRACE("Returning %ld\n", ret); return ret; } @@ -1643,7 +1643,7 @@ DWORD WINAPI WNetCloseEnum( HANDLE hEnum ) ret = WN_BAD_HANDLE; if (ret) SetLastError(ret); - TRACE("Returning %d\n", ret); + TRACE("Returning %ld\n", ret); return ret; } @@ -1740,7 +1740,7 @@ DWORD WINAPI WNetGetResourceInformationA( LPNETRESOURCEA lpNetResource, if (ret) SetLastError(ret); - TRACE("Returning %d\n", ret); + TRACE("Returning %ld\n", ret); return ret; } @@ -2089,7 +2089,7 @@ DWORD WINAPI WNetUseConnectionW( HWND hwndOwner, NETRESOURCEW *resource, LPCWSTR { struct use_connection_context ctxt; - TRACE( "(%p, %p, %p, %s, 0x%08X, %p, %p, %p)\n", + TRACE( "(%p, %p, %p, %s, 0x%08lX, %p, %p, %p)\n", hwndOwner, resource, password, debugstr_w(userid), flags, accessname, buffer_size, result ); @@ -2187,7 +2187,7 @@ DWORD WINAPI WNetUseConnectionA( HWND hwndOwner, NETRESOURCEA *resource, NETRESOURCEW resourceW; DWORD ret; - TRACE( "(%p, %p, %p, %s, 0x%08X, %p, %p, %p)\n", hwndOwner, resource, password, debugstr_a(userid), flags, + TRACE( "(%p, %p, %p, %s, 0x%08lX, %p, %p, %p)\n", hwndOwner, resource, password, debugstr_a(userid), flags, accessname, buffer_size, result ); netresource_a_to_w(resource, &resourceW); @@ -2406,7 +2406,7 @@ DWORD WINAPI WNetGetConnectionA( LPCSTR lpLocalName, } if (ret) SetLastError(ret); - TRACE("Returning %d\n", ret); + TRACE("Returning %ld\n", ret); return ret; } @@ -2423,7 +2423,7 @@ static DWORD get_drive_connection( WCHAR letter, LPWSTR remote, LPDWORD size ) FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 )) == INVALID_HANDLE_VALUE) { - ERR( "failed to open mount manager err %u\n", GetLastError() ); + ERR( "failed to open mount manager err %lu\n", GetLastError() ); return ret; } memset( data, 0, sizeof(*data) ); @@ -2502,7 +2502,7 @@ DWORD WINAPI WNetGetConnectionW( LPCWSTR lpLocalName, } if (ret) SetLastError(ret); - TRACE("Returning %d\n", ret); + TRACE("Returning %ld\n", ret); return ret; } @@ -2512,7 +2512,7 @@ DWORD WINAPI WNetGetConnectionW( LPCWSTR lpLocalName, DWORD WINAPI WNetSetConnectionA( LPCSTR lpName, DWORD dwProperty, LPVOID pvValue ) { - FIXME( "(%s, %08X, %p): stub\n", debugstr_a(lpName), dwProperty, pvValue ); + FIXME( "(%s, %08lX, %p): stub\n", debugstr_a(lpName), dwProperty, pvValue ); SetLastError(WN_NO_NETWORK); return WN_NO_NETWORK; @@ -2524,7 +2524,7 @@ DWORD WINAPI WNetSetConnectionA( LPCSTR lpName, DWORD dwProperty, DWORD WINAPI WNetSetConnectionW( LPCWSTR lpName, DWORD dwProperty, LPVOID pvValue ) { - FIXME( "(%s, %08X, %p): stub\n", debugstr_w(lpName), dwProperty, pvValue ); + FIXME( "(%s, %08lX, %p): stub\n", debugstr_w(lpName), dwProperty, pvValue ); SetLastError(WN_NO_NETWORK); return WN_NO_NETWORK; @@ -2538,7 +2538,7 @@ DWORD WINAPI WNetGetUniversalNameA ( LPCSTR lpLocalPath, DWORD dwInfoLevel, { DWORD err, size; - FIXME( "(%s, 0x%08X, %p, %p): stub\n", + FIXME( "(%s, 0x%08lX, %p, %p): stub\n", debugstr_a(lpLocalPath), dwInfoLevel, lpBuffer, lpBufferSize); switch (dwInfoLevel) @@ -2585,7 +2585,7 @@ DWORD WINAPI WNetGetUniversalNameW ( LPCWSTR lpLocalPath, DWORD dwInfoLevel, { DWORD err, size; - FIXME( "(%s, 0x%08X, %p, %p): stub\n", + FIXME( "(%s, 0x%08lX, %p, %p): stub\n", debugstr_w(lpLocalPath), dwInfoLevel, lpBuffer, lpBufferSize); switch (dwInfoLevel) @@ -2757,7 +2757,7 @@ DWORD WINAPI WNetConnectionDialog1W( LPCONNECTDLGSTRUCTW lpConnDlgStruct ) */ DWORD WINAPI WNetDisconnectDialog( HWND hwnd, DWORD dwType ) { - FIXME( "(%p, %08X): stub\n", hwnd, dwType ); + FIXME( "(%p, %08lX): stub\n", hwnd, dwType ); SetLastError(WN_NO_NETWORK); return WN_NO_NETWORK; @@ -2792,7 +2792,7 @@ DWORD WINAPI WNetGetLastErrorA( LPDWORD lpError, LPSTR lpErrorBuf, DWORD nErrorBufSize, LPSTR lpNameBuf, DWORD nNameBufSize ) { - FIXME( "(%p, %p, %d, %p, %d): stub\n", + FIXME( "(%p, %p, %ld, %p, %ld): stub\n", lpError, lpErrorBuf, nErrorBufSize, lpNameBuf, nNameBufSize ); SetLastError(WN_NO_NETWORK); @@ -2806,7 +2806,7 @@ DWORD WINAPI WNetGetLastErrorW( LPDWORD lpError, LPWSTR lpErrorBuf, DWORD nErrorBufSize, LPWSTR lpNameBuf, DWORD nNameBufSize ) { - FIXME( "(%p, %p, %d, %p, %d): stub\n", + FIXME( "(%p, %p, %ld, %p, %ld): stub\n", lpError, lpErrorBuf, nErrorBufSize, lpNameBuf, nNameBufSize ); SetLastError(WN_NO_NETWORK); @@ -2849,7 +2849,7 @@ DWORD WINAPI WNetGetNetworkInformationA( LPCSTR lpProvider, } if (ret) SetLastError(ret); - TRACE("Returning %d\n", ret); + TRACE("Returning %ld\n", ret); return ret; } @@ -2897,7 +2897,7 @@ DWORD WINAPI WNetGetNetworkInformationW( LPCWSTR lpProvider, } if (ret) SetLastError(ret); - TRACE("Returning %d\n", ret); + TRACE("Returning %ld\n", ret); return ret; } @@ -2909,7 +2909,7 @@ DWORD WINAPI WNetGetProviderNameA( DWORD dwNetType, { DWORD ret; - TRACE("(0x%08x, %s, %p)\n", dwNetType, debugstr_a(lpProvider), + TRACE("(0x%08lx, %s, %p)\n", dwNetType, debugstr_a(lpProvider), lpBufferSize); if (!lpProvider) @@ -2952,7 +2952,7 @@ DWORD WINAPI WNetGetProviderNameA( DWORD dwNetType, } if (ret) SetLastError(ret); - TRACE("Returning %d\n", ret); + TRACE("Returning %ld\n", ret); return ret; } @@ -2964,7 +2964,7 @@ DWORD WINAPI WNetGetProviderNameW( DWORD dwNetType, { DWORD ret; - TRACE("(0x%08x, %s, %p)\n", dwNetType, debugstr_w(lpProvider), + TRACE("(0x%08lx, %s, %p)\n", dwNetType, debugstr_w(lpProvider), lpBufferSize); if (!lpProvider) @@ -3005,6 +3005,6 @@ DWORD WINAPI WNetGetProviderNameW( DWORD dwNetType, } if (ret) SetLastError(ret); - TRACE("Returning %d\n", ret); + TRACE("Returning %ld\n", ret); return ret; }
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msacm32.drv/Makefile.in | 1 - dlls/msacm32.drv/wavemap.c | 76 +++++++++++++++++++++--------------------- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/dlls/msacm32.drv/Makefile.in b/dlls/msacm32.drv/Makefile.in index 5d622d58221..ec343b0e272 100644 --- a/dlls/msacm32.drv/Makefile.in +++ b/dlls/msacm32.drv/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msacm32.drv IMPORTS = msacm32 winmm user32 diff --git a/dlls/msacm32.drv/wavemap.c b/dlls/msacm32.drv/wavemap.c index bb51e2235cd..c5fac640472 100644 --- a/dlls/msacm32.drv/wavemap.c +++ b/dlls/msacm32.drv/wavemap.c @@ -80,7 +80,7 @@ static void CALLBACK wodCallback(HWAVEOUT hWave, UINT uMsg, DWORD_PTR dwInstance { WAVEMAPDATA* wom = (WAVEMAPDATA*)dwInstance; - TRACE("(%p %u %ld %lx %lx);\n", hWave, uMsg, dwInstance, dwParam1, dwParam2); + TRACE("(%p %u %Id %Ix %Ix);\n", hWave, uMsg, dwInstance, dwParam1, dwParam2); if (!WAVEMAP_IsData(wom)) { ERR("Bad data\n"); @@ -125,7 +125,7 @@ static DWORD wodOpenHelper(WAVEMAPDATA* wom, UINT idx, { DWORD ret; - TRACE("(%p %04x %p %p %08x)\n", wom, idx, lpDesc, lpwfx, dwFlags); + TRACE("(%p %04x %p %p %08lx)\n", wom, idx, lpDesc, lpwfx, dwFlags); /* destination is always PCM, so the formulas below apply */ lpwfx->nBlockAlign = (lpwfx->nChannels * lpwfx->wBitsPerSample) / 8; @@ -144,7 +144,7 @@ static DWORD wodOpenHelper(WAVEMAPDATA* wom, UINT idx, wom->hAcmStream = 0; } } - TRACE("ret = %08x\n", ret); + TRACE("ret = %08lx\n", ret); return ret; } @@ -155,7 +155,7 @@ static DWORD wodOpen(DWORD_PTR *lpdwUser, LPWAVEOPENDESC lpDesc, DWORD dwFlags) WAVEMAPDATA* wom = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEMAPDATA)); DWORD res; - TRACE("(%p %p %08x)\n", lpdwUser, lpDesc, dwFlags); + TRACE("(%p %p %08lx)\n", lpdwUser, lpDesc, dwFlags); if (!wom) { WARN("no memory\n"); @@ -288,7 +288,7 @@ error: WARN("ret = WAVERR_BADFORMAT\n"); return WAVERR_BADFORMAT; } - WARN("ret = 0x%08x\n", res); + WARN("ret = 0x%08lx\n", res); return res; } @@ -315,7 +315,7 @@ static DWORD wodWrite(WAVEMAPDATA* wom, LPWAVEHDR lpWaveHdrSrc, DWORD dwParam2) PACMSTREAMHEADER ash; LPWAVEHDR lpWaveHdrDst; - TRACE("(%p %p %08x)\n", wom, lpWaveHdrSrc, dwParam2); + TRACE("(%p %p %08lx)\n", wom, lpWaveHdrSrc, dwParam2); if (!wom->hAcmStream) { return waveOutWrite(wom->u.out.hInnerWave, lpWaveHdrSrc, dwParam2); @@ -352,7 +352,7 @@ static DWORD wodPrepare(WAVEMAPDATA* wom, LPWAVEHDR lpWaveHdrSrc, DWORD dwParam2 DWORD dwRet; LPWAVEHDR lpWaveHdrDst; - TRACE("(%p %p %08x)\n", wom, lpWaveHdrSrc, dwParam2); + TRACE("(%p %p %08lx)\n", wom, lpWaveHdrSrc, dwParam2); if (!wom->hAcmStream) return waveOutPrepareHeader(wom->u.out.hInnerWave, lpWaveHdrSrc, dwParam2); @@ -401,7 +401,7 @@ static DWORD wodPrepare(WAVEMAPDATA* wom, LPWAVEHDR lpWaveHdrSrc, DWORD dwParam2 TRACE("=> (0)\n"); return MMSYSERR_NOERROR; errCleanUp: - TRACE("=> (%d)\n", dwRet); + TRACE("=> (%ld)\n", dwRet); HeapFree(GetProcessHeap(), 0, ash); return dwRet; } @@ -412,7 +412,7 @@ static DWORD wodUnprepare(WAVEMAPDATA* wom, LPWAVEHDR lpWaveHdrSrc, DWORD dwPara LPWAVEHDR lpWaveHdrDst; DWORD dwRet1, dwRet2; - TRACE("(%p %p %08x)\n", wom, lpWaveHdrSrc, dwParam2); + TRACE("(%p %p %08lx)\n", wom, lpWaveHdrSrc, dwParam2); if (!wom->hAcmStream) { return waveOutUnprepareHeader(wom->u.out.hInnerWave, lpWaveHdrSrc, dwParam2); @@ -433,7 +433,7 @@ static DWORD wodGetPosition(WAVEMAPDATA* wom, LPMMTIME lpTime, DWORD dwParam2) { DWORD val; MMTIME timepos; - TRACE("(%p %p %08x)\n", wom, lpTime, dwParam2); + TRACE("(%p %p %08lx)\n", wom, lpTime, dwParam2); timepos = *lpTime; @@ -493,7 +493,7 @@ static DWORD wodGetPosition(WAVEMAPDATA* wom, LPMMTIME lpTime, DWORD dwParam2) static DWORD wodGetDevCaps(UINT wDevID, WAVEMAPDATA* wom, LPWAVEOUTCAPSW lpWaveCaps, DWORD dwParam2) { - TRACE("(%04x %p %p %08x)\n",wDevID, wom, lpWaveCaps, dwParam2); + TRACE("(%04x %p %p %08lx)\n",wDevID, wom, lpWaveCaps, dwParam2); /* if opened low driver, forward message */ if (WAVEMAP_IsData(wom)) @@ -538,7 +538,7 @@ static DWORD wodGetVolume(UINT wDevID, WAVEMAPDATA* wom, LPDWORD lpVol) static DWORD wodSetVolume(UINT wDevID, WAVEMAPDATA* wom, DWORD vol) { - TRACE("(%04x %p %08x)\n",wDevID, wom, vol); + TRACE("(%04x %p %08lx)\n",wDevID, wom, vol); if (WAVEMAP_IsData(wom)) return waveOutSetVolume(wom->u.out.hInnerWave, vol); @@ -578,7 +578,7 @@ static DWORD wodMapperStatus(WAVEMAPDATA* wom, DWORD flags, LPVOID ptr) UINT id; DWORD ret = MMSYSERR_NOTSUPPORTED; - TRACE("(%p %08x %p)\n",wom, flags, ptr); + TRACE("(%p %08lx %p)\n",wom, flags, ptr); switch (flags) { case WAVEOUT_MAPPER_STATUS_DEVICE: @@ -586,16 +586,16 @@ static DWORD wodMapperStatus(WAVEMAPDATA* wom, DWORD flags, LPVOID ptr) *(LPDWORD)ptr = id; break; case WAVEOUT_MAPPER_STATUS_MAPPED: - FIXME("Unsupported flag=%d\n", flags); + FIXME("Unsupported flag=%ld\n", flags); *(LPDWORD)ptr = 0; /* FIXME ?? */ break; case WAVEOUT_MAPPER_STATUS_FORMAT: - FIXME("Unsupported flag=%d\n", flags); + FIXME("Unsupported flag=%ld\n", flags); /* ptr points to a WAVEFORMATEX struct - before or after streaming ? */ *(LPDWORD)ptr = 0; break; default: - FIXME("Unsupported flag=%d\n", flags); + FIXME("Unsupported flag=%ld\n", flags); *(LPDWORD)ptr = 0; break; } @@ -604,7 +604,7 @@ static DWORD wodMapperStatus(WAVEMAPDATA* wom, DWORD flags, LPVOID ptr) static DWORD wodMapperReconfigure(WAVEMAPDATA* wom, DWORD dwParam1, DWORD dwParam2) { - FIXME("(%p %08x %08x) stub!\n", wom, dwParam1, dwParam2); + FIXME("(%p %08lx %08lx) stub!\n", wom, dwParam1, dwParam2); return MMSYSERR_NOERROR; } @@ -615,7 +615,7 @@ static DWORD wodMapperReconfigure(WAVEMAPDATA* wom, DWORD dwParam1, DWORD dwP DWORD WINAPI WAVEMAP_wodMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("(%u, %04X, %08lX, %08lX, %08lX);\n", + TRACE("(%u, %04X, %08IX, %08IX, %08IX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { @@ -664,7 +664,7 @@ static void CALLBACK widCallback(HWAVEIN hWave, UINT uMsg, DWORD_PTR dwInstance, { WAVEMAPDATA* wim = (WAVEMAPDATA*)dwInstance; - TRACE("(%p %u %lx %lx %lx);\n", hWave, uMsg, dwInstance, dwParam1, dwParam2); + TRACE("(%p %u %Ix %Ix %Ix);\n", hWave, uMsg, dwInstance, dwParam1, dwParam2); if (!WAVEMAP_IsData(wim)) { ERR("Bad data\n"); @@ -690,7 +690,7 @@ static void CALLBACK widCallback(HWAVEIN hWave, UINT uMsg, DWORD_PTR dwInstance, ERR("ACM conversion failed\n"); return; } else { - TRACE("Converted %d bytes into %d\n", ash->cbSrcLengthUsed, ash->cbDstLengthUsed); + TRACE("Converted %ld bytes into %ld\n", ash->cbSrcLengthUsed, ash->cbDstLengthUsed); } /* and setup the wavehdr to return accordingly */ lpWaveHdrDst->dwFlags &= ~WHDR_INQUEUE; @@ -713,7 +713,7 @@ static DWORD widOpenHelper(WAVEMAPDATA* wim, UINT idx, { DWORD ret; - TRACE("(%p %04x %p %p %08x)\n", wim, idx, lpDesc, lpwfx, dwFlags); + TRACE("(%p %04x %p %p %08lx)\n", wim, idx, lpDesc, lpwfx, dwFlags); /* source is always PCM, so the formulas below apply */ lpwfx->nBlockAlign = (lpwfx->nChannels * lpwfx->wBitsPerSample) / 8; @@ -732,7 +732,7 @@ static DWORD widOpenHelper(WAVEMAPDATA* wim, UINT idx, wim->hAcmStream = 0; } } - TRACE("ret = %08x\n", ret); + TRACE("ret = %08lx\n", ret); return ret; } @@ -743,7 +743,7 @@ static DWORD widOpen(DWORD_PTR *lpdwUser, LPWAVEOPENDESC lpDesc, DWORD dwFlags) WAVEMAPDATA* wim = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEMAPDATA)); DWORD res; - TRACE("(%p %p %08x)\n", lpdwUser, lpDesc, dwFlags); + TRACE("(%p %p %08lx)\n", lpdwUser, lpDesc, dwFlags); if (!wim) { WARN("no memory\n"); @@ -859,7 +859,7 @@ error: WARN("ret = WAVERR_BADFORMAT\n"); return WAVERR_BADFORMAT; } - WARN("ret = 0x%08x\n", res); + WARN("ret = 0x%08lx\n", res); return res; } @@ -886,7 +886,7 @@ static DWORD widAddBuffer(WAVEMAPDATA* wim, LPWAVEHDR lpWaveHdrDst, DWORD dwPara PACMSTREAMHEADER ash; LPWAVEHDR lpWaveHdrSrc; - TRACE("(%p %p %08x)\n", wim, lpWaveHdrDst, dwParam2); + TRACE("(%p %p %08lx)\n", wim, lpWaveHdrDst, dwParam2); if (!wim->hAcmStream) { return waveInAddBuffer(wim->u.in.hInnerWave, lpWaveHdrDst, dwParam2); @@ -906,7 +906,7 @@ static DWORD widPrepare(WAVEMAPDATA* wim, LPWAVEHDR lpWaveHdrDst, DWORD dwParam2 DWORD dwRet; LPWAVEHDR lpWaveHdrSrc; - TRACE("(%p %p %08x)\n", wim, lpWaveHdrDst, dwParam2); + TRACE("(%p %p %08lx)\n", wim, lpWaveHdrDst, dwParam2); if (!wim->hAcmStream) { return waveInPrepareHeader(wim->u.in.hInnerWave, lpWaveHdrDst, dwParam2); @@ -956,7 +956,7 @@ static DWORD widPrepare(WAVEMAPDATA* wim, LPWAVEHDR lpWaveHdrDst, DWORD dwParam2 TRACE("=> (0)\n"); return MMSYSERR_NOERROR; errCleanUp: - TRACE("=> (%d)\n", dwRet); + TRACE("=> (%ld)\n", dwRet); HeapFree(GetProcessHeap(), 0, ash); return dwRet; } @@ -967,7 +967,7 @@ static DWORD widUnprepare(WAVEMAPDATA* wim, LPWAVEHDR lpWaveHdrDst, DWORD dwPara LPWAVEHDR lpWaveHdrSrc; DWORD dwRet1, dwRet2; - TRACE("(%p %p %08x)\n", wim, lpWaveHdrDst, dwParam2); + TRACE("(%p %p %08lx)\n", wim, lpWaveHdrDst, dwParam2); if (!wim->hAcmStream) { return waveInUnprepareHeader(wim->u.in.hInnerWave, lpWaveHdrDst, dwParam2); @@ -988,7 +988,7 @@ static DWORD widGetPosition(WAVEMAPDATA* wim, LPMMTIME lpTime, DWORD dwParam2) { DWORD val; MMTIME timepos; - TRACE("(%p %p %08x)\n", wim, lpTime, dwParam2); + TRACE("(%p %p %08lx)\n", wim, lpTime, dwParam2); timepos = *lpTime; @@ -1048,7 +1048,7 @@ static DWORD widGetPosition(WAVEMAPDATA* wim, LPMMTIME lpTime, DWORD dwParam2) static DWORD widGetDevCaps(UINT wDevID, WAVEMAPDATA* wim, LPWAVEINCAPSW lpWaveCaps, DWORD dwParam2) { - TRACE("(%04x, %p %p %08x)\n", wDevID, wim, lpWaveCaps, dwParam2); + TRACE("(%04x, %p %p %08lx)\n", wDevID, wim, lpWaveCaps, dwParam2); /* if opened low driver, forward message */ if (WAVEMAP_IsData(wim)) @@ -1107,7 +1107,7 @@ static DWORD widMapperStatus(WAVEMAPDATA* wim, DWORD flags, LPVOID ptr) UINT id; DWORD ret = MMSYSERR_NOTSUPPORTED; - TRACE("(%p %08x %p)\n", wim, flags, ptr); + TRACE("(%p %08lx %p)\n", wim, flags, ptr); switch (flags) { case WAVEIN_MAPPER_STATUS_DEVICE: @@ -1115,16 +1115,16 @@ static DWORD widMapperStatus(WAVEMAPDATA* wim, DWORD flags, LPVOID ptr) *(LPDWORD)ptr = id; break; case WAVEIN_MAPPER_STATUS_MAPPED: - FIXME("Unsupported yet flag=%d\n", flags); + FIXME("Unsupported yet flag=%ld\n", flags); *(LPDWORD)ptr = 0; /* FIXME ?? */ break; case WAVEIN_MAPPER_STATUS_FORMAT: - FIXME("Unsupported flag=%d\n", flags); + FIXME("Unsupported flag=%ld\n", flags); /* ptr points to a WAVEFORMATEX struct - before or after streaming ? */ *(LPDWORD)ptr = 0; /* FIXME ?? */ break; default: - FIXME("Unsupported flag=%d\n", flags); + FIXME("Unsupported flag=%ld\n", flags); *(LPDWORD)ptr = 0; break; } @@ -1133,7 +1133,7 @@ static DWORD widMapperStatus(WAVEMAPDATA* wim, DWORD flags, LPVOID ptr) static DWORD widMapperReconfigure(WAVEMAPDATA* wim, DWORD dwParam1, DWORD dwParam2) { - FIXME("(%p %08x %08x) stub!\n", wim, dwParam1, dwParam2); + FIXME("(%p %08lx %08lx) stub!\n", wim, dwParam1, dwParam2); return MMSYSERR_NOERROR; } @@ -1144,7 +1144,7 @@ static DWORD widMapperReconfigure(WAVEMAPDATA* wim, DWORD dwParam1, DWORD dwP DWORD WINAPI WAVEMAP_widMessage(WORD wDevID, WORD wMsg, DWORD_PTR dwUser, DWORD_PTR dwParam1, DWORD_PTR dwParam2) { - TRACE("(%u, %04X, %08lX, %08lX, %08lX);\n", + TRACE("(%u, %04X, %08IX, %08IX, %08IX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); switch (wMsg) { @@ -1205,7 +1205,7 @@ static LRESULT WAVEMAP_drvOpen(LPSTR str) */ static LRESULT WAVEMAP_drvClose(DWORD_PTR dwDevID) { - TRACE("(%08lx)\n", dwDevID); + TRACE("(%08Ix)\n", dwDevID); if (oss) { oss = NULL; @@ -1220,7 +1220,7 @@ static LRESULT WAVEMAP_drvClose(DWORD_PTR dwDevID) LRESULT CALLBACK WAVEMAP_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2) { - TRACE("(%08lX, %p, %08X, %08lX, %08lX)\n", + TRACE("(%08IX, %p, %08X, %08IX, %08IX)\n", dwDevID, hDriv, wMsg, dwParam1, dwParam2); switch(wMsg) {
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msacm32/Makefile.in | 1 - dlls/msacm32/driver.c | 26 +++++++++++++------------- dlls/msacm32/filter.c | 12 ++++++------ dlls/msacm32/format.c | 26 +++++++++++++------------- dlls/msacm32/internal.c | 14 +++++++------- dlls/msacm32/msacm32_main.c | 4 ++-- dlls/msacm32/pcmconverter.c | 24 ++++++++++++------------ dlls/msacm32/stream.c | 24 ++++++++++++------------ 8 files changed, 65 insertions(+), 66 deletions(-) diff --git a/dlls/msacm32/Makefile.in b/dlls/msacm32/Makefile.in index a6da7428749..be2136d78f7 100644 --- a/dlls/msacm32/Makefile.in +++ b/dlls/msacm32/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msacm32.dll IMPORTLIB = msacm32 IMPORTS = winmm user32 advapi32 diff --git a/dlls/msacm32/driver.c b/dlls/msacm32/driver.c index a8d6f3cf6d7..aa88a88d354 100644 --- a/dlls/msacm32/driver.c +++ b/dlls/msacm32/driver.c @@ -49,7 +49,7 @@ MMRESULT WINAPI acmDriverAddA(PHACMDRIVERID phadid, HINSTANCE hinstModule, WCHAR * driverW = NULL; LPARAM lParamW = lParam; - TRACE("(%p, %p, %08lx, %08x, %08x)\n", + TRACE("(%p, %p, %08Ix, %08lx, %08lx)\n", phadid, hinstModule, lParam, dwPriority, fdwAdd); if (!phadid) { @@ -98,7 +98,7 @@ MMRESULT WINAPI acmDriverAddW(PHACMDRIVERID phadid, HINSTANCE hinstModule, { PWINE_ACMLOCALDRIVER pLocalDrv = NULL; - TRACE("(%p, %p, %08lx, %08x, %08x)\n", + TRACE("(%p, %p, %08Ix, %08lx, %08lx)\n", phadid, hinstModule, lParam, dwPriority, fdwAdd); if (!phadid) { @@ -165,7 +165,7 @@ MMRESULT WINAPI acmDriverAddW(PHACMDRIVERID phadid, HINSTANCE hinstModule, } break; default: - ERR("invalid flag value 0x%08x for fdwAdd\n", fdwAdd); + ERR("invalid flag value 0x%08lx for fdwAdd\n", fdwAdd); return MMSYSERR_INVALFLAG; } @@ -182,7 +182,7 @@ MMRESULT WINAPI acmDriverClose(HACMDRIVER had, DWORD fdwClose) PWINE_ACMDRIVERID padid; PWINE_ACMDRIVER* tpad; - TRACE("(%p, %08x)\n", had, fdwClose); + TRACE("(%p, %08lx)\n", had, fdwClose); if (fdwClose) { WARN("invalid flag\n"); @@ -225,7 +225,7 @@ MMRESULT WINAPI acmDriverDetailsA(HACMDRIVERID hadid, PACMDRIVERDETAILSA padd, D MMRESULT mmr; ACMDRIVERDETAILSW addw; - TRACE("(%p, %p, %08x)\n", hadid, padd, fdwDetails); + TRACE("(%p, %p, %08lx)\n", hadid, padd, fdwDetails); if (!padd) { WARN("invalid parameter\n"); @@ -276,7 +276,7 @@ MMRESULT WINAPI acmDriverDetailsW(HACMDRIVERID hadid, PACMDRIVERDETAILSW padd, D HACMDRIVER acmDrvr; MMRESULT mmr; - TRACE("(%p, %p, %08x)\n", hadid, padd, fdwDetails); + TRACE("(%p, %p, %08lx)\n", hadid, padd, fdwDetails); if (!padd) { WARN("invalid parameter\n"); @@ -318,7 +318,7 @@ MMRESULT WINAPI acmDriverEnum(ACMDRIVERENUMCB fnCallback, DWORD_PTR dwInstance, PWINE_ACMDRIVERID padid; DWORD fdwSupport; - TRACE("(%p, %08lx, %08x)\n", fnCallback, dwInstance, fdwEnum); + TRACE("(%p, %08Ix, %08lx)\n", fnCallback, dwInstance, fdwEnum); if (!fnCallback) { WARN("invalid parameter\n"); @@ -353,7 +353,7 @@ MMRESULT WINAPI acmDriverID(HACMOBJ hao, PHACMDRIVERID phadid, DWORD fdwDriverID { PWINE_ACMOBJ pao; - TRACE("(%p, %p, %08x)\n", hao, phadid, fdwDriverID); + TRACE("(%p, %p, %08lx)\n", hao, phadid, fdwDriverID); if (fdwDriverID) { WARN("invalid flag\n"); @@ -391,7 +391,7 @@ MMRESULT WINAPI acmDriverID(HACMOBJ hao, PHACMDRIVERID phadid, DWORD fdwDriverID */ LRESULT WINAPI acmDriverMessage(HACMDRIVER had, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { - TRACE("(%p, %04x, %08lx, %08lx\n", had, uMsg, lParam1, lParam2); + TRACE("(%p, %04x, %08Ix, %08Ix\n", had, uMsg, lParam1, lParam2); if ((uMsg >= ACMDM_USER && uMsg < ACMDM_RESERVED_LOW) || uMsg == ACMDM_DRIVER_ABOUT || @@ -492,7 +492,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe PWINE_ACMDRIVER pad = NULL; MMRESULT ret; - TRACE("(%p, %p, %08u)\n", phad, hadid, fdwOpen); + TRACE("(%p, %p, %08lu)\n", phad, hadid, fdwOpen); if (!phad) { WARN("invalid parameter\n"); @@ -605,7 +605,7 @@ MMRESULT WINAPI acmDriverOpen(PHACMDRIVER phad, HACMDRIVERID hadid, DWORD fdwOpe MMRESULT WINAPI acmDriverPriority(HACMDRIVERID hadid, DWORD dwPriority, DWORD fdwPriority) { - TRACE("(%p, %08x, %08x)\n", hadid, dwPriority, fdwPriority); + TRACE("(%p, %08lx, %08lx)\n", hadid, dwPriority, fdwPriority); /* Check for unknown flags */ if (fdwPriority & @@ -679,7 +679,7 @@ MMRESULT WINAPI acmDriverPriority(HACMDRIVERID hadid, DWORD dwPriority, DWORD fd return MMSYSERR_NOTSUPPORTED; } if (dwPriority != 1 && dwPriority != (DWORD)-1) { - FIXME("unexpected priority %d, using sign only\n", dwPriority); + FIXME("unexpected priority %ld, using sign only\n", dwPriority); if ((signed)dwPriority < 0) dwPriority = (DWORD)-1; if (dwPriority > 0) dwPriority = 1; } @@ -746,7 +746,7 @@ MMRESULT WINAPI acmDriverRemove(HACMDRIVERID hadid, DWORD fdwRemove) PWINE_ACMDRIVERID padid; PWINE_ACMNOTIFYWND panwnd; - TRACE("(%p, %08x)\n", hadid, fdwRemove); + TRACE("(%p, %08lx)\n", hadid, fdwRemove); padid = MSACM_GetDriverID(hadid); panwnd = MSACM_GetNotifyWnd(hadid); diff --git a/dlls/msacm32/filter.c b/dlls/msacm32/filter.c index 8d5abced9d9..bacb9c0abcf 100644 --- a/dlls/msacm32/filter.c +++ b/dlls/msacm32/filter.c @@ -91,7 +91,7 @@ MMRESULT WINAPI acmFilterDetailsW(HACMDRIVER had, PACMFILTERDETAILSW pafd, MMRESULT mmr; ACMFILTERTAGDETAILSA aftd; - TRACE("(%p, %p, %d)\n", had, pafd, fdwDetails); + TRACE("(%p, %p, %ld)\n", had, pafd, fdwDetails); memset(&aftd, 0, sizeof(aftd)); aftd.cbStruct = sizeof(aftd); @@ -127,7 +127,7 @@ MMRESULT WINAPI acmFilterDetailsW(HACMDRIVER had, PACMFILTERDETAILSW pafd, mmr = MSACM_Message(had, ACMDM_FILTER_DETAILS, (LPARAM)pafd, fdwDetails); break; default: - WARN("Unknown fdwDetails %08x\n", fdwDetails); + WARN("Unknown fdwDetails %08lx\n", fdwDetails); mmr = MMSYSERR_INVALFLAG; break; } @@ -228,7 +228,7 @@ MMRESULT WINAPI acmFilterEnumW(HACMDRIVER had, PACMFILTERDETAILSW pafd, PWINE_ACMDRIVERID padid; BOOL ret; - TRACE("(%p, %p, %p, %ld, %d)\n", + TRACE("(%p, %p, %p, %Id, %ld)\n", had, pafd, fnCallback, dwInstance, fdwEnum); if (pafd->cbStruct < sizeof(*pafd)) return MMSYSERR_INVALPARAM; @@ -294,7 +294,7 @@ MMRESULT WINAPI acmFilterTagDetailsW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd PWINE_ACMDRIVERID padid; MMRESULT mmr; - TRACE("(%p, %p, %d)\n", had, paftd, fdwDetails); + TRACE("(%p, %p, %ld)\n", had, paftd, fdwDetails); if (fdwDetails & ~(ACM_FILTERTAGDETAILSF_FILTERTAG|ACM_FILTERTAGDETAILSF_INDEX| ACM_FILTERTAGDETAILSF_LARGESTSIZE)) @@ -355,7 +355,7 @@ MMRESULT WINAPI acmFilterTagDetailsW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd break; default: - WARN("Unsupported fdwDetails=%08x\n", fdwDetails); + WARN("Unsupported fdwDetails=%08lx\n", fdwDetails); mmr = MMSYSERR_ERROR; } @@ -427,7 +427,7 @@ MMRESULT WINAPI acmFilterTagEnumW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd, PWINE_ACMDRIVERID padid; unsigned int i; - TRACE("(%p, %p, %p, %ld, %d)\n", + TRACE("(%p, %p, %p, %Id, %ld)\n", had, paftd, fnCallback, dwInstance, fdwEnum); if (paftd->cbStruct < sizeof(*paftd)) return MMSYSERR_INVALPARAM; diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index 536fa42e767..6aab538fffb 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -217,7 +217,7 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, { ACMFORMATCHOOSEW *afc = (ACMFORMATCHOOSEW *)GetPropW(hWnd, L"acmprop"); - TRACE("hwnd=%p msg=%i 0x%08lx 0x%08lx\n", hWnd, msg, wParam, lParam); + TRACE("hwnd=%p msg=%i 0x%08Ix 0x%08Ix\n", hWnd, msg, wParam, lParam); switch (msg) { case WM_INITDIALOG: @@ -230,7 +230,7 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, ACMFORMATCHOOSE_STYLEF_INITTOWFXSTRUCT| ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATEHANDLE| ACMFORMATCHOOSE_STYLEF_ENABLETEMPLATE)) != 0) - FIXME("Unsupported style %08x\n", afc->fdwStyle); + FIXME("Unsupported style %08lx\n", afc->fdwStyle); if (!(afc->fdwStyle & ACMFORMATCHOOSE_STYLEF_SHOWHELP)) ShowWindow(GetDlgItem(hWnd, IDD_ACMFORMATCHOOSE_BTN_HELP), SW_HIDE); return TRUE; @@ -249,7 +249,7 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, MSACM_FillFormat(hWnd, afc); break; default: - TRACE("Dropped dlgNotif (fmtTag): 0x%08x 0x%08lx\n", + TRACE("Dropped dlgNotif (fmtTag): 0x%08x 0x%08Ix\n", HIWORD(wParam), lParam); break; } @@ -261,7 +261,7 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, break; default: - TRACE("Dropped dlgCmd: ctl=%d ntf=0x%04x 0x%08lx\n", + TRACE("Dropped dlgCmd: ctl=%d ntf=0x%04x 0x%08Ix\n", LOWORD(wParam), HIWORD(wParam), lParam); break; } @@ -281,7 +281,7 @@ static INT_PTR CALLBACK FormatChooseDlgProc(HWND hWnd, UINT msg, break; #endif default: - TRACE("Dropped dlgMsg: hwnd=%p msg=%i 0x%08lx 0x%08lx\n", + TRACE("Dropped dlgMsg: hwnd=%p msg=%i 0x%08Ix 0x%08Ix\n", hWnd, msg, wParam, lParam ); break; } @@ -430,7 +430,7 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD MMRESULT mmr; ACMFORMATTAGDETAILSW aftd = {0}; - TRACE("(%p, %p, %d)\n", had, pafd, fdwDetails); + TRACE("(%p, %p, %ld)\n", had, pafd, fdwDetails); if (!pafd) return MMSYSERR_INVALPARAM; @@ -486,7 +486,7 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD mmr = MSACM_Message(had, ACMDM_FORMAT_DETAILS, (LPARAM)pafd, fdwDetails); break; default: - WARN("Unknown fdwDetails %08x\n", fdwDetails); + WARN("Unknown fdwDetails %08lx\n", fdwDetails); mmr = MMSYSERR_INVALFLAG; break; } @@ -673,7 +673,7 @@ MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD cbwfxMax; MMRESULT mmr; - TRACE("(%p, %p, %p, %ld, %d)\n", + TRACE("(%p, %p, %p, %Id, %ld)\n", had, pafd, fnCallback, dwInstance, fdwEnum); if (!pafd) @@ -705,7 +705,7 @@ MMRESULT WINAPI acmFormatEnumW(HACMDRIVER had, PACMFORMATDETAILSW pafd, return MMSYSERR_INVALPARAM; if (fdwEnum & (ACM_FORMATENUMF_CONVERT|ACM_FORMATENUMF_INPUT|ACM_FORMATENUMF_OUTPUT)) - FIXME("Unsupported fdwEnum values %08x\n", fdwEnum); + FIXME("Unsupported fdwEnum values %08lx\n", fdwEnum); mmr = acmMetrics((HACMOBJ)had, ACM_METRIC_MAX_SIZE_FORMAT, &cbwfxMax); if (mmr != MMSYSERR_NOERROR) @@ -745,7 +745,7 @@ MMRESULT WINAPI acmFormatSuggest(HACMDRIVER had, PWAVEFORMATEX pwfxSrc, ACMDRVFORMATSUGGEST adfg; MMRESULT mmr; - TRACE("(%p, %p, %p, %d, %d)\n", + TRACE("(%p, %p, %p, %ld, %ld)\n", had, pwfxSrc, pwfxDst, cbwfxDst, fdwSuggest); if (!pwfxSrc || !pwfxDst) @@ -850,7 +850,7 @@ MMRESULT WINAPI acmFormatTagDetailsW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd PWINE_ACMDRIVERID padid; MMRESULT mmr = ACMERR_NOTPOSSIBLE; - TRACE("(%p, %p, %d)\n", had, paftd, fdwDetails); + TRACE("(%p, %p, %ld)\n", had, paftd, fdwDetails); if (fdwDetails & ~(ACM_FORMATTAGDETAILSF_FORMATTAG|ACM_FORMATTAGDETAILSF_INDEX| ACM_FORMATTAGDETAILSF_LARGESTSIZE)) @@ -917,7 +917,7 @@ MMRESULT WINAPI acmFormatTagDetailsW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd break; default: - WARN("Unsupported fdwDetails=%08x\n", fdwDetails); + WARN("Unsupported fdwDetails=%08lx\n", fdwDetails); mmr = MMSYSERR_ERROR; } @@ -999,7 +999,7 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, unsigned int i; BOOL bPcmDone = FALSE; - TRACE("(%p, %p, %p, %ld, %d)\n", + TRACE("(%p, %p, %p, %Id, %ld)\n", had, paftd, fnCallback, dwInstance, fdwEnum); if (!paftd) diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index e83f1f5c215..7c2d3b5bf9e 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -74,12 +74,12 @@ PWINE_ACMDRIVERID MSACM_RegisterDriverFromRegistry(LPCWSTR pszRegEntry) if (0 == wcsnicmp(pszRegEntry, msacmW, ARRAY_SIZE(msacmW))) { lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, drvkey, 0, KEY_QUERY_VALUE, &hKey); if (lRet != ERROR_SUCCESS) { - WARN("unable to open registry key - 0x%08x\n", lRet); + WARN("unable to open registry key - 0x%08lx\n", lRet); } else { bufLen = sizeof(buf); lRet = RegQueryValueExW(hKey, pszRegEntry, NULL, NULL, (LPBYTE)buf, &bufLen); if (lRet != ERROR_SUCCESS) { - WARN("unable to query requested subkey %s - 0x%08x\n", debugstr_w(pszRegEntry), lRet); + WARN("unable to query requested subkey %s - 0x%08lx\n", debugstr_w(pszRegEntry), lRet); } else { MSACM_RegisterDriver(pszRegEntry, buf, 0); } @@ -403,7 +403,7 @@ PWINE_ACMNOTIFYWND MSACM_RegisterNotificationWindow(HWND hNotifyWnd, DWORD dwNot { PWINE_ACMNOTIFYWND panwnd; - TRACE("(%p,0x%08x)\n", hNotifyWnd, dwNotifyMsg); + TRACE("(%p,0x%08lx)\n", hNotifyWnd, dwNotifyMsg); panwnd = HeapAlloc(MSACM_hHeap, 0, sizeof(WINE_ACMNOTIFYWND)); panwnd->obj.dwType = WINE_ACMOBJ_NOTIFYWND; @@ -654,13 +654,13 @@ void MSACM_WriteCurrentPriorities(void) /* Delete ACM priority key and create it anew */ lError = RegDeleteKeyW(HKEY_CURRENT_USER, basePriorityKey); if (lError != ERROR_SUCCESS && lError != ERROR_FILE_NOT_FOUND) { - ERR("unable to remove current key %s (0x%08x) - priority changes won't persist past application end.\n", + ERR("unable to remove current key %s (0x%08lx) - priority changes won't persist past application end.\n", debugstr_w(basePriorityKey), lError); return; } lError = RegCreateKeyW(HKEY_CURRENT_USER, basePriorityKey, &hPriorityKey); if (lError != ERROR_SUCCESS) { - ERR("unable to create key %s (0x%08x) - priority changes won't persist past application end.\n", + ERR("unable to create key %s (0x%08lx) - priority changes won't persist past application end.\n", debugstr_w(basePriorityKey), lError); return; } @@ -680,7 +680,7 @@ void MSACM_WriteCurrentPriorities(void) lError = RegSetValueExW(hPriorityKey, szSubKey, 0, REG_SZ, (BYTE *)szBuffer, (lstrlenW(szBuffer) + 1) * sizeof(WCHAR)); if (lError != ERROR_SUCCESS) { - ERR("unable to write value for %s under key %s (0x%08x)\n", + ERR("unable to write value for %s under key %s (0x%08lx)\n", debugstr_w(padid->pszDriverAlias), debugstr_w(basePriorityKey), lError); } } @@ -694,7 +694,7 @@ void MSACM_WriteCurrentPriorities(void) lError = RegSetValueExW(hPriorityKey, szSubKey, 0, REG_SZ, (BYTE *)szBuffer, (lstrlenW(szBuffer) + 1) * sizeof(WCHAR)); if (lError != ERROR_SUCCESS) { - ERR("unable to write value for Internal PCM Converter under key %s (0x%08x)\n", + ERR("unable to write value for Internal PCM Converter under key %s (0x%08lx)\n", debugstr_w(basePriorityKey), lError); } RegCloseKey(hPriorityKey); diff --git a/dlls/msacm32/msacm32_main.c b/dlls/msacm32/msacm32_main.c index efe58af309a..ad33c88d85a 100644 --- a/dlls/msacm32/msacm32_main.c +++ b/dlls/msacm32/msacm32_main.c @@ -44,7 +44,7 @@ HINSTANCE MSACM_hInstance32 = 0; */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) { - TRACE("%p 0x%x %p\n", hInstDLL, fdwReason, lpvReserved); + TRACE("%p 0x%lx %p\n", hInstDLL, fdwReason, lpvReserved); switch (fdwReason) { case DLL_PROCESS_ATTACH: @@ -87,7 +87,7 @@ DWORD WINAPI acmGetVersion(void) case VER_PLATFORM_WIN32s: return 0x02010000; /* 2.1 */ default: - FIXME("%x not supported\n", version.dwPlatformId); + FIXME("%lx not supported\n", version.dwPlatformId); /* fall through */ case VER_PLATFORM_WIN32_WINDOWS: return 0x04030000; /* 4.3.0 */ diff --git a/dlls/msacm32/pcmconverter.c b/dlls/msacm32/pcmconverter.c index d528a6d35fb..0b9724ba5e1 100644 --- a/dlls/msacm32/pcmconverter.c +++ b/dlls/msacm32/pcmconverter.c @@ -65,7 +65,7 @@ static DWORD PCM_drvOpen(LPCSTR str, PACMDRVOPENDESCW adod) */ static DWORD PCM_drvClose(DWORD dwDevID) { - TRACE("(%d)\n", dwDevID); + TRACE("(%ld)\n", dwDevID); return 1; } @@ -1001,7 +1001,7 @@ static LRESULT PCM_DriverDetails(PACMDRIVERDETAILSW add) */ static LRESULT PCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) { - TRACE("(%p, %08x)\n", aftd, dwQuery); + TRACE("(%p, %08lx)\n", aftd, dwQuery); switch (dwQuery) { case ACM_FORMATTAGDETAILSF_INDEX: @@ -1024,7 +1024,7 @@ static LRESULT PCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) } break; default: - WARN("Unsupported query %08x\n", dwQuery); + WARN("Unsupported query %08lx\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } @@ -1044,7 +1044,7 @@ static LRESULT PCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) */ static LRESULT PCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) { - TRACE("(%p, %08x)\n", afd, dwQuery); + TRACE("(%p, %08lx)\n", afd, dwQuery); switch (dwQuery) { case ACM_FORMATDETAILSF_FORMAT: @@ -1068,7 +1068,7 @@ static LRESULT PCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) afd->pwfx->nSamplesPerSec * afd->pwfx->nBlockAlign; break; default: - WARN("Unsupported query %08x\n", dwQuery); + WARN("Unsupported query %08lx\n", dwQuery); return MMSYSERR_NOTSUPPORTED; } @@ -1260,7 +1260,7 @@ static LRESULT PCM_StreamSize(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMSIZE adss adsi->pwfxSrc->nAvgBytesPerSec) & dstMask; break; default: - WARN("Unsupported query %08x\n", adss->fdwSize); + WARN("Unsupported query %08lx\n", adss->fdwSize); return MMSYSERR_NOTSUPPORTED; } return MMSYSERR_NOERROR; @@ -1278,12 +1278,12 @@ static LRESULT PCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER TRACE("(%p, %p)\n", adsi, adsh); - TRACE("nsrc=%d,adsh->cbSrcLength=%d\n", nsrc, adsh->cbSrcLength); - TRACE("ndst=%d,adsh->cbDstLength=%d\n", ndst, adsh->cbDstLength); - TRACE("src [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%u, nAvgBytesPerSec=%u, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", + TRACE("nsrc=%ld,adsh->cbSrcLength=%ld\n", nsrc, adsh->cbSrcLength); + TRACE("ndst=%ld,adsh->cbDstLength=%ld\n", ndst, adsh->cbDstLength); + TRACE("src [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", adsi->pwfxSrc->wFormatTag, adsi->pwfxSrc->nChannels, adsi->pwfxSrc->nSamplesPerSec, adsi->pwfxSrc->nAvgBytesPerSec, adsi->pwfxSrc->nBlockAlign, adsi->pwfxSrc->wBitsPerSample, adsi->pwfxSrc->cbSize); - TRACE("dst [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%u, nAvgBytesPerSec=%u, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", + TRACE("dst [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", adsi->pwfxDst->wFormatTag, adsi->pwfxDst->nChannels, adsi->pwfxDst->nSamplesPerSec, adsi->pwfxDst->nAvgBytesPerSec, adsi->pwfxDst->nBlockAlign, adsi->pwfxDst->wBitsPerSample, adsi->pwfxDst->cbSize); @@ -1291,7 +1291,7 @@ static LRESULT PCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER ~(ACM_STREAMCONVERTF_BLOCKALIGN| ACM_STREAMCONVERTF_END| ACM_STREAMCONVERTF_START)) { - FIXME("Unsupported fdwConvert (%08x), ignoring it\n", adsh->fdwConvert); + FIXME("Unsupported fdwConvert (%08lx), ignoring it\n", adsh->fdwConvert); } /* ACM_STREAMCONVERTF_BLOCKALIGN * currently all conversions are block aligned, so do nothing for this flag @@ -1325,7 +1325,7 @@ static LRESULT PCM_StreamConvert(PACMDRVSTREAMINSTANCE adsi, PACMDRVSTREAMHEADER LRESULT CALLBACK PCM_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, LPARAM dwParam1, LPARAM dwParam2) { - TRACE("(%08lx %p %u %08lx %08lx);\n", + TRACE("(%08Ix %p %u %08Ix %08Ix);\n", dwDevID, hDriv, wMsg, dwParam1, dwParam2); switch (wMsg) { diff --git a/dlls/msacm32/stream.c b/dlls/msacm32/stream.c index e06503abfe4..1fcd2e39066 100644 --- a/dlls/msacm32/stream.c +++ b/dlls/msacm32/stream.c @@ -67,7 +67,7 @@ MMRESULT WINAPI acmStreamClose(HACMSTREAM has, DWORD fdwClose) PWINE_ACMSTREAM was; MMRESULT ret; - TRACE("(%p, %d)\n", has, fdwClose); + TRACE("(%p, %ld)\n", has, fdwClose); if ((was = ACM_GetStream(has)) == NULL) { WARN("invalid handle\n"); @@ -93,7 +93,7 @@ MMRESULT WINAPI acmStreamConvert(HACMSTREAM has, PACMSTREAMHEADER pash, MMRESULT ret = MMSYSERR_NOERROR; PACMDRVSTREAMHEADER padsh; - TRACE("(%p, %p, %d)\n", has, pash, fdwConvert); + TRACE("(%p, %p, %ld)\n", has, pash, fdwConvert); if ((was = ACM_GetStream(has)) == NULL) { WARN("invalid handle\n"); @@ -138,7 +138,7 @@ MMRESULT WINAPI acmStreamConvert(HACMSTREAM has, PACMSTREAMHEADER pash, MMRESULT WINAPI acmStreamMessage(HACMSTREAM has, UINT uMsg, LPARAM lParam1, LPARAM lParam2) { - FIXME("(%p, %u, %ld, %ld): stub\n", has, uMsg, lParam1, lParam2); + FIXME("(%p, %u, %Id, %Id): stub\n", has, uMsg, lParam1, lParam2); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -158,7 +158,7 @@ MMRESULT WINAPI acmStreamOpen(PHACMSTREAM phas, HACMDRIVER had, int wfxDstSize; WAVEFORMATEX wfxSrc, wfxDst; - TRACE("(%p, %p, %p, %p, %p, %ld, %ld, %d)\n", + TRACE("(%p, %p, %p, %p, %p, %Id, %Id, %ld)\n", phas, had, pwfxSrc, pwfxDst, pwfltr, dwCallback, dwInstance, fdwOpen); /* NOTE: pwfxSrc and/or pwfxDst can point to a structure smaller than @@ -177,11 +177,11 @@ MMRESULT WINAPI acmStreamOpen(PHACMSTREAM phas, HACMDRIVER had, pwfxDst = &wfxDst; } - TRACE("src [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%u, nAvgBytesPerSec=%u, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", + TRACE("src [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", pwfxSrc->wFormatTag, pwfxSrc->nChannels, pwfxSrc->nSamplesPerSec, pwfxSrc->nAvgBytesPerSec, pwfxSrc->nBlockAlign, pwfxSrc->wBitsPerSample, pwfxSrc->cbSize); - TRACE("dst [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%u, nAvgBytesPerSec=%u, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", + TRACE("dst [wFormatTag=%u, nChannels=%u, nSamplesPerSec=%lu, nAvgBytesPerSec=%lu, nBlockAlign=%u, wBitsPerSample=%u, cbSize=%u]\n", pwfxDst->wFormatTag, pwfxDst->nChannels, pwfxDst->nSamplesPerSec, pwfxDst->nAvgBytesPerSec, pwfxDst->nBlockAlign, pwfxDst->wBitsPerSample, pwfxDst->cbSize); @@ -303,7 +303,7 @@ MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, MMRESULT ret = MMSYSERR_NOERROR; PACMDRVSTREAMHEADER padsh; - TRACE("(%p, %p, %d)\n", has, pash, fdwPrepare); + TRACE("(%p, %p, %ld)\n", has, pash, fdwPrepare); if ((was = ACM_GetStream(has)) == NULL) { WARN("invalid handle\n"); @@ -320,7 +320,7 @@ MMRESULT WINAPI acmStreamPrepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, if ((was->drvInst.pwfxSrc->wFormatTag == WAVE_FORMAT_ADPCM || was->drvInst.pwfxSrc->wFormatTag == WAVE_FORMAT_PCM) && pash->cbSrcLength < was->drvInst.pwfxSrc->nBlockAlign) { - WARN("source smaller than block align (%d < %d)\n", + WARN("source smaller than block align (%ld < %d)\n", pash->cbSrcLength, was->drvInst.pwfxSrc->nBlockAlign); return pash->cbSrcLength ? ACMERR_NOTPOSSIBLE : MMSYSERR_INVALPARAM; } @@ -373,7 +373,7 @@ MMRESULT WINAPI acmStreamReset(HACMSTREAM has, DWORD fdwReset) PWINE_ACMSTREAM was; MMRESULT ret = MMSYSERR_NOERROR; - TRACE("(%p, %d)\n", has, fdwReset); + TRACE("(%p, %ld)\n", has, fdwReset); if (fdwReset) { WARN("invalid flag\n"); @@ -398,7 +398,7 @@ MMRESULT WINAPI acmStreamSize(HACMSTREAM has, DWORD cbInput, ACMDRVSTREAMSIZE adss; MMRESULT ret; - TRACE("(%p, %d, %p, %d)\n", has, cbInput, pdwOutputBytes, fdwSize); + TRACE("(%p, %ld, %p, %ld)\n", has, cbInput, pdwOutputBytes, fdwSize); if ((was = ACM_GetStream(has)) == NULL) { WARN("invalid handle\n"); @@ -439,7 +439,7 @@ MMRESULT WINAPI acmStreamSize(HACMSTREAM has, DWORD cbInput, break; } } - TRACE("=> (%d) [%u]\n", ret, *pdwOutputBytes); + TRACE("=> (%d) [%lu]\n", ret, *pdwOutputBytes); return ret; } @@ -453,7 +453,7 @@ MMRESULT WINAPI acmStreamUnprepareHeader(HACMSTREAM has, PACMSTREAMHEADER pash, MMRESULT ret = MMSYSERR_NOERROR; PACMDRVSTREAMHEADER padsh; - TRACE("(%p, %p, %d)\n", has, pash, fdwUnprepare); + TRACE("(%p, %p, %ld)\n", has, pash, fdwUnprepare); if ((was = ACM_GetStream(has)) == NULL) { WARN("invalid handle\n");
Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/msacm.dll16/Makefile.in | 1 - dlls/msacm.dll16/msacm.c | 48 +++++++++++++++++++++--------------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/dlls/msacm.dll16/Makefile.in b/dlls/msacm.dll16/Makefile.in index c4991005de1..dccaf17c721 100644 --- a/dlls/msacm.dll16/Makefile.in +++ b/dlls/msacm.dll16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msacm.dll16 IMPORTS = msacm32 EXTRADLLFLAGS = -m16 -Wb,--main-module,msacm32.dll diff --git a/dlls/msacm.dll16/msacm.c b/dlls/msacm.dll16/msacm.c index 48729f9608c..30182c92b2f 100644 --- a/dlls/msacm.dll16/msacm.c +++ b/dlls/msacm.dll16/msacm.c @@ -73,7 +73,7 @@ MMRESULT16 WINAPI acmMetrics16( MMRESULT16 WINAPI acmDriverEnum16( ACMDRIVERENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) { - FIXME("(%p, %d, %d): stub\n", + FIXME("(%p, %ld, %ld): stub\n", fnCallback, dwInstance, fdwEnum ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -87,7 +87,7 @@ MMRESULT16 WINAPI acmDriverEnum16( MMRESULT16 WINAPI acmDriverDetails16( HACMDRIVERID16 hadid, LPACMDRIVERDETAILS16 padd, DWORD fdwDetails) { - FIXME("(0x%04x, %p, %d): stub\n", hadid, padd, fdwDetails); + FIXME("(0x%04x, %p, %ld): stub\n", hadid, padd, fdwDetails); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -99,7 +99,7 @@ MMRESULT16 WINAPI acmDriverAdd16( LPHACMDRIVERID16 phadid, HINSTANCE16 hinstModule, LPARAM lParam, DWORD dwPriority, DWORD fdwAdd) { - FIXME("(%p, 0x%04x, %ld, %d, %d): stub\n", + FIXME("(%p, 0x%04x, %ld, %ld, %ld): stub\n", phadid, hinstModule, lParam, dwPriority, fdwAdd ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -112,7 +112,7 @@ MMRESULT16 WINAPI acmDriverAdd16( MMRESULT16 WINAPI acmDriverRemove16( HACMDRIVERID16 hadid, DWORD fdwRemove) { - FIXME("(0x%04x, %d): stub\n", hadid, fdwRemove); + FIXME("(0x%04x, %ld): stub\n", hadid, fdwRemove); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -123,7 +123,7 @@ MMRESULT16 WINAPI acmDriverRemove16( MMRESULT16 WINAPI acmDriverOpen16( LPHACMDRIVER16 phad, HACMDRIVERID16 hadid, DWORD fdwOpen) { - FIXME("(%p, 0x%04x, %d): stub\n", phad, hadid, fdwOpen); + FIXME("(%p, 0x%04x, %ld): stub\n", phad, hadid, fdwOpen); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -134,7 +134,7 @@ MMRESULT16 WINAPI acmDriverOpen16( MMRESULT16 WINAPI acmDriverClose16( HACMDRIVER16 had, DWORD fdwClose) { - FIXME("(0x%04x, %d): stub\n", had, fdwClose); + FIXME("(0x%04x, %ld): stub\n", had, fdwClose); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -158,7 +158,7 @@ LRESULT WINAPI acmDriverMessage16( MMRESULT16 WINAPI acmDriverID16( HACMOBJ16 hao, LPHACMDRIVERID16 phadid, DWORD fdwDriverID) { - FIXME("(0x%04x, %p, %d): stub\n", hao, phadid, fdwDriverID); + FIXME("(0x%04x, %p, %ld): stub\n", hao, phadid, fdwDriverID); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -169,7 +169,7 @@ MMRESULT16 WINAPI acmDriverID16( MMRESULT16 WINAPI acmDriverPriority16( HACMDRIVERID16 hadid, DWORD dwPriority, DWORD fdwPriority) { - FIXME("(0x%04x, %d, %d): stub\n", + FIXME("(0x%04x, %ld, %ld): stub\n", hadid, dwPriority, fdwPriority ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -182,7 +182,7 @@ MMRESULT16 WINAPI acmDriverPriority16( MMRESULT16 WINAPI acmFormatTagDetails16( HACMDRIVER16 had, LPACMFORMATTAGDETAILS16 paftd, DWORD fdwDetails) { - FIXME("(0x%04x, %p, %d): stub\n", had, paftd, fdwDetails); + FIXME("(0x%04x, %p, %ld): stub\n", had, paftd, fdwDetails); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -194,7 +194,7 @@ MMRESULT16 WINAPI acmFormatTagEnum16( HACMDRIVER16 had, LPACMFORMATTAGDETAILS16 paftd, ACMFORMATTAGENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) { - FIXME("(0x%04x, %p, %p, %d, %d): stub\n", + FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", had, paftd, fnCallback, dwInstance, fdwEnum ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -218,7 +218,7 @@ MMRESULT16 WINAPI acmFormatChoose16( MMRESULT16 WINAPI acmFormatDetails16( HACMDRIVER16 had, LPACMFORMATDETAILS16 pafd, DWORD fdwDetails) { - FIXME("(0x%04x, %p, %d): stub\n", had, pafd, fdwDetails); + FIXME("(0x%04x, %p, %ld): stub\n", had, pafd, fdwDetails); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -230,7 +230,7 @@ MMRESULT16 WINAPI acmFormatEnum16( HACMDRIVER16 had, LPACMFORMATDETAILS16 pafd, ACMFORMATENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) { - FIXME("(0x%04x, %p, %p, %d, %d): stub\n", + FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", had, pafd, fnCallback, dwInstance, fdwEnum ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -244,7 +244,7 @@ MMRESULT16 WINAPI acmFormatSuggest16( HACMDRIVER16 had, LPWAVEFORMATEX pwfxSrc, LPWAVEFORMATEX pwfxDst, DWORD cbwfxDst, DWORD fdwSuggest) { - FIXME("(0x%04x, %p, %p, %d, %d): stub\n", + FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", had, pwfxSrc, pwfxDst, cbwfxDst, fdwSuggest ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -257,7 +257,7 @@ MMRESULT16 WINAPI acmFormatSuggest16( MMRESULT16 WINAPI acmFilterTagDetails16( HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd, DWORD fdwDetails) { - FIXME("(0x%04x, %p, %d): stub\n", had, paftd, fdwDetails); + FIXME("(0x%04x, %p, %ld): stub\n", had, paftd, fdwDetails); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -269,7 +269,7 @@ MMRESULT16 WINAPI acmFilterTagEnum16( HACMDRIVER16 had, LPACMFILTERTAGDETAILS16 paftd, ACMFILTERTAGENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) { - FIXME("(0x%04x, %p, %p, %d, %d): stub\n", + FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", had, paftd, fnCallback, dwInstance, fdwEnum ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -293,7 +293,7 @@ MMRESULT16 WINAPI acmFilterChoose16( MMRESULT16 WINAPI acmFilterDetails16( HACMDRIVER16 had, LPACMFILTERDETAILS16 pafd, DWORD fdwDetails) { - FIXME("(0x%04x, %p, %d): stub\n", had, pafd, fdwDetails); + FIXME("(0x%04x, %p, %ld): stub\n", had, pafd, fdwDetails); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -305,7 +305,7 @@ MMRESULT16 WINAPI acmFilterEnum16( HACMDRIVER16 had, LPACMFILTERDETAILS16 pafd, ACMFILTERENUMCB16 fnCallback, DWORD dwInstance, DWORD fdwEnum) { - FIXME("(0x%04x, %p, %p, %d, %d): stub\n", + FIXME("(0x%04x, %p, %p, %ld, %ld): stub\n", had, pafd, fnCallback, dwInstance, fdwEnum ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -321,7 +321,7 @@ MMRESULT16 WINAPI acmStreamOpen16( LPWAVEFILTER pwfltr, DWORD dwCallback, DWORD dwInstance, DWORD fdwOpen) { - FIXME("(%p, 0x%04x, %p, %p, %p, %d, %d, %d): stub\n", + FIXME("(%p, 0x%04x, %p, %p, %p, %ld, %ld, %ld): stub\n", phas, had, pwfxSrc, pwfxDst, pwfltr, dwCallback, dwInstance, fdwOpen ); @@ -335,7 +335,7 @@ MMRESULT16 WINAPI acmStreamOpen16( MMRESULT16 WINAPI acmStreamClose16( HACMSTREAM16 has, DWORD fdwClose) { - FIXME("(0x%04x, %d): stub\n", has, fdwClose); + FIXME("(0x%04x, %ld): stub\n", has, fdwClose); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -347,7 +347,7 @@ MMRESULT16 WINAPI acmStreamSize16( HACMSTREAM16 has, DWORD cbInput, LPDWORD pdwOutputBytes, DWORD fdwSize) { - FIXME("(0x%04x, %d, %p, %d): stub\n", + FIXME("(0x%04x, %ld, %p, %ld): stub\n", has, cbInput, pdwOutputBytes, fdwSize ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -360,7 +360,7 @@ MMRESULT16 WINAPI acmStreamSize16( MMRESULT16 WINAPI acmStreamConvert16( HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwConvert) { - FIXME("(0x%04x, %p, %d): stub\n", has, pash, fdwConvert); + FIXME("(0x%04x, %p, %ld): stub\n", has, pash, fdwConvert); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -371,7 +371,7 @@ MMRESULT16 WINAPI acmStreamConvert16( MMRESULT16 WINAPI acmStreamReset16( HACMSTREAM16 has, DWORD fdwReset) { - FIXME("(0x%04x, %d): stub\n", has, fdwReset); + FIXME("(0x%04x, %ld): stub\n", has, fdwReset); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -382,7 +382,7 @@ MMRESULT16 WINAPI acmStreamReset16( MMRESULT16 WINAPI acmStreamPrepareHeader16( HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwPrepare) { - FIXME("(0x%04x, %p, %d): stub\n", has, pash, fdwPrepare); + FIXME("(0x%04x, %p, %ld): stub\n", has, pash, fdwPrepare); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return MMSYSERR_ERROR; } @@ -393,7 +393,7 @@ MMRESULT16 WINAPI acmStreamPrepareHeader16( MMRESULT16 WINAPI acmStreamUnprepareHeader16( HACMSTREAM16 has, LPACMSTREAMHEADER16 pash, DWORD fdwUnprepare) { - FIXME("(0x%04x, %p, %d): stub\n", + FIXME("(0x%04x, %p, %ld): stub\n", has, pash, fdwUnprepare ); SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
participants (3)
-
Andrew Eikum -
Eric Pouech -
Nikolay Sivov