wmp: Enable compilation with long types.

dlls/wmp/Makefile.in

-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = wmp.dll
 IMPORTS   = oleaut32 ole32 urlmon shlwapi user32 gdi32
 

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;

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;
     }
 

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: