krnl386.exe16: Use BOOL type where appropriate (try 2)

Frédéric Delanoy frederic.delanoy at gmail.com
Fri Oct 25 04:26:23 CDT 2013


try 2: do not modify DPMI_CallRMProc return type

Note: VGA_SetMode made to return TRUE on success, for consistency
---
 dlls/krnl386.exe16/dosexe.h           |  2 +-
 dlls/krnl386.exe16/dosmem.c           |  8 +++---
 dlls/krnl386.exe16/global.c           |  2 +-
 dlls/krnl386.exe16/int10.c            |  2 +-
 dlls/krnl386.exe16/int16.c            |  8 +++---
 dlls/krnl386.exe16/int21.c            | 51 ++++++++++++++++++-----------------
 dlls/krnl386.exe16/int2f.c            |  4 +--
 dlls/krnl386.exe16/int31.c            |  6 ++---
 dlls/krnl386.exe16/ioports.c          | 10 +++----
 dlls/krnl386.exe16/kernel.c           | 16 +++++------
 dlls/krnl386.exe16/kernel16_private.h |  2 +-
 dlls/krnl386.exe16/ne_module.c        |  4 +--
 dlls/krnl386.exe16/relay.c            |  8 +++---
 dlls/krnl386.exe16/resource.c         |  2 +-
 dlls/krnl386.exe16/soundblaster.c     | 12 ++++-----
 dlls/krnl386.exe16/task.c             |  2 +-
 dlls/krnl386.exe16/vga.c              | 12 ++++-----
 dlls/krnl386.exe16/vga.h              |  4 +--
 18 files changed, 78 insertions(+), 77 deletions(-)

diff --git a/dlls/krnl386.exe16/dosexe.h b/dlls/krnl386.exe16/dosexe.h
index 0b813e1..304fa22 100644
--- a/dlls/krnl386.exe16/dosexe.h
+++ b/dlls/krnl386.exe16/dosexe.h
@@ -404,7 +404,7 @@ extern void WINAPI DOSVM_Int15Handler(CONTEXT*);
 /* int16.c */
 extern void WINAPI DOSVM_Int16Handler(CONTEXT*);
 extern BOOL DOSVM_Int16ReadChar( BYTE *, BYTE *, CONTEXT * );
-extern int DOSVM_Int16AddChar(BYTE ascii,BYTE scan);
+extern BOOL DOSVM_Int16AddChar(BYTE ascii,BYTE scan);
 
 /* int21.c */
 extern void WINAPI DOSVM_Int21Handler(CONTEXT*);
diff --git a/dlls/krnl386.exe16/dosmem.c b/dlls/krnl386.exe16/dosmem.c
index 2af4505..98fec39 100644
--- a/dlls/krnl386.exe16/dosmem.c
+++ b/dlls/krnl386.exe16/dosmem.c
@@ -300,7 +300,7 @@ static void DOSMEM_Collapse( MCB* mcb )
  */
 BOOL DOSMEM_InitDosMemory(void)
 {
-    static int done;
+    static BOOL done = FALSE;
     static HANDLE hRunOnce;
 
     if (done) return TRUE;
@@ -351,7 +351,7 @@ BOOL DOSMEM_InitDosMemory(void)
             DOSVM_InitSegments();
 
             SetEvent( hRunOnce );
-            done = 1;
+            done = TRUE;
             return ret;
 	}
 	/* someone beat us here... */
@@ -649,7 +649,7 @@ UINT DOSMEM_Available(void)
  */
 BOOL DOSMEM_MapDosLayout(void)
 {
-    static int already_mapped;
+    static BOOL already_mapped = FALSE;
 
     if (!already_mapped)
     {
@@ -666,7 +666,7 @@ BOOL DOSMEM_MapDosLayout(void)
         /* we may now need the actual interrupt stubs, and since we've just moved the
          * interrupt vector table away, we can fill the area with stubs instead... */
         DOSMEM_MakeIsrStubs();
-        already_mapped = 1;
+        already_mapped = TRUE;
     }
     return TRUE;
 }
diff --git a/dlls/krnl386.exe16/global.c b/dlls/krnl386.exe16/global.c
index 699463c..8f9ac02 100644
--- a/dlls/krnl386.exe16/global.c
+++ b/dlls/krnl386.exe16/global.c
@@ -547,7 +547,7 @@ BOOL16 WINAPI GlobalUnlock16(
     GLOBALARENA *pArena = GET_ARENA_PTR(handle);
     if (!VALID_HANDLE(handle)) {
 	WARN("Invalid handle 0x%04x passed to GlobalUnlock16!\n",handle);
-	return 0;
+        return FALSE;
     }
     TRACE("%04x\n", handle );
     if (pArena->lockCount) pArena->lockCount--;
diff --git a/dlls/krnl386.exe16/int10.c b/dlls/krnl386.exe16/int10.c
index dfba761..4b9ab45 100644
--- a/dlls/krnl386.exe16/int10.c
+++ b/dlls/krnl386.exe16/int10.c
@@ -750,7 +750,7 @@ static BOOL INT10_SetVideoMode( BIOSDATA *data, WORD mode )
                ptr->Width, ptr->Height, ptr->Depth,
                clearScreen ? "cleared" : "preserved" );
 
-        if ( VGA_SetMode(mode) )
+        if ( !VGA_SetMode(mode) )
             return FALSE;
     }
 
diff --git a/dlls/krnl386.exe16/int16.c b/dlls/krnl386.exe16/int16.c
index f567ee7..c731472 100644
--- a/dlls/krnl386.exe16/int16.c
+++ b/dlls/krnl386.exe16/int16.c
@@ -160,7 +160,7 @@ void WINAPI DOSVM_Int16Handler( CONTEXT *context )
  * Return value will always be TRUE and returned keystroke will be
  * removed from buffer.
  */
-int DOSVM_Int16ReadChar(BYTE *ascii, BYTE *scan, CONTEXT *waitctx)
+BOOL DOSVM_Int16ReadChar(BYTE *ascii, BYTE *scan, CONTEXT *waitctx)
 {
     BIOSDATA *data = DOSVM_BiosData();
     WORD CurOfs = data->NextKbdCharPtr;
@@ -195,7 +195,7 @@ int DOSVM_Int16ReadChar(BYTE *ascii, BYTE *scan, CONTEXT *waitctx)
     return TRUE;
 }
 
-int DOSVM_Int16AddChar(BYTE ascii,BYTE scan)
+BOOL DOSVM_Int16AddChar(BYTE ascii,BYTE scan)
 {
   BIOSDATA *data = DOSVM_BiosData();
   WORD CurOfs = data->FirstKbdCharPtr;
@@ -204,12 +204,12 @@ int DOSVM_Int16AddChar(BYTE ascii,BYTE scan)
   TRACE("(%02x,%02x)\n",ascii,scan);
   if (NextOfs >= data->KbdBufferEnd) NextOfs = data->KbdBufferStart;
   /* check if buffer is full */
-  if (NextOfs == data->NextKbdCharPtr) return 0;
+  if (NextOfs == data->NextKbdCharPtr) return FALSE;
 
   /* okay, insert character in ring buffer */
   ((BYTE*)data)[CurOfs] = ascii;
   ((BYTE*)data)[CurOfs+1] = scan;
 
   data->FirstKbdCharPtr = NextOfs;
-  return 1;
+  return TRUE;
 }
diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c
index 3652054..53b6537 100644
--- a/dlls/krnl386.exe16/int21.c
+++ b/dlls/krnl386.exe16/int21.c
@@ -3437,7 +3437,7 @@ static int INT21_GetDiskSerialNumber( CONTEXT *context )
  *		INT21_SetDiskSerialNumber
  *
  */
-static int INT21_SetDiskSerialNumber( CONTEXT *context )
+static BOOL INT21_SetDiskSerialNumber( CONTEXT *context )
 {
 #if 0
     BYTE *dataptr = CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx);
@@ -3446,15 +3446,15 @@ static int INT21_SetDiskSerialNumber( CONTEXT *context )
     if (!is_valid_drive(drive))
     {
         SetLastError( ERROR_INVALID_DRIVE );
-        return 0;
+        return FALSE;
     }
 
     DRIVE_SetSerialNumber( drive, *(DWORD *)(dataptr + 2) );
-    return 1;
+    return TRUE;
 #else
     FIXME("Setting drive serial number is no longer supported\n");
     SetLastError( ERROR_NOT_SUPPORTED );
-    return 0;
+    return FALSE;
 #endif
 }
 
@@ -3463,7 +3463,7 @@ static int INT21_SetDiskSerialNumber( CONTEXT *context )
  *		INT21_GetFreeDiskSpace
  *
  */
-static int INT21_GetFreeDiskSpace( CONTEXT *context )
+static BOOL INT21_GetFreeDiskSpace( CONTEXT *context )
 {
     DWORD cluster_sectors, sector_bytes, free_clusters, total_clusters;
     WCHAR root[] = {'A',':','\\',0};
@@ -3473,7 +3473,8 @@ static int INT21_GetFreeDiskSpace( CONTEXT *context )
 
     root[0] += INT21_MapDrive(DL_reg(context));
     if (!GetDiskFreeSpaceW( root, &cluster_sectors, &sector_bytes,
-                            &free_clusters, &total_clusters )) return 0;
+                            &free_clusters, &total_clusters ))
+        return FALSE;
 
     /* Some old win31 apps (Lotus SmartSuite 5.1) crap out if there's too
      * much disk space, so Windows XP seems to apply the following limits:
@@ -3530,19 +3531,19 @@ static int INT21_GetFreeDiskSpace( CONTEXT *context )
     SET_BX( context, free_clusters );
     SET_CX( context, sector_bytes );
     SET_DX( context, total_clusters );
-    return 1;
+    return TRUE;
 }
 
 /******************************************************************
  *		INT21_GetDriveAllocInfo
  *
  */
-static int INT21_GetDriveAllocInfo( CONTEXT *context, BYTE drive )
+static BOOL INT21_GetDriveAllocInfo( CONTEXT *context, BYTE drive )
 {
     INT21_DPB  *dpb;
 
     drive = INT21_MapDrive( drive );
-    if (!INT21_FillDrivePB( drive )) return 0;
+    if (!INT21_FillDrivePB( drive )) return FALSE;
     dpb = &(INT21_GetHeapPointer()->misc_dpb_list[drive]);
     SET_AL( context, dpb->cluster_sectors + 1 );
     SET_CX( context, dpb->sector_bytes );
@@ -3550,7 +3551,7 @@ static int INT21_GetDriveAllocInfo( CONTEXT *context, BYTE drive )
 
     context->SegDs = INT21_GetHeapSelector( context );
     SET_BX( context, offsetof( INT21_HEAP, misc_dpb_list[drive].media_ID ) );
-    return 1;
+    return TRUE;
 }
 
 /***********************************************************************
@@ -3800,7 +3801,7 @@ static const WCHAR *INT21_FindPath; /* will point to current dta->fullPath searc
 /******************************************************************
  *		INT21_FindFirst
  */
-static int INT21_FindFirst( CONTEXT *context )
+static BOOL INT21_FindFirst( CONTEXT *context )
 {
     WCHAR *p, *q;
     const char *path;
@@ -3829,7 +3830,7 @@ static int INT21_FindFirst( CONTEXT *context )
         SetLastError( ERROR_FILE_NOT_FOUND );
         SET_AX( context, ERROR_FILE_NOT_FOUND );
         SET_CFLAG(context);
-        return 0;
+        return FALSE;
     }
     WideCharToMultiByte(CP_OEMCP, 0, maskW, 12, dta->mask, sizeof(dta->mask), NULL, NULL);
 
@@ -3842,7 +3843,7 @@ static int INT21_FindFirst( CONTEXT *context )
     dta->drive = toupperW(dta->fullPath[0]) - 'A';
     dta->count = 0;
     dta->search_attr = CL_reg(context);
-    return 1;
+    return TRUE;
 }
 
 /******************************************************************
@@ -3930,14 +3931,14 @@ static unsigned INT21_FindHelper(LPCWSTR fullPath, unsigned drive, unsigned coun
 /******************************************************************
  *		INT21_FindNext
  */
-static int INT21_FindNext( CONTEXT *context )
+static BOOL INT21_FindNext( CONTEXT *context )
 {
     FINDFILE_DTA *dta = (FINDFILE_DTA *)INT21_GetCurrentDTA(context);
     DWORD attr = dta->search_attr | FA_UNUSED | FA_ARCHIVE | FA_RDONLY;
     WIN32_FIND_DATAW entry;
     int n;
 
-    if (!dta->fullPath) return 0;
+    if (!dta->fullPath) return FALSE;
 
     n = INT21_FindHelper(dta->fullPath, dta->drive, dta->count, 
                          dta->mask, attr, &entry);
@@ -3962,11 +3963,11 @@ static int INT21_FindNext( CONTEXT *context )
             INT21_FindPath = dta->fullPath = NULL;
         }
         dta->count = n;
-        return 1;
+        return TRUE;
     }
     HeapFree( GetProcessHeap(), 0, dta->fullPath );
     INT21_FindPath = dta->fullPath = NULL;
-    return 0;
+    return FALSE;
 }
 
 /* microsoft's programmers should be shot for using CP/M style int21
@@ -3976,7 +3977,7 @@ static int INT21_FindNext( CONTEXT *context )
  *		INT21_FindFirstFCB
  *
  */
-static int INT21_FindFirstFCB( CONTEXT *context )
+static BOOL INT21_FindFirstFCB( CONTEXT *context )
 {
     BYTE *fcb = CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx);
     FINDFILE_FCB *pFCB;
@@ -3986,21 +3987,21 @@ static int INT21_FindFirstFCB( CONTEXT *context )
     if (*fcb == 0xff) pFCB = (FINDFILE_FCB *)(fcb + 7);
     else pFCB = (FINDFILE_FCB *)fcb;
     drive = INT21_MapDrive( pFCB->drive );
-    if (drive == MAX_DOS_DRIVES) return 0;
+    if (drive == MAX_DOS_DRIVES) return FALSE;
 
     p[0] = 'A' + drive;
     pFCB->fullPath = HeapAlloc(GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR));
-    if (!pFCB->fullPath) return 0;
+    if (!pFCB->fullPath) return FALSE;
     GetLongPathNameW(p, pFCB->fullPath, MAX_PATH);
     pFCB->count = 0;
-    return 1;
+    return TRUE;
 }
 
 /******************************************************************
  *		INT21_FindNextFCB
  *
  */
-static int INT21_FindNextFCB( CONTEXT *context )
+static BOOL INT21_FindNextFCB( CONTEXT *context )
 {
     BYTE *fcb = CTX_SEG_OFF_TO_LIN(context, context->SegDs, context->Edx);
     FINDFILE_FCB *pFCB;
@@ -4022,14 +4023,14 @@ static int INT21_FindNextFCB( CONTEXT *context )
         pFCB = (FINDFILE_FCB *)fcb;
     }
 
-    if (!pFCB->fullPath) return 0;
+    if (!pFCB->fullPath) return FALSE;
     n = INT21_FindHelper(pFCB->fullPath, INT21_MapDrive( pFCB->drive ),
                          pFCB->count, pFCB->filename, attr, &entry);
     if (!n)
     {
         HeapFree( GetProcessHeap(), 0, pFCB->fullPath );
         INT21_FindPath = pFCB->fullPath = NULL;
-        return 0;
+        return FALSE;
     }
     pFCB->count += n;
 
@@ -4055,7 +4056,7 @@ static int INT21_FindNextFCB( CONTEXT *context )
     else
         INT21_ToDosFCBFormat( entry.cFileName, nameW );
     WideCharToMultiByte(CP_OEMCP, 0, nameW, 11, ddl->filename, 11, NULL, NULL);
-    return 1;
+    return TRUE;
 }
 
 
diff --git a/dlls/krnl386.exe16/int2f.c b/dlls/krnl386.exe16/int2f.c
index 85b9011..8f50962 100644
--- a/dlls/krnl386.exe16/int2f.c
+++ b/dlls/krnl386.exe16/int2f.c
@@ -480,7 +480,7 @@ static void    MSCDEX_StoreMSF(DWORD frame, BYTE* val)
     val[0] = frame % CDFRAMES_PERSEC; /* frames */
 }
 
-static int is_cdrom( int drive)
+static BOOL is_cdrom( int drive)
 {
     char root[] = "A:\\";
     root[0] += drive;
@@ -549,7 +549,7 @@ static void MSCDEX_Request(BYTE *driver_request, BOOL dorealmode)
     CDROM_SUB_Q_DATA_FORMAT     fmt;
     SUB_Q_CHANNEL_DATA          data;
     DWORD                       br;
-    DWORD                       present = TRUE;
+    BOOL                        present = TRUE;
 
     /* FIXME
      * the following tests are wrong because lots of functions don't require the
diff --git a/dlls/krnl386.exe16/int31.c b/dlls/krnl386.exe16/int31.c
index 5eddcca..d7ccc4d 100644
--- a/dlls/krnl386.exe16/int31.c
+++ b/dlls/krnl386.exe16/int31.c
@@ -702,7 +702,7 @@ FARPROC16 DPMI_AllocInternalRMCB( RMCBPROC proc )
 }
 
 
-static int DPMI_FreeRMCB( DWORD address )
+static BOOL DPMI_FreeRMCB( DWORD address )
 {
     RMCB *CurrRMCB = FirstRMCB;
     RMCB *PrevRMCB = NULL;
@@ -720,9 +720,9 @@ static int DPMI_FreeRMCB( DWORD address )
 	FirstRMCB = CurrRMCB->next;
 	DOSMEM_FreeBlock(PTR_REAL_TO_LIN(SELECTOROF(CurrRMCB->address),OFFSETOF(CurrRMCB->address)));
 	HeapFree(GetProcessHeap(), 0, CurrRMCB);
-	return 0;
+        return FALSE;
     }
-    return 1;
+    return TRUE;
 }
 
 
diff --git a/dlls/krnl386.exe16/ioports.c b/dlls/krnl386.exe16/ioports.c
index a3e7342..00c87ed 100644
--- a/dlls/krnl386.exe16/ioports.c
+++ b/dlls/krnl386.exe16/ioports.c
@@ -93,7 +93,7 @@ static BYTE parport_8255[4] = {0x4f, 0x20, 0xff, 0xff};
 
 static BYTE cmosaddress;
 
-static int cmos_image_initialized = 0;
+static BOOL cmos_image_initialized = FALSE;
 
 static BYTE cmosimage[64] =
 {
@@ -694,7 +694,7 @@ static BOOL IO_pp_outp(int port, DWORD* res)
     for (idx=0;idx<PPDeviceNum ;idx++)
       {
        j = port - PPDeviceList[idx].userbase;
-       if (j <0) return 1;
+       if (j <0) return TRUE;
        switch (j)
          {
          case 0:
@@ -718,7 +718,7 @@ static BOOL IO_pp_outp(int port, DWORD* res)
          case 0x401:
            FIXME("Port %d not accessible for writing with ppdev\n",port);
            FIXME("If this is causing problems, try direct port access\n");
-           return 1;
+           return TRUE;
          default:
            break;
          }
@@ -832,7 +832,7 @@ DWORD DOSVM_inport( int port, int size )
         if (!cmos_image_initialized)
         {
             IO_FixCMOSCheckSum();
-            cmos_image_initialized = 1;
+            cmos_image_initialized = TRUE;
         }
         res = (DWORD)cmosimage[cmosaddress & 0x3f];
         break;
@@ -1075,7 +1075,7 @@ void DOSVM_outport( int port, int size, DWORD value )
         if (!cmos_image_initialized)
         {
             IO_FixCMOSCheckSum();
-            cmos_image_initialized = 1;
+            cmos_image_initialized = TRUE;
         }
         cmosimage[cmosaddress & 0x3f] = (BYTE)value;
         break;
diff --git a/dlls/krnl386.exe16/kernel.c b/dlls/krnl386.exe16/kernel.c
index e879507..a9aab54 100644
--- a/dlls/krnl386.exe16/kernel.c
+++ b/dlls/krnl386.exe16/kernel.c
@@ -90,11 +90,11 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
 BOOL WINAPI KERNEL_DllEntryPoint( DWORD reasion, HINSTANCE16 inst, WORD ds,
                                   WORD heap, DWORD reserved1, WORD reserved2 )
 {
-    static int done;
+    static BOOL done = FALSE;
 
     /* the entry point can be called multiple times */
     if (done) return TRUE;
-    done = 1;
+    done = TRUE;
 
     /* create the shared heap for broken win95 native dlls */
     HeapCreate( HEAP_SHARED, 0, 0 );
@@ -469,12 +469,12 @@ SEGPTR WINAPI lstrcatn16( SEGPTR dst, LPCSTR src, INT16 n )
  */
 BOOL16 WINAPI GetWinDebugInfo16(WINDEBUGINFO16 *lpwdi, UINT16 flags)
 {
-    FIXME("(%8lx,%d): stub returning 0\n",
+    FIXME("(%8lx,%d): stub returning FALSE\n",
           (unsigned long)lpwdi, flags);
-    /* 0 means not in debugging mode/version */
+    /* FALSE means not in debugging mode/version */
     /* Can this type of debugging be used in wine ? */
     /* Constants: WDI_OPTIONS WDI_FILTER WDI_ALLOCBREAK */
-    return 0;
+    return FALSE;
 }
 
 /***********************************************************************
@@ -482,11 +482,11 @@ BOOL16 WINAPI GetWinDebugInfo16(WINDEBUGINFO16 *lpwdi, UINT16 flags)
  */
 BOOL16 WINAPI SetWinDebugInfo16(WINDEBUGINFO16 *lpwdi)
 {
-    FIXME("(%8lx): stub returning 0\n", (unsigned long)lpwdi);
-    /* 0 means not in debugging mode/version */
+    FIXME("(%8lx): stub returning FALSE\n", (unsigned long)lpwdi);
+    /* FALSE means not in debugging mode/version */
     /* Can this type of debugging be used in wine ? */
     /* Constants: WDI_OPTIONS WDI_FILTER WDI_ALLOCBREAK */
-    return 0;
+    return FALSE;
 }
 
 /***********************************************************************
diff --git a/dlls/krnl386.exe16/kernel16_private.h b/dlls/krnl386.exe16/kernel16_private.h
index db33af6..9fc9e5b 100644
--- a/dlls/krnl386.exe16/kernel16_private.h
+++ b/dlls/krnl386.exe16/kernel16_private.h
@@ -242,7 +242,7 @@ extern int relay_call_from_16( void *entry_point, unsigned char *args16, CONTEXT
 /* snoop16.c */
 extern void SNOOP16_RegisterDLL(HMODULE16,LPCSTR);
 extern FARPROC16 SNOOP16_GetProcAddress16(HMODULE16,DWORD,FARPROC16);
-extern int SNOOP16_ShowDebugmsgSnoop(const char *dll,int ord,const char *fname);
+extern BOOL SNOOP16_ShowDebugmsgSnoop(const char *dll,int ord,const char *fname);
 
 /* syslevel.c */
 extern VOID SYSLEVEL_CheckNotLevel( INT level );
diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c
index 2fd367a..a6f3eb4 100644
--- a/dlls/krnl386.exe16/ne_module.c
+++ b/dlls/krnl386.exe16/ne_module.c
@@ -105,7 +105,7 @@ static inline void patch_code_segment( NE_MODULE *pModule )
 /***********************************************************************
  *           contains_path
  */
-static inline int contains_path( LPCSTR name )
+static inline BOOL contains_path( LPCSTR name )
 {
     return ((*name && (name[1] == ':')) || strchr(name, '/') || strchr(name, '\\'));
 }
@@ -485,7 +485,7 @@ BOOL16 NE_SetEntryPoint( HMODULE16 hModule, WORD ordinal, WORD offset )
     while ((ordinal < bundle->first + 1) || (ordinal > bundle->last))
     {
         bundle = (ET_BUNDLE *)((BYTE *)pModule + bundle->next);
-        if (!(bundle->next)) return 0;
+        if (!(bundle->next)) return FALSE;
     }
 
     entry = (ET_ENTRY *)((BYTE *)bundle+6);
diff --git a/dlls/krnl386.exe16/relay.c b/dlls/krnl386.exe16/relay.c
index dcafe17..f399b9d 100644
--- a/dlls/krnl386.exe16/relay.c
+++ b/dlls/krnl386.exe16/relay.c
@@ -48,7 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(relay);
  * Memory block for temporary 16-bit stacks used with relay calls.
  */
 typedef struct {
-    DWORD inuse;          /* non-zero if stack block is in use */
+    BOOL inuse;           /* TRUE if stack block is in use */
     DWORD eip;            /* saved ip */
     DWORD seg_cs;         /* saved cs */
     DWORD esp;            /* saved sp */
@@ -232,7 +232,7 @@ static BOOL RELAY_ShowDebugmsgRelay(const char *module, int ordinal, const char
  * Simple function to decide if a particular debugging message is
  * wanted.
  */
-int SNOOP16_ShowDebugmsgSnoop(const char *module, int ordinal, const char *func)
+BOOL SNOOP16_ShowDebugmsgSnoop(const char *module, int ordinal, const char *func)
 {
     if (debug_snoop_excludelist && check_list( module, ordinal, func, debug_snoop_excludelist ))
         return FALSE;
@@ -633,7 +633,7 @@ static void RELAY_MakeShortContext( CONTEXT *context )
     if (offset >= DOSVM_RELAY_DATA_SIZE)
         ERR( "Too many nested interrupts!\n" );
 
-    stack->inuse = 1;
+    stack->inuse = TRUE;
     stack->eip = context->Eip;
     stack->seg_cs = context->SegCs;
     stack->esp = context->Esp;
@@ -705,7 +705,7 @@ void DOSVM_RelayHandler( CONTEXT *context )
         stack->stack_top != RELAY_MAGIC)
         ERR( "Stack corrupted!\n" );
 
-    stack->inuse = 0;
+    stack->inuse = FALSE;
 }
 
 
diff --git a/dlls/krnl386.exe16/resource.c b/dlls/krnl386.exe16/resource.c
index 3292990..9b5c2c4 100644
--- a/dlls/krnl386.exe16/resource.c
+++ b/dlls/krnl386.exe16/resource.c
@@ -1136,7 +1136,7 @@ BOOL16 WINAPI FreeResource16( HGLOBAL16 handle )
                         pNameInfo->handle = 0;
                         pNameInfo->flags &= ~NE_SEGFLAGS_LOADED;
                     }
-                    return 0;
+                    return FALSE;
                 }
                 pNameInfo++;
             }
diff --git a/dlls/krnl386.exe16/soundblaster.c b/dlls/krnl386.exe16/soundblaster.c
index 68700c3..ca62732 100644
--- a/dlls/krnl386.exe16/soundblaster.c
+++ b/dlls/krnl386.exe16/soundblaster.c
@@ -126,7 +126,7 @@ static BOOL SB_Init(void)
         result = DirectSoundCreate(NULL,&lpdsound,NULL);
         if (result != DS_OK) {
             ERR("Unable to initialize Sound Subsystem err = %x !\n",result);
-            return 0;
+            return FALSE;
         }
 
         /* FIXME: To uncomment when :
@@ -136,7 +136,7 @@ static BOOL SB_Init(void)
         result = IDirectSound_SetCooperativeLevel(lpdsound,vga_hwnd,DSSCL_EXCLUSIVE|DSSCL_PRIORITY);
         if (result != DS_OK) {
             ERR("Can't set cooperative level !\n");
-            return 0;
+            return FALSE;
         }
         */
 
@@ -156,13 +156,13 @@ static BOOL SB_Init(void)
         result = IDirectSound_CreateSoundBuffer(lpdsound,&buf_desc,&lpdsbuf,NULL);
         if (result != DS_OK) {
             ERR("Can't create sound buffer !\n");
-            return 0;
+            return FALSE;
         }
 
         result = IDirectSoundBuffer_Play(lpdsbuf,0, 0, DSBPLAY_LOOPING);
         if (result != DS_OK) {
             ERR("Can't start playing !\n");
-            return 0;
+            return FALSE;
         }
 
         buf_off = 0;
@@ -171,10 +171,10 @@ static BOOL SB_Init(void)
         TRACE("thread\n");
         if (!SB_Thread) {
             ERR("Can't create thread !\n");
-            return 0;
+            return FALSE;
         }
     }
-    return 1;
+    return TRUE;
 }
 
 static void SB_Reset(void)
diff --git a/dlls/krnl386.exe16/task.c b/dlls/krnl386.exe16/task.c
index f3fc56d..30aa866 100644
--- a/dlls/krnl386.exe16/task.c
+++ b/dlls/krnl386.exe16/task.c
@@ -226,7 +226,7 @@ static BOOL TASK_FreeThunk( SEGPTR thunk )
     THUNKS *pThunk;
     WORD sel, base;
 
-    if (!(pTask = TASK_GetCurrent())) return 0;
+    if (!(pTask = TASK_GetCurrent())) return FALSE;
     sel = pTask->hCSAlias;
     pThunk = (THUNKS *)pTask->thunks;
     base = (char *)pThunk - (char *)pTask;
diff --git a/dlls/krnl386.exe16/vga.c b/dlls/krnl386.exe16/vga.c
index f1b632e..2a71b88 100644
--- a/dlls/krnl386.exe16/vga.c
+++ b/dlls/krnl386.exe16/vga.c
@@ -954,7 +954,7 @@ static int VGA_SetGraphicMode(WORD mode)
     return par.ret;
 }
 
-int VGA_SetMode(WORD mode)
+BOOL VGA_SetMode(WORD mode)
 {
     const VGA_MODE *ModeInfo;
     /* get info on VGA mode & set appropriately */
@@ -980,17 +980,17 @@ int VGA_SetMode(WORD mode)
     {
        return VGA_SetGraphicMode(mode);
     }
-    return 0; /* assume all good & return zero */
+    return TRUE; /* assume all good & return TRUE */
 }
 
-int VGA_GetMode(unsigned*Height,unsigned*Width,unsigned*Depth)
+BOOL VGA_GetMode(unsigned*Height,unsigned*Width,unsigned*Depth)
 {
-    if (!lpddraw) return 1;
-    if (!lpddsurf) return 1;
+    if (!lpddraw) return TRUE;
+    if (!lpddsurf) return TRUE;
     if (Height) *Height=sdesc.dwHeight;
     if (Width) *Width=sdesc.dwWidth;
     if (Depth) *Depth=sdesc.ddpfPixelFormat.u1.dwRGBBitCount;
-    return 0;
+    return FALSE;
 }
 
 static void VGA_Exit(void)
diff --git a/dlls/krnl386.exe16/vga.h b/dlls/krnl386.exe16/vga.h
index 5d79567..305a4a9 100644
--- a/dlls/krnl386.exe16/vga.h
+++ b/dlls/krnl386.exe16/vga.h
@@ -52,10 +52,10 @@ extern const VGA_MODE VGA_modelist[];
 
 /* all vga modes */
 const VGA_MODE *VGA_GetModeInfo(WORD mode);
-int VGA_SetMode(WORD mode);
+BOOL VGA_SetMode(WORD mode);
 
 /* graphics mode */
-int VGA_GetMode(unsigned*Height,unsigned*Width,unsigned*Depth);
+BOOL VGA_GetMode(unsigned*Height,unsigned*Width,unsigned*Depth);
 void VGA_SetPalette(PALETTEENTRY*pal,int start,int len);
 void VGA_SetColor16(int reg,int color);
 char VGA_GetColor16(int reg);
-- 
1.8.4.1




More information about the wine-patches mailing list