-
Notifications
You must be signed in to change notification settings - Fork 107
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add WinRT.StubExe project and .targets to support WinRT activation for apps #1640
Closed
Closed
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
81a38d0
Add blank 'WinRT.StubExe' project
Sergio0694 66479d3
Remove unnecessary filter folders
Sergio0694 ae2a564
Add .def files and .lib files
Sergio0694 335579b
Update WinRT.StubExe.cpp
Sergio0694 95a0dbd
Attempt to reference .lib files from vcxproj file
Sergio0694 e8c5d6c
Add pch.h/pch.cpp to fix build
Sergio0694 59282ea
Remove .lib files, switch to 'LoadLibrary'
Sergio0694 f8b74fb
Switch app type to WinExe for stub .exe
Sergio0694 5fc4958
Simplify 'WinRT.StubExe.vcxproj', fix ARM64 build
Sergio0694 6d4caae
Switch to 'wmain', remove 'CommandLineToArgvW'
Sergio0694 fc1fd67
Remove leftover 'ItemDefinitionGroup'
Sergio0694 1391296
Link against 'WindowsApp.lib' for Xbox/HoloLens
Sergio0694 d567513
Only set 'WindowsApp.lib' as additional dependencies
Sergio0694 3eee49b
Remove leftover link pragma
Sergio0694 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| #include "pch.h" | ||
| #include <windows.h> | ||
|
|
||
| typedef int (*__managed__Main)(int, wchar_t*[]); | ||
|
|
||
| int wmain(int argc, wchar_t* argv[]) | ||
| { | ||
| wchar_t fileName[MAX_PATH]; | ||
|
|
||
| // Get the path of the current .exe file (it will be renamed to match the app name) | ||
| if (!GetModuleFileNameW(NULL, fileName, MAX_PATH)) | ||
| { | ||
| return GetLastError(); | ||
| } | ||
|
|
||
| int fileNameLength = lstrlenW(fileName); | ||
|
|
||
| // Replace the extension (.exe -> .dll) | ||
| memcpy( | ||
| /* _Dst */ &fileName[fileNameLength - 3 /* "exe" */], | ||
| /* _Src */ L"dll", | ||
| /* _Size */ sizeof(wchar_t) * 3 /* "dll" */); | ||
|
|
||
| // Load the .dll for the app | ||
| HMODULE hModule = LoadLibraryW(fileName); | ||
|
|
||
| if (!hModule) | ||
| { | ||
| return GetLastError(); | ||
| } | ||
|
|
||
| // Get the custom main from the native .dll (hardcoded to "__managed__Main") | ||
| FARPROC pEntryPoint = GetProcAddress(hModule, "__managed__Main"); | ||
|
|
||
| if (!pEntryPoint) | ||
| { | ||
| return GetLastError(); | ||
| } | ||
|
|
||
| // Jump to the custom entry point in the implementation .dll | ||
| return ((__managed__Main)pEntryPoint)(argc, argv); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <ItemGroup Label="ProjectConfigurations"> | ||
| <ProjectConfiguration Include="Debug|Win32"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>Win32</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|Win32"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>Win32</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Debug|x64"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>x64</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|x64"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>x64</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Debug|ARM64"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>ARM64</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|ARM64"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>ARM64</Platform> | ||
| </ProjectConfiguration> | ||
| </ItemGroup> | ||
| <PropertyGroup Label="Globals"> | ||
| <VCProjectVersion>17.0</VCProjectVersion> | ||
| <Keyword>Win32Proj</Keyword> | ||
| <ProjectGuid>{47ac26da-15ad-41bf-867b-890ffc45b817}</ProjectGuid> | ||
| <RootNamespace>WinRTStubExe</RootNamespace> | ||
| <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | ||
| </PropertyGroup> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||
| <PropertyGroup Label="Configuration"> | ||
| <ConfigurationType>Application</ConfigurationType> | ||
| <UseDebugLibraries>false</UseDebugLibraries> | ||
| <UseDebugLibraries Condition="'$(Configuration)' == 'Debug'">true</UseDebugLibraries> | ||
| <PlatformToolset>v143</PlatformToolset> | ||
| <CharacterSet>Unicode</CharacterSet> | ||
| <WholeProgramOptimization Condition="'$(Configuration)' == 'Release'">true</WholeProgramOptimization> | ||
| </PropertyGroup> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||
| <ImportGroup Label="ExtensionSettings"> | ||
| </ImportGroup> | ||
| <ImportGroup Label="Shared"> | ||
| </ImportGroup> | ||
| <ImportGroup Label="PropertySheets"> | ||
| <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| </ImportGroup> | ||
| <PropertyGroup Label="UserMacros" /> | ||
| <ItemDefinitionGroup Condition="'$(Configuration)' == 'Debug'"> | ||
| <ClCompile> | ||
| <WarningLevel>Level3</WarningLevel> | ||
| <SDLCheck>true</SDLCheck> | ||
| <PreprocessorDefinitions>_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| <ConformanceMode>true</ConformanceMode> | ||
| </ClCompile> | ||
| <Link> | ||
| <SubSystem>Windows</SubSystem> | ||
| <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol> | ||
| <AdditionalOptions>/DEFAULTLIB:WindowsApp.lib %(AdditionalOptions)</AdditionalOptions> | ||
| <AdditionalDependencies>WindowsApp.lib</AdditionalDependencies> | ||
| </Link> | ||
| </ItemDefinitionGroup> | ||
| <ItemDefinitionGroup Condition="'$(Configuration)' == 'Release'"> | ||
| <ClCompile> | ||
| <WarningLevel>Level3</WarningLevel> | ||
| <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| <SDLCheck>true</SDLCheck> | ||
| <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| <ConformanceMode>true</ConformanceMode> | ||
| </ClCompile> | ||
| <Link> | ||
| <SubSystem>Windows</SubSystem> | ||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| <OptimizeReferences>true</OptimizeReferences> | ||
| <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| <EntryPointSymbol>wmainCRTStartup</EntryPointSymbol> | ||
| <AdditionalOptions>/DEFAULTLIB:WindowsApp.lib %(AdditionalOptions)</AdditionalOptions> | ||
| <AdditionalDependencies>WindowsApp.lib</AdditionalDependencies> | ||
| </Link> | ||
| </ItemDefinitionGroup> | ||
| <ItemGroup> | ||
| <ClCompile Include="pch.cpp" PrecompiledHeader="Create" /> | ||
| <ClCompile Include="WinRT.StubExe.cpp" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ClInclude Include="pch.h" /> | ||
| </ItemGroup> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||
| <ImportGroup Label="ExtensionTargets"> | ||
| </ImportGroup> | ||
| </Project> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <ItemGroup> | ||
| <Filter Include="Source Files"> | ||
| <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> | ||
| <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions> | ||
| </Filter> | ||
| <Filter Include="Header Files"> | ||
| <UniqueIdentifier>{2ca660b5-26af-43dd-9654-4782175ecf94}</UniqueIdentifier> | ||
| </Filter> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ClCompile Include="WinRT.StubExe.cpp"> | ||
| <Filter>Source Files</Filter> | ||
| </ClCompile> | ||
| <ClCompile Include="pch.cpp"> | ||
| <Filter>Source Files</Filter> | ||
| </ClCompile> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ClInclude Include="pch.h"> | ||
| <Filter>Header Files</Filter> | ||
| </ClInclude> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| #include "pch.h" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| #pragma once |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you will need to enable a more options here to pass https://github.com/microsoft/binskim