Eric Pouech : msvideo.dll16: Enable compilation with long types.

[Alexandre Julliard]

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

Author: Eric Pouech 
Date:   Tue Feb 15 07:30:53 2022 +0100

msvideo.dll16: Enable compilation with long types.

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

---

dlls/msvideo.dll16/Makefile.in |  1 -
 dlls/msvideo.dll16/msvideo16.c | 12 ++++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dlls/msvideo.dll16/Makefile.in b/dlls/msvideo.dll16/Makefile.in
index dfc900f8cb5..5f7a9a4c33d 100644
--- a/dlls/msvideo.dll16/Makefile.in
+++ b/dlls/msvideo.dll16/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 MODULE    = msvideo.dll16
 IMPORTS   = msvfw32 version advapi32 user32

diff --git a/dlls/msvideo.dll16/msvideo16.c b/dlls/msvideo.dll16/msvideo16.c
index 840de2efa8c..3a7a761382e 100644
--- a/dlls/msvideo.dll16/msvideo16.c
+++ b/dlls/msvideo.dll16/msvideo16.c
@@ -166,7 +166,7 @@ LRESULT VFWAPIV ICMessage16( HIC16 hic, UINT16 msg, UINT16 cb, VA_LIST16 valist

lpData = HeapAlloc(GetProcessHeap(), 0, cb);

-    TRACE("0x%08x, %u, %u, ...)\n", (DWORD) hic, msg, cb);
+    TRACE("0x%08lx, %u, %u, ...)\n", (DWORD) hic, msg, cb);

for (i = 0; i < cb / sizeof(WORD); i++)
     {
@@ -187,7 +187,7 @@ LRESULT VFWAPI ICGetInfo16(HIC16 hic, ICINFO16 * picinfo, DWORD cb)
 {
     LRESULT ret;

-    TRACE("(0x%08x,%p,%d)\n", (DWORD) hic, picinfo, cb);
+    TRACE("(0x%08lx,%p,%ld)\n", (DWORD) hic, picinfo, cb);
     ret = ICSendMessage16(hic, ICM_GETINFO, (DWORD) picinfo, cb);
     TRACE("	-> 0x%08lx\n", ret);
     return ret;
@@ -218,7 +218,7 @@ DWORD VFWAPIV ICCompress16(HIC16 hic, DWORD dwFlags,
     ICCOMPRESS iccmp;
     SEGPTR seg_iccmp;

-    TRACE("(0x%08x,%d,%p,%p,%p,%p,...)\n", (DWORD) hic, dwFlags,
+    TRACE("(0x%08lx,%ld,%p,%p,%p,%p,...)\n", (DWORD) hic, dwFlags,
      lpbiOutput, lpData, lpbiInput, lpBits);

iccmp.dwFlags = dwFlags;
@@ -252,7 +252,7 @@ DWORD VFWAPIV ICDecompress16(HIC16 hic, DWORD dwFlags,
     SEGPTR segptr;
     DWORD ret;

-    TRACE("(0x%08x,%d,%p,%p,%p,%p)\n", (DWORD) hic, dwFlags, lpbiFormat,
+    TRACE("(0x%08lx,%ld,%p,%p,%p,%p)\n", (DWORD) hic, dwFlags, lpbiFormat,
      lpData, lpbi, lpBits);

icd.dwFlags = dwFlags;
@@ -291,7 +291,7 @@ DWORD VFWAPIV ICDrawBegin16(HIC16 hic,		/* [in] */
     ICDRAWBEGIN16 icdb;
     SEGPTR seg_icdb;

-    TRACE ("(0x%08x,%d,0x%08x,0x%08x,0x%08x,%u,%u,%u,%u,%p,%u,%u,%u,%u,%d,%d)\n",
+    TRACE ("(0x%08lx,%ld,0x%08lx,0x%08lx,0x%08lx,%u,%u,%u,%u,%p,%u,%u,%u,%u,%ld,%ld)\n",
       (DWORD) hic, dwFlags, (DWORD) hpal, (DWORD) hwnd, (DWORD) hdc,
       xDst, yDst, dxDst, dyDst, lpbi, xSrc, ySrc, dxSrc, dySrc, dwRate,
       dwScale);
@@ -330,7 +330,7 @@ DWORD VFWAPIV ICDraw16(HIC16 hic, DWORD dwFlags,
     ICDRAW icd;
     SEGPTR seg_icd;

-    TRACE("(0x%08x,0x%08x,%p,%p,%d,%d)\n", (DWORD) hic, dwFlags,
+    TRACE("(0x%08lx,0x%08lx,%p,%p,%ld,%ld)\n", (DWORD) hic, dwFlags,
      lpFormat, lpData, cbData, lTime);
     icd.dwFlags = dwFlags;
     icd.lpFormat = lpFormat;