Signed-off-by: Eric Pouech eric.pouech@gmail.com
--- dlls/wmp/Makefile.in | 1 - dlls/wmp/events.c | 10 +++--- dlls/wmp/oleobj.c | 40 ++++++++++++------------ dlls/wmp/player.c | 84 +++++++++++++++++++++++++------------------------- dlls/wmp/wmp_main.c | 6 ++-- 5 files changed, 70 insertions(+), 71 deletions(-)
diff --git a/dlls/wmp/Makefile.in b/dlls/wmp/Makefile.in index 5f3cb501f92..0e17ee4b257 100644 --- a/dlls/wmp/Makefile.in +++ b/dlls/wmp/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wmp.dll IMPORTS = oleaut32 ole32 urlmon shlwapi user32 gdi32
diff --git a/dlls/wmp/events.c b/dlls/wmp/events.c index 412eb307d1a..f541830773b 100644 --- a/dlls/wmp/events.c +++ b/dlls/wmp/events.c @@ -138,7 +138,7 @@ static ULONG WINAPI EnumConnections_AddRef(IEnumConnections *iface) EnumConnections *This = impl_from_IEnumConnections(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -148,7 +148,7 @@ static ULONG WINAPI EnumConnections_Release(IEnumConnections *iface) EnumConnections *This = impl_from_IEnumConnections(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { IConnectionPoint_Release(&This->cp->IConnectionPoint_iface); @@ -163,7 +163,7 @@ static HRESULT WINAPI EnumConnections_Next(IEnumConnections *iface, ULONG cConne EnumConnections *This = impl_from_IEnumConnections(iface); ULONG cnt = 0;
- TRACE("(%p)->(%u %p %p)\n", This, cConnections, pgcd, pcFetched); + TRACE("(%p)->(%lu %p %p)\n", This, cConnections, pgcd, pcFetched);
while(cConnections--) { while(This->iter < This->cp->sinks_size && !This->cp->sinks[This->iter]) @@ -186,7 +186,7 @@ static HRESULT WINAPI EnumConnections_Next(IEnumConnections *iface, ULONG cConne static HRESULT WINAPI EnumConnections_Skip(IEnumConnections *iface, ULONG cConnections) { EnumConnections *This = impl_from_IEnumConnections(iface); - FIXME("(%p)->(%u)\n", This, cConnections); + FIXME("(%p)->(%lu)\n", This, cConnections); return E_NOTIMPL; }
@@ -314,7 +314,7 @@ static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD dw { ConnectionPoint *This = impl_from_IConnectionPoint(iface);
- TRACE("(%p)->(%d)\n", This, dwCookie); + TRACE("(%p)->(%ld)\n", This, dwCookie);
if(!dwCookie || dwCookie > This->sinks_size || !This->sinks[dwCookie-1]) return CONNECT_E_NOCONNECTION; diff --git a/dlls/wmp/oleobj.c b/dlls/wmp/oleobj.c index 04a9f204639..5eaa789f87f 100644 --- a/dlls/wmp/oleobj.c +++ b/dlls/wmp/oleobj.c @@ -170,7 +170,7 @@ static HRESULT activate_inplace(WindowsMediaPlayer *This) hres = IOleInPlaceSite_GetWindowContext(ipsite, &ip_frame, &ip_window, &posrect, &cliprect, &frameinfo); IOleInPlaceSite_Release(ipsite); if(FAILED(hres)) { - FIXME("GetWindowContext failed: %08x\n", hres); + FIXME("GetWindowContext failed: %08lx\n", hres); return hres; }
@@ -291,7 +291,7 @@ static ULONG WINAPI OleObject_AddRef(IOleObject *iface) WindowsMediaPlayer *This = impl_from_IOleObject(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -301,7 +301,7 @@ static ULONG WINAPI OleObject_Release(IOleObject *iface) WindowsMediaPlayer *This = impl_from_IOleObject(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { release_client_site(This); @@ -365,10 +365,10 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) { WindowsMediaPlayer *This = impl_from_IOleObject(iface);
- TRACE("(%p)->(%08x)\n", This, dwSaveOption); + TRACE("(%p)->(%08lx)\n", This, dwSaveOption);
if(dwSaveOption) - FIXME("Unsupported option %d\n", dwSaveOption); + FIXME("Unsupported option %ld\n", dwSaveOption);
if(This->hwnd) /* FIXME: Possibly hide window */ deactivate_window(This); @@ -378,14 +378,14 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) static HRESULT WINAPI OleObject_SetMoniker(IOleObject *iface, DWORD dwWhichMoniker, IMoniker *pmk) { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - FIXME("(%p %d %p)->()\n", This, dwWhichMoniker, pmk); + FIXME("(%p %ld %p)->()\n", This, dwWhichMoniker, pmk); return E_NOTIMPL; }
static HRESULT WINAPI OleObject_GetMoniker(IOleObject *iface, DWORD dwAssign, DWORD dwWhichMoniker, IMoniker **ppmk) { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d %d %p)\n", This, dwAssign, dwWhichMoniker, ppmk); + FIXME("(%p)->(%ld %ld %p)\n", This, dwAssign, dwWhichMoniker, ppmk); return E_NOTIMPL; }
@@ -393,14 +393,14 @@ static HRESULT WINAPI OleObject_InitFromData(IOleObject *iface, IDataObject *pDa DWORD dwReserved) { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%p %x %d)\n", This, pDataObject, fCreation, dwReserved); + FIXME("(%p)->(%p %x %ld)\n", This, pDataObject, fCreation, dwReserved); return E_NOTIMPL; }
static HRESULT WINAPI OleObject_GetClipboardData(IOleObject *iface, DWORD dwReserved, IDataObject **ppDataObject) { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d %p)\n", This, dwReserved, ppDataObject); + FIXME("(%p)->(%ld %p)\n", This, dwReserved, ppDataObject); return E_NOTIMPL; }
@@ -424,7 +424,7 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, LPMSG lpms return S_OK;
default: - FIXME("Unsupported iVerb %d\n", iVerb); + FIXME("Unsupported iVerb %ld\n", iVerb); }
return E_NOTIMPL; @@ -461,7 +461,7 @@ static HRESULT WINAPI OleObject_GetUserClassID(IOleObject *iface, CLSID *pClsid) static HRESULT WINAPI OleObject_GetUserType(IOleObject *iface, DWORD dwFormOfType, LPOLESTR *pszUserType) { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d %p)\n", This, dwFormOfType, pszUserType); + FIXME("(%p)->(%ld %p)\n", This, dwFormOfType, pszUserType); return E_NOTIMPL; }
@@ -469,7 +469,7 @@ static HRESULT WINAPI OleObject_SetExtent(IOleObject *iface, DWORD dwDrawAspect, { WindowsMediaPlayer *This = impl_from_IOleObject(iface);
- TRACE("(%p)->(%d %p)\n", This, dwDrawAspect, psizel); + TRACE("(%p)->(%ld %p)\n", This, dwDrawAspect, psizel);
if(dwDrawAspect != DVASPECT_CONTENT) return DV_E_DVASPECT; @@ -482,7 +482,7 @@ static HRESULT WINAPI OleObject_GetExtent(IOleObject *iface, DWORD dwDrawAspect, { WindowsMediaPlayer *This = impl_from_IOleObject(iface);
- TRACE("(%p)->(%d %p)\n", This, dwDrawAspect, psizel); + TRACE("(%p)->(%ld %p)\n", This, dwDrawAspect, psizel);
if(dwDrawAspect != DVASPECT_CONTENT) return E_FAIL; @@ -501,7 +501,7 @@ static HRESULT WINAPI OleObject_Advise(IOleObject *iface, IAdviseSink *pAdvSink, static HRESULT WINAPI OleObject_Unadvise(IOleObject *iface, DWORD dwConnection) { WindowsMediaPlayer *This = impl_from_IOleObject(iface); - FIXME("(%p)->(%d)\n", This, dwConnection); + FIXME("(%p)->(%ld)\n", This, dwConnection); return E_NOTIMPL; }
@@ -516,7 +516,7 @@ static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect, { WindowsMediaPlayer *This = impl_from_IOleObject(iface);
- TRACE("(%p)->(%d %p)\n", This, dwAspect, pdwStatus); + TRACE("(%p)->(%ld %p)\n", This, dwAspect, pdwStatus);
switch(dwAspect) { case DVASPECT_CONTENT: @@ -524,7 +524,7 @@ static HRESULT WINAPI OleObject_GetMiscStatus(IOleObject *iface, DWORD dwAspect, |OLEMISC_CANTLINKINSIDE|OLEMISC_RECOMPOSEONRESIZE; break; default: - FIXME("Unhandled aspect %d\n", dwAspect); + FIXME("Unhandled aspect %ld\n", dwAspect); return E_NOTIMPL; }
@@ -648,7 +648,7 @@ static HRESULT WINAPI OleInPlaceObjectWindowless_OnWindowMessage(IOleInPlaceObje UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *lpResult) { WindowsMediaPlayer *This = impl_from_IOleInPlaceObjectWindowless(iface); - FIXME("(%p)->(%u %lu %lu %p)\n", This, msg, wParam, lParam, lpResult); + FIXME("(%p)->(%u %Iu %Iu %p)\n", This, msg, wParam, lParam, lpResult); return E_NOTIMPL; }
@@ -714,7 +714,7 @@ static HRESULT WINAPI OleControl_OnMnemonic(IOleControl *iface, MSG *msg) static HRESULT WINAPI OleControl_OnAmbientPropertyChange(IOleControl *iface, DISPID dispID) { WindowsMediaPlayer *This = impl_from_IOleControl(iface); - FIXME("(%p)->(%d)\n", This, dispID); + FIXME("(%p)->(%ld)\n", This, dispID); return E_NOTIMPL; }
@@ -774,10 +774,10 @@ static HRESULT WINAPI ProvideClassInfo2_GetGUID(IProvideClassInfo2 *iface, DWORD { WindowsMediaPlayer *This = impl_from_IProvideClassInfo2(iface);
- TRACE("(%p)->(%d %p)\n", This, dwGuidKind, pGUID); + TRACE("(%p)->(%ld %p)\n", This, dwGuidKind, pGUID);
if(dwGuidKind != GUIDKIND_DEFAULT_SOURCE_DISP_IID) { - FIXME("Unexpected dwGuidKind %d\n", dwGuidKind); + FIXME("Unexpected dwGuidKind %ld\n", dwGuidKind); return E_INVALIDARG; }
diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 1da81b17a26..7225e7130a9 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -104,7 +104,7 @@ static HRESULT WINAPI WMPPlayer4_GetTypeInfo(IWMPPlayer4 *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%u %d %p)\n", This, iTInfo, lcid, ppTInfo); + FIXME("(%p)->(%u %ld %p)\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; }
@@ -112,7 +112,7 @@ static HRESULT WINAPI WMPPlayer4_GetIDsOfNames(IWMPPlayer4 *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%s %p %u %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + FIXME("(%p)->(%s %p %u %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); return E_NOTIMPL; }
@@ -121,7 +121,7 @@ static HRESULT WINAPI WMPPlayer4_Invoke(IWMPPlayer4 *iface, DISPID dispIdMember, EXCEPINFO *pExcepInfo, UINT *puArgErr) { WindowsMediaPlayer *This = impl_from_IWMPPlayer4(iface); - FIXME("(%p)->(%d %s %d %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, + FIXME("(%p)->(%ld %s %ld %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return E_NOTIMPL; } @@ -818,7 +818,7 @@ static HRESULT WINAPI WMPSettings_GetTypeInfo(IWMPSettings *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { WindowsMediaPlayer *This = impl_from_IWMPSettings(iface); - FIXME("(%p)->(%u %d %p)\n", This, iTInfo, lcid, ppTInfo); + FIXME("(%p)->(%u %ld %p)\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; }
@@ -826,7 +826,7 @@ static HRESULT WINAPI WMPSettings_GetIDsOfNames(IWMPSettings *iface, REFIID riid LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { WindowsMediaPlayer *This = impl_from_IWMPSettings(iface); - FIXME("(%p)->(%s %p %u %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + FIXME("(%p)->(%s %p %u %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); return E_NOTIMPL; }
@@ -835,7 +835,7 @@ static HRESULT WINAPI WMPSettings_Invoke(IWMPSettings *iface, DISPID dispIdMembe EXCEPINFO *pExcepInfo, UINT *puArgErr) { WindowsMediaPlayer *This = impl_from_IWMPSettings(iface); - FIXME("(%p)->(%d %s %d %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, + FIXME("(%p)->(%ld %s %ld %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return E_NOTIMPL; } @@ -938,7 +938,7 @@ static HRESULT WINAPI WMPSettings_get_playCount(IWMPSettings *iface, LONG *p) static HRESULT WINAPI WMPSettings_put_playCount(IWMPSettings *iface, LONG v) { WindowsMediaPlayer *This = impl_from_IWMPSettings(iface); - FIXME("(%p)->(%d)\n", This, v); + FIXME("(%p)->(%ld)\n", This, v); return E_NOTIMPL; }
@@ -966,7 +966,7 @@ static HRESULT WINAPI WMPSettings_get_balance(IWMPSettings *iface, LONG *p) static HRESULT WINAPI WMPSettings_put_balance(IWMPSettings *iface, LONG v) { WindowsMediaPlayer *This = impl_from_IWMPSettings(iface); - FIXME("(%p)->(%d)\n", This, v); + FIXME("(%p)->(%ld)\n", This, v); return E_NOTIMPL; }
@@ -983,7 +983,7 @@ static HRESULT WINAPI WMPSettings_get_volume(IWMPSettings *iface, LONG *p) static HRESULT WINAPI WMPSettings_put_volume(IWMPSettings *iface, LONG v) { WindowsMediaPlayer *This = impl_from_IWMPSettings(iface); - TRACE("(%p)->(%d)\n", This, v); + TRACE("(%p)->(%ld)\n", This, v); This->volume = v; if (!This->filter_graph) return S_OK; @@ -1103,7 +1103,7 @@ static HRESULT WINAPI WMPNetwork_GetTypeInfo(IWMPNetwork *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { WindowsMediaPlayer *This = impl_from_IWMPNetwork(iface); - FIXME("(%p)->(%u %d %p)\n", This, iTInfo, lcid, ppTInfo); + FIXME("(%p)->(%u %ld %p)\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; }
@@ -1111,7 +1111,7 @@ static HRESULT WINAPI WMPNetwork_GetIDsOfNames(IWMPNetwork *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { WindowsMediaPlayer *This = impl_from_IWMPNetwork(iface); - FIXME("(%p)->(%s %p %u %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + FIXME("(%p)->(%s %p %u %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); return E_NOTIMPL; }
@@ -1120,7 +1120,7 @@ static HRESULT WINAPI WMPNetwork_Invoke(IWMPNetwork *iface, DISPID dispIdMember, EXCEPINFO *pExcepInfo, UINT *puArgErr) { WindowsMediaPlayer *This = impl_from_IWMPNetwork(iface); - FIXME("(%p)->(%d %s %d %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, + FIXME("(%p)->(%ld %s %ld %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return E_NOTIMPL; } @@ -1200,7 +1200,7 @@ static HRESULT WINAPI WMPNetwork_get_bufferingTime(IWMPNetwork *iface, LONG *plB static HRESULT WINAPI WMPNetwork_put_bufferingTime(IWMPNetwork *iface, LONG lBufferingTime) { WindowsMediaPlayer *This = impl_from_IWMPNetwork(iface); - FIXME("(%p)->(%d)\n", This, lBufferingTime); + FIXME("(%p)->(%ld)\n", This, lBufferingTime); return E_NOTIMPL; }
@@ -1235,7 +1235,7 @@ static HRESULT WINAPI WMPNetwork_getProxySettings(IWMPNetwork *iface, BSTR bstrP static HRESULT WINAPI WMPNetwork_setProxySettings(IWMPNetwork *iface, BSTR bstrProtocol, LONG lProxySetting) { WindowsMediaPlayer *This = impl_from_IWMPNetwork(iface); - FIXME("(%p)->(%s, %d)\n", This, debugstr_w(bstrProtocol), lProxySetting); + FIXME("(%p)->(%s, %ld)\n", This, debugstr_w(bstrProtocol), lProxySetting); return E_NOTIMPL; }
@@ -1263,7 +1263,7 @@ static HRESULT WINAPI WMPNetwork_getProxyPort(IWMPNetwork *iface, BSTR bstrProto static HRESULT WINAPI WMPNetwork_setProxyPort(IWMPNetwork *iface, BSTR bstrProtocol, LONG lProxyPort) { WindowsMediaPlayer *This = impl_from_IWMPNetwork(iface); - FIXME("(%p)->(%s, %d)\n", This, debugstr_w(bstrProtocol), lProxyPort); + FIXME("(%p)->(%s, %ld)\n", This, debugstr_w(bstrProtocol), lProxyPort); return E_NOTIMPL; }
@@ -1305,7 +1305,7 @@ static HRESULT WINAPI WMPNetwork_get_maxBandwidth(IWMPNetwork *iface, LONG *plMa static HRESULT WINAPI WMPNetwork_put_maxBandwidth(IWMPNetwork *iface, LONG lMaxBandwidth) { WindowsMediaPlayer *This = impl_from_IWMPNetwork(iface); - FIXME("(%p)->(%d)\n", This, lMaxBandwidth); + FIXME("(%p)->(%ld)\n", This, lMaxBandwidth); return E_NOTIMPL; }
@@ -1419,7 +1419,7 @@ static HRESULT WINAPI WMPControls_GetTypeInfo(IWMPControls *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%u %d %p)\n", This, iTInfo, lcid, ppTInfo); + FIXME("(%p)->(%u %ld %p)\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; }
@@ -1427,7 +1427,7 @@ static HRESULT WINAPI WMPControls_GetIDsOfNames(IWMPControls *iface, REFIID riid LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%s %p %u %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + FIXME("(%p)->(%s %p %u %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); return E_NOTIMPL; }
@@ -1436,7 +1436,7 @@ static HRESULT WINAPI WMPControls_Invoke(IWMPControls *iface, DISPID dispIdMembe EXCEPINFO *pExcepInfo, UINT *puArgErr) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%d %s %d %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, + FIXME("(%p)->(%ld %s %ld %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return E_NOTIMPL; } @@ -1598,7 +1598,7 @@ static HRESULT WINAPI WMPControls_get_currentPosition(IWMPControls *iface, DOUBL
hres = IMediaSeeking_GetCurrentPosition(This->media_seeking, ¤tPosition); *pdCurrentPosition = (DOUBLE) currentPosition / 10000000.0f; - TRACE("hres: %d, pos: %f\n", hres, *pdCurrentPosition); + TRACE("hres: %ld, pos: %f\n", hres, *pdCurrentPosition); return hres; }
@@ -1663,7 +1663,7 @@ static HRESULT WINAPI WMPControls_get_currentMarker(IWMPControls *iface, LONG *p static HRESULT WINAPI WMPControls_put_currentMarker(IWMPControls *iface, LONG lMarker) { WindowsMediaPlayer *This = impl_from_IWMPControls(iface); - FIXME("(%p)->(%d)\n", This, lMarker); + FIXME("(%p)->(%ld)\n", This, lMarker); return E_NOTIMPL; }
@@ -1728,7 +1728,7 @@ static ULONG WINAPI WMPMedia_AddRef(IWMPMedia *iface) WMPMedia *This = impl_from_IWMPMedia(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -1738,7 +1738,7 @@ static ULONG WINAPI WMPMedia_Release(IWMPMedia *iface) WMPMedia *This = impl_from_IWMPMedia(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { heap_free(This->url); @@ -1760,7 +1760,7 @@ static HRESULT WINAPI WMPMedia_GetTypeInfo(IWMPMedia *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%u %d %p)\n", This, iTInfo, lcid, ppTInfo); + FIXME("(%p)->(%u %ld %p)\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; }
@@ -1768,7 +1768,7 @@ static HRESULT WINAPI WMPMedia_GetIDsOfNames(IWMPMedia *iface, REFIID riid, LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%s %p %u %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + FIXME("(%p)->(%s %p %u %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); return E_NOTIMPL; }
@@ -1777,7 +1777,7 @@ static HRESULT WINAPI WMPMedia_Invoke(IWMPMedia *iface, DISPID dispIdMember, EXCEPINFO *pExcepInfo, UINT *puArgErr) { WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%d %s %d %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, + FIXME("(%p)->(%ld %s %ld %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return E_NOTIMPL; } @@ -1844,14 +1844,14 @@ static HRESULT WINAPI WMPMedia_get_markerCount(IWMPMedia *iface, LONG* pMarkerCo static HRESULT WINAPI WMPMedia_getMarkerTime(IWMPMedia *iface, LONG MarkerNum, DOUBLE *pMarkerTime) { WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%d, %p)\n", This, MarkerNum, pMarkerTime); + FIXME("(%p)->(%ld, %p)\n", This, MarkerNum, pMarkerTime); return E_NOTIMPL; }
static HRESULT WINAPI WMPMedia_getMarkerName(IWMPMedia *iface, LONG MarkerNum, BSTR *pbstrMarkerName) { WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%d, %p)\n", This, MarkerNum, pbstrMarkerName); + FIXME("(%p)->(%ld, %p)\n", This, MarkerNum, pbstrMarkerName); return E_NOTIMPL; }
@@ -1882,7 +1882,7 @@ static HRESULT WINAPI WMPMedia_get_attributeCount(IWMPMedia *iface, LONG *plCoun static HRESULT WINAPI WMPMedia_getAttributeName(IWMPMedia *iface, LONG lIndex, BSTR *pbstrItemName) { WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%d, %p)\n", This, lIndex, pbstrItemName); + FIXME("(%p)->(%ld, %p)\n", This, lIndex, pbstrItemName); return E_NOTIMPL; }
@@ -1903,7 +1903,7 @@ static HRESULT WINAPI WMPMedia_setItemInfo(IWMPMedia *iface, BSTR bstrItemName, static HRESULT WINAPI WMPMedia_getItemInfoByAtom(IWMPMedia *iface, LONG lAtom, BSTR *pbstrVal) { WMPMedia *This = impl_from_IWMPMedia(iface); - FIXME("(%p)->(%d, %p)\n", This, lAtom, pbstrVal); + FIXME("(%p)->(%ld, %p)\n", This, lAtom, pbstrVal); return E_NOTIMPL; }
@@ -1977,7 +1977,7 @@ static ULONG WINAPI WMPPlaylist_AddRef(IWMPPlaylist *iface) WMPPlaylist *This = impl_from_IWMPPlaylist(iface); LONG ref = InterlockedIncrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
return ref; } @@ -1987,7 +1987,7 @@ static ULONG WINAPI WMPPlaylist_Release(IWMPPlaylist *iface) WMPPlaylist *This = impl_from_IWMPPlaylist(iface); LONG ref = InterlockedDecrement(&This->ref);
- TRACE("(%p) ref=%d\n", This, ref); + TRACE("(%p) ref=%ld\n", This, ref);
if(!ref) { heap_free(This->url); @@ -2009,7 +2009,7 @@ static HRESULT WINAPI WMPPlaylist_GetTypeInfo(IWMPPlaylist *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { WMPPlaylist *This = impl_from_IWMPPlaylist(iface); - FIXME("(%p)->(%u %d %p)\n", This, iTInfo, lcid, ppTInfo); + FIXME("(%p)->(%u %ld %p)\n", This, iTInfo, lcid, ppTInfo); return E_NOTIMPL; }
@@ -2017,7 +2017,7 @@ static HRESULT WINAPI WMPPlaylist_GetIDsOfNames(IWMPPlaylist *iface, REFIID riid LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) { WMPPlaylist *This = impl_from_IWMPPlaylist(iface); - FIXME("(%p)->(%s %p %u %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); + FIXME("(%p)->(%s %p %u %ld %p)\n", This, debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId); return E_NOTIMPL; }
@@ -2026,7 +2026,7 @@ static HRESULT WINAPI WMPPlaylist_Invoke(IWMPPlaylist *iface, DISPID dispIdMembe EXCEPINFO *pExcepInfo, UINT *puArgErr) { WMPPlaylist *This = impl_from_IWMPPlaylist(iface); - FIXME("(%p)->(%d %s %d %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, + FIXME("(%p)->(%ld %s %ld %x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); return E_NOTIMPL; } @@ -2075,14 +2075,14 @@ static HRESULT WINAPI WMPPlaylist_get_attributeCount(IWMPPlaylist *iface, LONG * static HRESULT WINAPI WMPPlaylist_get_attributeName(IWMPPlaylist *iface, LONG index, BSTR *attribute_name) { WMPPlaylist *This = impl_from_IWMPPlaylist(iface); - FIXME("(%p)->(%d %p)\n", This, index, attribute_name); + FIXME("(%p)->(%ld %p)\n", This, index, attribute_name); return E_NOTIMPL; }
static HRESULT WINAPI WMPPlaylist_get_Item(IWMPPlaylist *iface, LONG index, IWMPMedia **media) { WMPPlaylist *This = impl_from_IWMPPlaylist(iface); - FIXME("(%p)->(%d %p)\n", This, index, media); + FIXME("(%p)->(%ld %p)\n", This, index, media); return E_NOTIMPL; }
@@ -2117,7 +2117,7 @@ static HRESULT WINAPI WMPPlaylist_clear(IWMPPlaylist *iface) static HRESULT WINAPI WMPPlaylist_insertItem(IWMPPlaylist *iface, LONG index, IWMPMedia *media) { WMPPlaylist *This = impl_from_IWMPPlaylist(iface); - FIXME("(%p)->(%d %p)\n", This, index, media); + FIXME("(%p)->(%ld %p)\n", This, index, media); return E_NOTIMPL; }
@@ -2138,7 +2138,7 @@ static HRESULT WINAPI WMPPlaylist_removeItem(IWMPPlaylist *iface, IWMPMedia *med static HRESULT WINAPI WMPPlaylist_moveItem(IWMPPlaylist *iface, LONG old_index, LONG new_index) { WMPPlaylist *This = impl_from_IWMPPlaylist(iface); - FIXME("(%p)->(%d %d)\n", This, old_index, new_index); + FIXME("(%p)->(%ld %ld)\n", This, old_index, new_index); return E_NOTIMPL; }
@@ -2177,7 +2177,7 @@ static LRESULT WINAPI player_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM do { hr = IMediaEvent_GetEvent(wmp->media_event, &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(wmp->media_event, event_code, p1, p2); /* For now we only handle EC_COMPLETE */ if (event_code == EC_COMPLETE) { @@ -2221,11 +2221,11 @@ BOOL init_player(WindowsMediaPlayer *wmp) wmp->msg_window = CreateWindowW( MAKEINTRESOURCEW(player_msg_class), NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, 0, wmp_instance, wmp ); if (!wmp->msg_window) { - ERR("Failed to create message window, GetLastError: %d\n", GetLastError()); + ERR("Failed to create message window, GetLastError: %ld\n", GetLastError()); return FALSE; } if (!WM_WMPEVENT) { - ERR("Failed to register window message, GetLastError: %d\n", GetLastError()); + ERR("Failed to register window message, GetLastError: %ld\n", GetLastError()); return FALSE; }
diff --git a/dlls/wmp/wmp_main.c b/dlls/wmp/wmp_main.c index 931e737e527..1f2afd8b244 100644 --- a/dlls/wmp/wmp_main.c +++ b/dlls/wmp/wmp_main.c @@ -45,7 +45,7 @@ static HRESULT load_typelib(void)
hr = LoadRegTypeLib(&LIBID_WMPLib, 1, 0, LOCALE_SYSTEM_DEFAULT, &tl); if (FAILED(hr)) { - ERR("LoadRegTypeLib failed: %08x\n", hr); + ERR("LoadRegTypeLib failed: %08lx\n", hr); return hr; }
@@ -68,7 +68,7 @@ HRESULT get_typeinfo(typeinfo_id tid, ITypeInfo **typeinfo)
hr = ITypeLib_GetTypeInfoOfGuid(typelib, tid_ids[tid], &ti); if (FAILED(hr)) { - ERR("GetTypeInfoOfGuid (%s) failed: %08x\n", debugstr_guid(tid_ids[tid]), hr); + ERR("GetTypeInfoOfGuid (%s) failed: %08lx\n", debugstr_guid(tid_ids[tid]), hr); return hr; }
@@ -146,7 +146,7 @@ static IClassFactory WMPFactory = { &WMPFactoryVtbl }; */ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) { - TRACE("(%p %d %p)\n", hInstDLL, fdwReason, lpv); + TRACE("(%p %ld %p)\n", hInstDLL, fdwReason, lpv);
switch(fdwReason) { case DLL_PROCESS_ATTACH: