Skip to content

Commit fe033f2

Browse files
mukholemukhole
committed
Added dependencies for the new support library (RTObjCInterop) for projections.
1 parent 5e24018 commit fe033f2

File tree

22 files changed

+69
-40
lines changed

22 files changed

+69
-40
lines changed

‎Frameworks/AVFoundation/AVAudioPlayer.mm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525

2626
#include <UWP/WindowsUIXamlControls.h>
2727

28-
#import <COMIncludes.h>
28+
#include <COMIncludes.h>
2929
#import <RawBuffer.h>
3030
#import <windows.storage.streams.h>
31-
#import <COMIncludes_End.h>
31+
#include <COMIncludes_End.h>
3232
#import "AssertARCEnabled.h"
3333

3434
// 100 nanoseconds per tick
@@ -184,7 +184,7 @@ - (instancetype)initWithData:(NSData *)data fileTypeHint:(NSString*)utiString er
184184

185185
// TODO: subclassed IAsyncOperation<T>s don't get generated correctly in ObjCUWP yet, when that happens it'll
186186
// open up StoreAsync.
187-
IDataWriter* writer = (__bridge IDataWriter*)[rw internalObject];
187+
IDataWriter* writer = (IDataWriter*)[rw comObj].Get();
188188
ComPtr<IAsyncOperation<UInt32>> comp;
189189
writer->WriteBuffer(buffer.Get());
190190
writer->StoreAsync(&comp);

‎Frameworks/Foundation/NSData.mm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
#import "Foundation/NSValue.h"
2626
#import <UWP/WindowsStorageStreams.h>
2727
#import <UWP/WindowsSecurityCryptography.h>
28-
#import <COMIncludes.h>
28+
#include <COMIncludes.h>
2929
#import "ErrorHandling.h"
3030
#import "RawBuffer.h"
3131
#import <wrl\wrappers\corewrappers.h>
3232
#import <windows.security.cryptography.h>
3333
#import <windows.storage.streams.h>
34-
#import <COMIncludes_End.h>
34+
#include <COMIncludes_End.h>
3535
#import <string>
3636
#import <sstream>
3737
#import <iomanip>

‎Frameworks/Foundation/NSURLProtocol_WinHTTP.mm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
#import <Foundation/NSURLProtocol.h>
1818
#import <Foundation/NSHTTPURLResponse.h>
1919

20-
#import <COMIncludes.h>
20+
#include <COMIncludes.h>
2121
#import <wrl/client.h>
2222
#import <wrl/wrappers/corewrappers.h>
2323
#import <Windows.Foundation.Collections.h>
2424
#import <Windows.Web.Http.h>
2525
#import <Windows.Web.Http.Filters.h>
2626
#import <Windows.Storage.Streams.h>
2727
#import <Windows.System.Threading.h>
28-
#import <COMIncludes_end.h>
28+
#include <COMIncludes_end.h>
2929
#import <mutex>
3030

3131
#import "Starboard/SmartTypes.h"

‎Frameworks/StarboardXaml/CompositorInterface.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1725,7 +1725,7 @@ void DecrementCounter(const char* name) override {
17251725
}
17261726

17271727
DisplayTexture* CreateDisplayTextureForElement(id xamlElement) override {
1728-
GenericControlXaml* genericControlTexture = new GenericControlXaml((IUnknown*)[(RTObject*)xamlElement internalObject]);
1728+
GenericControlXaml* genericControlTexture = new GenericControlXaml([(RTObject*)xamlElement comObj].Get());
17291729
return genericControlTexture;
17301730
}
17311731

‎Frameworks/SystemConfiguration/SCNetworkReachability.mm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ + (void)_testAllReachabilityObjects {
134134

135135
+ (void)_checkGlobalReachability {
136136
WNCConnectionProfile* internetConnectionProfile = [WNCNetworkInformation getInternetConnectionProfile];
137-
if ([internetConnectionProfile internalObject] != nil &&
137+
if (internetConnectionProfile &&
138138
[internetConnectionProfile getNetworkConnectivityLevel] == WNCNetworkConnectivityLevelInternetAccess) {
139139
SCNetworkReachabilityFlags newFlags = kSCNetworkReachabilityFlagsReachable;
140140

‎build/Tests/UnitTests/Starboard/Starboard.UnitTests.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
<Link>
133133
<SubSystem>Console</SubSystem>
134134
<GenerateDebugInformation>true</GenerateDebugInformation>
135-
<AdditionalDependencies>ObjCUWP.lib;mincore.lib;%(AdditionalDependencies)</AdditionalDependencies>
135+
<AdditionalDependencies>RTObjCInterop.lib;ObjCUWP.lib;mincore.lib;%(AdditionalDependencies)</AdditionalDependencies>
136136
<AppContainer>false</AppContainer>
137137
</Link>
138138
<ClangCompile>
@@ -154,7 +154,7 @@
154154
<Link>
155155
<SubSystem>Console</SubSystem>
156156
<GenerateDebugInformation>true</GenerateDebugInformation>
157-
<AdditionalDependencies>ObjCUWP.lib;mincore.lib;%(AdditionalDependencies)</AdditionalDependencies>
157+
<AdditionalDependencies>RTObjCInterop.lib;ObjCUWP.lib;mincore.lib;%(AdditionalDependencies)</AdditionalDependencies>
158158
<AppContainer>false</AppContainer>
159159
</Link>
160160
<ClangCompile>
@@ -180,7 +180,7 @@
180180
<GenerateDebugInformation>true</GenerateDebugInformation>
181181
<EnableCOMDATFolding>true</EnableCOMDATFolding>
182182
<OptimizeReferences>true</OptimizeReferences>
183-
<AdditionalDependencies>ObjCUWP.lib;mincore.lib;%(AdditionalDependencies)</AdditionalDependencies>
183+
<AdditionalDependencies>RTObjCInterop.lib;ObjCUWP.lib;mincore.lib;%(AdditionalDependencies)</AdditionalDependencies>
184184
<AppContainer>false</AppContainer>
185185
</Link>
186186
<ClangCompile>
@@ -206,7 +206,7 @@
206206
<GenerateDebugInformation>true</GenerateDebugInformation>
207207
<EnableCOMDATFolding>true</EnableCOMDATFolding>
208208
<OptimizeReferences>true</OptimizeReferences>
209-
<AdditionalDependencies>ObjCUWP.lib;mincore.lib;%(AdditionalDependencies)</AdditionalDependencies>
209+
<AdditionalDependencies>RTObjCInterop.lib;ObjCUWP.lib;mincore.lib;%(AdditionalDependencies)</AdditionalDependencies>
210210
<AppContainer>false</AppContainer>
211211
</Link>
212212
<ClangCompile>

‎build/Tests/UnitTests/UIKit/UIKit.UnitTests.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@
146146
<Link>
147147
<SubSystem>Console</SubSystem>
148148
<GenerateDebugInformation>true</GenerateDebugInformation>
149-
<AdditionalDependencies>mincore.lib;freetype.lib;libxml2.lib;Windowscodecs.lib;ObjCUWP.lib;libdispatch.lib;%(AdditionalDependencies)</AdditionalDependencies>
149+
<AdditionalDependencies>RTObjCInterop.lib;mincore.lib;freetype.lib;libxml2.lib;Windowscodecs.lib;ObjCUWP.lib;libdispatch.lib;%(AdditionalDependencies)</AdditionalDependencies>
150150
<AppContainer>false</AppContainer>
151151
</Link>
152152
<ClangCompile>
@@ -169,7 +169,7 @@
169169
<Link>
170170
<SubSystem>Console</SubSystem>
171171
<GenerateDebugInformation>true</GenerateDebugInformation>
172-
<AdditionalDependencies>mincore.lib;freetype.lib;libxml2.lib;Windowscodecs.lib;ObjCUWP.lib;libdispatch.lib;%(AdditionalDependencies)</AdditionalDependencies>
172+
<AdditionalDependencies>RTObjCInterop.lib;mincore.lib;freetype.lib;libxml2.lib;Windowscodecs.lib;ObjCUWP.lib;libdispatch.lib;%(AdditionalDependencies)</AdditionalDependencies>
173173
<AppContainer>false</AppContainer>
174174
</Link>
175175
<ClangCompile>
@@ -196,7 +196,7 @@
196196
<GenerateDebugInformation>true</GenerateDebugInformation>
197197
<EnableCOMDATFolding>true</EnableCOMDATFolding>
198198
<OptimizeReferences>true</OptimizeReferences>
199-
<AdditionalDependencies>mincore.lib;freetype.lib;libxml2.lib;Windowscodecs.lib;ObjCUWP.lib;libdispatch.lib;%(AdditionalDependencies)</AdditionalDependencies>
199+
<AdditionalDependencies>RTObjCInterop.lib;mincore.lib;freetype.lib;libxml2.lib;Windowscodecs.lib;ObjCUWP.lib;libdispatch.lib;%(AdditionalDependencies)</AdditionalDependencies>
200200
<AppContainer>false</AppContainer>
201201
</Link>
202202
<ClangCompile>
@@ -223,7 +223,7 @@
223223
<GenerateDebugInformation>true</GenerateDebugInformation>
224224
<EnableCOMDATFolding>true</EnableCOMDATFolding>
225225
<OptimizeReferences>true</OptimizeReferences>
226-
<AdditionalDependencies>mincore.lib;freetype.lib;libxml2.lib;Windowscodecs.lib;ObjCUWP.lib;libdispatch.lib;%(AdditionalDependencies)</AdditionalDependencies>
226+
<AdditionalDependencies>RTObjCInterop.lib;mincore.lib;freetype.lib;libxml2.lib;Windowscodecs.lib;ObjCUWP.lib;libdispatch.lib;%(AdditionalDependencies)</AdditionalDependencies>
227227
<AppContainer>false</AppContainer>
228228
</Link>
229229
<ClangCompile>

‎build/UIKit/dll/UIKit.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
</ClCompile>
7171
<Link>
7272
<ModuleDefinitionFile>UIKit.def</ModuleDefinitionFile>
73-
<AdditionalDependencies>freetype.lib;objcuwp.lib;libdispatch.lib;Windowscodecs.lib;libxml2.lib;%(AdditionalDependencies)</AdditionalDependencies>
73+
<AdditionalDependencies>RTObjCInterop.lib;freetype.lib;objcuwp.lib;libdispatch.lib;Windowscodecs.lib;libxml2.lib;%(AdditionalDependencies)</AdditionalDependencies>
7474
</Link>
7575
<ClangCompile>
7676
<IncludePaths>$(StarboardBasePath)\deps\prebuilt\include;$(StarboardBasePath)\Frameworks\include</IncludePaths>
@@ -83,7 +83,7 @@
8383
</ClCompile>
8484
<Link>
8585
<ModuleDefinitionFile>UIKit.def</ModuleDefinitionFile>
86-
<AdditionalDependencies>freetype.lib;objcuwp.lib;libdispatch.lib;Windowscodecs.lib;libxml2.lib;%(AdditionalDependencies)</AdditionalDependencies>
86+
<AdditionalDependencies>RTObjCInterop.lib;freetype.lib;objcuwp.lib;libdispatch.lib;Windowscodecs.lib;libxml2.lib;%(AdditionalDependencies)</AdditionalDependencies>
8787
</Link>
8888
<ClangCompile>
8989
<IncludePaths>$(StarboardBasePath)\deps\prebuilt\include;$(StarboardBasePath)\Frameworks\include</IncludePaths>
@@ -96,7 +96,7 @@
9696
</ClCompile>
9797
<Link>
9898
<ModuleDefinitionFile>UIKit.def</ModuleDefinitionFile>
99-
<AdditionalDependencies>freetype.lib;objcuwp.lib;libdispatch.lib;Windowscodecs.lib;libxml2.lib;%(AdditionalDependencies)</AdditionalDependencies>
99+
<AdditionalDependencies>RTObjCInterop.lib;freetype.lib;objcuwp.lib;libdispatch.lib;Windowscodecs.lib;libxml2.lib;%(AdditionalDependencies)</AdditionalDependencies>
100100
</Link>
101101
<ClangCompile>
102102
<IncludePaths>$(StarboardBasePath)\deps\prebuilt\include;$(StarboardBasePath)\Frameworks\include</IncludePaths>
@@ -109,7 +109,7 @@
109109
</ClCompile>
110110
<Link>
111111
<ModuleDefinitionFile>UIKit.def</ModuleDefinitionFile>
112-
<AdditionalDependencies>freetype.lib;objcuwp.lib;libdispatch.lib;Windowscodecs.lib;libxml2.lib;%(AdditionalDependencies)</AdditionalDependencies>
112+
<AdditionalDependencies>RTObjCInterop.lib;freetype.lib;objcuwp.lib;libdispatch.lib;Windowscodecs.lib;libxml2.lib;%(AdditionalDependencies)</AdditionalDependencies>
113113
</Link>
114114
<ClangCompile>
115115
<IncludePaths>$(StarboardBasePath)\deps\prebuilt\include;$(StarboardBasePath)\Frameworks\include</IncludePaths>

‎deps/prebuilt/Universal Windows/ARM/ObjCUWP.dll‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:9587df5fafffe996678953f539095015f96a6aa4c21ef6fdc17ce0ef453eb230
3-
size 34056704
2+
oid sha256:b63e85d7b4d62b49ad0d5a665e5f7f59f3769b3199b373becdd065e6282f8730
3+
size 34962944

‎deps/prebuilt/Universal Windows/ARM/ObjCUWP.lib‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:e0c5c041e2f3fd0e8fdb1c984acbcae0bfd50ddb572f19cc9afa3e8492bf08d1
3-
size 1409006
2+
oid sha256:5fba28c92161cadf720b5d9de0d30b97e60a8816356aedaf8daec336ba21d541
3+
size 1408370

0 commit comments

Comments
 (0)