Changeset 21355 for trunk/src

Timestamp:

Feb 21, 2010, 5:32:45 PM (16 years ago)

Author:

rlwalsh

Message:

eliminate VACPP warning & info msgs - see Ticket #1

Location:

trunk/src/kernel32

Files:

• KERNEL32.DEF (modified) (1 diff)
• codepage.c (modified) (2 diffs)
• dosdevice.cpp (modified) (1 diff)
• environ.cpp (modified) (2 diffs)
• heapstring.cpp (modified) (1 diff)
• ole2nls.c (modified) (7 diffs)
• profile.cpp (modified) (2 diffs)
• winimagepeldr.cpp (modified) (1 diff)

trunk/src/kernel32/KERNEL32.DEF

@@ -542 +542 @@
      GetUserDefaultLCID         = _GetUserDefaultLCID@0       @425
      GetUserDefaultLangID       = _GetUserDefaultLangID@0     @426
-     GetVDMCurrentDirectories   = _GetVDMCurrentDirectories@4           ;NT
+;     GetVDMCurrentDirectories   = _GetVDMCurrentDirectories@4           ;NT
      GetVersion                 = _GetVersion@0               @427
      GetVersionExA              = _GetVersionExA@4            @428

trunk/src/kernel32/codepage.c

@@ -97 +97 @@
     if (!ansi_cptable) init_codepages();  /* just in case */
 
-    if ((table = get_locale_cp( lcid, LOCALE_IDEFAULTANSICODEPAGE ))) ansi_cptable = table;
-    if ((table = get_locale_cp( lcid, LOCALE_IDEFAULTMACCODEPAGE ))) mac_cptable = table;
-    if ((table = get_locale_cp( lcid, LOCALE_IDEFAULTCODEPAGE ))) oem_cptable = table;
+    if ((table = get_locale_cp( lcid, LOCALE_IDEFAULTANSICODEPAGE )) != NULL) ansi_cptable = table;
+    if ((table = get_locale_cp( lcid, LOCALE_IDEFAULTMACCODEPAGE )) != NULL) mac_cptable = table;
+    if ((table = get_locale_cp( lcid, LOCALE_IDEFAULTCODEPAGE )) != NULL) oem_cptable = table;
 
     TRACE( "ansi=%03d oem=%03d mac=%03d\n", ansi_cptable->info.codepage,
@@ -501 +501 @@
 
     countW = MultiByteToWideChar(cp, 0, src, count, NULL, 0);
-    if((srcW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR))))
+    if((srcW = HeapAlloc(GetProcessHeap(), 0, countW * sizeof(WCHAR))) != NULL)
     {
         MultiByteToWideChar(cp, 0, src, count, srcW, countW);

trunk/src/kernel32/dosdevice.cpp

@@ -169 +169 @@
         strcpy(buffer,"\\DEV\\");
         strcat(buffer,devname);
-        if ((s=strchr(buffer,':'))) *s='\0';
+        if ((s=strchr(buffer,':')) != NULL) *s='\0';
         lstrcpynA(target,buffer,bufsize);
         return strlen(buffer)+1;

trunk/src/kernel32/environ.cpp

@@ -245 +245 @@
         if (*src != '%')
         {
-            if ((p = strchr( src, '%' ))) len = p - src;
+            if ((p = strchr( src, '%' )) != NULL) len = p - src;
             else len = strlen(src);
             var = src;
@@ -252 +252 @@
         else  /* we are at the start of a variable */
         {
-            if ((p = strchr( src + 1, '%' )))
+            if ((p = strchr( src + 1, '%' )) != NULL)
             {
                 len = p - src - 1;  /* Length of the variable name */   
                 if ((var = ENV_FindVariable( GetEnvironmentStringsA(),
-                                             src + 1, len )))
+                                             src + 1, len )) != NULL)
                 {
                     src += len + 2;  /* Skip the variable name */

trunk/src/kernel32/heapstring.cpp

@@ -348 +348 @@
 
     WCHAR *p = dest;
-    while ((*p++ = *src++));
+    while ((*p++ = *src++) != 0);
 
     return dest;

trunk/src/kernel32/ole2nls.c

@@ -779 +779 @@
     char    acRealKey[128];
 
-    if ( (pacKey = GetLocaleSubkeyName(lctype)) )
+    if ( (pacKey = GetLocaleSubkeyName(lctype)) != NULL)
     {
         sprintf( acRealKey, "Control Panel\\International\\%s", pacKey );
@@ -786 +786 @@
         {
             if ( RegSetValueExA( hKey, NULL, 0, REG_SZ,
-                                 data, strlen(data)+1 ) != ERROR_SUCCESS )
+                                 (LPSTR)data, strlen(data)+1 ) != ERROR_SUCCESS )
             {
                 ERR("SetLocaleInfoA: %s did not work\n", pacKey );
@@ -1359 +1359 @@
 }
 
+/******************************************************************************
+ *      identityW   [Internal]
+ */
+static WCHAR identityW(WCHAR c)
+{
+  return c;
+}
+
 /*************************************************************************
  *              LCMapStringA                [KERNEL32.492]
@@ -1902 +1910 @@
   else
   {
+#ifdef __WIN32OS2__
+    WCHAR (*f)(WCHAR)=identityW;
+#else
     int (*f)(int)=identity;
+#endif
 
     if (dstlen==0)
@@ -2150 +2162 @@
    its possible that it fails when the time looks like ss:mm:hh as example*/
    if (tflags & (TIME_NOMINUTESORSECONDS))
-   { if ((pos = strstr ( format, ":mm")))
+   { if ((pos = strstr ( format, ":mm")) != NULL)
      { memcpy ( pos, pos+3, strlen(format)-(pos-format)-2 );
      }
    }
    if (tflags & (TIME_NOSECONDS))
-   { if ((pos = strstr ( format, ":ss")))
+   { if ((pos = strstr ( format, ":ss")) != NULL)
      { memcpy ( pos, pos+3, strlen(format)-(pos-format)-2 );
      }
@@ -3745 +3757 @@
   }
   else
-  { thistime = xtime;
+  { thistime = (LPSYSTEMTIME)xtime;
   /* Check that hour,min and sec is in range */
   }
@@ -3794 +3806 @@
     }
     else
-    { thistime = xtime;
+    { thistime = (LPSYSTEMTIME)xtime;
     }
 

trunk/src/kernel32/profile.cpp

@@ -986 +986 @@
     InitializeCriticalSection( &PROFILE_CritSect );
     MakeCriticalSectionGlobal( &PROFILE_CritSect );
+    return 1;
 }
 
@@ -1404 +1405 @@
             while(*string) {
                 LPSTR buf=HEAP_strdupA( GetProcessHeap(), 0, string );
-                if((p=strchr( buf, '='))){
+                if((p=strchr( buf, '=')) != NULL){
                     *p='\0';
                     ret = PROFILE_SetString( section, buf, p+1 );

trunk/src/kernel32/winimagepeldr.cpp

@@ -503 +503 @@
     if(!(dwFlags & FLAG_PELDR_LOADASDATAFILE))
     {
-        if(tlsDir = (IMAGE_TLS_DIRECTORY *)ImageDirectoryOffset(peview, IMAGE_DIRECTORY_ENTRY_TLS))
+        if((tlsDir = (IMAGE_TLS_DIRECTORY *)ImageDirectoryOffset(peview, IMAGE_DIRECTORY_ENTRY_TLS)) != NULL)
         {
             Section *sect;