finished Discovery serialization stuff.

[mono.git] / eglib / src / gmisc-win32.c

diff --git a/eglib/src/gmisc-win32.c b/eglib/src/gmisc-win32.c
index f1fe019c55023712ace94dcdca963c203deb6450..8aa25a514b0aa0e08a2f39e572169fa58d50c4df 100644 (file)
--- a/eglib/src/gmisc-win32.c
+++ b/eglib/src/gmisc-win32.c
@@ -42,15 +42,20 @@ g_getenv(const gchar *variable)
        gint32 retval;
        var = u8to16(variable); 
        buffer = g_malloc(buffer_size*sizeof(gunichar2));
-       retval = GetEnvironmentVariable (var, buffer, buffer_size);
+       retval = GetEnvironmentVariableW (var, buffer, buffer_size);
        if (retval != 0) {
                if (retval > buffer_size) {
                        g_free (buffer);
                        buffer_size = retval;
                        buffer = g_malloc(buffer_size*sizeof(gunichar2));
-                       retval = GetEnvironmentVariable (var, buffer, buffer_size);
+                       retval = GetEnvironmentVariableW (var, buffer, buffer_size);
                }
                val = u16to8 (buffer);
+       } else {
+               if (GetLastError () != ERROR_ENVVAR_NOT_FOUND){
+                       val = g_malloc (1);
+                       *val = 0;
+               }
        }
        g_free(var);
        g_free(buffer);
@@ -64,7 +69,7 @@ g_setenv(const gchar *variable, const gchar *value, gboolean overwrite)
        gboolean result;
        var = u8to16(variable); 
        val = u8to16(value);
-       result = (SetEnvironmentVariable(var, val) != 0) ? TRUE : FALSE;
+       result = (SetEnvironmentVariableW(var, val) != 0) ? TRUE : FALSE;
        g_free(var);
        g_free(val);
        return result;
@@ -75,7 +80,7 @@ g_unsetenv(const gchar *variable)
 {
        gunichar2 *var;
        var = u8to16(variable); 
-       SetEnvironmentVariable(var, TEXT(""));
+       SetEnvironmentVariableW(var, TEXT(""));
        g_free(var);
 }