Changeset 10251 for trunk/src/kernel32/atom.cpp

Timestamp:

Sep 18, 2003, 4:21:07 PM (22 years ago)

Author:

sandervl

Message:

KOM: DBCS fixes

File:

• trunk/src/kernel32/atom.cpp (modified) (13 diffs)

trunk/src/kernel32/atom.cpp

@@ -1 @@
-/* $Id: atom.cpp,v 1.12 2002-02-12 11:43:31 sandervl Exp $ */
+/* $Id: atom.cpp,v 1.13 2003-09-18 14:21:07 sandervl Exp $ */
 
 /*
@@ -21 +21 @@
 #include <misc.h>
 
-#define DBG_LOCALLOG    DBG_atom
+#define DBG_LOCALLOG    DBG_atom
 #include "dbglocal.h"
 
@@ -54 +54 @@
 {
     if(privateAtomTable == NULL) {
-        privateAtomTable = WinCreateAtomTable(0, 37); 
+        privateAtomTable = WinCreateAtomTable(0, 37);
     }
     return privateAtomTable;
@@ -63 +63 @@
 {
     if(systemAtomTable == NULL) {
-        systemAtomTable = WinQuerySystemAtomTable(); 
+        systemAtomTable = WinQuerySystemAtomTable();
     }
     return systemAtomTable;
@@ -81 +81 @@
 //******************************************************************************
 ATOM WIN32API FindAtomA( LPCSTR atomName)
-{ 
+{
     HATOMTBL atomTable = getPrivateAtomTable();
     ATOM     atom = 0;
- 
+
     if(HIWORD(atomName)) {
          dprintf(("FindAtomA %s", atomName));
@@ -91 +91 @@
 
     if(atomTable != NULL) {
-        atom = LookupAtom(atomTable, HIWORD(atomName) ? 
+        atom = LookupAtom(atomTable, HIWORD(atomName) ?
                           (PSZ) atomName : (PSZ) (LOWORD(atomName) | 0xFFFF0000),
                           LOOKUP_FIND | LOOKUP_NOCASE);
@@ -130 +130 @@
     if(atomTable != NULL)
     {
-        atom = LookupAtom(atomTable, HIWORD(atomName) ? 
+        atom = LookupAtom(atomTable, HIWORD(atomName) ?
                           (PSZ) atomName : (PSZ) (LOWORD(atomName) | 0xFFFF0000),
                           LOOKUP_ADD | LOOKUP_NOCASE);
@@ -136 +136 @@
 
     if(HIWORD(atomName)) {
-         dprintf(("KERNEL32: AddAtomA %s returned %x", atomName, atom));
+         dprintf(("KERNEL32: AddAtomA %s returned %x", atomName, atom));
     }
     else dprintf(("KERNEL32: AddAtomA %x returned %x", atomName, atom));
@@ -191 +191 @@
 
     dprintf(("KERNEL32: GetAtomNameW %x %x %d", atom, lpszBuffer, cchBuffer));
-    astring = (char *)alloca(cchBuffer);
+    astring = (char *)alloca(cchBuffer * sizeof( WCHAR ));
     if(astring == NULL) {
-        dprintf(("GlobalGetAtomNameW: alloca failed!!"));
-        DebugInt3();
-        return 0;
-    }
-    rc = GetAtomNameA(atom, astring, cchBuffer);
+    dprintf(("GlobalGetAtomNameW: alloca failed!!"));
+    DebugInt3();
+    return 0;
+    }
+    rc = GetAtomNameA(atom, astring, cchBuffer * sizeof( WCHAR ));
     if(rc) {
-         lstrcpyAtoW(lpszBuffer, astring);
+         lstrcpynAtoW(lpszBuffer, astring, cchBuffer);
     }
     else lpszBuffer[0] = 0; //necessary?
-    return rc;
+    return lstrlenW( lpszBuffer );
 }
 //******************************************************************************
@@ -236 +236 @@
     if(atomTable != NULL)
     {
-        atom = LookupAtom(atomTable, HIWORD(atomName) ? 
+        atom = LookupAtom(atomTable, HIWORD(atomName) ?
                           (PSZ) atomName : (PSZ) (LOWORD(atomName) | 0xFFFF0000),
                           LOOKUP_ADD | LOOKUP_NOCASE);
@@ -242 +242 @@
 
     if(HIWORD(atomName)) {
-         dprintf(("KERNEL32: GlobalAddAtomA %s returned %x", atomName, atom));
+         dprintf(("KERNEL32: GlobalAddAtomA %s returned %x", atomName, atom));
     }
     else dprintf(("KERNEL32: GlobalAddAtomA %x returned %x", atomName, atom));
@@ -283 +283 @@
     else dprintf(("KERNEL32: GlobalFindAtomA %x", atomName));
 
-    atom = LookupAtom(atomTable, HIWORD(atomName) ? 
+    atom = LookupAtom(atomTable, HIWORD(atomName) ?
                       (PSZ) atomName : (PSZ) (LOWORD(atomName) | 0xFFFF0000),
                       LOOKUP_FIND | LOOKUP_NOCASE);
@@ -340 +340 @@
 
     dprintf(("KERNEL32: GlobalGetAtomNameW %x %x %d", atom, lpszBuffer, cchBuffer));
-    astring = (char *)alloca(cchBuffer);
+    astring = (char *)alloca(cchBuffer * sizeof( WCHAR ));
     if(astring == NULL) {
-        dprintf(("GlobalGetAtomNameW: alloca failed!!"));
-        DebugInt3();
-        return 0;
-    }
-    rc = GlobalGetAtomNameA(atom, astring, cchBuffer);
+    dprintf(("GlobalGetAtomNameW: alloca failed!!"));
+    DebugInt3();
+    return 0;
+    }
+    rc = GlobalGetAtomNameA(atom, astring, cchBuffer * sizeof( WCHAR ));
     if(rc) {
-         lstrcpyAtoW(lpszBuffer, astring);
+         lstrcpynAtoW(lpszBuffer, astring, cchBuffer);
     }
     else lpszBuffer[0] = 0; //necessary?
-    return rc;
-}
-//******************************************************************************
-//******************************************************************************
+    return lstrlenW( lpszBuffer );
+}
+//******************************************************************************
+//******************************************************************************