commit c8ab54d158ebbb5b81c1ba11d02c819c2b8280d0
author Dmitry Timoshkov <dmitry@baikal.ru> Fri Oct 04 17:45:00 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Oct 04 17:45:00 2002 +0000
tree d37a4a6cd79e605c564ead97dd6c826fb36b5b48
parent 3139b927b20bd9728eb9623e8c6bd95fd41d3c36

Fixed atom test to work on Windows.

memory/atom.c

diff --git a/memory/atom.c b/memory/atom.c
index cd69ee8..6aa1240 100644
--- a/memory/atom.c
+++ b/memory/atom.c
@@ -131,7 +131,7 @@
         }
         if (*atomstr) return FALSE;
     }
-    if (!atom || (atom >= MAXINTATOM))
+    if (atom >= MAXINTATOM)
     {
         SetLastError( ERROR_INVALID_PARAMETER );
         atom = 0;
@@ -158,7 +158,7 @@
         }
         if (*atomstr) return FALSE;
     }
-    if (!atom || (atom >= MAXINTATOM))
+    if (atom >= MAXINTATOM)
     {
         SetLastError( ERROR_INVALID_PARAMETER );
         atom = 0;
@@ -502,18 +502,17 @@
 static ATOM ATOM_DeleteAtom( ATOM atom,  BOOL local)
 {
     TRACE( "(%s) %x\n", local ? "local" : "global", atom );
-    if (atom < MAXINTATOM) atom = 0;
-    else
+    if (atom >= MAXINTATOM)
     {
         SERVER_START_REQ( delete_atom )
         {
             req->atom = atom;
             req->local = local;
-            if (!wine_server_call_err( req )) atom = 0;
+            wine_server_call_err( req );
         }
         SERVER_END_REQ;
     }
-    return atom;
+    return 0;
 }
 
 
@@ -775,11 +774,6 @@
         SERVER_END_REQ;
         if (!len) return 0;
     }
-    if (count <= len)
-    {
-        SetLastError( ERROR_MORE_DATA );
-        return 0;
-    }
     TRACE( "(%s) %x -> %s\n", local ? "local" : "global", atom, debugstr_w(buffer) );
     return len;
 }