=?UTF-8?Q?Fr=C3=A9d=C3=A9ric=20Delanoy=20?=: krnl386.exe16: Use BOOL type where appropriate.
Alexandre Julliard
julliard at winehq.org
Thu Mar 13 14:40:34 CDT 2014
Module: wine
Branch: master
Commit: 03cec9d886938aafbc33b805e6197327f0709fca
URL: http://source.winehq.org/git/wine.git/?a=commit;h=03cec9d886938aafbc33b805e6197327f0709fca
Author: Frédéric Delanoy <frederic.delanoy at gmail.com>
Date: Thu Mar 13 08:58:47 2014 +0100
krnl386.exe16: Use BOOL type where appropriate.
---
dlls/krnl386.exe16/int21.c | 4 ++--
dlls/krnl386.exe16/int31.c | 6 +++---
dlls/krnl386.exe16/soundblaster.c | 14 +++++++-------
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c
index 53b6537..45a8149 100644
--- a/dlls/krnl386.exe16/int21.c
+++ b/dlls/krnl386.exe16/int21.c
@@ -2737,7 +2737,7 @@ static void INT21_IoctlHPScanHandler( CONTEXT *context )
static void INT21_Ioctl_Char( CONTEXT *context )
{
int status;
- int IsConsoleIOHandle = 0;
+ BOOL IsConsoleIOHandle = FALSE;
IO_STATUS_BLOCK io;
FILE_INTERNAL_INFORMATION info;
HANDLE handle = DosFileHandleToWin32Handle(BX_reg(context));
@@ -2746,7 +2746,7 @@ static void INT21_Ioctl_Char( CONTEXT *context )
if (status)
{
if( VerifyConsoleIoHandle( handle))
- IsConsoleIOHandle = 1;
+ IsConsoleIOHandle = TRUE;
else {
SET_AX( context, RtlNtStatusToDosError(status) );
SET_CFLAG( context );
diff --git a/dlls/krnl386.exe16/int31.c b/dlls/krnl386.exe16/int31.c
index e7413cc..2f01452 100644
--- a/dlls/krnl386.exe16/int31.c
+++ b/dlls/krnl386.exe16/int31.c
@@ -439,7 +439,7 @@ int DPMI_CallRMProc( CONTEXT *context, LPWORD stack, int args, int iret )
LPWORD stack16;
LPVOID addr = NULL; /* avoid gcc warning */
RMCB *CurrRMCB;
- int alloc = 0, already = 0;
+ BOOL alloc = FALSE, already = FALSE;
BYTE *code;
TRACE("EAX=%08x EBX=%08x ECX=%08x EDX=%08x\n",
@@ -490,7 +490,7 @@ callrmproc_again:
}
if (!already) {
if (!context->SegSs) {
- alloc = 1; /* allocate default stack */
+ alloc = TRUE; /* allocate default stack */
stack16 = addr = DOSMEM_AllocBlock( 64, (UINT16 *)&(context->SegSs) );
context->Esp = 64-2;
stack16 += 32-1;
@@ -514,7 +514,7 @@ callrmproc_again:
*(--stack16) = 0;
/* adjust stack */
context->Esp -= 2*sizeof(WORD);
- already = 1;
+ already = TRUE;
}
if (CurrRMCB) {
diff --git a/dlls/krnl386.exe16/soundblaster.c b/dlls/krnl386.exe16/soundblaster.c
index ca62732..8939bb3 100644
--- a/dlls/krnl386.exe16/soundblaster.c
+++ b/dlls/krnl386.exe16/soundblaster.c
@@ -48,8 +48,8 @@ static int InSize; /* Nb of bytes in InBuffer */
static BYTE DSP_OutBuffer[10]; /* Store DSP information bytes to host */
static int OutSize; /* Nb of bytes in InBuffer */
static int command; /* Current command */
-static int end_sound_loop = 0;
-static int dma_enable = 0;
+static BOOL end_sound_loop = FALSE;
+static BOOL dma_enable = FALSE;
/* The maximum size of a dma transfer can be 65536 */
#define DMATRFSIZE 1024
@@ -112,7 +112,7 @@ static DWORD CALLBACK SB_Poll( void *dummy )
SamplesCount -= size;
if (!SamplesCount) {
DOSVM_QueueEvent(SB_IRQ,SB_IRQ_PRI,NULL,NULL);
- dma_enable = 0;
+ dma_enable = FALSE;
}
}
return 0;
@@ -166,7 +166,7 @@ static BOOL SB_Init(void)
}
buf_off = 0;
- end_sound_loop = 0;
+ end_sound_loop = FALSE;
SB_Thread = CreateThread(NULL, 0, SB_Poll, NULL, 0, NULL);
TRACE("thread\n");
if (!SB_Thread) {
@@ -254,7 +254,7 @@ void SB_ioport_out( WORD port, BYTE val )
case 0x14: /* SB */
SamplesCount = DSP_InBuffer[1]+(val<<8)+1;
TRACE("DMA DAC (8-bit) for %x samples\n",SamplesCount);
- dma_enable = 1;
+ dma_enable = TRUE;
break;
case 0x20:
FIXME("Direct ADC (8-bit) - Not Implemented\n");
@@ -274,7 +274,7 @@ void SB_ioport_out( WORD port, BYTE val )
/* case 0xBX/0xCX -> See below */
case 0xD0: /* SB */
TRACE("Halt DMA operation (8-bit)\n");
- dma_enable = 0;
+ dma_enable = FALSE;
break;
case 0xD1: /* SB */
FIXME("Enable Speaker - Not Implemented\n");
@@ -331,7 +331,7 @@ void SB_ioport_out( WORD port, BYTE val )
FIXME("Generic DAC/ADC stereo mode not supported\n");
SamplesCount = DSP_InBuffer[2]+(val<<8)+1;
TRACE("Generic DMA for %x samples\n",SamplesCount);
- dma_enable = 1;
+ dma_enable = TRUE;
}
else
FIXME("DSP command %x not supported\n",val);
More information about the wine-cvs
mailing list