h3, h5, minihwc: minor warning fixes.
This commit is contained in:
@@ -1846,7 +1846,7 @@ hwcGetSurfaceInfo(const hwcBoardInfo* bInfo,
|
||||
retVal = (ddErr == DD_OK);
|
||||
if (!retVal) {
|
||||
sprintf(errorString, "%s: IDirectDrawSurface2_Lock (0x%X)\n",
|
||||
FN_NAME, ddErr);
|
||||
FN_NAME,(unsigned)ddErr);
|
||||
GDBG_INFO(80, "%s", errorString);
|
||||
goto __errExit;
|
||||
}
|
||||
@@ -1867,7 +1867,7 @@ hwcGetSurfaceInfo(const hwcBoardInfo* bInfo,
|
||||
retVal = (ret->depth != 0x00UL);
|
||||
if (!retVal) {
|
||||
sprintf(errorString, "%s: Invalid surface pixel format (0x%X)\n",
|
||||
FN_NAME, desc.ddpfPixelFormat.dwFlags);
|
||||
FN_NAME, (unsigned)desc.ddpfPixelFormat.dwFlags);
|
||||
GDBG_INFO(80, "%s", errorString);
|
||||
goto __errExit;
|
||||
}
|
||||
@@ -4176,7 +4176,7 @@ hwcGetenv(char *a)
|
||||
static char strval[255];
|
||||
|
||||
/* This should work for both NT and Win95/98 (getRegPath works) */
|
||||
if (retVal = getenv(a))
|
||||
if ((retVal = getenv(a)) != NULL)
|
||||
return retVal;
|
||||
|
||||
szData = sizeof(strval);
|
||||
|
||||
@@ -2866,7 +2866,7 @@ hwcGetSurfaceInfo(const hwcBoardInfo* bInfo,
|
||||
retVal = (ddErr == DD_OK);
|
||||
if (!retVal) {
|
||||
sprintf(errorString, "%s: IDirectDrawSurface2_Lock (0x%X)\n",
|
||||
FN_NAME, ddErr);
|
||||
FN_NAME,(unsigned)ddErr);
|
||||
GDBG_INFO(80, "%s", errorString);
|
||||
goto __errExit;
|
||||
}
|
||||
@@ -2894,7 +2894,7 @@ hwcGetSurfaceInfo(const hwcBoardInfo* bInfo,
|
||||
retVal = (ret->bitdepth != 0x00UL);
|
||||
if (!retVal) {
|
||||
sprintf(errorString, "%s: Invalid surface pixel format (0x%X)\n",
|
||||
FN_NAME, desc.ddpfPixelFormat.dwFlags);
|
||||
FN_NAME, (unsigned)desc.ddpfPixelFormat.dwFlags);
|
||||
GDBG_INFO(80, "%s", errorString);
|
||||
goto __errExit;
|
||||
}
|
||||
@@ -8685,7 +8685,7 @@ hwcGetenv(const char *a)
|
||||
static char strval[255];
|
||||
|
||||
/* favor system env vars over reg settings */
|
||||
if (retVal = getenv(a))
|
||||
if ((retVal = getenv(a)) != NULL)
|
||||
return retVal;
|
||||
|
||||
szData = sizeof(strval);
|
||||
|
||||
@@ -180,7 +180,7 @@ setVideoMode( hwcBoardInfo *bInfo, int refresh )
|
||||
GDBG_INFO( 80, "setVideoMode sees hwnd 0x%x\n", (HWND)bInfo->vidInfo.hWnd);
|
||||
|
||||
if ((HWND)bInfo->vidInfo.hWnd == NULL)
|
||||
(HWND)bInfo->vidInfo.hWnd = GetActiveWindow();
|
||||
bInfo->vidInfo.hWnd = (FxU32) GetActiveWindow();
|
||||
|
||||
ddGuid = NULL;
|
||||
ddraw = GetModuleHandle( "ddraw.dll" );
|
||||
|
||||
Reference in New Issue
Block a user