Module: wine Branch: master Commit: 341b341605e1130a2f9c0d68263c40a39c477263 URL: https://source.winehq.org/git/wine.git/?a=commit;h=341b341605e1130a2f9c0d682...
Author: Eric Pouech eric.pouech@gmail.com Date: Mon Feb 21 07:57:44 2022 +0100
user.exe16: Enable compilation with long types.
Signed-off-by: Eric Pouech eric.pouech@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/user.exe16/Makefile.in | 1 - dlls/user.exe16/bidi.c | 2 +- dlls/user.exe16/comm.c | 8 ++++---- dlls/user.exe16/dialog.c | 4 ++-- dlls/user.exe16/message.c | 4 ++-- dlls/user.exe16/network.c | 2 +- dlls/user.exe16/user.c | 8 ++++---- 7 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/dlls/user.exe16/Makefile.in b/dlls/user.exe16/Makefile.in index e4a2c4a723a..7e2438d033f 100644 --- a/dlls/user.exe16/Makefile.in +++ b/dlls/user.exe16/Makefile.in @@ -1,4 +1,3 @@ -EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = user.exe16 IMPORTS = mpr user32 gdi32 win32u EXTRADLLFLAGS = -m16 -Wb,--main-module,user32.dll,--heap,65520 diff --git a/dlls/user.exe16/bidi.c b/dlls/user.exe16/bidi.c index d9a320f0271..7b91a322a10 100644 --- a/dlls/user.exe16/bidi.c +++ b/dlls/user.exe16/bidi.c @@ -309,7 +309,7 @@ void WINAPI SetDlgItemTextEx16( HWND16 hwnd, INT16 id, */ BOOL16 WINAPI SetProcessDefaultLayout16( DWORD dwDefaultLayout ) { - FIXME( "( %08x ): No BiDi16\n", dwDefaultLayout ); + FIXME( "( %08lx ): No BiDi16\n", dwDefaultLayout ); return SetProcessDefaultLayout( dwDefaultLayout ); }
diff --git a/dlls/user.exe16/comm.c b/dlls/user.exe16/comm.c index 9125c6d0f37..911e0eeea4b 100644 --- a/dlls/user.exe16/comm.c +++ b/dlls/user.exe16/comm.c @@ -194,11 +194,11 @@ static VOID WINAPI COMM16_ReadComplete(DWORD dwErrorCode, DWORD len, LPOVERLAPPE
/* read data from comm port */ if (dwErrorCode != NO_ERROR) { - ERR("async read failed, error %d\n",dwErrorCode); + ERR("async read failed, error %ld\n",dwErrorCode); COM[cid].commerror = CE_RXOVER; return; } - TRACE("async read completed %d bytes\n",len); + TRACE("async read completed %ld bytes\n",len);
prev = comm_inbuf(ptr);
@@ -274,11 +274,11 @@ static VOID WINAPI COMM16_WriteComplete(DWORD dwErrorCode, DWORD len, LPOVERLAPP
/* read data from comm port */ if (dwErrorCode != NO_ERROR) { - ERR("async write failed, error %d\n",dwErrorCode); + ERR("async write failed, error %ld\n",dwErrorCode); COM[cid].commerror = CE_RXOVER; return; } - TRACE("async write completed %d bytes\n",len); + TRACE("async write completed %ld bytes\n",len);
/* update the buffer pointers */ prev = comm_outbuf(&COM[cid]); diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index 10416384562..ecd7acb9bfc 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -156,7 +156,7 @@ static LPCSTR DIALOG_GetControl16( LPCSTR p, DLG_CONTROL_INFO *info )
p += *p + 1;
- TRACE(" %s %s %d, %d, %d, %d, %d, %08x, %p\n", + TRACE(" %s %s %d, %d, %d, %d, %d, %08lx, %p\n", debugstr_a(info->className), debugstr_a(info->windowName), info->id, info->x, info->y, info->cx, info->cy, info->style, info->data ); @@ -238,7 +238,7 @@ static LPCSTR DIALOG_ParseTemplate16( LPCSTR p, DLG_TEMPLATE * result ) result->cy = GET_WORD(p); p += sizeof(WORD);
TRACE("DIALOG %d, %d, %d, %d\n", result->x, result->y, result->cx, result->cy ); - TRACE(" STYLE %08x\n", result->style ); + TRACE(" STYLE %08lx\n", result->style );
/* Get the menu name */
diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 5d388a55312..6d3de0f77e6 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -895,7 +895,7 @@ LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT1 case 1: break; /* atom, nothing to do */ case 3: - WARN("DDE_ACK: %lx both atom and handle... choosing handle\n", hi); + WARN("DDE_ACK: %Ix both atom and handle... choosing handle\n", hi); /* fall through */ case 2: hi = convert_handle_16_to_32(hi, GMEM_DDESHARE); @@ -1278,7 +1278,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT case 1: break; /* atom, nothing to do */ case 3: - WARN("DDE_ACK: %lx both atom and handle... choosing handle\n", hi); + WARN("DDE_ACK: %Ix both atom and handle... choosing handle\n", hi); /* fall through */ case 2: hi = convert_handle_32_to_16(hi, GMEM_DDESHARE); diff --git a/dlls/user.exe16/network.c b/dlls/user.exe16/network.c index c137bb19f70..96135a3064a 100644 --- a/dlls/user.exe16/network.c +++ b/dlls/user.exe16/network.c @@ -319,7 +319,7 @@ WORD WINAPI WNetGetUser16( LPSTR szUser, LPINT16 nBufferSize ) case ERROR_MORE_DATA: return WN16_MORE_DATA; default: - FIXME("Untranslated return value %d\n", ret); + FIXME("Untranslated return value %ld\n", ret); } return ret; } diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 5063f9d2343..4a56a67389b 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -1659,7 +1659,7 @@ HMODULE16 WINAPI GetDriverModuleHandle16(HDRVR16 hDrvr) LRESULT WINAPI DefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg, LPARAM lParam1, LPARAM lParam2) { - FIXME( "devID=0x%08x hDrv=0x%04x wMsg=%04x lP1=0x%08lx lP2=0x%08lx: stub\n", + FIXME( "devID=0x%08lx hDrv=0x%04x wMsg=%04x lP1=0x%08lx lP2=0x%08lx: stub\n", dwDevID, hDriv, wMsg, lParam1, lParam2); return 0; } @@ -1681,7 +1681,7 @@ BOOL16 WINAPI GetDriverInfo16(HDRVR16 hDrvr, struct DRIVERINFOSTRUCT16 *lpDrvInf */ HDRVR16 WINAPI GetNextDriver16(HDRVR16 hDrvr, DWORD dwFlags) { - FIXME( "(%04x, %08x): stub\n", hDrvr, dwFlags); + FIXME( "(%04x, %08lx): stub\n", hDrvr, dwFlags); return 0; }
@@ -3170,7 +3170,7 @@ DWORD WINAPI FormatMessage16( BOOL eos = FALSE; LPSTR allocstring = NULL;
- TRACE("(0x%x,%x,%d,0x%x,%p,%d,%p)\n", + TRACE("(0x%lx,%lx,%d,0x%x,%p,%d,%p)\n", dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args); if ((dwFlags & FORMAT_MESSAGE_FROM_SYSTEM) && (dwFlags & FORMAT_MESSAGE_FROM_HMODULE)) return 0; @@ -3179,7 +3179,7 @@ DWORD WINAPI FormatMessage16( || (dwFlags & FORMAT_MESSAGE_FROM_HMODULE))) return 0;
if (width && width != FORMAT_MESSAGE_MAX_WIDTH_MASK) - FIXME("line wrapping (%u) not supported.\n", width); + FIXME("line wrapping (%lu) not supported.\n", width); from = NULL; if (dwFlags & FORMAT_MESSAGE_FROM_STRING) {