A couple of Win32 fixes.

rdar://103071801

Author: al45tair

include/swift/Runtime/Win32.h

@@ -0,0 +1,55 @@
+//===--- Win32.h - Win32 utility functions ----------------------*- C++ -*-===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+//
+// Utility functions that are specific to the Windows port.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SWIFT_RUNTIME_WIN32_H
+#define SWIFT_RUNTIME_WIN32_H
+
+#ifdef _WIN32
+
+#include "swift/shims/Visibility.h"
+
+#include <wchar.h>
+
+namespace swift {
+namespace win32 {
+
+/// Convert a wide string to UTF-8.
+///
+/// @param str The string to convert.
+///
+/// @returns The string, converted to UTF-8.  The caller is responsible
+///          for freeing this string with @c free() when done with it.
+///
+/// If @a str cannot be converted to UTF-8, a fatal error occurs.
+SWIFT_RUNTIME_STDLIB_INTERNAL
+char *copyUTF8FromWide(const wchar_t *str);
+
+/// Convert a UTF-8 string to a wide string.
+///
+/// @param str The string to convert.
+///
+/// @returns The string, converted to UTF-16.  The caller is responsible
+///          for freeing this string with @c free() when done with it.
+///
+/// If @a str cannot be converted to UTF-16, a fatal error occurs.
+SWIFT_RUNTIME_STDLIB_INTERNAL
+wchar_t *copyWideFromUTF8(const char *str);
+
+}
+}
+#endif // defined(_WIN32)
+
+#endif // SWIFT_RUNTIME_WIN32_H

include/swift/Threading/Impl/Win32/Win32Defs.h

@@ -47,8 +47,7 @@ typedef struct _RTL_CONDITION_VARIABLE *PRTL_CONDITION_VARIABLE;
 typedef PRTL_CONDITION_VARIABLE PCONDITION_VARIABLE;
 
 // These have to be #defines, to avoid problems with <windows.h>
-#define RTL_SRWLOCK_INIT                                                       \
-  { 0 }
+#define RTL_SRWLOCK_INIT {0}
 #define SRWLOCK_INIT RTL_SRWLOCK_INIT
 #define FLS_OUT_OF_INDEXES ((DWORD)0xFFFFFFFF)
 

stdlib/public/CommandLineSupport/CommandLine.cpp

@@ -25,6 +25,7 @@
 #include <string>
 
 #include "swift/Runtime/Debug.h"
+#include "swift/Runtime/Win32.h"
 
 #include "swift/shims/GlobalObjects.h"
 #include "swift/shims/RuntimeStubs.h"
@@ -193,48 +194,6 @@ static void swift::enumerateUnsafeArgv(const F& body) {
 #elif defined(_WIN32)
 #include <stdlib.h>
 
-namespace swift {
-  /// Convert an argument, represented by a wide string, to UTF-8.
-  ///
-  /// @param str The string to convert.
-  /// 
-  /// @returns The string, converted to UTF-8. The caller is responsible for
-  ///   freeing this string when done with it.
-  /// 
-  /// If @a str cannot be converted to UTF-8, a fatal error occurs.
-  static char *copyUTF8FromWide(wchar_t *str) {
-    char *result = nullptr;
-
-    int resultLength = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, str,
-      -1, nullptr, 0, nullptr, nullptr);
-    if (resultLength <= 0) {
-      swift::fatalError(0,
-        "Fatal error: Could not get length of commandline "
-        "argument '%ls': %lu\n",
-        str, GetLastError());
-    }
-
-    result = reinterpret_cast<char *>(malloc(resultLength));
-    if (!result) {
-      swift::fatalError(0,
-        "Fatal error: Could not allocate space for commandline "
-        "argument '%ls': %d\n",
-        str, errno);
-    }
-
-    resultLength = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, str, -1,
-      result, resultLength, nullptr, nullptr);
-    if (resultLength <= 0) {
-      swift::fatalError(0,
-        "Fatal error: Conversion to UTF-8 failed for "
-        "commandline argument '%ls': %lu\n",
-        str, GetLastError());
-    }
-
-    return result;
-  }
-}
-
 static char **swift::getUnsafeArgvArgc(int *outArgLen) {
   return nullptr;
 }
@@ -244,7 +203,7 @@ static void swift::enumerateUnsafeArgv(const F& body) {
   int argc = 0;
   if (LPWSTR *wargv = CommandLineToArgvW(GetCommandLineW(), &argc)) {
     std::for_each(wargv, wargv + argc, [=] (wchar_t *warg) {
-      auto arg = copyUTF8FromWide(warg);
+      auto arg = swift::win32::copyUTF8FromWide(warg);
       body(argc, arg);
       free(arg);
     });

stdlib/public/runtime/Paths.cpp

@@ -18,10 +18,9 @@
 #include "swift/Runtime/EnvironmentVariables.h"
 #include "swift/Runtime/Debug.h"
 #include "swift/Runtime/Paths.h"
+#include "swift/Runtime/Win32.h"
 #include "swift/Threading/Once.h"
 
-#include "Win32.h"
-
 #include <filesystem>
 
 #if !defined(_WIN32) || defined(__CYGWIN__)
@@ -247,7 +246,7 @@ _swift_initRuntimePath(void *) {
                       "Unable to obtain Swift runtime path\n");
   }
 
-  runtimePath = swift::_swift_utf8FromWide(lpFilename);
+  runtimePath = swift::win32::copyUTF8FromWide(lpFilename);
 
   free(lpFilename);
 }
@@ -267,7 +266,7 @@ bool _swift_exists(const char *path)
   struct stat st;
   return stat(path, &st) == 0;
 #else
-  wchar_t *wszPath = swift::_swift_wideFromUTF8(path);
+  wchar_t *wszPath = swift::win32::copyWideFromUTF8(path);
   bool result = GetFileAttributesW(wszPath) != INVALID_FILE_ATTRIBUTES;
   free(wszPath);
   return result;

stdlib/public/runtime/Win32.cpp

@@ -1,4 +1,4 @@
-//===--- Win32.cpp - Win32 specific functions -------------------*- C++ -*-===//
+//===--- Win32.cpp - Win32 utility functions --------------------*- C++ -*-===//
 //
 // This source file is part of the Swift.org open source project
 //
@@ -15,15 +15,14 @@
 //===----------------------------------------------------------------------===//
 
 #include "swift/Runtime/Debug.h"
-
-#include "Win32.h"
+#include "swift/Runtime/Win32.h"
 
 #ifdef _WIN32
 
 #include <windows.h>
 
 char *
-swift::_swift_utf8FromWide(const wchar_t *str) {
+swift::win32::copyUTF8FromWide(const wchar_t *str) {
   char *result = nullptr;
   int len = ::WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS,
                                   str, -1,
@@ -56,7 +55,7 @@ swift::_swift_utf8FromWide(const wchar_t *str) {
 }
 
 wchar_t *
-swift::_swift_wideFromUTF8(const char *str) {
+swift::win32::copyWideFromUTF8(const char *str) {
   wchar_t *result = nullptr;
   int len = ::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS,
                                   str, -1,
@@ -68,7 +67,7 @@ swift::_swift_wideFromUTF8(const char *str) {
   }
 
   result = reinterpret_cast<wchar_t *>(std::malloc(len * sizeof(wchar_t)));
-  if (!reuslt) {
+  if (!result) {
     swift::fatalError(0, "unable to allocate space to convert '%s': %d\n",
                       str, errno);
   }
@@ -85,6 +84,4 @@ swift::_swift_wideFromUTF8(const char *str) {
   return result;
 }
 
-} // namespace swift
-
 #endif // defined(_WIN32)

stdlib/public/runtime/Win32.h

@@ -20,7 +20,7 @@
 #include <string.h>
 
 #if defined(_WIN32) && !defined(__CYGWIN)
-#define stat(x) _stat(x)
+#define stat _stat
 #define S_IFDIR _S_IFDIR
 #endif