From 6e31a0dd00b859ff59ed73d7f385d58e4c71be8d Mon Sep 17 00:00:00 2001 From: Dmitry Gorbachev Date: Sat, 25 Jul 2009 07:42:15 +0000 Subject: [PATCH] Fix some bugs, reported by GCC. svn path=/trunk/; revision=42193 --- rostests/dxtest/ddraw/DDraw/display_modes.cpp | 6 +++--- rostests/dxtest/ddraw/Surface/misc.cpp | 4 ++-- rostests/tests/regqueryvalue/regqueryvalue.c | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/rostests/dxtest/ddraw/DDraw/display_modes.cpp b/rostests/dxtest/ddraw/DDraw/display_modes.cpp index 2b3b24c26be..3143575dee0 100644 --- a/rostests/dxtest/ddraw/DDraw/display_modes.cpp +++ b/rostests/dxtest/ddraw/DDraw/display_modes.cpp @@ -24,8 +24,8 @@ HRESULT CALLBACK EnumDisplayModes( LPDDSURFACEDESC2 pDDSD, ENUMCONTEXT* Context DDSURFACEDESC2 DisplayMode = {0}; DisplayMode.dwSize = sizeof(DDSURFACEDESC2); - TEST ( pDDSD->dwFlags == DDSD_HEIGHT | DDSD_WIDTH | DDSD_PITCH | DDSD_PIXELFORMAT | DDSD_REFRESHRATE); - TEST ( pDDSD->ddpfPixelFormat.dwFlags == DDPF_RGB | DDPF_PALETTEINDEXED8 || pDDSD->ddpfPixelFormat.dwFlags == DDPF_RGB ); + TEST ( pDDSD->dwFlags == (DDSD_HEIGHT | DDSD_WIDTH | DDSD_PITCH | DDSD_PIXELFORMAT | DDSD_REFRESHRATE)); + TEST ( pDDSD->ddpfPixelFormat.dwFlags == (DDPF_RGB | DDPF_PALETTEINDEXED8) || pDDSD->ddpfPixelFormat.dwFlags == DDPF_RGB ); TEST ( Context->DirectDraw->SetDisplayMode (pDDSD->dwWidth, pDDSD->dwHeight, pDDSD->ddpfPixelFormat.dwRGBBitCount, pDDSD->dwRefreshRate, 0) == DD_OK); TEST ( Context->DirectDraw->GetMonitorFrequency (&lpdwFrequency) == DD_OK && lpdwFrequency == pDDSD->dwRefreshRate); TEST ( Context->DirectDraw->GetDisplayMode (&DisplayMode) == DD_OK @@ -33,7 +33,7 @@ HRESULT CALLBACK EnumDisplayModes( LPDDSURFACEDESC2 pDDSD, ENUMCONTEXT* Context && pDDSD->dwWidth == DisplayMode.dwWidth && pDDSD->dwRefreshRate == DisplayMode.dwRefreshRate && pDDSD->ddpfPixelFormat.dwRGBBitCount == DisplayMode.ddpfPixelFormat.dwRGBBitCount - && DisplayMode.dwFlags == DDSD_HEIGHT | DDSD_WIDTH | DDSD_PITCH | DDSD_PIXELFORMAT | DDSD_REFRESHRATE ); + && DisplayMode.dwFlags == (DDSD_HEIGHT | DDSD_WIDTH | DDSD_PITCH | DDSD_PIXELFORMAT | DDSD_REFRESHRATE) ); setcout++; return DDENUMRET_OK; diff --git a/rostests/dxtest/ddraw/Surface/misc.cpp b/rostests/dxtest/ddraw/Surface/misc.cpp index 41c13c02f35..0c323db0b64 100644 --- a/rostests/dxtest/ddraw/Surface/misc.cpp +++ b/rostests/dxtest/ddraw/Surface/misc.cpp @@ -2,7 +2,7 @@ BOOL CreateSurface(LPDIRECTDRAWSURFACE7* pSurface); BOOL Test_Misc (INT* passed, INT* failed) { - LPDIRECTDRAWSURFACE7 Surface; + LPDIRECTDRAWSURFACE7 Surface; if(!CreateSurface(&Surface)) return FALSE; @@ -12,7 +12,7 @@ BOOL Test_Misc (INT* passed, INT* failed) DDSCAPS2 Caps; TEST (Surface->GetCaps((DDSCAPS2*)0xdeadbeef) == DDERR_INVALIDPARAMS); TEST (Surface->GetCaps(&Caps) == DD_OK && Caps.dwCaps == 0x10004040 - && Caps.dwCaps2 == Caps.dwCaps3 == Caps.dwCaps4 == 0); // FIXME: Replace 0x10004040 + && Caps.dwCaps2 == 0 && Caps.dwCaps3 == 0 && Caps.dwCaps4 == 0); // FIXME: Replace 0x10004040 // GetDC / ReleaseDC HDC hdc; diff --git a/rostests/tests/regqueryvalue/regqueryvalue.c b/rostests/tests/regqueryvalue/regqueryvalue.c index dd275e6c8ca..eae7d3005c1 100644 --- a/rostests/tests/regqueryvalue/regqueryvalue.c +++ b/rostests/tests/regqueryvalue/regqueryvalue.c @@ -63,7 +63,6 @@ int main( int argc, char **argv ) { free( WcharResult ); free( CharResult ); - free( ValueNameWC ); return 0; }