luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove support for Windows 9x/ME, as will be done also in Pango and GTK+.

Browse Source 
2006-08-29  Tor Lillqvist  <tml@novell.com>

	Remove support for Windows 9x/ME, as will be done also in Pango
	and GTK+. GTK+ hasn't worked on Win9x since 2.6 or 2.8 anyway, so
	it's pretty pointless to keep the Win9x code in here either. If
	somebody is interested, the code can always be found in older GLib
	versions, and in CVS.

	* glib/gdir.c
	* glib/gfileutils.c
	* glib/gspawn-win32-helper.c
	* glib/gspawn-win32.c
	* glib/gstdio.c
	* glib/gutils.c
	* glib/gwin32.c
	* glib/gwin32.h: Remove the G_WIN32_IS_NT_BASED() and
	G_WIN32_HAVE_WIDECHAR_API() tests and their false (Win9x)
	branches, and any variables or static functions used only by the
	Win9x branches.

	* glib/gwin32.c (g_win32_windows_version_init): Call g_error() if
	run on Win9x.
This commit is contained in:
Tor Lillqvist 2006-08-29 22:45:00 +00:00 committed by Tor Lillqvist
parent 08e3a830fb
commit da422c0060
11 changed files with 581 additions and 1381 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ChangeLog
View File

@ -1,3 +1,26 @@
2006-08-29 Tor Lillqvist <tml@novell.com>
Remove support for Windows 9x/ME, as will be done also in Pango
and GTK+. GTK+ hasn't worked on Win9x since 2.6 or 2.8 anyway, so
it's pretty pointless to keep the Win9x code in here either. If
somebody is interested, the code can always be found in older GLib
versions, and in CVS.
* glib/gdir.c
* glib/gfileutils.c
* glib/gspawn-win32-helper.c
* glib/gspawn-win32.c
* glib/gstdio.c
* glib/gutils.c
* glib/gwin32.c
* glib/gwin32.h: Remove the G_WIN32_IS_NT_BASED() and
G_WIN32_HAVE_WIDECHAR_API() tests and their false (Win9x)
branches, and any variables or static functions used only by the
Win9x branches.
* glib/gwin32.c (g_win32_windows_version_init): Call g_error() if
run on Win9x.
2006-08-27 Matthias Clasen <mclasen@redhat.com> 2006-08-27 Matthias Clasen <mclasen@redhat.com>
* configure.in: Fix pthread compiler flag detection. * configure.in: Fix pthread compiler flag detection.

143
glib/gdir.c
View File

@ -25,7 +25,8 @@
#include "config.h" #include "config.h"
#include <errno.h> #include <errno.h>
#include <string.h> /* strcmp */ #include <string.h>
#include <sys/stat.h>
#ifdef HAVE_DIRENT_H #ifdef HAVE_DIRENT_H
#include <sys/types.h> #include <sys/types.h>
@ -41,12 +42,11 @@
struct _GDir struct _GDir
{ {
union {
DIR *dirp;
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
_WDIR *wdirp; _WDIR *wdirp;
#else
DIR *dirp;
#endif #endif
} u;
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
gchar utf8_buf[FILENAME_MAX*4]; gchar utf8_buf[FILENAME_MAX*4];
#endif #endif
@ -74,44 +74,27 @@ g_dir_open (const gchar *path,
GError **error) GError **error)
{ {
GDir *dir; GDir *dir;
#ifndef G_OS_WIN32 #ifdef G_OS_WIN32
wchar_t *wpath;
#else
gchar *utf8_path; gchar *utf8_path;
#endif #endif
g_return_val_if_fail (path != NULL, NULL); g_return_val_if_fail (path != NULL, NULL);
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
if (G_WIN32_HAVE_WIDECHAR_API ()) wpath = g_utf8_to_utf16 (path, -1, NULL, NULL, error);
{
wchar_t *wpath = g_utf8_to_utf16 (path, -1, NULL, NULL, error);
if (wpath == NULL)
return NULL;
dir = g_new (GDir, 1); if (wpath == NULL)
return NULL;
dir->u.wdirp = _wopendir (wpath); dir = g_new (GDir, 1);
g_free (wpath);
if (dir->u.wdirp)
return dir;
}
else
{
gchar *cp_path = g_locale_from_utf8 (path, -1, NULL, NULL, error);
if (cp_path == NULL) dir->wdirp = _wopendir (wpath);
return NULL; g_free (wpath);
dir = g_new (GDir, 1); if (dir->wdirp)
return dir;
dir->u.dirp = opendir (cp_path);
g_free (cp_path);
if (dir->u.dirp)
return dir;
}
/* error case */ /* error case */
@ -127,9 +110,9 @@ g_dir_open (const gchar *path,
#else #else
dir = g_new (GDir, 1); dir = g_new (GDir, 1);
dir->u.dirp = opendir (path); dir->dirp = opendir (path);
if (dir->u.dirp) if (dir->dirp)
return dir; return dir;
/* error case */ /* error case */
@ -193,70 +176,43 @@ g_dir_open (const gchar *path,
G_CONST_RETURN gchar* G_CONST_RETURN gchar*
g_dir_read_name (GDir *dir) g_dir_read_name (GDir *dir)
{ {
#ifdef G_OS_WIN32
gchar *utf8_name;
struct _wdirent *wentry;
#else
struct dirent *entry; struct dirent *entry;
#endif
g_return_val_if_fail (dir != NULL, NULL); g_return_val_if_fail (dir != NULL, NULL);
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
if (G_WIN32_HAVE_WIDECHAR_API ()) while (1)
{ {
gchar *utf8_name; wentry = _wreaddir (dir->wdirp);
struct _wdirent *wentry; while (wentry
&& (0 == wcscmp (wentry->d_name, L".") ||
0 == wcscmp (wentry->d_name, L"..")))
wentry = _wreaddir (dir->wdirp);
while (1) if (wentry == NULL)
{ return NULL;
wentry = _wreaddir (dir->u.wdirp);
while (wentry
&& (0 == wcscmp (wentry->d_name, L".") ||
0 == wcscmp (wentry->d_name, L"..")))
wentry = _wreaddir (dir->u.wdirp);
if (wentry == NULL)
return NULL;
utf8_name = g_utf16_to_utf8 (wentry->d_name, -1, NULL, NULL, NULL);
if (utf8_name == NULL) utf8_name = g_utf16_to_utf8 (wentry->d_name, -1, NULL, NULL, NULL);
continue; /* Huh, impossible? Skip it anyway */
strcpy (dir->utf8_buf, utf8_name);
g_free (utf8_name);
return dir->utf8_buf;
}
}
else
{
while (1)
{
gchar *utf8_name;
entry = readdir (dir->u.dirp);
while (entry
&& (0 == strcmp (entry->d_name, ".") ||
0 == strcmp (entry->d_name, "..")))
entry = readdir (dir->u.dirp);
if (entry == NULL) if (utf8_name == NULL)
return NULL; continue; /* Huh, impossible? Skip it anyway */
utf8_name = g_locale_to_utf8 (entry->d_name, -1, NULL, NULL, NULL); strcpy (dir->utf8_buf, utf8_name);
g_free (utf8_name);
if (utf8_name != NULL) return dir->utf8_buf;
{
strcpy (dir->utf8_buf, utf8_name);
g_free (utf8_name);
return dir->utf8_buf;
}
}
} }
#else #else
entry = readdir (dir->u.dirp); entry = readdir (dir->dirp);
while (entry while (entry
&& (0 == strcmp (entry->d_name, ".") || && (0 == strcmp (entry->d_name, ".") ||
0 == strcmp (entry->d_name, ".."))) 0 == strcmp (entry->d_name, "..")))
entry = readdir (dir->u.dirp); entry = readdir (dir->dirp);
if (entry) if (entry)
return entry->d_name; return entry->d_name;
@ -311,14 +267,10 @@ g_dir_rewind (GDir *dir)
g_return_if_fail (dir != NULL); g_return_if_fail (dir != NULL);
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
if (G_WIN32_HAVE_WIDECHAR_API ()) _wrewinddir (dir->wdirp);
{ #else
_wrewinddir (dir->u.wdirp); rewinddir (dir->dirp);
return;
}
#endif #endif
rewinddir (dir->u.dirp);
} }
/** /**
@ -333,15 +285,10 @@ g_dir_close (GDir *dir)
g_return_if_fail (dir != NULL); g_return_if_fail (dir != NULL);
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
if (G_WIN32_HAVE_WIDECHAR_API ()) _wclosedir (dir->wdirp);
{ #else
_wclosedir (dir->u.wdirp); closedir (dir->dirp);
g_free (dir);
return;
}
#endif #endif
closedir (dir->u.dirp);
g_free (dir); g_free (dir);
} }

25
glib/gfileutils.c
View File

@ -191,29 +191,14 @@ g_file_test (const gchar *filename,
# define FILE_ATTRIBUTE_DEVICE 64 # define FILE_ATTRIBUTE_DEVICE 64
# endif # endif
int attributes; int attributes;
wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
if (G_WIN32_HAVE_WIDECHAR_API ()) if (wfilename == NULL)
{ return FALSE;
wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
if (wfilename == NULL) attributes = GetFileAttributesW (wfilename);
return FALSE;
attributes = GetFileAttributesW (wfilename); g_free (wfilename);
g_free (wfilename);
}
else
{
gchar *cpfilename = g_locale_from_utf8 (filename, -1, NULL, NULL, NULL);
if (cpfilename == NULL)
return FALSE;
attributes = GetFileAttributesA (cpfilename);
g_free (cpfilename);
}
if (attributes == INVALID_FILE_ATTRIBUTES) if (attributes == INVALID_FILE_ATTRIBUTES)
return FALSE; return FALSE;

43
glib/gspawn-win32-helper.c
View File

@ -160,7 +160,6 @@ WinMain (struct HINSTANCE__ *hInstance,
int no_error = CHILD_NO_ERROR; int no_error = CHILD_NO_ERROR;
int zero = 0; int zero = 0;
gint argv_zero_offset = ARG_PROGRAM; gint argv_zero_offset = ARG_PROGRAM;
gchar **new_argv;
wchar_t **new_wargv; wchar_t **new_wargv;
int argc; int argc;
wchar_t **wargv, **wenvp; wchar_t **wargv, **wenvp;
@ -168,17 +167,14 @@ WinMain (struct HINSTANCE__ *hInstance,
g_assert (__argc >= ARG_COUNT); g_assert (__argc >= ARG_COUNT);
if (G_WIN32_HAVE_WIDECHAR_API ()) /* Fetch the wide-char argument vector */
{ __wgetmainargs (&argc, &wargv, &wenvp, 0, &si);
/* Fetch the wide-char argument vector */
__wgetmainargs (&argc, &wargv, &wenvp, 0, &si);
/* We still have the system codepage args in __argv. We can look /* We still have the system codepage args in __argv. We can look
* at the first args in which gspawn-win32.c passes us flags and * at the first args in which gspawn-win32.c passes us flags and
* fd numbers in __argv, as we know those are just ASCII anyway. * fd numbers in __argv, as we know those are just ASCII anyway.
*/ */
g_assert (argc == __argc); g_assert (argc == __argc);
}
/* argv[ARG_CHILD_ERR_REPORT] is the file descriptor number onto /* argv[ARG_CHILD_ERR_REPORT] is the file descriptor number onto
* which write error messages. * which write error messages.
@ -266,10 +262,7 @@ WinMain (struct HINSTANCE__ *hInstance,
if (__argv[ARG_WORKING_DIRECTORY][0] == '-' && if (__argv[ARG_WORKING_DIRECTORY][0] == '-' &&
__argv[ARG_WORKING_DIRECTORY][1] == 0) __argv[ARG_WORKING_DIRECTORY][1] == 0)
; /* Nothing */ ; /* Nothing */
else if ((G_WIN32_HAVE_WIDECHAR_API () && else if (_wchdir (wargv[ARG_WORKING_DIRECTORY]) < 0)
_wchdir (wargv[ARG_WORKING_DIRECTORY]) < 0) ||
(!G_WIN32_HAVE_WIDECHAR_API () &&
chdir (__argv[ARG_WORKING_DIRECTORY]) < 0))
write_err_and_exit (child_err_report_fd, CHILD_CHDIR_FAILED); write_err_and_exit (child_err_report_fd, CHILD_CHDIR_FAILED);
/* __argv[ARG_CLOSE_DESCRIPTORS] is "y" if file descriptors from 3 /* __argv[ARG_CLOSE_DESCRIPTORS] is "y" if file descriptors from 3
@ -297,24 +290,12 @@ WinMain (struct HINSTANCE__ *hInstance,
/* For the program name passed to spawnv(), don't use the quoted /* For the program name passed to spawnv(), don't use the quoted
* version. * version.
*/ */
if (G_WIN32_HAVE_WIDECHAR_API ()) protect_wargv (wargv + argv_zero_offset, &new_wargv);
{
protect_wargv (wargv + argv_zero_offset, &new_wargv);
if (__argv[ARG_USE_PATH][0] == 'y') if (__argv[ARG_USE_PATH][0] == 'y')
handle = _wspawnvp (mode, wargv[ARG_PROGRAM], (const wchar_t **) new_wargv); handle = _wspawnvp (mode, wargv[ARG_PROGRAM], (const wchar_t **) new_wargv);
else
handle = _wspawnv (mode, wargv[ARG_PROGRAM], (const wchar_t **) new_wargv);
}
else else
{ handle = _wspawnv (mode, wargv[ARG_PROGRAM], (const wchar_t **) new_wargv);
protect_argv (__argv + argv_zero_offset, &new_argv);
if (__argv[ARG_USE_PATH][0] == 'y')
handle = spawnvp (mode, __argv[ARG_PROGRAM], (const char **) new_argv);
else
handle = spawnv (mode, __argv[ARG_PROGRAM], (const char **) new_argv);
}
saved_errno = errno; saved_errno = errno;

334
glib/gspawn-win32.c
View File

@ -108,6 +108,10 @@ enum {
ARG_COUNT = ARG_PROGRAM ARG_COUNT = ARG_PROGRAM
}; };
#ifndef GSPAWN_HELPER
#define HELPER_PROCESS "gspawn-win32-helper"
static gchar * static gchar *
protect_argv_string (const gchar *string) protect_argv_string (const gchar *string)
{ {
@ -192,10 +196,6 @@ protect_argv (gchar **argv,
return argc; return argc;
} }
#ifndef GSPAWN_HELPER
#define HELPER_PROCESS "gspawn-win32-helper"
GQuark GQuark
g_spawn_error_quark (void) g_spawn_error_quark (void)
{ {
@ -400,43 +400,6 @@ utf8_charv_to_wcharv (char **utf8_charv,
return TRUE; return TRUE;
} }
static gboolean
utf8_charv_to_cp_charv (char **utf8_charv,
gchar ***cp_charv,
int *error_index,
GError **error)
{
char **retval = NULL;
*cp_charv = NULL;
if (utf8_charv != NULL)
{
int n = 0, i;
while (utf8_charv[n])
n++;
retval = g_new (char *, n + 1);
for (i = 0; i < n; i++)
{
retval[i] = g_locale_from_utf8 (utf8_charv[i], -1, NULL, NULL, error);
if (retval[i] == NULL)
{
if (error_index)
*error_index = i;
while (i)
g_free (retval[--i]);
g_free (retval);
return FALSE;
}
}
retval[n] = NULL;
}
*cp_charv = retval;
return TRUE;
}
static gboolean static gboolean
do_spawn_directly (gint *exit_status, do_spawn_directly (gint *exit_status,
gboolean do_return_handle, gboolean do_return_handle,
@ -455,120 +418,61 @@ do_spawn_directly (gint *exit_status,
int saved_errno; int saved_errno;
GError *conv_error = NULL; GError *conv_error = NULL;
gint conv_error_index; gint conv_error_index;
wchar_t *wargv0, **wargv, **wenvp;
new_argv = (flags & G_SPAWN_FILE_AND_ARGV_ZERO) ? protected_argv + 1 : protected_argv; new_argv = (flags & G_SPAWN_FILE_AND_ARGV_ZERO) ? protected_argv + 1 : protected_argv;
if (G_WIN32_HAVE_WIDECHAR_API ())
wargv0 = g_utf8_to_utf16 (argv[0], -1, NULL, NULL, &conv_error);
if (wargv0 == NULL)
{ {
wchar_t *wargv0, **wargv, **wenvp; g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED,
_("Invalid program name: %s"),
wargv0 = g_utf8_to_utf16 (argv[0], -1, NULL, NULL, &conv_error); conv_error->message);
if (wargv0 == NULL) g_error_free (conv_error);
{
g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED,
_("Invalid program name: %s"),
conv_error->message);
g_error_free (conv_error);
return FALSE;
}
if (!utf8_charv_to_wcharv (new_argv, &wargv, &conv_error_index, &conv_error))
{
g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED,
_("Invalid string in argument vector at %d: %s"),
conv_error_index, conv_error->message);
g_error_free (conv_error);
g_free (wargv0);
return FALSE;
}
if (!utf8_charv_to_wcharv (envp, &wenvp, NULL, &conv_error))
{
g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED,
_("Invalid string in environment: %s"),
conv_error->message);
g_error_free (conv_error);
g_free (wargv0);
g_strfreev ((gchar **) wargv);
return FALSE;
}
if (child_setup)
(* child_setup) (user_data);
if (flags & G_SPAWN_SEARCH_PATH)
if (wenvp != NULL)
rc = _wspawnvpe (mode, wargv0, (const wchar_t **) wargv, (const wchar_t **) wenvp);
else
rc = _wspawnvp (mode, wargv0, (const wchar_t **) wargv);
else
if (wenvp != NULL)
rc = _wspawnve (mode, wargv0, (const wchar_t **) wargv, (const wchar_t **) wenvp);
else
rc = _wspawnv (mode, wargv0, (const wchar_t **) wargv);
return FALSE;
}
if (!utf8_charv_to_wcharv (new_argv, &wargv, &conv_error_index, &conv_error))
{
g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED,
_("Invalid string in argument vector at %d: %s"),
conv_error_index, conv_error->message);
g_error_free (conv_error);
g_free (wargv0);
return FALSE;
}
if (!utf8_charv_to_wcharv (envp, &wenvp, NULL, &conv_error))
{
g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED,
_("Invalid string in environment: %s"),
conv_error->message);
g_error_free (conv_error);
g_free (wargv0); g_free (wargv0);
g_strfreev ((gchar **) wargv); g_strfreev ((gchar **) wargv);
g_strfreev ((gchar **) wenvp);
return FALSE;
} }
if (child_setup)
(* child_setup) (user_data);
if (flags & G_SPAWN_SEARCH_PATH)
if (wenvp != NULL)
rc = _wspawnvpe (mode, wargv0, (const wchar_t **) wargv, (const wchar_t **) wenvp);
else
rc = _wspawnvp (mode, wargv0, (const wchar_t **) wargv);
else else
{ if (wenvp != NULL)
char *cpargv0, **cpargv, **cpenvp; rc = _wspawnve (mode, wargv0, (const wchar_t **) wargv, (const wchar_t **) wenvp);
else
cpargv0 = g_locale_from_utf8 (argv[0], -1, NULL, NULL, &conv_error); rc = _wspawnv (mode, wargv0, (const wchar_t **) wargv);
if (cpargv0 == NULL)
{
g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED,
_("Invalid program name: %s"),
conv_error->message);
g_error_free (conv_error);
return FALSE; g_free (wargv0);
} g_strfreev ((gchar **) wargv);
g_strfreev ((gchar **) wenvp);
if (!utf8_charv_to_cp_charv (new_argv, &cpargv, &conv_error_index, &conv_error))
{
g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED,
_("Invalid string in argument vector at %d: %s"),
conv_error_index, conv_error->message);
g_error_free (conv_error);
g_free (cpargv0);
return FALSE;
}
if (!utf8_charv_to_cp_charv (envp, &cpenvp, NULL, &conv_error))
{
g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED,
_("Invalid string in environment: %s"),
conv_error->message);
g_error_free (conv_error);
g_free (cpargv0);
g_strfreev (cpargv);
return FALSE;
}
if (child_setup)
(* child_setup) (user_data);
if (flags & G_SPAWN_SEARCH_PATH)
if (cpenvp != NULL)
rc = spawnvpe (mode, cpargv0, (const char **) cpargv, (const char **) cpenvp);
else
rc = spawnvp (mode, cpargv0, (const char **) cpargv);
else
if (envp != NULL)
rc = spawnve (mode, cpargv0, (const char **) cpargv, (const char **) cpenvp);
else
rc = spawnv (mode, cpargv0, (const char **) cpargv);
g_free (cpargv0);
g_strfreev (cpargv);
g_strfreev (cpenvp);
}
saved_errno = errno; saved_errno = errno;
@ -630,6 +534,7 @@ do_spawn_with_pipes (gint *exit_status,
gint conv_error_index; gint conv_error_index;
gchar *helper_process; gchar *helper_process;
CONSOLE_CURSOR_INFO cursor_info; CONSOLE_CURSOR_INFO cursor_info;
wchar_t *whelper, **wargv, **wenvp;
SETUP_DEBUG(); SETUP_DEBUG();
@ -761,111 +666,58 @@ do_spawn_with_pipes (gint *exit_status,
g_print ("argv[%d]: %s\n", i, (new_argv[i] ? new_argv[i] : "NULL")); g_print ("argv[%d]: %s\n", i, (new_argv[i] ? new_argv[i] : "NULL"));
} }
if (G_WIN32_HAVE_WIDECHAR_API ()) whelper = g_utf8_to_utf16 (helper_process, -1, NULL, NULL, NULL);
if (!utf8_charv_to_wcharv (new_argv, &wargv, &conv_error_index, &conv_error))
{ {
wchar_t *whelper = g_utf8_to_utf16 (helper_process, -1, NULL, NULL, NULL); if (conv_error_index == ARG_WORKING_DIRECTORY)
wchar_t **wargv, **wenvp; g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_CHDIR,
_("Invalid working directory: %s"),
if (!utf8_charv_to_wcharv (new_argv, &wargv, &conv_error_index, &conv_error)) conv_error->message);
{
if (conv_error_index == ARG_WORKING_DIRECTORY)
g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_CHDIR,
_("Invalid working directory: %s"),
conv_error->message);
else
g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED,
_("Invalid string in argument vector at %d: %s"),
conv_error_index - ARG_PROGRAM, conv_error->message);
g_error_free (conv_error);
g_strfreev (protected_argv);
g_free (new_argv[ARG_WORKING_DIRECTORY]);
g_free (new_argv);
g_free (whelper);
return FALSE;
}
if (!utf8_charv_to_wcharv (envp, &wenvp, NULL, &conv_error))
{
g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED,
_("Invalid string in environment: %s"),
conv_error->message);
g_error_free (conv_error);
g_strfreev (protected_argv);
g_free (new_argv[ARG_WORKING_DIRECTORY]);
g_free (new_argv);
g_free (whelper);
g_strfreev ((gchar **) wargv);
return FALSE;
}
if (child_setup)
(* child_setup) (user_data);
if (wenvp != NULL)
/* Let's hope envp hasn't mucked with PATH so that
* gspawn-win32-helper.exe isn't found.
*/
rc = _wspawnvpe (P_NOWAIT, whelper, (const wchar_t **) wargv, (const wchar_t **) wenvp);
else else
rc = _wspawnvp (P_NOWAIT, whelper, (const wchar_t **) wargv); g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED,
_("Invalid string in argument vector at %d: %s"),
conv_error_index - ARG_PROGRAM, conv_error->message);
g_error_free (conv_error);
g_strfreev (protected_argv);
g_free (new_argv[ARG_WORKING_DIRECTORY]);
g_free (new_argv);
g_free (whelper);
saved_errno = errno; return FALSE;
}
if (!utf8_charv_to_wcharv (envp, &wenvp, NULL, &conv_error))
{
g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED,
_("Invalid string in environment: %s"),
conv_error->message);
g_error_free (conv_error);
g_strfreev (protected_argv);
g_free (new_argv[ARG_WORKING_DIRECTORY]);
g_free (new_argv);
g_free (whelper); g_free (whelper);
g_strfreev ((gchar **) wargv); g_strfreev ((gchar **) wargv);
g_strfreev ((gchar **) wenvp);
return FALSE;
} }
if (child_setup)
(* child_setup) (user_data);
if (wenvp != NULL)
/* Let's hope envp hasn't mucked with PATH so that
* gspawn-win32-helper.exe isn't found.
*/
rc = _wspawnvpe (P_NOWAIT, whelper, (const wchar_t **) wargv, (const wchar_t **) wenvp);
else else
{ rc = _wspawnvp (P_NOWAIT, whelper, (const wchar_t **) wargv);
char **cpargv, **cpenvp;
if (!utf8_charv_to_cp_charv (new_argv, &cpargv, &conv_error_index, &conv_error)) saved_errno = errno;
{
if (conv_error_index == ARG_WORKING_DIRECTORY)
g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_CHDIR,
_("Invalid working directory: %s"),
conv_error->message);
else
g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED,
_("Invalid string in argument vector at %d: %s"),
conv_error_index - ARG_PROGRAM, conv_error->message);
g_error_free (conv_error);
g_strfreev (protected_argv);
g_free (new_argv[ARG_WORKING_DIRECTORY]);
g_free (new_argv);
return FALSE;
}
if (!utf8_charv_to_cp_charv (envp, &cpenvp, NULL, &conv_error))
{
g_set_error (error, G_SPAWN_ERROR, G_SPAWN_ERROR_FAILED,
_("Invalid string in environment: %s"),
conv_error->message);
g_error_free (conv_error);
g_strfreev (protected_argv);
g_free (new_argv[ARG_WORKING_DIRECTORY]);
g_free (new_argv);
g_strfreev (cpargv);
return FALSE;
}
if (child_setup) g_free (whelper);
(* child_setup) (user_data); g_strfreev ((gchar **) wargv);
g_strfreev ((gchar **) wenvp);
if (cpenvp != NULL)
rc = spawnvpe (P_NOWAIT, helper_process, (const char **) cpargv, (const char **) cpenvp);
else
rc = spawnvp (P_NOWAIT, helper_process, (const char **) cpargv);
saved_errno = errno;
g_strfreev (cpargv);
g_strfreev (cpenvp);
}
/* Close the other process's ends of the pipes in this process, /* Close the other process's ends of the pipes in this process,
* otherwise the reader will never get EOF. * otherwise the reader will never get EOF.

746
glib/gstdio.c
View File

@ -74,46 +74,23 @@ g_access (const gchar *filename,
int mode) int mode)
{ {
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
if (G_WIN32_HAVE_WIDECHAR_API ()) wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
int retval;
int save_errno;
if (wfilename == NULL)
{ {
wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL); errno = EINVAL;
int retval; return -1;
int save_errno;
if (wfilename == NULL)
{
errno = EINVAL;
return -1;
}
retval = _waccess (wfilename, mode);
save_errno = errno;
g_free (wfilename);
errno = save_errno;
return retval;
} }
else
{
gchar *cp_filename = g_locale_from_utf8 (filename, -1, NULL, NULL, NULL);
int retval;
int save_errno;
if (cp_filename == NULL) retval = _waccess (wfilename, mode);
{ save_errno = errno;
errno = EINVAL;
return -1;
}
retval = access (cp_filename, mode); g_free (wfilename);
save_errno = errno;
g_free (cp_filename); errno = save_errno;
return retval;
errno = save_errno;
return retval;
}
#else #else
return access (filename, mode); return access (filename, mode);
#endif #endif
@ -143,46 +120,23 @@ g_chmod (const gchar *filename,
int mode) int mode)
{ {
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
if (G_WIN32_HAVE_WIDECHAR_API ()) wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
int retval;
int save_errno;
if (wfilename == NULL)
{ {
wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL); errno = EINVAL;
int retval; return -1;
int save_errno;
if (wfilename == NULL)
{
errno = EINVAL;
return -1;
}
retval = _wchmod (wfilename, mode);
save_errno = errno;
g_free (wfilename);
errno = save_errno;
return retval;
} }
else
{
gchar *cp_filename = g_locale_from_utf8 (filename, -1, NULL, NULL, NULL);
int retval;
int save_errno;
if (cp_filename == NULL) retval = _wchmod (wfilename, mode);
{ save_errno = errno;
errno = EINVAL;
return -1;
}
retval = chmod (cp_filename, mode); g_free (wfilename);
save_errno = errno;
g_free (cp_filename); errno = save_errno;
return retval;
errno = save_errno;
return retval;
}
#else #else
return chmod (filename, mode); return chmod (filename, mode);
#endif #endif
@ -214,46 +168,23 @@ g_open (const gchar *filename,
int mode) int mode)
{ {
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
if (G_WIN32_HAVE_WIDECHAR_API ()) wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
int retval;
int save_errno;
if (wfilename == NULL)
{ {
wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL); errno = EINVAL;
int retval; return -1;
int save_errno;
if (wfilename == NULL)
{
errno = EINVAL;
return -1;
}
retval = _wopen (wfilename, flags, mode);
save_errno = errno;
g_free (wfilename);
errno = save_errno;
return retval;
} }
else
{
gchar *cp_filename = g_locale_from_utf8 (filename, -1, NULL, NULL, NULL);
int retval;
int save_errno;
if (cp_filename == NULL) retval = _wopen (wfilename, flags, mode);
{ save_errno = errno;
errno = EINVAL;
return -1;
}
retval = open (cp_filename, flags, mode); g_free (wfilename);
save_errno = errno;
g_free (cp_filename); errno = save_errno;
return retval;
errno = save_errno;
return retval;
}
#else #else
return open (filename, flags, mode); return open (filename, flags, mode);
#endif #endif
@ -283,46 +214,23 @@ g_creat (const gchar *filename,
int mode) int mode)
{ {
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
if (G_WIN32_HAVE_WIDECHAR_API ()) wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
int retval;
int save_errno;
if (wfilename == NULL)
{ {
wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL); errno = EINVAL;
int retval; return -1;
int save_errno;
if (wfilename == NULL)
{
errno = EINVAL;
return -1;
}
retval = _wcreat (wfilename, mode);
save_errno = errno;
g_free (wfilename);
errno = save_errno;
return retval;
} }
else
{
gchar *cp_filename = g_locale_from_utf8 (filename, -1, NULL, NULL, NULL);
int retval;
int save_errno;
if (cp_filename == NULL) retval = _wcreat (wfilename, mode);
{ save_errno = errno;
errno = EINVAL;
return -1;
}
retval = creat (cp_filename, mode); g_free (wfilename);
save_errno = errno;
g_free (cp_filename); errno = save_errno;
return retval;
errno = save_errno;
return retval;
}
#else #else
return creat (filename, mode); return creat (filename, mode);
#endif #endif
@ -350,86 +258,52 @@ g_rename (const gchar *oldfilename,
const gchar *newfilename) const gchar *newfilename)
{ {
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
if (G_WIN32_HAVE_WIDECHAR_API ()) wchar_t *woldfilename = g_utf8_to_utf16 (oldfilename, -1, NULL, NULL, NULL);
wchar_t *wnewfilename;
int retval;
int save_errno;
if (woldfilename == NULL)
{ {
wchar_t *woldfilename = g_utf8_to_utf16 (oldfilename, -1, NULL, NULL, NULL); errno = EINVAL;
wchar_t *wnewfilename; return -1;
int retval;
int save_errno;
if (woldfilename == NULL)
{
errno = EINVAL;
return -1;
}
wnewfilename = g_utf8_to_utf16 (newfilename, -1, NULL, NULL, NULL);
if (wnewfilename == NULL)
{
g_free (woldfilename);
errno = EINVAL;
return -1;
}
if (MoveFileExW (woldfilename, wnewfilename, MOVEFILE_REPLACE_EXISTING))
retval = 0;
else
{
retval = -1;
switch (GetLastError ())
{
#define CASE(a,b) case ERROR_##a: save_errno = b; break
CASE (FILE_NOT_FOUND, ENOENT);
CASE (PATH_NOT_FOUND, ENOENT);
CASE (ACCESS_DENIED, EACCES);
CASE (NOT_SAME_DEVICE, EXDEV);
CASE (LOCK_VIOLATION, EACCES);
CASE (SHARING_VIOLATION, EACCES);
CASE (FILE_EXISTS, EEXIST);
CASE (ALREADY_EXISTS, EEXIST);
#undef CASE
default: save_errno = EIO;
}
}
g_free (woldfilename);
g_free (wnewfilename);
errno = save_errno;
return retval;
} }
wnewfilename = g_utf8_to_utf16 (newfilename, -1, NULL, NULL, NULL);
if (wnewfilename == NULL)
{
g_free (woldfilename);
errno = EINVAL;
return -1;
}
if (MoveFileExW (woldfilename, wnewfilename, MOVEFILE_REPLACE_EXISTING))
retval = 0;
else else
{ {
gchar *cp_oldfilename = g_locale_from_utf8 (oldfilename, -1, NULL, NULL, NULL); retval = -1;
gchar *cp_newfilename; switch (GetLastError ())
int retval;
int save_errno;
if (cp_oldfilename == NULL)
{ {
errno = EINVAL; #define CASE(a,b) case ERROR_##a: save_errno = b; break
return -1; CASE (FILE_NOT_FOUND, ENOENT);
CASE (PATH_NOT_FOUND, ENOENT);
CASE (ACCESS_DENIED, EACCES);
CASE (NOT_SAME_DEVICE, EXDEV);
CASE (LOCK_VIOLATION, EACCES);
CASE (SHARING_VIOLATION, EACCES);
CASE (FILE_EXISTS, EEXIST);
CASE (ALREADY_EXISTS, EEXIST);
#undef CASE
default: save_errno = EIO;
} }
cp_newfilename = g_locale_from_utf8 (newfilename, -1, NULL, NULL, NULL);
if (cp_newfilename == NULL)
{
g_free (cp_oldfilename);
errno = EINVAL;
return -1;
}
retval = rename (cp_oldfilename, cp_newfilename);
save_errno = errno;
g_free (cp_oldfilename);
g_free (cp_newfilename);
errno = save_errno;
return retval;
} }
g_free (woldfilename);
g_free (wnewfilename);
errno = save_errno;
return retval;
#else #else
return rename (oldfilename, newfilename); return rename (oldfilename, newfilename);
#endif #endif
@ -455,46 +329,23 @@ g_mkdir (const gchar *filename,
int mode) int mode)
{ {
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
if (G_WIN32_HAVE_WIDECHAR_API ()) wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
int retval;
int save_errno;
if (wfilename == NULL)
{ {
wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL); errno = EINVAL;
int retval; return -1;
int save_errno;
if (wfilename == NULL)
{
errno = EINVAL;
return -1;
}
retval = _wmkdir (wfilename);
save_errno = errno;
g_free (wfilename);
errno = save_errno;
return retval;
} }
else
{
gchar *cp_filename = g_locale_from_utf8 (filename, -1, NULL, NULL, NULL);
int retval;
int save_errno;
if (cp_filename == NULL) retval = _wmkdir (wfilename);
{ save_errno = errno;
errno = EINVAL;
return -1;
}
retval = mkdir (cp_filename); g_free (wfilename);
save_errno = errno;
errno = save_errno;
g_free (cp_filename); return retval;
errno = save_errno;
return retval;
}
#else #else
return mkdir (filename, mode); return mkdir (filename, mode);
#endif #endif
@ -517,46 +368,23 @@ int
g_chdir (const gchar *path) g_chdir (const gchar *path)
{ {
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
if (G_WIN32_HAVE_WIDECHAR_API ()) wchar_t *wpath = g_utf8_to_utf16 (path, -1, NULL, NULL, NULL);
int retval;
int save_errno;
if (wpath == NULL)
{ {
wchar_t *wpath = g_utf8_to_utf16 (path, -1, NULL, NULL, NULL); errno = EINVAL;
int retval; return -1;
int save_errno;
if (wpath == NULL)
{
errno = EINVAL;
return -1;
}
retval = _wchdir (wpath);
save_errno = errno;
g_free (wpath);
errno = save_errno;
return retval;
} }
else
{
gchar *cp_path = g_locale_from_utf8 (path, -1, NULL, NULL, NULL);
int retval;
int save_errno;
if (cp_path == NULL) retval = _wchdir (wpath);
{ save_errno = errno;
errno = EINVAL;
return -1;
}
retval = chdir (cp_path); g_free (wpath);
save_errno = errno;
errno = save_errno;
g_free (cp_path); return retval;
errno = save_errno;
return retval;
}
#else #else
return chdir (path); return chdir (path);
#endif #endif
@ -583,62 +411,31 @@ g_stat (const gchar *filename,
struct stat *buf) struct stat *buf)
{ {
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
if (G_WIN32_HAVE_WIDECHAR_API ()) wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
int retval;
int save_errno;
int len;
if (wfilename == NULL)
{ {
wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL); errno = EINVAL;
int retval; return -1;
int save_errno;
int len;
if (wfilename == NULL)
{
errno = EINVAL;
return -1;
}
len = wcslen (wfilename);
while (len > 0 && G_IS_DIR_SEPARATOR (wfilename[len-1]))
len--;
if (len > 0 &&
(!g_path_is_absolute (filename) || len > g_path_skip_root (filename) - filename))
wfilename[len] = '\0';
retval = _wstat (wfilename, (struct _stat *) buf);
save_errno = errno;
g_free (wfilename);
errno = save_errno;
return retval;
} }
else
{
gchar *cp_filename = g_locale_from_utf8 (filename, -1, NULL, NULL, NULL);
int retval;
int save_errno;
int len;
if (cp_filename == NULL) len = wcslen (wfilename);
{ while (len > 0 && G_IS_DIR_SEPARATOR (wfilename[len-1]))
errno = EINVAL; len--;
return -1; if (len > 0 &&
} (!g_path_is_absolute (filename) || len > g_path_skip_root (filename) - filename))
wfilename[len] = '\0';
len = strlen (cp_filename); retval = _wstat (wfilename, (struct _stat *) buf);
while (len > 0 && G_IS_DIR_SEPARATOR (cp_filename[len-1])) save_errno = errno;
len--;
if (len > 0 &&
(!g_path_is_absolute (filename) || len > g_path_skip_root (filename) - filename))
cp_filename[len] = '\0';
retval = stat (cp_filename, buf);
save_errno = errno;
g_free (cp_filename); g_free (wfilename);
errno = save_errno; errno = save_errno;
return retval; return retval;
}
#else #else
return stat (filename, buf); return stat (filename, buf);
#endif #endif
@ -697,46 +494,23 @@ int
g_unlink (const gchar *filename) g_unlink (const gchar *filename)
{ {
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
if (G_WIN32_HAVE_WIDECHAR_API ()) wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
int retval;
int save_errno;
if (wfilename == NULL)
{ {
wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL); errno = EINVAL;
int retval; return -1;
int save_errno;
if (wfilename == NULL)
{
errno = EINVAL;
return -1;
}
retval = _wunlink (wfilename);
save_errno = errno;
g_free (wfilename);
errno = save_errno;
return retval;
} }
else
{
gchar *cp_filename = g_locale_from_utf8 (filename, -1, NULL, NULL, NULL);
int retval;
int save_errno;
if (cp_filename == NULL) retval = _wunlink (wfilename);
{ save_errno = errno;
errno = EINVAL;
return -1;
}
retval = unlink (cp_filename); g_free (wfilename);
save_errno = errno;
g_free (cp_filename); errno = save_errno;
return retval;
errno = save_errno;
return retval;
}
#else #else
return unlink (filename); return unlink (filename);
#endif #endif
@ -772,50 +546,25 @@ int
g_remove (const gchar *filename) g_remove (const gchar *filename)
{ {
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
if (G_WIN32_HAVE_WIDECHAR_API ()) wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
int retval;
int save_errno;
if (wfilename == NULL)
{ {
wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL); errno = EINVAL;
int retval; return -1;
int save_errno;
if (wfilename == NULL)
{
errno = EINVAL;
return -1;
}
retval = _wremove (wfilename);
if (retval == -1)
retval = _wrmdir (wfilename);
save_errno = errno;
g_free (wfilename);
errno = save_errno;
return retval;
} }
else
{
gchar *cp_filename = g_locale_from_utf8 (filename, -1, NULL, NULL, NULL);
int retval;
int save_errno;
if (cp_filename == NULL)
{
errno = EINVAL;
return -1;
}
retval = remove (cp_filename); retval = _wremove (wfilename);
if (retval == -1) if (retval == -1)
retval = rmdir (cp_filename); retval = _wrmdir (wfilename);
save_errno = errno; save_errno = errno;
g_free (cp_filename); g_free (wfilename);
errno = save_errno; errno = save_errno;
return retval; return retval;
}
#else #else
return remove (filename); return remove (filename);
#endif #endif
@ -840,46 +589,23 @@ int
g_rmdir (const gchar *filename) g_rmdir (const gchar *filename)
{ {
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
if (G_WIN32_HAVE_WIDECHAR_API ()) wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
int retval;
int save_errno;
if (wfilename == NULL)
{ {
wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL); errno = EINVAL;
int retval; return -1;
int save_errno;
if (wfilename == NULL)
{
errno = EINVAL;
return -1;
}
retval = _wrmdir (wfilename);
save_errno = errno;
g_free (wfilename);
errno = save_errno;
return retval;
} }
else
{ retval = _wrmdir (wfilename);
gchar *cp_filename = g_locale_from_utf8 (filename, -1, NULL, NULL, NULL); save_errno = errno;
int retval;
int save_errno;
if (cp_filename == NULL) g_free (wfilename);
{
errno = EINVAL;
return -1;
}
retval = rmdir (cp_filename); errno = save_errno;
save_errno = errno; return retval;
g_free (cp_filename);
errno = save_errno;
return retval;
}
#else #else
return rmdir (filename); return rmdir (filename);
#endif #endif
@ -906,57 +632,34 @@ g_fopen (const gchar *filename,
const gchar *mode) const gchar *mode)
{ {
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
if (G_WIN32_HAVE_WIDECHAR_API ()) wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
wchar_t *wmode;
FILE *retval;
int save_errno;
if (wfilename == NULL)
{ {
wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL); errno = EINVAL;
wchar_t *wmode; return NULL;
FILE *retval; }
int save_errno;
if (wfilename == NULL) wmode = g_utf8_to_utf16 (mode, -1, NULL, NULL, NULL);
{
errno = EINVAL;
return NULL;
}
wmode = g_utf8_to_utf16 (mode, -1, NULL, NULL, NULL);
if (wmode == NULL)
{
g_free (wfilename);
errno = EINVAL;
return NULL;
}
retval = _wfopen (wfilename, wmode);
save_errno = errno;
if (wmode == NULL)
{
g_free (wfilename); g_free (wfilename);
g_free (wmode); errno = EINVAL;
return NULL;
errno = save_errno;
return retval;
} }
else
{
gchar *cp_filename = g_locale_from_utf8 (filename, -1, NULL, NULL, NULL);
FILE *retval;
int save_errno;
if (cp_filename == NULL) retval = _wfopen (wfilename, wmode);
{ save_errno = errno;
errno = EINVAL;
return NULL;
}
retval = fopen (cp_filename, mode); g_free (wfilename);
save_errno = errno; g_free (wmode);
g_free (cp_filename); errno = save_errno;
return retval;
errno = save_errno;
return retval;
}
#else #else
return fopen (filename, mode); return fopen (filename, mode);
#endif #endif
@ -985,57 +688,34 @@ g_freopen (const gchar *filename,
FILE *stream) FILE *stream)
{ {
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
if (G_WIN32_HAVE_WIDECHAR_API ()) wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL);
wchar_t *wmode;
FILE *retval;
int save_errno;
if (wfilename == NULL)
{ {
wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, NULL); errno = EINVAL;
wchar_t *wmode; return NULL;
FILE *retval; }
int save_errno;
wmode = g_utf8_to_utf16 (mode, -1, NULL, NULL, NULL);
if (wfilename == NULL)
{
errno = EINVAL;
return NULL;
}
wmode = g_utf8_to_utf16 (mode, -1, NULL, NULL, NULL);
if (wmode == NULL)
{
g_free (wfilename);
errno = EINVAL;
return NULL;
}
retval = _wfreopen (wfilename, wmode, stream);
save_errno = errno;
if (wmode == NULL)
{
g_free (wfilename); g_free (wfilename);
g_free (wmode); errno = EINVAL;
return NULL;
errno = save_errno;
return retval;
} }
else
{ retval = _wfreopen (wfilename, wmode, stream);
gchar *cp_filename = g_locale_from_utf8 (filename, -1, NULL, NULL, NULL); save_errno = errno;
FILE *retval;
int save_errno;
if (cp_filename == NULL) g_free (wfilename);
{ g_free (wmode);
errno = EINVAL;
return NULL;
}
retval = freopen (cp_filename, mode, stream); errno = save_errno;
save_errno = errno; return retval;
g_free (cp_filename);
errno = save_errno;
return retval;
}
#else #else
return freopen (filename, mode, stream); return freopen (filename, mode, stream);
#endif #endif

427
glib/gutils.c
View File

@ -387,6 +387,9 @@ g_find_program_in_path (const gchar *program)
const gchar *path_copy; const gchar *path_copy;
gchar *filename = NULL, *appdir = NULL; gchar *filename = NULL, *appdir = NULL;
gchar *sysdir = NULL, *windir = NULL; gchar *sysdir = NULL, *windir = NULL;
int n;
wchar_t wfilename[MAXPATHLEN], wsysdir[MAXPATHLEN],
wwindir[MAXPATHLEN];
#endif #endif
size_t len; size_t len;
size_t pathlen; size_t pathlen;
@ -427,42 +430,17 @@ g_find_program_in_path (const gchar *program)
path = "/bin:/usr/bin:."; path = "/bin:/usr/bin:.";
} }
#else #else
if (G_WIN32_HAVE_WIDECHAR_API ()) n = GetModuleFileNameW (NULL, wfilename, MAXPATHLEN);
{ if (n > 0 && n < MAXPATHLEN)
int n; filename = g_utf16_to_utf8 (wfilename, -1, NULL, NULL, NULL);
wchar_t wfilename[MAXPATHLEN], wsysdir[MAXPATHLEN],
wwindir[MAXPATHLEN]; n = GetSystemDirectoryW (wsysdir, MAXPATHLEN);
if (n > 0 && n < MAXPATHLEN)
n = GetModuleFileNameW (NULL, wfilename, MAXPATHLEN); sysdir = g_utf16_to_utf8 (wsysdir, -1, NULL, NULL, NULL);
if (n > 0 && n < MAXPATHLEN)
filename = g_utf16_to_utf8 (wfilename, -1, NULL, NULL, NULL); n = GetWindowsDirectoryW (wwindir, MAXPATHLEN);
if (n > 0 && n < MAXPATHLEN)
n = GetSystemDirectoryW (wsysdir, MAXPATHLEN); windir = g_utf16_to_utf8 (wwindir, -1, NULL, NULL, NULL);
if (n > 0 && n < MAXPATHLEN)
sysdir = g_utf16_to_utf8 (wsysdir, -1, NULL, NULL, NULL);
n = GetWindowsDirectoryW (wwindir, MAXPATHLEN);
if (n > 0 && n < MAXPATHLEN)
windir = g_utf16_to_utf8 (wwindir, -1, NULL, NULL, NULL);
}
else
{
int n;
gchar cpfilename[MAXPATHLEN], cpsysdir[MAXPATHLEN],
cpwindir[MAXPATHLEN];
n = GetModuleFileNameA (NULL, cpfilename, MAXPATHLEN);
if (n > 0 && n < MAXPATHLEN)
filename = g_locale_to_utf8 (cpfilename, -1, NULL, NULL, NULL);
n = GetSystemDirectoryA (cpsysdir, MAXPATHLEN);
if (n > 0 && n < MAXPATHLEN)
sysdir = g_locale_to_utf8 (cpsysdir, -1, NULL, NULL, NULL);
n = GetWindowsDirectoryA (cpwindir, MAXPATHLEN);
if (n > 0 && n < MAXPATHLEN)
windir = g_locale_to_utf8 (cpwindir, -1, NULL, NULL, NULL);
}
if (filename) if (filename)
{ {
@ -939,33 +917,16 @@ g_get_current_dir (void)
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
gchar *dir = NULL; gchar *dir = NULL;
wchar_t dummy[2], *wdir;
int len;
if (G_WIN32_HAVE_WIDECHAR_API ()) len = GetCurrentDirectoryW (2, dummy);
{ wdir = g_new (wchar_t, len);
wchar_t dummy[2], *wdir;
int len;
len = GetCurrentDirectoryW (2, dummy); if (GetCurrentDirectoryW (len, wdir) == len - 1)
wdir = g_new (wchar_t, len); dir = g_utf16_to_utf8 (wdir, -1, NULL, NULL, NULL);
if (GetCurrentDirectoryW (len, wdir) == len - 1) g_free (wdir);
dir = g_utf16_to_utf8 (wdir, -1, NULL, NULL, NULL);
g_free (wdir);
}
else
{
gchar dummy[2], *cpdir;
int len;
len = GetCurrentDirectoryA (2, dummy);
cpdir = g_new (gchar, len);
if (GetCurrentDirectoryA (len, cpdir) == len - 1)
dir = g_locale_to_utf8 (cpdir, -1, NULL, NULL, NULL);
g_free (cpdir);
}
if (dir == NULL) if (dir == NULL)
dir = g_strdup ("\\"); dir = g_strdup ("\\");
@ -1048,6 +1009,8 @@ g_getenv (const gchar *variable)
GQuark quark; GQuark quark;
gchar *value; gchar *value;
wchar_t dummy[2], *wname, *wvalue;
int len;
g_return_val_if_fail (variable != NULL, NULL); g_return_val_if_fail (variable != NULL, NULL);
g_return_val_if_fail (g_utf8_validate (variable, -1, NULL), NULL); g_return_val_if_fail (g_utf8_validate (variable, -1, NULL), NULL);
@ -1062,111 +1025,52 @@ g_getenv (const gchar *variable)
* contain references to other environment variables.) * contain references to other environment variables.)
*/ */
if (G_WIN32_HAVE_WIDECHAR_API ()) wname = g_utf8_to_utf16 (variable, -1, NULL, NULL, NULL);
len = GetEnvironmentVariableW (wname, dummy, 2);
if (len == 0)
{ {
wchar_t dummy[2], *wname, *wvalue; g_free (wname);
int len; return NULL;
}
wname = g_utf8_to_utf16 (variable, -1, NULL, NULL, NULL); else if (len == 1)
len = 2;
len = GetEnvironmentVariableW (wname, dummy, 2); wvalue = g_new (wchar_t, len);
if (len == 0)
{
g_free (wname);
return NULL;
}
else if (len == 1)
len = 2;
wvalue = g_new (wchar_t, len);
if (GetEnvironmentVariableW (wname, wvalue, len) != len - 1)
{
g_free (wname);
g_free (wvalue);
return NULL;
}
if (wcschr (wvalue, L'%') != NULL)
{
wchar_t *tem = wvalue;
len = ExpandEnvironmentStringsW (wvalue, dummy, 2);
if (len > 0)
{
wvalue = g_new (wchar_t, len);
if (ExpandEnvironmentStringsW (tem, wvalue, len) != len)
{
g_free (wvalue);
wvalue = tem;
}
else
g_free (tem);
}
}
value = g_utf16_to_utf8 (wvalue, -1, NULL, NULL, NULL);
if (GetEnvironmentVariableW (wname, wvalue, len) != len - 1)
{
g_free (wname); g_free (wname);
g_free (wvalue); g_free (wvalue);
return NULL;
} }
else
if (wcschr (wvalue, L'%') != NULL)
{ {
gchar dummy[3], *cpname, *cpvalue; wchar_t *tem = wvalue;
int len;
cpname = g_locale_from_utf8 (variable, -1, NULL, NULL, NULL);
g_return_val_if_fail (cpname != NULL, NULL); len = ExpandEnvironmentStringsW (wvalue, dummy, 2);
len = GetEnvironmentVariableA (cpname, dummy, 2); if (len > 0)
if (len == 0)
{ {
g_free (cpname); wvalue = g_new (wchar_t, len);
return NULL;
}
else if (len == 1)
len = 2;
cpvalue = g_new (gchar, len); if (ExpandEnvironmentStringsW (tem, wvalue, len) != len)
if (GetEnvironmentVariableA (cpname, cpvalue, len) != len - 1)
{
g_free (cpname);
g_free (cpvalue);
return NULL;
}
if (strchr (cpvalue, '%') != NULL)
{
gchar *tem = cpvalue;
len = ExpandEnvironmentStringsA (cpvalue, dummy, 3);
if (len > 0)
{ {
cpvalue = g_new (gchar, len); g_free (wvalue);
wvalue = tem;
if (ExpandEnvironmentStringsA (tem, cpvalue, len) != len)
{
g_free (cpvalue);
cpvalue = tem;
}
else
g_free (tem);
} }
else
g_free (tem);
} }
value = g_locale_to_utf8 (cpvalue, -1, NULL, NULL, NULL);
g_free (cpname);
g_free (cpvalue);
} }
value = g_utf16_to_utf8 (wvalue, -1, NULL, NULL, NULL);
g_free (wname);
g_free (wvalue);
quark = g_quark_from_string (value); quark = g_quark_from_string (value);
g_free (value); g_free (value);
@ -1250,6 +1154,8 @@ g_setenv (const gchar *variable,
#else /* G_OS_WIN32 */ #else /* G_OS_WIN32 */
gboolean retval; gboolean retval;
wchar_t *wname, *wvalue, *wassignment;
gchar *tem;
g_return_val_if_fail (variable != NULL, FALSE); g_return_val_if_fail (variable != NULL, FALSE);
g_return_val_if_fail (strchr (variable, '=') == NULL, FALSE); g_return_val_if_fail (strchr (variable, '=') == NULL, FALSE);
@ -1273,36 +1179,19 @@ g_setenv (const gchar *variable,
* the putenv() first, then call SetEnvironmentValueW ourselves. * the putenv() first, then call SetEnvironmentValueW ourselves.
*/ */
if (G_WIN32_HAVE_WIDECHAR_API ()) wname = g_utf8_to_utf16 (variable, -1, NULL, NULL, NULL);
{ wvalue = g_utf8_to_utf16 (value, -1, NULL, NULL, NULL);
wchar_t *wname = g_utf8_to_utf16 (variable, -1, NULL, NULL, NULL); tem = g_strconcat (variable, "=", value, NULL);
wchar_t *wvalue = g_utf8_to_utf16 (value, -1, NULL, NULL, NULL); wassignment = g_utf8_to_utf16 (tem, -1, NULL, NULL, NULL);
gchar *tem = g_strconcat (variable, "=", value, NULL);
wchar_t *wassignment = g_utf8_to_utf16 (tem, -1, NULL, NULL, NULL); g_free (tem);
_wputenv (wassignment);
g_free (tem); g_free (wassignment);
_wputenv (wassignment);
g_free (wassignment);
retval = (SetEnvironmentVariableW (wname, wvalue) != 0); retval = (SetEnvironmentVariableW (wname, wvalue) != 0);
g_free (wname); g_free (wname);
g_free (wvalue); g_free (wvalue);
}
else
{
/* In the non-Unicode case (Win9x), just putenv() is good
* enough.
*/
gchar *tem = g_strconcat (variable, "=", value, NULL);
gchar *cpassignment = g_locale_from_utf8 (tem, -1, NULL, NULL, NULL);
g_free (tem);
retval = (putenv (cpassignment) == 0);
g_free (cpassignment);
}
return retval; return retval;
@ -1372,38 +1261,24 @@ g_unsetenv (const gchar *variable)
#else /* G_OS_WIN32 */ #else /* G_OS_WIN32 */
wchar_t *wname, *wassignment;
gchar *tem;
g_return_if_fail (variable != NULL); g_return_if_fail (variable != NULL);
g_return_if_fail (strchr (variable, '=') == NULL); g_return_if_fail (strchr (variable, '=') == NULL);
g_return_if_fail (g_utf8_validate (variable, -1, NULL)); g_return_if_fail (g_utf8_validate (variable, -1, NULL));
if (G_WIN32_HAVE_WIDECHAR_API ()) wname = g_utf8_to_utf16 (variable, -1, NULL, NULL, NULL);
{ tem = g_strconcat (variable, "=", NULL);
wchar_t *wname = g_utf8_to_utf16 (variable, -1, NULL, NULL, NULL); wassignment = g_utf8_to_utf16 (tem, -1, NULL, NULL, NULL);
gchar *tem = g_strconcat (variable, "=", NULL);
wchar_t *wassignment = g_utf8_to_utf16 (tem, -1, NULL, NULL, NULL); g_free (tem);
_wputenv (wassignment);
g_free (tem); g_free (wassignment);
_wputenv (wassignment);
g_free (wassignment);
SetEnvironmentVariableW (wname, NULL); SetEnvironmentVariableW (wname, NULL);
g_free (wname); g_free (wname);
}
else
{
/* In the non-Unicode case (Win9x), just putenv() is good
* enough.
*/
gchar *tem = g_strconcat (variable, "=", NULL);
gchar *cpassignment = g_locale_from_utf8 (tem, -1, NULL, NULL, NULL);
g_free (tem);
putenv (cpassignment);
g_free (cpassignment);
}
#endif /* G_OS_WIN32 */ #endif /* G_OS_WIN32 */
} }
@ -1448,68 +1323,41 @@ g_listenv (void)
return result; return result;
#else #else
gchar **result, *eq; gchar **result, *eq;
gint len = 0, i, j; gint len = 0, j;
wchar_t *p, *q;
if (G_WIN32_HAVE_WIDECHAR_API ()) p = (wchar_t *) GetEnvironmentStringsW ();
if (p != NULL)
{ {
wchar_t *p, *q;
p = (wchar_t *) GetEnvironmentStringsW ();
if (p != NULL)
{
q = p;
while (*q)
{
q += wcslen (q) + 1;
len++;
}
}
result = g_new0 (gchar *, len + 1);
j = 0;
q = p; q = p;
while (*q) while (*q)
{ {
result[j] = g_utf16_to_utf8 (q, -1, NULL, NULL, NULL);
if (result[j] != NULL)
{
eq = strchr (result[j], '=');
if (eq && eq > result[j])
{
*eq = '\0';
j++;
}
else
g_free (result[j]);
}
q += wcslen (q) + 1; q += wcslen (q) + 1;
len++;
} }
result[j] = NULL;
FreeEnvironmentStringsW (p);
} }
else result = g_new0 (gchar *, len + 1);
j = 0;
q = p;
while (*q)
{ {
len = g_strv_length (environ); result[j] = g_utf16_to_utf8 (q, -1, NULL, NULL, NULL);
result = g_new0 (gchar *, len + 1); if (result[j] != NULL)
j = 0;
for (i = 0; i < len; i++)
{ {
result[j] = g_locale_to_utf8 (environ[i], -1, NULL, NULL, NULL); eq = strchr (result[j], '=');
if (result[j] != NULL) if (eq && eq > result[j])
{ {
eq = strchr (result[j], '='); *eq = '\0';
if (eq && eq > result[j]) j++;
{
*eq = '\0';
j++;
}
else
g_free (result[j]);
} }
else
g_free (result[j]);
} }
result[j] = NULL; q += wcslen (q) + 1;
} }
result[j] = NULL;
FreeEnvironmentStringsW (p);
return result; return result;
#endif #endif
@ -1556,18 +1404,9 @@ get_special_folder (int csidl)
hr = SHGetSpecialFolderLocation (NULL, csidl, &pidl); hr = SHGetSpecialFolderLocation (NULL, csidl, &pidl);
if (hr == S_OK) if (hr == S_OK)
{ {
if (G_WIN32_HAVE_WIDECHAR_API ()) b = SHGetPathFromIDListW (pidl, path.wc);
{ if (b)
b = SHGetPathFromIDListW (pidl, path.wc); retval = g_utf16_to_utf8 (path.wc, -1, NULL, NULL, NULL);
if (b)
retval = g_utf16_to_utf8 (path.wc, -1, NULL, NULL, NULL);
}
else
{
b = SHGetPathFromIDListA (pidl, path.c);
if (b)
retval = g_locale_to_utf8 (path.c, -1, NULL, NULL, NULL);
}
CoTaskMemFree (pidl); CoTaskMemFree (pidl);
} }
return retval; return retval;
@ -1788,27 +1627,13 @@ g_get_any_init_do (void)
#else /* !HAVE_PWD_H */ #else /* !HAVE_PWD_H */
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
if (G_WIN32_HAVE_WIDECHAR_API ()) guint len = UNLEN+1;
wchar_t buffer[UNLEN+1];
if (GetUserNameW (buffer, (LPDWORD) &len))
{ {
guint len = UNLEN+1; g_user_name = g_utf16_to_utf8 (buffer, -1, NULL, NULL, NULL);
wchar_t buffer[UNLEN+1]; g_real_name = g_strdup (g_user_name);
if (GetUserNameW (buffer, (LPDWORD) &len))
{
g_user_name = g_utf16_to_utf8 (buffer, -1, NULL, NULL, NULL);
g_real_name = g_strdup (g_user_name);
}
}
else
{
guint len = UNLEN+1;
char buffer[UNLEN+1];
if (GetUserNameA (buffer, (LPDWORD) &len))
{
g_user_name = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL);
g_real_name = g_strdup (g_user_name);
}
} }
#endif /* G_OS_WIN32 */ #endif /* G_OS_WIN32 */
@ -2004,22 +1829,13 @@ g_get_prgname (void)
if (!beenhere) if (!beenhere)
{ {
gchar *utf8_buf = NULL; gchar *utf8_buf = NULL;
wchar_t buf[MAX_PATH+1];
beenhere = TRUE; beenhere = TRUE;
if (G_WIN32_HAVE_WIDECHAR_API ()) if (GetModuleFileNameW (GetModuleHandle (NULL),
{ buf, G_N_ELEMENTS (buf)) > 0)
wchar_t buf[MAX_PATH+1]; utf8_buf = g_utf16_to_utf8 (buf, -1, NULL, NULL, NULL);
if (GetModuleFileNameW (GetModuleHandle (NULL),
buf, G_N_ELEMENTS (buf)) > 0)
utf8_buf = g_utf16_to_utf8 (buf, -1, NULL, NULL, NULL);
}
else
{
gchar buf[MAX_PATH+1];
if (GetModuleFileNameA (GetModuleHandle (NULL),
buf, G_N_ELEMENTS (buf)) > 0)
utf8_buf = g_locale_to_utf8 (buf, -1, NULL, NULL, NULL);
}
if (utf8_buf) if (utf8_buf)
{ {
g_prgname = g_path_get_basename (utf8_buf); g_prgname = g_path_get_basename (utf8_buf);
@ -2314,23 +2130,14 @@ get_module_share_dir (gconstpointer address)
HMODULE hmodule; HMODULE hmodule;
gchar *filename = NULL; gchar *filename = NULL;
gchar *p, *retval; gchar *p, *retval;
wchar_t wfilename[MAX_PATH];
hmodule = get_module_for_address (address); hmodule = get_module_for_address (address);
if (hmodule == NULL) if (hmodule == NULL)
return NULL; return NULL;
if (G_WIN32_IS_NT_BASED ()) if (GetModuleFileNameW (hmodule, wfilename, G_N_ELEMENTS (wfilename)))
{ filename = g_utf16_to_utf8 (wfilename, -1, NULL, NULL, NULL);
wchar_t wfilename[MAX_PATH];
if (GetModuleFileNameW (hmodule, wfilename, G_N_ELEMENTS (wfilename)))
filename = g_utf16_to_utf8 (wfilename, -1, NULL, NULL, NULL);
}
else
{
char cpfilename[MAX_PATH];
if (GetModuleFileNameA (hmodule, cpfilename, G_N_ELEMENTS (cpfilename)))
filename = g_locale_to_utf8 (cpfilename, -1, NULL, NULL, NULL);
}
if (filename == NULL) if (filename == NULL)
return NULL; return NULL;

189
glib/gwin32.c
View File

@ -1055,55 +1055,27 @@ gchar *
g_win32_error_message (gint error) g_win32_error_message (gint error)
{ {
gchar *retval; gchar *retval;
wchar_t *msg = NULL;
int nchars;
if (G_WIN32_HAVE_WIDECHAR_API ()) FormatMessageW (FORMAT_MESSAGE_ALLOCATE_BUFFER
|FORMAT_MESSAGE_IGNORE_INSERTS
|FORMAT_MESSAGE_FROM_SYSTEM,
NULL, error, 0,
(LPWSTR) &msg, 0, NULL);
if (msg != NULL)
{ {
wchar_t *msg = NULL; nchars = wcslen (msg);
int nchars;
if (nchars > 2 && msg[nchars-1] == '\n' && msg[nchars-2] == '\r')
FormatMessageW (FORMAT_MESSAGE_ALLOCATE_BUFFER msg[nchars-2] = '\0';
|FORMAT_MESSAGE_IGNORE_INSERTS
|FORMAT_MESSAGE_FROM_SYSTEM, retval = g_utf16_to_utf8 (msg, -1, NULL, NULL, NULL);
NULL, error, 0,
(LPWSTR) &msg, 0, NULL); LocalFree (msg);
if (msg != NULL)
{
nchars = wcslen (msg);
if (nchars > 2 && msg[nchars-1] == '\n' && msg[nchars-2] == '\r')
msg[nchars-2] = '\0';
retval = g_utf16_to_utf8 (msg, -1, NULL, NULL, NULL);
LocalFree (msg);
}
else
retval = g_strdup ("");
} }
else else
{ retval = g_strdup ("");
gchar *msg = NULL;
int nbytes;
FormatMessageA (FORMAT_MESSAGE_ALLOCATE_BUFFER
|FORMAT_MESSAGE_IGNORE_INSERTS
|FORMAT_MESSAGE_FROM_SYSTEM,
NULL, error, 0,
(LPTSTR) &msg, 0, NULL);
if (msg != NULL)
{
nbytes = strlen (msg);
if (nbytes > 2 && msg[nbytes-1] == '\n' && msg[nbytes-2] == '\r')
msg[nbytes-2] = '\0';
retval = g_locale_to_utf8 (msg, -1, NULL, NULL, NULL);
LocalFree (msg);
}
else
retval = g_strdup ("");
}
return retval; return retval;
} }
@ -1117,6 +1089,7 @@ get_package_directory_from_module (gchar *module_name)
gchar *fn; gchar *fn;
gchar *p; gchar *p;
gchar *result; gchar *result;
wchar_t wc_fn[MAX_PATH];
G_LOCK (module_dirs); G_LOCK (module_dirs);
@ -1133,42 +1106,20 @@ get_package_directory_from_module (gchar *module_name)
if (module_name) if (module_name)
{ {
if (G_WIN32_HAVE_WIDECHAR_API ()) wchar_t *wc_module_name = g_utf8_to_utf16 (module_name, -1, NULL, NULL, NULL);
{ hmodule = GetModuleHandleW (wc_module_name);
wchar_t *wc_module_name = g_utf8_to_utf16 (module_name, -1, NULL, NULL, NULL); g_free (wc_module_name);
hmodule = GetModuleHandleW (wc_module_name);
g_free (wc_module_name);
}
else
{
char *cp_module_name = g_locale_from_utf8 (module_name, -1, NULL, NULL, NULL);
hmodule = GetModuleHandleA (cp_module_name);
g_free (cp_module_name);
}
if (!hmodule) if (!hmodule)
return NULL; return NULL;
} }
if (G_WIN32_HAVE_WIDECHAR_API ()) if (!GetModuleFileNameW (hmodule, wc_fn, MAX_PATH))
{ {
wchar_t wc_fn[MAX_PATH]; G_UNLOCK (module_dirs);
if (!GetModuleFileNameW (hmodule, wc_fn, MAX_PATH)) return NULL;
{
G_UNLOCK (module_dirs);
return NULL;
}
fn = g_utf16_to_utf8 (wc_fn, -1, NULL, NULL, NULL);
}
else
{
gchar cp_fn[MAX_PATH];
if (!GetModuleFileNameA (hmodule, cp_fn, MAX_PATH))
{
G_UNLOCK (module_dirs);
return NULL;
}
fn = g_locale_to_utf8 (cp_fn, -1, NULL, NULL, NULL);
} }
fn = g_utf16_to_utf8 (wc_fn, -1, NULL, NULL, NULL);
if ((p = strrchr (fn, G_DIR_SEPARATOR)) != NULL) if ((p = strrchr (fn, G_DIR_SEPARATOR)) != NULL)
*p = '\0'; *p = '\0';
@ -1240,6 +1191,7 @@ g_win32_get_package_installation_directory (gchar *package,
G_LOCK_DEFINE_STATIC (package_dirs); G_LOCK_DEFINE_STATIC (package_dirs);
gchar *result = NULL; gchar *result = NULL;
gchar *key; gchar *key;
wchar_t *wc_key;
HKEY reg_key = NULL; HKEY reg_key = NULL;
DWORD type; DWORD type;
DWORD nbytes; DWORD nbytes;
@ -1262,52 +1214,27 @@ g_win32_get_package_installation_directory (gchar *package,
key = g_strconcat ("Software\\", package, NULL); key = g_strconcat ("Software\\", package, NULL);
nbytes = 0; nbytes = 0;
if (G_WIN32_HAVE_WIDECHAR_API ())
wc_key = g_utf8_to_utf16 (key, -1, NULL, NULL, NULL);
if (((RegOpenKeyExW (HKEY_CURRENT_USER, wc_key, 0,
KEY_QUERY_VALUE, &reg_key) == ERROR_SUCCESS
&& RegQueryValueExW (reg_key, L"InstallationDirectory", 0,
&type, NULL, &nbytes) == ERROR_SUCCESS)
||
(RegOpenKeyExW (HKEY_LOCAL_MACHINE, wc_key, 0,
KEY_QUERY_VALUE, &reg_key) == ERROR_SUCCESS
&& RegQueryValueExW (reg_key, L"InstallationDirectory", 0,
&type, NULL, &nbytes) == ERROR_SUCCESS))
&& type == REG_SZ)
{ {
wchar_t *wc_key = g_utf8_to_utf16 (key, -1, NULL, NULL, NULL); wchar_t *wc_temp = g_new (wchar_t, (nbytes+1)/2 + 1);
if (((RegOpenKeyExW (HKEY_CURRENT_USER, wc_key, 0, RegQueryValueExW (reg_key, L"InstallationDirectory", 0,
KEY_QUERY_VALUE, &reg_key) == ERROR_SUCCESS &type, (LPBYTE) wc_temp, &nbytes);
&& RegQueryValueExW (reg_key, L"InstallationDirectory", 0, wc_temp[nbytes/2] = '\0';
&type, NULL, &nbytes) == ERROR_SUCCESS) result = g_utf16_to_utf8 (wc_temp, -1, NULL, NULL, NULL);
|| g_free (wc_temp);
(RegOpenKeyExW (HKEY_LOCAL_MACHINE, wc_key, 0,
KEY_QUERY_VALUE, &reg_key) == ERROR_SUCCESS
&& RegQueryValueExW (reg_key, L"InstallationDirectory", 0,
&type, NULL, &nbytes) == ERROR_SUCCESS))
&& type == REG_SZ)
{
wchar_t *wc_temp = g_new (wchar_t, (nbytes+1)/2 + 1);
RegQueryValueExW (reg_key, L"InstallationDirectory", 0,
&type, (LPBYTE) wc_temp, &nbytes);
wc_temp[nbytes/2] = '\0';
result = g_utf16_to_utf8 (wc_temp, -1, NULL, NULL, NULL);
g_free (wc_temp);
}
g_free (wc_key);
}
else
{
char *cp_key = g_locale_from_utf8 (key, -1, NULL, NULL, NULL);
if (((RegOpenKeyExA (HKEY_CURRENT_USER, cp_key, 0,
KEY_QUERY_VALUE, &reg_key) == ERROR_SUCCESS
&& RegQueryValueExA (reg_key, "InstallationDirectory", 0,
&type, NULL, &nbytes) == ERROR_SUCCESS)
||
(RegOpenKeyExA (HKEY_LOCAL_MACHINE, cp_key, 0,
KEY_QUERY_VALUE, &reg_key) == ERROR_SUCCESS
&& RegQueryValueExA (reg_key, "InstallationDirectory", 0,
&type, NULL, &nbytes) == ERROR_SUCCESS))
&& type == REG_SZ)
{
char *cp_temp = g_malloc (nbytes + 1);
RegQueryValueExA (reg_key, "InstallationDirectory", 0,
&type, cp_temp, &nbytes);
cp_temp[nbytes] = '\0';
result = g_locale_to_utf8 (cp_temp, -1, NULL, NULL, NULL);
g_free (cp_temp);
}
g_free (cp_key);
} }
g_free (wc_key);
if (reg_key != NULL) if (reg_key != NULL)
RegCloseKey (reg_key); RegCloseKey (reg_key);
@ -1425,10 +1352,10 @@ g_win32_windows_version_init (void)
if (!beenhere) if (!beenhere)
{ {
beenhere = TRUE; beenhere = TRUE;
if (getenv ("G_WIN32_PRETEND_WIN9X")) windows_version = GetVersion ();
windows_version = 0x80000004;
else if (windows_version & 0x80000000)
windows_version = GetVersion (); g_error ("This version of GLib requires NT-based Windows.");
} }
} }
@ -1444,17 +1371,13 @@ _g_win32_thread_init (void)
* Returns version information for the Windows operating system the * Returns version information for the Windows operating system the
* code is running on. See MSDN documentation for the GetVersion() * code is running on. See MSDN documentation for the GetVersion()
* function. To summarize, the most significant bit is one on Win9x, * function. To summarize, the most significant bit is one on Win9x,
* and zero on NT-based systems. The least significant byte is 4 on * and zero on NT-based systems. Since version 2.14, GLib works only
* Windows NT 4, 5 on Windows XP. Software that needs really detailled * on NT-based systems, so checking whether your are running on Win9x
* version and feature information should use Win32 API like * in your own software is moot. The least significant byte is 4 on
* Windows NT 4, and 5 on Windows XP. Software that needs really
* detailled version and feature information should use Win32 API like
* GetVersionEx() and VerifyVersionInfo(). * GetVersionEx() and VerifyVersionInfo().
* *
* If there is an environment variable <envar>G_WIN32_PRETEND_WIN9X</envar>
* defined (with any value), this function always returns a version
* code for Windows 9x. This is mainly an internal debugging aid for
* GTK+ and GLib developers, to be able to check the code paths for
* Windows 9x.
*
* Returns: The version information. * Returns: The version information.
* *
* Since: 2.6 * Since: 2.6
@ -1501,7 +1424,7 @@ g_win32_locale_filename_from_utf8 (const gchar *utf8filename)
{ {
gchar *retval = g_locale_from_utf8 (utf8filename, -1, NULL, NULL, NULL); gchar *retval = g_locale_from_utf8 (utf8filename, -1, NULL, NULL, NULL);
if (retval == NULL && G_WIN32_HAVE_WIDECHAR_API ()) if (retval == NULL)
{ {
/* Conversion failed, so convert to wide chars, check if there /* Conversion failed, so convert to wide chars, check if there
* is a 8.3 version, and use that. * is a 8.3 version, and use that.

5
glib/gwin32.h
View File

@ -93,8 +93,9 @@ guint g_win32_get_windows_version (void);
gchar* g_win32_locale_filename_from_utf8 (const gchar *utf8filename); gchar* g_win32_locale_filename_from_utf8 (const gchar *utf8filename);
#define G_WIN32_IS_NT_BASED() (g_win32_get_windows_version () < 0x80000000) /* As of GLib 2.14 we only support NT-based Windows */
#define G_WIN32_HAVE_WIDECHAR_API() (G_WIN32_IS_NT_BASED ()) #define G_WIN32_IS_NT_BASED() TRUE
#define G_WIN32_HAVE_WIDECHAR_API() TRUE
G_END_DECLS G_END_DECLS

10
gmodule/ChangeLog
View File

@ -1,3 +1,13 @@
2006-08-29 Tor Lillqvist <tml@novell.com>
Remove support for Windows 9x/ME. GTK+ hasn't worked on Win9x
since 2.6. It's pointless to keep the Win9x code in here as it
isn't being maintained anyway. If somebody is interested, it is in
older GLib versions, and in CVS.
* gmodule-win32.c (_g_module_open): Remove the Win9x branch of if
statement.
2006-08-15 Matthias Clasen <mclasen@redhat.com> 2006-08-15 Matthias Clasen <mclasen@redhat.com>
* === Released 2.12.2 === * === Released 2.12.2 ===

17
gmodule/gmodule-win32.c
View File

@ -56,26 +56,17 @@ _g_module_open (const gchar *file_name,
gboolean bind_local) gboolean bind_local)
{ {
HINSTANCE handle; HINSTANCE handle;
wchar_t *wfilename;
#ifdef G_WITH_CYGWIN #ifdef G_WITH_CYGWIN
gchar tmp[MAX_PATH]; gchar tmp[MAX_PATH];
cygwin_conv_to_win32_path(file_name, tmp); cygwin_conv_to_win32_path(file_name, tmp);
file_name = tmp; file_name = tmp;
#endif #endif
if (G_WIN32_HAVE_WIDECHAR_API ()) wfilename = g_utf8_to_utf16 (file_name, -1, NULL, NULL, NULL);
{
wchar_t *wfilename = g_utf8_to_utf16 (file_name, -1, NULL, NULL, NULL);
handle = LoadLibraryW (wfilename);
g_free (wfilename);
}
else
{
gchar *cp_filename = g_locale_from_utf8 (file_name, -1, NULL, NULL, NULL);
handle = LoadLibraryA (cp_filename); handle = LoadLibraryW (wfilename);
g_free (cp_filename); g_free (wfilename);
}
if (!handle) if (!handle)
set_error (); set_error ();