Skip to content

Commit 5579f5d

Browse files
kennykerrkennykerr
committed
Revert "Build tweaks to simplify Win7 smoke testing (#471)"
This reverts commit 0651af8.
1 parent 0651af8 commit 5579f5d

File tree

71 files changed

+26
-4743
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+26
-4743
lines changed

‎cppwinrt.sln‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_module_lock_custom", "
9696
EndProject
9797
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{3C7EA5F8-6E8C-4376-B499-2CAF596384B0}"
9898
EndProject
99-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_win7", "test\test_win7\test_win7.vcxproj", "{2EF696B9-7F4A-410F-AE5C-5301565C0F08}"
100-
ProjectSection(ProjectDependencies) = postProject
101-
{D613FB39-5035-4043-91E2-BAB323908AF4} = {D613FB39-5035-4043-91E2-BAB323908AF4}
102-
{F1C915B3-2C64-4992-AFB7-7F035B1A7607} = {F1C915B3-2C64-4992-AFB7-7F035B1A7607}
103-
{A91B8BF3-28E4-4D9E-8DBA-64B70E4F0270} = {A91B8BF3-28E4-4D9E-8DBA-64B70E4F0270}
104-
EndProjectSection
105-
EndProject
10699
Global
107100
GlobalSection(SolutionConfigurationPlatforms) = preSolution
108101
Debug|ARM = Debug|ARM
@@ -419,22 +412,6 @@ Global
419412
{08C40663-B6A3-481E-8755-AE32BAD99501}.Release|x64.Build.0 = Release|x64
420413
{08C40663-B6A3-481E-8755-AE32BAD99501}.Release|x86.ActiveCfg = Release|Win32
421414
{08C40663-B6A3-481E-8755-AE32BAD99501}.Release|x86.Build.0 = Release|Win32
422-
{2EF696B9-7F4A-410F-AE5C-5301565C0F08}.Debug|ARM.ActiveCfg = Debug|ARM
423-
{2EF696B9-7F4A-410F-AE5C-5301565C0F08}.Debug|ARM.Build.0 = Debug|ARM
424-
{2EF696B9-7F4A-410F-AE5C-5301565C0F08}.Debug|ARM64.ActiveCfg = Debug|ARM64
425-
{2EF696B9-7F4A-410F-AE5C-5301565C0F08}.Debug|ARM64.Build.0 = Debug|ARM64
426-
{2EF696B9-7F4A-410F-AE5C-5301565C0F08}.Debug|x64.ActiveCfg = Debug|x64
427-
{2EF696B9-7F4A-410F-AE5C-5301565C0F08}.Debug|x64.Build.0 = Debug|x64
428-
{2EF696B9-7F4A-410F-AE5C-5301565C0F08}.Debug|x86.ActiveCfg = Debug|Win32
429-
{2EF696B9-7F4A-410F-AE5C-5301565C0F08}.Debug|x86.Build.0 = Debug|Win32
430-
{2EF696B9-7F4A-410F-AE5C-5301565C0F08}.Release|ARM.ActiveCfg = Release|ARM
431-
{2EF696B9-7F4A-410F-AE5C-5301565C0F08}.Release|ARM.Build.0 = Release|ARM
432-
{2EF696B9-7F4A-410F-AE5C-5301565C0F08}.Release|ARM64.ActiveCfg = Release|ARM64
433-
{2EF696B9-7F4A-410F-AE5C-5301565C0F08}.Release|ARM64.Build.0 = Release|ARM64
434-
{2EF696B9-7F4A-410F-AE5C-5301565C0F08}.Release|x64.ActiveCfg = Release|x64
435-
{2EF696B9-7F4A-410F-AE5C-5301565C0F08}.Release|x64.Build.0 = Release|x64
436-
{2EF696B9-7F4A-410F-AE5C-5301565C0F08}.Release|x86.ActiveCfg = Release|Win32
437-
{2EF696B9-7F4A-410F-AE5C-5301565C0F08}.Release|x86.Build.0 = Release|Win32
438415
EndGlobalSection
439416
GlobalSection(SolutionProperties) = preSolution
440417
HideSolutionNode = FALSE
@@ -456,7 +433,6 @@ Global
456433
{303CC0FE-7D66-4F9F-B7A1-0AF7F9359074} = {3C7EA5F8-6E8C-4376-B499-2CAF596384B0}
457434
{D48A96C2-8512-4CC3-B6E4-7CFF07ED8ED3} = {3C7EA5F8-6E8C-4376-B499-2CAF596384B0}
458435
{08C40663-B6A3-481E-8755-AE32BAD99501} = {3C7EA5F8-6E8C-4376-B499-2CAF596384B0}
459-
{2EF696B9-7F4A-410F-AE5C-5301565C0F08} = {3C7EA5F8-6E8C-4376-B499-2CAF596384B0}
460436
EndGlobalSection
461437
GlobalSection(ExtensibilityGlobals) = postSolution
462438
SolutionGuid = {2783B8FD-EA3B-4D6B-9F81-662D289E02AA}

‎cppwinrt/cppwinrt.vcxproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@
201201
<ClCompile>
202202
<Optimization>Disabled</Optimization>
203203
<AdditionalIncludeDirectories>..\inc;$(OutputPath);$(WinMDPackageDir);</AdditionalIncludeDirectories>
204-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
205204
</ClCompile>
206205
<Link>
207206
<SubSystem>Console</SubSystem>
@@ -218,7 +217,6 @@
218217
<ClCompile>
219218
<Optimization>Disabled</Optimization>
220219
<AdditionalIncludeDirectories>..\inc;$(OutputPath);$(WinMDPackageDir);</AdditionalIncludeDirectories>
221-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
222220
</ClCompile>
223221
<Link>
224222
<SubSystem>Console</SubSystem>
@@ -235,7 +233,6 @@
235233
<ClCompile>
236234
<Optimization>Disabled</Optimization>
237235
<AdditionalIncludeDirectories>..\inc;$(OutputPath);$(WinMDPackageDir);</AdditionalIncludeDirectories>
238-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
239236
</ClCompile>
240237
<Link>
241238
<SubSystem>Console</SubSystem>
@@ -252,7 +249,6 @@
252249
<ClCompile>
253250
<Optimization>Disabled</Optimization>
254251
<AdditionalIncludeDirectories>..\inc;$(OutputPath);$(WinMDPackageDir);</AdditionalIncludeDirectories>
255-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
256252
</ClCompile>
257253
<Link>
258254
<SubSystem>Console</SubSystem>

‎prebuild/prebuild.vcxproj‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@
125125
<ClCompile>
126126
<Optimization>Disabled</Optimization>
127127
<AdditionalIncludeDirectories>..\cppwinrt</AdditionalIncludeDirectories>
128-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
129128
</ClCompile>
130129
<Link>
131130
<SubSystem>Console</SubSystem>
@@ -135,7 +134,6 @@
135134
<ClCompile>
136135
<Optimization>Disabled</Optimization>
137136
<AdditionalIncludeDirectories>..\cppwinrt</AdditionalIncludeDirectories>
138-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
139137
</ClCompile>
140138
<Link>
141139
<SubSystem>Console</SubSystem>
@@ -145,7 +143,6 @@
145143
<ClCompile>
146144
<Optimization>Disabled</Optimization>
147145
<AdditionalIncludeDirectories>..\cppwinrt</AdditionalIncludeDirectories>
148-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
149146
</ClCompile>
150147
<Link>
151148
<SubSystem>Console</SubSystem>
@@ -155,7 +152,6 @@
155152
<ClCompile>
156153
<Optimization>Disabled</Optimization>
157154
<AdditionalIncludeDirectories>..\cppwinrt</AdditionalIncludeDirectories>
158-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
159155
</ClCompile>
160156
<Link>
161157
<SubSystem>Console</SubSystem>
@@ -167,7 +163,6 @@
167163
<FunctionLevelLinking>true</FunctionLevelLinking>
168164
<IntrinsicFunctions>true</IntrinsicFunctions>
169165
<AdditionalIncludeDirectories>..\cppwinrt</AdditionalIncludeDirectories>
170-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
171166
</ClCompile>
172167
<Link>
173168
<SubSystem>Console</SubSystem>
@@ -181,7 +176,6 @@
181176
<FunctionLevelLinking>true</FunctionLevelLinking>
182177
<IntrinsicFunctions>true</IntrinsicFunctions>
183178
<AdditionalIncludeDirectories>..\cppwinrt</AdditionalIncludeDirectories>
184-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
185179
</ClCompile>
186180
<Link>
187181
<SubSystem>Console</SubSystem>
@@ -195,7 +189,6 @@
195189
<FunctionLevelLinking>true</FunctionLevelLinking>
196190
<IntrinsicFunctions>true</IntrinsicFunctions>
197191
<AdditionalIncludeDirectories>..\cppwinrt</AdditionalIncludeDirectories>
198-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
199192
</ClCompile>
200193
<Link>
201194
<SubSystem>Console</SubSystem>
@@ -209,7 +202,6 @@
209202
<FunctionLevelLinking>true</FunctionLevelLinking>
210203
<IntrinsicFunctions>true</IntrinsicFunctions>
211204
<AdditionalIncludeDirectories>..\cppwinrt</AdditionalIncludeDirectories>
212-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
213205
</ClCompile>
214206
<Link>
215207
<SubSystem>Console</SubSystem>

‎run_tests.cmd‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ if "%target_platform%"=="" set target_platform=x64
99
if "%target_configuration%"=="" set target_configuration=Debug
1010

1111
call :run_test test
12-
call :run_test test_win7
1312
call :run_test test_fast
1413
call :run_test test_slow
1514
call :run_test test_old

‎scratch/scratch.vcxproj‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@
130130
<AdditionalIncludeDirectories>$(OutputPath);Generated Files;..\..\..\library</AdditionalIncludeDirectories>
131131
<PreprocessorDefinitions>NOMINMAX;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
132132
<AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
133-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
134133
</ClCompile>
135134
<Link>
136135
<SubSystem>Console</SubSystem>
@@ -152,7 +151,6 @@
152151
<AdditionalIncludeDirectories>$(OutputPath);Generated Files;..\..\..\library</AdditionalIncludeDirectories>
153152
<PreprocessorDefinitions>NOMINMAX;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
154153
<AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
155-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
156154
</ClCompile>
157155
<Link>
158156
<SubSystem>Console</SubSystem>
@@ -172,7 +170,6 @@
172170
<AdditionalIncludeDirectories>$(OutputPath);Generated Files;..\..\..\library</AdditionalIncludeDirectories>
173171
<PreprocessorDefinitions>NOMINMAX;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
174172
<AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
175-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
176173
</ClCompile>
177174
<Link>
178175
<SubSystem>Console</SubSystem>
@@ -192,7 +189,6 @@
192189
<AdditionalIncludeDirectories>$(OutputPath);Generated Files;..\..\..\library</AdditionalIncludeDirectories>
193190
<PreprocessorDefinitions>NOMINMAX;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
194191
<AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
195-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
196192
</ClCompile>
197193
<Link>
198194
<SubSystem>Console</SubSystem>
@@ -212,7 +208,6 @@
212208
<AdditionalIncludeDirectories>$(OutputPath);Generated Files;..\..\..\library</AdditionalIncludeDirectories>
213209
<PreprocessorDefinitions>NOMINMAX;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
214210
<AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
215-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
216211
</ClCompile>
217212
<Link>
218213
<SubSystem>Console</SubSystem>
@@ -234,7 +229,6 @@
234229
<AdditionalIncludeDirectories>$(OutputPath);Generated Files;..\..\..\library</AdditionalIncludeDirectories>
235230
<PreprocessorDefinitions>NOMINMAX;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
236231
<AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
237-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
238232
</ClCompile>
239233
<Link>
240234
<SubSystem>Console</SubSystem>
@@ -258,7 +252,6 @@
258252
<AdditionalIncludeDirectories>$(OutputPath);Generated Files;..\..\..\library</AdditionalIncludeDirectories>
259253
<PreprocessorDefinitions>NOMINMAX;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
260254
<AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
261-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
262255
</ClCompile>
263256
<Link>
264257
<SubSystem>Console</SubSystem>
@@ -282,7 +275,6 @@
282275
<AdditionalIncludeDirectories>$(OutputPath);Generated Files;..\..\..\library</AdditionalIncludeDirectories>
283276
<PreprocessorDefinitions>NOMINMAX;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
284277
<AdditionalOptions>/await %(AdditionalOptions)</AdditionalOptions>
285-
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
286278
</ClCompile>
287279
<Link>
288280
<SubSystem>Console</SubSystem>

‎strings/base_activation.h‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,8 @@ namespace winrt::impl
3434

3535
if (hr == impl::error_not_initialized)
3636
{
37-
auto usage = static_cast<int32_t(__stdcall*)(void** cookie) noexcept>(WINRT_GetProcAddress(WINRT_LoadLibraryW(L"combase.dll"), "CoIncrementMTAUsage"));
38-
39-
if (!usage)
40-
{
41-
return hr;
42-
}
43-
4437
void* cookie;
45-
usage(&cookie);
38+
WINRT_CoIncrementMTAUsage(&cookie);
4639
hr = handler(*(void**)(&name), guid_of<Interface>(), result);
4740
}
4841

‎strings/base_extern.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ extern "C"
1313
int32_t __stdcall WINRT_GetErrorInfo(uint32_t reserved, void** info) noexcept;
1414
int32_t __stdcall WINRT_CoInitializeEx(void*, uint32_t type) noexcept;
1515
void __stdcall WINRT_CoUninitialize() noexcept;
16+
int32_t __stdcall WINRT_CoIncrementMTAUsage(void** cookie) noexcept;
1617

1718
int32_t __stdcall WINRT_CoCreateFreeThreadedMarshaler(void* outer, void** marshaler) noexcept;
1819
int32_t __stdcall WINRT_CoCreateInstance(winrt::guid const& clsid, void* outer, uint32_t context, winrt::guid const& iid, void** object) noexcept;
@@ -95,6 +96,7 @@ WINRT_IMPL_LINK(SetErrorInfo, 8)
9596
WINRT_IMPL_LINK(GetErrorInfo, 8)
9697
WINRT_IMPL_LINK(CoInitializeEx, 8)
9798
WINRT_IMPL_LINK(CoUninitialize, 0)
99+
WINRT_IMPL_LINK(CoIncrementMTAUsage, 4)
98100

99101
WINRT_IMPL_LINK(CoCreateFreeThreadedMarshaler, 8)
100102
WINRT_IMPL_LINK(CoCreateInstance, 20)

0 commit comments

Comments
 (0)