Eric Pouech : msdmo: Enable compilation with long types.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a43a17787e84e87b2d07bded617acad4092e9b1b
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=a43a17787e84e87b2d07bded6...

Author: Eric Pouech 
Date:   Tue Feb 15 07:29:23 2022 +0100

msdmo: Enable compilation with long types.

Signed-off-by: Eric Pouech 
Signed-off-by: Alexandre Julliard

---

dlls/msdmo/Makefile.in |  1 -
 dlls/msdmo/dmoreg.c    | 22 +++++++++++-----------
 dlls/msdmo/dmort.c     |  4 ++--
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/dlls/msdmo/Makefile.in b/dlls/msdmo/Makefile.in
index ed4bcfae6f0..566461e00bf 100644
--- a/dlls/msdmo/Makefile.in
+++ b/dlls/msdmo/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = msdmo.dll
 IMPORTLIB = msdmo
 IMPORTS   = dmoguids uuid ole32 user32 advapi32
diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c
index d5c76c8273f..70f01661697 100644
--- a/dlls/msdmo/dmoreg.c
+++ b/dlls/msdmo/dmoreg.c
@@ -204,7 +204,7 @@ lend:
         RegCloseKey(hrkey);

hres = HRESULT_FROM_WIN32(ret);
-    TRACE(" hresult=0x%08x\n", hres);
+    TRACE(" hresult=0x%08lx\n", hres);
     return hres;
 }

@@ -398,7 +398,7 @@ static ULONG WINAPI IEnumDMO_fnAddRef(IEnumDMO * iface)
 {
     IEnumDMOImpl *This = impl_from_IEnumDMO(iface);
     ULONG refCount = InterlockedIncrement(&This->ref);
-    TRACE("(%p)->(%d)\n", This, refCount);
+    TRACE("(%p)->(%ld)\n", This, refCount);
     return refCount;
 }

@@ -431,7 +431,7 @@ static ULONG WINAPI IEnumDMO_fnRelease(IEnumDMO * iface)
     IEnumDMOImpl *This = impl_from_IEnumDMO(iface);
     ULONG refCount = InterlockedDecrement(&This->ref);

-    TRACE("(%p)->(%d)\n", This, refCount);
+    TRACE("(%p)->(%ld)\n", This, refCount);

if (!refCount)
     {
@@ -483,7 +483,7 @@ static HRESULT WINAPI IEnumDMO_fnNext(

IEnumDMOImpl *This = impl_from_IEnumDMO(iface);

-    TRACE("(%p)->(%d %p %p %p)\n", This, cItemsToFetch, pCLSID, Names, pcItemsFetched);
+    TRACE("(%p)->(%ld %p %p %p)\n", This, cItemsToFetch, pCLSID, Names, pcItemsFetched);

if (!pCLSID)
         return E_POINTER;
@@ -550,7 +550,7 @@ static HRESULT WINAPI IEnumDMO_fnNext(
             }

for (i = 0; i < size / sizeof(DMO_PARTIAL_MEDIATYPE); ++i)
-                TRACE("intype %d: type %s, subtype %s\n", i, debugstr_guid(&types[i].type),
+                TRACE("intype %ld: type %s, subtype %s\n", i, debugstr_guid(&types[i].type),
                     debugstr_guid(&types[i].subtype));

if (!any_types_match(types, size / sizeof(DMO_PARTIAL_MEDIATYPE), This->pInTypes, This->cInTypes))
@@ -586,7 +586,7 @@ static HRESULT WINAPI IEnumDMO_fnNext(
             }

for (i = 0; i < size / sizeof(DMO_PARTIAL_MEDIATYPE); ++i)
-                TRACE("outtype %d: type %s, subtype %s\n", i, debugstr_guid(&types[i].type),
+                TRACE("outtype %ld: type %s, subtype %s\n", i, debugstr_guid(&types[i].type),
                     debugstr_guid(&types[i].subtype));

if (!any_types_match(types, size / sizeof(DMO_PARTIAL_MEDIATYPE), This->pOutTypes, This->cOutTypes))
@@ -633,7 +633,7 @@ static HRESULT WINAPI IEnumDMO_fnSkip(IEnumDMO * iface, DWORD cItemsToSkip)
 {
     IEnumDMOImpl *This = impl_from_IEnumDMO(iface);

-    TRACE("(%p)->(%d)\n", This, cItemsToSkip);
+    TRACE("(%p)->(%ld)\n", This, cItemsToSkip);
     This->index += cItemsToSkip;

return S_OK;
@@ -680,7 +680,7 @@ HRESULT WINAPI DMOEnum(
     const DMO_PARTIAL_MEDIATYPE *pOutTypes,
     IEnumDMO **ppEnum)
 {
-    TRACE("%s 0x%08x %d %p %d %p %p\n", debugstr_guid(category), flags, cInTypes, pInTypes,
+    TRACE("%s 0x%08lx %ld %p %ld %p %p\n", debugstr_guid(category), flags, cInTypes, pInTypes,
         cOutTypes, pOutTypes, ppEnum);

if (TRACE_ON(msdmo))
@@ -689,13 +689,13 @@ HRESULT WINAPI DMOEnum(
         if (cInTypes)
         {
             for (i = 0; i < cInTypes; i++)
-                TRACE("intype %d - type %s, subtype %s\n", i, debugstr_guid(&pInTypes[i].type),
+                TRACE("intype %ld - type %s, subtype %s\n", i, debugstr_guid(&pInTypes[i].type),
                     debugstr_guid(&pInTypes[i].subtype));
         }

if (cOutTypes) {
             for (i = 0; i < cOutTypes; i++)
-                TRACE("outtype %d - type %s, subtype %s\n", i, debugstr_guid(&pOutTypes[i].type),
+                TRACE("outtype %ld - type %s, subtype %s\n", i, debugstr_guid(&pOutTypes[i].type),
                     debugstr_guid(&pOutTypes[i].subtype));
         }
     }
@@ -727,7 +727,7 @@ HRESULT WINAPI DMOGetTypes(REFCLSID clsid, ULONG input_count, ULONG *ret_input_c
     LSTATUS ret;
     DWORD size;

-    TRACE("clsid %s, input_count %u, ret_input_count %p, input %p, output_count %u, ret_output_count %p, output %p.\n",
+    TRACE("clsid %s, input_count %lu, ret_input_count %p, input %p, output_count %lu, ret_output_count %p, output %p.\n",
             debugstr_guid(clsid), input_count, ret_input_count, input, output_count, ret_output_count, output);

if (RegOpenKeyExW(HKEY_CLASSES_ROOT, L"DirectShow\MediaObjects", 0, KEY_READ, &root))
diff --git a/dlls/msdmo/dmort.c b/dlls/msdmo/dmort.c
index b586cac6116..04e2617ccca 100644
--- a/dlls/msdmo/dmort.c
+++ b/dlls/msdmo/dmort.c
@@ -39,7 +39,7 @@ HRESULT WINAPI MoCreateMediaType(DMO_MEDIA_TYPE** ppmedia, DWORD cbFormat)
 {
     HRESULT r;

-    TRACE("%p %u\n", ppmedia, cbFormat);
+    TRACE("%p %lu\n", ppmedia, cbFormat);

if (!ppmedia)
         return E_POINTER;
@@ -65,7 +65,7 @@ HRESULT WINAPI MoCreateMediaType(DMO_MEDIA_TYPE** ppmedia, DWORD cbFormat)
  */
 HRESULT WINAPI MoInitMediaType(DMO_MEDIA_TYPE* pmedia, DWORD cbFormat)
 {
-    TRACE("%p %u\n", pmedia, cbFormat);
+    TRACE("%p %lu\n", pmedia, cbFormat);

if (!pmedia)
         return E_POINTER;