diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/tool_doswin.c | 19 | ||||
| -rw-r--r-- | src/tool_doswin.h | 2 | ||||
| -rw-r--r-- | src/tool_filetime.c | 11 | ||||
| -rw-r--r-- | src/tool_operate.c | 2 |
4 files changed, 23 insertions, 11 deletions
diff --git a/src/tool_doswin.c b/src/tool_doswin.c index b7df3e615..78285a21b 100644 --- a/src/tool_doswin.c +++ b/src/tool_doswin.c @@ -36,6 +36,7 @@ #include "tool_bname.h" #include "tool_doswin.h" +#include "curlx.h" #include "memdebug.h" /* keep this as LAST include */ #ifdef WIN32 @@ -612,7 +613,7 @@ char **__crt0_glob_function(char *arg) CURLcode FindWin32CACert(struct OperationConfig *config, curl_sslbackend backend, - const char *bundle_file) + const TCHAR *bundle_file) { CURLcode result = CURLE_OK; @@ -626,15 +627,19 @@ CURLcode FindWin32CACert(struct OperationConfig *config, backend != CURLSSLBACKEND_SCHANNEL) { DWORD res_len; - char buf[PATH_MAX]; - char *ptr = NULL; + TCHAR buf[PATH_MAX]; + TCHAR *ptr = NULL; - buf[0] = '\0'; + buf[0] = TEXT('\0'); - res_len = SearchPathA(NULL, bundle_file, NULL, PATH_MAX, buf, &ptr); + res_len = SearchPath(NULL, bundle_file, NULL, PATH_MAX, buf, &ptr); if(res_len > 0) { Curl_safefree(config->cacert); +#ifdef UNICODE + config->cacert = curlx_convert_wchar_to_UTF8(buf); +#else config->cacert = strdup(buf); +#endif if(!config->cacert) result = CURLE_OUT_OF_MEMORY; } @@ -702,7 +707,7 @@ bool tool_isVistaOrGreater; CURLcode win32_init(void) { - OSVERSIONINFOEXA osvi; + OSVERSIONINFOEX osvi; unsigned __int64 mask = 0; unsigned char op = VER_GREATER_EQUAL; @@ -712,7 +717,7 @@ CURLcode win32_init(void) VER_SET_CONDITION(mask, VER_MAJORVERSION, op); VER_SET_CONDITION(mask, VER_MINORVERSION, op); - if(VerifyVersionInfoA(&osvi, (VER_MAJORVERSION | VER_MINORVERSION), mask)) + if(VerifyVersionInfo(&osvi, (VER_MAJORVERSION | VER_MINORVERSION), mask)) tool_isVistaOrGreater = true; else if(GetLastError() == ERROR_OLD_WIN_VERSION) tool_isVistaOrGreater = false; diff --git a/src/tool_doswin.h b/src/tool_doswin.h index d1649d1f3..ab23f8d65 100644 --- a/src/tool_doswin.h +++ b/src/tool_doswin.h @@ -59,7 +59,7 @@ char **__crt0_glob_function(char *arg); CURLcode FindWin32CACert(struct OperationConfig *config, curl_sslbackend backend, - const char *bundle_file); + const TCHAR *bundle_file); struct curl_slist *GetLoadedModulePaths(void); CURLcode win32_init(void); diff --git a/src/tool_filetime.c b/src/tool_filetime.c index 6071e44d2..3970570e4 100644 --- a/src/tool_filetime.c +++ b/src/tool_filetime.c @@ -21,6 +21,8 @@ ***************************************************************************/ #include "tool_filetime.h" +#include "curlx.h" + #ifdef HAVE_UTIME_H # include <utime.h> #elif defined(HAVE_SYS_UTIME_H) @@ -36,11 +38,13 @@ curl_off_t getfiletime(const char *filename, FILE *error_stream) access to a 64-bit type we can bypass stat and get the times directly. */ #if defined(WIN32) && (SIZEOF_CURL_OFF_T >= 8) HANDLE hfile; + TCHAR *tchar_filename = curlx_convert_UTF8_to_tchar((char *)filename); - hfile = CreateFileA(filename, FILE_READ_ATTRIBUTES, + hfile = CreateFile(tchar_filename, FILE_READ_ATTRIBUTES, (FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE), NULL, OPEN_EXISTING, 0, NULL); + curlx_unicodefree(tchar_filename); if(hfile != INVALID_HANDLE_VALUE) { FILETIME ft; if(GetFileTime(hfile, NULL, NULL, &ft)) { @@ -93,6 +97,7 @@ void setfiletime(curl_off_t filetime, const char *filename, access to a 64-bit type we can bypass utime and set the times directly. */ #if defined(WIN32) && (SIZEOF_CURL_OFF_T >= 8) HANDLE hfile; + TCHAR *tchar_filename = curlx_convert_UTF8_to_tchar((char *)filename); /* 910670515199 is the maximum unix filetime that can be used as a Windows FILETIME without overflow: 30827-12-31T23:59:59. */ @@ -100,13 +105,15 @@ void setfiletime(curl_off_t filetime, const char *filename, fprintf(error_stream, "Failed to set filetime %" CURL_FORMAT_CURL_OFF_T " on outfile: overflow\n", filetime); + curlx_unicodefree(tchar_filename); return; } - hfile = CreateFileA(filename, FILE_WRITE_ATTRIBUTES, + hfile = CreateFile(tchar_filename, FILE_WRITE_ATTRIBUTES, (FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE), NULL, OPEN_EXISTING, 0, NULL); + curlx_unicodefree(tchar_filename); if(hfile != INVALID_HANDLE_VALUE) { curl_off_t converted = ((curl_off_t)filetime * 10000000) + CURL_OFF_T_C(116444736000000000); diff --git a/src/tool_operate.c b/src/tool_operate.c index 29daff02a..ad4e85dd8 100644 --- a/src/tool_operate.c +++ b/src/tool_operate.c @@ -2415,7 +2415,7 @@ static CURLcode transfer_per_config(struct GlobalConfig *global, #ifdef WIN32 else { result = FindWin32CACert(config, tls_backend_info->backend, - "curl-ca-bundle.crt"); + TEXT("curl-ca-bundle.crt")); } #endif } |