Commit 620305d9 authored by Eric Pouech's avatar Eric Pouech Committed by Alexandre Julliard

conhost: Enable compilation with long types.

parent abbde22d
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = conhost.exe MODULE = conhost.exe
IMPORTS = user32 gdi32 advapi32 IMPORTS = user32 gdi32 advapi32
DELAYIMPORTS = comctl32 DELAYIMPORTS = comctl32
......
...@@ -162,7 +162,7 @@ static void tty_flush( struct console *console ) ...@@ -162,7 +162,7 @@ static void tty_flush( struct console *console )
TRACE("%s\n", debugstr_an(console->tty_buffer, console->tty_buffer_count)); TRACE("%s\n", debugstr_an(console->tty_buffer, console->tty_buffer_count));
if (!WriteFile( console->tty_output, console->tty_buffer, console->tty_buffer_count, if (!WriteFile( console->tty_output, console->tty_buffer, console->tty_buffer_count,
NULL, NULL )) NULL, NULL ))
WARN( "write failed: %u\n", GetLastError() ); WARN( "write failed: %lu\n", GetLastError() );
console->tty_buffer_count = 0; console->tty_buffer_count = 0;
} }
...@@ -180,7 +180,7 @@ static void tty_write( struct console *console, const char *buffer, size_t size ...@@ -180,7 +180,7 @@ static void tty_write( struct console *console, const char *buffer, size_t size
{ {
assert( !console->tty_buffer_count ); assert( !console->tty_buffer_count );
if (!WriteFile( console->tty_output, buffer, size, NULL, NULL )) if (!WriteFile( console->tty_output, buffer, size, NULL, NULL ))
WARN( "write failed: %u\n", GetLastError() ); WARN( "write failed: %lu\n", GetLastError() );
} }
} }
...@@ -461,7 +461,7 @@ static NTSTATUS read_complete( struct console *console, NTSTATUS status, const v ...@@ -461,7 +461,7 @@ static NTSTATUS read_complete( struct console *console, NTSTATUS status, const v
status = wine_server_call( req ); status = wine_server_call( req );
} }
SERVER_END_REQ; SERVER_END_REQ;
if (status && (console->read_ioctl || status != STATUS_INVALID_HANDLE)) ERR( "failed: %#x\n", status ); if (status && (console->read_ioctl || status != STATUS_INVALID_HANDLE)) ERR( "failed: %#lx\n", status );
console->signaled = signal; console->signaled = signal;
console->read_ioctl = 0; console->read_ioctl = 0;
console->pending_read = 0; console->pending_read = 0;
...@@ -472,7 +472,7 @@ static NTSTATUS read_console_input( struct console *console, size_t out_size ) ...@@ -472,7 +472,7 @@ static NTSTATUS read_console_input( struct console *console, size_t out_size )
{ {
size_t count = min( out_size / sizeof(INPUT_RECORD), console->record_count ); size_t count = min( out_size / sizeof(INPUT_RECORD), console->record_count );
TRACE("count %u\n", count); TRACE("count %Iu\n", count);
read_complete( console, STATUS_SUCCESS, console->records, count * sizeof(*console->records), read_complete( console, STATUS_SUCCESS, console->records, count * sizeof(*console->records),
console->record_count > count ); console->record_count > count );
...@@ -1271,7 +1271,7 @@ static NTSTATUS process_console_input( struct console *console ) ...@@ -1271,7 +1271,7 @@ static NTSTATUS process_console_input( struct console *console )
if (ir.EventType != KEY_EVENT || !ir.Event.KeyEvent.bKeyDown) continue; if (ir.EventType != KEY_EVENT || !ir.Event.KeyEvent.bKeyDown) continue;
TRACE( "key code=%02x scan=%02x char=%02x state=%08x\n", TRACE( "key code=%02x scan=%02x char=%02x state=%08lx\n",
ir.Event.KeyEvent.wVirtualKeyCode, ir.Event.KeyEvent.wVirtualScanCode, ir.Event.KeyEvent.wVirtualKeyCode, ir.Event.KeyEvent.wVirtualScanCode,
ir.Event.KeyEvent.uChar.UnicodeChar, ir.Event.KeyEvent.dwControlKeyState ); ir.Event.KeyEvent.uChar.UnicodeChar, ir.Event.KeyEvent.dwControlKeyState );
...@@ -1638,7 +1638,7 @@ static DWORD WINAPI tty_input( void *param ) ...@@ -1638,7 +1638,7 @@ static DWORD WINAPI tty_input( void *param )
unsigned int h = condrv_handle( console->tty_input ); unsigned int h = condrv_handle( console->tty_input );
status = NtDeviceIoControlFile( console->server, NULL, NULL, NULL, &io, IOCTL_CONDRV_SETUP_INPUT, status = NtDeviceIoControlFile( console->server, NULL, NULL, NULL, &io, IOCTL_CONDRV_SETUP_INPUT,
&h, sizeof(h), NULL, 0 ); &h, sizeof(h), NULL, 0 );
if (status) ERR( "input setup failed: %#x\n", status ); if (status) ERR( "input setup failed: %#lx\n", status );
} }
event = CreateEventW( NULL, TRUE, FALSE, NULL ); event = CreateEventW( NULL, TRUE, FALSE, NULL );
...@@ -1695,7 +1695,7 @@ static DWORD WINAPI tty_input( void *param ) ...@@ -1695,7 +1695,7 @@ static DWORD WINAPI tty_input( void *param )
LeaveCriticalSection( &console_section ); LeaveCriticalSection( &console_section );
} }
TRACE( "NtReadFile failed: %#x\n", status ); TRACE( "NtReadFile failed: %#lx\n", status );
done: done:
EnterCriticalSection( &console_section ); EnterCriticalSection( &console_section );
...@@ -1705,7 +1705,7 @@ done: ...@@ -1705,7 +1705,7 @@ done:
unsigned int h = 0; unsigned int h = 0;
status = NtDeviceIoControlFile( console->server, NULL, NULL, NULL, &io, IOCTL_CONDRV_SETUP_INPUT, status = NtDeviceIoControlFile( console->server, NULL, NULL, NULL, &io, IOCTL_CONDRV_SETUP_INPUT,
&h, sizeof(h), NULL, 0 ); &h, sizeof(h), NULL, 0 );
if (status) ERR( "input restore failed: %#x\n", status ); if (status) ERR( "input restore failed: %#lx\n", status );
} }
CloseHandle( console->input_thread ); CloseHandle( console->input_thread );
console->input_thread = NULL; console->input_thread = NULL;
...@@ -2632,7 +2632,7 @@ static NTSTATUS process_console_ioctls( struct console *console ) ...@@ -2632,7 +2632,7 @@ static NTSTATUS process_console_ioctls( struct console *console )
} }
if (status) if (status)
{ {
TRACE( "failed to get next request: %#x\n", status ); TRACE( "failed to get next request: %#lx\n", status );
return status; return status;
} }
......
...@@ -110,8 +110,8 @@ static const char *debugstr_config( const struct console_config *config ) ...@@ -110,8 +110,8 @@ static const char *debugstr_config( const struct console_config *config )
static const char *debugstr_logfont( const LOGFONTW *lf, unsigned int ft ) static const char *debugstr_logfont( const LOGFONTW *lf, unsigned int ft )
{ {
return wine_dbg_sprintf( "%s%s%s%s lfHeight=%d lfWidth=%d lfEscapement=%d " return wine_dbg_sprintf( "%s%s%s%s lfHeight=%ld lfWidth=%ld lfEscapement=%ld "
"lfOrientation=%d lfWeight=%d lfItalic=%u lfUnderline=%u " "lfOrientation=%ld lfWeight=%ld lfItalic=%u lfUnderline=%u "
"lfStrikeOut=%u lfCharSet=%u lfPitchAndFamily=%u lfFaceName=%s", "lfStrikeOut=%u lfCharSet=%u lfPitchAndFamily=%u lfFaceName=%s",
(ft & RASTER_FONTTYPE) ? "raster" : "", (ft & RASTER_FONTTYPE) ? "raster" : "",
(ft & TRUETYPE_FONTTYPE) ? "truetype" : "", (ft & TRUETYPE_FONTTYPE) ? "truetype" : "",
...@@ -124,8 +124,8 @@ static const char *debugstr_logfont( const LOGFONTW *lf, unsigned int ft ) ...@@ -124,8 +124,8 @@ static const char *debugstr_logfont( const LOGFONTW *lf, unsigned int ft )
static const char *debugstr_textmetric( const TEXTMETRICW *tm, unsigned int ft ) static const char *debugstr_textmetric( const TEXTMETRICW *tm, unsigned int ft )
{ {
return wine_dbg_sprintf( "%s%s%s%s tmHeight=%d tmAscent=%d tmDescent=%d " return wine_dbg_sprintf( "%s%s%s%s tmHeight=%ld tmAscent=%ld tmDescent=%ld "
"tmAveCharWidth=%d tmMaxCharWidth=%d tmWeight=%d " "tmAveCharWidth=%ld tmMaxCharWidth=%ld tmWeight=%ld "
"tmPitchAndFamily=%u tmCharSet=%u", "tmPitchAndFamily=%u tmCharSet=%u",
(ft & RASTER_FONTTYPE) ? "raster" : "", (ft & RASTER_FONTTYPE) ? "raster" : "",
(ft & TRUETYPE_FONTTYPE) ? "truetype" : "", (ft & TRUETYPE_FONTTYPE) ? "truetype" : "",
...@@ -2453,7 +2453,7 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp ...@@ -2453,7 +2453,7 @@ static LRESULT WINAPI window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp
break; break;
case IDS_SCROLL: case IDS_SCROLL:
case IDS_SEARCH: case IDS_SEARCH:
FIXME( "Unhandled yet command: %lx\n", wparam ); FIXME( "Unhandled yet command: %Ix\n", wparam );
break; break;
default: default:
return DefWindowProcW( hwnd, msg, wparam, lparam ); return DefWindowProcW( hwnd, msg, wparam, lparam );
......
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