Changeset 2485 for trunk/src/kernel32/heapstring.cpp

Timestamp:

Jan 20, 2000, 10:40:26 PM (26 years ago)

Author:

sandervl

Message:

VT: Codepages changes/bugfixes

File:

• trunk/src/kernel32/heapstring.cpp (modified) (10 diffs)

trunk/src/kernel32/heapstring.cpp

@@ -1 @@
-/* $Id: heapstring.cpp,v 1.24 2000-01-15 15:42:49 sandervl Exp $ */
+/* $Id: heapstring.cpp,v 1.25 2000-01-20 21:40:26 sandervl Exp $ */
 
 /*
@@ -27 +27 @@
 #include <heapstring.h>
 #include "misc.h"
-
+#include "codepage.h"
 
 /*****************************************************************************
@@ -34 +34 @@
 
 ODINDEBUGCHANNEL(KERNEL32-HEAPSTRING)
-
-
-/*****************************************************************************
- * Name      :
- * Purpose   :
- * Parameters:
- * Variables :
- * Result    :
- * Remark    :
- * Status    :
- *
- * Author    : Patrick Haller [Thu, 1999/08/05 20:46]
- *****************************************************************************/
-
-static UconvObject uconv_object = NULL;
-
-static BOOL getUconvObject( void )
-{
-  int rc;
-  BOOL ret;
-
-  if ( uconv_object )
-    ret = TRUE;
-  else
-  {
-    rc = UniCreateUconvObject( (UniChar*)L"",
-                              &uconv_object );
-    if ( rc == ULS_SUCCESS )
-      ret = TRUE;
-    else
-    {
-      uconv_object = NULL;  // to make sure
-      return FALSE;
-    }
-    dprintf2(("KERNEL32: HeapString: UniCreateUconvObject(%d)\n",
-             rc));
-  }
-  return ret;
-}
-
 
 /*****************************************************************************
@@ -515 +475 @@
 // returns string length
 
-int WIN32API lstrcpynWtoA(LPSTR  astring,
+int WIN32API lstrcpynCtoA(LPSTR  astring,
                           LPCWSTR ustring,
-                          int    unilen)
+                          int    unilen,
+                          UconvObject uconv_object)
 {
   int      i;
@@ -537 +498 @@
     return 0;
 
-  if (getUconvObject())
+  if (uconv_object)
   {
     if (unilen == 1)
@@ -578 +539 @@
 }
 
+int WIN32API lstrcpynWtoA(LPSTR  astring,
+                          LPCWSTR ustring,
+                          int    unilen)
+{
+    return lstrcpynCtoA(astring, ustring, unilen, GetWindowsUconvObject());
+}
+
 
 /*****************************************************************************
@@ -593 +561 @@
 // asciilen: max length of unicode buffer (including end 0)
 // @@@PH 0 termination is NOT necessarily included !
-int WIN32API lstrcpynAtoW(LPWSTR unicode,
-                          LPCSTR  ascii,
-                          int    asciilen)
+int lstrcpynAtoC(LPWSTR unicode,
+                 LPCSTR  ascii,
+                 int    asciilen,
+                 UconvObject uconv_object)
 {
   int      rc;
@@ -620 +589 @@
     return 0; //nothing to do
 
-  if (getUconvObject())
+  if (uconv_object)
   {
     //@@@PH what's this?
@@ -637 +606 @@
     in_bytes_left = strlen(in_buf)+1;
     in_bytes_left = asciilen = min(in_bytes_left, asciilen); //buffer size in bytes
-    
+
     out_buf = (UniChar*)unicode;
 
@@ -670 +639 @@
 }
 
+int WIN32API lstrcpynAtoW(LPWSTR unicode,
+                          LPCSTR  ascii,
+                          int    asciilen)
+{
+    return lstrcpynAtoC(unicode, ascii, asciilen, GetWindowsUconvObject());
+}
 
 /*****************************************************************************