Merge pull request #1796 from compnerd/simple-windows

Simple portions of the Windows Port

Author: compnerd

CoreFoundation/AppServices.subproj/CFUserNotification.c

@@ -17,13 +17,18 @@
 #include "CFRuntime_Internal.h"
 #include <CoreFoundation/CFMachPort.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <stdio.h>
 #include <mach/mach.h>
 #include <mach/error.h>
 #include <limits.h>
 #include <errno.h>
+
+#if __has_include(<unistd.h>)
+#include <unistd.h>
+#endif
+#if _POSIX_THREADS
 #include <pthread.h>
+#endif
 
 #define CFUserNotificationLog(alertHeader, alertMessage) CFLog(3, CFSTR("%@:  %@"), alertHeader, alertMessage);
 

CoreFoundation/Base.subproj/CFAsmMacros.h

@@ -16,7 +16,7 @@
 
 /* Use .note.GNU-stack to explicitly indicate a non-exec stack, b/c of bad   */
 /* default behaviour when translating handwritten assembly files (needed on  */
-/* GNU/* platforms, Android and FreeBSD, as tests have shown).               */
+/* GNU platforms, Android and FreeBSD, as tests have shown).                 */
 /* Platform tests are documented at http://git.savannah.gnu.org/gitweb/?p=libffcall.git;a=blob;f=porting-tools/execstack/README */
 #if (defined(__GNUC__) || defined (__llvm__) || defined (__clang__)) && defined(__ELF__) && (defined (__linux__) || defined (__linux) || defined (__gnu_linux__) || defined(__FreeBSD__) || defined (__FreeBSD_kernel__))
 #define NO_EXEC_STACK_DIRECTIVE .section .note.GNU-stack,"",%progbits

CoreFoundation/Base.subproj/CFBase.c

@@ -11,7 +11,10 @@
 #include <CoreFoundation/CFBase.h>
 #include "CFInternal.h"
 #include "CFRuntime_Internal.h"
-#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI || DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD
+#if __has_include(<unistd.h>)
+#include <unistd.h>
+#endif
+#if _POSIX_THREADS
 #include <pthread.h>
 #endif
 #if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_EMBEDDED_MINI
@@ -102,9 +105,6 @@ CF_INLINE CFAllocatorPreferredSizeCallBack __CFAllocatorGetPreferredSizeFunction
 }
 
 static const void * const __MallocDefaultZoneInfoPlaceholder = NULL;
-#if !TARGET_OS_MAC
-#define malloc_default_zone() (NULL)
-#endif
 
 #if TARGET_OS_MAC
 

CoreFoundation/Base.subproj/CFFileUtilities.c

@@ -1015,6 +1015,7 @@ CF_PRIVATE CFIndex _CFLengthAfterDeletingPathExtension(UniChar *unichars, CFInde
 #define	DT_DIR		 4
 #define	DT_REG		 8
 #define	DT_LNK		10
+#define	DT_UNKNOWN	 0
 #endif
 
 // NOTE: on Windows the filename is UTF16-encoded, the fileNameLen is result of wcslen. This function automatically skips '.' and '..', and '._' files

CoreFoundation/Base.subproj/CFInternal.h

@@ -101,13 +101,17 @@ CF_EXTERN_C_BEGIN
 #include <xlocale.h>
 #endif // !TARGET_OS_CYGWIN && !defined(__linux__)
 
-#include <unistd.h>
 #include <sys/time.h>
 #include <signal.h>
 #include <stdio.h>
 #endif // TARGET_OS_MAC || TARGET_OS_LINUX || TARGET_OS_BSD
 
+#if __has_include(<unistd.h>)
+#include <unistd.h>
+#endif
+#if _POSIX_THREADS
 #include <pthread.h>
+#endif
 
 #if !DEPLOYMENT_RUNTIME_SWIFT && __has_include(<os/log.h>)
 #include <os/log.h>
@@ -406,6 +410,7 @@ CF_PRIVATE Boolean __CFProcessIsRestricted(void);
 #if DEPLOYMENT_TARGET_WINDOWS
 #define SAFE_STACK_BUFFER_DECL(Type, Name, Count, Max) Type *Name; BOOL __ ## Name ## WasMallocd = NO; if (sizeof(Type) * Count > Max) { Name = (Type *)malloc((Count) * sizeof(Type)); __ ## Name ## WasMallocd = YES; } else Name = (Count > 0) ? _alloca((Count) * sizeof(Type)) : NULL
 #define SAFE_STACK_BUFFER_USE(Type, Name, Count, Max) if (sizeof(Type) * Count > Max) { Name = (Type *)malloc((Count) * sizeof(Type)); __ ## Name ## WasMallocd = YES; } else Name = (Count > 0) ? _alloca((Count) * sizeof(Type)) : NULL
+#define SAFE_STACK_BUFFER_CLEANUP(Name) if (__ ## Name ## WasMallocd) free(Name)
 #else
 // Declare and allocate a stack buffer. Max is the max size (in bytes) before falling over to malloc.
 #define SAFE_STACK_BUFFER_DECL(Type, Name, Count, Max) Type *Name; BOOL __ ## Name ## WasMallocd = NO; if (sizeof(Type) * Count > Max) { Name = (Type *)malloc((Count) * sizeof(Type)); __ ## Name ## WasMallocd = YES; } else Name = (Count > 0) ? alloca((Count) * sizeof(Type)) : NULL
@@ -574,7 +579,7 @@ typedef CFLock_t OSSpinLock;
 
 #if __has_include(<os/lock.h>)
 #include <os/lock.h>
-#else
+#elif _POSIX_THREADS
 #define OS_UNFAIR_LOCK_INIT PTHREAD_MUTEX_INITIALIZER
 typedef pthread_mutex_t os_unfair_lock;
 typedef pthread_mutex_t * os_unfair_lock_t;
@@ -682,6 +687,7 @@ CF_PRIVATE CFArrayRef _CFCreateCFArrayByTokenizingString(const char *values, cha
 #define	DT_DIR		 4
 #define	DT_REG		 8
 #define DT_LNK          10
+#define	DT_UNKNOWN	 0
 #endif
 
 /*
@@ -880,12 +886,6 @@ CF_EXPORT void _NS_pthread_setname_np(const char *name);
 #define pthread_main_np _CFIsMainThread
 #endif
 
-#if DEPLOYMENT_TARGET_WINDOWS
-// replacement for DISPATCH_QUEUE_OVERCOMMIT until we get a bug fix in dispatch on Windows
-// <rdar://problem/7923891> dispatch on Windows: Need queue_private.h
-#define DISPATCH_QUEUE_OVERCOMMIT 2
-#endif
-
 #if DEPLOYMENT_TARGET_WINDOWS
 CF_PRIVATE const wchar_t *_CFDLLPath(void);
 #endif
@@ -937,7 +937,7 @@ enum {
 };
 #endif
 
-#if DEPLOYMENT_TARGET_LINUX
+#if DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_WINDOWS
 #define QOS_CLASS_USER_INITIATED DISPATCH_QUEUE_PRIORITY_HIGH
 #define QOS_CLASS_DEFAULT DISPATCH_QUEUE_PRIORITY_DEFAULT
 #define QOS_CLASS_UTILITY DISPATCH_QUEUE_PRIORITY_LOW

CoreFoundation/Base.subproj/CFKnownLocations.c

@@ -72,6 +72,25 @@ CFURLRef _Nullable _CFKnownLocationCreatePreferencesURLForUser(CFKnownLocationUs
         }
     }
 
+#elif DEPLOYMENT_TARGET_WINDOWS
+
+    switch (user) {
+        case _kCFKnownLocationUserAny:
+            location = CFURLCreateWithFileSystemPath(kCFAllocatorSystemDefault, CFSTR("\\Users\\All Users\\AppData\\Local"), kCFURLWindowsPathStyle, true);
+            break;
+        case _kCFKnownLocationUserCurrent:
+            username = CFGetUserName();
+            // fallthrough
+        case _kCFKnownLocationUserByName:
+            const char *user = CFStringGetCStringPtr(username, kCFStringEncodingUTF8);
+            CFURLRef userdir = CFURLCreateFromFileSystemRepresentation(kCFAllocatorSystemDefault, (const unsigned char *)user, strlen(user), true);
+            CFURLRef homedir = CFURLCreateWithFileSystemPathRelativeToBase(kCFAllocatorSystemDefault, CFSTR("\\Users"), kCFURLWindowsPathStyle, true, userdir);
+            location = CFURLCreateWithFileSystemPathRelativeToBase(kCFAllocatorSystemDefault, CFSTR("\\AppData\\Local"),  kCFURLWindowsPathStyle, true, homedir);
+            CFRelease(homedir);
+            CFRelease(userdir);
+            break;
+    }
+
 #else
 
     #error For this platform, you need to define a preferences path for both 'any user' (i.e. installation-wide preferences) or the current user.

CoreFoundation/Base.subproj/CFPlatform.c

@@ -26,6 +26,9 @@
 #include <shellapi.h>
 #include <shlobj.h>
 #include <WinIoCtl.h>
+#include <direct.h>
+#define SECURITY_WIN32
+#include <Security.h>
 
 #define getcwd _NS_getcwd
 
@@ -302,6 +305,14 @@ CF_CROSS_PLATFORM_EXPORT CFStringRef CFCopyFullUserName(void) {
     if (upwd && upwd->pw_gecos) {
         result = CFStringCreateWithCString(kCFAllocatorSystemDefault, upwd->pw_gecos, kCFPlatformInterfaceStringEncoding);
     }
+#elif TARGET_OS_WIN32
+    ULONG ulLength = 0;
+    GetUserNameExW(NameDisplay, NULL, &ulLength);
+
+    WCHAR *wszBuffer[ulLength + 1];
+    GetUserNameExW(NameDisplay, (LPWSTR)wszBuffer, &ulLength);
+
+    result = CFStringCreateWithCharacters(kCFAllocatorSystemDefault, (UniChar *)wszBuffer, ulLength);
 #else
 #error "Please add an implementation for CFCopyFullUserName() that copies the full (display) user name"
 #endif
@@ -589,12 +600,12 @@ static DWORD __CFTSDIndexKey = 0xFFFFFFFF;
 
 // Called from CFRuntime's startup code, on Windows only
 CF_PRIVATE void __CFTSDWindowsInitialize() {
-    __CFTSDIndexKey = TlsAlloc();
+    __CFTSDIndexKey = FlsAlloc(__CFTSDFinalize);
 }
 
 // Called from CFRuntime's cleanup code, on Windows only
 CF_PRIVATE void __CFTSDWindowsCleanup() {
-    TlsFree(__CFTSDIndexKey);
+    FlsFree(__CFTSDIndexKey);
 }
 
 // Called for each thread as it exits, on Windows only
@@ -624,7 +635,7 @@ static void __CFTSDSetSpecific(void *arg) {
 #elif DEPLOYMENT_TARGET_LINUX
     pthread_setspecific(__CFTSDIndexKey, arg);
 #elif DEPLOYMENT_TARGET_WINDOWS
-    TlsSetValue(__CFTSDIndexKey, arg);
+    FlsSetValue(__CFTSDIndexKey, arg);
 #endif
 }
 
@@ -634,7 +645,7 @@ static void *__CFTSDGetSpecific() {
 #elif DEPLOYMENT_TARGET_LINUX
     return pthread_getspecific(__CFTSDIndexKey);
 #elif DEPLOYMENT_TARGET_WINDOWS
-    return TlsGetValue(__CFTSDIndexKey);
+    return FlsGetValue(__CFTSDIndexKey);
 #endif
 }
 
@@ -1325,21 +1336,36 @@ static void _CFThreadSpecificDestructor(void *ctx) {
 
 _CFThreadSpecificKey _CFThreadSpecificKeyCreate() {
     _CFThreadSpecificKey key;
+#if DEPLOYMENT_TARGET_WINDOWS
+    key = FlsAlloc(_CFThreadSpecificDestructor);
+#else
     pthread_key_create(&key, &_CFThreadSpecificDestructor);
+#endif
     return key;
 }
 
 CFTypeRef _Nullable _CFThreadSpecificGet(_CFThreadSpecificKey key) {
+#if DEPLOYMENT_TARGET_WINDOWS
+  return (CFTypeRef)FlsGetValue(key);
+#else
     return (CFTypeRef)pthread_getspecific(key);
+#endif
 }
 
 void _CFThreadSpecificSet(_CFThreadSpecificKey key, CFTypeRef _Nullable value) {
+#if DEPLOYMENT_TARGET_WINDOWS
+    if (value != NULL) {
+        swift_retain((void *)value);
+    }
+    FlsSetValue(key, value);
+#else
     if (value != NULL) {
         swift_retain((void *)value);
         pthread_setspecific(key, value);
     } else {
         pthread_setspecific(key, NULL);
     }
+#endif
 }
 
 _CFThreadRef _CFThreadCreate(const _CFThreadAttributes attrs, void *_Nullable (* _Nonnull startfn)(void *_Nullable), void *_CF_RESTRICT _Nullable context) {

CoreFoundation/Base.subproj/CFPriv.h

@@ -567,14 +567,11 @@ CF_EXPORT CFMessagePortRef _CFMessagePortCreateLocalEx(CFAllocatorRef allocator,
 
 #endif
 
-#if TARGET_OS_MAC || TARGET_OS_EMBEDDED || TARGET_OS_IPHONE
-#include <pthread.h>
-#elif !TARGET_OS_LINUX
-// Avoid including the pthread header
-#ifndef HAVE_STRUCT_TIMESPEC
-#define HAVE_STRUCT_TIMESPEC 1
-struct timespec { long tv_sec; long tv_nsec; };
+#if __has_include(<unistd.h>)
+#include <unistd.h>
 #endif
+#if _POSIX_THREADS
+#include <pthread.h>
 #endif
 
 CF_INLINE CFAbsoluteTime _CFAbsoluteTimeFromFileTimeSpec(struct timespec ts) {

CoreFoundation/Base.subproj/CFUtilities.c

@@ -28,7 +28,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS
+#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
 #include <asl.h>
 #else
 #define ASL_LEVEL_EMERG 0
@@ -40,7 +40,6 @@
 #include <unistd.h>
 #include <sys/uio.h>
 #include <mach/mach.h>
-#include <pthread.h>
 #include <mach-o/loader.h>
 #include <mach-o/dyld.h>
 #include <crt_externs.h>
@@ -61,12 +60,15 @@
 
 #if DEPLOYMENT_TARGET_LINUX || DEPLOYMENT_TARGET_FREEBSD
 #include <string.h>
-#include <pthread.h>
 #include <sys/mman.h>
-#include <unistd.h>
 #endif
 
-
+#if __has_include(<unistd.h>)
+#include <unistd.h>
+#endif
+#if _POSIX_THREADS
+#include <pthread.h>
+#endif
 
 
 
@@ -759,6 +761,16 @@ static bool also_do_stderr(const _cf_logging_style style) {
     return result;
 }
 
+#if DEPLOYMENT_TARGET_WINDOWS
+static struct tm *localtime_r(time_t *tv, struct tm *result) {
+  struct tm *tm = localtime(tv);
+  if (tm) {
+    *result = *tm;
+  }
+  return tm;
+}
+#endif
+
 static void _populateBanner(char **banner, char **time, char **thread, int *bannerLen) {
     double dummy;
     CFAbsoluteTime at = CFAbsoluteTimeGetCurrent();
@@ -778,8 +790,8 @@ static void _populateBanner(char **banner, char **time, char **thread, int *bann
     asprintf(banner, "%04d-%02d-%02d %02d:%02d:%02d.%03d %s[%d:%llu] ", year, month, day, hour, minute, second, ms, *_CFGetProgname(), getpid(), tid);
     asprintf(thread, "%x", pthread_mach_thread_np(pthread_self()));
 #elif DEPLOYMENT_TARGET_WINDOWS
-    bannerLen = asprintf(banner, "%04d-%02d-%02d %02d:%02d:%02d.%03d %s[%d:%x] ", year, month, day, hour, minute, second, ms, *_CFGetProgname(), getpid(), GetCurrentThreadId());
-    asprintf(thread, "%x", GetCurrentThreadId());
+    bannerLen = asprintf(banner, "%04d-%02d-%02d %02d:%02d:%02d.%03d %s[%d:%lx] ", year, month, day, hour, minute, second, ms, *_CFGetProgname(), getpid(), GetCurrentThreadId());
+    asprintf(thread, "%lx", GetCurrentThreadId());
 #else
     bannerLen = asprintf(banner, "%04d-%02d-%02d %02d:%02d:%02d.%03d %s[%d:%x] ", year, month, day, hour, minute, second, ms, *_CFGetProgname(), getpid(), (unsigned int)pthread_self());
     asprintf(thread, "%lx", pthread_self());
@@ -802,6 +814,7 @@ static void _logToStderr(char *banner, const char *message, size_t length) {
     writev(STDERR_FILENO, v[0].iov_base ? v : v + 1, nv);
     __CFUnlock(&lock);
 #elif DEPLOYMENT_TARGET_WINDOWS
+    size_t bannerLen = strlen(banner);
     size_t bufLen = bannerLen + length + 1;
     char *buf = (char *)malloc(sizeof(char) * bufLen);
     if (banner) {
@@ -869,7 +882,7 @@ static void __CFLogCStringLegacy(int32_t lev, const char *message, size_t length
         _populateBanner(&banner, &time, &thread, &bannerLen);
     }
 
-#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED || DEPLOYMENT_TARGET_WINDOWS
+#if DEPLOYMENT_TARGET_MACOSX || DEPLOYMENT_TARGET_EMBEDDED
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated"
     uid_t euid;
@@ -1202,7 +1215,7 @@ CF_PRIVATE Boolean _CFReadMappedFromFile(CFStringRef path, Boolean map, Boolean
     }
 #if __LP64__
 #else
-    if (statBuf.st_size > (1LL << 31)) {	// refuse to do more than 2GB
+    if (statBuf.st_size > (1ull << 31)) {	// refuse to do more than 2GB
         close(fd);
         if (errorPtr) *errorPtr = _CFErrorWithFilePathCodeDomain(kCFErrorDomainPOSIX, EFBIG, path);
         return false;
@@ -1524,6 +1537,8 @@ CFDictionaryRef __CFGetEnvironment() {
 #define environ __environ
 #endif
         char **envp = environ;
+#elif TARGET_OS_WIN32
+        char **envp = _environ;
 #endif
         envDict = CFDictionaryCreateMutable(kCFAllocatorSystemDefault, 0, &kCFCopyStringDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
         for (; *envp; ++envp) {