Changeset 6607 for trunk/src

Timestamp:

Aug 29, 2001, 7:15:11 PM (24 years ago)

Author:

phaller

Message:

.

File:

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

trunk/src/kernel32/ole2nls.cpp

@@ -39 +39 @@
 #ifdef __WIN32OS2__
 #include <wctype.h>
+#include <unicode.h>
 
 #define DBG_LOCALLOG    DBG_kernel32
@@ -3242 +3243 @@
                               LPWSTR date, INT datelen)
 {
+  // convert "format" on passing in into ASCII
+  LPSTR pszAsciiFormat = UnicodeToAsciiString((LPWSTR) format);
+  LPSTR pszAsciiDate = (char *)alloca(datelen);
+  
+  TRACE("Kernel32-ole2nls: GetDateFormatW(0x%04lx,0x%08lx,%p,%s,%p,%d) not yet complete\n",
+              locale,flags,xtime,pszAsciiFormat,date,datelen);
+
+  // call ASCII variant
+  int rc = GetDateFormatA(locale,
+                          flags,
+                          xtime,
+                          pszAsciiFormat,
+                          pszAsciiDate,
+                          datelen);  // is in "characters", not bytes
+    
+  FreeAsciiString(pszAsciiFormat);
+  
+  // convert "date" on returning to UNICODE
+  if (datelen != 0)
+  {
+    // in this case 'rc' holds the number of characters to convert
+    lstrcpynAtoW(date, pszAsciiDate, rc);
+  }
+  
+  return rc;
+  
+#if PH_OFF
    unsigned short datearr[] = {'1','9','9','4','-','1','-','1',0};
 
@@ -3247 +3275 @@
    lstrcpynW(date, datearr, datelen);
    return (  datelen < 9) ? datelen : 9;
-   
-   
+#endif
 }