From: Marcel Raad <raad@teamviewer.com>
Date: Tue, 4 Apr 2017 21:02:16 +0000 (+0200)
Subject: tool: fix Windows Unicode build
X-Git-Tag: curl-7_54_0~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d40f4e15e73f906cd06919da84e535f52637c1a1;p=curl

tool: fix Windows Unicode build

... by explicitly calling the ANSI versions of Windows API functions where
required.
---

diff --git a/src/tool_homedir.c b/src/tool_homedir.c
index 26b6c535c..483553d59 100644
--- a/src/tool_homedir.c
+++ b/src/tool_homedir.c
@@ -39,14 +39,14 @@ static char *GetEnv(const char *variable, char do_expand)
   /* Don't use getenv(); it doesn't find variable added after program was
    * started. Don't accept truncated results (i.e. rc >= sizeof(buf1)).  */
 
-  rc = GetEnvironmentVariable(variable, buf1, sizeof(buf1));
+  rc = GetEnvironmentVariableA(variable, buf1, sizeof(buf1));
   if(rc > 0 && rc < sizeof(buf1)) {
     env = buf1;
     variable = buf1;
   }
   if(do_expand && strchr(variable, '%')) {
     /* buf2 == variable if not expanded */
-    rc = ExpandEnvironmentStrings(variable, buf2, sizeof(buf2));
+    rc = ExpandEnvironmentStringsA(variable, buf2, sizeof(buf2));
     if(rc > 0 && rc < sizeof(buf2) &&
        !strchr(buf2, '%'))    /* no vars still unexpanded */
       env = buf2;
diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c
index 7cf11d8a4..14efc5c3a 100644
--- a/src/tool_parsecfg.c
+++ b/src/tool_parsecfg.c
@@ -79,7 +79,7 @@ int parseconfig(const char *filename, struct GlobalConfig *global)
            * already declared via inclusions done in setup header file.
            * We assume that we are using the ASCII version here.
            */
-          int n = GetModuleFileName(0, filebuffer, sizeof(filebuffer));
+          int n = GetModuleFileNameA(0, filebuffer, sizeof(filebuffer));
           if(n > 0 && n < (int)sizeof(filebuffer)) {
             /* We got a valid filename - get the directory part */
             char *lastdirchar = strrchr(filebuffer, '\\');