Changeset 7832 for trunk/src

Timestamp:

Feb 7, 2002, 5:34:54 PM (24 years ago)

Author:

sandervl

Message:

codepage, getlocaleinfo + thread tib updates

Location:

trunk/src/kernel32

Files:

• KERNEL32.DEF (modified) (3 diffs)
• codepage.c (added)
• codepage.cpp (deleted)
• heapstring.cpp (modified) (6 diffs)
• kernel32.mak (modified) (2 diffs)
• kernelrsrc.orc (modified) (2 diffs)
• lang.cpp (modified) (4 diffs)
• ole2nls.c (added)
• ole2nls.cpp (deleted)

trunk/src/kernel32/KERNEL32.DEF

@@ -1 @@
-; $Id: KERNEL32.DEF,v 1.129 2002-02-06 16:33:38 sandervl Exp $
+; $Id: KERNEL32.DEF,v 1.130 2002-02-07 16:34:51 sandervl Exp $
 
 ;Basis is Windows95 KERNEL32
@@ -1192 +1192 @@
     strncmpiW                                                     @2022 NONAME
 
-    GetDisplayCodepage__Fv                                        @3000 NONAME
-    GetWindowsCodepage__Fv                                        @3001 NONAME
+    GetDisplayCodepage                                            @3000 NONAME
+    GetWindowsCodepage                                            @3001 NONAME
 
 ; ODIN debugging functions
@@ -1205 +1205 @@
     _dbg_ThreadPushCall@4                                         @3107 NONAME
     _dbg_ThreadPopCall@0                                          @3108 NONAME
-

trunk/src/kernel32/heapstring.cpp

@@ -1 @@
-/* $Id: heapstring.cpp,v 1.48 2001-11-30 17:50:42 phaller Exp $ */
+/* $Id: heapstring.cpp,v 1.49 2002-02-07 16:34:52 sandervl Exp $ */
 /*
  * Project Odin Software License can be found in LICENSE.TXT
@@ -92 +92 @@
 
 ODINFUNCTIONNODBG1(int, lstrlenW,
-                   LPCWSTR, arg1)
-{
-  int rc;
-
-  if(arg1 == NULL) {
+                   LPCWSTR, str)
+{
+  if(str == NULL) {
       SetLastError( ERROR_INVALID_PARAMETER );
       return 0;
   }
 
-  rc = UniStrlen( (UniChar*)arg1);
+  const WCHAR *s = str;
+  while (*s) s++;
   dprintf2(("KERNEL32: lstrlenW(%08xh) returns %d\n",
-           arg1,
-           rc));
-  return rc;
+            str, s - str));
+
+  return s - str;
 }
 
@@ -149 +148 @@
 
 ODINFUNCTIONNODBG2(LPWSTR, lstrcatW,
-                   LPWSTR, arg1,
-                   LPCWSTR, arg2)
-{
-  dprintf2(("KERNEL32: OS2lstrcatW(%08xh,%08xh)\n",
-           arg1,
-           arg2));
-
-  if(arg2 == NULL)
-    return arg1;
-
-  UniStrcat( (UniChar*) arg1, (UniChar*) arg2 );
-  return arg1;
+                   LPWSTR, dst,
+                   LPCWSTR, src)
+{
+    dprintf2(("KERNEL32: OS2lstrcatW(%08xh,%08xh)\n",
+              dst, src));
+
+    if(src == NULL)
+        return dst;
+
+    strcpyW( dst + strlenW(dst), src );
+    return dst;
 }
 
@@ -375 +373 @@
         return NULL;
 
-    UniStrcpy( (UniChar*)dest,
-               (UniChar*)src );
+    WCHAR *p = dest;
+    while ((*p++ = *src++));
+
     return dest;
 }
@@ -432 +431 @@
 
 ODINFUNCTION3(LPWSTR, lstrcpynW,
-              LPWSTR, dest,
+              LPWSTR, dst,
               LPCWSTR, src,
-              int, arg3)
-{
-  if (arg3 == 0)
-    return NULL;
-
-  UniStrncpy( (UniChar*)dest,
-              (UniChar*)src,
-              arg3-1); //CB: copy arg3-1 characters
-  dest[arg3-1] = 0; //CB: set end
-  return dest;
+              int, n)
+{
+    LPWSTR p = dst;
+
+    /* In real windows the whole function is protected by an exception handler
+     * that returns ERROR_INVALID_PARAMETER on faulty parameters
+     * We currently just check for NULL.
+     */
+    if (!dst || !src) {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return 0;
+    }
+    while ((n-- > 1) && *src) *p++ = *src++;
+    if (n >= 0) *p = 0;
+    return dst;
 }
 
@@ -587 +591 @@
     lstrcpynWtoA(ascii,
                unicode,
-               UniStrlen((UniChar*)unicode)+1); //end included
+               lstrlenW((UniChar*)unicode)+1); //end included
 
     return ascii;

trunk/src/kernel32/kernel32.mak

@@ -1 @@
-# $Id: kernel32.mak,v 1.21 2002-02-03 13:16:22 sandervl Exp $
+# $Id: kernel32.mak,v 1.22 2002-02-07 16:34:52 sandervl Exp $
 
 #
@@ -142 +142 @@
 $(ODIN32_LIB)/$(ODINCRT).lib \
 $(ODIN32_LIB)\wgss50.LIB \
-$(ODIN32_LIB)\LIBULS.LIB \
-$(ODIN32_LIB)\LIBCONV.LIB \
 $(ODIN32_LIB)\WIN32K.LIB \
 $(ODIN32_LIB)\UNICODE.LIB \

trunk/src/kernel32/kernelrsrc.orc

@@ -1 @@
-/* $Id: kernelrsrc.orc,v 1.2 2000-08-19 13:00:30 sandervl Exp $ */
+/* $Id: kernelrsrc.orc,v 1.3 2002-02-07 16:34:52 sandervl Exp $ */
 
 #include "winuser.h"
@@ -40 +40 @@
     END
 END
+
+#include "nls\locale_rc.rc"

trunk/src/kernel32/lang.cpp

@@ -1 @@
-/* $Id: lang.cpp,v 1.38 2001-10-28 17:15:33 sandervl Exp $ */
+/* $Id: lang.cpp,v 1.39 2002-02-07 16:34:53 sandervl Exp $ */
 /*
  * Win32 language API functions for OS/2
@@ -182 +182 @@
   if (wbuf)
   {
-    if (*pLen > UniStrlen(lpUniStr))
-      UniStrcpy(wbuf,lpUniStr);
+    if (*pLen > lstrlenW(lpUniStr))
+      lstrcpyW(wbuf,lpUniStr);
     else
     {
@@ -192 +192 @@
   }
 
-  *pLen=UniStrlen(lpUniStr)+1; // + null terminator
+  *pLen=lstrlenW(lpUniStr)+1; // + null terminator
 
   return TRUE;
 }
+//replaced by Wine functions in ole2nls.c
+#if 0
 //******************************************************************************
 //******************************************************************************
@@ -894 +896 @@
   return (ret_len);
 }
+#endif
 //******************************************************************************
 //******************************************************************************