Release 1702.1

.gitattributes

@@ -7,4 +7,9 @@
 *.png filter=lfs diff=lfs merge=lfs -text
 *.jpeg filter=lfs diff=lfs merge=lfs -text
 *.jpg filter=lfs diff=lfs merge=lfs -text
+*.tiff filter=lfs diff=lfs merge=lfs -text
+*.nef filter=lfs diff=lfs merge=lfs -text
+*.xcf filter=lfs diff=lfs merge=lfs -text
+*.gif filter=lfs diff=lfs merge=lfs -text
 *.ttf filter=lfs diff=lfs merge=lfs -text
+*.nupkg filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -48,6 +48,9 @@ tmp
 *.lock.json
 .vscode/
 
+*.nuget.targets
+*.nuget.props
+
 # Mac desktop service store files
 .DS_Store
 xcuserdata/

.gitmodules

@@ -10,18 +10,6 @@
 [submodule "deps/3rdparty/zlib"]
 	path = deps/3rdparty/zlib
 	url = https://github.com/madler/zlib
-[submodule "deps/3rdparty/libpng"]
-	path = deps/3rdparty/libpng
-	url = git://git.code.sf.net/p/libpng/code
-[submodule "deps/3rdparty/freetype2"]
-	path = deps/3rdparty/freetype2
-	url = git://git.sv.nongnu.org/freetype/freetype2.git
-[submodule "deps/3rdparty/pixman"]
-	path = deps/3rdparty/pixman
-	url = git://anongit.freedesktop.org/pixman
-[submodule "deps/3rdparty/cairo"]
-	path = deps/3rdparty/cairo
-	url = git://anongit.freedesktop.org/git/cairo
 [submodule "deps/3rdparty/libobjc2"]
 	path = deps/3rdparty/libobjc2
 	url = https://github.com/Microsoft/libobjc2

Frameworks/Accelerate/vImage.mm

@@ -21,6 +21,7 @@
 #import <CoreGraphics/CGImage.h>
 #import <CoreGraphics/CoreGraphics.h>
 #import "CoreGraphics/CGDataProvider.h"
+#import "CGDataProviderInternal.h"
 #import <Foundation/Foundation.h>
 
 static const wchar_t* TAG = L"vImage";
@@ -59,8 +60,6 @@ vImage_Error vImageBuffer_InitWithCGImage(
         const CGColorSpaceModel srcCsModel = CGColorSpaceGetModel(srcColorSpace);
         const CGBitmapInfo srcBitmapInfo = CGImageGetBitmapInfo(image);
 
-        CGColorSpaceRelease(srcColorSpace);
-
         if (srcCsModel != dstCsModel) {
             TraceWarning(TAG, L"Colorspace conversions are not yet supported.");
         }
@@ -85,7 +84,7 @@ vImage_Error vImageBuffer_InitWithCGImage(
     if (result == kvImageNoError) {
         const uint32_t srcPitch = CGImageGetBytesPerRow(image);
         const uint32_t dstPitch = buffer->rowBytes;
-        BYTE* srcData = reinterpret_cast<BYTE*>(_CGImageGetData(image));
+        const BYTE* srcData = static_cast<const BYTE *>(_CGDataProviderGetData(CGImageGetDataProvider(image)));
         BYTE* dstData = reinterpret_cast<BYTE*>(buffer->data);
         const uint32_t bytesPerPixel = format->bitsPerPixel >> 3;
         const uint32_t bytesToCopy = width * bytesPerPixel;
@@ -174,49 +173,33 @@ CGImageRef vImageCreateCGImageFromBuffer(vImage_Buffer* buffer,
         packedBufferAllocated = false;
     }
 
-    CGImageRef imageRef;
-
-    if ((flags & kvImageNoAllocate) != 0) {
-        const size_t bufferSize = packedWidthInBytes * buffer->height;
+    if ((flags & kvImageNoAllocate) != 0) { // Client is self-allocating buffer.
         if (packedBufferAllocated) {
             TraceWarning(TAG,
                          L"kvImageNoAllocate flag ignored since padded buffer passed in. Packed buffer allocated and used since padded "
                          L"buffers can't be used in CGImage.");
         }
+    }
 
-        NSData* data = [NSData dataWithBytesNoCopy:packedBuffer length:bufferSize freeWhenDone:YES];
-
-        CGDataProviderRef dataProvider = CGDataProviderCreateWithCFData((CFDataRef)data);
-
-        imageRef = CGImageCreate((size_t)buffer->width,
-                                 (size_t)buffer->height,
-                                 (size_t)format->bitsPerComponent,
-                                 (size_t)format->bitsPerPixel,
-                                 (size_t)packedWidthInBytes,
-                                 format->colorSpace,
-                                 format->bitmapInfo,
-                                 dataProvider,
-                                 NULL,
-                                 false,
-                                 format->renderingIntent);
-
-        CGDataProviderRelease(dataProvider);
-    } else {
-        CGContextRef ctx = CGBitmapContextCreate(packedBuffer,
-                                                 (size_t)buffer->width,
-                                                 (size_t)buffer->height,
-                                                 (size_t)format->bitsPerComponent,
-                                                 packedWidthInBytes,
-                                                 format->colorSpace,
-                                                 format->bitmapInfo);
-
-        imageRef = CGBitmapContextCreateImage(ctx);
-
-        CGContextRelease(ctx);
-
-        if (packedBufferAllocated == true) {
-            IwFree(packedBuffer);
-        }
+    const size_t bufferSize = packedWidthInBytes * buffer->height;
+    CGDataProviderRef dataProvider = CGDataProviderCreateWithData(nullptr, packedBuffer, bufferSize, nullptr);
+
+    CGImageRef imageRef = CGImageCreate((size_t)buffer->width,
+                                        (size_t)buffer->height,
+                                        (size_t)format->bitsPerComponent,
+                                        (size_t)format->bitsPerPixel,
+                                        (size_t)packedWidthInBytes,
+                                        format->colorSpace,
+                                        format->bitmapInfo,
+                                        dataProvider,
+                                        NULL,
+                                        false,
+                                        format->renderingIntent);
+
+    CGDataProviderRelease(dataProvider);
+
+    if (packedBufferAllocated == true) {
+        IwFree(packedBuffer);
     }
 
     if (imageRef == nullptr) {

Frameworks/AutoLayout/AutoLayout.mm

@@ -463,6 +463,12 @@ - (void)autoLayoutLayoutSubviews {
 - (BOOL)autoLayoutInvalidateContentSize {
     AutoLayoutProperties* layoutProperties = self._autoLayoutProperties;
 
+    if (DEBUG_AUTO_LAYOUT_LIGHT) {
+        TraceVerbose(TAG, L"autoLayoutInvalidateContentSize: %hs(0x%p).",
+            object_getClassName(self),
+            self);
+    }
+
     CGSize newContentSize = [self intrinsicContentSize];
     if (CGSizeEqualToSize(layoutProperties->_intrinsicContentSize, newContentSize)) {
         if (DEBUG_AUTO_LAYOUT_LIGHT) {

Frameworks/CoreFoundation/Base.subproj/CFInternal.h

@@ -369,6 +369,17 @@ CF_PRIVATE Boolean __CFProcessIsRestricted();
 extern "C" Class _OBJC_CLASS__NSCFNumber;
 extern "C" Class _OBJC_CLASS__NSCFBoolean;
 
+// WINOBJC: Returns an empty protocol that is assigned only to bridged classes, so that bridged objects can be distinguished quickly
+static Protocol* __CFRuntimeGetBridgeProtocol() {
+    static Protocol* s_bridgeProtocol = []() {        
+        Protocol* ret = objc_allocateProtocol("_NSCFBridgedType");
+        objc_registerProtocol(ret);
+        return ret;
+    }();
+
+    return s_bridgeProtocol;
+}
+
 #ifdef __CONSTANT_CFSTRINGS__
 
 #if DEPLOYMENT_RUNTIME_SWIFT
@@ -684,8 +695,7 @@ extern uintptr_t __CFRuntimeObjCClassTable[];
 // WINOBJC: helper function to determine if a cf object is a bridged CF object.
 CF_INLINE bool __CF_IsBridgedObject(CFTypeRef obj) {
     CFRuntimeBase* object = (CFRuntimeBase*)obj;
-    if (!object || 
-        (object->_cfisa == 0)) {
+    if (!object || (object->_cfisa == 0)) {
         return false;
     }
 
@@ -696,28 +706,23 @@ CF_INLINE bool __CF_IsBridgedObject(CFTypeRef obj) {
         return true;
     }
 
-    for (unsigned int i = 0; i < __CFRuntimeClassTableSize; i++) {
-        if ((__CFRuntimeObjCClassTable[i] != 0) && 
-            ((object->_cfisa == __CFRuntimeObjCClassTable[i]) ||
-            ([object isKindOfClass:(Class)(__CFRuntimeObjCClassTable[i])]))) {
-            return true;
-        }
-    }
-
-    return false;
+    // Check if the object has the 'bridged object' protocol
+    // NOTE: because our class_conformsToProtocol() checks based only on name, 
+    // it is possible to spoof a bridged object by stating an object conforms to a protocol with the same name.
+    // However, this would not grant access to anything that could not be accessed by more conventional means
+    // (ie: overriding an existing CF/Foundation class)
+    // and as such would not constitute an escalation of privilege.
+    return class_conformsToProtocol((Class)(object->_cfisa), __CFRuntimeGetBridgeProtocol());
 }
 
 
 // WINOBJC: helper function to determine if an object is actually a CF object.
 // Logically this is basically !CF_IS_OBJC except that the expected type is not known ahead of time.
+// This is also logically the same as __CF_IsBridgedObject, except for if the object's _cfisa == 0
+// (treated as a CF object but not a bridged one)
 CF_INLINE bool __CF_IsCFObject(CFTypeRef obj) {
     CFRuntimeBase* object = (CFRuntimeBase*)obj;
-    if ((object->_cfisa == 0) || 
-        (object->_cfisa == (uintptr_t)(&_OBJC_CLASS__NSCFType)) ||
-        (object->_cfisa == (uintptr_t)(&_OBJC_CLASS__NSCFString)) ||
-        (object->_cfisa == (uintptr_t)(&_OBJC_CLASS__NSCFNumber)) ||
-        (object->_cfisa == (uintptr_t)(&_OBJC_CLASS__NSCFBoolean)) ||
-        __CF_IsBridgedObject(obj)) {
+    if ((object->_cfisa == 0) || __CF_IsBridgedObject(obj)) {
         return true;
     }
 

Frameworks/CoreFoundation/Base.subproj/CFRuntime.c

@@ -272,6 +272,10 @@ CFTypeID _CFRuntimeRegisterClass(const CFRuntimeClass * const cls) {
 void _CFRuntimeBridgeTypeToClass(CFTypeID cf_typeID, const void *cls_ref) {
     __CFLock(&__CFBigRuntimeFunnel);
     __CFRuntimeObjCClassTable[cf_typeID] = (uintptr_t)cls_ref;
+
+    // WINOBJC: Label the class with the 'bridged object' protocol, so that it can be quickly distinguished from non-bridged objects
+    class_addProtocol((Class)cls_ref, __CFRuntimeGetBridgeProtocol());
+
     __CFUnlock(&__CFBigRuntimeFunnel);
 }
 
@@ -1137,6 +1141,10 @@ void __CFInitialize(void) {
         for (CFIndex idx = 1; idx < __CFRuntimeClassTableSize; ++idx) {
             __CFRuntimeObjCClassTable[idx] = (uintptr_t)&_OBJC_CLASS__NSCFType;
         }
+
+        // WINOBJC: Label NSCFType with the 'bridged object' protocol
+        class_addProtocol(_OBJC_CLASS__NSCFType, __CFRuntimeGetBridgeProtocol());
+
 #endif
 
 #if DEPLOYMENT_RUNTIME_SWIFT

Frameworks/CoreFoundation/URL.subproj/CFURL.c

@@ -5007,21 +5007,38 @@ CFURLRef CFURLCreateCopyDeletingPathExtension(CFAllocatorRef allocator, CFURLRef
     }
 #endif
 
+    // WINOBJC: The previous implementation deleted invalid extensions.
     rg = _rangeOfLastPathComponent(url);
-    if (rg.location < 0) {
-        result = NULL;
-    } else if (rg.length && CFStringFindWithOptions(url->_string, CFSTR("."), rg, kCFCompareBackwards, &dotRg)) {
-        CFMutableStringRef newString = CFStringCreateMutableCopy(allocator, 0, url->_string);
-        dotRg.length = rg.location + rg.length - dotRg.location;
+    CFStringRef lastPathComponent =
+        CFStringCreateWithSubstring(allocator, url->_string, rg);
+
+    if ((rg.location == kCFNotFound) || (lastPathComponent == NULL)) {
+      // no last path component
+      result = NULL;
+    } else {
+      CFRange primaryExtRange;
+      _CFGetPathExtensionRangesFromPathComponent(lastPathComponent,
+                                                 &primaryExtRange, NULL);
+      if (primaryExtRange.location != kCFNotFound) {
+        CFMutableStringRef newString =
+            CFStringCreateMutableCopy(allocator, 0, url->_string);
+        dotRg.location = rg.location + primaryExtRange.location - 1;
+        dotRg.length = primaryExtRange.length + 1;
         CFStringDelete(newString, dotRg);
-        result = _CFURLCreateWithArbitraryString(allocator, newString, url->_base);
+        result =
+            _CFURLCreateWithArbitraryString(allocator, newString, url->_base);
         CFRelease(newString);
-    } else {
-        result = (CFURLRef)CFRetain(url);
+      } else {
+        // there is no extension to delete
+        result = static_cast<CFURLRef>(CFRetain(url));
+      }
+      CFRelease(lastPathComponent);
     }
-    if ( filePathURLCreated ) {
+
+    if (filePathURLCreated) {
         CFRelease(url);
     }
+
     return result;
 }
 

Frameworks/CoreGraphics/CGAffineTransform.mm

@@ -192,10 +192,11 @@ bool CGAffineTransformEqualToTransform(CGAffineTransform t2, CGAffineTransform t
 }
 
 /**
- @Status Stub
- @Notes
+ @Status Interoperable
 */
 CGSize CGSizeApplyAffineTransform(CGSize size, CGAffineTransform t) {
-    UNIMPLEMENTED();
-    return StubReturn();
+    return {
+        (CGFloat)((double)t.a * size.width + (double)t.c * size.height),
+        (CGFloat)((double)t.b * size.width + (double)t.d * size.height)
+    };
 }