Implement on Win32.

2000-05-30  Tor Lillqvist  <tml@iki.fi>

* gutils.c (g_locale_get_codeset): Implement on Win32.

* glib.def: Add g_get_codeset.

* tests/Makefile.am (EXTRA_DIST): makefile.cygwin* has been
renamed to makefile.mingw*.

ChangeLog

@@ -1,3 +1,12 @@
+2000-05-30  Tor Lillqvist  <tml@iki.fi>
+
+	* gutils.c (g_locale_get_codeset): Implement on Win32.
+
+	* glib.def: Add g_get_codeset.
+
+	* tests/Makefile.am (EXTRA_DIST): makefile.cygwin* has been
+	renamed to makefile.mingw*.
+
 Tue May 30 16:01:32 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* glib.h gutils.c: Move the g_locale_get_codeset() up in the 

ChangeLog.pre-2-0

@@ -1,3 +1,12 @@
+2000-05-30  Tor Lillqvist  <tml@iki.fi>
+
+	* gutils.c (g_locale_get_codeset): Implement on Win32.
+
+	* glib.def: Add g_get_codeset.
+
+	* tests/Makefile.am (EXTRA_DIST): makefile.cygwin* has been
+	renamed to makefile.mingw*.
+
 Tue May 30 16:01:32 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* glib.h gutils.c: Move the g_locale_get_codeset() up in the 

ChangeLog.pre-2-10

@@ -1,3 +1,12 @@
+2000-05-30  Tor Lillqvist  <tml@iki.fi>
+
+	* gutils.c (g_locale_get_codeset): Implement on Win32.
+
+	* glib.def: Add g_get_codeset.
+
+	* tests/Makefile.am (EXTRA_DIST): makefile.cygwin* has been
+	renamed to makefile.mingw*.
+
 Tue May 30 16:01:32 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* glib.h gutils.c: Move the g_locale_get_codeset() up in the 

ChangeLog.pre-2-12

@@ -1,3 +1,12 @@
+2000-05-30  Tor Lillqvist  <tml@iki.fi>
+
+	* gutils.c (g_locale_get_codeset): Implement on Win32.
+
+	* glib.def: Add g_get_codeset.
+
+	* tests/Makefile.am (EXTRA_DIST): makefile.cygwin* has been
+	renamed to makefile.mingw*.
+
 Tue May 30 16:01:32 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* glib.h gutils.c: Move the g_locale_get_codeset() up in the 

ChangeLog.pre-2-2

@@ -1,3 +1,12 @@
+2000-05-30  Tor Lillqvist  <tml@iki.fi>
+
+	* gutils.c (g_locale_get_codeset): Implement on Win32.
+
+	* glib.def: Add g_get_codeset.
+
+	* tests/Makefile.am (EXTRA_DIST): makefile.cygwin* has been
+	renamed to makefile.mingw*.
+
 Tue May 30 16:01:32 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* glib.h gutils.c: Move the g_locale_get_codeset() up in the 

ChangeLog.pre-2-4

@@ -1,3 +1,12 @@
+2000-05-30  Tor Lillqvist  <tml@iki.fi>
+
+	* gutils.c (g_locale_get_codeset): Implement on Win32.
+
+	* glib.def: Add g_get_codeset.
+
+	* tests/Makefile.am (EXTRA_DIST): makefile.cygwin* has been
+	renamed to makefile.mingw*.
+
 Tue May 30 16:01:32 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* glib.h gutils.c: Move the g_locale_get_codeset() up in the 

ChangeLog.pre-2-6

@@ -1,3 +1,12 @@
+2000-05-30  Tor Lillqvist  <tml@iki.fi>
+
+	* gutils.c (g_locale_get_codeset): Implement on Win32.
+
+	* glib.def: Add g_get_codeset.
+
+	* tests/Makefile.am (EXTRA_DIST): makefile.cygwin* has been
+	renamed to makefile.mingw*.
+
 Tue May 30 16:01:32 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* glib.h gutils.c: Move the g_locale_get_codeset() up in the 

ChangeLog.pre-2-8

@@ -1,3 +1,12 @@
+2000-05-30  Tor Lillqvist  <tml@iki.fi>
+
+	* gutils.c (g_locale_get_codeset): Implement on Win32.
+
+	* glib.def: Add g_get_codeset.
+
+	* tests/Makefile.am (EXTRA_DIST): makefile.cygwin* has been
+	renamed to makefile.mingw*.
+
 Tue May 30 16:01:32 2000  Owen Taylor  <otaylor@redhat.com>
 
 	* glib.h gutils.c: Move the g_locale_get_codeset() up in the 

glib.def

@@ -93,6 +93,7 @@ EXPORTS
 	g_filename_from_utf8
 	g_filename_to_utf8
 	g_free
+	g_get_codeset
 	g_get_current_dir
 	g_get_current_time
 	g_get_home_dir

glib/glib.def

@@ -93,6 +93,7 @@ EXPORTS
 	g_filename_from_utf8
 	g_filename_to_utf8
 	g_free
+	g_get_codeset
 	g_get_current_dir
 	g_get_current_time
 	g_get_home_dir

glib/gutils.c

@@ -617,7 +617,7 @@ g_get_any_init (void)
 	guint len = 17;
 	gchar buffer[17];
 	
-	if (GetUserName (buffer, &len))
+	if (GetUserName ((LPTSTR) buffer, (LPDWORD) &len))
 	  {
 	    g_user_name = g_strdup (buffer);
 	    g_real_name = g_strdup (buffer);
@@ -776,8 +776,15 @@ g_get_codeset (void)
   char *result = nl_langinfo (CODESET);
   return g_strdup (result);
 #else
+#ifndef G_OS_WIN32
   /* FIXME: Do something more intelligent based on setlocale (LC_CTYPE, NULL)
    */
   return g_strdup ("ISO-8859-1");
+#else
+  /* On Win32 we always use UTF-8. At least in GDK. SO should we
+   * therefore return that?
+   */
+  return g_strdup ("UTF-8");
+#endif
 #endif
 }

gutils.c

@@ -617,7 +617,7 @@ g_get_any_init (void)
 	guint len = 17;
 	gchar buffer[17];
 	
-	if (GetUserName (buffer, &len))
+	if (GetUserName ((LPTSTR) buffer, (LPDWORD) &len))
 	  {
 	    g_user_name = g_strdup (buffer);
 	    g_real_name = g_strdup (buffer);
@@ -776,8 +776,15 @@ g_get_codeset (void)
   char *result = nl_langinfo (CODESET);
   return g_strdup (result);
 #else
+#ifndef G_OS_WIN32
   /* FIXME: Do something more intelligent based on setlocale (LC_CTYPE, NULL)
    */
   return g_strdup ("ISO-8859-1");
+#else
+  /* On Win32 we always use UTF-8. At least in GDK. SO should we
+   * therefore return that?
+   */
+  return g_strdup ("UTF-8");
+#endif
 #endif
 }

tests/Makefile.am

@@ -4,8 +4,8 @@ INCLUDES = -I$(top_srcdir) @GLIB_DEBUG_FLAGS@
 EXTRA_DIST = \
 	makefile.msc	\
 	makefile.msc.in	\
-	makefile.cygwin	\
+	makefile.mingw	\
-	makefile.cygwin.in
+	makefile.mingw.in
 
 TESTS = \
 	array-test	\
@@ -49,6 +49,6 @@ type_test_LDADD = $(top_builddir)/libglib.la
 makefile.msc: $(top_builddir)/config.status $(top_srcdir)/tests/makefile.msc.in
 	cd $(top_builddir) && CONFIG_FILES=tests/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
-makefile.cygwin: $(top_builddir)/config.status $(top_srcdir)/tests/makefile.cygwin.in
+makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/tests/makefile.mingw.in
 	cd $(top_builddir) && CONFIG_FILES=tests/$@ CONFIG_HEADERS= $(SHELL) ./config.status