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

Timestamp:

Oct 14, 1999, 3:47:39 AM (26 years ago)

Author:

bird

Message:

Temporary fix for some W functions.
I'll do a permanent fix for all W functions later.

File:

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

trunk/src/kernel32/atom.cpp

@@ -1 @@
-/* $Id: atom.cpp,v 1.4 1999-06-10 20:47:54 phaller Exp $ */
+/* $Id: atom.cpp,v 1.5 1999-10-14 01:47:39 bird Exp $ */
 
 /*
@@ -28 +28 @@
 
     dprintf(("KERNEL32:  OS2FindAtomW"));
-    astring = UnicodeToAsciiString((LPWSTR)arg1);
-    rc = O32_FindAtom(astring);
-    FreeAsciiString(astring);
+    if (arg1 < (LPCWSTR)0x10000)
+        rc = O32_FindAtom((char*)arg1);
+    else
+    {
+        astring = UnicodeToAsciiString((LPWSTR)arg1);
+        rc = O32_FindAtom(astring);
+        FreeAsciiString(astring);
+    }
     return(rc);
 }
@@ -48 +53 @@
 
     dprintf(("KERNEL32:  OS2AddAtomW\n"));
-    astring = UnicodeToAsciiString((LPWSTR)arg1);
-    rc = O32_AddAtom(astring);
-    FreeAsciiString(astring);
+    if (arg1 < (LPCWSTR)0x10000)
+        rc = O32_AddAtom((char*)arg1);
+    else
+    {
+        astring = UnicodeToAsciiString((LPWSTR)arg1);
+        rc = O32_AddAtom(astring);
+        FreeAsciiString(astring);
+    }
     return(rc);
 }
@@ -70 +80 @@
 
     dprintf(("KERNEL32:  OS2GetAtomNameW\n"));
-    astring = UnicodeToAsciiString(arg2);
+    astring = UnicodeToAsciiString(arg2); /* FIXME! */
     rc = O32_GetAtomName(arg1, astring, arg3);
     FreeAsciiString(astring);
@@ -110 +120 @@
  ATOM  rc;
 
-    astring = UnicodeToAsciiString((LPWSTR)arg1);
-    dprintf(("KERNEL32:  OS2GlobalAddAtomW %s\n", astring));
-    rc = O32_GlobalAddAtom(astring);
-    FreeAsciiString(astring);
+    if (arg1 < (LPCWSTR)0x10000)
+    {
+        dprintf(("KERNEL32:  OS2GlobalAddAtomW %#4x\n", astring));
+        rc = O32_GlobalAddAtom((char*)arg1);
+    }
+    else
+    {
+        astring = UnicodeToAsciiString((LPWSTR)arg1);
+        dprintf(("KERNEL32:  OS2GlobalAddAtomW %s\n", astring));
+        rc = O32_GlobalAddAtom(astring);
+        FreeAsciiString(astring);
+    }
     return(rc);
 }
@@ -131 +149 @@
 
     dprintf(("KERNEL32:  OS2GlobalFindAtomW\n"));
-    astring = UnicodeToAsciiString((LPWSTR)arg1);
-    rc = O32_GlobalFindAtom(astring);
-    FreeAsciiString(astring);
+    if (arg1 < (LPCWSTR)0x10000)
+        rc = O32_GlobalFindAtom((char*)arg1);
+    else
+    {
+        astring = UnicodeToAsciiString((LPWSTR)arg1);
+        rc = O32_GlobalFindAtom(astring);
+        FreeAsciiString(astring);
+    }
     return(rc);
 }
@@ -151 +174 @@
 
     dprintf(("KERNEL32:  OS2GlobalGetAtomNameW\n"));
-    astring = UnicodeToAsciiString((LPWSTR)arg1);
+    astring = UnicodeToAsciiString((LPWSTR)arg1); /* FIXME! */
     rc = O32_GlobalGetAtomName(arg1, astring, arg3);
     FreeAsciiString(astring);