commit d8a8c1131df003612e2f571cb36aec64d402c440
author Alexandre Julliard <julliard@winehq.org> Fri Oct 12 18:45:29 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Oct 12 18:45:29 2001 +0000
tree c7c0b59ba0d0f6de261d83cc3ba18fa1f7ff597c
parent 2ff4faf66d8e834aa280b97220f5b043525e3fe4

Added atom_t type for atoms to make sure we use the same type
everywhere. Handle MIN_STR_ATOM offset in the server.

memory/atom.c

diff --git a/memory/atom.c b/memory/atom.c
index 0917c0f..0f6b9f8 100644
--- a/memory/atom.c
+++ b/memory/atom.c
@@ -431,7 +431,7 @@
         {
             MultiByteToWideChar( CP_ACP, 0, str, strlen(str), server_data_ptr(req), len );
             req->local = local;
-            if (!SERVER_CALL_ERR()) atom = req->atom + MIN_STR_ATOM;
+            if (!SERVER_CALL_ERR()) atom = req->atom;
         }
         SERVER_END_VAR_REQ;
     }
@@ -486,7 +486,7 @@
         {
             memcpy( server_data_ptr(req), str, len * sizeof(WCHAR) );
             req->local = local;
-            if (!SERVER_CALL_ERR()) atom = req->atom + MIN_STR_ATOM;
+            if (!SERVER_CALL_ERR()) atom = req->atom;
         }
         SERVER_END_VAR_REQ;
     }
@@ -521,7 +521,7 @@
     {
         SERVER_START_REQ( delete_atom )
         {
-            req->atom = atom - MIN_STR_ATOM;
+            req->atom = atom;
             req->local = local;
             if (!SERVER_CALL_ERR()) atom = 0;
         }
@@ -576,7 +576,7 @@
         {
             MultiByteToWideChar( CP_ACP, 0, str, strlen(str), server_data_ptr(req), len );
             req->local = local;
-            if (!SERVER_CALL_ERR()) atom = req->atom + MIN_STR_ATOM;
+            if (!SERVER_CALL_ERR()) atom = req->atom;
         }
         SERVER_END_VAR_REQ;
     }
@@ -630,7 +630,7 @@
         {
             memcpy( server_data_ptr(req), str, len * sizeof(WCHAR) );
             req->local = local;
-            if (!SERVER_CALL_ERR()) atom = req->atom + MIN_STR_ATOM;
+            if (!SERVER_CALL_ERR()) atom = req->atom;
         }
         SERVER_END_VAR_REQ;
     }
@@ -682,7 +682,7 @@
         len = 0;
         SERVER_START_VAR_REQ( get_atom_name, MAX_ATOM_LEN * sizeof(WCHAR) )
         {
-            req->atom = atom - MIN_STR_ATOM;
+            req->atom = atom;
             req->local = local;
             if (!SERVER_CALL_ERR())
             {
@@ -768,7 +768,7 @@
         len = 0;
         SERVER_START_VAR_REQ( get_atom_name, MAX_ATOM_LEN * sizeof(WCHAR) )
         {
-            req->atom = atom - MIN_STR_ATOM;
+            req->atom = atom;
             req->local = local;
             if (!SERVER_CALL_ERR())
             {