From 745a89fa9c1530bee027924de90b5758fbfbf882 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B0=E7=B3=96XH?= <76904365+bingtangxh@users.noreply.github.com> Date: Thu, 26 Mar 2026 13:54:29 +0800 Subject: [PATCH 01/11] Add ARM platform & pugixml_arm, update VS solution Upgrade solution to Visual Studio 17 and add ARM build configurations across projects. Several .vcxproj files were updated to include Debug/Release|ARM property groups, property sheet imports and LinkIncremental settings; platform toolset set for ARM configs where appropriate. A new pugixml_arm project and its sources/filters were added. Also added ExtensibilityGlobals (SolutionGuid) to the .sln. --- AppInstallerReset.sln | 239 +++++++++--------------- IEHelper/IEHelper.vcxproj | 59 ++++++ IEHelper/Stdafx.h | 4 + appinstaller/appinstaller.vcxproj | 82 ++++++++ appinstaller/appxinfo.h | 2 + appinstaller/certmgr.h | 2 +- appinstaller/main.cpp | 4 + appinstaller/notice.h | 2 +- appinstaller/pkgmgr.h | 2 +- appinstaller/pkgread.h | 2 +- appinstaller/priformatcli.h | 2 +- certmgr/certmgr.vcxproj | 73 ++++++++ certmgr/stdafx.h | 3 + desktopini/desktopini.vcxproj | 69 +++++++ desktopini/main.cpp | 5 + notice/notice.vcxproj | 70 +++++++ notice/targetver.h | 4 + pkgmgr/pkgmgr.vcxproj | 74 ++++++++ pkgmgr/targetver.h | 4 + pkgread/dllmain.cpp | 1 + pkgread/pkgread.vcxproj | 91 +++++++++ pkgread/pkgread.vcxproj.filters | 9 + pkgread/targetver.h | 4 + pkgread/typestrans.h | 1 + priformatcli/priformatcli.vcxproj | 78 ++++++++ priformatcli/targetver.h | 4 + pugixml_arm/framework.h | 3 + pugixml_arm/pch.cpp | 5 + pugixml_arm/pch.h | 13 ++ pugixml_arm/pugixml_arm.cpp | 10 + pugixml_arm/pugixml_arm.vcxproj | 207 ++++++++++++++++++++ pugixml_arm/pugixml_arm.vcxproj.filters | 25 +++ reslib/reslib.vcxproj | 71 +++++++ reslib/targetver.h | 4 + settings/main.cpp | 4 + settings/settings.vcxproj | 80 ++++++++ shortcut/main.cpp | 5 + shortcut/shortcut.vcxproj | 69 +++++++ 38 files changed, 1233 insertions(+), 153 deletions(-) create mode 100644 pugixml_arm/framework.h create mode 100644 pugixml_arm/pch.cpp create mode 100644 pugixml_arm/pch.h create mode 100644 pugixml_arm/pugixml_arm.cpp create mode 100644 pugixml_arm/pugixml_arm.vcxproj create mode 100644 pugixml_arm/pugixml_arm.vcxproj.filters diff --git a/AppInstallerReset.sln b/AppInstallerReset.sln index d300cf8..ed4fdb4 100644 --- a/AppInstallerReset.sln +++ b/AppInstallerReset.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio Version 17 +VisualStudioVersion = 17.14.37012.4 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pkgread", "pkgread\pkgread.vcxproj", "{A7753282-AA16-43D9-8ACA-7065239DD702}" EndProject @@ -73,242 +73,185 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Launch", "Launch\Launch.csp EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 + Debug|ARM = Debug|ARM Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 + Release|ARM = Release|ARM Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A7753282-AA16-43D9-8ACA-7065239DD702}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {A7753282-AA16-43D9-8ACA-7065239DD702}.Debug|x64.ActiveCfg = Debug|x64 - {A7753282-AA16-43D9-8ACA-7065239DD702}.Debug|x64.Build.0 = Debug|x64 + {A7753282-AA16-43D9-8ACA-7065239DD702}.Debug|ARM.ActiveCfg = Debug|ARM + {A7753282-AA16-43D9-8ACA-7065239DD702}.Debug|ARM.Build.0 = Debug|ARM {A7753282-AA16-43D9-8ACA-7065239DD702}.Debug|x86.ActiveCfg = Debug|Win32 {A7753282-AA16-43D9-8ACA-7065239DD702}.Debug|x86.Build.0 = Debug|Win32 - {A7753282-AA16-43D9-8ACA-7065239DD702}.Release|Any CPU.ActiveCfg = Release|Win32 - {A7753282-AA16-43D9-8ACA-7065239DD702}.Release|x64.ActiveCfg = Release|x64 - {A7753282-AA16-43D9-8ACA-7065239DD702}.Release|x64.Build.0 = Release|x64 + {A7753282-AA16-43D9-8ACA-7065239DD702}.Release|ARM.ActiveCfg = Release|ARM + {A7753282-AA16-43D9-8ACA-7065239DD702}.Release|ARM.Build.0 = Release|ARM {A7753282-AA16-43D9-8ACA-7065239DD702}.Release|x86.ActiveCfg = Release|Win32 {A7753282-AA16-43D9-8ACA-7065239DD702}.Release|x86.Build.0 = Release|Win32 - {8EAC0230-4990-4E41-8E0F-D641D1561396}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {8EAC0230-4990-4E41-8E0F-D641D1561396}.Debug|x64.ActiveCfg = Debug|Win32 + {8EAC0230-4990-4E41-8E0F-D641D1561396}.Debug|ARM.ActiveCfg = Debug|ARM + {8EAC0230-4990-4E41-8E0F-D641D1561396}.Debug|ARM.Build.0 = Debug|ARM {8EAC0230-4990-4E41-8E0F-D641D1561396}.Debug|x86.ActiveCfg = Debug|Win32 {8EAC0230-4990-4E41-8E0F-D641D1561396}.Debug|x86.Build.0 = Debug|Win32 - {8EAC0230-4990-4E41-8E0F-D641D1561396}.Release|Any CPU.ActiveCfg = Release|Win32 - {8EAC0230-4990-4E41-8E0F-D641D1561396}.Release|x64.ActiveCfg = Release|Win32 + {8EAC0230-4990-4E41-8E0F-D641D1561396}.Release|ARM.ActiveCfg = Release|ARM + {8EAC0230-4990-4E41-8E0F-D641D1561396}.Release|ARM.Build.0 = Release|ARM {8EAC0230-4990-4E41-8E0F-D641D1561396}.Release|x86.ActiveCfg = Release|Win32 {8EAC0230-4990-4E41-8E0F-D641D1561396}.Release|x86.Build.0 = Release|Win32 - {798ED492-EECE-457D-8FD8-129DA93CE126}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {798ED492-EECE-457D-8FD8-129DA93CE126}.Debug|x64.ActiveCfg = Debug|Win32 + {798ED492-EECE-457D-8FD8-129DA93CE126}.Debug|ARM.ActiveCfg = Debug|ARM + {798ED492-EECE-457D-8FD8-129DA93CE126}.Debug|ARM.Build.0 = Debug|ARM {798ED492-EECE-457D-8FD8-129DA93CE126}.Debug|x86.ActiveCfg = Debug|Win32 {798ED492-EECE-457D-8FD8-129DA93CE126}.Debug|x86.Build.0 = Debug|Win32 - {798ED492-EECE-457D-8FD8-129DA93CE126}.Release|Any CPU.ActiveCfg = Release|Win32 - {798ED492-EECE-457D-8FD8-129DA93CE126}.Release|x64.ActiveCfg = Release|Win32 + {798ED492-EECE-457D-8FD8-129DA93CE126}.Release|ARM.ActiveCfg = Release|ARM + {798ED492-EECE-457D-8FD8-129DA93CE126}.Release|ARM.Build.0 = Release|ARM {798ED492-EECE-457D-8FD8-129DA93CE126}.Release|x86.ActiveCfg = Release|Win32 {798ED492-EECE-457D-8FD8-129DA93CE126}.Release|x86.Build.0 = Release|Win32 - {EF4012D4-EF08-499C-B803-177739350B2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EF4012D4-EF08-499C-B803-177739350B2D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EF4012D4-EF08-499C-B803-177739350B2D}.Debug|x64.ActiveCfg = Debug|Any CPU - {EF4012D4-EF08-499C-B803-177739350B2D}.Debug|x64.Build.0 = Debug|Any CPU + {EF4012D4-EF08-499C-B803-177739350B2D}.Debug|ARM.ActiveCfg = Debug|Any CPU + {EF4012D4-EF08-499C-B803-177739350B2D}.Debug|ARM.Build.0 = Debug|Any CPU {EF4012D4-EF08-499C-B803-177739350B2D}.Debug|x86.ActiveCfg = Debug|Any CPU {EF4012D4-EF08-499C-B803-177739350B2D}.Debug|x86.Build.0 = Debug|Any CPU - {EF4012D4-EF08-499C-B803-177739350B2D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EF4012D4-EF08-499C-B803-177739350B2D}.Release|Any CPU.Build.0 = Release|Any CPU - {EF4012D4-EF08-499C-B803-177739350B2D}.Release|x64.ActiveCfg = Release|Any CPU - {EF4012D4-EF08-499C-B803-177739350B2D}.Release|x64.Build.0 = Release|Any CPU + {EF4012D4-EF08-499C-B803-177739350B2D}.Release|ARM.ActiveCfg = Release|Any CPU + {EF4012D4-EF08-499C-B803-177739350B2D}.Release|ARM.Build.0 = Release|Any CPU {EF4012D4-EF08-499C-B803-177739350B2D}.Release|x86.ActiveCfg = Release|Any CPU {EF4012D4-EF08-499C-B803-177739350B2D}.Release|x86.Build.0 = Release|Any CPU - {E04CCAB9-35DB-495C-A279-5B483C707CD0}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {E04CCAB9-35DB-495C-A279-5B483C707CD0}.Debug|x64.ActiveCfg = Debug|x64 - {E04CCAB9-35DB-495C-A279-5B483C707CD0}.Debug|x64.Build.0 = Debug|x64 + {E04CCAB9-35DB-495C-A279-5B483C707CD0}.Debug|ARM.ActiveCfg = Debug|ARM + {E04CCAB9-35DB-495C-A279-5B483C707CD0}.Debug|ARM.Build.0 = Debug|ARM {E04CCAB9-35DB-495C-A279-5B483C707CD0}.Debug|x86.ActiveCfg = Debug|Win32 {E04CCAB9-35DB-495C-A279-5B483C707CD0}.Debug|x86.Build.0 = Debug|Win32 - {E04CCAB9-35DB-495C-A279-5B483C707CD0}.Release|Any CPU.ActiveCfg = Release|Win32 - {E04CCAB9-35DB-495C-A279-5B483C707CD0}.Release|x64.ActiveCfg = Release|x64 - {E04CCAB9-35DB-495C-A279-5B483C707CD0}.Release|x64.Build.0 = Release|x64 + {E04CCAB9-35DB-495C-A279-5B483C707CD0}.Release|ARM.ActiveCfg = Release|ARM + {E04CCAB9-35DB-495C-A279-5B483C707CD0}.Release|ARM.Build.0 = Release|ARM {E04CCAB9-35DB-495C-A279-5B483C707CD0}.Release|x86.ActiveCfg = Release|Win32 {E04CCAB9-35DB-495C-A279-5B483C707CD0}.Release|x86.Build.0 = Release|Win32 - {F0C84812-0CDF-4AA0-A0F8-F37AC833F39B}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {F0C84812-0CDF-4AA0-A0F8-F37AC833F39B}.Debug|x64.ActiveCfg = Debug|x64 - {F0C84812-0CDF-4AA0-A0F8-F37AC833F39B}.Debug|x64.Build.0 = Debug|x64 + {F0C84812-0CDF-4AA0-A0F8-F37AC833F39B}.Debug|ARM.ActiveCfg = Debug|ARM + {F0C84812-0CDF-4AA0-A0F8-F37AC833F39B}.Debug|ARM.Build.0 = Debug|ARM {F0C84812-0CDF-4AA0-A0F8-F37AC833F39B}.Debug|x86.ActiveCfg = Debug|Win32 {F0C84812-0CDF-4AA0-A0F8-F37AC833F39B}.Debug|x86.Build.0 = Debug|Win32 - {F0C84812-0CDF-4AA0-A0F8-F37AC833F39B}.Release|Any CPU.ActiveCfg = Release|Win32 - {F0C84812-0CDF-4AA0-A0F8-F37AC833F39B}.Release|x64.ActiveCfg = Release|x64 - {F0C84812-0CDF-4AA0-A0F8-F37AC833F39B}.Release|x64.Build.0 = Release|x64 + {F0C84812-0CDF-4AA0-A0F8-F37AC833F39B}.Release|ARM.ActiveCfg = Release|ARM + {F0C84812-0CDF-4AA0-A0F8-F37AC833F39B}.Release|ARM.Build.0 = Release|ARM {F0C84812-0CDF-4AA0-A0F8-F37AC833F39B}.Release|x86.ActiveCfg = Release|Win32 {F0C84812-0CDF-4AA0-A0F8-F37AC833F39B}.Release|x86.Build.0 = Release|Win32 - {AD25497F-A15F-4DFF-AC7A-B8ABF5F411D6}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {AD25497F-A15F-4DFF-AC7A-B8ABF5F411D6}.Debug|x64.ActiveCfg = Debug|x64 - {AD25497F-A15F-4DFF-AC7A-B8ABF5F411D6}.Debug|x64.Build.0 = Debug|x64 + {AD25497F-A15F-4DFF-AC7A-B8ABF5F411D6}.Debug|ARM.ActiveCfg = Debug|ARM + {AD25497F-A15F-4DFF-AC7A-B8ABF5F411D6}.Debug|ARM.Build.0 = Debug|ARM {AD25497F-A15F-4DFF-AC7A-B8ABF5F411D6}.Debug|x86.ActiveCfg = Debug|Win32 {AD25497F-A15F-4DFF-AC7A-B8ABF5F411D6}.Debug|x86.Build.0 = Debug|Win32 - {AD25497F-A15F-4DFF-AC7A-B8ABF5F411D6}.Release|Any CPU.ActiveCfg = Release|Win32 - {AD25497F-A15F-4DFF-AC7A-B8ABF5F411D6}.Release|x64.ActiveCfg = Release|x64 - {AD25497F-A15F-4DFF-AC7A-B8ABF5F411D6}.Release|x64.Build.0 = Release|x64 + {AD25497F-A15F-4DFF-AC7A-B8ABF5F411D6}.Release|ARM.ActiveCfg = Release|ARM + {AD25497F-A15F-4DFF-AC7A-B8ABF5F411D6}.Release|ARM.Build.0 = Release|ARM {AD25497F-A15F-4DFF-AC7A-B8ABF5F411D6}.Release|x86.ActiveCfg = Release|Win32 {AD25497F-A15F-4DFF-AC7A-B8ABF5F411D6}.Release|x86.Build.0 = Release|Win32 - {3AE2A022-ED83-41F1-948A-12A7593CBD00}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {3AE2A022-ED83-41F1-948A-12A7593CBD00}.Debug|x64.ActiveCfg = Debug|x64 - {3AE2A022-ED83-41F1-948A-12A7593CBD00}.Debug|x64.Build.0 = Debug|x64 + {3AE2A022-ED83-41F1-948A-12A7593CBD00}.Debug|ARM.ActiveCfg = Debug|ARM + {3AE2A022-ED83-41F1-948A-12A7593CBD00}.Debug|ARM.Build.0 = Debug|ARM {3AE2A022-ED83-41F1-948A-12A7593CBD00}.Debug|x86.ActiveCfg = Debug|Win32 {3AE2A022-ED83-41F1-948A-12A7593CBD00}.Debug|x86.Build.0 = Debug|Win32 - {3AE2A022-ED83-41F1-948A-12A7593CBD00}.Release|Any CPU.ActiveCfg = Release|Win32 - {3AE2A022-ED83-41F1-948A-12A7593CBD00}.Release|x64.ActiveCfg = Release|x64 - {3AE2A022-ED83-41F1-948A-12A7593CBD00}.Release|x64.Build.0 = Release|x64 + {3AE2A022-ED83-41F1-948A-12A7593CBD00}.Release|ARM.ActiveCfg = Release|ARM + {3AE2A022-ED83-41F1-948A-12A7593CBD00}.Release|ARM.Build.0 = Release|ARM {3AE2A022-ED83-41F1-948A-12A7593CBD00}.Release|x86.ActiveCfg = Release|Win32 {3AE2A022-ED83-41F1-948A-12A7593CBD00}.Release|x86.Build.0 = Release|Win32 - {18E0189B-F3F1-4CB2-A3AF-5606ADD5E279}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {18E0189B-F3F1-4CB2-A3AF-5606ADD5E279}.Debug|x64.ActiveCfg = Debug|x64 - {18E0189B-F3F1-4CB2-A3AF-5606ADD5E279}.Debug|x64.Build.0 = Debug|x64 + {18E0189B-F3F1-4CB2-A3AF-5606ADD5E279}.Debug|ARM.ActiveCfg = Debug|ARM + {18E0189B-F3F1-4CB2-A3AF-5606ADD5E279}.Debug|ARM.Build.0 = Debug|ARM {18E0189B-F3F1-4CB2-A3AF-5606ADD5E279}.Debug|x86.ActiveCfg = Debug|Win32 {18E0189B-F3F1-4CB2-A3AF-5606ADD5E279}.Debug|x86.Build.0 = Debug|Win32 - {18E0189B-F3F1-4CB2-A3AF-5606ADD5E279}.Release|Any CPU.ActiveCfg = Release|Win32 - {18E0189B-F3F1-4CB2-A3AF-5606ADD5E279}.Release|x64.ActiveCfg = Release|x64 - {18E0189B-F3F1-4CB2-A3AF-5606ADD5E279}.Release|x64.Build.0 = Release|x64 + {18E0189B-F3F1-4CB2-A3AF-5606ADD5E279}.Release|ARM.ActiveCfg = Release|ARM + {18E0189B-F3F1-4CB2-A3AF-5606ADD5E279}.Release|ARM.Build.0 = Release|ARM {18E0189B-F3F1-4CB2-A3AF-5606ADD5E279}.Release|x86.ActiveCfg = Release|Win32 {18E0189B-F3F1-4CB2-A3AF-5606ADD5E279}.Release|x86.Build.0 = Release|Win32 - {7A05E943-6E0A-4F57-8BD7-BE90F44DCAD7}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {7A05E943-6E0A-4F57-8BD7-BE90F44DCAD7}.Debug|x64.ActiveCfg = Debug|x64 - {7A05E943-6E0A-4F57-8BD7-BE90F44DCAD7}.Debug|x64.Build.0 = Debug|x64 + {7A05E943-6E0A-4F57-8BD7-BE90F44DCAD7}.Debug|ARM.ActiveCfg = Debug|ARM + {7A05E943-6E0A-4F57-8BD7-BE90F44DCAD7}.Debug|ARM.Build.0 = Debug|ARM {7A05E943-6E0A-4F57-8BD7-BE90F44DCAD7}.Debug|x86.ActiveCfg = Debug|Win32 {7A05E943-6E0A-4F57-8BD7-BE90F44DCAD7}.Debug|x86.Build.0 = Debug|Win32 - {7A05E943-6E0A-4F57-8BD7-BE90F44DCAD7}.Release|Any CPU.ActiveCfg = Release|Win32 - {7A05E943-6E0A-4F57-8BD7-BE90F44DCAD7}.Release|x64.ActiveCfg = Release|x64 - {7A05E943-6E0A-4F57-8BD7-BE90F44DCAD7}.Release|x64.Build.0 = Release|x64 + {7A05E943-6E0A-4F57-8BD7-BE90F44DCAD7}.Release|ARM.ActiveCfg = Release|ARM + {7A05E943-6E0A-4F57-8BD7-BE90F44DCAD7}.Release|ARM.Build.0 = Release|ARM {7A05E943-6E0A-4F57-8BD7-BE90F44DCAD7}.Release|x86.ActiveCfg = Release|Win32 {7A05E943-6E0A-4F57-8BD7-BE90F44DCAD7}.Release|x86.Build.0 = Release|Win32 - {33D91B58-1981-4A3C-B4D1-86EE406CDE12}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {33D91B58-1981-4A3C-B4D1-86EE406CDE12}.Debug|x64.ActiveCfg = Debug|x64 - {33D91B58-1981-4A3C-B4D1-86EE406CDE12}.Debug|x64.Build.0 = Debug|x64 + {33D91B58-1981-4A3C-B4D1-86EE406CDE12}.Debug|ARM.ActiveCfg = Debug|ARM + {33D91B58-1981-4A3C-B4D1-86EE406CDE12}.Debug|ARM.Build.0 = Debug|ARM {33D91B58-1981-4A3C-B4D1-86EE406CDE12}.Debug|x86.ActiveCfg = Debug|Win32 {33D91B58-1981-4A3C-B4D1-86EE406CDE12}.Debug|x86.Build.0 = Debug|Win32 - {33D91B58-1981-4A3C-B4D1-86EE406CDE12}.Release|Any CPU.ActiveCfg = Release|Win32 - {33D91B58-1981-4A3C-B4D1-86EE406CDE12}.Release|x64.ActiveCfg = Release|x64 - {33D91B58-1981-4A3C-B4D1-86EE406CDE12}.Release|x64.Build.0 = Release|x64 + {33D91B58-1981-4A3C-B4D1-86EE406CDE12}.Release|ARM.ActiveCfg = Release|ARM + {33D91B58-1981-4A3C-B4D1-86EE406CDE12}.Release|ARM.Build.0 = Release|ARM {33D91B58-1981-4A3C-B4D1-86EE406CDE12}.Release|x86.ActiveCfg = Release|Win32 {33D91B58-1981-4A3C-B4D1-86EE406CDE12}.Release|x86.Build.0 = Release|Win32 - {512BF866-1AA0-4169-A7D6-D2776B5D731E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {512BF866-1AA0-4169-A7D6-D2776B5D731E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {512BF866-1AA0-4169-A7D6-D2776B5D731E}.Debug|x64.ActiveCfg = Debug|Any CPU - {512BF866-1AA0-4169-A7D6-D2776B5D731E}.Debug|x64.Build.0 = Debug|Any CPU + {512BF866-1AA0-4169-A7D6-D2776B5D731E}.Debug|ARM.ActiveCfg = Debug|Any CPU + {512BF866-1AA0-4169-A7D6-D2776B5D731E}.Debug|ARM.Build.0 = Debug|Any CPU {512BF866-1AA0-4169-A7D6-D2776B5D731E}.Debug|x86.ActiveCfg = Debug|Any CPU {512BF866-1AA0-4169-A7D6-D2776B5D731E}.Debug|x86.Build.0 = Debug|Any CPU - {512BF866-1AA0-4169-A7D6-D2776B5D731E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {512BF866-1AA0-4169-A7D6-D2776B5D731E}.Release|Any CPU.Build.0 = Release|Any CPU - {512BF866-1AA0-4169-A7D6-D2776B5D731E}.Release|x64.ActiveCfg = Release|Any CPU - {512BF866-1AA0-4169-A7D6-D2776B5D731E}.Release|x64.Build.0 = Release|Any CPU + {512BF866-1AA0-4169-A7D6-D2776B5D731E}.Release|ARM.ActiveCfg = Release|Any CPU + {512BF866-1AA0-4169-A7D6-D2776B5D731E}.Release|ARM.Build.0 = Release|Any CPU {512BF866-1AA0-4169-A7D6-D2776B5D731E}.Release|x86.ActiveCfg = Release|Any CPU {512BF866-1AA0-4169-A7D6-D2776B5D731E}.Release|x86.Build.0 = Release|Any CPU - {8E708D9A-6325-4AA9-B5A5-D1B5ECA8EEF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E708D9A-6325-4AA9-B5A5-D1B5ECA8EEF7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E708D9A-6325-4AA9-B5A5-D1B5ECA8EEF7}.Debug|x64.ActiveCfg = Debug|Any CPU - {8E708D9A-6325-4AA9-B5A5-D1B5ECA8EEF7}.Debug|x64.Build.0 = Debug|Any CPU + {8E708D9A-6325-4AA9-B5A5-D1B5ECA8EEF7}.Debug|ARM.ActiveCfg = Debug|Any CPU + {8E708D9A-6325-4AA9-B5A5-D1B5ECA8EEF7}.Debug|ARM.Build.0 = Debug|Any CPU {8E708D9A-6325-4AA9-B5A5-D1B5ECA8EEF7}.Debug|x86.ActiveCfg = Debug|Any CPU {8E708D9A-6325-4AA9-B5A5-D1B5ECA8EEF7}.Debug|x86.Build.0 = Debug|Any CPU - {8E708D9A-6325-4AA9-B5A5-D1B5ECA8EEF7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E708D9A-6325-4AA9-B5A5-D1B5ECA8EEF7}.Release|Any CPU.Build.0 = Release|Any CPU - {8E708D9A-6325-4AA9-B5A5-D1B5ECA8EEF7}.Release|x64.ActiveCfg = Release|Any CPU - {8E708D9A-6325-4AA9-B5A5-D1B5ECA8EEF7}.Release|x64.Build.0 = Release|Any CPU + {8E708D9A-6325-4AA9-B5A5-D1B5ECA8EEF7}.Release|ARM.ActiveCfg = Release|Any CPU + {8E708D9A-6325-4AA9-B5A5-D1B5ECA8EEF7}.Release|ARM.Build.0 = Release|Any CPU {8E708D9A-6325-4AA9-B5A5-D1B5ECA8EEF7}.Release|x86.ActiveCfg = Release|Any CPU {8E708D9A-6325-4AA9-B5A5-D1B5ECA8EEF7}.Release|x86.Build.0 = Release|Any CPU - {BD681A4F-EB60-4BB8-90B5-65968FC7DA59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BD681A4F-EB60-4BB8-90B5-65968FC7DA59}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BD681A4F-EB60-4BB8-90B5-65968FC7DA59}.Debug|x64.ActiveCfg = Debug|Any CPU - {BD681A4F-EB60-4BB8-90B5-65968FC7DA59}.Debug|x64.Build.0 = Debug|Any CPU + {BD681A4F-EB60-4BB8-90B5-65968FC7DA59}.Debug|ARM.ActiveCfg = Debug|Any CPU + {BD681A4F-EB60-4BB8-90B5-65968FC7DA59}.Debug|ARM.Build.0 = Debug|Any CPU {BD681A4F-EB60-4BB8-90B5-65968FC7DA59}.Debug|x86.ActiveCfg = Debug|x86 {BD681A4F-EB60-4BB8-90B5-65968FC7DA59}.Debug|x86.Build.0 = Debug|x86 - {BD681A4F-EB60-4BB8-90B5-65968FC7DA59}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BD681A4F-EB60-4BB8-90B5-65968FC7DA59}.Release|Any CPU.Build.0 = Release|Any CPU - {BD681A4F-EB60-4BB8-90B5-65968FC7DA59}.Release|x64.ActiveCfg = Release|Any CPU - {BD681A4F-EB60-4BB8-90B5-65968FC7DA59}.Release|x64.Build.0 = Release|Any CPU + {BD681A4F-EB60-4BB8-90B5-65968FC7DA59}.Release|ARM.ActiveCfg = Release|Any CPU + {BD681A4F-EB60-4BB8-90B5-65968FC7DA59}.Release|ARM.Build.0 = Release|Any CPU {BD681A4F-EB60-4BB8-90B5-65968FC7DA59}.Release|x86.ActiveCfg = Release|x86 {BD681A4F-EB60-4BB8-90B5-65968FC7DA59}.Release|x86.Build.0 = Release|x86 - {FFD3FD52-37A8-4F43-883C-DE8D996CB0E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FFD3FD52-37A8-4F43-883C-DE8D996CB0E0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FFD3FD52-37A8-4F43-883C-DE8D996CB0E0}.Debug|x64.ActiveCfg = Debug|Any CPU - {FFD3FD52-37A8-4F43-883C-DE8D996CB0E0}.Debug|x64.Build.0 = Debug|Any CPU + {FFD3FD52-37A8-4F43-883C-DE8D996CB0E0}.Debug|ARM.ActiveCfg = Debug|Any CPU + {FFD3FD52-37A8-4F43-883C-DE8D996CB0E0}.Debug|ARM.Build.0 = Debug|Any CPU {FFD3FD52-37A8-4F43-883C-DE8D996CB0E0}.Debug|x86.ActiveCfg = Debug|Any CPU {FFD3FD52-37A8-4F43-883C-DE8D996CB0E0}.Debug|x86.Build.0 = Debug|Any CPU - {FFD3FD52-37A8-4F43-883C-DE8D996CB0E0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FFD3FD52-37A8-4F43-883C-DE8D996CB0E0}.Release|Any CPU.Build.0 = Release|Any CPU - {FFD3FD52-37A8-4F43-883C-DE8D996CB0E0}.Release|x64.ActiveCfg = Release|Any CPU - {FFD3FD52-37A8-4F43-883C-DE8D996CB0E0}.Release|x64.Build.0 = Release|Any CPU + {FFD3FD52-37A8-4F43-883C-DE8D996CB0E0}.Release|ARM.ActiveCfg = Release|Any CPU + {FFD3FD52-37A8-4F43-883C-DE8D996CB0E0}.Release|ARM.Build.0 = Release|Any CPU {FFD3FD52-37A8-4F43-883C-DE8D996CB0E0}.Release|x86.ActiveCfg = Release|Any CPU {FFD3FD52-37A8-4F43-883C-DE8D996CB0E0}.Release|x86.Build.0 = Release|Any CPU - {3C2F5446-33F0-41D5-813A-64A94AA474AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C2F5446-33F0-41D5-813A-64A94AA474AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C2F5446-33F0-41D5-813A-64A94AA474AF}.Debug|x64.ActiveCfg = Debug|Any CPU - {3C2F5446-33F0-41D5-813A-64A94AA474AF}.Debug|x64.Build.0 = Debug|Any CPU + {3C2F5446-33F0-41D5-813A-64A94AA474AF}.Debug|ARM.ActiveCfg = Debug|Any CPU + {3C2F5446-33F0-41D5-813A-64A94AA474AF}.Debug|ARM.Build.0 = Debug|Any CPU {3C2F5446-33F0-41D5-813A-64A94AA474AF}.Debug|x86.ActiveCfg = Debug|Any CPU {3C2F5446-33F0-41D5-813A-64A94AA474AF}.Debug|x86.Build.0 = Debug|Any CPU - {3C2F5446-33F0-41D5-813A-64A94AA474AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C2F5446-33F0-41D5-813A-64A94AA474AF}.Release|Any CPU.Build.0 = Release|Any CPU - {3C2F5446-33F0-41D5-813A-64A94AA474AF}.Release|x64.ActiveCfg = Release|Any CPU - {3C2F5446-33F0-41D5-813A-64A94AA474AF}.Release|x64.Build.0 = Release|Any CPU + {3C2F5446-33F0-41D5-813A-64A94AA474AF}.Release|ARM.ActiveCfg = Release|Any CPU + {3C2F5446-33F0-41D5-813A-64A94AA474AF}.Release|ARM.Build.0 = Release|Any CPU {3C2F5446-33F0-41D5-813A-64A94AA474AF}.Release|x86.ActiveCfg = Release|Any CPU {3C2F5446-33F0-41D5-813A-64A94AA474AF}.Release|x86.Build.0 = Release|Any CPU - {4EC16578-EFBF-41E6-8D7F-976E3646DD1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4EC16578-EFBF-41E6-8D7F-976E3646DD1D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4EC16578-EFBF-41E6-8D7F-976E3646DD1D}.Debug|x64.ActiveCfg = Debug|Any CPU - {4EC16578-EFBF-41E6-8D7F-976E3646DD1D}.Debug|x64.Build.0 = Debug|Any CPU + {4EC16578-EFBF-41E6-8D7F-976E3646DD1D}.Debug|ARM.ActiveCfg = Debug|Any CPU + {4EC16578-EFBF-41E6-8D7F-976E3646DD1D}.Debug|ARM.Build.0 = Debug|Any CPU {4EC16578-EFBF-41E6-8D7F-976E3646DD1D}.Debug|x86.ActiveCfg = Debug|Any CPU {4EC16578-EFBF-41E6-8D7F-976E3646DD1D}.Debug|x86.Build.0 = Debug|Any CPU - {4EC16578-EFBF-41E6-8D7F-976E3646DD1D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4EC16578-EFBF-41E6-8D7F-976E3646DD1D}.Release|Any CPU.Build.0 = Release|Any CPU - {4EC16578-EFBF-41E6-8D7F-976E3646DD1D}.Release|x64.ActiveCfg = Release|Any CPU - {4EC16578-EFBF-41E6-8D7F-976E3646DD1D}.Release|x64.Build.0 = Release|Any CPU + {4EC16578-EFBF-41E6-8D7F-976E3646DD1D}.Release|ARM.ActiveCfg = Release|Any CPU + {4EC16578-EFBF-41E6-8D7F-976E3646DD1D}.Release|ARM.Build.0 = Release|Any CPU {4EC16578-EFBF-41E6-8D7F-976E3646DD1D}.Release|x86.ActiveCfg = Release|Any CPU {4EC16578-EFBF-41E6-8D7F-976E3646DD1D}.Release|x86.Build.0 = Release|Any CPU - {DC074727-72E4-43C5-BAAF-E0D548104797}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DC074727-72E4-43C5-BAAF-E0D548104797}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DC074727-72E4-43C5-BAAF-E0D548104797}.Debug|x64.ActiveCfg = Debug|Any CPU - {DC074727-72E4-43C5-BAAF-E0D548104797}.Debug|x64.Build.0 = Debug|Any CPU + {DC074727-72E4-43C5-BAAF-E0D548104797}.Debug|ARM.ActiveCfg = Debug|Any CPU + {DC074727-72E4-43C5-BAAF-E0D548104797}.Debug|ARM.Build.0 = Debug|Any CPU {DC074727-72E4-43C5-BAAF-E0D548104797}.Debug|x86.ActiveCfg = Debug|Any CPU {DC074727-72E4-43C5-BAAF-E0D548104797}.Debug|x86.Build.0 = Debug|Any CPU - {DC074727-72E4-43C5-BAAF-E0D548104797}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DC074727-72E4-43C5-BAAF-E0D548104797}.Release|Any CPU.Build.0 = Release|Any CPU - {DC074727-72E4-43C5-BAAF-E0D548104797}.Release|x64.ActiveCfg = Release|Any CPU - {DC074727-72E4-43C5-BAAF-E0D548104797}.Release|x64.Build.0 = Release|Any CPU + {DC074727-72E4-43C5-BAAF-E0D548104797}.Release|ARM.ActiveCfg = Release|Any CPU + {DC074727-72E4-43C5-BAAF-E0D548104797}.Release|ARM.Build.0 = Release|Any CPU {DC074727-72E4-43C5-BAAF-E0D548104797}.Release|x86.ActiveCfg = Release|Any CPU {DC074727-72E4-43C5-BAAF-E0D548104797}.Release|x86.Build.0 = Release|Any CPU - {E4CA78A9-9408-4F5F-ADD6-730FD501FF8E}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {E4CA78A9-9408-4F5F-ADD6-730FD501FF8E}.Debug|x64.ActiveCfg = Debug|x64 - {E4CA78A9-9408-4F5F-ADD6-730FD501FF8E}.Debug|x64.Build.0 = Debug|x64 + {E4CA78A9-9408-4F5F-ADD6-730FD501FF8E}.Debug|ARM.ActiveCfg = Debug|ARM + {E4CA78A9-9408-4F5F-ADD6-730FD501FF8E}.Debug|ARM.Build.0 = Debug|ARM {E4CA78A9-9408-4F5F-ADD6-730FD501FF8E}.Debug|x86.ActiveCfg = Debug|Win32 {E4CA78A9-9408-4F5F-ADD6-730FD501FF8E}.Debug|x86.Build.0 = Debug|Win32 - {E4CA78A9-9408-4F5F-ADD6-730FD501FF8E}.Release|Any CPU.ActiveCfg = Release|Win32 - {E4CA78A9-9408-4F5F-ADD6-730FD501FF8E}.Release|x64.ActiveCfg = Release|x64 - {E4CA78A9-9408-4F5F-ADD6-730FD501FF8E}.Release|x64.Build.0 = Release|x64 + {E4CA78A9-9408-4F5F-ADD6-730FD501FF8E}.Release|ARM.ActiveCfg = Release|ARM + {E4CA78A9-9408-4F5F-ADD6-730FD501FF8E}.Release|ARM.Build.0 = Release|ARM {E4CA78A9-9408-4F5F-ADD6-730FD501FF8E}.Release|x86.ActiveCfg = Release|Win32 {E4CA78A9-9408-4F5F-ADD6-730FD501FF8E}.Release|x86.Build.0 = Release|Win32 - {C5587B6E-19C4-4484-AA97-5C20FBB07E43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C5587B6E-19C4-4484-AA97-5C20FBB07E43}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C5587B6E-19C4-4484-AA97-5C20FBB07E43}.Debug|x64.ActiveCfg = Debug|Any CPU - {C5587B6E-19C4-4484-AA97-5C20FBB07E43}.Debug|x64.Build.0 = Debug|Any CPU + {C5587B6E-19C4-4484-AA97-5C20FBB07E43}.Debug|ARM.ActiveCfg = Debug|Any CPU + {C5587B6E-19C4-4484-AA97-5C20FBB07E43}.Debug|ARM.Build.0 = Debug|Any CPU {C5587B6E-19C4-4484-AA97-5C20FBB07E43}.Debug|x86.ActiveCfg = Debug|Any CPU {C5587B6E-19C4-4484-AA97-5C20FBB07E43}.Debug|x86.Build.0 = Debug|Any CPU - {C5587B6E-19C4-4484-AA97-5C20FBB07E43}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C5587B6E-19C4-4484-AA97-5C20FBB07E43}.Release|Any CPU.Build.0 = Release|Any CPU - {C5587B6E-19C4-4484-AA97-5C20FBB07E43}.Release|x64.ActiveCfg = Release|Any CPU - {C5587B6E-19C4-4484-AA97-5C20FBB07E43}.Release|x64.Build.0 = Release|Any CPU + {C5587B6E-19C4-4484-AA97-5C20FBB07E43}.Release|ARM.ActiveCfg = Release|Any CPU + {C5587B6E-19C4-4484-AA97-5C20FBB07E43}.Release|ARM.Build.0 = Release|Any CPU {C5587B6E-19C4-4484-AA97-5C20FBB07E43}.Release|x86.ActiveCfg = Release|Any CPU {C5587B6E-19C4-4484-AA97-5C20FBB07E43}.Release|x86.Build.0 = Release|Any CPU - {F0288B24-7B84-42A5-9A92-2E16A012E4DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F0288B24-7B84-42A5-9A92-2E16A012E4DE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F0288B24-7B84-42A5-9A92-2E16A012E4DE}.Debug|x64.ActiveCfg = Debug|Any CPU - {F0288B24-7B84-42A5-9A92-2E16A012E4DE}.Debug|x64.Build.0 = Debug|Any CPU + {F0288B24-7B84-42A5-9A92-2E16A012E4DE}.Debug|ARM.ActiveCfg = Debug|Any CPU + {F0288B24-7B84-42A5-9A92-2E16A012E4DE}.Debug|ARM.Build.0 = Debug|Any CPU {F0288B24-7B84-42A5-9A92-2E16A012E4DE}.Debug|x86.ActiveCfg = Debug|Any CPU {F0288B24-7B84-42A5-9A92-2E16A012E4DE}.Debug|x86.Build.0 = Debug|Any CPU - {F0288B24-7B84-42A5-9A92-2E16A012E4DE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F0288B24-7B84-42A5-9A92-2E16A012E4DE}.Release|Any CPU.Build.0 = Release|Any CPU - {F0288B24-7B84-42A5-9A92-2E16A012E4DE}.Release|x64.ActiveCfg = Release|Any CPU - {F0288B24-7B84-42A5-9A92-2E16A012E4DE}.Release|x64.Build.0 = Release|Any CPU + {F0288B24-7B84-42A5-9A92-2E16A012E4DE}.Release|ARM.ActiveCfg = Release|Any CPU + {F0288B24-7B84-42A5-9A92-2E16A012E4DE}.Release|ARM.Build.0 = Release|Any CPU {F0288B24-7B84-42A5-9A92-2E16A012E4DE}.Release|x86.ActiveCfg = Release|Any CPU {F0288B24-7B84-42A5-9A92-2E16A012E4DE}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {5FAD9D1A-D291-492A-956A-94422761AA8E} + EndGlobalSection EndGlobal diff --git a/IEHelper/IEHelper.vcxproj b/IEHelper/IEHelper.vcxproj index bf9782c..16ebf92 100644 --- a/IEHelper/IEHelper.vcxproj +++ b/IEHelper/IEHelper.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug Win32 + + Release + ARM + Release Win32 @@ -33,6 +41,13 @@ true Unicode + + DynamicLibrary + true + v140 + true + Unicode + DynamicLibrary false @@ -40,6 +55,13 @@ true Unicode + + DynamicLibrary + false + v140 + true + Unicode + DynamicLibrary true @@ -62,9 +84,15 @@ + + + + + + @@ -75,12 +103,18 @@ true + + true + true false + + false + false @@ -95,6 +129,18 @@ + + + Level3 + Disabled + WIN32;_DEBUG;%(PreprocessorDefinitions) + Use + + + + + + Level3 @@ -116,6 +162,17 @@ + + + Level3 + WIN32;NDEBUG;%(PreprocessorDefinitions) + Use + + + + + + Level3 @@ -142,8 +199,10 @@ Create + Create Create Create + Create Create diff --git a/IEHelper/Stdafx.h b/IEHelper/Stdafx.h index 9aff0fd..950f8a2 100644 --- a/IEHelper/Stdafx.h +++ b/IEHelper/Stdafx.h @@ -4,6 +4,10 @@ #pragma once +#ifdef _M_ARM +#define _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 1 +#endif + #include #include #include \ No newline at end of file diff --git a/appinstaller/appinstaller.vcxproj b/appinstaller/appinstaller.vcxproj index 6f21d59..8cc6e8a 100644 --- a/appinstaller/appinstaller.vcxproj +++ b/appinstaller/appinstaller.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug Win32 + + Release + ARM + Release Win32 @@ -32,6 +40,13 @@ Unicode true + + Application + true + v140 + Unicode + true + Application false @@ -40,6 +55,14 @@ Unicode true + + Application + false + v140 + true + Unicode + true + Application true @@ -61,9 +84,15 @@ + + + + + + @@ -74,12 +103,18 @@ true + + true + true false + + false + false @@ -102,6 +137,28 @@ app.manifest + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;HMODULE_MODE_EXE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + true + + + Windows + true + shlwapi.lib;version.lib;dwmapi.lib;$(OutDir)pkgread.lib;$(OutDir)pkgmgr.lib;$(OutDir)certmgr.lib;$(OutDir)priformatcli.lib;$(OutDir)notice.lib;winhttp.lib;Psapi.lib;advapi32.lib;gdi32.lib;comdlg32.lib;shell32.lib;ole32.lib;%(AdditionalDependencies) + RequireAdministrator + comsupp.lib + + + app.manifest + + @@ -139,6 +196,31 @@ app.manifest + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;HMODULE_MODE_EXE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + shlwapi.lib;version.lib;dwmapi.lib;$(OutDir)pkgread.lib;$(OutDir)pkgmgr.lib;$(OutDir)certmgr.lib;$(OutDir)priformatcli.lib;$(OutDir)notice.lib;winhttp.lib;Psapi.lib;advapi32.lib;gdi32.lib;comdlg32.lib;shell32.lib;ole32.lib;%(AdditionalDependencies) + RequireAdministrator + + + + + app.manifest + + Level3 diff --git a/appinstaller/appxinfo.h b/appinstaller/appxinfo.h index e21a464..05e9582 100644 --- a/appinstaller/appxinfo.h +++ b/appinstaller/appxinfo.h @@ -12,6 +12,8 @@ #include "nstring.h" #include "priformatcli.h" #include "pkgread.h" +#include +#include "../pkgread/pkgread.h" static std::string ws2utf8 (const std::wstring &ws) { diff --git a/appinstaller/certmgr.h b/appinstaller/certmgr.h index 16f79f3..6f1945b 120000 --- a/appinstaller/certmgr.h +++ b/appinstaller/certmgr.h @@ -1 +1 @@ -E:/Profiles/Bruce/Documents/Visual Studio 2015/Projects/AppInstallerReset/certmgr/certmgr.h \ No newline at end of file +D:/GitHub/App-Installer-For-Windows-8.x-Reset/certmgr/certmgr.h \ No newline at end of file diff --git a/appinstaller/main.cpp b/appinstaller/main.cpp index 0bf901f..9754f27 100644 --- a/appinstaller/main.cpp +++ b/appinstaller/main.cpp @@ -1,3 +1,7 @@ +#ifdef _M_ARM +#define _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 1 +#endif + #include #include #include diff --git a/appinstaller/notice.h b/appinstaller/notice.h index f96b6f3..30a7f3f 120000 --- a/appinstaller/notice.h +++ b/appinstaller/notice.h @@ -1 +1 @@ -E:/Profiles/Bruce/Documents/Visual Studio 2015/Projects/AppInstallerReset/notice/notice.h \ No newline at end of file +D:/GitHub/App-Installer-For-Windows-8.x-Reset/notice/notice.h \ No newline at end of file diff --git a/appinstaller/pkgmgr.h b/appinstaller/pkgmgr.h index 5557732..5e021c9 120000 --- a/appinstaller/pkgmgr.h +++ b/appinstaller/pkgmgr.h @@ -1 +1 @@ -E:/Profiles/Bruce/Documents/Visual Studio 2015/Projects/AppInstallerReset/pkgmgr/pkgmgr.h \ No newline at end of file +D:/GitHub/App-Installer-For-Windows-8.x-Reset/pkgmgr/pkgmgr.h \ No newline at end of file diff --git a/appinstaller/pkgread.h b/appinstaller/pkgread.h index 03c7377..ebe33f8 120000 --- a/appinstaller/pkgread.h +++ b/appinstaller/pkgread.h @@ -1 +1 @@ -E:/Profiles/Bruce/Documents/Visual Studio 2015/Projects/AppInstallerReset/pkgread/pkgread.h \ No newline at end of file +D:/GitHub/App-Installer-For-Windows-8.x-Reset/pkgread/pkgread.h \ No newline at end of file diff --git a/appinstaller/priformatcli.h b/appinstaller/priformatcli.h index ca5b3bd..146f8f9 120000 --- a/appinstaller/priformatcli.h +++ b/appinstaller/priformatcli.h @@ -1 +1 @@ -../priformatcli/priformatcli.h \ No newline at end of file +D:/GitHub/App-Installer-For-Windows-8.x-Reset/priformatcli/priformatcli.h \ No newline at end of file diff --git a/certmgr/certmgr.vcxproj b/certmgr/certmgr.vcxproj index 1d2d2d8..0f1a325 100644 --- a/certmgr/certmgr.vcxproj +++ b/certmgr/certmgr.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug Win32 + + Release + ARM + Release Win32 @@ -31,6 +39,12 @@ v140 Unicode + + DynamicLibrary + true + v140 + Unicode + DynamicLibrary false @@ -38,6 +52,13 @@ true Unicode + + DynamicLibrary + false + v140 + true + Unicode + DynamicLibrary true @@ -59,9 +80,15 @@ + + + + + + @@ -72,12 +99,18 @@ true + + true + true false + + false + false @@ -95,6 +128,20 @@ crypt32.lib;wintrust.lib;%(AdditionalDependencies) + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;CERTMGR_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + crypt32.lib;wintrust.lib;%(AdditionalDependencies) + + Use @@ -126,6 +173,24 @@ crypt32.lib;wintrust.lib;%(AdditionalDependencies) + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;CERTMGR_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + crypt32.lib;wintrust.lib;%(AdditionalDependencies) + + Level3 @@ -156,22 +221,30 @@ false + false + + false false + false + + false Create + Create Create Create + Create Create diff --git a/certmgr/stdafx.h b/certmgr/stdafx.h index 43c45a2..6b7194f 100644 --- a/certmgr/stdafx.h +++ b/certmgr/stdafx.h @@ -4,6 +4,9 @@ // #pragma once +#ifdef _M_ARM +#define _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 1 +#endif #include "targetver.h" diff --git a/desktopini/desktopini.vcxproj b/desktopini/desktopini.vcxproj index c1ff41d..1cb729c 100644 --- a/desktopini/desktopini.vcxproj +++ b/desktopini/desktopini.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug Win32 + + Release + ARM + Release Win32 @@ -31,6 +39,12 @@ v140 Unicode + + Application + true + v140 + Unicode + Application false @@ -38,6 +52,13 @@ true Unicode + + Application + false + v140 + true + Unicode + Application true @@ -59,9 +80,15 @@ + + + + + + @@ -72,12 +99,18 @@ true + + true + true false + + false + false @@ -97,6 +130,22 @@ shlwapi.lib;version.lib;%(AdditionalDependencies) + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + RequireAdministrator + shlwapi.lib;version.lib;%(AdditionalDependencies) + + @@ -131,6 +180,26 @@ shlwapi.lib;version.lib;%(AdditionalDependencies) + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + RequireAdministrator + shlwapi.lib;version.lib;%(AdditionalDependencies) + + Level3 diff --git a/desktopini/main.cpp b/desktopini/main.cpp index 041025a..823f638 100644 --- a/desktopini/main.cpp +++ b/desktopini/main.cpp @@ -1,5 +1,10 @@ #define _CRT_SECURE_NO_WARNINGS #define HMODULE_MODE_EXE + +#ifdef _M_ARM +#define _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 1 +#endif + #include #include #include diff --git a/notice/notice.vcxproj b/notice/notice.vcxproj index 795895d..e8e3024 100644 --- a/notice/notice.vcxproj +++ b/notice/notice.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug Win32 + + Release + ARM + Release Win32 @@ -24,6 +32,13 @@ v120 false + + DynamicLibrary + true + Unicode + v120 + false + DynamicLibrary false @@ -31,21 +46,40 @@ v120 false + + DynamicLibrary + false + Unicode + v120 + false + + + + + + + $(VCINSTALLDIR)\vcpackages;$(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib;$(WindowsSdkDir)\References\CommonConfiguration\Neutral;$(VSSDK140Install)..\VC\atlmfc\lib;$(ReferencePath) + + $(VCINSTALLDIR)\vcpackages;$(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib;$(WindowsSdkDir)\References\CommonConfiguration\Neutral;$(VSSDK140Install)..\VC\atlmfc\lib;$(ReferencePath) + $(VCINSTALLDIR)\vcpackages;$(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib;$(WindowsSdkDir)\References\CommonConfiguration\Neutral;$(VSSDK140Install)..\VC\atlmfc\lib;$(ReferencePath) + + $(VCINSTALLDIR)\vcpackages;$(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib;$(WindowsSdkDir)\References\CommonConfiguration\Neutral;$(VSSDK140Install)..\VC\atlmfc\lib;$(ReferencePath) + @@ -64,6 +98,23 @@ shlwapi.lib;crypt32.lib;%(AdditionalDependencies) + + + NotUsing + Level3 + Disabled + /ZW:nostdlib /FUplatform.winmd /FUwindows.winmd %(AdditionalOptions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;NOTICE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + false + + + Windows + true + RequireAdministrator + shlwapi.lib;crypt32.lib;%(AdditionalDependencies) + + NotUsing @@ -83,6 +134,25 @@ shlwapi.lib;crypt32.lib;%(AdditionalDependencies) + + + NotUsing + Level3 + MaxSpeed + true + true + /ZW:nostdlib /FUplatform.winmd /FUWindows.winmd %(AdditionalOptions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;NOTICE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + shlwapi.lib;crypt32.lib;%(AdditionalDependencies) + + diff --git a/notice/targetver.h b/notice/targetver.h index 416cebf..332d020 100644 --- a/notice/targetver.h +++ b/notice/targetver.h @@ -5,4 +5,8 @@ // ҪΪǰ Windows ƽ̨Ӧó WinSDKVer.h // _WIN32_WINNT ΪҪֵ֧ƽ̨Ȼٰ SDKDDKVer.h +#ifdef _M_ARM +#define _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 1 +#endif + #include diff --git a/pkgmgr/pkgmgr.vcxproj b/pkgmgr/pkgmgr.vcxproj index 694e91c..c437c8c 100644 --- a/pkgmgr/pkgmgr.vcxproj +++ b/pkgmgr/pkgmgr.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug Win32 + + Release + ARM + Release Win32 @@ -24,6 +32,13 @@ v120 false + + DynamicLibrary + true + Unicode + v120 + false + DynamicLibrary false @@ -31,21 +46,40 @@ v120 false + + DynamicLibrary + false + Unicode + v120 + false + + + + + + + $(VCINSTALLDIR)\vcpackages;$(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib;$(WindowsSdkDir)\References\CommonConfiguration\Neutral;$(ReferencePath) + + $(VCINSTALLDIR)\vcpackages;$(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib;$(WindowsSdkDir)\References\CommonConfiguration\Neutral;$(ReferencePath) + $(VCINSTALLDIR)\vcpackages;$(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib;$(WindowsSdkDir)\References\CommonConfiguration\Neutral;$(ReferencePath) + + $(VCINSTALLDIR)\vcpackages;$(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib;$(WindowsSdkDir)\References\CommonConfiguration\Neutral;$(ReferencePath) + @@ -63,6 +97,25 @@ RequireAdministrator + + + NotUsing + Level3 + Disabled + /ZW:nostdlib /FUplatform.winmd /FUwindows.winmd %(AdditionalOptions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;PKGMGR_EXPORTS;%(PreprocessorDefinitions) + true + false + + + Windows + true + RequireAdministrator + + + shlwapi.lib;version.lib;dwmapi.lib;winhttp.lib;Psapi.lib;advapi32.lib;gdi32.lib;comdlg32.lib;shell32.lib;ole32.lib;%(AdditionalDependencies) + + NotUsing @@ -81,6 +134,27 @@ true + + + NotUsing + Level3 + MaxSpeed + true + true + /ZW:nostdlib /FUplatform.winmd /FUWindows.winmd %(AdditionalOptions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;PKGMGR_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + + + shlwapi.lib;version.lib;dwmapi.lib;winhttp.lib;Psapi.lib;advapi32.lib;gdi32.lib;comdlg32.lib;shell32.lib;ole32.lib;%(AdditionalDependencies) + + diff --git a/pkgmgr/targetver.h b/pkgmgr/targetver.h index 416cebf..332d020 100644 --- a/pkgmgr/targetver.h +++ b/pkgmgr/targetver.h @@ -5,4 +5,8 @@ // ҪΪǰ Windows ƽ̨Ӧó WinSDKVer.h // _WIN32_WINNT ΪҪֵ֧ƽ̨Ȼٰ SDKDDKVer.h +#ifdef _M_ARM +#define _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 1 +#endif + #include diff --git a/pkgread/dllmain.cpp b/pkgread/dllmain.cpp index c63aef3..a8de525 100644 --- a/pkgread/dllmain.cpp +++ b/pkgread/dllmain.cpp @@ -1,4 +1,5 @@ // dllmain.cpp : DLL Ӧóڵ㡣 + #include "stdafx.h" BOOL APIENTRY DllMain( HMODULE hModule, diff --git a/pkgread/pkgread.vcxproj b/pkgread/pkgread.vcxproj index 5d2b7fb..d89f598 100644 --- a/pkgread/pkgread.vcxproj +++ b/pkgread/pkgread.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug Win32 + + Release + ARM + Release Win32 @@ -31,6 +39,12 @@ v140 Unicode + + DynamicLibrary + true + v140 + Unicode + DynamicLibrary false @@ -38,6 +52,13 @@ true Unicode + + DynamicLibrary + false + v140 + true + Unicode + DynamicLibrary true @@ -59,9 +80,15 @@ + + + + + + @@ -72,12 +99,18 @@ true + + true + true false + + false + false @@ -88,6 +121,7 @@ Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;PKGREAD_EXPORTS;HMODULE_MODE_DLL1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + D:\GitHub\App-Installer-For-Windows-8.x-Reset\packages\pugixml.1.15.0\build\native\include\ Windows @@ -95,6 +129,29 @@ urlmon.lib;crypt32.lib;version.lib;xmllite.lib;%(AdditionalDependencies) + + + NotUsing + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;PKGREAD_EXPORTS;HMODULE_MODE_DLL1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + D:\GitHub\App-Installer-For-Windows-8.x-Reset\packages\pugixml.1.15.0\build\native\include\ + ProgramDatabase + false + false + Default + + + Windows + true + shlwapi.lib;version.lib;dwmapi.lib;winhttp.lib;Psapi.lib;advapi32.lib;gdi32.lib;comdlg32.lib;shell32.lib;ole32.lib;urlmon.lib;crypt32.lib;xmllite.lib;pugixml.lib;%(AdditionalDependencies) + + + $(SolutionDir)ARM\$(Configuration) + false + + Use @@ -102,6 +159,7 @@ Disabled _DEBUG;_WINDOWS;_USRDLL;PKGREAD_EXPORTS;%(PreprocessorDefinitions) true + D:\GitHub\App-Installer-For-Windows-8.x-Reset\packages\pugixml.1.15.0\build\native\include\ Windows @@ -117,6 +175,7 @@ true WIN32;NDEBUG;_WINDOWS;_USRDLL;PKGREAD_EXPORTS;HMODULE_MODE_DLL1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true + D:\GitHub\App-Installer-For-Windows-8.x-Reset\packages\pugixml.1.15.0\build\native\include\ Windows @@ -126,6 +185,26 @@ urlmon.lib;crypt32.lib;version.lib;xmllite.lib;%(AdditionalDependencies) + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;PKGREAD_EXPORTS;HMODULE_MODE_DLL1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + D:\GitHub\App-Installer-For-Windows-8.x-Reset\packages\pugixml.1.15.0\build\native\include\ + + + Windows + true + true + true + shlwapi.lib;version.lib;dwmapi.lib;winhttp.lib;Psapi.lib;advapi32.lib;gdi32.lib;comdlg32.lib;shell32.lib;ole32.lib;urlmon.lib;crypt32.lib;xmllite.lib;pugixml.lib;%(AdditionalDependencies) + D:\GitHub\App-Installer-For-Windows-8.x-Reset\packages\pugixml.1.15.0\build\native\lib\ARM\v140\dynamic\$(Configuration) + + Level3 @@ -135,6 +214,7 @@ true NDEBUG;_WINDOWS;_USRDLL;PKGREAD_EXPORTS;%(PreprocessorDefinitions) true + D:\GitHub\App-Installer-For-Windows-8.x-Reset\packages\pugixml.1.15.0\build\native\include\ Windows @@ -147,6 +227,8 @@ + + @@ -167,16 +249,23 @@ + false + false + + false false + false + + false @@ -184,8 +273,10 @@ Create + Create Create Create + Create Create diff --git a/pkgread/pkgread.vcxproj.filters b/pkgread/pkgread.vcxproj.filters index e061920..73cc715 100644 --- a/pkgread/pkgread.vcxproj.filters +++ b/pkgread/pkgread.vcxproj.filters @@ -72,6 +72,12 @@ 头文件 + + 头文件 + + + 头文件 + @@ -83,6 +89,9 @@ 源文件 + + 源文件 + diff --git a/pkgread/targetver.h b/pkgread/targetver.h index 416cebf..332d020 100644 --- a/pkgread/targetver.h +++ b/pkgread/targetver.h @@ -5,4 +5,8 @@ // ҪΪǰ Windows ƽ̨Ӧó WinSDKVer.h // _WIN32_WINNT ΪҪֵ֧ƽ̨Ȼٰ SDKDDKVer.h +#ifdef _M_ARM +#define _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 1 +#endif + #include diff --git a/pkgread/typestrans.h b/pkgread/typestrans.h index 7abde9b..0297fc1 100644 --- a/pkgread/typestrans.h +++ b/pkgread/typestrans.h @@ -8,6 +8,7 @@ #include #include #include +#include #else #include #include diff --git a/priformatcli/priformatcli.vcxproj b/priformatcli/priformatcli.vcxproj index cdb5121..e24c80c 100644 --- a/priformatcli/priformatcli.vcxproj +++ b/priformatcli/priformatcli.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug Win32 + + Release + ARM + Release Win32 @@ -33,6 +41,13 @@ Unicode true + + DynamicLibrary + true + v140 + Unicode + true + DynamicLibrary false @@ -41,6 +56,14 @@ Unicode true + + DynamicLibrary + false + v140 + true + Unicode + true + DynamicLibrary true @@ -62,9 +85,15 @@ + + + + + + @@ -75,12 +104,18 @@ true + + true + true false + + false + false @@ -98,6 +133,23 @@ true + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;PRIFORMATCLI_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + + + Windows + true + + + shlwapi.lib;version.lib;dwmapi.lib;winhttp.lib;Psapi.lib;advapi32.lib;gdi32.lib;comdlg32.lib;shell32.lib;ole32.lib;%(AdditionalDependencies) + + @@ -130,6 +182,26 @@ true + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;PRIFORMATCLI_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + D:\GitHub\App-Installer-For-Windows-8.x-Reset\ARM\$(Configuration);C:\Program Files (x86)\Windows Kits\8.1\Lib\winv6.3\um\arm + shlwapi.lib;version.lib;dwmapi.lib;winhttp.lib;Psapi.lib;advapi32.lib;gdi32.lib;comdlg32.lib;shell32.lib;ole32.lib;%(AdditionalDependencies) + + Level3 @@ -168,14 +240,20 @@ false + false + + false false + false + + false diff --git a/priformatcli/targetver.h b/priformatcli/targetver.h index 416cebf..332d020 100644 --- a/priformatcli/targetver.h +++ b/priformatcli/targetver.h @@ -5,4 +5,8 @@ // ҪΪǰ Windows ƽ̨Ӧó WinSDKVer.h // _WIN32_WINNT ΪҪֵ֧ƽ̨Ȼٰ SDKDDKVer.h +#ifdef _M_ARM +#define _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 1 +#endif + #include diff --git a/pugixml_arm/framework.h b/pugixml_arm/framework.h new file mode 100644 index 0000000..d2d95bd --- /dev/null +++ b/pugixml_arm/framework.h @@ -0,0 +1,3 @@ +#pragma once + +#define WIN32_LEAN_AND_MEAN // 从 Windows 头文件中排除极少使用的内容 diff --git a/pugixml_arm/pch.cpp b/pugixml_arm/pch.cpp new file mode 100644 index 0000000..b6fb8f4 --- /dev/null +++ b/pugixml_arm/pch.cpp @@ -0,0 +1,5 @@ +// pch.cpp: 与预编译标头对应的源文件 + +#include "pch.h" + +// 当使用预编译的头时，需要使用此源文件，编译才能成功。 diff --git a/pugixml_arm/pch.h b/pugixml_arm/pch.h new file mode 100644 index 0000000..9660927 --- /dev/null +++ b/pugixml_arm/pch.h @@ -0,0 +1,13 @@ +// pch.h: 这是预编译标头文件。 +// 下方列出的文件仅编译一次，提高了将来生成的生成性能。 +// 这还将影响 IntelliSense 性能，包括代码完成和许多代码浏览功能。 +// 但是，如果此处列出的文件中的任何一个在生成之间有更新，它们全部都将被重新编译。 +// 请勿在此处添加要频繁更新的文件，这将使得性能优势无效。 + +#ifndef PCH_H +#define PCH_H + +// 添加要在此处预编译的标头 +#include "framework.h" + +#endif //PCH_H diff --git a/pugixml_arm/pugixml_arm.cpp b/pugixml_arm/pugixml_arm.cpp new file mode 100644 index 0000000..b5ffc6c --- /dev/null +++ b/pugixml_arm/pugixml_arm.cpp @@ -0,0 +1,10 @@ +// pugixml_arm.cpp : 定义静态库的函数。 +// + +#include "pch.h" +#include "framework.h" + +// TODO: 这是一个库函数示例 +void fnpugixmlarm() +{ +} diff --git a/pugixml_arm/pugixml_arm.vcxproj b/pugixml_arm/pugixml_arm.vcxproj new file mode 100644 index 0000000..924da89 --- /dev/null +++ b/pugixml_arm/pugixml_arm.vcxproj @@ -0,0 +1,207 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Release + ARM + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 17.0 + Win32Proj + {d764f74d-4c42-4a49-a4cd-212c630f02a8} + pugixmlarm + 10.0.22621.0 + pugixml + + + + StaticLibrary + true + v143 + Unicode + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + false + v143 + true + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + StaticLibrary + true + v143 + Unicode + + + StaticLibrary + false + v143 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + .lib + + + + Level3 + true + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + NotUsing + pch.h + + + + + true + + + + + Level3 + true + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + NotUsing + pch.h + + + + + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + NotUsing + pch.h + + + + + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + NotUsing + pch.h + + + + + true + + + + + Level3 + true + _DEBUG;_LIB;%(PreprocessorDefinitions) + true + NotUsing + pch.h + + + + + true + + + + + Level3 + true + true + true + NDEBUG;_LIB;%(PreprocessorDefinitions) + true + NotUsing + pch.h + + + + + true + + + + + + + + + + \ No newline at end of file diff --git a/pugixml_arm/pugixml_arm.vcxproj.filters b/pugixml_arm/pugixml_arm.vcxproj.filters new file mode 100644 index 0000000..284ff26 --- /dev/null +++ b/pugixml_arm/pugixml_arm.vcxproj.filters @@ -0,0 +1,25 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + 头文件 + + + 头文件 + + + \ No newline at end of file diff --git a/reslib/reslib.vcxproj b/reslib/reslib.vcxproj index 2de487b..3a94c4b 100644 --- a/reslib/reslib.vcxproj +++ b/reslib/reslib.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug Win32 + + Release + ARM + Release Win32 @@ -31,6 +39,12 @@ v140 Unicode + + DynamicLibrary + true + v140 + Unicode + DynamicLibrary false @@ -38,6 +52,13 @@ true Unicode + + DynamicLibrary + false + v140 + true + Unicode + DynamicLibrary true @@ -59,9 +80,15 @@ + + + + + + @@ -72,12 +99,18 @@ true + + true + true false + + false + false @@ -94,6 +127,19 @@ true + + + Use + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;RESLIB_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + + Use @@ -124,6 +170,23 @@ true + + + Level3 + Use + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;RESLIB_EXPORTS;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + + Level3 @@ -153,14 +216,20 @@ false + false + + false false + false + + false @@ -168,8 +237,10 @@ Create + Create Create Create + Create Create diff --git a/reslib/targetver.h b/reslib/targetver.h index 416cebf..332d020 100644 --- a/reslib/targetver.h +++ b/reslib/targetver.h @@ -5,4 +5,8 @@ // ҪΪǰ Windows ƽ̨Ӧó WinSDKVer.h // _WIN32_WINNT ΪҪֵ֧ƽ̨Ȼٰ SDKDDKVer.h +#ifdef _M_ARM +#define _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 1 +#endif + #include diff --git a/settings/main.cpp b/settings/main.cpp index a64d494..7d2786b 100644 --- a/settings/main.cpp +++ b/settings/main.cpp @@ -1,3 +1,7 @@ +#ifdef _M_ARM +#define _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 1 +#endif + #include #include #include diff --git a/settings/settings.vcxproj b/settings/settings.vcxproj index 4da8637..7cf5832 100644 --- a/settings/settings.vcxproj +++ b/settings/settings.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug Win32 + + Release + ARM + Release Win32 @@ -33,6 +41,13 @@ Unicode true + + Application + true + v140 + Unicode + true + Application false @@ -41,6 +56,14 @@ Unicode true + + Application + false + v140 + true + Unicode + true + Application true @@ -62,9 +85,15 @@ + + + + + + @@ -76,6 +105,10 @@ true $(IncludePath) + + true + $(IncludePath) + true @@ -83,6 +116,10 @@ false $(IncludePath) + + false + $(IncludePath) + false @@ -102,6 +139,26 @@ RequireAdministrator + + + + + Level3 + Disabled + WIN32;_DEBUG;_WINDOWS;HMODULE_MODE_EXE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + true + + + Windows + true + shlwapi.lib;version.lib;dwmapi.lib;winhttp.lib;Psapi.lib;advapi32.lib;gdi32.lib;comdlg32.lib;shell32.lib;ole32.lib;%(AdditionalDependencies) + RequireAdministrator + + + false + comsupp.lib + + @@ -136,6 +193,29 @@ RequireAdministrator + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_WINDOWS;HMODULE_MODE_EXE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + shlwapi.lib;version.lib;dwmapi.lib;winhttp.lib;Psapi.lib;advapi32.lib;gdi32.lib;comdlg32.lib;shell32.lib;ole32.lib;%(AdditionalDependencies) + RequireAdministrator + + + false + + Level3 diff --git a/shortcut/main.cpp b/shortcut/main.cpp index af626fa..5215f6a 100644 --- a/shortcut/main.cpp +++ b/shortcut/main.cpp @@ -1,3 +1,8 @@ +#ifdef _M_ARM +#define _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 1 +#endif + + #include #include #include diff --git a/shortcut/shortcut.vcxproj b/shortcut/shortcut.vcxproj index a764b91..bae856f 100644 --- a/shortcut/shortcut.vcxproj +++ b/shortcut/shortcut.vcxproj @@ -1,10 +1,18 @@  + + Debug + ARM + Debug Win32 + + Release + ARM + Release Win32 @@ -31,6 +39,12 @@ v140 Unicode + + Application + true + v140 + Unicode + Application false @@ -38,6 +52,13 @@ true Unicode + + Application + false + v140 + true + Unicode + Application true @@ -59,9 +80,15 @@ + + + + + + @@ -72,12 +99,18 @@ true + + true + true false + + false + false @@ -97,6 +130,22 @@ RequireAdministrator + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + $(OutDir)notice.lib;%(AdditionalDependencies) + RequireAdministrator + + @@ -131,6 +180,26 @@ RequireAdministrator + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + $(OutDir)notice.lib;%(AdditionalDependencies) + RequireAdministrator + + Level3 From ccf6cfd66ce8e0acdd92423cdf147b3447cf0c77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B0=E7=B3=96XH?= <76904365+bingtangxh@users.noreply.github.com> Date: Thu, 26 Mar 2026 13:58:29 +0800 Subject: [PATCH 02/11] Remove useless pugixml_arm --- AppInstallerReset.sln | 12 +- pugixml_arm/framework.h | 3 - pugixml_arm/pch.cpp | 5 - pugixml_arm/pch.h | 13 -- pugixml_arm/pugixml_arm.cpp | 10 -- pugixml_arm/pugixml_arm.vcxproj | 207 ------------------------ pugixml_arm/pugixml_arm.vcxproj.filters | 25 --- 7 files changed, 4 insertions(+), 271 deletions(-) delete mode 100644 pugixml_arm/framework.h delete mode 100644 pugixml_arm/pch.cpp delete mode 100644 pugixml_arm/pch.h delete mode 100644 pugixml_arm/pugixml_arm.cpp delete mode 100644 pugixml_arm/pugixml_arm.vcxproj delete mode 100644 pugixml_arm/pugixml_arm.vcxproj.filters diff --git a/AppInstallerReset.sln b/AppInstallerReset.sln index 4d0665d..d9f8a2d 100644 --- a/AppInstallerReset.sln +++ b/AppInstallerReset.sln @@ -249,16 +249,12 @@ Global {F0288B24-7B84-42A5-9A92-2E16A012E4DE}.Release|ARM.Build.0 = Release|Any CPU {F0288B24-7B84-42A5-9A92-2E16A012E4DE}.Release|x86.ActiveCfg = Release|Any CPU {F0288B24-7B84-42A5-9A92-2E16A012E4DE}.Release|x86.Build.0 = Release|Any CPU - {26B3C19D-6182-4DB5-8B69-EE098A0FD3BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {26B3C19D-6182-4DB5-8B69-EE098A0FD3BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {26B3C19D-6182-4DB5-8B69-EE098A0FD3BB}.Debug|x64.ActiveCfg = Debug|Any CPU - {26B3C19D-6182-4DB5-8B69-EE098A0FD3BB}.Debug|x64.Build.0 = Debug|Any CPU + {26B3C19D-6182-4DB5-8B69-EE098A0FD3BB}.Debug|ARM.ActiveCfg = Debug|Any CPU + {26B3C19D-6182-4DB5-8B69-EE098A0FD3BB}.Debug|ARM.Build.0 = Debug|Any CPU {26B3C19D-6182-4DB5-8B69-EE098A0FD3BB}.Debug|x86.ActiveCfg = Debug|Any CPU {26B3C19D-6182-4DB5-8B69-EE098A0FD3BB}.Debug|x86.Build.0 = Debug|Any CPU - {26B3C19D-6182-4DB5-8B69-EE098A0FD3BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {26B3C19D-6182-4DB5-8B69-EE098A0FD3BB}.Release|Any CPU.Build.0 = Release|Any CPU - {26B3C19D-6182-4DB5-8B69-EE098A0FD3BB}.Release|x64.ActiveCfg = Release|Any CPU - {26B3C19D-6182-4DB5-8B69-EE098A0FD3BB}.Release|x64.Build.0 = Release|Any CPU + {26B3C19D-6182-4DB5-8B69-EE098A0FD3BB}.Release|ARM.ActiveCfg = Release|Any CPU + {26B3C19D-6182-4DB5-8B69-EE098A0FD3BB}.Release|ARM.Build.0 = Release|Any CPU {26B3C19D-6182-4DB5-8B69-EE098A0FD3BB}.Release|x86.ActiveCfg = Release|Any CPU {26B3C19D-6182-4DB5-8B69-EE098A0FD3BB}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection diff --git a/pugixml_arm/framework.h b/pugixml_arm/framework.h deleted file mode 100644 index d2d95bd..0000000 --- a/pugixml_arm/framework.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#define WIN32_LEAN_AND_MEAN // 从 Windows 头文件中排除极少使用的内容 diff --git a/pugixml_arm/pch.cpp b/pugixml_arm/pch.cpp deleted file mode 100644 index b6fb8f4..0000000 --- a/pugixml_arm/pch.cpp +++ /dev/null @@ -1,5 +0,0 @@ -// pch.cpp: 与预编译标头对应的源文件 - -#include "pch.h" - -// 当使用预编译的头时，需要使用此源文件，编译才能成功。 diff --git a/pugixml_arm/pch.h b/pugixml_arm/pch.h deleted file mode 100644 index 9660927..0000000 --- a/pugixml_arm/pch.h +++ /dev/null @@ -1,13 +0,0 @@ -// pch.h: 这是预编译标头文件。 -// 下方列出的文件仅编译一次，提高了将来生成的生成性能。 -// 这还将影响 IntelliSense 性能，包括代码完成和许多代码浏览功能。 -// 但是，如果此处列出的文件中的任何一个在生成之间有更新，它们全部都将被重新编译。 -// 请勿在此处添加要频繁更新的文件，这将使得性能优势无效。 - -#ifndef PCH_H -#define PCH_H - -// 添加要在此处预编译的标头 -#include "framework.h" - -#endif //PCH_H diff --git a/pugixml_arm/pugixml_arm.cpp b/pugixml_arm/pugixml_arm.cpp deleted file mode 100644 index b5ffc6c..0000000 --- a/pugixml_arm/pugixml_arm.cpp +++ /dev/null @@ -1,10 +0,0 @@ -// pugixml_arm.cpp : 定义静态库的函数。 -// - -#include "pch.h" -#include "framework.h" - -// TODO: 这是一个库函数示例 -void fnpugixmlarm() -{ -} diff --git a/pugixml_arm/pugixml_arm.vcxproj b/pugixml_arm/pugixml_arm.vcxproj deleted file mode 100644 index 924da89..0000000 --- a/pugixml_arm/pugixml_arm.vcxproj +++ /dev/null @@ -1,207 +0,0 @@ - - - - - Debug - ARM - - - Debug - Win32 - - - Release - ARM - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 17.0 - Win32Proj - {d764f74d-4c42-4a49-a4cd-212c630f02a8} - pugixmlarm - 10.0.22621.0 - pugixml - - - - StaticLibrary - true - v143 - Unicode - - - StaticLibrary - true - v140 - Unicode - - - StaticLibrary - false - v143 - true - Unicode - - - StaticLibrary - false - v140 - true - Unicode - - - StaticLibrary - true - v143 - Unicode - - - StaticLibrary - false - v143 - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - .lib - - - - Level3 - true - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - NotUsing - pch.h - - - - - true - - - - - Level3 - true - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - NotUsing - pch.h - - - - - true - - - - - Level3 - true - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - NotUsing - pch.h - - - - - true - - - - - Level3 - true - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - NotUsing - pch.h - - - - - true - - - - - Level3 - true - _DEBUG;_LIB;%(PreprocessorDefinitions) - true - NotUsing - pch.h - - - - - true - - - - - Level3 - true - true - true - NDEBUG;_LIB;%(PreprocessorDefinitions) - true - NotUsing - pch.h - - - - - true - - - - - - - - - - \ No newline at end of file diff --git a/pugixml_arm/pugixml_arm.vcxproj.filters b/pugixml_arm/pugixml_arm.vcxproj.filters deleted file mode 100644 index 284ff26..0000000 --- a/pugixml_arm/pugixml_arm.vcxproj.filters +++ /dev/null @@ -1,25 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - 头文件 - - - 头文件 - - - \ No newline at end of file From 2e45bb1cd9896b65d50ec02bc1ed05c5d630e330 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B0=E7=B3=96XH?= <76904365+bingtangxh@users.noreply.github.com> Date: Thu, 26 Mar 2026 14:27:03 +0800 Subject: [PATCH 03/11] Add symlink notes and fix pugixml path Add notes/symlinks.md documenting required symbolic links for the appinstaller and shared directories, plus guidance for creating symlinks in Debug/Release and including shared subdirs in releases. Update pkgread project and its filters to use a relative path for pugixml.cpp (..\packages\pugixml.1.15.0\...) instead of an absolute user-specific NuGet path so the project is portable and includes pugixml.cpp needed to resolve linker errors for non-x86 builds (e.g. ARM). --- notes/symlinks.md | 50 +++++++++++++++++++++++++++++++++ pkgread/pkgread.vcxproj | 2 +- pkgread/pkgread.vcxproj.filters | 2 +- 3 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 notes/symlinks.md diff --git a/notes/symlinks.md b/notes/symlinks.md new file mode 100644 index 0000000..9197a56 --- /dev/null +++ b/notes/symlinks.md @@ -0,0 +1,50 @@ +# 关于该项目中的一些符号链接 + +该项目由于原作者开发方便，使用了一些符号链接。在迁移时会遇到问题。 + +符号链接主要是位于 \appinstaller 目录中。 + +使用了符号链接的文件有： + +- certmgr.h +- notice.h +- pkgmgr.h +- pkgread.h +- priformatcli.h + +以上文件分别指向的是 `..\\.h` 。 + +# 一些最终运行所需文件位于 shared 目录 + +此外，在生成完成后，最终生成的程序需要一些文件，但是这些文件位于的是解决方案的 `shared` 目录。 + +因此，你在测试时，需要将 `shared` 目录中的每一个子目录都在输出目录下（`Debug`和`Release`）创建一个目录符号链接 (`SYMLINKD`)，指向 `..\shared\<子目录>` 。 + +例如： + +``` for /d %A in (D:\GitHub\App-Installer-For-Windows-8.x-Reset\shared\*) do @mklink /d "D:\GitHub\App-Installer-For-Windows-8.x-Reset\Debug\%~nA" "%A" ``` + +``` for /d %A in (D:\GitHub\App-Installer-For-Windows-8.x-Reset\shared\*) do @mklink /d "D:\GitHub\App-Installer-For-Windows-8.x-Reset\Release\%~nA" "%A" ``` + +最终发布时，你也需要将 `shared` 目录中的每一个子目录都复制到发布目录，再打包发布。 + +# pkgread 项目需要引用 pugixml.cpp + +最后，pkgread 项目有一个 `pugixml.cpp` 的引用。 +如果没有这个的话，链接器会报错 LNK2019 无法解析的外部符号： + +- `pugi::xml_document::load_file` +- `pugi::as_utf8_` +- `pugi::as_wide_` + +和 LNK1120 n 个无法解析的外部命令。 + +因为这个解决方案需要一个 NuGet 包叫 `pugixml` ， +但是这个包默认只有 x86 和 x64 的版本，因此为了编译出 ARM32 版本，我就把 pugixml.cpp 在 pkgread 项目中加了一个引用。 + +迁移之后，你应该需要重新添加这个“现有项”的引用。 + +路径示例： + +```D:\GitHub\App-Installer-For-Windows-8.x-Reset\packages\pugixml.1.15.0\build\native\include\pugixml.cpp``` + diff --git a/pkgread/pkgread.vcxproj b/pkgread/pkgread.vcxproj index d89f598..381593e 100644 --- a/pkgread/pkgread.vcxproj +++ b/pkgread/pkgread.vcxproj @@ -249,7 +249,7 @@ - + false false diff --git a/pkgread/pkgread.vcxproj.filters b/pkgread/pkgread.vcxproj.filters index 73cc715..8be6062 100644 --- a/pkgread/pkgread.vcxproj.filters +++ b/pkgread/pkgread.vcxproj.filters @@ -89,7 +89,7 @@ 源文件 - + 源文件 From fe6a9a186b578b15684938dafdc22974ef5b0c42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B0=E7=B3=96XH?= <76904365+bingtangxh@users.noreply.github.com> Date: Thu, 26 Mar 2026 14:46:26 +0800 Subject: [PATCH 04/11] Enable ARM desktop SDK macro in projects Add _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 to PreprocessorDefinitions in multiple .vcxproj files so ARM desktop SDK partition is available at project level. Remove per-file #ifdef _M_ARM defines from several headers and source files (Stdafx.h, targetver.h, main.cpp across various modules) to avoid duplication. Also add ShowIncludes=false in pkgread.vcxproj. This centralizes the ARM macro for consistent ARM builds across modules. --- IEHelper/IEHelper.vcxproj | 4 ++-- IEHelper/Stdafx.h | 4 ---- README.md | 2 +- appinstaller/appinstaller.vcxproj | 4 ++-- appinstaller/main.cpp | 4 ---- certmgr/certmgr.vcxproj | 4 ++-- certmgr/stdafx.h | 3 --- desktopini/desktopini.vcxproj | 4 ++-- desktopini/main.cpp | 4 ---- notice/notice.vcxproj | 4 ++-- notice/targetver.h | 4 ---- pkgmgr/pkgmgr.vcxproj | 4 ++-- pkgmgr/targetver.h | 4 ---- pkgread/pkgread.vcxproj | 5 +++-- pkgread/targetver.h | 4 ---- priformatcli/priformatcli.vcxproj | 4 ++-- priformatcli/targetver.h | 4 ---- reslib/reslib.vcxproj | 4 ++-- reslib/targetver.h | 4 ---- settings/main.cpp | 4 ---- settings/settings.vcxproj | 4 ++-- shortcut/main.cpp | 5 ----- shortcut/shortcut.vcxproj | 4 ++-- 23 files changed, 24 insertions(+), 67 deletions(-) diff --git a/IEHelper/IEHelper.vcxproj b/IEHelper/IEHelper.vcxproj index 16ebf92..db781ed 100644 --- a/IEHelper/IEHelper.vcxproj +++ b/IEHelper/IEHelper.vcxproj @@ -133,7 +133,7 @@ Level3 Disabled - WIN32;_DEBUG;%(PreprocessorDefinitions) + WIN32;_DEBUG;%(PreprocessorDefinitions);_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 Use @@ -165,7 +165,7 @@ Level3 - WIN32;NDEBUG;%(PreprocessorDefinitions) + WIN32;NDEBUG;%(PreprocessorDefinitions);_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 Use diff --git a/IEHelper/Stdafx.h b/IEHelper/Stdafx.h index 950f8a2..9aff0fd 100644 --- a/IEHelper/Stdafx.h +++ b/IEHelper/Stdafx.h @@ -4,10 +4,6 @@ #pragma once -#ifdef _M_ARM -#define _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 1 -#endif - #include #include #include \ No newline at end of file diff --git a/README.md b/README.md index 2082711..4d60f76 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@

Note: There is no official release yet, but the test version still does not have the Pre-released label; this is for testing upgrade functionality. Once the official release is complete, previous versions will be marked as Pre-released.

Attention

    -
  • This program is an x86 program, not an ARM application, not cross-platform, and cannot be used on Windows RT.
    • +
  • This program is an x86 program, not an ARM application, not cross-platform, and cannot be used on Windows RT.
  • This program uses some third-party libraries and other Github projects, and is completed using AI (ChatGTP). This project can be used for learning and communication purposes.
  • (Important) Internet Explorer must support TLS 1.2 (requiring the use of IE's XMLHttpRequest to retrieve update information), especially IE10. You can do this by opening the "Advanced" tab in Control Panel/Internet Explorer's "Internet Options," finding "Use TLS 1.2" and checking the box, then clicking "OK" and saving. The settings will take effect the next time you open the browser.
    屏幕截图 2025-12-08 103450
diff --git a/appinstaller/appinstaller.vcxproj b/appinstaller/appinstaller.vcxproj index 8cc6e8a..40f0412 100644 --- a/appinstaller/appinstaller.vcxproj +++ b/appinstaller/appinstaller.vcxproj @@ -143,7 +143,7 @@ Level3 Disabled - WIN32;_DEBUG;_WINDOWS;HMODULE_MODE_EXE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;HMODULE_MODE_EXE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions);_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 true MultiThreadedDebugDLL true @@ -204,7 +204,7 @@ MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;HMODULE_MODE_EXE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;HMODULE_MODE_EXE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions);_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 true diff --git a/appinstaller/main.cpp b/appinstaller/main.cpp index 9754f27..0bf901f 100644 --- a/appinstaller/main.cpp +++ b/appinstaller/main.cpp @@ -1,7 +1,3 @@ -#ifdef _M_ARM -#define _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 1 -#endif - #include #include #include diff --git a/certmgr/certmgr.vcxproj b/certmgr/certmgr.vcxproj index 0f1a325..5a2b6e9 100644 --- a/certmgr/certmgr.vcxproj +++ b/certmgr/certmgr.vcxproj @@ -133,7 +133,7 @@ Use Level3 Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;CERTMGR_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;CERTMGR_EXPORTS;%(PreprocessorDefinitions);_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 true @@ -180,7 +180,7 @@ MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;_USRDLL;CERTMGR_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;CERTMGR_EXPORTS;%(PreprocessorDefinitions);_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 true diff --git a/certmgr/stdafx.h b/certmgr/stdafx.h index 6b7194f..43c45a2 100644 --- a/certmgr/stdafx.h +++ b/certmgr/stdafx.h @@ -4,9 +4,6 @@ // #pragma once -#ifdef _M_ARM -#define _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 1 -#endif #include "targetver.h" diff --git a/desktopini/desktopini.vcxproj b/desktopini/desktopini.vcxproj index 1cb729c..ca299d3 100644 --- a/desktopini/desktopini.vcxproj +++ b/desktopini/desktopini.vcxproj @@ -136,7 +136,7 @@ Level3 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 true @@ -188,7 +188,7 @@ MaxSpeed true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 true diff --git a/desktopini/main.cpp b/desktopini/main.cpp index 823f638..5b915e2 100644 --- a/desktopini/main.cpp +++ b/desktopini/main.cpp @@ -1,10 +1,6 @@ #define _CRT_SECURE_NO_WARNINGS #define HMODULE_MODE_EXE -#ifdef _M_ARM -#define _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 1 -#endif - #include #include #include diff --git a/notice/notice.vcxproj b/notice/notice.vcxproj index e8e3024..ecdca30 100644 --- a/notice/notice.vcxproj +++ b/notice/notice.vcxproj @@ -104,7 +104,7 @@ Level3 Disabled /ZW:nostdlib /FUplatform.winmd /FUwindows.winmd %(AdditionalOptions) - WIN32;_DEBUG;_WINDOWS;_USRDLL;NOTICE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;NOTICE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions);_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 true false @@ -142,7 +142,7 @@ true true /ZW:nostdlib /FUplatform.winmd /FUWindows.winmd %(AdditionalOptions) - WIN32;NDEBUG;_WINDOWS;_USRDLL;NOTICE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;NOTICE_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions);_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 true diff --git a/notice/targetver.h b/notice/targetver.h index 332d020..416cebf 100644 --- a/notice/targetver.h +++ b/notice/targetver.h @@ -5,8 +5,4 @@ // ҪΪǰ Windows ƽ̨Ӧó WinSDKVer.h // _WIN32_WINNT ΪҪֵ֧ƽ̨Ȼٰ SDKDDKVer.h -#ifdef _M_ARM -#define _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 1 -#endif - #include diff --git a/pkgmgr/pkgmgr.vcxproj b/pkgmgr/pkgmgr.vcxproj index c437c8c..e995260 100644 --- a/pkgmgr/pkgmgr.vcxproj +++ b/pkgmgr/pkgmgr.vcxproj @@ -103,7 +103,7 @@ Level3 Disabled /ZW:nostdlib /FUplatform.winmd /FUwindows.winmd %(AdditionalOptions) - WIN32;_DEBUG;_WINDOWS;_USRDLL;PKGMGR_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;PKGMGR_EXPORTS;%(PreprocessorDefinitions);_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 true false @@ -142,7 +142,7 @@ true true /ZW:nostdlib /FUplatform.winmd /FUWindows.winmd %(AdditionalOptions) - WIN32;NDEBUG;_WINDOWS;_USRDLL;PKGMGR_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;PKGMGR_EXPORTS;%(PreprocessorDefinitions);_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 true diff --git a/pkgmgr/targetver.h b/pkgmgr/targetver.h index 332d020..416cebf 100644 --- a/pkgmgr/targetver.h +++ b/pkgmgr/targetver.h @@ -5,8 +5,4 @@ // ҪΪǰ Windows ƽ̨Ӧó WinSDKVer.h // _WIN32_WINNT ΪҪֵ֧ƽ̨Ȼٰ SDKDDKVer.h -#ifdef _M_ARM -#define _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 1 -#endif - #include diff --git a/pkgread/pkgread.vcxproj b/pkgread/pkgread.vcxproj index 381593e..50b73c5 100644 --- a/pkgread/pkgread.vcxproj +++ b/pkgread/pkgread.vcxproj @@ -134,13 +134,14 @@ NotUsing Level3 Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;PKGREAD_EXPORTS;HMODULE_MODE_DLL1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;PKGREAD_EXPORTS;HMODULE_MODE_DLL1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions);_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 true D:\GitHub\App-Installer-For-Windows-8.x-Reset\packages\pugixml.1.15.0\build\native\include\ ProgramDatabase false false Default + false Windows @@ -192,7 +193,7 @@ MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;_USRDLL;PKGREAD_EXPORTS;HMODULE_MODE_DLL1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;PKGREAD_EXPORTS;HMODULE_MODE_DLL1;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions);_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 true D:\GitHub\App-Installer-For-Windows-8.x-Reset\packages\pugixml.1.15.0\build\native\include\ diff --git a/pkgread/targetver.h b/pkgread/targetver.h index 332d020..416cebf 100644 --- a/pkgread/targetver.h +++ b/pkgread/targetver.h @@ -5,8 +5,4 @@ // ҪΪǰ Windows ƽ̨Ӧó WinSDKVer.h // _WIN32_WINNT ΪҪֵ֧ƽ̨Ȼٰ SDKDDKVer.h -#ifdef _M_ARM -#define _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 1 -#endif - #include diff --git a/priformatcli/priformatcli.vcxproj b/priformatcli/priformatcli.vcxproj index e24c80c..4f8bbaa 100644 --- a/priformatcli/priformatcli.vcxproj +++ b/priformatcli/priformatcli.vcxproj @@ -139,7 +139,7 @@ Level3 Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;PRIFORMATCLI_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;PRIFORMATCLI_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions);_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 true @@ -190,7 +190,7 @@ MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;_USRDLL;PRIFORMATCLI_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;PRIFORMATCLI_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions);_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 true diff --git a/priformatcli/targetver.h b/priformatcli/targetver.h index 332d020..416cebf 100644 --- a/priformatcli/targetver.h +++ b/priformatcli/targetver.h @@ -5,8 +5,4 @@ // ҪΪǰ Windows ƽ̨Ӧó WinSDKVer.h // _WIN32_WINNT ΪҪֵ֧ƽ̨Ȼٰ SDKDDKVer.h -#ifdef _M_ARM -#define _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 1 -#endif - #include diff --git a/reslib/reslib.vcxproj b/reslib/reslib.vcxproj index 3a94c4b..3ccd9c5 100644 --- a/reslib/reslib.vcxproj +++ b/reslib/reslib.vcxproj @@ -132,7 +132,7 @@ Use Level3 Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;RESLIB_EXPORTS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;RESLIB_EXPORTS;%(PreprocessorDefinitions);_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 true @@ -177,7 +177,7 @@ MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;_USRDLL;RESLIB_EXPORTS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;RESLIB_EXPORTS;%(PreprocessorDefinitions);_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 true diff --git a/reslib/targetver.h b/reslib/targetver.h index 332d020..416cebf 100644 --- a/reslib/targetver.h +++ b/reslib/targetver.h @@ -5,8 +5,4 @@ // ҪΪǰ Windows ƽ̨Ӧó WinSDKVer.h // _WIN32_WINNT ΪҪֵ֧ƽ̨Ȼٰ SDKDDKVer.h -#ifdef _M_ARM -#define _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 1 -#endif - #include diff --git a/settings/main.cpp b/settings/main.cpp index 7d2786b..a64d494 100644 --- a/settings/main.cpp +++ b/settings/main.cpp @@ -1,7 +1,3 @@ -#ifdef _M_ARM -#define _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 1 -#endif - #include #include #include diff --git a/settings/settings.vcxproj b/settings/settings.vcxproj index 7cf5832..dde70b0 100644 --- a/settings/settings.vcxproj +++ b/settings/settings.vcxproj @@ -145,7 +145,7 @@ Level3 Disabled - WIN32;_DEBUG;_WINDOWS;HMODULE_MODE_EXE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;HMODULE_MODE_EXE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions);_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 true @@ -201,7 +201,7 @@ MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;HMODULE_MODE_EXE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;HMODULE_MODE_EXE;_CRT_SECURE_NO_WARNINGS;_CRT_NON_CONFORMING_SWPRINTFS;%(PreprocessorDefinitions);_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 true diff --git a/shortcut/main.cpp b/shortcut/main.cpp index 5215f6a..af626fa 100644 --- a/shortcut/main.cpp +++ b/shortcut/main.cpp @@ -1,8 +1,3 @@ -#ifdef _M_ARM -#define _ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 1 -#endif - - #include #include #include diff --git a/shortcut/shortcut.vcxproj b/shortcut/shortcut.vcxproj index bae856f..8cf9a70 100644 --- a/shortcut/shortcut.vcxproj +++ b/shortcut/shortcut.vcxproj @@ -136,7 +136,7 @@ Level3 Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 true @@ -188,7 +188,7 @@ MaxSpeed true true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 true From b2633b37e53f5686527a65b07dc9b1e3673843cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B0=E7=B3=96XH?= <76904365+bingtangxh@users.noreply.github.com> Date: Thu, 26 Mar 2026 15:46:37 +0800 Subject: [PATCH 05/11] Add pugixml project and reference Add a new pugixml static library project and include it in the solution to support ARM builds. pkgread now references the new pugixml project (removed direct pugixml file/includes) and its Release|ARM PrecompiledHeader is set to NotUsing. Update solution configurations to include pugixml and add appropriate build platform mappings. Update notes/symlinks.md with instructions for the new project and manual copying of generated pugixml.lib; also clear an AdditionalLibraryDirectories entry in priformatcli. --- AppInstallerReset.sln | 17 +++- notes/symlinks.md | 36 ++++++-- pkgread/pkgread.vcxproj | 10 +- pkgread/pkgread.vcxproj.filters | 9 -- priformatcli/priformatcli.vcxproj | 3 +- pugixml/pugixml.vcxproj | 147 ++++++++++++++++++++++++++++++ pugixml/pugixml.vcxproj.filters | 30 ++++++ 7 files changed, 229 insertions(+), 23 deletions(-) create mode 100644 pugixml/pugixml.vcxproj create mode 100644 pugixml/pugixml.vcxproj.filters diff --git a/AppInstallerReset.sln b/AppInstallerReset.sln index d9f8a2d..792d8e0 100644 --- a/AppInstallerReset.sln +++ b/AppInstallerReset.sln @@ -15,10 +15,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "certmgr", "certmgr\certmgr. EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appinstaller", "appinstaller\appinstaller.vcxproj", "{F0C84812-0CDF-4AA0-A0F8-F37AC833F39B}" ProjectSection(ProjectDependencies) = postProject - {8EAC0230-4990-4E41-8E0F-D641D1561396} = {8EAC0230-4990-4E41-8E0F-D641D1561396} {33D91B58-1981-4A3C-B4D1-86EE406CDE12} = {33D91B58-1981-4A3C-B4D1-86EE406CDE12} - {A7753282-AA16-43D9-8ACA-7065239DD702} = {A7753282-AA16-43D9-8ACA-7065239DD702} {798ED492-EECE-457D-8FD8-129DA93CE126} = {798ED492-EECE-457D-8FD8-129DA93CE126} + {8EAC0230-4990-4E41-8E0F-D641D1561396} = {8EAC0230-4990-4E41-8E0F-D641D1561396} + {A7753282-AA16-43D9-8ACA-7065239DD702} = {A7753282-AA16-43D9-8ACA-7065239DD702} + {B1DF139F-CEF1-404F-8255-31EF4BF0EC4C} = {B1DF139F-CEF1-404F-8255-31EF4BF0EC4C} {E04CCAB9-35DB-495C-A279-5B483C707CD0} = {E04CCAB9-35DB-495C-A279-5B483C707CD0} {EF4012D4-EF08-499C-B803-177739350B2D} = {EF4012D4-EF08-499C-B803-177739350B2D} EndProjectSection @@ -26,6 +27,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "settings", "settings\settings.vcxproj", "{AD25497F-A15F-4DFF-AC7A-B8ABF5F411D6}" ProjectSection(ProjectDependencies) = postProject {3AE2A022-ED83-41F1-948A-12A7593CBD00} = {3AE2A022-ED83-41F1-948A-12A7593CBD00} + {B1DF139F-CEF1-404F-8255-31EF4BF0EC4C} = {B1DF139F-CEF1-404F-8255-31EF4BF0EC4C} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "reslib", "reslib\reslib.vcxproj", "{3AE2A022-ED83-41F1-948A-12A7593CBD00}" @@ -48,8 +50,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PrivateInit", "PrivateInit\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AppxPackage", "AppxPackage\AppxPackage.csproj", "{BD681A4F-EB60-4BB8-90B5-65968FC7DA59}" ProjectSection(ProjectDependencies) = postProject - {8EAC0230-4990-4E41-8E0F-D641D1561396} = {8EAC0230-4990-4E41-8E0F-D641D1561396} {33D91B58-1981-4A3C-B4D1-86EE406CDE12} = {33D91B58-1981-4A3C-B4D1-86EE406CDE12} + {8EAC0230-4990-4E41-8E0F-D641D1561396} = {8EAC0230-4990-4E41-8E0F-D641D1561396} {A7753282-AA16-43D9-8ACA-7065239DD702} = {A7753282-AA16-43D9-8ACA-7065239DD702} {EF4012D4-EF08-499C-B803-177739350B2D} = {EF4012D4-EF08-499C-B803-177739350B2D} EndProjectSection @@ -73,6 +75,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Launch", "Launch\Launch.csp EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Reader", "Reader\Reader.csproj", "{26B3C19D-6182-4DB5-8B69-EE098A0FD3BB}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pugixml", "pugixml\pugixml.vcxproj", "{B1DF139F-CEF1-404F-8255-31EF4BF0EC4C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM @@ -257,6 +261,13 @@ Global {26B3C19D-6182-4DB5-8B69-EE098A0FD3BB}.Release|ARM.Build.0 = Release|Any CPU {26B3C19D-6182-4DB5-8B69-EE098A0FD3BB}.Release|x86.ActiveCfg = Release|Any CPU {26B3C19D-6182-4DB5-8B69-EE098A0FD3BB}.Release|x86.Build.0 = Release|Any CPU + {B1DF139F-CEF1-404F-8255-31EF4BF0EC4C}.Debug|ARM.ActiveCfg = Debug|ARM + {B1DF139F-CEF1-404F-8255-31EF4BF0EC4C}.Debug|ARM.Build.0 = Debug|ARM + {B1DF139F-CEF1-404F-8255-31EF4BF0EC4C}.Debug|x86.ActiveCfg = Debug|Win32 + {B1DF139F-CEF1-404F-8255-31EF4BF0EC4C}.Debug|x86.Build.0 = Debug|Win32 + {B1DF139F-CEF1-404F-8255-31EF4BF0EC4C}.Release|ARM.ActiveCfg = Release|ARM + {B1DF139F-CEF1-404F-8255-31EF4BF0EC4C}.Release|x86.ActiveCfg = Release|Win32 + {B1DF139F-CEF1-404F-8255-31EF4BF0EC4C}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/notes/symlinks.md b/notes/symlinks.md index 9197a56..244a71f 100644 --- a/notes/symlinks.md +++ b/notes/symlinks.md @@ -28,23 +28,47 @@ 最终发布时，你也需要将 `shared` 目录中的每一个子目录都复制到发布目录，再打包发布。 -# pkgread 项目需要引用 pugixml.cpp +# pkgread 项目需要引用 pugixml 代码文件 + +最后，pkgread 项目引用了我新建的一个叫 pugixml 的项目，包含如下文件： + +- `pugixml.cpp` +- `pugixml.hpp` +- `pugiconfig.hpp` -最后，pkgread 项目有一个 `pugixml.cpp` 的引用。 如果没有这个的话，链接器会报错 LNK2019 无法解析的外部符号： - `pugi::xml_document::load_file` -- `pugi::as_utf8_` -- `pugi::as_wide_` +- `pugi::as_utf8` +- `pugi::as_wide` 和 LNK1120 n 个无法解析的外部命令。 因为这个解决方案需要一个 NuGet 包叫 `pugixml` ， -但是这个包默认只有 x86 和 x64 的版本，因此为了编译出 ARM32 版本，我就把 pugixml.cpp 在 pkgread 项目中加了一个引用。 +但是这个包默认只有 x86 和 x64 的版本，因此为了编译出 ARM32 版本，我就把 pugixml.cpp 等文件单开了一个项目。 -迁移之后，你应该需要重新添加这个“现有项”的引用。 +迁移之后，你应该需要在 pugixml 项目中重新添加这几个“现有项”的引用。 路径示例： ```D:\GitHub\App-Installer-For-Windows-8.x-Reset\packages\pugixml.1.15.0\build\native\include\pugixml.cpp``` +我的做法是在整个解决方案中添加了一个新的项目 `pugixml`，这个项目的唯一作用就是编译 pugixml.cpp 生成 pugixml.lib 。 + +暂时还需要手动将 Debug 和 Release 版本的 pugixml.lib 从生成的路径分别复制到项目生成时所引用的 Debug 和 Release 目录下，才能成功链接。 + +例如： + +生成的目标路径： + +```D:\GitHub\App-Installer-For-Windows-8.x-Reset\ARM\Debug\pugixml.lib``` + +```D:\GitHub\App-Installer-For-Windows-8.x-Reset\ARM\Release\pugixml.lib``` + + +你需要复制到的路径： + +```D:\GitHub\App-Installer-For-Windows-8.x-Reset\packages\pugixml.1.15.0\build\native\lib\ARM\v140\dynamic\Debug\pugixml.lib``` + +```D:\GitHub\App-Installer-For-Windows-8.x-Reset\packages\pugixml.1.15.0\build\native\lib\ARM\v140\dynamic\Release\pugixml.lib``` + diff --git a/pkgread/pkgread.vcxproj b/pkgread/pkgread.vcxproj index 50b73c5..4643448 100644 --- a/pkgread/pkgread.vcxproj +++ b/pkgread/pkgread.vcxproj @@ -189,7 +189,7 @@ Level3 - Use + NotUsing MaxSpeed true true @@ -228,8 +228,6 @@ - - @@ -250,7 +248,6 @@ - false false @@ -287,6 +284,11 @@ + + + {b1df139f-cef1-404f-8255-31ef4bf0ec4c} + + diff --git a/pkgread/pkgread.vcxproj.filters b/pkgread/pkgread.vcxproj.filters index 8be6062..e061920 100644 --- a/pkgread/pkgread.vcxproj.filters +++ b/pkgread/pkgread.vcxproj.filters @@ -72,12 +72,6 @@ 头文件 - - 头文件 - - - 头文件 - @@ -89,9 +83,6 @@ 源文件 - - 源文件 - diff --git a/priformatcli/priformatcli.vcxproj b/priformatcli/priformatcli.vcxproj index 4f8bbaa..4d30602 100644 --- a/priformatcli/priformatcli.vcxproj +++ b/priformatcli/priformatcli.vcxproj @@ -198,7 +198,8 @@ true true true - D:\GitHub\App-Installer-For-Windows-8.x-Reset\ARM\$(Configuration);C:\Program Files (x86)\Windows Kits\8.1\Lib\winv6.3\um\arm + + shlwapi.lib;version.lib;dwmapi.lib;winhttp.lib;Psapi.lib;advapi32.lib;gdi32.lib;comdlg32.lib;shell32.lib;ole32.lib;%(AdditionalDependencies) diff --git a/pugixml/pugixml.vcxproj b/pugixml/pugixml.vcxproj new file mode 100644 index 0000000..6f980fe --- /dev/null +++ b/pugixml/pugixml.vcxproj @@ -0,0 +1,147 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Release + ARM + + + Release + Win32 + + + + + + + + + + + 17.0 + Win32Proj + {b1df139f-cef1-404f-8255-31ef4bf0ec4c} + pugixml + 8.1 + + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + true + v140 + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + StaticLibrary + false + v140 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + Level3 + true + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + NotUsing + pch.h + + + + + true + + + + + Level3 + true + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions);_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 + true + NotUsing + pch.h + + + + + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + true + NotUsing + pch.h + + + + + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions);_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1 + true + NotUsing + pch.h + + + + + true + + + + + + \ No newline at end of file diff --git a/pugixml/pugixml.vcxproj.filters b/pugixml/pugixml.vcxproj.filters new file mode 100644 index 0000000..c132240 --- /dev/null +++ b/pugixml/pugixml.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + 头文件 + + + 头文件 + + + + + 源文件 + + + \ No newline at end of file From a472ddba737dd7f962d68f0938a35c16e88ce928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B0=E7=B3=96XH?= <76904365+bingtangxh@users.noreply.github.com> Date: Thu, 26 Mar 2026 20:11:24 +0800 Subject: [PATCH 06/11] Set PlatformTarget to AnyCPU and add publish Change PlatformTarget from x86 to AnyCPU across solution and projects (Launch, Manager, ModernNotice, Reader) so builds target AnyCPU. Add ClickOnce/publishing properties to Manager.csproj (PublishUrl, Install, Update settings, ApplicationVersion/Revision, BootstrapperEnabled, etc.) and include a BootstrapperPackage entry for .NET Framework 3.5 SP1. These changes prepare the projects for AnyCPU builds and configure Manager for deployment/publishing. --- AppInstallerReset.sln | 4 ++-- Launch/Launch.csproj | 2 +- Manager/Manager.csproj | 26 ++++++++++++++++++++++++-- ModernNotice/ModernNotice.csproj | 2 +- Reader/Reader.csproj | 2 +- 5 files changed, 29 insertions(+), 7 deletions(-) diff --git a/AppInstallerReset.sln b/AppInstallerReset.sln index 792d8e0..c5b7718 100644 --- a/AppInstallerReset.sln +++ b/AppInstallerReset.sln @@ -195,8 +195,8 @@ Global {BD681A4F-EB60-4BB8-90B5-65968FC7DA59}.Debug|x86.Build.0 = Debug|x86 {BD681A4F-EB60-4BB8-90B5-65968FC7DA59}.Release|ARM.ActiveCfg = Release|Any CPU {BD681A4F-EB60-4BB8-90B5-65968FC7DA59}.Release|ARM.Build.0 = Release|Any CPU - {BD681A4F-EB60-4BB8-90B5-65968FC7DA59}.Release|x86.ActiveCfg = Release|x86 - {BD681A4F-EB60-4BB8-90B5-65968FC7DA59}.Release|x86.Build.0 = Release|x86 + {BD681A4F-EB60-4BB8-90B5-65968FC7DA59}.Release|x86.ActiveCfg = Release|Any CPU + {BD681A4F-EB60-4BB8-90B5-65968FC7DA59}.Release|x86.Build.0 = Release|Any CPU {FFD3FD52-37A8-4F43-883C-DE8D996CB0E0}.Debug|ARM.ActiveCfg = Debug|Any CPU {FFD3FD52-37A8-4F43-883C-DE8D996CB0E0}.Debug|ARM.Build.0 = Debug|Any CPU {FFD3FD52-37A8-4F43-883C-DE8D996CB0E0}.Debug|x86.ActiveCfg = Debug|Any CPU diff --git a/Launch/Launch.csproj b/Launch/Launch.csproj index b9be413..bd8ba08 100644 --- a/Launch/Launch.csproj +++ b/Launch/Launch.csproj @@ -23,7 +23,7 @@ 4 - x86 + AnyCPU pdbonly true ..\Release\ diff --git a/Manager/Manager.csproj b/Manager/Manager.csproj index f97d0c5..4241a0b 100644 --- a/Manager/Manager.csproj +++ b/Manager/Manager.csproj @@ -11,9 +11,24 @@ Manager v4.0 512 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true - x86 + AnyCPU true full false @@ -23,7 +38,7 @@ 4 - x86 + AnyCPU pdbonly true ..\Release\ @@ -175,6 +190,13 @@ + + + False + .NET Framework 3.5 SP1 + false + +