**NSudo 6.0.1801.19**

- 修复NSudoDuplicateSessionToken函数定义Bug（感谢 mingkuang） - 修复在图形界面下无法启用全部特权的Bug（感谢 abbodi1406） - 修复没有VC-LTL时x86和x86-64(AMD64)的Release编译配置未采用静态编译的Bug
M2TeamArchived · Nov 30, 2018 · 2a1297c · 2a1297c
1 parent 23d2480
commit 2a1297c
Show file tree

Hide file tree

Showing 17 changed files with 79 additions and 16 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -2,6 +2,11 @@
 
 - [简体中文](更新日志.md)
 
+**NSudo 6.0.1801.19**
+- Fix the Nsudoduplicatesessiontoken function definition bug. (Thanks to mingkuang.)
+- Fix bugs that cannot enable full privileges under the graphical interface. (Thanks to abbodi1406.)
+- Fix bugs that cannot use static compile mode when using release configuration for x86 and x86-64 (AMD64) without VC-LTL.
+
 **NSudo 5.3.1801.11**
 - Fix a potential bug when NSudo obtaining the System Token. (Thanks to mingkuang.)
 - Provide VC-LTL support for NSudo release configuration for x86 and x86-64 (AMD64). (Thanks to mingkuang.)

diff --git a/NSudo/NSudo.aps b/NSudo/NSudo.aps
diff --git a/NSudoC/NSudoC.aps b/NSudoC/NSudoC.aps
diff --git a/NSudoC/NSudoC.cpp b/NSudoC/NSudoC.cpp
diff --git a/NSudoC/NSudoC.rc b/NSudoC/NSudoC.rc
diff --git a/NSudoC/NSudoC.vcxproj b/NSudoC/NSudoC.vcxproj
@@ -323,6 +323,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="resource.h" />
+    <ClInclude Include="resource1.h" />
     <ClInclude Include="stdafx.h" />
     <ClInclude Include="targetver.h" />
   </ItemGroup>
@@ -341,6 +342,7 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="NSudoC.rc" />
+    <ResourceCompile Include="Version.rc" />
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\NSudo.Icon\NSudo.ico" />

diff --git a/NSudoC/NSudoC.vcxproj.filters b/NSudoC/NSudoC.vcxproj.filters
@@ -24,6 +24,9 @@
     <ClInclude Include="resource.h">
       <Filter>头文件</Filter>
     </ClInclude>
+    <ClInclude Include="resource1.h">
+      <Filter>头文件</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="stdafx.cpp">
@@ -37,6 +40,9 @@
     <ResourceCompile Include="NSudoC.rc">
       <Filter>资源文件</Filter>
     </ResourceCompile>
+    <ResourceCompile Include="Version.rc">
+      <Filter>资源文件</Filter>
+    </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
     <Image Include="..\NSudo.Icon\NSudo.ico">

diff --git a/NSudoC/Version.aps b/NSudoC/Version.aps
diff --git a/NSudoC/Version.rc b/NSudoC/Version.rc
diff --git a/NSudoC/resource.h b/NSudoC/resource.h
@@ -2,18 +2,14 @@
 // Microsoft Visual C++ 生成的包含文件。
 // 供 NSudoC.rc 使用
 //
-#define NSUDO_VER_MINOR                 0
-#define NSUDO_VER_MAJOR                 6
-#define NSUDO_VER_REV                   11
-#define IDI_ICON1                       102
-#define IDI_NSUDO                       102
-#define NSUDO_VER_BUILD                 1801
+#define IDI_NSUDO                       101
+#define IDR_CommandLineHelpPage         102
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        103
+#define _APS_NEXT_RESOURCE_VALUE        104
 #define _APS_NEXT_COMMAND_VALUE         40001
 #define _APS_NEXT_CONTROL_VALUE         1001
 #define _APS_NEXT_SYMED_VALUE           101

diff --git a/NSudoC/resource1.h b/NSudoC/resource1.h
@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by Version.rc
+
+// ÐÂ¶ÔÏóµÄÏÂÒ»×éÄ¬ÈÏÖµ
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/NSudoG/resource.h b/NSudoG/resource.h
@@ -2,12 +2,8 @@
 // Microsoft Visual C++ 生成的包含文件。
 // 供 NSudoG.rc 使用
 //
-#define NSUDO_VER_MINOR                 0
-#define NSUDO_VER_MAJOR                 6
-#define NSUDO_VER_REV                   11
-#define IDI_ICON1                       101
+
 #define IDI_NSUDO                       101
-#define NSUDO_VER_BUILD                 1801
 
 // Next default values for new objects
 // 

diff --git a/NSudoSDK/NSudoSDK.vcxitems b/NSudoSDK/NSudoSDK.vcxitems
@@ -20,4 +20,7 @@
     <ClInclude Include="$(MSBuildThisFileDirectory)NSudoVersion.h" />
     <ClInclude Include="$(MSBuildThisFileDirectory)ThirdParty\json.hpp" />
   </ItemGroup>
+  <ItemGroup>
+    <Text Include="$(MSBuildThisFileDirectory)Resources\en\CommandLineHelpPage.txt" />
+  </ItemGroup>
 </Project>
diff --git a/NSudoSDK/NSudoSDK.vcxitems.filters b/NSudoSDK/NSudoSDK.vcxitems.filters
@@ -13,5 +13,16 @@
     <Filter Include="ThirdParty">
       <UniqueIdentifier>{fbdb5e99-1ac3-445a-8120-4ec9e83aad0f}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Resources">
+      <UniqueIdentifier>{bae262bf-0cb3-4f13-abfc-287904e63e4e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resources\en">
+      <UniqueIdentifier>{1d7fa200-3b0e-4141-ba3b-ac95092919d1}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <Text Include="$(MSBuildThisFileDirectory)Resources\en\CommandLineHelpPage.txt">
+      <Filter>Resources\en</Filter>
+    </Text>
   </ItemGroup>
 </Project>
diff --git a/NSudoSDK/NSudoVersion.h b/NSudoSDK/NSudoVersion.h
@@ -13,7 +13,7 @@ License: The MIT License
 #define NSUDO_VER_MAJOR 6
 #define NSUDO_VER_MINOR 0
 #define NSUDO_VER_BUILD 1801
-#define NSUDO_VER_REV 12
+#define NSUDO_VER_REV 19
 #endif
 
 #ifndef NSUDO_VER_FMT_COMMA

diff --git a/NSudoSDK/Resources/en/CommandLineHelpPage.txt b/NSudoSDK/Resources/en/CommandLineHelpPage.txt
@@ -0,0 +1,31 @@
+Format: NSudo [ -U ] [ -P ] [ -M ] Command line or ShortCut Command
+
+-U:[ T | S | C | P | D ] User
+    T TrustedInstaller
+    S System
+    C Current User
+    P Current Process
+    D Current Process (Drop right)
+
+-P:[ E | D ] Privilege
+    E Enable All Privileges
+    D Disable All Privileges
+PS:
+    If you want to use the default privileges, please do not include the "-P"
+    parameter.
+
+-M:[ S | H | M | L ] Integrity Level
+    S System
+    H High
+    M Medium
+    L Low
+PS:
+    If you want to use the default Integrity Level, please do not include the 
+    "-M" parameter
+
+-? Show this content
+
+Example：
+    If you want to run Command Prompt with TrustedInstaller, enable all 
+    privileges and the default Integrity Level.
+        NSudo -U:T -P:E cmd
diff --git a/更新日志.md b/更新日志.md
@@ -2,11 +2,10 @@
 
 - [English](Changelog.md)
 
-**NSudo 6.0.1801.12**
+**NSudo 6.0.1801.19**
 - 修复NSudoDuplicateSessionToken函数定义Bug（感谢 mingkuang）
-- 修复在图形界面下无法启用全部特权的Bug（感谢 abbodi1406
+- 修复在图形界面下无法启用全部特权的Bug（感谢 abbodi1406）
 - 修复没有VC-LTL时x86和x86-64(AMD64)的Release编译配置未采用静态编译的Bug
-- 引入NSudoC和NSudoG
 
 **NSudo 5.3.1801.11**
 - 修复获取System令牌函数的一个潜在Bug（感谢 mingkuang）