Skip to content

W
wine-cw
Commit 308e04fc authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

Compile the kernel dll with -DSTRICT.

parent 461708c1
Show whitespace changes
Inline Side-by-side
Showing with 50 additions and 51 deletions
dlls/kernel/Makefile.in
View file @ 308e04fc
EXTRADEFS = -DWINE_NO_STRICT
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
......
dlls/kernel/comm.c
View file @ 308e04fc
......@@ -589,10 +589,10 @@ BOOL WINAPI EscapeCommFunction(
int fd,direct=FALSE,result=FALSE;
struct termios port;
TRACE("handle %d, function=%d\n", handle, nFunction);
TRACE("handle %p, function=%d\n", handle, nFunction);
fd = FILE_GetUnixHandle( handle, GENERIC_READ );
if(fd<0) {
FIXME("handle %d not found.\n",handle);
FIXME("handle %p not found.\n",handle);
return FALSE;
}
......@@ -663,7 +663,7 @@ BOOL WINAPI EscapeCommFunction(
break;
#endif
default:
WARN("(handle=%d,nFunction=%d): Unknown function\n",
WARN("(handle=%p,nFunction=%d): Unknown function\n",
handle, nFunction);
break;
}
......@@ -705,11 +705,11 @@ BOOL WINAPI PurgeComm(
{
int fd;
TRACE("handle %d, flags %lx\n", handle, flags);
TRACE("handle %p, flags %lx\n", handle, flags);
fd = FILE_GetUnixHandle( handle, GENERIC_READ );
if(fd<0) {
FIXME("no handle %d found\n",handle);
FIXME("no handle %p found\n",handle);
return FALSE;
}
......@@ -751,7 +751,7 @@ BOOL WINAPI ClearCommError(
fd=FILE_GetUnixHandle( handle, GENERIC_READ );
if(0>fd)
{
FIXME("no handle %d found\n",handle);
FIXME("no handle %p found\n",handle);
return FALSE;
}
......@@ -778,7 +778,7 @@ BOOL WINAPI ClearCommError(
WARN("ioctl returned error\n");
#endif
TRACE("handle %d cbInQue = %ld cbOutQue = %ld\n",
TRACE("handle %p cbInQue = %ld cbOutQue = %ld\n",
handle, lpStat->cbInQue, lpStat->cbOutQue);
}
......@@ -814,7 +814,7 @@ BOOL WINAPI SetupComm(
FIXME("insize %ld outsize %ld unimplemented stub\n", insize, outsize);
fd=FILE_GetUnixHandle( handle, GENERIC_READ );
if(0>fd) {
FIXME("handle %d not found?\n",handle);
FIXME("handle %p not found?\n",handle);
return FALSE;
}
close(fd);
......@@ -837,7 +837,7 @@ BOOL WINAPI GetCommMask(
{
BOOL ret;
TRACE("handle %d, mask %p\n", handle, evtmask);
TRACE("handle %p, mask %p\n", handle, evtmask);
SERVER_START_REQ( get_serial_info )
{
......@@ -868,7 +868,7 @@ BOOL WINAPI SetCommMask(
{
BOOL ret;
TRACE("handle %d, mask %lx\n", handle, evtmask);
TRACE("handle %p, mask %lx\n", handle, evtmask);
SERVER_START_REQ( set_serial_info )
{
......@@ -899,7 +899,7 @@ BOOL WINAPI SetCommState(
struct termios port;
int fd, bytesize, stopbits;
TRACE("handle %d, ptr %p\n", handle, lpdcb);
TRACE("handle %p, ptr %p\n", handle, lpdcb);
TRACE("bytesize %d baudrate %ld fParity %d Parity %d stopbits %d\n",
lpdcb->ByteSize,lpdcb->BaudRate,lpdcb->fParity, lpdcb->Parity,
(lpdcb->StopBits == ONESTOPBIT)?1:
......@@ -909,7 +909,7 @@ BOOL WINAPI SetCommState(
fd = FILE_GetUnixHandle( handle, GENERIC_READ );
if (fd < 0) {
FIXME("no handle %d found\n",handle);
FIXME("no handle %p found\n",handle);
return FALSE;
}
......@@ -1250,7 +1250,7 @@ BOOL WINAPI GetCommState(
struct termios port;
int fd,speed;
TRACE("handle %d, ptr %p\n", handle, lpdcb);
TRACE("handle %p, ptr %p\n", handle, lpdcb);
fd = FILE_GetUnixHandle( handle, GENERIC_READ );
if (fd < 0)
......@@ -1457,7 +1457,7 @@ BOOL WINAPI TransmitCommChar(
BOOL r = FALSE;
int fd;
WARN("(%x,'%c') not perfect!\n",hComm,chTransmit);
WARN("(%p,'%c') not perfect!\n",hComm,chTransmit);
fd = FILE_GetUnixHandle( hComm, GENERIC_READ );
if ( fd < 0 )
......@@ -1488,7 +1488,7 @@ BOOL WINAPI GetCommTimeouts(
{
BOOL ret;
TRACE("(%x,%p)\n",hComm,lptimeouts);
TRACE("(%p,%p)\n",hComm,lptimeouts);
if(!lptimeouts)
{
......@@ -1536,7 +1536,7 @@ BOOL WINAPI SetCommTimeouts(
int fd;
struct termios tios;
TRACE("(%x,%p)\n",hComm,lptimeouts);
TRACE("(%p,%p)\n",hComm,lptimeouts);
if(!lptimeouts)
{
......@@ -1561,7 +1561,7 @@ BOOL WINAPI SetCommTimeouts(
/* FIXME: move this stuff to the server */
fd = FILE_GetUnixHandle( hComm, GENERIC_READ );
if (fd < 0) {
FIXME("no fd for handle = %0x!.\n",hComm);
FIXME("no fd for handle = %p!.\n",hComm);
return FALSE;
}
......@@ -1750,7 +1750,7 @@ BOOL WINAPI WaitCommEvent(
OVERLAPPED ov;
int ret;
TRACE("(%x %p %p )\n",hFile, lpdwEvents,lpOverlapped);
TRACE("(%p %p %p )\n",hFile, lpdwEvents,lpOverlapped);
if(lpOverlapped)
return COMM_WaitCommEvent(hFile, lpdwEvents, lpOverlapped);
......@@ -1789,7 +1789,7 @@ BOOL WINAPI GetCommProperties(
HANDLE hFile, /* [in] handle of the comm port */
LPCOMMPROP lpCommProp) /* [out] pointer to struct to be filled */
{
FIXME("(%d %p )\n",hFile,lpCommProp);
FIXME("(%p %p )\n",hFile,lpCommProp);
if(!lpCommProp)
return FALSE;
......@@ -1864,7 +1864,7 @@ BOOL WINAPI CommConfigDialogA(
HMODULE hConfigModule;
BOOL r;
TRACE("(%p %x %p)\n",lpszDevice, hWnd, lpCommConfig);
TRACE("(%p %p %p)\n",lpszDevice, hWnd, lpCommConfig);
hConfigModule = LoadLibraryA(lpszSerialUI);
if(!hConfigModule)
......@@ -1925,7 +1925,7 @@ BOOL WINAPI GetCommConfig(
{
BOOL r;
TRACE("(%x %p)\n",hFile,lpCommConfig);
TRACE("(%p %p)\n",hFile,lpCommConfig);
if(lpCommConfig == NULL)
return FALSE;
......@@ -1960,7 +1960,7 @@ BOOL WINAPI SetCommConfig(
LPCOMMCONFIG lpCommConfig, /* [in] The desired configuration. */
DWORD dwSize) /* [in] size of the lpCommConfig struct */
{
TRACE("(%x %p)\n",hFile,lpCommConfig);
TRACE("(%p %p)\n",hFile,lpCommConfig);
return SetCommState(hFile,&lpCommConfig->dcb);
}
......
dlls/kernel/console.c
View file @ 308e04fc
......@@ -190,7 +190,7 @@ BOOL WINAPI WriteConsoleInputW( HANDLE handle, const INPUT_RECORD *buffer,
{
BOOL ret;
TRACE("(%d,%p,%ld,%p)\n", handle, buffer, count, written);
TRACE("(%p,%p,%ld,%p)\n", handle, buffer, count, written);
if (written) *written = 0;
SERVER_START_REQ( write_console_input )
......@@ -253,7 +253,7 @@ BOOL WINAPI WriteConsoleOutputW( HANDLE hConsoleOutput, const CHAR_INFO *lpBuffe
int width, height, y;
BOOL ret = TRUE;
TRACE("(%x,%p,(%d,%d),(%d,%d),(%d,%dx%d,%d)\n",
TRACE("(%p,%p,(%d,%d),(%d,%d),(%d,%dx%d,%d)\n",
hConsoleOutput, lpBuffer, size.X, size.Y, coord.X, coord.Y,
region->Left, region->Top, region->Right, region->Bottom);
......@@ -307,7 +307,7 @@ BOOL WINAPI WriteConsoleOutputCharacterA( HANDLE hConsoleOutput, LPCSTR str, DWO
LPWSTR strW;
DWORD lenW;
TRACE("(%d,%s,%ld,%dx%d,%p)\n", hConsoleOutput,
TRACE("(%p,%s,%ld,%dx%d,%p)\n", hConsoleOutput,
debugstr_an(str, length), length, coord.X, coord.Y, lpNumCharsWritten);
lenW = MultiByteToWideChar( GetConsoleOutputCP(), 0, str, length, NULL, 0 );
......@@ -344,7 +344,7 @@ BOOL WINAPI WriteConsoleOutputAttribute( HANDLE hConsoleOutput, CONST WORD *attr
{
BOOL ret;
TRACE("(%d,%p,%ld,%dx%d,%p)\n", hConsoleOutput,attr,length,coord.X,coord.Y,lpNumAttrsWritten);
TRACE("(%p,%p,%ld,%dx%d,%p)\n", hConsoleOutput,attr,length,coord.X,coord.Y,lpNumAttrsWritten);
SERVER_START_REQ( write_console_output )
{
......@@ -407,7 +407,7 @@ BOOL WINAPI FillConsoleOutputCharacterW( HANDLE hConsoleOutput, WCHAR ch, DWORD
{
BOOL ret;
TRACE("(%d,%s,%ld,(%dx%d),%p)\n",
TRACE("(%p,%s,%ld,(%dx%d),%p)\n",
hConsoleOutput, debugstr_wn(&ch, 1), length, coord.X, coord.Y, lpNumCharsWritten);
SERVER_START_REQ( fill_console_output )
......@@ -448,7 +448,7 @@ BOOL WINAPI FillConsoleOutputAttribute( HANDLE hConsoleOutput, WORD attr, DWORD
{
BOOL ret;
TRACE("(%d,%d,%ld,(%dx%d),%p)\n",
TRACE("(%p,%d,%ld,(%dx%d),%p)\n",
hConsoleOutput, attr, length, coord.X, coord.Y, lpNumAttrsWritten);
SERVER_START_REQ( fill_console_output )
......@@ -503,7 +503,7 @@ BOOL WINAPI ReadConsoleOutputCharacterW( HANDLE hConsoleOutput, LPWSTR buffer, D
{
BOOL ret;
TRACE( "(%d,%p,%ld,%dx%d,%p)\n", hConsoleOutput, buffer, count, coord.X, coord.Y, read_count );
TRACE( "(%p,%p,%ld,%dx%d,%p)\n", hConsoleOutput, buffer, count, coord.X, coord.Y, read_count );
SERVER_START_REQ( read_console_output )
{
......@@ -531,7 +531,7 @@ BOOL WINAPI ReadConsoleOutputAttribute(HANDLE hConsoleOutput, LPWORD lpAttribute
{
BOOL ret;
TRACE("(%d,%p,%ld,%dx%d,%p)\n",
TRACE("(%p,%p,%ld,%dx%d,%p)\n",
hConsoleOutput, lpAttribute, length, coord.X, coord.Y, read_count);
SERVER_START_REQ( read_console_output )
......@@ -855,7 +855,7 @@ static BOOL start_console_renderer_helper(const char* appname, STARTUPINFOA*
PROCESS_INFORMATION pi;
/* FIXME: use dynamic allocation for most of the buffers below */
ret = snprintf(buffer, sizeof(buffer), "%s --use-event=%d", appname, hEvent);
ret = snprintf(buffer, sizeof(buffer), "%s --use-event=%d", appname, (INT)hEvent);
if ((ret > -1) && (ret < sizeof(buffer)) &&
CreateProcessA(NULL, buffer, NULL, NULL, TRUE, DETACHED_PROCESS,
NULL, NULL, si, &pi))
......@@ -1039,7 +1039,7 @@ BOOL WINAPI ReadConsoleW(HANDLE hConsoleInput, LPVOID lpBuffer,
LPWSTR xbuf = (LPWSTR)lpBuffer;
DWORD mode;
TRACE("(%d,%p,%ld,%p,%p)\n",
TRACE("(%p,%p,%ld,%p,%p)\n",
hConsoleInput, lpBuffer, nNumberOfCharsToRead, lpNumberOfCharsRead, lpReserved);
if (!GetConsoleMode(hConsoleInput, &mode))
......@@ -1137,7 +1137,7 @@ BOOL WINAPI WriteConsoleOutputCharacterW( HANDLE hConsoleOutput, LPCWSTR str, DW
{
BOOL ret;
TRACE("(%d,%s,%ld,%dx%d,%p)\n", hConsoleOutput,
TRACE("(%p,%s,%ld,%dx%d,%p)\n", hConsoleOutput,
debugstr_wn(str, length), length, coord.X, coord.Y, lpNumCharsWritten);
SERVER_START_REQ( write_console_output )
......@@ -1503,7 +1503,7 @@ BOOL WINAPI SetConsoleActiveScreenBuffer(HANDLE hConsoleOutput)
{
BOOL ret;
TRACE("(%x)\n", hConsoleOutput);
TRACE("(%p)\n", hConsoleOutput);
SERVER_START_REQ( set_console_input_info )
{
......@@ -1568,7 +1568,7 @@ BOOL WINAPI SetConsoleMode(HANDLE hcon, DWORD mode)
* empty the S_EditString buffer
*/
TRACE("(%x,%lx) retval == %d\n", hcon, mode, ret);
TRACE("(%p,%lx) retval == %d\n", hcon, mode, ret);
return ret;
}
......@@ -1697,7 +1697,7 @@ BOOL WINAPI WriteConsoleW(HANDLE hConsoleOutput, LPCVOID lpBuffer, DWORD nNumber
CONSOLE_SCREEN_BUFFER_INFO csbi;
int k, first = 0;
TRACE("%d %s %ld %p %p\n",
TRACE("%p %s %ld %p %p\n",
hConsoleOutput, debugstr_wn(lpBuffer, nNumberOfCharsToWrite),
nNumberOfCharsToWrite, lpNumberOfCharsWritten, lpReserved);
......@@ -1814,7 +1814,7 @@ BOOL WINAPI SetConsoleCursorPosition(HANDLE hcon, COORD pos)
int do_move = 0;
int w, h;
TRACE("%x %d %d\n", hcon, pos.X, pos.Y);
TRACE("%p %d %d\n", hcon, pos.X, pos.Y);
SERVER_START_REQ(set_console_output_info)
{
......@@ -2072,14 +2072,14 @@ BOOL WINAPI ScrollConsoleScreenBufferW(HANDLE hConsoleOutput, LPSMALL_RECT lpScr
BOOL inside;
if (lpClipRect)
TRACE("(%d,(%d,%d-%d,%d),(%d,%d-%d,%d),%d-%d,%p)\n", hConsoleOutput,
TRACE("(%p,(%d,%d-%d,%d),(%d,%d-%d,%d),%d-%d,%p)\n", hConsoleOutput,
lpScrollRect->Left, lpScrollRect->Top,
lpScrollRect->Right, lpScrollRect->Bottom,
lpClipRect->Left, lpClipRect->Top,
lpClipRect->Right, lpClipRect->Bottom,
dwDestOrigin.X, dwDestOrigin.Y, lpFill);
else
TRACE("(%d,(%d,%d-%d,%d),(nil),%d-%d,%p)\n", hConsoleOutput,
TRACE("(%p,(%d,%d-%d,%d),(nil),%d-%d,%p)\n", hConsoleOutput,
lpScrollRect->Left, lpScrollRect->Top,
lpScrollRect->Right, lpScrollRect->Bottom,
dwDestOrigin.X, dwDestOrigin.Y, lpFill);
......
dlls/kernel/debugger.c
View file @ 308e04fc
......@@ -282,7 +282,7 @@ BOOL WINAPI DebugBreakProcess(HANDLE hProc)
{
BOOL ret, self;
TRACE("(%08x)\n", hProc);
TRACE("(%p)\n", hProc);
SERVER_START_REQ( debug_break )
{
......
dlls/kernel/sync.c
View file @ 308e04fc
......@@ -696,7 +696,7 @@ BOOL WINAPI ConnectNamedPipe(HANDLE hPipe, LPOVERLAPPED overlapped)
OVERLAPPED ov;
BOOL ret;
TRACE("(%d,%p)\n",hPipe, overlapped);
TRACE("(%p,%p)\n",hPipe, overlapped);
if(overlapped)
return SYNC_ConnectNamedPipe(hPipe,overlapped);
......@@ -728,7 +728,7 @@ BOOL WINAPI DisconnectNamedPipe(HANDLE hPipe)
{
BOOL ret;
TRACE("(%d)\n",hPipe);
TRACE("(%p)\n",hPipe);
SERVER_START_REQ( disconnect_named_pipe )
{
......@@ -747,7 +747,7 @@ BOOL WINAPI TransactNamedPipe(
HANDLE hPipe, LPVOID lpInput, DWORD dwInputSize, LPVOID lpOutput,
DWORD dwOutputSize, LPDWORD lpBytesRead, LPOVERLAPPED lpOverlapped)
{
FIXME("%d %p %ld %p %ld %p %p\n",
FIXME("%p %p %ld %p %ld %p %p\n",
hPipe, lpInput, dwInputSize, lpOutput,
dwOutputSize, lpBytesRead, lpOverlapped);
if(lpBytesRead)
......@@ -764,7 +764,7 @@ BOOL WINAPI GetNamedPipeInfo(
{
BOOL ret;
TRACE("%d %p %p %p %p\n", hNamedPipe, lpFlags,
TRACE("%p %p %p %p %p\n", hNamedPipe, lpFlags,
lpOutputBufferSize, lpInputBufferSize, lpMaxInstances);
SERVER_START_REQ( get_named_pipe_info )
......@@ -789,7 +789,7 @@ BOOL WINAPI GetNamedPipeHandleStateA(
LPDWORD lpMaxCollectionCount, LPDWORD lpCollectDataTimeout,
LPSTR lpUsername, DWORD nUsernameMaxSize)
{
FIXME("%d %p %p %p %p %p %ld\n",
FIXME("%p %p %p %p %p %p %ld\n",
hNamedPipe, lpState, lpCurInstances,
lpMaxCollectionCount, lpCollectDataTimeout,
lpUsername, nUsernameMaxSize);
......@@ -805,7 +805,7 @@ BOOL WINAPI GetNamedPipeHandleStateW(
LPDWORD lpMaxCollectionCount, LPDWORD lpCollectDataTimeout,
LPWSTR lpUsername, DWORD nUsernameMaxSize)
{
FIXME("%d %p %p %p %p %p %ld\n",
FIXME("%p %p %p %p %p %p %ld\n",
hNamedPipe, lpState, lpCurInstances,
lpMaxCollectionCount, lpCollectDataTimeout,
lpUsername, nUsernameMaxSize);
......@@ -820,7 +820,7 @@ BOOL WINAPI SetNamedPipeHandleState(
HANDLE hNamedPipe, LPDWORD lpMode, LPDWORD lpMaxCollectionCount,
LPDWORD lpCollectDataTimeout)
{
FIXME("%d %p %p %p\n",
FIXME("%p %p %p %p\n",
hNamedPipe, lpMode, lpMaxCollectionCount, lpCollectDataTimeout);
return FALSE;
}
......
dlls/kernel/thunk.c
View file @ 308e04fc
......@@ -2013,7 +2013,7 @@ void WINAPI HouseCleanLogicallyDeadHandles(void)
*/
BOOL WINAPI _KERNEL32_100(HANDLE threadid,DWORD exitcode,DWORD x)
{
FIXME("(%d,%ld,0x%08lx): stub\n",threadid,exitcode,x);
FIXME("(%p,%ld,0x%08lx): stub\n",threadid,exitcode,x);
return TRUE;
}
......
dlls/kernel/wowthunk.c
View file @ 308e04fc
......@@ -239,7 +239,7 @@ HANDLE WINAPI K32WOWHandle32( WORD handle, WOW_HANDLE_TYPE type )
WORD WINAPI K32WOWHandle16( HANDLE handle, WOW_HANDLE_TYPE type )
{
if ( HIWORD(handle ) )
ERR( "handle 0x%08x of type %d has non-zero HIWORD\n", handle, type );
ERR( "handle %p of type %d has non-zero HIWORD\n", handle, type );
switch ( type )
{
......@@ -266,7 +266,7 @@ WORD WINAPI K32WOWHandle16( HANDLE handle, WOW_HANDLE_TYPE type )
return THREAD_IdToTEB((DWORD)handle)->htask16;
default:
ERR( "handle 0x%08x of unknown type %d\n", handle, type );
ERR( "handle %p of unknown type %d\n", handle, type );
return LOWORD(handle);
}
}
......
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