From 88fd181eac4fad985bfa54ca5f30bb6d149eaee5 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 30 May 2000 20:46:03 +0000 Subject: [PATCH] Implement on Win32. 2000-05-30 Tor Lillqvist * 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 | 9 +++++++++ ChangeLog.pre-2-0 | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-12 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ glib.def | 1 + glib/glib.def | 1 + glib/gutils.c | 9 ++++++++- gutils.c | 9 ++++++++- tests/Makefile.am | 6 +++--- 13 files changed, 93 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a3d6ac..fd32701 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2000-05-30 Tor Lillqvist + + * 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 * glib.h gutils.c: Move the g_locale_get_codeset() up in the diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 5a3d6ac..fd32701 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +2000-05-30 Tor Lillqvist + + * 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 * glib.h gutils.c: Move the g_locale_get_codeset() up in the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5a3d6ac..fd32701 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2000-05-30 Tor Lillqvist + + * 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 * glib.h gutils.c: Move the g_locale_get_codeset() up in the diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 5a3d6ac..fd32701 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,12 @@ +2000-05-30 Tor Lillqvist + + * 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 * glib.h gutils.c: Move the g_locale_get_codeset() up in the diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 5a3d6ac..fd32701 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +2000-05-30 Tor Lillqvist + + * 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 * glib.h gutils.c: Move the g_locale_get_codeset() up in the diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 5a3d6ac..fd32701 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +2000-05-30 Tor Lillqvist + + * 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 * glib.h gutils.c: Move the g_locale_get_codeset() up in the diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5a3d6ac..fd32701 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +2000-05-30 Tor Lillqvist + + * 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 * glib.h gutils.c: Move the g_locale_get_codeset() up in the diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5a3d6ac..fd32701 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2000-05-30 Tor Lillqvist + + * 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 * glib.h gutils.c: Move the g_locale_get_codeset() up in the diff --git a/glib.def b/glib.def index c7ea6ff..18e7e08 100644 --- a/glib.def +++ b/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 diff --git a/glib/glib.def b/glib/glib.def index c7ea6ff..18e7e08 100644 --- a/glib/glib.def +++ b/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 diff --git a/glib/gutils.c b/glib/gutils.c index 3b66598..c9f2c28 100644 --- a/glib/gutils.c +++ b/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 } diff --git a/gutils.c b/gutils.c index 3b66598..c9f2c28 100644 --- a/gutils.c +++ b/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 } diff --git a/tests/Makefile.am b/tests/Makefile.am index a534730..81aaf62 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -4,8 +4,8 @@ INCLUDES = -I$(top_srcdir) @GLIB_DEBUG_FLAGS@ EXTRA_DIST = \ makefile.msc \ makefile.msc.in \ - makefile.cygwin \ - makefile.cygwin.in + makefile.mingw \ + 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 -- 2.7.4