Commit 6b5a8111 authored by Marcus Meissner's avatar Marcus Meissner Committed by Alexandre Julliard

Some more warnings and bugs fixed.

parent b2e099cf
......@@ -335,7 +335,7 @@ CreateMRUListLazy32A (LPMRUINFO lpmi, DWORD dwParam2, DWORD dwParam3, DWORD dwPa
if (lpmi) {
FIXME (commctrl, "(%lx %lx %lx %lx \"%s\" %lx)\n",
lpmi->dwParam1, lpmi->dwParam2, lpmi->dwParam3,
lpmi->hkeyMain, lpmi->lpszSubKey, lpmi->dwParam6);
(DWORD)lpmi->hkeyMain, lpmi->lpszSubKey, lpmi->dwParam6);
}
/* dummy pointer creation */
......
......@@ -37,6 +37,7 @@
#include "process.h"
#include "task.h"
#include "async.h"
#include "wincon.h"
#include "debug.h"
#include "server/request.h"
......
......@@ -22,7 +22,7 @@ BOOL32 PSDRV_ExtTextOut( DC *dc, INT32 x, INT32 y, UINT32 flags,
SIZE32 sz;
TRACE(psdrv, "(x=%d, y=%d, flags=0x%08x, str='%.*s', count=%d)\n", x, y,
flags, count, str, count);
flags, (int)count, str, count);
strbuf = (char *)HeapAlloc( PSDRV_Heap, 0, count + 1);
if(!strbuf) {
......
......@@ -28,7 +28,7 @@ static void do_int2f_16( CONTEXT *context );
*/
void WINAPI INT_Int2fHandler( CONTEXT *context )
{
TRACE(int,"Subfunction 0x%X\n", AH_reg(context));
TRACE(int,"Subfunction 0x%X\n", AX_reg(context));
switch(AH_reg(context))
{
......@@ -265,9 +265,6 @@ static void do_int2f_16( CONTEXT *context )
case 0x80: /* Release time-slice */
AL_reg(context) = 0;
/* FIXME: We need to do something that lets some other process run
here. */
sleep(0);
break;
case 0x81: /* Begin critical section. */
......
......@@ -252,34 +252,34 @@ int main(int argc, char **argv)
static FILE *file = 0;
HFILE OpenFile32( LPCSTR path, OFSTRUCT *ofs, UINT mode )
HFILE WINAPI OpenFile32( LPCSTR path, OFSTRUCT *ofs, UINT mode )
{
file = *path ? fopen(path, "r") : stdin;
return file ? 1 : HFILE_ERROR;
}
HFILE _lclose32( HFILE hFile )
HFILE WINAPI _lclose32( HFILE hFile )
{
fclose(file);
return 0;
}
LONG _hread32( HFILE hFile, LPVOID buffer, LONG count )
LONG WINAPI _hread32( HFILE hFile, LPVOID buffer, LONG count )
{
return fread(buffer, 1, count, file);
}
HGLOBAL GlobalAlloc( UINT flags, DWORD size )
HGLOBAL WINAPI GlobalAlloc( UINT flags, DWORD size )
{
return (HGLOBAL) malloc(size);
}
LPVOID GlobalLock( HGLOBAL handle )
LPVOID WINAPI GlobalLock( HGLOBAL handle )
{
return (LPVOID) handle;
}
HGLOBAL GlobalFree( HGLOBAL handle )
HGLOBAL WINAPI GlobalFree( HGLOBAL handle )
{
free((VOID*) handle);
return(0);
......@@ -291,12 +291,12 @@ HGLOBAL GlobalFree( HGLOBAL handle )
* Copyright 1993 Yngvi Sigurjonsson (yngvi@hafro.is)
*/
INT lstrcmp(LPCSTR str1,LPCSTR str2)
INT WINAPI lstrcmp(LPCSTR str1,LPCSTR str2)
{
return strcmp( str1, str2 );
}
INT lstrcmpi( LPCSTR str1, LPCSTR str2 )
INT WINAPI lstrcmpi( LPCSTR str1, LPCSTR str2 )
{
INT res;
......@@ -309,19 +309,19 @@ INT lstrcmpi( LPCSTR str1, LPCSTR str2 )
return toupper(*str1) - toupper(*str2);
}
INT lstrlen(LPCSTR str)
INT WINAPI lstrlen(LPCSTR str)
{
return strlen(str);
}
LPSTR lstrcpy32A( LPSTR dst, LPCSTR src )
LPSTR WINAPI lstrcpy32A( LPSTR dst, LPCSTR src )
{
if (!src || !dst) return NULL;
strcpy( dst, src );
return dst;
}
void hmemcpy(LPVOID hpvDest, LPCVOID hpvSource, LONG cbCopy)
void WINAPI hmemcpy(LPVOID hpvDest, LPCVOID hpvSource, LONG cbCopy)
{
memcpy(hpvDest, hpvSource, cbCopy);
}
......
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