Changeset 1458 for trunk/src/kernel32/lang.cpp

Timestamp:

Oct 26, 1999, 7:54:16 PM (26 years ago)

Author:

sandervl

Message:

FS fixes in GetLocaleInfoA/W

File:

• trunk/src/kernel32/lang.cpp (modified) (3 diffs)

trunk/src/kernel32/lang.cpp

@@ -59 +59 @@
 }
 
-/*****************************************************************************
- * Name      : DWORD GetLocaleInfoA
- * Purpose   : The GetLocaleInfoA function returns specific locale information
- * Parameters: LCID   lcid    locale identifier
- *             LCTYPE LCType  type of information
- *             LPSTR  buf     address of buffer for information
- *             int    len     size of buffer
- * Variables :
- * Result    : size of target buffer
- * Remark    : In this version LOCALE_SYSTEM_DEFAULT == LOCALE_USER_DEFAULT
- *             look into GetLocaleInfoW
- *
- * Status    : TESTED
- *
- * Author    : Przemyslaw Dobrowolski [Tue, 1999/07/21 12:18]
- *****************************************************************************/
-int WIN32API GetLocaleInfoA(LCID lcid, LCTYPE LCType, LPSTR buf, int len)
-{
-  LPWSTR lpWStr;
-  int    ret_len;
-
-  if (len && (! buf) )
-  {
-    SetLastError(ERROR_INSUFFICIENT_BUFFER);
-    return 0;
-  }
-
-  dprintf(("KERNEL32:  OS2GetLocaleInfoA lcID=%d,lcType=%x,buf=%X,len=%d\n",lcid,LCType,buf,len));
-
-  if (buf)
-    lpWStr=(LPWSTR)malloc(len*(sizeof(WCHAR)));
-  else
-    lpWStr=NULL; // Query for buffer size
-
-  ret_len=GetLocaleInfoW(lcid, LCType, lpWStr, len);
-
-  if (ret_len && buf)
-  {
-    UnicodeToAscii(lpWStr,buf);
-    free(lpWStr);
-  }
-
-  dprintf(("KERNEL32:  OS2GetLocaleInfoA returned %d\n",ret_len));
-
-  return (ret_len);
-}
 //******************************************************************************
 //******************************************************************************
@@ -176 +130 @@
  * Author    : Przemyslaw Dobrowolski [Tue, 1999/07/22 17:07]
  *****************************************************************************/
-int WIN32API GetLocaleInfoW(LCID lcid, LCTYPE LCType, LPWSTR wbuf, int len)
+ODINFUNCTION4(int, GetLocaleInfoW, LCID, lcid, LCTYPE, LCType, LPWSTR, wbuf, 
+              int, len)
 {
   LocaleObject    locale_object = NULL;
@@ -760 +715 @@
   return (ulInfoLen);
 }
-
+/*****************************************************************************
+ * Name      : DWORD GetLocaleInfoA
+ * Purpose   : The GetLocaleInfoA function returns specific locale information
+ * Parameters: LCID   lcid    locale identifier
+ *             LCTYPE LCType  type of information
+ *             LPSTR  buf     address of buffer for information
+ *             int    len     size of buffer
+ * Variables :
+ * Result    : size of target buffer
+ * Remark    : In this version LOCALE_SYSTEM_DEFAULT == LOCALE_USER_DEFAULT
+ *             look into GetLocaleInfoW
+ *
+ * Status    : TESTED
+ *
+ * Author    : Przemyslaw Dobrowolski [Tue, 1999/07/21 12:18]
+ *****************************************************************************/
+ODINFUNCTION4(int, GetLocaleInfoA, LCID, lcid, LCTYPE, LCType, LPSTR, buf, 
+              int, len)
+{
+  LPWSTR lpWStr;
+  int    ret_len;
+
+  if (len && (! buf) )
+  {
+    SetLastError(ERROR_INSUFFICIENT_BUFFER);
+    return 0;
+  }
+
+  dprintf(("KERNEL32:  OS2GetLocaleInfoA lcID=%d,lcType=%x,buf=%X,len=%d\n",lcid,LCType,buf,len));
+
+  if (buf)
+    lpWStr=(LPWSTR)malloc(len*(sizeof(WCHAR)));
+  else
+    lpWStr=NULL; // Query for buffer size
+
+  ret_len = ODIN_GetLocaleInfoW(lcid, LCType, lpWStr, len);
+
+  if (ret_len && buf)
+  {
+    UnicodeToAscii(lpWStr,buf);
+    free(lpWStr);
+  }
+
+  dprintf(("KERNEL32:  OS2GetLocaleInfoA returned %d\n",ret_len));
+
+  return (ret_len);
+}
 //******************************************************************************
 //******************************************************************************