Commit 341b3416 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard

user.exe16: Enable compilation with long types.

parent f383ad10
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = user.exe16 MODULE = user.exe16
IMPORTS = mpr user32 gdi32 win32u IMPORTS = mpr user32 gdi32 win32u
EXTRADLLFLAGS = -m16 -Wb,--main-module,user32.dll,--heap,65520 EXTRADLLFLAGS = -m16 -Wb,--main-module,user32.dll,--heap,65520
......
...@@ -309,7 +309,7 @@ void WINAPI SetDlgItemTextEx16( HWND16 hwnd, INT16 id, ...@@ -309,7 +309,7 @@ void WINAPI SetDlgItemTextEx16( HWND16 hwnd, INT16 id,
*/ */
BOOL16 WINAPI SetProcessDefaultLayout16( DWORD dwDefaultLayout ) BOOL16 WINAPI SetProcessDefaultLayout16( DWORD dwDefaultLayout )
{ {
FIXME( "( %08x ): No BiDi16\n", dwDefaultLayout ); FIXME( "( %08lx ): No BiDi16\n", dwDefaultLayout );
return SetProcessDefaultLayout( dwDefaultLayout ); return SetProcessDefaultLayout( dwDefaultLayout );
} }
......
...@@ -194,11 +194,11 @@ static VOID WINAPI COMM16_ReadComplete(DWORD dwErrorCode, DWORD len, LPOVERLAPPE ...@@ -194,11 +194,11 @@ static VOID WINAPI COMM16_ReadComplete(DWORD dwErrorCode, DWORD len, LPOVERLAPPE
/* read data from comm port */ /* read data from comm port */
if (dwErrorCode != NO_ERROR) { 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; COM[cid].commerror = CE_RXOVER;
return; return;
} }
TRACE("async read completed %d bytes\n",len); TRACE("async read completed %ld bytes\n",len);
prev = comm_inbuf(ptr); prev = comm_inbuf(ptr);
...@@ -274,11 +274,11 @@ static VOID WINAPI COMM16_WriteComplete(DWORD dwErrorCode, DWORD len, LPOVERLAPP ...@@ -274,11 +274,11 @@ static VOID WINAPI COMM16_WriteComplete(DWORD dwErrorCode, DWORD len, LPOVERLAPP
/* read data from comm port */ /* read data from comm port */
if (dwErrorCode != NO_ERROR) { 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; COM[cid].commerror = CE_RXOVER;
return; return;
} }
TRACE("async write completed %d bytes\n",len); TRACE("async write completed %ld bytes\n",len);
/* update the buffer pointers */ /* update the buffer pointers */
prev = comm_outbuf(&COM[cid]); prev = comm_outbuf(&COM[cid]);
......
...@@ -156,7 +156,7 @@ static LPCSTR DIALOG_GetControl16( LPCSTR p, DLG_CONTROL_INFO *info ) ...@@ -156,7 +156,7 @@ static LPCSTR DIALOG_GetControl16( LPCSTR p, DLG_CONTROL_INFO *info )
p += *p + 1; 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), debugstr_a(info->className), debugstr_a(info->windowName),
info->id, info->x, info->y, info->cx, info->cy, info->id, info->x, info->y, info->cx, info->cy,
info->style, info->data ); info->style, info->data );
...@@ -238,7 +238,7 @@ static LPCSTR DIALOG_ParseTemplate16( LPCSTR p, DLG_TEMPLATE * result ) ...@@ -238,7 +238,7 @@ static LPCSTR DIALOG_ParseTemplate16( LPCSTR p, DLG_TEMPLATE * result )
result->cy = GET_WORD(p); p += sizeof(WORD); result->cy = GET_WORD(p); p += sizeof(WORD);
TRACE("DIALOG %d, %d, %d, %d\n", result->x, result->y, result->cx, result->cy ); 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 */ /* Get the menu name */
......
...@@ -895,7 +895,7 @@ LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT1 ...@@ -895,7 +895,7 @@ LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT1
case 1: case 1:
break; /* atom, nothing to do */ break; /* atom, nothing to do */
case 3: 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 */ /* fall through */
case 2: case 2:
hi = convert_handle_16_to_32(hi, GMEM_DDESHARE); hi = convert_handle_16_to_32(hi, GMEM_DDESHARE);
...@@ -1278,7 +1278,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT ...@@ -1278,7 +1278,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT
case 1: case 1:
break; /* atom, nothing to do */ break; /* atom, nothing to do */
case 3: 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 */ /* fall through */
case 2: case 2:
hi = convert_handle_32_to_16(hi, GMEM_DDESHARE); hi = convert_handle_32_to_16(hi, GMEM_DDESHARE);
......
...@@ -319,7 +319,7 @@ WORD WINAPI WNetGetUser16( LPSTR szUser, LPINT16 nBufferSize ) ...@@ -319,7 +319,7 @@ WORD WINAPI WNetGetUser16( LPSTR szUser, LPINT16 nBufferSize )
case ERROR_MORE_DATA: case ERROR_MORE_DATA:
return WN16_MORE_DATA; return WN16_MORE_DATA;
default: default:
FIXME("Untranslated return value %d\n", ret); FIXME("Untranslated return value %ld\n", ret);
} }
return ret; return ret;
} }
......
...@@ -1659,7 +1659,7 @@ HMODULE16 WINAPI GetDriverModuleHandle16(HDRVR16 hDrvr) ...@@ -1659,7 +1659,7 @@ HMODULE16 WINAPI GetDriverModuleHandle16(HDRVR16 hDrvr)
LRESULT WINAPI DefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg, LRESULT WINAPI DefDriverProc16(DWORD dwDevID, HDRVR16 hDriv, UINT16 wMsg,
LPARAM lParam1, LPARAM lParam2) 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); dwDevID, hDriv, wMsg, lParam1, lParam2);
return 0; return 0;
} }
...@@ -1681,7 +1681,7 @@ BOOL16 WINAPI GetDriverInfo16(HDRVR16 hDrvr, struct DRIVERINFOSTRUCT16 *lpDrvInf ...@@ -1681,7 +1681,7 @@ BOOL16 WINAPI GetDriverInfo16(HDRVR16 hDrvr, struct DRIVERINFOSTRUCT16 *lpDrvInf
*/ */
HDRVR16 WINAPI GetNextDriver16(HDRVR16 hDrvr, DWORD dwFlags) HDRVR16 WINAPI GetNextDriver16(HDRVR16 hDrvr, DWORD dwFlags)
{ {
FIXME( "(%04x, %08x): stub\n", hDrvr, dwFlags); FIXME( "(%04x, %08lx): stub\n", hDrvr, dwFlags);
return 0; return 0;
} }
...@@ -3170,7 +3170,7 @@ DWORD WINAPI FormatMessage16( ...@@ -3170,7 +3170,7 @@ DWORD WINAPI FormatMessage16(
BOOL eos = FALSE; BOOL eos = FALSE;
LPSTR allocstring = NULL; 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); dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args);
if ((dwFlags & FORMAT_MESSAGE_FROM_SYSTEM) if ((dwFlags & FORMAT_MESSAGE_FROM_SYSTEM)
&& (dwFlags & FORMAT_MESSAGE_FROM_HMODULE)) return 0; && (dwFlags & FORMAT_MESSAGE_FROM_HMODULE)) return 0;
...@@ -3179,7 +3179,7 @@ DWORD WINAPI FormatMessage16( ...@@ -3179,7 +3179,7 @@ DWORD WINAPI FormatMessage16(
|| (dwFlags & FORMAT_MESSAGE_FROM_HMODULE))) return 0; || (dwFlags & FORMAT_MESSAGE_FROM_HMODULE))) return 0;
if (width && width != FORMAT_MESSAGE_MAX_WIDTH_MASK) 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; from = NULL;
if (dwFlags & FORMAT_MESSAGE_FROM_STRING) if (dwFlags & FORMAT_MESSAGE_FROM_STRING)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment