Skip to content

W
wine-winehq
Commit ebe3c529 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Janitorial: C booleans must not be compared against TRUE.

parent 4a9b22b2
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 96 deletions
dlls/avifil32/avifile.c
View file @ ebe3c529
......@@ -1999,7 +1999,7 @@ static HRESULT AVIFILE_ParseIndex(IAVIFileImpl *This, AVIINDEXENTRY *lp,
if (nStream > This->fInfo.dwStreams)
return AVIERR_BADFORMAT;
if (*bAbsolute == TRUE && lp->dwChunkOffset < This->dwMoviChunkPos)
if (*bAbsolute && lp->dwChunkOffset < This->dwMoviChunkPos)
*bAbsolute = FALSE;
if (*bAbsolute)
......
dlls/comctl32/datetime.c
View file @ ebe3c529
......@@ -620,7 +620,7 @@ DATETIME_LButtonDown (DATETIME_INFO *infoPtr, WORD wKey, INT x, INT y)
static LRESULT
DATETIME_LButtonUp (DATETIME_INFO *infoPtr, WORD wKey)
{
if(infoPtr->bCalDepressed == TRUE) {
if(infoPtr->bCalDepressed) {
infoPtr->bCalDepressed = FALSE;
InvalidateRect(infoPtr->hwndSelf, &(infoPtr->calbutton), TRUE);
}
......
dlls/comctl32/tab.c
View file @ ebe3c529
......@@ -258,7 +258,7 @@ TAB_SetCurFocus (HWND hwnd,WPARAM wParam)
if (infoPtr->iSelected != iItem || infoPtr->uFocus == -1 ) {
infoPtr->uFocus = iItem;
if (oldFocus != -1) {
if (TAB_SendSimpleNotify(hwnd, TCN_SELCHANGING)!=TRUE) {
if (!TAB_SendSimpleNotify(hwnd, TCN_SELCHANGING)) {
infoPtr->iSelected = iItem;
TAB_SendSimpleNotify(hwnd, TCN_SELCHANGE);
}
......@@ -611,7 +611,7 @@ TAB_LButtonDown (HWND hwnd, WPARAM wParam, LPARAM lParam)
if ((newItem != -1) && (infoPtr->iSelected != newItem))
{
if (TAB_SendSimpleNotify(hwnd, TCN_SELCHANGING) != TRUE)
if (!TAB_SendSimpleNotify(hwnd, TCN_SELCHANGING))
{
infoPtr->iSelected = newItem;
infoPtr->uFocus = newItem;
......
dlls/commdlg/printdlg.c
View file @ ebe3c529
......@@ -1412,7 +1412,7 @@ LRESULT PRINTDLG_WMCommandA(HWND hDlg, WPARAM wParam,
switch (LOWORD(wParam)) {
case IDOK:
TRACE(" OK button was hit\n");
if (PRINTDLG_UpdatePrintDlgA(hDlg, PrintStructures)!=TRUE) {
if (!PRINTDLG_UpdatePrintDlgA(hDlg, PrintStructures)) {
FIXME("Update printdlg was not successful!\n");
return(FALSE);
}
......@@ -1589,7 +1589,7 @@ static LRESULT PRINTDLG_WMCommandW(HWND hDlg, WPARAM wParam,
switch (LOWORD(wParam)) {
case IDOK:
TRACE(" OK button was hit\n");
if (PRINTDLG_UpdatePrintDlgW(hDlg, PrintStructures)!=TRUE) {
if (!PRINTDLG_UpdatePrintDlgW(hDlg, PrintStructures)) {
FIXME("Update printdlg was not successful!\n");
return(FALSE);
}
......
dlls/d3d8/device.c
View file @ ebe3c529
......@@ -1966,7 +1966,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_LightEnable(LPDIRECT3DDEVICE8 iface, DWORD
/* If we are disabling it, check it was enabled, and
still only do something if it has assigned a glIndex (which it should have!) */
if ((lightInfo->lightEnabled == TRUE) && (lightInfo->glIndex != -1)) {
if (lightInfo->lightEnabled && (lightInfo->glIndex != -1)) {
TRACE("Disabling light set up at gl idx %ld\n", lightInfo->glIndex);
ENTER_GL();
glDisable(GL_LIGHT0 + lightInfo->glIndex);
......@@ -1979,7 +1979,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_LightEnable(LPDIRECT3DDEVICE8 iface, DWORD
} else {
/* We are enabling it. If it is enabled, its really simple */
if (lightInfo->lightEnabled == TRUE) {
if (lightInfo->lightEnabled) {
/* nop */
TRACE("Nothing to do as light was enabled\n");
......@@ -3216,7 +3216,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetTexture(LPDIRECT3DDEVICE8 iface, DWORD
textureType = IDirect3DBaseTexture8Impl_GetType(pTexture);
if (textureType == D3DRTYPE_TEXTURE) {
if (oldTxt == pTexture && TRUE == IDirect3DBaseTexture8Impl_IsDirty(pTexture)) {
if (oldTxt == pTexture && IDirect3DBaseTexture8Impl_IsDirty(pTexture)) {
TRACE("Skipping setting texture as old == new\n");
reapplyStates = FALSE;
} else {
......@@ -3228,7 +3228,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetTexture(LPDIRECT3DDEVICE8 iface, DWORD
IDirect3DTexture8Impl_PreLoad((LPDIRECT3DTEXTURE8) pTexture);
}
} else if (textureType == D3DRTYPE_VOLUMETEXTURE) {
if (oldTxt == pTexture && TRUE == IDirect3DBaseTexture8Impl_IsDirty(pTexture)) {
if (oldTxt == pTexture && IDirect3DBaseTexture8Impl_IsDirty(pTexture)) {
TRACE("Skipping setting texture as old == new\n");
reapplyStates = FALSE;
} else {
......@@ -3240,7 +3240,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_SetTexture(LPDIRECT3DDEVICE8 iface, DWORD
IDirect3DVolumeTexture8Impl_PreLoad((LPDIRECT3DVOLUMETEXTURE8) pTexture);
}
} else if (textureType == D3DRTYPE_CUBETEXTURE) {
if (oldTxt == pTexture && TRUE == IDirect3DBaseTexture8Impl_IsDirty(pTexture)) {
if (oldTxt == pTexture && IDirect3DBaseTexture8Impl_IsDirty(pTexture)) {
TRACE("Skipping setting texture as old == new\n");
reapplyStates = FALSE;
} else {
......
dlls/d3d8/drawprim.c
View file @ ebe3c529
......@@ -167,7 +167,7 @@ void init_materials(LPDIRECT3DDEVICE8 iface, BOOL isDiffuseSupplied) {
BOOL requires_material_reset = FALSE;
IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
if (This->tracking_color == NEEDS_TRACKING && isDiffuseSupplied == TRUE) {
if (This->tracking_color == NEEDS_TRACKING && isDiffuseSupplied) {
/* If we have not set up the material color tracking, do it now as required */
glDisable(GL_COLOR_MATERIAL); /* Note: Man pages state must enable AFTER calling glColorMaterial! Required?*/
checkGLcall("glDisable GL_COLOR_MATERIAL");
......@@ -187,7 +187,7 @@ void init_materials(LPDIRECT3DDEVICE8 iface, BOOL isDiffuseSupplied) {
This->tracking_color = NEEDS_TRACKING;
requires_material_reset = TRUE; /* Restore material settings as will be used */
} else if (This->tracking_color == IS_TRACKING && isDiffuseSupplied == TRUE) {
} else if (This->tracking_color == IS_TRACKING && isDiffuseSupplied) {
/* No need to reset material colors since no change to gl_color_material */
requires_material_reset = FALSE;
......@@ -199,7 +199,7 @@ void init_materials(LPDIRECT3DDEVICE8 iface, BOOL isDiffuseSupplied) {
}
/* Reset the material colors which may have been tracking the color*/
if (requires_material_reset == TRUE) {
if (requires_material_reset) {
glMaterialfv(GL_FRONT_AND_BACK, GL_AMBIENT, (float*) &This->StateBlock->material.Ambient);
checkGLcall("glMaterialfv");
glMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, (float*) &This->StateBlock->material.Diffuse);
......@@ -393,7 +393,7 @@ void primitiveConvertToStridedData(LPDIRECT3DDEVICE8 iface, Direct3DVertexStride
if (LoopThroughTo == 1) { /* VertexShader is FVF */
thisFVF = This->UpdateStateBlock->VertexShader;
/* Handle memory passed directly as well as vertex buffers */
if (This->StateBlock->streamIsUP == TRUE) {
if (This->StateBlock->streamIsUP) {
data = (BYTE *)This->StateBlock->stream_source[nStream];
} else {
data = ((IDirect3DVertexBuffer8Impl *)This->StateBlock->stream_source[nStream])->allocatedMemory;
......@@ -526,13 +526,13 @@ void draw_vertex(LPDIRECT3DDEVICE8 iface, /* interf
IDirect3DDevice8Impl *This = (IDirect3DDevice8Impl *)iface;
/* Diffuse -------------------------------- */
if (isDiffuse == TRUE) {
if (isDiffuse) {
glColor4fv(dRGBA);
VTRACE(("glColor4f: r,g,b,a=%f,%f,%f,%f\n", dRGBA[0], dRGBA[1], dRGBA[2], dRGBA[3]));
}
/* Specular Colour ------------------------------------------*/
if (isSpecular == TRUE) {
if (isSpecular) {
if (GL_SUPPORT(EXT_SECONDARY_COLOR)) {
GL_EXTCALL(glSecondaryColor3fvEXT(sRGB));
VTRACE(("glSecondaryColor4f: r,g,b=%f,%f,%f\n", sRGB[0], sRGB[1], sRGB[2]));
......@@ -542,13 +542,13 @@ void draw_vertex(LPDIRECT3DDEVICE8 iface, /* interf
}
/* Normal -------------------------------- */
if (isNormal == TRUE) {
if (isNormal) {
VTRACE(("glNormal:nx,ny,nz=%f,%f,%f\n", nx,ny,nz));
glNormal3f(nx, ny, nz);
}
/* Point Size ----------------------------------------------*/
if (isPtSize == TRUE) {
if (isPtSize) {
/* no such functionality in the fixed function GL pipeline */
FIXME("Cannot change ptSize here in openGl\n");
......@@ -644,7 +644,7 @@ void draw_vertex(LPDIRECT3DDEVICE8 iface, /* interf
} /* End of textures */
/* Position -------------------------------- */
if (isXYZ == TRUE) {
if (isXYZ) {
if (1.0f == rhw || rhw < 0.00001f) {
VTRACE(("Vertex: glVertex:x,y,z=%f,%f,%f\n", x,y,z));
glVertex3f(x, y, z);
......@@ -1475,7 +1475,7 @@ void drawPrimitive(LPDIRECT3DDEVICE8 iface,
if (rc) return;
/* If we will be using a vertex shader, do some initialization for it */
if (useVertexShaderFunction == TRUE) {
if (useVertexShaderFunction) {
vertex_shader = VERTEX_SHADER(This->UpdateStateBlock->VertexShader);
memset(&vertex_shader->input, 0, sizeof(VSHADERINPUTDATA8));
......@@ -1485,7 +1485,7 @@ void drawPrimitive(LPDIRECT3DDEVICE8 iface,
vertex_shader->usage != D3DUSAGE_SOFTWAREPROCESSING);
/** init Constants */
if (TRUE == This->UpdateStateBlock->Changed.vertexShaderConstant) {
if (This->UpdateStateBlock->Changed.vertexShaderConstant) {
TRACE_(d3d_shader)("vertex shader initializing constants\n");
IDirect3DVertexShaderImpl_SetConstantF(vertex_shader, 0, (CONST FLOAT*) &This->UpdateStateBlock->vertexShaderConstant[0], 96);
}
......@@ -1505,7 +1505,7 @@ void drawPrimitive(LPDIRECT3DDEVICE8 iface,
checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);");
/* init Constants */
if (TRUE == This->UpdateStateBlock->Changed.pixelShaderConstant) {
if (This->UpdateStateBlock->Changed.pixelShaderConstant) {
TRACE_(d3d_shader)("pixel shader initializing constants %p\n",pixel_shader);
IDirect3DPixelShaderImpl_SetConstantF(pixel_shader, 0, (CONST FLOAT*) &This->UpdateStateBlock->pixelShaderConstant[0], 8);
}
......@@ -1571,7 +1571,7 @@ void drawPrimitive(LPDIRECT3DDEVICE8 iface,
}
/* Now draw the graphics to the screen */
if (useVertexShaderFunction == TRUE) {
if (useVertexShaderFunction) {
/* Ideally, we should have software FV and hardware VS, possibly
depending on the device type? */
......@@ -1632,7 +1632,7 @@ void drawPrimitive(LPDIRECT3DDEVICE8 iface,
/* Diagnostics */
#if defined(SHOW_FRAME_MAKEUP)
{
if (isDumpingFrames == TRUE) {
if (isDumpingFrames) {
D3DLOCKED_RECT r;
char buffer[80];
IDirect3DSurface8Impl_LockRect((LPDIRECT3DSURFACE8) This->renderTarget, &r, NULL, D3DLOCK_READONLY);
......
dlls/d3d8/utils.c
View file @ ebe3c529
......@@ -1822,7 +1822,7 @@ void set_tex_op(LPDIRECT3DDEVICE8 iface, BOOL isAlpha, int Stage, D3DTEXTUREOP o
}
}
if (combineOK == TRUE) {
if (combineOK) {
glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, useext(GL_COMBINE));
checkGLcall("GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, useext(GL_COMBINE)");
......
dlls/d3d8/vshaderdeclaration.c
View file @ ebe3c529
......@@ -418,7 +418,7 @@ HRESULT WINAPI IDirect3DDeviceImpl_FillVertexShaderInputSW(IDirect3DDevice8Impl*
ERR("using unitialised stream[%lu]\n", stream);
return D3DERR_INVALIDCALL;
} else {
if (This->StateBlock->streamIsUP == TRUE) {
if (This->StateBlock->streamIsUP) {
curPos = ((char *) pVB) + (SkipnStrides * skip); /* Not really a VB */
} else {
curPos = ((IDirect3DVertexBuffer8Impl*) pVB)->allocatedMemory + (SkipnStrides * skip);
......@@ -602,7 +602,7 @@ HRESULT WINAPI IDirect3DDeviceImpl_FillVertexShaderInputArbHW(IDirect3DDevice8Im
ERR("using unitialised stream[%lu]\n", stream);
return D3DERR_INVALIDCALL;
} else {
if (This->StateBlock->streamIsUP == TRUE) {
if (This->StateBlock->streamIsUP) {
curPos = ((char *) pVB) + (SkipnStrides * skip); /* Not really a VB */
} else {
curPos = ((IDirect3DVertexBuffer8Impl*) pVB)->allocatedMemory + (SkipnStrides * skip);
......
dlls/ddraw/d3dtexture.c
View file @ ebe3c529
......@@ -147,7 +147,7 @@ convert_tex_address_to_GL(D3DTEXTUREADDRESS dwState)
case D3DTADDRESS_CLAMP: gl_state = GL_CLAMP; break;
case D3DTADDRESS_BORDER: gl_state = GL_CLAMP_TO_EDGE; break;
case D3DTADDRESS_MIRROR:
if (GL_extensions.mirrored_repeat == TRUE) {
if (GL_extensions.mirrored_repeat) {
gl_state = GL_MIRRORED_REPEAT_WINE;
} else {
gl_state = GL_REPEAT;
......@@ -266,7 +266,7 @@ gltex_upload_texture(IDirectDrawSurfaceImpl *surf_ptr, IDirect3DDeviceImpl *d3dd
changed = TRUE;
}
if (changed == TRUE) {
if (changed) {
if (gl_surf_ptr->tex_parameters == NULL) {
gl_surf_ptr->tex_parameters = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
sizeof(DWORD) * (D3DTSS_MAXMIPLEVEL + 1 - D3DTSS_ADDRESSU));
......
dlls/ddraw/d3dvertexbuffer.c
View file @ ebe3c529
......@@ -104,7 +104,7 @@ Main_IDirect3DVertexBufferImpl_7_1T_Lock(LPDIRECT3DVERTEXBUFFER7 iface,
DDRAW_dump_lockflag(dwFlags);
}
if (This->processed == TRUE) {
if (This->processed) {
WARN(" application does a Lock on a vertex buffer resulting from a ProcessVertices call. Expect problems !\n");
}
......
dlls/ddraw/dsurface/fakezbuffer.c
View file @ ebe3c529
......@@ -61,7 +61,7 @@ static void zbuffer_unlock_update(IDirectDrawSurfaceImpl* This, LPCRECT pRect)
static BOOLEAN zbuffer_get_dirty_status(IDirectDrawSurfaceImpl* This, LPCRECT pRect)
{
if (((FakeZBuffer_DirectDrawSurfaceImpl *) This->private)->in_memory == TRUE) {
if (((FakeZBuffer_DirectDrawSurfaceImpl *) This->private)->in_memory) {
((FakeZBuffer_DirectDrawSurfaceImpl *) This->private)->in_memory = FALSE;
return TRUE;
}
......
dlls/ddraw/mesa.c
View file @ ebe3c529
......@@ -162,7 +162,7 @@ void set_render_state(IDirect3DDeviceImpl* This,
glThis->depth_test = TRUE;
}
} else if (dwRenderState == D3DZB_FALSE) {
if (glThis->depth_test == TRUE) {
if (glThis->depth_test) {
glDisable(GL_DEPTH_TEST);
glThis->depth_test = FALSE;
}
......@@ -883,7 +883,7 @@ HRESULT upload_surface_to_tex_memory_init(IDirectDrawSurfaceImpl *surf_ptr, GLui
if ((src_pf->u2.dwRBitMask == 0x00FF0000) &&
(src_pf->u3.dwGBitMask == 0x0000FF00) &&
(src_pf->u4.dwBBitMask == 0x000000FF)) {
if (need_alpha_ck == TRUE) {
if (need_alpha_ck) {
convert_type = CONVERT_RGB32_888;
current_format = GL_RGBA;
internal_format = GL_RGBA;
......@@ -905,7 +905,7 @@ HRESULT upload_surface_to_tex_memory_init(IDirectDrawSurfaceImpl *surf_ptr, GLui
error = TRUE;
}
if (error == TRUE) {
if (error) {
ERR("Unsupported pixel format for textures : \n");
if (ERR_ON(ddraw)) {
DDRAW_dump_pixelformat(src_pf);
......@@ -921,7 +921,7 @@ HRESULT upload_surface_to_tex_memory_init(IDirectDrawSurfaceImpl *surf_ptr, GLui
}
}
if ((sub_texture == TRUE) && (convert_type == NO_CONVERSION)) {
if (sub_texture && (convert_type == NO_CONVERSION)) {
current_storage_width = surf_ptr->surface_desc.u1.lPitch / bpp;
} else {
if (surf_ptr->surface_desc.u1.lPitch == (surf_ptr->surface_desc.dwWidth * bpp)) {
......
dlls/dmime/performance.c
View file @ ebe3c529
......@@ -114,7 +114,7 @@ static DWORD WINAPI ProcessMsgThread(LPVOID lpParam) {
outrefresh:
LeaveCriticalSection(&This->safe);
while (TRUE == PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) {
while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) {
/** if hwnd we suppose that is a windows event ... */
if (NULL != msg.hwnd) {
TranslateMessage(&msg);
......@@ -308,7 +308,7 @@ HRESULT WINAPI IDirectMusicPerformance8Impl_SendPMsg (LPDIRECTMUSICPERFORMANCE8
if (NULL == pItem) {
return E_POINTER;
}
if (TRUE == pItem->bInUse) {
if (pItem->bInUse) {
return DMUS_E_ALREADY_SENT;
}
......@@ -369,7 +369,7 @@ HRESULT WINAPI IDirectMusicPerformance8Impl_GetTime (LPDIRECTMUSICPERFORMANCE8 i
REFERENCE_TIME rtCur = 0;
/*TRACE("(%p, %p, %p)\n", This, prtNow, pmtNow); */
if (TRUE == This->procThreadTicStarted) {
if (This->procThreadTicStarted) {
rtCur = ((REFERENCE_TIME) GetTickCount() * 10000) - This->procThreadStartTime;
} else {
/*return DMUS_E_NO_MASTER_CLOCK;*/
......@@ -417,7 +417,7 @@ HRESULT WINAPI IDirectMusicPerformance8Impl_FreePMsg (LPDIRECTMUSICPERFORMANCE8
if (NULL == pItem) {
return E_POINTER;
}
if (TRUE == pItem->bInUse) {
if (pItem->bInUse) {
/** prevent for freeing PMsg in queue (ie to be processed) */
return DMUS_E_CANNOT_FREE;
}
......
dlls/dmloader/classfactory.c
View file @ ebe3c529
......@@ -75,7 +75,7 @@ HRESULT WINAPI IDirectMusicLoaderCF_CreateInstance (LPCLASSFACTORY iface, LPUNKN
HRESULT WINAPI IDirectMusicLoaderCF_LockServer (LPCLASSFACTORY iface, BOOL dolock) {
IDirectMusicLoaderCF *This = (IDirectMusicLoaderCF *)iface;
TRACE("(%p, %d)\n", This, dolock);
if (dolock == TRUE)
if (dolock)
InterlockedIncrement (&dwDirectMusicLoader);
else
InterlockedDecrement (&dwDirectMusicLoader);
......@@ -162,7 +162,7 @@ HRESULT WINAPI IDirectMusicContainerCF_CreateInstance (LPCLASSFACTORY iface, LPU
HRESULT WINAPI IDirectMusicContainerCF_LockServer (LPCLASSFACTORY iface, BOOL dolock) {
IDirectMusicContainerCF *This = (IDirectMusicContainerCF *)iface;
TRACE("(%p, %d)\n", This, dolock);
if (dolock == TRUE)
if (dolock)
InterlockedIncrement (&dwDirectMusicContainer);
else
InterlockedDecrement (&dwDirectMusicContainer);
......
dlls/dmloader/loader.c
View file @ ebe3c529
......@@ -93,7 +93,7 @@ HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_GetObject (LPDIRECTMUSI
IsEqualGUID (&pDesc->guidObject, &pExistingEntry->Desc.guidObject)) {
TRACE(": found it by object GUID\n");
/* I suppose such stuff can happen only when GUID for object is given (GUID_DefaultGMCollection) */
if (pExistingEntry->bInvalidDefaultDLS == TRUE) {
if (pExistingEntry->bInvalidDefaultDLS) {
TRACE(": found faulty default DLS collection... enabling M$ compliant behaviour\n");
return DMUS_E_LOADER_NOFILENAME;
}
......
dlls/dsound/sound3d.c
View file @ ebe3c529
......@@ -355,7 +355,7 @@ static void WINAPI DSOUND_ChangeListener(IDirectSound3DListenerImpl *ds3dl)
crash without the following line) */
if (ds3dl->dsound->buffers[i]->ds3db == NULL)
continue;
if (ds3dl->dsound->buffers[i]->ds3db_need_recalc == TRUE)
if (ds3dl->dsound->buffers[i]->ds3db_need_recalc)
{
DSOUND_Mix3DBuffer(ds3dl->dsound->buffers[i]);
}
......
dlls/itss/chm_lib.c
View file @ ebe3c529
......@@ -588,7 +588,7 @@ static Int64 _chm_fetch_bytes(struct chmFile *h,
buf,
(DWORD)len,
&actualLen,
NULL) == TRUE)
NULL))
readLen = actualLen;
else
readLen = 0;
......
dlls/kernel/tests/locale.c
View file @ ebe3c529
......@@ -131,7 +131,7 @@ char GlobalBuffer[BUFFER_SIZE]; /* Buffer used by callback function */
#define EXPECT_LENW EXPECT_LEN((int)strlenW(Expected)+1)
#define EXPECT_EQW ok(strncmpW(buffer, Expected, strlenW(Expected)) == 0, "Bad conversion\n")
#define EXPECT_FALSE ok(FALSE == ret, "Expected return value FALSE, got TRUE\n")
#define EXPECT_TRUE ok(TRUE == ret, "Expected return value TRUE, got FALSE\n")
#define EXPECT_TRUE ok(FALSE != ret, "Expected return value TRUE, got FALSE\n")
#define NUO LOCALE_NOUSEROVERRIDE
......
dlls/msvcrt/lock.c
View file @ ebe3c529
......@@ -90,7 +90,7 @@ void msvcrt_free_mt_locks(void)
/* Uninitialize the table */
for( i=0; i < _TOTAL_LOCKS; i++ )
{
if( lock_table[ i ].bInit == TRUE )
if( lock_table[ i ].bInit )
{
msvcrt_uninitialize_mlock( i );
}
......
dlls/ole32/compositemoniker.c
View file @ ebe3c529
......@@ -445,7 +445,7 @@ HRESULT WINAPI CompositeMonikerImpl_GetSizeMax(IMoniker* iface,ULARGE_INTEGER* p
IMoniker_Enum(iface,TRUE,&enumMk);
while(IEnumMoniker_Next(enumMk,1,&pmk,NULL)==TRUE){
while(IEnumMoniker_Next(enumMk,1,&pmk,NULL)){
IMoniker_GetSizeMax(pmk,&ptmpSize);
......
dlls/ole32/storage32.c
View file @ ebe3c529
......@@ -1680,7 +1680,7 @@ HRESULT WINAPI StorageImpl_DestroyElement(
This->rootPropertySetIndex,
&parentProperty);
assert(res==TRUE);
assert(res);
/*
* Second, check to see if by any chance the actual storage (This) is not
......
dlls/quartz/systemclock.c
View file @ ebe3c529
......@@ -139,7 +139,7 @@ static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) {
outrefresh:
LeaveCriticalSection(&This->safe);
while (TRUE == PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) {
while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) {
/** if hwnd we suppose that is a windows event ... */
if (NULL != msg.hwnd) {
TranslateMessage(&msg);
......
dlls/serialui/confdlg.c
View file @ ebe3c529
......@@ -263,7 +263,7 @@ static void SERIALUI_DCBToDialogInfo(HWND hDlg, SERIALUI_DialogInfo *info)
/* map flow control state, if it looks normal */
if((lpdcb->fRtsControl == RTS_CONTROL_HANDSHAKE) ||
(lpdcb->fOutxCtsFlow == TRUE)) {
(lpdcb->fOutxCtsFlow)) {
dwFlowControl = 1;
} else if(lpdcb->fOutX || lpdcb->fInX) {
dwFlowControl = 2;
......
dlls/shell32/shellole.c
View file @ ebe3c529
......@@ -704,7 +704,7 @@ UINT WINAPI DragQueryFileA(
lpDrop = (LPSTR) lpDropFileStruct + lpDropFileStruct->pFiles;
if(lpDropFileStruct->fWide == TRUE) {
if(lpDropFileStruct->fWide) {
LPWSTR lpszFileW = NULL;
if(lpszFile) {
......
dlls/user/menu.c
View file @ ebe3c529
......@@ -2186,7 +2186,7 @@ static INT MENU_ButtonUp( MTRACKER* pmt, HMENU hPtMenu, UINT wFlags)
/* If we are dealing with the top-level menu */
/* and this is a click on an already "popped" item: */
/* Stop the menu tracking and close the opened submenus */
if((pmt->hTopMenu == hPtMenu) && (ptmenu->bTimeToHide == TRUE))
if((pmt->hTopMenu == hPtMenu) && ptmenu->bTimeToHide)
return 0;
}
ptmenu->bTimeToHide = TRUE;
......
dlls/winaspi/winaspi16.c
View file @ ebe3c529
......@@ -455,7 +455,7 @@ WORD WINAPI SendASPICommand16(SEGPTR segptr_srb)
WORD WINAPI InsertInASPIChain16(BOOL16 remove, FARPROC16 pASPIChainFunc)
{
#ifdef linux
if (remove == TRUE) /* Remove */
if (remove) /* Remove */
{
if (ASPIChainFunc == pASPIChainFunc)
{
......@@ -463,8 +463,7 @@ WORD WINAPI InsertInASPIChain16(BOOL16 remove, FARPROC16 pASPIChainFunc)
return SS_COMP;
}
}
else
if (remove == FALSE) /* Insert */
else /* Insert */
{
if (ASPIChainFunc == NULL)
{
......
dlls/wined3d/device.c
View file @ ebe3c529
......@@ -704,7 +704,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetLightEnable(IWineD3DDevice *iface, DWORD In
/* If we are disabling it, check it was enabled, and
still only do something if it has assigned a glIndex (which it should have!) */
if ((lightInfo->lightEnabled == TRUE) && (lightInfo->glIndex != -1)) {
if ((lightInfo->lightEnabled) && (lightInfo->glIndex != -1)) {
TRACE("Disabling light set up at gl idx %ld\n", lightInfo->glIndex);
ENTER_GL();
glDisable(GL_LIGHT0 + lightInfo->glIndex);
......@@ -717,7 +717,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetLightEnable(IWineD3DDevice *iface, DWORD In
} else {
/* We are enabling it. If it is enabled, its really simple */
if (lightInfo->lightEnabled == TRUE) {
if (lightInfo->lightEnabled) {
/* nop */
TRACE("Nothing to do as light was enabled\n");
......
dlls/wined3d/directx.c
View file @ ebe3c529
......@@ -763,7 +763,7 @@ HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Adapter,
}
/* If it worked, return the information requested */
if (isGLInfoValid == TRUE) {
if (isGLInfoValid) {
TRACE_(d3d_caps)("device/Vendor Name and Version detection using FillGLCaps\n");
strcpy(pIdentifier->Driver, "Display");
strcpy(pIdentifier->Description, "Direct3D HAL");
......@@ -1029,7 +1029,7 @@ HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, D3DDEVT
BOOL rc = IWineD3DImpl_FillGLCaps(&This->gl_info, NULL);
/* If we are running off a real context, save the values */
if ((rc == TRUE) && ((NULL != fake_ctx))) This->isGLInfoValid = TRUE;
if (rc && ((NULL != fake_ctx))) This->isGLInfoValid = TRUE;
}
/* ------------------------------------------------
......
dlls/wined3d/drawprim.c
View file @ ebe3c529
......@@ -1506,7 +1506,7 @@ void drawPrimitive(IWineD3DDevice *iface,
vertex_shader->usage != D3DUSAGE_SOFTWAREPROCESSING);
/** init Constants */
if (TRUE == This->updateStateBlock->Changed.vertexShaderConstant) {
if (This->updateStateBlock->Changed.vertexShaderConstant) {
TRACE_(d3d_shader)("vertex shader initializing constants\n");
IDirect3DVertexShaderImpl_SetConstantF(vertex_shader, 0, (CONST FLOAT*) &This->updateStateBlock->vertexShaderConstant[0], 96);
}
......@@ -1528,7 +1528,7 @@ void drawPrimitive(IWineD3DDevice *iface,
checkGLcall("glEnable(GL_FRAGMENT_PROGRAM_ARB);");
/* init Constants */
if (TRUE == This->updateStateBlock->Changed.pixelShaderConstant) {
if (This->updateStateBlock->Changed.pixelShaderConstant) {
TRACE_(d3d_shader)("pixel shader initializing constants %p\n",pixel_shader);
IDirect3DPixelShaderImpl_SetConstantF(pixel_shader, 0, (CONST FLOAT*) &This->updateStateBlock->pixelShaderConstant[0], 8);
}
......
dlls/wineps/glyphlist.c
View file @ ebe3c529
......@@ -196,7 +196,7 @@ VOID PSDRV_IndexGlyphList()
{
INT i;
if (glyphNamesIndexed == TRUE)
if (glyphNamesIndexed)
return;
TRACE("%i glyph names:\n", glyphListSize);
......
dlls/winmm/mciwave/mciwave.c
View file @ ebe3c529
......@@ -467,7 +467,7 @@ static DWORD WAVE_mciOpen(UINT wDevID, DWORD dwFlags, LPMCI_WAVE_OPEN_PARMSA lpO
memcpy(&wmw->openParms, lpOpenParms, sizeof(MCI_WAVE_OPEN_PARMSA));
if (wmw->bTemporaryFile == TRUE)
if (wmw->bTemporaryFile)
{
/* Additional openParms is temporary file's name */
wmw->openParms.lpstrElementName = pszTmpFileName;
......
programs/regedit/framewnd.c
View file @ ebe3c529
......@@ -335,7 +335,7 @@ BOOL PrintRegistryHive(HWND hWnd, LPTSTR path)
pd.nToPage = 0xFFFF;
pd.nMinPage = 1;
pd.nMaxPage = 0xFFFF;
if (PrintDlg(&pd) == TRUE) {
if (PrintDlg(&pd)) {
/* GDI calls to render output. */
DeleteDC(pd.hDC); /* Delete DC when done.*/
}
......
programs/uninstaller/main.c
View file @ ebe3c529
......@@ -293,7 +293,7 @@ void UninstallProgram(void)
si.cb = sizeof(STARTUPINFO);
si.wShowWindow = SW_NORMAL;
res = CreateProcess(NULL, entries[i].command, NULL, NULL, FALSE, 0, NULL, NULL, &si, &info);
if (res == TRUE)
if (res)
{ /* wait for the process to exit */
WaitForSingleObject(info.hProcess, INFINITE);
res = GetExitCodeProcess(info.hProcess, &exit_code);
......
windows/winproc.c
View file @ ebe3c529
......@@ -1372,8 +1372,7 @@ INT WINPROC_MapMsg16To32A( HWND hwnd, UINT16 msg16, WPARAM16 wParam16, UINT *pms
*(BOOL*)(*plparam) = 0;
return 1;
case WM_MDISETMENU:
if(wParam16==TRUE)
*pmsg32=WM_MDIREFRESHMENU;
if(wParam16) *pmsg32=WM_MDIREFRESHMENU;
*pwparam32 = (WPARAM)HMENU_32(LOWORD(*plparam));
*plparam = (LPARAM)HMENU_32(HIWORD(*plparam));
return 0;
......
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