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/object.c

diff --git a/server/object.c b/server/object.c
index 28cfe67..71e9451 100644
--- a/server/object.c
+++ b/server/object.c
@@ -12,7 +12,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "winerror.h"
 #include "thread.h"
 #include "unicode.h"
 
@@ -53,7 +52,7 @@
 {
     void *ptr = malloc( size );
     if (ptr) memset( ptr, 0x55, size );
-    else if (current) set_error( ERROR_OUTOFMEMORY );
+    else if (current) set_error( STATUS_NO_MEMORY );
     return ptr;
 }
 
@@ -165,10 +164,10 @@
         free( name_ptr );  /* we no longer need it */
         if (obj->ops == ops)
         {
-            set_error( ERROR_ALREADY_EXISTS );
+            set_error( STATUS_OBJECT_NAME_COLLISION );
             return obj;
         }
-        set_error( ERROR_INVALID_HANDLE );
+        set_error( STATUS_OBJECT_TYPE_MISMATCH );
         return NULL;
     }
     if ((obj = alloc_object( ops, -1 )))
@@ -242,7 +241,7 @@
 
 int no_add_queue( struct object *obj, struct wait_queue_entry *entry )
 {
-    set_error( ERROR_INVALID_HANDLE );
+    set_error( STATUS_OBJECT_TYPE_MISMATCH );
     return 0;
 }
 
@@ -253,25 +252,25 @@
 
 int no_read_fd( struct object *obj )
 {
-    set_error( ERROR_INVALID_HANDLE );
+    set_error( STATUS_OBJECT_TYPE_MISMATCH );
     return -1;
 }
 
 int no_write_fd( struct object *obj )
 {
-    set_error( ERROR_INVALID_HANDLE );
+    set_error( STATUS_OBJECT_TYPE_MISMATCH );
     return -1;
 }
 
 int no_flush( struct object *obj )
 {
-    set_error( ERROR_INVALID_HANDLE );
+    set_error( STATUS_OBJECT_TYPE_MISMATCH );
     return 0;
 }
 
 int no_get_file_info( struct object *obj, struct get_file_info_request *info )
 {
-    set_error( ERROR_INVALID_HANDLE );
+    set_error( STATUS_OBJECT_TYPE_MISMATCH );
     return 0;
 }