зеркало из https://github.com/mozilla/gecko-dev.git
Backed out 2 changesets (bug 1771951) for causing bug 1776170. CLOSED TREE
Backed out changeset 3a789d06604f (bug 1771951) Backed out changeset 59eac90984cb (bug 1771951)
This commit is contained in:
Родитель
ad0291c5b7
Коммит
45ecfdfaa2
|
@ -1446,7 +1446,11 @@ Function leaveShortcuts
|
|||
${EndIf}
|
||||
${MUI_INSTALLOPTIONS_READ} $AddDesktopSC "shortcuts.ini" "Field 2" "State"
|
||||
${MUI_INSTALLOPTIONS_READ} $AddStartMenuSC "shortcuts.ini" "Field 3" "State"
|
||||
${MUI_INSTALLOPTIONS_READ} $AddTaskbarSC "shortcuts.ini" "Field 4" "State"
|
||||
|
||||
; Don't install the quick launch shortcut on Windows 7
|
||||
${Unless} ${AtLeastWin7}
|
||||
${MUI_INSTALLOPTIONS_READ} $AddQuickLaunchSC "shortcuts.ini" "Field 4" "State"
|
||||
${EndUnless}
|
||||
|
||||
${If} $InstallType == ${INSTALLTYPE_CUSTOM}
|
||||
Call CheckExistingInstall
|
||||
|
@ -1894,7 +1898,13 @@ Function .onInit
|
|||
WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Top "67"
|
||||
WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Bottom "87"
|
||||
|
||||
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Settings" NumFields "4"
|
||||
; Setup the shortcuts.ini file for the Custom Shortcuts Page
|
||||
; Don't offer to install the quick launch shortcut on Windows 7
|
||||
${If} ${AtLeastWin7}
|
||||
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Settings" NumFields "3"
|
||||
${Else}
|
||||
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Settings" NumFields "4"
|
||||
${EndIf}
|
||||
|
||||
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Type "label"
|
||||
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Text "$(CREATE_ICONS_DESC)"
|
||||
|
@ -1920,13 +1930,16 @@ Function .onInit
|
|||
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Bottom "50"
|
||||
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" State "1"
|
||||
|
||||
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Type "checkbox"
|
||||
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Text "$(ICONS_TASKBAR)"
|
||||
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Left "0"
|
||||
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Right "-1"
|
||||
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Top "60"
|
||||
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Bottom "70"
|
||||
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" State "1"
|
||||
; Don't offer to install the quick launch shortcut on Windows 7
|
||||
${Unless} ${AtLeastWin7}
|
||||
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Type "checkbox"
|
||||
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Text "$(ICONS_QUICKLAUNCH)"
|
||||
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Left "0"
|
||||
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Right "-1"
|
||||
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Top "60"
|
||||
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Bottom "70"
|
||||
WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" State "1"
|
||||
${EndUnless}
|
||||
|
||||
; Setup the components.ini file for the Components Page
|
||||
WriteINIStr "$PLUGINSDIR\components.ini" "Settings" NumFields "2"
|
||||
|
|
|
@ -40,16 +40,7 @@
|
|||
${EndIf}
|
||||
|
||||
; Adds a pinned Task Bar shortcut (see MigrateTaskBarShortcut for details).
|
||||
; When we enabled this feature for Windows 10 & 11 we decided _not_ to pin
|
||||
; during an update (even once) because we already offered to do when the
|
||||
; the user originally installed, and we don't want to go against their
|
||||
; explicit wishes.
|
||||
; For Windows 7 and 8, we've been doing this ~forever, and those users may
|
||||
; not have experienced the onboarding offer to pin to taskbar, so we're
|
||||
; leaving it enabled there.
|
||||
${If} ${AtMostWin2012R2}
|
||||
${MigrateTaskBarShortcut}
|
||||
${EndIf}
|
||||
${MigrateTaskBarShortcut}
|
||||
|
||||
; Update the name/icon/AppModelID of our shortcuts as needed, then update the
|
||||
; lastwritetime of the Start Menu shortcut to clear the tile icon cache.
|
||||
|
@ -1290,6 +1281,28 @@ ${RemoveDefaultBrowserAgentShortcut}
|
|||
${PinToTaskBar}
|
||||
${EndIf}
|
||||
${EndIf}
|
||||
${ElseIf} ${AtLeastWin10}
|
||||
${GetInstallerRegistryPref} "Software\Mozilla\${AppName}" \
|
||||
"installer.taskbarpin.win10.enabled" $2
|
||||
${If} $2 == "true"
|
||||
; On Windows 10, we may have previously tried to make a taskbar pin
|
||||
; and failed because the API we tried to use was blocked by the OS.
|
||||
; We have an option that works in more cases now, so we're going to try
|
||||
; again, but also record that we've done so by writing a particular
|
||||
; registry value, so that we don't continue to do this repeatedly.
|
||||
ClearErrors
|
||||
ReadRegDWORD $2 HKCU \
|
||||
"Software\Mozilla\${AppName}\Installer\$AppUserModelID" \
|
||||
"WasPinnedToTaskbar"
|
||||
${If} ${Errors}
|
||||
WriteRegDWORD HKCU \
|
||||
"Software\Mozilla\${AppName}\Installer\$AppUserModelID" \
|
||||
"WasPinnedToTaskbar" 1
|
||||
${If} $AddTaskbarSC != "0"
|
||||
${PinToTaskBar}
|
||||
${EndIf}
|
||||
${EndIf}
|
||||
${EndIf}
|
||||
${EndIf}
|
||||
${EndIf}
|
||||
!macroend
|
||||
|
@ -1356,22 +1369,17 @@ ${RemoveDefaultBrowserAgentShortcut}
|
|||
; Pin the shortcut to the TaskBar. 5386 is the shell32.dll
|
||||
; resource id for the "Pin to Taskbar" string.
|
||||
InvokeShellVerb::DoIt "$SMPROGRAMS" "$1" "5386"
|
||||
${ElseIf} ${AtMostWaaS} 1809
|
||||
${Else}
|
||||
; In Windows 10 the "Pin to Taskbar" resource was removed, so we
|
||||
; can't access the verb that way anymore. We have a create a
|
||||
; command key using the GUID that's assigned to this action and
|
||||
; then invoke that as a verb. This works up until build 1809
|
||||
; then invoke that as a verb.
|
||||
ReadRegStr $R9 HKLM \
|
||||
"Software\Microsoft\Windows\CurrentVersion\Explorer\CommandStore\shell\Windows.taskbarpin" \
|
||||
"ExplorerCommandHandler"
|
||||
WriteRegStr HKCU "Software\Classes\*\shell\${AppRegName}-$AppUserModelID" "ExplorerCommandHandler" $R9
|
||||
InvokeShellVerb::DoIt "$SMPROGRAMS" "$1" "${AppRegName}-$AppUserModelID"
|
||||
DeleteRegKey HKCU "Software\Classes\*\shell\${AppRegName}-$AppUserModelID"
|
||||
${Else}
|
||||
; In the Windows 10 1903 and up (and Windows 11) the above no
|
||||
; longer works. We have yet another method for these versions
|
||||
; which is detailed in the PinToTaskbar plugin code.
|
||||
PinToTaskbar::Pin "$SMPROGRAMS\$1"
|
||||
${EndIf}
|
||||
|
||||
; Delete the shortcut if it was created
|
||||
|
|
|
@ -40,9 +40,9 @@ SUMMARY_UPGRADE_CLICK=Click Upgrade to continue.
|
|||
SURVEY_TEXT=&Tell us what you thought of $BrandShortName
|
||||
LAUNCH_TEXT=&Launch $BrandShortName now
|
||||
CREATE_ICONS_DESC=Create icons for $BrandShortName:
|
||||
ICONS_DESKTOP=On my &desktop
|
||||
ICONS_STARTMENU=In my &Start menu Programs folder
|
||||
ICONS_TASKBAR=On my &taskbar
|
||||
ICONS_DESKTOP=On my &Desktop
|
||||
ICONS_STARTMENU=In my &Start Menu Programs folder
|
||||
ICONS_QUICKLAUNCH=In my &Quick Launch bar
|
||||
WARN_MANUALLY_CLOSE_APP_INSTALL=$BrandShortName must be closed to proceed with the installation.\n\nPlease close $BrandShortName to continue.
|
||||
WARN_MANUALLY_CLOSE_APP_UNINSTALL=$BrandShortName must be closed to proceed with the uninstall.\n\nPlease close $BrandShortName to continue.
|
||||
WARN_MANUALLY_CLOSE_APP_REFRESH=$BrandShortName must be closed to proceed with the refresh.\n\nPlease close $BrandShortName to continue.
|
||||
|
|
|
@ -1,150 +0,0 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, you can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
// This file is an NSIS plugin which exports a function that pins a provided
|
||||
// Shortcut to the Windows Taskbar on Windows 10 (1903+) and Windows 11.
|
||||
// This is an adapted version of the Pin to Taskbar code that is used in
|
||||
// Firefox: https://searchfox.org/mozilla-central/rev/4bce7d85ba4796dd03c5dcc7cfe8eee0e4c07b3b/browser/components/shell/nsWindowsShellService.cpp#1178
|
||||
|
||||
#include <objbase.h>
|
||||
#include <shlobj.h>
|
||||
|
||||
#pragma comment(lib, "shlwapi.lib")
|
||||
|
||||
static bool
|
||||
PinShortcutToTaskbar(const wchar_t *shortcutPath)
|
||||
{
|
||||
// This enum is likely only used for Windows telemetry, INT_MAX is chosen to
|
||||
// avoid confusion with existing uses.
|
||||
enum PINNEDLISTMODIFYCALLER { PLMC_INT_MAX = INT_MAX };
|
||||
|
||||
// The types below, and the idea of using IPinnedList3::Modify,
|
||||
// are thanks to Gee Law <https://geelaw.blog/entries/msedge-pins/>
|
||||
static constexpr GUID CLSID_TaskbandPin = {
|
||||
0x90aa3a4e,
|
||||
0x1cba,
|
||||
0x4233,
|
||||
{0xb8, 0xbb, 0x53, 0x57, 0x73, 0xd4, 0x84, 0x49}};
|
||||
|
||||
static constexpr GUID IID_IPinnedList3 = {
|
||||
0x0dd79ae2,
|
||||
0xd156,
|
||||
0x45d4,
|
||||
{0x9e, 0xeb, 0x3b, 0x54, 0x97, 0x69, 0xe9, 0x40}};
|
||||
|
||||
struct IPinnedList3Vtbl;
|
||||
struct IPinnedList3 {
|
||||
IPinnedList3Vtbl* vtbl;
|
||||
};
|
||||
|
||||
typedef ULONG STDMETHODCALLTYPE ReleaseFunc(IPinnedList3 * that);
|
||||
typedef HRESULT STDMETHODCALLTYPE ModifyFunc(
|
||||
IPinnedList3 * that, PCIDLIST_ABSOLUTE unpin, PCIDLIST_ABSOLUTE pin,
|
||||
PINNEDLISTMODIFYCALLER caller);
|
||||
|
||||
struct IPinnedList3Vtbl {
|
||||
void* QueryInterface; // 0
|
||||
void* AddRef; // 1
|
||||
ReleaseFunc* Release; // 2
|
||||
void* Other[13]; // 3-15
|
||||
ModifyFunc* Modify; // 16
|
||||
};
|
||||
|
||||
PIDLIST_ABSOLUTE path = nullptr;
|
||||
HRESULT hr = SHParseDisplayName(shortcutPath, nullptr, &path, 0, nullptr);
|
||||
if (FAILED(hr) || !path) {
|
||||
return false;
|
||||
}
|
||||
|
||||
IPinnedList3* pinnedList = nullptr;
|
||||
hr = CoCreateInstance(CLSID_TaskbandPin, nullptr, CLSCTX_INPROC_SERVER,
|
||||
IID_IPinnedList3, (void**)&pinnedList);
|
||||
if (FAILED(hr) || !pinnedList) {
|
||||
return false;
|
||||
}
|
||||
|
||||
hr = pinnedList->vtbl->Modify(pinnedList, nullptr, path, PLMC_INT_MAX);
|
||||
|
||||
pinnedList->vtbl->Release(pinnedList);
|
||||
CoTaskMemFree(path);
|
||||
return true;
|
||||
}
|
||||
|
||||
struct stack_t {
|
||||
stack_t* next;
|
||||
TCHAR text[MAX_PATH];
|
||||
};
|
||||
|
||||
/**
|
||||
* Removes an element from the top of the NSIS stack
|
||||
*
|
||||
* @param stacktop A pointer to the top of the stack
|
||||
* @param str The string to pop to
|
||||
* @param len The max length
|
||||
* @return 0 on success
|
||||
*/
|
||||
int
|
||||
popstring(stack_t **stacktop, TCHAR *str, int len)
|
||||
{
|
||||
// Removes the element from the top of the stack and puts it in the buffer
|
||||
stack_t *th;
|
||||
if (!stacktop || !*stacktop) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
th = (*stacktop);
|
||||
lstrcpyn(str, th->text, len);
|
||||
*stacktop = th->next;
|
||||
HeapFree(GetProcessHeap(), 0, th);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds an element to the top of the NSIS stack
|
||||
*
|
||||
* @param stacktop A pointer to the top of the stack
|
||||
* @param str The string to push on the stack
|
||||
* @param len The length of the string to push on the stack
|
||||
* @return 0 on success
|
||||
*/
|
||||
void
|
||||
pushstring(stack_t **stacktop, const TCHAR *str, int len)
|
||||
{
|
||||
stack_t *th;
|
||||
if (!stacktop) {
|
||||
return;
|
||||
}
|
||||
th = (stack_t*)HeapAlloc(GetProcessHeap(), 0, sizeof(stack_t) + len);
|
||||
lstrcpyn(th->text, str, len);
|
||||
th->next = *stacktop;
|
||||
*stacktop = th;
|
||||
}
|
||||
|
||||
/**
|
||||
* Pins a provided shortcut to the Taskbar on Windows 10 (1903) and up.
|
||||
*
|
||||
* @param stacktop Pointer to the top of the stack, AKA the first parameter to
|
||||
the plugin call. Should contain the shortcut to pin.
|
||||
* @return 1 if the shortcut was pinned successfully, otherwise 0
|
||||
*/
|
||||
extern "C" void __declspec(dllexport)
|
||||
Pin(HWND, int, TCHAR *, stack_t **stacktop, void *)
|
||||
{
|
||||
wchar_t shortcutPath[MAX_PATH + 1];
|
||||
bool rv = false;
|
||||
// We're skipping building the C runtime to keep the file size low, so we
|
||||
// can't use a normal string initialization because that would call memset.
|
||||
shortcutPath[0] = L'\0';
|
||||
popstring(stacktop, shortcutPath, MAX_PATH);
|
||||
|
||||
rv = PinShortcutToTaskbar(shortcutPath);
|
||||
|
||||
pushstring(stacktop, rv ? L"1" : L"0", 2);
|
||||
}
|
||||
|
||||
BOOL APIENTRY
|
||||
DllMain(HMODULE, DWORD, LPVOID)
|
||||
{
|
||||
return TRUE;
|
||||
}
|
|
@ -1,31 +0,0 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 15
|
||||
VisualStudioVersion = 15.0.27428.2015
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PinToTaskbar", "PinToTaskbar.vcxproj", "{84FDFDE2-893F-418F-A524-4B8DACF11EB6}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|x64 = Debug|x64
|
||||
Debug|x86 = Debug|x86
|
||||
Release|x64 = Release|x64
|
||||
Release|x86 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{84FDFDE2-893F-418F-A524-4B8DACF11EB6}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{84FDFDE2-893F-418F-A524-4B8DACF11EB6}.Debug|x64.Build.0 = Debug|x64
|
||||
{84FDFDE2-893F-418F-A524-4B8DACF11EB6}.Debug|x86.ActiveCfg = Debug|Win32
|
||||
{84FDFDE2-893F-418F-A524-4B8DACF11EB6}.Debug|x86.Build.0 = Debug|Win32
|
||||
{84FDFDE2-893F-418F-A524-4B8DACF11EB6}.Release|x64.ActiveCfg = Release|x64
|
||||
{84FDFDE2-893F-418F-A524-4B8DACF11EB6}.Release|x64.Build.0 = Release|x64
|
||||
{84FDFDE2-893F-418F-A524-4B8DACF11EB6}.Release|x86.ActiveCfg = Release|Win32
|
||||
{84FDFDE2-893F-418F-A524-4B8DACF11EB6}.Release|x86.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
SolutionGuid = {975FF9C9-7351-4314-BC67-F348FAC9ECB2}
|
||||
EndGlobalSection
|
||||
EndGlobal
|
|
@ -1,175 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="15.0" 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>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<VCProjectVersion>15.0</VCProjectVersion>
|
||||
<ProjectGuid>{84fdfde2-893f-418f-a524-4b8dacf11eb6}</ProjectGuid>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<RootNamespace>PinToTaskbar</RootNamespace>
|
||||
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="Shared">
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<SDLCheck>false</SDLCheck>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;EXECINEXPLORER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
<OmitDefaultLibName>true</OmitDefaultLibName>
|
||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<EntryPointSymbol>DllMain</EntryPointSymbol>
|
||||
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<SDLCheck>false</SDLCheck>
|
||||
<PreprocessorDefinitions>_DEBUG;EXECINEXPLORER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
<OmitDefaultLibName>true</OmitDefaultLibName>
|
||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<EntryPointSymbol>DllMain</EntryPointSymbol>
|
||||
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<SDLCheck>false</SDLCheck>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;EXECINEXPLORER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
<OmitDefaultLibName>true</OmitDefaultLibName>
|
||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<EntryPointSymbol>DllMain</EntryPointSymbol>
|
||||
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<SDLCheck>false</SDLCheck>
|
||||
<PreprocessorDefinitions>NDEBUG;EXECINEXPLORER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
<OmitDefaultLibName>true</OmitDefaultLibName>
|
||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<EntryPointSymbol>DllMain</EntryPointSymbol>
|
||||
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="PinToTaskbar.cpp" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
Двоичные данные
other-licenses/nsis/Plugins/PinToTaskbar.dll
Двоичные данные
other-licenses/nsis/Plugins/PinToTaskbar.dll
Двоичный файл не отображается.
|
@ -41,7 +41,6 @@ CUSTOM_NSIS_PLUGINS = \
|
|||
InvokeShellVerb.dll \
|
||||
liteFirewallW.dll \
|
||||
nsJSON.dll \
|
||||
PinToTaskbar.dll \
|
||||
ServicesHelper.dll \
|
||||
ShellLink.dll \
|
||||
UAC.dll \
|
||||
|
|
Загрузка…
Ссылка в новой задаче