Changed the server to return STATUS_* error codes.
diff --git a/server/registry.c b/server/registry.c
index 188725e..2136e58 100644
--- a/server/registry.c
+++ b/server/registry.c
@@ -21,7 +21,6 @@
#include "unicode.h"
#include "winbase.h"
-#include "winerror.h"
#include "winreg.h"
@@ -364,7 +363,7 @@
nb_subkeys = key->nb_subkeys + (key->nb_subkeys / 2); /* grow by 50% */
if (!(new_subkeys = realloc( key->subkeys, nb_subkeys * sizeof(*new_subkeys) )))
{
- set_error( ERROR_OUTOFMEMORY );
+ set_error( STATUS_NO_MEMORY );
return 0;
}
}
@@ -461,7 +460,7 @@
{
if (!(key = find_subkey( key, path, &index )))
{
- set_error( ERROR_FILE_NOT_FOUND );
+ set_error( STATUS_OBJECT_NAME_NOT_FOUND );
break;
}
path = get_path_token( NULL, 0 );
@@ -482,13 +481,13 @@
if (key->flags & KEY_DELETED) /* we cannot create a subkey under a deleted key */
{
- set_error( ERROR_KEY_DELETED );
+ set_error( STATUS_KEY_DELETED );
return NULL;
}
if (options & REG_OPTION_VOLATILE) flags |= KEY_VOLATILE;
else if (key->flags & KEY_VOLATILE)
{
- set_error( ERROR_CHILD_MUST_BE_VOLATILE );
+ set_error( STATUS_CHILD_MUST_BE_VOLATILE );
return NULL;
}
@@ -532,7 +531,7 @@
{
struct key *key;
- if ((index < 0) || (index > parent->last_subkey)) set_error( ERROR_NO_MORE_ITEMS );
+ if ((index < 0) || (index > parent->last_subkey)) set_error( STATUS_NO_MORE_ENTRIES );
else
{
key = parent->subkeys[index];
@@ -593,12 +592,12 @@
/* deleting this key, must find parent and index */
if (key->flags & KEY_ROOT)
{
- set_error( ERROR_ACCESS_DENIED );
+ set_error( STATUS_ACCESS_DENIED );
return;
}
if (!(parent = key->parent) || (key->flags & KEY_DELETED))
{
- set_error( ERROR_KEY_DELETED );
+ set_error( STATUS_KEY_DELETED );
return;
}
for (index = 0; index <= parent->last_subkey; index++)
@@ -610,7 +609,7 @@
parent = key;
if (!(key = find_subkey( parent, path, &index )))
{
- set_error( ERROR_FILE_NOT_FOUND );
+ set_error( STATUS_OBJECT_NAME_NOT_FOUND );
return;
}
path = get_path_token( NULL, 0 );
@@ -619,7 +618,7 @@
/* we can only delete a key that has no subkeys (FIXME) */
if ((key->flags & KEY_ROOT) || (key->last_subkey >= 0))
{
- set_error( ERROR_ACCESS_DENIED );
+ set_error( STATUS_ACCESS_DENIED );
return;
}
if (debug_level > 1) dump_operation( key, NULL, "Delete" );
@@ -638,7 +637,7 @@
nb_values = key->nb_values + (key->nb_values / 2); /* grow by 50% */
if (!(new_val = realloc( key->values, nb_values * sizeof(*new_val) )))
{
- set_error( ERROR_OUTOFMEMORY );
+ set_error( STATUS_NO_MEMORY );
return 0;
}
}
@@ -741,7 +740,7 @@
{
*type = -1;
*len = 0;
- set_error( ERROR_FILE_NOT_FOUND );
+ set_error( STATUS_OBJECT_NAME_NOT_FOUND );
}
}
@@ -754,7 +753,7 @@
{
name[0] = 0;
*len = 0;
- set_error( ERROR_NO_MORE_ITEMS );
+ set_error( STATUS_NO_MORE_ENTRIES );
}
else
{
@@ -775,7 +774,7 @@
if (!(value = find_value( key, name, &index )))
{
- set_error( ERROR_FILE_NOT_FOUND );
+ set_error( STATUS_OBJECT_NAME_NOT_FOUND );
return;
}
if (debug_level > 1) dump_operation( key, value, "Delete" );
@@ -922,7 +921,7 @@
newlen = info->len + info->len / 2;
if (!(newbuf = realloc( info->buffer, newlen )))
{
- set_error( ERROR_OUTOFMEMORY );
+ set_error( STATUS_NO_MEMORY );
return -1;
}
info->buffer = newbuf;
@@ -937,7 +936,7 @@
if (info->tmplen >= size) return 1;
if (!(tmp = realloc( info->tmp, size )))
{
- set_error( ERROR_OUTOFMEMORY );
+ set_error( STATUS_NO_MEMORY );
return 0;
}
info->tmp = tmp;
@@ -1196,7 +1195,7 @@
if ((read_next_line( &info ) != 1) ||
strcmp( info.buffer, "WINE REGISTRY Version 2" ))
{
- set_error( ERROR_NOT_REGISTRY_FILE );
+ set_error( STATUS_NOT_REGISTRY_FILE );
goto done;
}
@@ -1319,7 +1318,7 @@
if (key->flags & KEY_DELETED)
{
- set_error( ERROR_KEY_DELETED );
+ set_error( STATUS_KEY_DELETED );
return;
}
if (!(obj = get_handle_obj( current->process, handle, GENERIC_WRITE, NULL ))) return;
@@ -1443,7 +1442,7 @@
int datalen = req->len;
if (datalen > max)
{
- set_error( ERROR_OUTOFMEMORY ); /* FIXME */
+ set_error( STATUS_NO_MEMORY ); /* FIXME */
return;
}
if ((key = get_hkey_obj( req->hkey, KEY_SET_VALUE )))
