Changeset 21356 for trunk/src/user32/combo.c

Timestamp:

Feb 21, 2010, 5:33:53 PM (16 years ago)

Author:

rlwalsh

Message:

eliminate VACPP warning & info msgs - see Ticket #1

File:

• trunk/src/user32/combo.c (modified) (5 diffs)

trunk/src/user32/combo.c

@@ -85 +85 @@
  * Load combo button bitmap.
  */
-static BOOL COMBO_Init()
+static BOOL COMBO_Init(void)
 {
   HDC       hDC;
 
   if( hComboBmp ) return TRUE;
-  if( (hDC = CreateCompatibleDC(0)) )
+  if( (hDC = CreateCompatibleDC(0)) != 0)
   {
     BOOL    bRet = FALSE;
-    if( (hComboBmp = LoadBitmapW(0, MAKEINTRESOURCEW(OBM_COMBO))) )
+    if( (hComboBmp = LoadBitmapW(0, MAKEINTRESOURCEW(OBM_COMBO))) != 0)
     {
       BITMAP      bm;
@@ -676 +676 @@
         PATCOPY );
 
-    if( (bBool = lphc->wState & CBF_BUTTONDOWN) )
+    if( (bBool = lphc->wState & CBF_BUTTONDOWN) != FALSE)
     {
         DrawEdge( hdc, &rectButton, EDGE_SUNKEN, BF_RECT );
@@ -750 +750 @@
    {
         size = SendMessageW(lphc->hWndLBox, LB_GETTEXTLEN, id, 0);
-        if( (pText = HeapAlloc( GetProcessHeap(), 0, (size + 1) * sizeof(WCHAR))) )
+        if( (pText = HeapAlloc( GetProcessHeap(), 0, (size + 1) * sizeof(WCHAR))) != NULL)
     {
             /* size from LB_GETTEXTLEN may be too large, from LB_GETTEXT is accurate */
@@ -1094 +1094 @@
        if( length )
        {
-       if( (pText = HeapAlloc( GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR))) )
+       if( (pText = HeapAlloc( GetProcessHeap(), 0, (length + 1) * sizeof(WCHAR))) != NULL)
        {
         SendMessageW(lphc->hWndLBox, LB_GETTEXT,
@@ -1897 +1897 @@
       LPHEADCOMBO lphc = (LPHEADCOMBO)GetWindowLongA( hwnd, 0 );
 
-      TRACE("[%04x]: msg %s wp %08x lp %08lx\n",
-            hwnd, SPY_GetMsgName(message, hwnd), wParam, lParam );
+      TRACE("[%04x]: msg %s wp %08x lp %08lx\n", hwnd, SPY_GetMsgName(message, hwnd), wParam, lParam );
 
       if( lphc || message == WM_NCCREATE )