Changeset 21355 for trunk/src/kernel32/ole2nls.c

Timestamp:

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

Author:

rlwalsh

Message:

eliminate VACPP warning & info msgs - see Ticket #1

File:

• trunk/src/kernel32/ole2nls.c (modified) (7 diffs)

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;
     }