Merge pull request #2417 from razzfazz/guard_substr

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

diff --git a/eglib/src/gmisc-win32.c b/eglib/src/gmisc-win32.c
index 7e60293f5f2d57e968303b5e925b9343d855ed4e..f89f37c22049a780451ff55dcb4d3369ce8d1d10 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,17 +80,19 @@ g_unsetenv(const gchar *variable)
 {
        gunichar2 *var;
        var = u8to16(variable); 
-       SetEnvironmentVariable(var, TEXT(""));
+       SetEnvironmentVariableW(var, L"");
        g_free(var);
 }
 
 gchar*
 g_win32_getlocale(void)
 {
-       /* FIXME: Use GetThreadLocale
-        * and convert LCID to standard 
-        * string form, "en_US" */
-       return strdup ("en_US");
+       LCID lcid = GetThreadLocale();
+       gchar buf[19];
+       gint ccBuf = GetLocaleInfo(lcid, LOCALE_SISO639LANGNAME, buf, 9);
+       buf[ccBuf - 1] = '-';
+       ccBuf += GetLocaleInfo(lcid, LOCALE_SISO3166CTRYNAME, buf + ccBuf, 9);
+       return strdup(buf);
 }
 
 gboolean
@@ -93,11 +100,17 @@ g_path_is_absolute (const char *filename)
 {
        g_return_val_if_fail (filename != NULL, FALSE);
 
-       if (filename[0] != '\0' && filename[1] != '\0' && filename[1] == ':' && 
-               filename[2] != '\0' && (filename[2] == '\\' || filename[2] == '/'))
-               return TRUE;
-       else
-               return FALSE;
+       if (filename[0] != '\0' && filename[1] != '\0') {
+               if (filename[1] == ':' && filename[2] != '\0' &&
+                       (filename[2] == '\\' || filename[2] == '/'))
+                       return TRUE;
+               /* UNC paths */
+               else if (filename[0] == '\\' && filename[1] == '\\' && 
+                       filename[2] != '\0')
+                       return TRUE;
+       }
+
+       return FALSE;
 }
 
 const gchar *