commit cb1fc735f05cd4ca992c5db97c3f0b4a3dec8ab5
author Alexandre Julliard <julliard@winehq.org> Mon Jan 24 21:58:06 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Jan 24 21:58:06 2000 +0000
tree c31321f540318ec82cf32aa7fe1a4747b78f2804
parent 2646fb604782ce9de6a06a7eb5191d963bad8f94

Changed the server to return STATUS_* error codes.

server/handle.c

diff --git a/server/handle.c b/server/handle.c
index be81511..4b8ccc9 100644
--- a/server/handle.c
+++ b/server/handle.c
@@ -10,7 +10,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "winerror.h"
 #include "winbase.h"
 
 #include "handle.h"
@@ -150,7 +149,7 @@
     count *= 2;
     if (!(new_entries = realloc( table->entries, count * sizeof(struct handle_entry) )))
     {
-        set_error( ERROR_OUTOFMEMORY );
+        set_error( STATUS_NO_MEMORY );
         return 0;
     }
     table->entries = new_entries;
@@ -225,7 +224,7 @@
     return entry;
 
  error:
-    set_error( ERROR_INVALID_HANDLE );
+    set_error( STATUS_INVALID_HANDLE );
     return NULL;
 }
 
@@ -291,7 +290,7 @@
     if (!(entry = get_handle( process, handle ))) return 0;
     if (entry->access & RESERVED_CLOSE_PROTECT)
     {
-        set_error( ERROR_INVALID_HANDLE );
+        set_error( STATUS_INVALID_HANDLE );
         return 0;
     }
     obj = entry->ptr;
@@ -340,14 +339,14 @@
         if (!(entry = get_handle( process, handle ))) return NULL;
         if ((entry->access & access) != access)
         {
-            set_error( ERROR_ACCESS_DENIED );
+            set_error( STATUS_ACCESS_DENIED );
             return NULL;
         }
         obj = entry->ptr;
     }
     if (ops && (obj->ops != ops))
     {
-        set_error( ERROR_INVALID_HANDLE );  /* not the right type */
+        set_error( STATUS_OBJECT_TYPE_MISMATCH );  /* not the right type */
         return NULL;
     }
     return grab_object( obj );
@@ -362,7 +361,7 @@
     if (get_magic_handle( handle ))
     {
         /* we can retrieve but not set info for magic handles */
-        if (mask) set_error( ERROR_ACCESS_DENIED );
+        if (mask) set_error( STATUS_ACCESS_DENIED );
         return 0;
     }
     if (!(entry = get_handle( process, handle ))) return -1;
@@ -409,13 +408,13 @@
     if (obj)
     {
         if (ops && obj->ops != ops)
-            set_error( ERROR_INVALID_HANDLE );
+            set_error( STATUS_OBJECT_TYPE_MISMATCH );
         else
             handle = alloc_handle( current->process, obj, access, inherit );
         release_object( obj );
     }
     else
-        set_error( ERROR_FILE_NOT_FOUND );
+        set_error( STATUS_OBJECT_NAME_NOT_FOUND );
     return handle;
 }