security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Activity

w32: Allow for Unicocde installation directory. 

* common/homedir.c (w32_rootdir): Use Unicode fucntion not only for
WinCE.
--

This uses the same code We used for WindowsCE.  It has not been tested
with a Unicode requiring installation directory.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2015-02-01 15:27:32 +01:00
parent 7db6c82cec
commit 616633b771
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/homedir.c
View File

@ -74,7 +74,7 @@ static int w32_portable_app;
#ifdef HAVE_W32_SYSTEM #ifdef HAVE_W32_SYSTEM
/* This flag is true if this process' binary has been installed under /* This flag is true if this process' binary has been installed under
bin and not in the root directory. */ bin and not in the root directory as often used before GnuPG 2.1. */
static int w32_bin_is_bin; static int w32_bin_is_bin;
#endif /*HAVE_W32_SYSTEM*/ #endif /*HAVE_W32_SYSTEM*/
@ -288,21 +288,15 @@ w32_rootdir (void)
{ {
char *p; char *p;
int rc; int rc;
wchar_t wdir [MAX_PATH+5];
#ifdef HAVE_W32CE_SYSTEM rc = GetModuleFileNameW (NULL, wdir, MAX_PATH);
{ if (rc && WideCharToMultiByte (CP_UTF8, 0, wdir, -1, dir, MAX_PATH-4,
wchar_t wdir [MAX_PATH+5]; NULL, NULL) < 0)
rc = GetModuleFileName (NULL, wdir, MAX_PATH); rc = 0;
if (rc && WideCharToMultiByte (CP_UTF8, 0, wdir, -1, dir, MAX_PATH-4,
NULL, NULL) < 0)
rc = 0;
}
#else
rc = GetModuleFileName (NULL, dir, MAX_PATH);
#endif
if (!rc) if (!rc)
{ {
log_debug ("GetModuleFileName failed: %s\n", w32_strerror (0)); log_debug ("GetModuleFileName failed: %s\n", w32_strerror (-1));
*dir = 0; *dir = 0;
} }
got_dir = 1; got_dir = 1;