From 1b30f3caa5da2645fc7e51e239dfe350084b597b Mon Sep 17 00:00:00 2001 From: Bruce Date: Sun, 2 Nov 2025 23:29:13 +0800 Subject: [PATCH] Update Pri Reader (from chausner/PriTools) --- AppInstallerReset.sln | 21 ++-- LICENSE.PriTools.chausner | 201 ++++++++++++++++++++++++++++++++ THIRD_PARTY_NOTICES | 2 + dlltest/main.cpp | 83 +------------ pkgread/pkgread.vcxproj | 1 + pkgread/pkgread.vcxproj.filters | 3 + pkgread/priformatcli.h | 1 + pkgread/readobj.h | 1 + priformatcli | 1 + 9 files changed, 223 insertions(+), 91 deletions(-) create mode 100644 LICENSE.PriTools.chausner create mode 100644 THIRD_PARTY_NOTICES create mode 120000 pkgread/priformatcli.h create mode 120000 priformatcli diff --git a/AppInstallerReset.sln b/AppInstallerReset.sln index 1b9fb52..586ab1e 100644 --- a/AppInstallerReset.sln +++ b/AppInstallerReset.sln @@ -6,10 +6,13 @@ MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "appinstaller", "AppInstallerReset\AppInstallerReset.vcxproj", "{C96219BE-8AFF-4914-8933-B6B7047A94D8}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pkgread", "pkgread\pkgread.vcxproj", "{A7753282-AA16-43D9-8ACA-7065239DD702}" + ProjectSection(ProjectDependencies) = postProject + {33D91B58-1981-4A3C-B4D1-86EE406CDE12} = {33D91B58-1981-4A3C-B4D1-86EE406CDE12} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlltest", "dlltest\dlltest.vcxproj", "{F5CCB3AB-AC43-432A-862D-4F264760B09B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "priread", "priread\priread.vcxproj", "{99D714D9-F40D-425B-BAFA-8B41C17971A5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "priformatcli", "..\priformatcli\priformatcli\priformatcli.vcxproj", "{33D91B58-1981-4A3C-B4D1-86EE406CDE12}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -43,14 +46,14 @@ Global {F5CCB3AB-AC43-432A-862D-4F264760B09B}.Release|x64.Build.0 = Release|x64 {F5CCB3AB-AC43-432A-862D-4F264760B09B}.Release|x86.ActiveCfg = Release|Win32 {F5CCB3AB-AC43-432A-862D-4F264760B09B}.Release|x86.Build.0 = Release|Win32 - {99D714D9-F40D-425B-BAFA-8B41C17971A5}.Debug|x64.ActiveCfg = Debug|x64 - {99D714D9-F40D-425B-BAFA-8B41C17971A5}.Debug|x64.Build.0 = Debug|x64 - {99D714D9-F40D-425B-BAFA-8B41C17971A5}.Debug|x86.ActiveCfg = Debug|Win32 - {99D714D9-F40D-425B-BAFA-8B41C17971A5}.Debug|x86.Build.0 = Debug|Win32 - {99D714D9-F40D-425B-BAFA-8B41C17971A5}.Release|x64.ActiveCfg = Release|x64 - {99D714D9-F40D-425B-BAFA-8B41C17971A5}.Release|x64.Build.0 = Release|x64 - {99D714D9-F40D-425B-BAFA-8B41C17971A5}.Release|x86.ActiveCfg = Release|Win32 - {99D714D9-F40D-425B-BAFA-8B41C17971A5}.Release|x86.Build.0 = Release|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|x86.ActiveCfg = Debug|Win32 + {33D91B58-1981-4A3C-B4D1-86EE406CDE12}.Debug|x86.Build.0 = Debug|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|x86.ActiveCfg = Release|Win32 + {33D91B58-1981-4A3C-B4D1-86EE406CDE12}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/LICENSE.PriTools.chausner b/LICENSE.PriTools.chausner new file mode 100644 index 0000000..8445442 --- /dev/null +++ b/LICENSE.PriTools.chausner @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2016 Christoph Hausner + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/THIRD_PARTY_NOTICES b/THIRD_PARTY_NOTICES new file mode 100644 index 0000000..7f31c2d --- /dev/null +++ b/THIRD_PARTY_NOTICES @@ -0,0 +1,2 @@ +This project includes code from the following open source projects: +· PriTools by chausner: File "LICENSE.PriTools.chausner" \ No newline at end of file diff --git a/dlltest/main.cpp b/dlltest/main.cpp index 1f3ccdf..379361b 100644 --- a/dlltest/main.cpp +++ b/dlltest/main.cpp @@ -155,48 +155,6 @@ void read_package (const std::wstring &filepath) } } -struct head -{ - CHAR szMagic [8]; - WORD wPlaceholder1, // 0 - wPlaceholder2; // 1 - DWORD dwFileSize, - dwToCOffset, - dwSectStartOffset; - WORD wSectCount, - wPlaceholder3; // 0xFFFF - DWORD dwPlaceholder4; // 0 -}; -struct footer -{ - DWORD dwChkCode, // 0xDEFFFADE - dwTotalFileSize; -}; -struct tocentry -{ - CHAR szIdentifier [16] = {0}; - WORD wFlags = 0; - WORD wSectFlags = 0; - DWORD dwSectQualifier = 0; - DWORD dwSectOffset = 0; - DWORD dwSectLength = 0; -}; -// #pragma pack (push, 1) -struct section_header -{ - CHAR szIdentifier [16] = {0}; - DWORD dwQualifier = 0; - WORD wFlags = 0; - WORD wSectFlags = 0; - DWORD dwLength = 0; - DWORD dwPlaceholder1 = -1; // 0 -}; -struct section_check -{ - DWORD dwChkCode = 0, // 0xDEF5FADE - dwSectLength = 0; -}; - int main (int argc, char *argv []) { setlocale (LC_ALL, ""); @@ -209,46 +167,7 @@ int main (int argc, char *argv []) std::remove (pkgPathStr.begin (), pkgPathStr.end (), L'\"'), pkgPathStr.end () ); - HANDLE hFile = CreateFileW ( - pkgPathStr.c_str (), // ÎļþÃû - GENERIC_READ, // Ö»¶Á - FILE_SHARE_READ, // ÔÊÐíÆäËû½ø³Ì¶ÁÈ¡ - NULL, // ĬÈÏ°²È«ÊôÐÔ - OPEN_EXISTING, // ±ØÐëÎļþ´æÔÚ - FILE_ATTRIBUTE_NORMAL, // ÆÕͨÎļþ - NULL // ÎÞÄ£°å - ); - head header; - footer foot; - DWORD headRead = 0, footRead = 0; - ReadFile (hFile, &header, sizeof (header), &headRead, NULL); - SetFilePointer (hFile, header.dwFileSize - 16, NULL, FILE_BEGIN); - ReadFile (hFile, &foot, sizeof (foot), &footRead, NULL); - SetFilePointer (hFile, header.dwToCOffset, NULL, FILE_BEGIN); - std::vector tocs; - for (size_t i = 0; i < header.wSectCount; i ++) - { - tocentry toc; - DWORD dwRead; - ReadFile (hFile, &toc, sizeof (toc), &dwRead, NULL); - tocs.push_back (toc); - } - for (size_t i = 0; i < header.wSectCount; i ++) - { - SetFilePointer (hFile, header.dwSectStartOffset + tocs [i].dwSectOffset, NULL, FILE_BEGIN); - section_header sh; - section_check sc; - DWORD dwsh, dwsc; - ReadFile (hFile, &sh, sizeof (sh), &dwsh, NULL); - SetFilePointer (hFile, sh.dwLength - 16 - 24, NULL, FILE_CURRENT); - ReadFile (hFile, &sc, sizeof (sc), &dwsc, NULL); - SetFilePointer (hFile, 32 - sh.dwLength, NULL, FILE_CURRENT); - //subsection ss; - //ss.dwOffset = SetFilePointer (hFile, 0, NULL, FILE_CURRENT); - //ss.dwLength = sh.dwLength - 16 - 24; - //SetFilePointer (hFile, 32, NULL, FILE_CURRENT); - } - CloseHandle (hFile); + system ("pause"); return 0; } \ No newline at end of file diff --git a/pkgread/pkgread.vcxproj b/pkgread/pkgread.vcxproj index 9d84c81..a4fa96c 100644 --- a/pkgread/pkgread.vcxproj +++ b/pkgread/pkgread.vcxproj @@ -145,6 +145,7 @@ + diff --git a/pkgread/pkgread.vcxproj.filters b/pkgread/pkgread.vcxproj.filters index 10f25bd..0ff98ee 100644 --- a/pkgread/pkgread.vcxproj.filters +++ b/pkgread/pkgread.vcxproj.filters @@ -54,6 +54,9 @@ 头文件 + + 头文件 + diff --git a/pkgread/priformatcli.h b/pkgread/priformatcli.h new file mode 120000 index 0000000..8f6c608 --- /dev/null +++ b/pkgread/priformatcli.h @@ -0,0 +1 @@ +E:/Profiles/Bruce/Documents/visual studio 2015/Projects/priformatcli/priformatcli/priformatcli.h \ No newline at end of file diff --git a/pkgread/readobj.h b/pkgread/readobj.h index ff91359..5580e60 100644 --- a/pkgread/readobj.h +++ b/pkgread/readobj.h @@ -14,6 +14,7 @@ #include "stringres.h" #include "norstr.h" #include "raii.h" +#include "priformatcli.h" bool IsFileExistsW (LPCWSTR filename) { diff --git a/priformatcli b/priformatcli new file mode 120000 index 0000000..d726309 --- /dev/null +++ b/priformatcli @@ -0,0 +1 @@ +E:/Profiles/Bruce/Documents/visual studio 2015/Projects/priformatcli/priformatcli \ No newline at end of file