Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _msbuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ def launcher_exe(name, platform, windowed=False):
def pyshellext(ext='.exe', **props):
link_opts = ItemDefinition(
'Link',
AdditionalDependencies=Prepend('RuntimeObject.lib;'),
AdditionalDependencies=Prepend('RuntimeObject.lib;pathcch.lib;'),
)
if ext != '.exe':
link_opts.options['ModuleDefinitionFile'] = '$(SourceRootDir)src\\pyshellext\\pyshellext.def'
Expand Down
5 changes: 4 additions & 1 deletion _msbuild_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
PreprocessorDefinitions=Prepend("PYSHELLEXT_TEST=1;"),
LanguageStandard='stdcpp20',
),
ItemDefinition('Link', AdditionalDependencies=Prepend("RuntimeObject.lib;")),
ItemDefinition('Link', AdditionalDependencies=Prepend("RuntimeObject.lib;pathcch.lib;")),
CSourceFile('pyshellext/shellext.cpp'),
CSourceFile('pyshellext/shellext_test.cpp'),
IncludeFile('pyshellext/shellext.h'),
Expand All @@ -74,6 +74,9 @@
CFunction('shellext_ReadAllIdleInstalls'),
CFunction('shellext_PassthroughTitle'),
CFunction('shellext_IdleCommand'),
CFunction('shellext_GetDropArgumentsW'),
CFunction('shellext_GetDropArgumentsA'),
CFunction('shellext_GetDropDescription'),
source='src',
)
)
7 changes: 7 additions & 0 deletions src/pymanager/appxmanifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,13 @@
</uap:SupportedFileTypes>
</uap:FileTypeAssociation>
</uap:Extension>
<desktop4:Extension Category="windows.fileExplorerContextMenus">
<desktop4:FileExplorerContextMenus>
<desktop4:ItemType Type=".pyw">
<desktop4:Verb Id="EditInIdle" Clsid="C7E29CB0-9691-4DE8-B72B-6719DDC0B4A1" />
</desktop4:ItemType>
</desktop4:FileExplorerContextMenus>
</desktop4:Extension>
</Extensions>
</Application>
</Applications>
Expand Down
13 changes: 13 additions & 0 deletions src/pymanager/msi.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,23 @@
Name="ExplorerCommandHandler"
Value="{C7E29CB0-9691-4DE8-B72B-6719DDC0B4A1}"
Type="string" />
<RegistryValue Root="HKCR" Key="Python.File\shellex\DropHandler"
Value="{EAF5E48F-F54A-4A03-824B-CA880772EE20}"
Type="string" />

<ProgId Id="Python.NoConFile" Description="Python Script (Windowed)" Advertise="no" Icon="py.ico">
<Extension Id="pyw" ContentType="text/x-python">
<Verb Id="open" TargetFile="pythonw.exe" Argument="&quot;%1&quot; %*" />
</Extension>
</ProgId>
<RegistryValue Root="HKCR" Key="Python.NoConFile\shell\EditWithIDLE"
Name="ExplorerCommandHandler"
Value="{C7E29CB0-9691-4DE8-B72B-6719DDC0B4A1}"
Type="string" />
<RegistryValue Root="HKCR" Key="Python.NoConFile\shellex\DropHandler"
Value="{EAF5E48F-F54A-4A03-824B-CA880772EE20}"
Type="string" />

<ProgId Id="Python.CompiledFile" Description="Compiled Python Script" Advertise="no" Icon="pyc.ico">
<Extension Id="pyc" ContentType="application/x-python-code">
<Verb Id="open" TargetFile="python.exe" Argument="&quot;%1&quot; %*" />
Expand Down Expand Up @@ -111,6 +122,7 @@
Condition="WIX_NATIVE_MACHINE = 34404">
<File Source="pyshellext-64.dll">
<Class Id="{C7E29CB0-9691-4DE8-B72B-6719DDC0B4A1}" Advertise="no" Context="InprocServer32" />
<Class Id="{EAF5E48F-F54A-4A03-824B-CA880772EE20}" Advertise="no" Context="InprocServer32" />
</File>
</Component>

Expand All @@ -119,6 +131,7 @@
Condition="WIX_NATIVE_MACHINE = 43620">
<File Source="pyshellext-arm64.dll">
<Class Id="{C7E29CB0-9691-4DE8-B72B-6719DDC0B4A1}" Advertise="no" Context="InprocServer32" />
<Class Id="{EAF5E48F-F54A-4A03-824B-CA880772EE20}" Advertise="no" Context="InprocServer32" />
</File>
</Component>

Expand Down
Loading