From 060b9affa25b2139f2c5b7493b4b6a1d1abfd754 Mon Sep 17 00:00:00 2001 From: Dmitry Nefedov Date: Sun, 10 Dec 2023 22:23:54 +0300 Subject: [PATCH] Removed WaitNetworkStartup function, fixed typos --- Wrapper/Config/config_Windows_10.json | 85 ++++++-------- Wrapper/Config/config_Windows_10_LTSC.json | 83 ++++++-------- Wrapper/Config/config_Windows_11.json | 106 ++++++----------- .../de-DE/tooltip_Windows_10.json | 89 ++++++--------- .../de-DE/tooltip_Windows_11.json | 108 +++++++----------- .../en-US/tooltip_Windows_10.json | 89 ++++++--------- .../en-US/tooltip_Windows_11.json | 108 +++++++----------- .../ru-RU/tooltip_Windows_10.json | 89 ++++++--------- .../ru-RU/tooltip_Windows_11.json | 108 +++++++----------- .../Module/Sophia.psm1 | 96 +++------------- src/Sophia_Script_for_Windows_10/Sophia.ps1 | 8 -- .../Module/Sophia.psm1 | 91 +++------------ .../Sophia.ps1 | 8 -- .../Module/Sophia.psm1 | 93 +++------------ .../Sophia.ps1 | 8 -- .../Module/Sophia.psm1 | 96 +++------------- .../Sophia.ps1 | 8 -- .../Module/Sophia.psm1 | 100 ++++------------ src/Sophia_Script_for_Windows_11/Sophia.ps1 | 8 -- .../Module/Sophia.psm1 | 100 ++++------------ .../Sophia.ps1 | 8 -- 21 files changed, 444 insertions(+), 1045 deletions(-) diff --git a/Wrapper/Config/config_Windows_10.json b/Wrapper/Config/config_Windows_10.json index 87f36dcda..f985bda48 100644 --- a/Wrapper/Config/config_Windows_10.json +++ b/Wrapper/Config/config_Windows_10.json @@ -1214,23 +1214,6 @@ "Region": "System", "Control": "cmb", "Required": "false", - "Function": "WaitNetworkStartup", - "Arg": { - "Zero": { - "Tag": "Enable" - }, - "One": { - "Tag": "Disable" - } - }, - "Preset": "Zero", - "WindowsDefault": "One" - }, - { - "Id": 511, - "Region": "System", - "Control": "cmb", - "Required": "false", "Function": "WindowsManageDefaultPrinter", "Arg": { "Zero": { @@ -1244,7 +1227,7 @@ "WindowsDefault": "One" }, { - "Id": 512, + "Id": 511, "Region": "System", "Control": "cmb", "Required": "false", @@ -1261,7 +1244,7 @@ "WindowsDefault": "One" }, { - "Id": 513, + "Id": 512, "Region": "System", "Control": "cmb", "Required": "false", @@ -1278,7 +1261,7 @@ "WindowsDefault": "One" }, { - "Id": 514, + "Id": 513, "Region": "System", "Control": "cmb", "Required": "false", @@ -1295,7 +1278,7 @@ "WindowsDefault": "One" }, { - "Id": 515, + "Id": 514, "Region": "System", "Control": "cmb", "Required": "false", @@ -1312,7 +1295,7 @@ "WindowsDefault": "One" }, { - "Id": 516, + "Id": 515, "Region": "System", "Control": "cmb", "Required": "false", @@ -1329,7 +1312,7 @@ "WindowsDefault": "One" }, { - "Id": 517, + "Id": 516, "Region": "System", "Control": "cmb", "Required": "false", @@ -1349,7 +1332,7 @@ "WindowsDefault": "One" }, { - "Id": 518, + "Id": 517, "Region": "System", "Control": "cmb", "Required": "false", @@ -1366,7 +1349,7 @@ "WindowsDefault": "One" }, { - "Id": 519, + "Id": 518, "Region": "System", "Control": "cmb", "Required": "false", @@ -1386,7 +1369,7 @@ "WindowsDefault": "Two" }, { - "Id": 520, + "Id": 519, "Region": "System", "Control": "cmb", "Required": "false", @@ -1403,7 +1386,7 @@ "WindowsDefault": "One" }, { - "Id": 521, + "Id": 520, "Region": "System", "Control": "cmb", "Required": "false", @@ -1420,7 +1403,7 @@ "WindowsDefault": "One" }, { - "Id": 522, + "Id": 521, "Region": "System", "Control": "cmb", "Required": "false", @@ -1437,7 +1420,7 @@ "WindowsDefault": "One" }, { - "Id": 523, + "Id": 522, "Region": "System", "Control": "cmb", "Required": "false", @@ -1454,7 +1437,7 @@ "WindowsDefault": "One" }, { - "Id": 524, + "Id": 523, "Region": "System", "Control": "cmb", "Required": "false", @@ -1471,7 +1454,7 @@ "WindowsDefault": "One" }, { - "Id": 525, + "Id": 524, "Region": "System", "Control": "cmb", "Required": "false", @@ -1488,7 +1471,7 @@ "WindowsDefault": "One" }, { - "Id": 526, + "Id": 525, "Region": "System", "Control": "cmb", "Required": "false", @@ -1505,7 +1488,7 @@ "WindowsDefault": "One" }, { - "Id": 527, + "Id": 526, "Region": "System", "Control": "cmb", "Required": "false", @@ -1522,7 +1505,7 @@ "WindowsDefault": "One" }, { - "Id": 528, + "Id": 527, "Region": "System", "Control": "cmb", "Required": "false", @@ -1539,7 +1522,7 @@ "WindowsDefault": "One" }, { - "Id": 529, + "Id": 528, "Region": "System", "Control": "cmb", "Required": "false", @@ -1556,7 +1539,7 @@ "WindowsDefault": "One" }, { - "Id": 530, + "Id": 529, "Region": "System", "Control": "cmb", "Required": "false", @@ -1573,7 +1556,7 @@ "WindowsDefault": "One" }, { - "Id": 531, + "Id": 530, "Region": "System", "Control": "cmb", "Required": "false", @@ -1590,7 +1573,7 @@ "WindowsDefault": "One" }, { - "Id": 532, + "Id": 531, "Region": "System", "Control": "cmb", "Required": "false", @@ -1607,7 +1590,7 @@ "WindowsDefault": "One" }, { - "Id": 533, + "Id": 532, "Region": "System", "Control": "cmb", "Required": "false", @@ -1624,7 +1607,7 @@ "WindowsDefault": "One" }, { - "Id": 534, + "Id": 533, "Region": "System", "Control": "cmb", "Required": "false", @@ -1641,7 +1624,7 @@ "WindowsDefault": "One" }, { - "Id": 535, + "Id": 534, "Region": "System", "Control": "cmb", "Required": "false", @@ -1658,7 +1641,7 @@ "WindowsDefault": "One" }, { - "Id": 536, + "Id": 535, "Region": "System", "Control": "cmb", "Required": "false", @@ -1675,7 +1658,7 @@ "WindowsDefault": "Zero" }, { - "Id": 537, + "Id": 536, "Region": "System", "Control": "chk", "Required": "false", @@ -1689,7 +1672,7 @@ "WindowsDefault": "" }, { - "Id": 538, + "Id": 537, "Region": "System", "Control": "chk", "Required": "false", @@ -1703,7 +1686,7 @@ "WindowsDefault": "" }, { - "Id": 539, + "Id": 538, "Region": "System", "Control": "chk", "Required": "false", @@ -1717,7 +1700,7 @@ "WindowsDefault": "" }, { - "Id": 540, + "Id": 539, "Region": "System", "Control": "chk", "Required": "false", @@ -1731,7 +1714,7 @@ "WindowsDefault": "" }, { - "Id": 541, + "Id": 540, "Region": "System", "Control": "chk", "Required": "false", @@ -1745,7 +1728,7 @@ "WindowsDefault": "" }, { - "Id": 542, + "Id": 541, "Region": "System", "Control": "cmb", "Required": "false", @@ -1762,7 +1745,7 @@ "WindowsDefault": "One" }, { - "Id": 543, + "Id": 542, "Region": "System", "Control": "cmb", "Required": "false", @@ -1779,7 +1762,7 @@ "WindowsDefault": "One" }, { - "Id": 544, + "Id": 543, "Region": "System", "Control": "cmb", "Required": "false", @@ -1796,7 +1779,7 @@ "WindowsDefault": "One" }, { - "Id": 545, + "Id": 544, "Region": "System", "Control": "chk", "Required": "false", diff --git a/Wrapper/Config/config_Windows_10_LTSC.json b/Wrapper/Config/config_Windows_10_LTSC.json index bf4aefe48..b36f218b4 100644 --- a/Wrapper/Config/config_Windows_10_LTSC.json +++ b/Wrapper/Config/config_Windows_10_LTSC.json @@ -1103,25 +1103,6 @@ "Region": "System", "Control": "cmb", "Required": "false", - "Function": "WaitNetworkStartup", - "Arg": { - "Zero": { - "Tag": "Enable" - }, - "One": { - "Tag": "Disable" - } - }, - "Preset": "Zero", - "WindowsDefault": "One", - "LTSC2019": "true", - "LTSC2021": "true" - }, - { - "Id": 511, - "Region": "System", - "Control": "cmb", - "Required": "false", "Function": "WindowsManageDefaultPrinter", "Arg": { "Zero": { @@ -1137,7 +1118,7 @@ "LTSC2021": "true" }, { - "Id": 512, + "Id": 511, "Region": "System", "Control": "cmb", "Required": "false", @@ -1156,7 +1137,7 @@ "LTSC2021": "true" }, { - "Id": 513, + "Id": 512, "Region": "System", "Control": "cmb", "Required": "false", @@ -1175,7 +1156,7 @@ "LTSC2021": "true" }, { - "Id": 514, + "Id": 513, "Region": "System", "Control": "cmb", "Required": "false", @@ -1194,7 +1175,7 @@ "LTSC2021": "true" }, { - "Id": 515, + "Id": 514, "Region": "System", "Control": "cmb", "Required": "false", @@ -1213,7 +1194,7 @@ "LTSC2021": "true" }, { - "Id": 516, + "Id": 515, "Region": "System", "Control": "cmb", "Required": "false", @@ -1232,7 +1213,7 @@ "LTSC2021": "true" }, { - "Id": 517, + "Id": 516, "Region": "System", "Control": "cmb", "Required": "false", @@ -1252,7 +1233,7 @@ "WindowsDefault": "One" }, { - "Id": 518, + "Id": 517, "Region": "System", "Control": "cmb", "Required": "false", @@ -1271,7 +1252,7 @@ "LTSC2021": "true" }, { - "Id": 519, + "Id": 518, "Region": "System", "Control": "cmb", "Required": "false", @@ -1293,7 +1274,7 @@ "LTSC2021": "true" }, { - "Id": 520, + "Id": 519, "Region": "System", "Control": "cmb", "Required": "false", @@ -1312,7 +1293,7 @@ "LTSC2021": "true" }, { - "Id": 521, + "Id": 520, "Region": "System", "Control": "cmb", "Required": "false", @@ -1331,7 +1312,7 @@ "LTSC2021": "true" }, { - "Id": 522, + "Id": 521, "Region": "System", "Control": "cmb", "Required": "false", @@ -1350,7 +1331,7 @@ "LTSC2021": "true" }, { - "Id": 523, + "Id": 522, "Region": "System", "Control": "cmb", "Required": "false", @@ -1369,7 +1350,7 @@ "LTSC2021": "true" }, { - "Id": 524, + "Id": 523, "Region": "System", "Control": "cmb", "Required": "false", @@ -1388,7 +1369,7 @@ "LTSC2021": "true" }, { - "Id": 525, + "Id": 524, "Region": "System", "Control": "cmb", "Required": "false", @@ -1407,7 +1388,7 @@ "LTSC2021": "true" }, { - "Id": 526, + "Id": 525, "Region": "System", "Control": "cmb", "Required": "false", @@ -1426,7 +1407,7 @@ "LTSC2021": "true" }, { - "Id": 527, + "Id": 526, "Region": "System", "Control": "cmb", "Required": "false", @@ -1445,7 +1426,7 @@ "LTSC2021": "true" }, { - "Id": 528, + "Id": 527, "Region": "System", "Control": "cmb", "Required": "false", @@ -1464,7 +1445,7 @@ "LTSC2021": "true" }, { - "Id": 529, + "Id": 528, "Region": "System", "Control": "cmb", "Required": "false", @@ -1483,7 +1464,7 @@ "LTSC2021": "true" }, { - "Id": 530, + "Id": 529, "Region": "System", "Control": "cmb", "Required": "false", @@ -1502,7 +1483,7 @@ "LTSC2021": "true" }, { - "Id": 531, + "Id": 530, "Region": "System", "Control": "cmb", "Required": "false", @@ -1521,7 +1502,7 @@ "LTSC2021": "true" }, { - "Id": 532, + "Id": 531, "Region": "System", "Control": "cmb", "Required": "false", @@ -1540,7 +1521,7 @@ "LTSC2021": "true" }, { - "Id": 533, + "Id": 532, "Region": "System", "Control": "cmb", "Required": "false", @@ -1559,7 +1540,7 @@ "LTSC2021": "true" }, { - "Id": 534, + "Id": 533, "Region": "System", "Control": "cmb", "Required": "false", @@ -1578,7 +1559,7 @@ "LTSC2021": "true" }, { - "Id": 535, + "Id": 534, "Region": "System", "Control": "cmb", "Required": "false", @@ -1597,7 +1578,7 @@ "LTSC2021": "true" }, { - "Id": 536, + "Id": 535, "Region": "System", "Control": "chk", "Required": "false", @@ -1613,7 +1594,7 @@ "LTSC2021": "true" }, { - "Id": 537, + "Id": 536, "Region": "System", "Control": "chk", "Required": "false", @@ -1629,7 +1610,7 @@ "LTSC2021": "true" }, { - "Id": 538, + "Id": 537, "Region": "System", "Control": "chk", "Required": "false", @@ -1645,7 +1626,7 @@ "LTSC2021": "true" }, { - "Id": 539, + "Id": 538, "Region": "System", "Control": "chk", "Required": "false", @@ -1661,7 +1642,7 @@ "LTSC2021": "true" }, { - "Id": 540, + "Id": 539, "Region": "System", "Control": "cmb", "Required": "false", @@ -1680,7 +1661,7 @@ "LTSC2021": "true" }, { - "Id": 541, + "Id": 540, "Region": "System", "Control": "cmb", "Required": "false", @@ -1699,7 +1680,7 @@ "LTSC2021": "true" }, { - "Id": 542, + "Id": 541, "Region": "System", "Control": "cmb", "Required": "false", @@ -1718,7 +1699,7 @@ "LTSC2021": "true" }, { - "Id": 543, + "Id": 542, "Region": "System", "Control": "chk", "Required": "false", diff --git a/Wrapper/Config/config_Windows_11.json b/Wrapper/Config/config_Windows_11.json index 9f003823c..522680796 100644 --- a/Wrapper/Config/config_Windows_11.json +++ b/Wrapper/Config/config_Windows_11.json @@ -1115,23 +1115,6 @@ "Region": "System", "Control": "cmb", "Required": "false", - "Function": "WaitNetworkStartup", - "Arg": { - "Zero": { - "Tag": "Enable" - }, - "One": { - "Tag": "Disable" - } - }, - "Preset": "Zero", - "WindowsDefault": "One" - }, - { - "Id": 511, - "Region": "System", - "Control": "cmb", - "Required": "false", "Function": "WindowsManageDefaultPrinter", "Arg": { "Zero": { @@ -1145,7 +1128,7 @@ "WindowsDefault": "One" }, { - "Id": 512, + "Id": 511, "Region": "System", "Control": "cmb", "Required": "false", @@ -1162,7 +1145,7 @@ "WindowsDefault": "One" }, { - "Id": 513, + "Id": 512, "Region": "System", "Control": "cmb", "Required": "false", @@ -1179,7 +1162,7 @@ "WindowsDefault": "One" }, { - "Id": 514, + "Id": 513, "Region": "System", "Control": "cmb", "Required": "false", @@ -1196,7 +1179,7 @@ "WindowsDefault": "One" }, { - "Id": 515, + "Id": 514, "Region": "System", "Control": "cmb", "Required": "false", @@ -1213,7 +1196,7 @@ "WindowsDefault": "One" }, { - "Id": 516, + "Id": 515, "Region": "System", "Control": "cmb", "Required": "false", @@ -1230,7 +1213,7 @@ "WindowsDefault": "One" }, { - "Id": 517, + "Id": 516, "Region": "System", "Control": "cmb", "Required": "false", @@ -1250,7 +1233,7 @@ "WindowsDefault": "One" }, { - "Id": 518, + "Id": 517, "Region": "System", "Control": "cmb", "Required": "false", @@ -1267,7 +1250,7 @@ "WindowsDefault": "One" }, { - "Id": 519, + "Id": 518, "Region": "System", "Control": "cmb", "Required": "false", @@ -1287,7 +1270,7 @@ "WindowsDefault": "Two" }, { - "Id": 520, + "Id": 519, "Region": "System", "Control": "cmb", "Required": "false", @@ -1304,7 +1287,7 @@ "WindowsDefault": "One" }, { - "Id": 521, + "Id": 520, "Region": "System", "Control": "cmb", "Required": "false", @@ -1321,7 +1304,7 @@ "WindowsDefault": "One" }, { - "Id": 522, + "Id": 521, "Region": "System", "Control": "cmb", "Required": "false", @@ -1338,7 +1321,7 @@ "WindowsDefault": "One" }, { - "Id": 523, + "Id": 522, "Region": "System", "Control": "cmb", "Required": "false", @@ -1355,7 +1338,7 @@ "WindowsDefault": "One" }, { - "Id": 524, + "Id": 523, "Region": "System", "Control": "cmb", "Required": "false", @@ -1372,7 +1355,7 @@ "WindowsDefault": "One" }, { - "Id": 525, + "Id": 524, "Region": "System", "Control": "cmb", "Required": "false", @@ -1389,7 +1372,7 @@ "WindowsDefault": "One" }, { - "Id": 526, + "Id": 525, "Region": "System", "Control": "cmb", "Required": "false", @@ -1406,7 +1389,7 @@ "WindowsDefault": "One" }, { - "Id": 527, + "Id": 526, "Region": "System", "Control": "cmb", "Required": "false", @@ -1423,7 +1406,7 @@ "WindowsDefault": "One" }, { - "Id": 528, + "Id": 527, "Region": "System", "Control": "cmb", "Required": "false", @@ -1440,7 +1423,7 @@ "WindowsDefault": "One" }, { - "Id": 529, + "Id": 528, "Region": "System", "Control": "cmb", "Required": "false", @@ -1457,7 +1440,7 @@ "WindowsDefault": "One" }, { - "Id": 530, + "Id": 529, "Region": "System", "Control": "cmb", "Required": "false", @@ -1474,7 +1457,7 @@ "WindowsDefault": "One" }, { - "Id": 531, + "Id": 530, "Region": "System", "Control": "cmb", "Required": "false", @@ -1491,7 +1474,7 @@ "WindowsDefault": "One" }, { - "Id": 532, + "Id": 531, "Region": "System", "Control": "cmb", "Required": "false", @@ -1508,7 +1491,7 @@ "WindowsDefault": "One" }, { - "Id": 533, + "Id": 532, "Region": "System", "Control": "cmb", "Required": "false", @@ -1525,7 +1508,7 @@ "WindowsDefault": "One" }, { - "Id": 534, + "Id": 533, "Region": "System", "Control": "cmb", "Required": "false", @@ -1542,7 +1525,7 @@ "WindowsDefault": "One" }, { - "Id": 535, + "Id": 534, "Region": "System", "Control": "cmb", "Required": "false", @@ -1559,7 +1542,7 @@ "WindowsDefault": "One" }, { - "Id": 536, + "Id": 535, "Region": "System", "Control": "cmb", "Required": "false", @@ -1576,7 +1559,7 @@ "WindowsDefault": "Zero" }, { - "Id": 537, + "Id": 536, "Region": "System", "Control": "chk", "Required": "false", @@ -1590,7 +1573,7 @@ "WindowsDefault": "" }, { - "Id": 538, + "Id": 537, "Region": "System", "Control": "chk", "Required": "false", @@ -1604,7 +1587,7 @@ "WindowsDefault": "" }, { - "Id": 539, + "Id": 538, "Region": "System", "Control": "cmb", "Required": "false", @@ -1621,7 +1604,7 @@ "WindowsDefault": "One" }, { - "Id": 540, + "Id": 539, "Region": "System", "Control": "chk", "Required": "false", @@ -1635,7 +1618,7 @@ "WindowsDefault": "" }, { - "Id": 541, + "Id": 540, "Region": "System", "Control": "chk", "Required": "false", @@ -1649,7 +1632,7 @@ "WindowsDefault": "" }, { - "Id": 542, + "Id": 541, "Region": "System", "Control": "cmb", "Required": "false", @@ -1666,7 +1649,7 @@ "WindowsDefault": "One" }, { - "Id": 543, + "Id": 542, "Region": "System", "Control": "cmb", "Required": "false", @@ -1680,7 +1663,7 @@ "WindowsDefault": "" }, { - "Id": 544, + "Id": 543, "Region": "System", "Control": "cmb", "Required": "false", @@ -1697,7 +1680,7 @@ "WindowsDefault": "One" }, { - "Id": 545, + "Id": 544, "Region": "System", "Control": "cmb", "Required": "false", @@ -1714,7 +1697,7 @@ "WindowsDefault": "One" }, { - "Id": 546, + "Id": 545, "Region": "System", "Control": "chk", "Required": "false", @@ -1822,23 +1805,6 @@ "Region": "UWP apps", "Control": "cmb", "Required": "false", - "Function": "HEVC", - "Arg": { - "Zero": { - "Tag": "Manually" - }, - "One": { - "Tag": "Install" - } - }, - "Preset": "One", - "WindowsDefault": "" - }, - { - "Id": 804, - "Region": "UWP apps", - "Control": "cmb", - "Required": "false", "Function": "CortanaAutostart", "Arg": { "Zero": { @@ -1852,7 +1818,7 @@ "WindowsDefault": "One" }, { - "Id": 805, + "Id": 804, "Region": "UWP apps", "Control": "cmb", "Required": "false", diff --git a/Wrapper/Localizations/de-DE/tooltip_Windows_10.json b/Wrapper/Localizations/de-DE/tooltip_Windows_10.json index 1366ce6ee..e181481aa 100644 --- a/Wrapper/Localizations/de-DE/tooltip_Windows_10.json +++ b/Wrapper/Localizations/de-DE/tooltip_Windows_10.json @@ -1072,21 +1072,6 @@ { "Id": 510, "Region": "System", - "Function": "WaitNetworkStartup", - "Arg": { - "Zero": { - "Tag": "Enable", - "ToolTip": "Beim Starten des Computers und bei der Anmeldung für Arbeitsgruppennetzwerke immer auf das Netzwerk warten." - }, - "One": { - "Tag": "Disable", - "ToolTip": "Bei Arbeitsgruppennetzwerken beim Starten des Computers und bei der Anmeldung nie auf das Netzwerk warten (Standardeinstellung)." - } - } - }, - { - "Id": 511, - "Region": "System", "Function": "WindowsManageDefaultPrinter", "Arg": { "Zero": { @@ -1100,7 +1085,7 @@ } }, { - "Id": 512, + "Id": 511, "Region": "System", "Function": "WindowsFeatures", "Arg": { @@ -1115,7 +1100,7 @@ } }, { - "Id": 513, + "Id": 512, "Region": "System", "Function": "WindowsCapabilities", "Arg": { @@ -1130,7 +1115,7 @@ } }, { - "Id": 514, + "Id": 513, "Region": "System", "Function": "UpdateMicrosoftProducts", "Arg": { @@ -1145,7 +1130,7 @@ } }, { - "Id": 515, + "Id": 514, "Region": "System", "Function": "PowerPlan", "Arg": { @@ -1160,7 +1145,7 @@ } }, { - "Id": 516, + "Id": 515, "Region": "System", "Function": "LatestInstalled.NET", "Arg": { @@ -1175,7 +1160,7 @@ } }, { - "Id": 517, + "Id": 516, "Region": "System", "Function": "NetworkAdaptersSavePower", "Arg": { @@ -1190,7 +1175,7 @@ } }, { - "Id": 518, + "Id": 517, "Region": "System", "Function": "IPv6Component", "Arg": { @@ -1209,7 +1194,7 @@ } }, { - "Id": 519, + "Id": 518, "Region": "System", "Function": "InputMethod", "Arg": { @@ -1224,7 +1209,7 @@ } }, { - "Id": 520, + "Id": 519, "Region": "System", "Function": "Set-UserShellFolderLocation", "Arg": { @@ -1243,7 +1228,7 @@ } }, { - "Id": 521, + "Id": 520, "Region": "System", "Function": "WinPrtScrFolder", "Arg": { @@ -1258,7 +1243,7 @@ } }, { - "Id": 522, + "Id": 521, "Region": "System", "Function": "RecommendedTroubleshooting", "Arg": { @@ -1273,7 +1258,7 @@ } }, { - "Id": 523, + "Id": 522, "Region": "System", "Function": "FoldersLaunchSeparateProcess", "Arg": { @@ -1288,7 +1273,7 @@ } }, { - "Id": 524, + "Id": 523, "Region": "System", "Function": "ReservedStorage", "Arg": { @@ -1303,7 +1288,7 @@ } }, { - "Id": 525, + "Id": 524, "Region": "System", "Function": "F1HelpPage", "Arg": { @@ -1318,7 +1303,7 @@ } }, { - "Id": 526, + "Id": 525, "Region": "System", "Function": "NumLock", "Arg": { @@ -1333,7 +1318,7 @@ } }, { - "Id": 527, + "Id": 526, "Region": "System", "Function": "CapsLock", "Arg": { @@ -1348,7 +1333,7 @@ } }, { - "Id": 528, + "Id": 527, "Region": "System", "Function": "StickyShift", "Arg": { @@ -1363,7 +1348,7 @@ } }, { - "Id": 529, + "Id": 528, "Region": "System", "Function": "Autoplay", "Arg": { @@ -1378,7 +1363,7 @@ } }, { - "Id": 530, + "Id": 529, "Region": "System", "Function": "ThumbnailCacheRemoval", "Arg": { @@ -1393,7 +1378,7 @@ } }, { - "Id": 531, + "Id": 530, "Region": "System", "Function": "SaveRestartableApps", "Arg": { @@ -1408,7 +1393,7 @@ } }, { - "Id": 532, + "Id": 531, "Region": "System", "Function": "NetworkDiscovery", "Arg": { @@ -1423,7 +1408,7 @@ } }, { - "Id": 533, + "Id": 532, "Region": "System", "Function": "RestartNotification", "Arg": { @@ -1438,7 +1423,7 @@ } }, { - "Id": 534, + "Id": 533, "Region": "System", "Function": "RestartDeviceAfterUpdate", "Arg": { @@ -1453,7 +1438,7 @@ } }, { - "Id": 535, + "Id": 534, "Region": "System", "Function": "ActiveHours", "Arg": { @@ -1468,7 +1453,7 @@ } }, { - "Id": 536, + "Id": 535, "Region": "System", "Function": "WindowsLatestUpdate", "Arg": { @@ -1483,7 +1468,7 @@ } }, { - "Id": 537, + "Id": 536, "Region": "System", "Function": "Export-Associations", "Arg": { @@ -1494,7 +1479,7 @@ } }, { - "Id": 538, + "Id": 537, "Region": "System", "Function": "Import-Associations", "Arg": { @@ -1505,7 +1490,7 @@ } }, { - "Id": 539, + "Id": 538, "Region": "System", "Function": "UninstallPCHealthCheck", "Arg": { @@ -1516,7 +1501,7 @@ } }, { - "Id": 540, + "Id": 539, "Region": "System", "Function": "InstallVCRedist", "Arg": { @@ -1527,7 +1512,7 @@ } }, { - "Id": 541, + "Id": 540, "Region": "System", "Function": "InstallDotNetRuntimes", "Arg": { @@ -1538,7 +1523,7 @@ } }, { - "Id": 542, + "Id": 541, "Region": "System", "Function": "RKNBypass", "Arg": { @@ -1553,7 +1538,7 @@ } }, { - "Id": 543, + "Id": 542, "Region": "System", "Function": "PreventEdgeShortcutCreation", "Arg": { @@ -1568,7 +1553,7 @@ } }, { - "Id": 544, + "Id": 543, "Region": "System", "Function": "SATADrivesRemovableMedia", "Arg": { @@ -1583,7 +1568,7 @@ } }, { - "Id": 545, + "Id": 544, "Region": "System", "Function": "Set-Association", "Arg": { @@ -1594,7 +1579,7 @@ } }, { - "Id": 546, + "Id": 545, "Region": "System", "Function": "ProgramPath", "Arg": { @@ -1605,7 +1590,7 @@ } }, { - "Id": 547, + "Id": 546, "Region": "System", "Function": "Extension", "Arg": { @@ -1616,7 +1601,7 @@ } }, { - "Id": 548, + "Id": 547, "Region": "System", "Function": "Icon", "Arg": { diff --git a/Wrapper/Localizations/de-DE/tooltip_Windows_11.json b/Wrapper/Localizations/de-DE/tooltip_Windows_11.json index 74e088846..f343e6959 100644 --- a/Wrapper/Localizations/de-DE/tooltip_Windows_11.json +++ b/Wrapper/Localizations/de-DE/tooltip_Windows_11.json @@ -986,21 +986,6 @@ { "Id": 510, "Region": "System", - "Function": "WaitNetworkStartup", - "Arg": { - "Zero": { - "Tag": "Enable", - "ToolTip": "Beim Starten des Computers und bei der Anmeldung für Arbeitsgruppennetzwerke immer auf das Netzwerk warten." - }, - "One": { - "Tag": "Disable", - "ToolTip": "Bei Arbeitsgruppennetzwerken beim Starten des Computers und bei der Anmeldung nie auf das Netzwerk warten (Standardeinstellung)." - } - } - }, - { - "Id": 511, - "Region": "System", "Function": "WindowsManageDefaultPrinter", "Arg": { "Zero": { @@ -1014,7 +999,7 @@ } }, { - "Id": 512, + "Id": 511, "Region": "System", "Function": "WindowsFeatures", "Arg": { @@ -1029,7 +1014,7 @@ } }, { - "Id": 513, + "Id": 512, "Region": "System", "Function": "WindowsCapabilities", "Arg": { @@ -1044,7 +1029,7 @@ } }, { - "Id": 514, + "Id": 513, "Region": "System", "Function": "UpdateMicrosoftProducts", "Arg": { @@ -1059,7 +1044,7 @@ } }, { - "Id": 515, + "Id": 514, "Region": "System", "Function": "PowerPlan", "Arg": { @@ -1074,7 +1059,7 @@ } }, { - "Id": 516, + "Id": 515, "Region": "System", "Function": "NetworkAdaptersSavePower", "Arg": { @@ -1089,7 +1074,7 @@ } }, { - "Id": 517, + "Id": 516, "Region": "System", "Function": "IPv6Component", "Arg": { @@ -1108,7 +1093,7 @@ } }, { - "Id": 518, + "Id": 517, "Region": "System", "Function": "InputMethod", "Arg": { @@ -1123,7 +1108,7 @@ } }, { - "Id": 519, + "Id": 518, "Region": "System", "Function": "Set-UserShellFolderLocation", "Arg": { @@ -1142,7 +1127,7 @@ } }, { - "Id": 520, + "Id": 519, "Region": "System", "Function": "LatestInstalled.NET", "Arg": { @@ -1157,7 +1142,7 @@ } }, { - "Id": 521, + "Id": 520, "Region": "System", "Function": "WinPrtScrFolder", "Arg": { @@ -1172,7 +1157,7 @@ } }, { - "Id": 522, + "Id": 521, "Region": "System", "Function": "RecommendedTroubleshooting", "Arg": { @@ -1187,7 +1172,7 @@ } }, { - "Id": 523, + "Id": 522, "Region": "System", "Function": "FoldersLaunchSeparateProcess", "Arg": { @@ -1202,7 +1187,7 @@ } }, { - "Id": 524, + "Id": 523, "Region": "System", "Function": "ReservedStorage", "Arg": { @@ -1217,7 +1202,7 @@ } }, { - "Id": 525, + "Id": 524, "Region": "System", "Function": "F1HelpPage", "Arg": { @@ -1232,7 +1217,7 @@ } }, { - "Id": 526, + "Id": 525, "Region": "System", "Function": "NumLock", "Arg": { @@ -1247,7 +1232,7 @@ } }, { - "Id": 527, + "Id": 526, "Region": "System", "Function": "CapsLock", "Arg": { @@ -1262,7 +1247,7 @@ } }, { - "Id": 528, + "Id": 527, "Region": "System", "Function": "StickyShift", "Arg": { @@ -1277,7 +1262,7 @@ } }, { - "Id": 529, + "Id": 528, "Region": "System", "Function": "Autoplay", "Arg": { @@ -1292,7 +1277,7 @@ } }, { - "Id": 530, + "Id": 529, "Region": "System", "Function": "ThumbnailCacheRemoval", "Arg": { @@ -1307,7 +1292,7 @@ } }, { - "Id": 531, + "Id": 530, "Region": "System", "Function": "SaveRestartableApps", "Arg": { @@ -1322,7 +1307,7 @@ } }, { - "Id": 532, + "Id": 531, "Region": "System", "Function": "NetworkDiscovery", "Arg": { @@ -1337,7 +1322,7 @@ } }, { - "Id": 533, + "Id": 532, "Region": "System", "Function": "RestartNotification", "Arg": { @@ -1352,7 +1337,7 @@ } }, { - "Id": 534, + "Id": 533, "Region": "System", "Function": "RestartDeviceAfterUpdate", "Arg": { @@ -1367,7 +1352,7 @@ } }, { - "Id": 535, + "Id": 534, "Region": "System", "Function": "ActiveHours", "Arg": { @@ -1382,7 +1367,7 @@ } }, { - "Id": 536, + "Id": 535, "Region": "System", "Function": "WindowsLatestUpdate", "Arg": { @@ -1397,7 +1382,7 @@ } }, { - "Id": 537, + "Id": 536, "Region": "System", "Function": "Export-Associations", "Arg": { @@ -1408,7 +1393,7 @@ } }, { - "Id": 538, + "Id": 537, "Region": "System", "Function": "Import-Associations", "Arg": { @@ -1419,7 +1404,7 @@ } }, { - "Id": 539, + "Id": 538, "Region": "System", "Function": "DefaultTerminalApp", "Arg": { @@ -1434,7 +1419,7 @@ } }, { - "Id": 540, + "Id": 539, "Region": "System", "Function": "InstallVCRedist", "Arg": { @@ -1445,7 +1430,7 @@ } }, { - "Id": 541, + "Id": 540, "Region": "System", "Function": "InstallDotNetRuntimes", "Arg": { @@ -1456,7 +1441,7 @@ } }, { - "Id": 542, + "Id": 541, "Region": "System", "Function": "RKNBypass", "Arg": { @@ -1471,7 +1456,7 @@ } }, { - "Id": 543, + "Id": 542, "Region": "System", "Function": "Install-WSA", "Arg": { @@ -1482,7 +1467,7 @@ } }, { - "Id": 544, + "Id": 543, "Region": "System", "Function": "PreventEdgeShortcutCreation", "Arg": { @@ -1497,7 +1482,7 @@ } }, { - "Id": 545, + "Id": 544, "Region": "System", "Function": "SATADrivesRemovableMedia", "Arg": { @@ -1512,7 +1497,7 @@ } }, { - "Id": 546, + "Id": 545, "Region": "System", "Function": "Set-Association", "Arg": { @@ -1523,7 +1508,7 @@ } }, { - "Id": 547, + "Id": 546, "Region": "System", "Function": "ProgramPath", "Arg": { @@ -1534,7 +1519,7 @@ } }, { - "Id": 548, + "Id": 547, "Region": "System", "Function": "Extension", "Arg": { @@ -1545,7 +1530,7 @@ } }, { - "Id": 549, + "Id": 548, "Region": "System", "Function": "Icon", "Arg": { @@ -1632,21 +1617,6 @@ { "Id": 803, "Region": "UWP apps", - "Function": "HEVC", - "Arg": { - "Zero": { - "Tag": "Manually", - "ToolTip": "Die Seite Microsoft Store \"HEVC Video Extensions from Device Manufacturer\" öffnen, um diese Erweiterung manuell zu installieren und die Bildformate .heic und .heif öffnen zu können. Die Erweiterung kann ohne ein Microsoft-Konto installiert werden." - }, - "One": { - "Tag": "Install", - "ToolTip": "\"HEVC Video Extensions from Device Manufacturer\" herunterladen und installieren, um die Formate .heic und .heif öffnen zu können." - } - } - }, - { - "Id": 804, - "Region": "UWP apps", "Function": "CortanaAutostart", "Arg": { "Zero": { @@ -1660,7 +1630,7 @@ } }, { - "Id": 805, + "Id": 804, "Region": "UWP apps", "Function": "TeamsAutostart", "Arg": { diff --git a/Wrapper/Localizations/en-US/tooltip_Windows_10.json b/Wrapper/Localizations/en-US/tooltip_Windows_10.json index b72ccda3e..c73f52071 100644 --- a/Wrapper/Localizations/en-US/tooltip_Windows_10.json +++ b/Wrapper/Localizations/en-US/tooltip_Windows_10.json @@ -1072,21 +1072,6 @@ { "Id": 510, "Region": "System", - "Function": "WaitNetworkStartup", - "Arg": { - "Zero": { - "Tag": "Enable", - "ToolTip": "Always wait for the network at computer startup and logon for workgroup networks." - }, - "One": { - "Tag": "Disable", - "ToolTip": "Never wait for the network at computer startup and logon for workgroup networks (default value)." - } - } - }, - { - "Id": 511, - "Region": "System", "Function": "WindowsManageDefaultPrinter", "Arg": { "Zero": { @@ -1100,7 +1085,7 @@ } }, { - "Id": 512, + "Id": 511, "Region": "System", "Function": "WindowsFeatures", "Arg": { @@ -1115,7 +1100,7 @@ } }, { - "Id": 513, + "Id": 512, "Region": "System", "Function": "WindowsCapabilities", "Arg": { @@ -1130,7 +1115,7 @@ } }, { - "Id": 514, + "Id": 513, "Region": "System", "Function": "UpdateMicrosoftProducts", "Arg": { @@ -1145,7 +1130,7 @@ } }, { - "Id": 515, + "Id": 514, "Region": "System", "Function": "PowerPlan", "Arg": { @@ -1160,7 +1145,7 @@ } }, { - "Id": 516, + "Id": 515, "Region": "System", "Function": "LatestInstalled.NET", "Arg": { @@ -1175,7 +1160,7 @@ } }, { - "Id": 517, + "Id": 516, "Region": "System", "Function": "NetworkAdaptersSavePower", "Arg": { @@ -1190,7 +1175,7 @@ } }, { - "Id": 518, + "Id": 517, "Region": "System", "Function": "IPv6Component", "Arg": { @@ -1209,7 +1194,7 @@ } }, { - "Id": 519, + "Id": 518, "Region": "System", "Function": "InputMethod", "Arg": { @@ -1224,7 +1209,7 @@ } }, { - "Id": 520, + "Id": 519, "Region": "System", "Function": "Set-UserShellFolderLocation", "Arg": { @@ -1243,7 +1228,7 @@ } }, { - "Id": 521, + "Id": 520, "Region": "System", "Function": "WinPrtScrFolder", "Arg": { @@ -1258,7 +1243,7 @@ } }, { - "Id": 522, + "Id": 521, "Region": "System", "Function": "RecommendedTroubleshooting", "Arg": { @@ -1273,7 +1258,7 @@ } }, { - "Id": 523, + "Id": 522, "Region": "System", "Function": "FoldersLaunchSeparateProcess", "Arg": { @@ -1288,7 +1273,7 @@ } }, { - "Id": 524, + "Id": 523, "Region": "System", "Function": "ReservedStorage", "Arg": { @@ -1303,7 +1288,7 @@ } }, { - "Id": 525, + "Id": 524, "Region": "System", "Function": "F1HelpPage", "Arg": { @@ -1318,7 +1303,7 @@ } }, { - "Id": 526, + "Id": 525, "Region": "System", "Function": "NumLock", "Arg": { @@ -1333,7 +1318,7 @@ } }, { - "Id": 527, + "Id": 526, "Region": "System", "Function": "CapsLock", "Arg": { @@ -1348,7 +1333,7 @@ } }, { - "Id": 528, + "Id": 527, "Region": "System", "Function": "StickyShift", "Arg": { @@ -1363,7 +1348,7 @@ } }, { - "Id": 529, + "Id": 528, "Region": "System", "Function": "Autoplay", "Arg": { @@ -1378,7 +1363,7 @@ } }, { - "Id": 530, + "Id": 529, "Region": "System", "Function": "ThumbnailCacheRemoval", "Arg": { @@ -1393,7 +1378,7 @@ } }, { - "Id": 531, + "Id": 530, "Region": "System", "Function": "SaveRestartableApps", "Arg": { @@ -1408,7 +1393,7 @@ } }, { - "Id": 532, + "Id": 531, "Region": "System", "Function": "NetworkDiscovery", "Arg": { @@ -1423,7 +1408,7 @@ } }, { - "Id": 533, + "Id": 532, "Region": "System", "Function": "RestartNotification", "Arg": { @@ -1438,7 +1423,7 @@ } }, { - "Id": 534, + "Id": 533, "Region": "System", "Function": "RestartDeviceAfterUpdate", "Arg": { @@ -1453,7 +1438,7 @@ } }, { - "Id": 535, + "Id": 534, "Region": "System", "Function": "ActiveHours", "Arg": { @@ -1468,7 +1453,7 @@ } }, { - "Id": 536, + "Id": 535, "Region": "System", "Function": "WindowsLatestUpdate", "Arg": { @@ -1483,7 +1468,7 @@ } }, { - "Id": 537, + "Id": 536, "Region": "System", "Function": "Export-Associations", "Arg": { @@ -1494,7 +1479,7 @@ } }, { - "Id": 538, + "Id": 537, "Region": "System", "Function": "Import-Associations", "Arg": { @@ -1505,7 +1490,7 @@ } }, { - "Id": 539, + "Id": 538, "Region": "System", "Function": "UninstallPCHealthCheck", "Arg": { @@ -1516,7 +1501,7 @@ } }, { - "Id": 540, + "Id": 539, "Region": "System", "Function": "InstallVCRedist", "Arg": { @@ -1527,7 +1512,7 @@ } }, { - "Id": 541, + "Id": 540, "Region": "System", "Function": "InstallDotNetRuntimes", "Arg": { @@ -1538,7 +1523,7 @@ } }, { - "Id": 542, + "Id": 541, "Region": "System", "Function": "RKNBypass", "Arg": { @@ -1553,7 +1538,7 @@ } }, { - "Id": 543, + "Id": 542, "Region": "System", "Function": "PreventEdgeShortcutCreation", "Arg": { @@ -1568,7 +1553,7 @@ } }, { - "Id": 544, + "Id": 543, "Region": "System", "Function": "SATADrivesRemovableMedia", "Arg": { @@ -1583,7 +1568,7 @@ } }, { - "Id": 545, + "Id": 544, "Region": "System", "Function": "Set-Association", "Arg": { @@ -1594,7 +1579,7 @@ } }, { - "Id": 546, + "Id": 545, "Region": "System", "Function": "ProgramPath", "Arg": { @@ -1605,7 +1590,7 @@ } }, { - "Id": 547, + "Id": 546, "Region": "System", "Function": "Extension", "Arg": { @@ -1616,7 +1601,7 @@ } }, { - "Id": 548, + "Id": 547, "Region": "System", "Function": "Icon", "Arg": { diff --git a/Wrapper/Localizations/en-US/tooltip_Windows_11.json b/Wrapper/Localizations/en-US/tooltip_Windows_11.json index ab84e7662..a18b6aefb 100644 --- a/Wrapper/Localizations/en-US/tooltip_Windows_11.json +++ b/Wrapper/Localizations/en-US/tooltip_Windows_11.json @@ -986,21 +986,6 @@ { "Id": 510, "Region": "System", - "Function": "WaitNetworkStartup", - "Arg": { - "Zero": { - "Tag": "Enable", - "ToolTip": "Always wait for the network at computer startup and logon for workgroup networks." - }, - "One": { - "Tag": "Disable", - "ToolTip": "Never wait for the network at computer startup and logon for workgroup networks (default value)." - } - } - }, - { - "Id": 511, - "Region": "System", "Function": "WindowsManageDefaultPrinter", "Arg": { "Zero": { @@ -1014,7 +999,7 @@ } }, { - "Id": 512, + "Id": 511, "Region": "System", "Function": "WindowsFeatures", "Arg": { @@ -1029,7 +1014,7 @@ } }, { - "Id": 513, + "Id": 512, "Region": "System", "Function": "WindowsCapabilities", "Arg": { @@ -1044,7 +1029,7 @@ } }, { - "Id": 514, + "Id": 513, "Region": "System", "Function": "UpdateMicrosoftProducts", "Arg": { @@ -1059,7 +1044,7 @@ } }, { - "Id": 515, + "Id": 514, "Region": "System", "Function": "PowerPlan", "Arg": { @@ -1074,7 +1059,7 @@ } }, { - "Id": 516, + "Id": 515, "Region": "System", "Function": "NetworkAdaptersSavePower", "Arg": { @@ -1089,7 +1074,7 @@ } }, { - "Id": 517, + "Id": 516, "Region": "System", "Function": "IPv6Component", "Arg": { @@ -1108,7 +1093,7 @@ } }, { - "Id": 518, + "Id": 517, "Region": "System", "Function": "InputMethod", "Arg": { @@ -1123,7 +1108,7 @@ } }, { - "Id": 519, + "Id": 518, "Region": "System", "Function": "Set-UserShellFolderLocation", "Arg": { @@ -1142,7 +1127,7 @@ } }, { - "Id": 520, + "Id": 519, "Region": "System", "Function": "LatestInstalled.NET", "Arg": { @@ -1157,7 +1142,7 @@ } }, { - "Id": 521, + "Id": 520, "Region": "System", "Function": "WinPrtScrFolder", "Arg": { @@ -1172,7 +1157,7 @@ } }, { - "Id": 522, + "Id": 521, "Region": "System", "Function": "RecommendedTroubleshooting", "Arg": { @@ -1187,7 +1172,7 @@ } }, { - "Id": 523, + "Id": 522, "Region": "System", "Function": "FoldersLaunchSeparateProcess", "Arg": { @@ -1202,7 +1187,7 @@ } }, { - "Id": 524, + "Id": 523, "Region": "System", "Function": "ReservedStorage", "Arg": { @@ -1217,7 +1202,7 @@ } }, { - "Id": 525, + "Id": 524, "Region": "System", "Function": "F1HelpPage", "Arg": { @@ -1232,7 +1217,7 @@ } }, { - "Id": 526, + "Id": 525, "Region": "System", "Function": "NumLock", "Arg": { @@ -1247,7 +1232,7 @@ } }, { - "Id": 527, + "Id": 526, "Region": "System", "Function": "CapsLock", "Arg": { @@ -1262,7 +1247,7 @@ } }, { - "Id": 528, + "Id": 527, "Region": "System", "Function": "StickyShift", "Arg": { @@ -1277,7 +1262,7 @@ } }, { - "Id": 529, + "Id": 528, "Region": "System", "Function": "Autoplay", "Arg": { @@ -1292,7 +1277,7 @@ } }, { - "Id": 530, + "Id": 529, "Region": "System", "Function": "ThumbnailCacheRemoval", "Arg": { @@ -1307,7 +1292,7 @@ } }, { - "Id": 531, + "Id": 530, "Region": "System", "Function": "SaveRestartableApps", "Arg": { @@ -1322,7 +1307,7 @@ } }, { - "Id": 532, + "Id": 531, "Region": "System", "Function": "NetworkDiscovery", "Arg": { @@ -1337,7 +1322,7 @@ } }, { - "Id": 533, + "Id": 532, "Region": "System", "Function": "RestartNotification", "Arg": { @@ -1352,7 +1337,7 @@ } }, { - "Id": 534, + "Id": 533, "Region": "System", "Function": "RestartDeviceAfterUpdate", "Arg": { @@ -1367,7 +1352,7 @@ } }, { - "Id": 535, + "Id": 534, "Region": "System", "Function": "ActiveHours", "Arg": { @@ -1382,7 +1367,7 @@ } }, { - "Id": 536, + "Id": 535, "Region": "System", "Function": "WindowsLatestUpdate", "Arg": { @@ -1397,7 +1382,7 @@ } }, { - "Id": 537, + "Id": 536, "Region": "System", "Function": "Export-Associations", "Arg": { @@ -1408,7 +1393,7 @@ } }, { - "Id": 538, + "Id": 537, "Region": "System", "Function": "Import-Associations", "Arg": { @@ -1419,7 +1404,7 @@ } }, { - "Id": 539, + "Id": 538, "Region": "System", "Function": "DefaultTerminalApp", "Arg": { @@ -1434,7 +1419,7 @@ } }, { - "Id": 540, + "Id": 539, "Region": "System", "Function": "InstallVCRedist", "Arg": { @@ -1445,7 +1430,7 @@ } }, { - "Id": 541, + "Id": 540, "Region": "System", "Function": "InstallDotNetRuntimes", "Arg": { @@ -1456,7 +1441,7 @@ } }, { - "Id": 542, + "Id": 541, "Region": "System", "Function": "RKNBypass", "Arg": { @@ -1471,7 +1456,7 @@ } }, { - "Id": 543, + "Id": 542, "Region": "System", "Function": "Install-WSA", "Arg": { @@ -1482,7 +1467,7 @@ } }, { - "Id": 544, + "Id": 543, "Region": "System", "Function": "PreventEdgeShortcutCreation", "Arg": { @@ -1497,7 +1482,7 @@ } }, { - "Id": 545, + "Id": 544, "Region": "System", "Function": "SATADrivesRemovableMedia", "Arg": { @@ -1512,7 +1497,7 @@ } }, { - "Id": 546, + "Id": 545, "Region": "System", "Function": "Set-Association", "Arg": { @@ -1523,7 +1508,7 @@ } }, { - "Id": 547, + "Id": 546, "Region": "System", "Function": "ProgramPath", "Arg": { @@ -1534,7 +1519,7 @@ } }, { - "Id": 548, + "Id": 547, "Region": "System", "Function": "Extension", "Arg": { @@ -1545,7 +1530,7 @@ } }, { - "Id": 549, + "Id": 548, "Region": "System", "Function": "Icon", "Arg": { @@ -1632,21 +1617,6 @@ { "Id": 803, "Region": "UWP apps", - "Function": "HEVC", - "Arg": { - "Zero": { - "Tag": "Manually", - "ToolTip": "Open Microsoft Store \"HEVC Video Extensions from Device Manufacturer\" page to install this extension manually to be able to open .heic and .heif image formats. The extension can be installed without an Microsoft account." - }, - "One": { - "Tag": "Install", - "ToolTip": "Download and install \"HEVC Video Extensions from Device Manufacturer\" to be able to open .heic and .heif formats." - } - } - }, - { - "Id": 804, - "Region": "UWP apps", "Function": "CortanaAutostart", "Arg": { "Zero": { @@ -1660,7 +1630,7 @@ } }, { - "Id": 805, + "Id": 804, "Region": "UWP apps", "Function": "TeamsAutostart", "Arg": { diff --git a/Wrapper/Localizations/ru-RU/tooltip_Windows_10.json b/Wrapper/Localizations/ru-RU/tooltip_Windows_10.json index 16643f8fd..7a7157a44 100644 --- a/Wrapper/Localizations/ru-RU/tooltip_Windows_10.json +++ b/Wrapper/Localizations/ru-RU/tooltip_Windows_10.json @@ -1072,21 +1072,6 @@ { "Id": 510, "Region": "System", - "Function": "WaitNetworkStartup", - "Arg": { - "Zero": { - "Tag": "Enable", - "ToolTip": "Всегда ждать сеть при запуске и входе в систему для рабочих групп." - }, - "One": { - "Tag": "Disable", - "ToolTip": "Никогда не ждать сеть при запуске и входе в систему для рабочих групп (значение по умолчанию)." - } - } - }, - { - "Id": 511, - "Region": "System", "Function": "WindowsManageDefaultPrinter", "Arg": { "Zero": { @@ -1100,7 +1085,7 @@ } }, { - "Id": 512, + "Id": 511, "Region": "System", "Function": "WindowsFeatures", "Arg": { @@ -1115,7 +1100,7 @@ } }, { - "Id": 513, + "Id": 512, "Region": "System", "Function": "WindowsCapabilities", "Arg": { @@ -1130,7 +1115,7 @@ } }, { - "Id": 514, + "Id": 513, "Region": "System", "Function": "UpdateMicrosoftProducts", "Arg": { @@ -1145,7 +1130,7 @@ } }, { - "Id": 515, + "Id": 514, "Region": "System", "Function": "PowerPlan", "Arg": { @@ -1160,7 +1145,7 @@ } }, { - "Id": 517, + "Id": 515, "Region": "System", "Function": "NetworkAdaptersSavePower", "Arg": { @@ -1175,7 +1160,7 @@ } }, { - "Id": 518, + "Id": 516, "Region": "System", "Function": "IPv6Component", "Arg": { @@ -1194,7 +1179,7 @@ } }, { - "Id": 519, + "Id": 517, "Region": "System", "Function": "InputMethod", "Arg": { @@ -1209,7 +1194,7 @@ } }, { - "Id": 520, + "Id": 518, "Region": "System", "Function": "Set-UserShellFolderLocation", "Arg": { @@ -1228,7 +1213,7 @@ } }, { - "Id": 516, + "Id": 519, "Region": "System", "Function": "LatestInstalled.NET", "Arg": { @@ -1243,7 +1228,7 @@ } }, { - "Id": 521, + "Id": 520, "Region": "System", "Function": "WinPrtScrFolder", "Arg": { @@ -1258,7 +1243,7 @@ } }, { - "Id": 522, + "Id": 521, "Region": "System", "Function": "RecommendedTroubleshooting", "Arg": { @@ -1273,7 +1258,7 @@ } }, { - "Id": 523, + "Id": 522, "Region": "System", "Function": "FoldersLaunchSeparateProcess", "Arg": { @@ -1288,7 +1273,7 @@ } }, { - "Id": 524, + "Id": 523, "Region": "System", "Function": "ReservedStorage", "Arg": { @@ -1303,7 +1288,7 @@ } }, { - "Id": 525, + "Id": 524, "Region": "System", "Function": "F1HelpPage", "Arg": { @@ -1318,7 +1303,7 @@ } }, { - "Id": 526, + "Id": 525, "Region": "System", "Function": "NumLock", "Arg": { @@ -1333,7 +1318,7 @@ } }, { - "Id": 527, + "Id": 526, "Region": "System", "Function": "CapsLock", "Arg": { @@ -1348,7 +1333,7 @@ } }, { - "Id": 528, + "Id": 527, "Region": "System", "Function": "StickyShift", "Arg": { @@ -1363,7 +1348,7 @@ } }, { - "Id": 529, + "Id": 528, "Region": "System", "Function": "Autoplay", "Arg": { @@ -1378,7 +1363,7 @@ } }, { - "Id": 530, + "Id": 529, "Region": "System", "Function": "ThumbnailCacheRemoval", "Arg": { @@ -1393,7 +1378,7 @@ } }, { - "Id": 531, + "Id": 530, "Region": "System", "Function": "SaveRestartableApps", "Arg": { @@ -1408,7 +1393,7 @@ } }, { - "Id": 532, + "Id": 531, "Region": "System", "Function": "NetworkDiscovery", "Arg": { @@ -1423,7 +1408,7 @@ } }, { - "Id": 533, + "Id": 532, "Region": "System", "Function": "RestartNotification", "Arg": { @@ -1438,7 +1423,7 @@ } }, { - "Id": 534, + "Id": 533, "Region": "System", "Function": "RestartDeviceAfterUpdate", "Arg": { @@ -1453,7 +1438,7 @@ } }, { - "Id": 535, + "Id": 534, "Region": "System", "Function": "ActiveHours", "Arg": { @@ -1468,7 +1453,7 @@ } }, { - "Id": 536, + "Id": 535, "Region": "System", "Function": "WindowsLatestUpdate", "Arg": { @@ -1483,7 +1468,7 @@ } }, { - "Id": 537, + "Id": 536, "Region": "System", "Function": "Export-Associations", "Arg": { @@ -1494,7 +1479,7 @@ } }, { - "Id": 538, + "Id": 537, "Region": "System", "Function": "Import-Associations", "Arg": { @@ -1505,7 +1490,7 @@ } }, { - "Id": 539, + "Id": 538, "Region": "System", "Function": "UninstallPCHealthCheck", "Arg": { @@ -1516,7 +1501,7 @@ } }, { - "Id": 540, + "Id": 539, "Region": "System", "Function": "InstallVCRedist", "Arg": { @@ -1527,7 +1512,7 @@ } }, { - "Id": 541, + "Id": 540, "Region": "System", "Function": "InstallDotNetRuntimes", "Arg": { @@ -1538,7 +1523,7 @@ } }, { - "Id": 542, + "Id": 541, "Region": "System", "Function": "RKNBypass", "Arg": { @@ -1553,7 +1538,7 @@ } }, { - "Id": 543, + "Id": 542, "Region": "System", "Function": "PreventEdgeShortcutCreation", "Arg": { @@ -1568,7 +1553,7 @@ } }, { - "Id": 544, + "Id": 543, "Region": "System", "Function": "SATADrivesRemovableMedia", "Arg": { @@ -1583,7 +1568,7 @@ } }, { - "Id": 545, + "Id": 544, "Region": "System", "Function": "Set-Association", "Arg": { @@ -1594,7 +1579,7 @@ } }, { - "Id": 546, + "Id": 545, "Region": "System", "Function": "ProgramPath", "Arg": { @@ -1605,7 +1590,7 @@ } }, { - "Id": 547, + "Id": 546, "Region": "System", "Function": "Extension", "Arg": { @@ -1616,7 +1601,7 @@ } }, { - "Id": 548, + "Id": 547, "Region": "System", "Function": "Icon", "Arg": { diff --git a/Wrapper/Localizations/ru-RU/tooltip_Windows_11.json b/Wrapper/Localizations/ru-RU/tooltip_Windows_11.json index 5ec89fdd1..3e3acf9dc 100644 --- a/Wrapper/Localizations/ru-RU/tooltip_Windows_11.json +++ b/Wrapper/Localizations/ru-RU/tooltip_Windows_11.json @@ -986,21 +986,6 @@ { "Id": 510, "Region": "System", - "Function": "WaitNetworkStartup", - "Arg": { - "Zero": { - "Tag": "Enable", - "ToolTip": "Всегда ждать сеть при запуске и входе в систему для рабочих групп." - }, - "One": { - "Tag": "Disable", - "ToolTip": "Никогда не ждать сеть при запуске и входе в систему для рабочих групп (значение по умолчанию)." - } - } - }, - { - "Id": 511, - "Region": "System", "Function": "WindowsManageDefaultPrinter", "Arg": { "Zero": { @@ -1014,7 +999,7 @@ } }, { - "Id": 512, + "Id": 511, "Region": "System", "Function": "WindowsFeatures", "Arg": { @@ -1029,7 +1014,7 @@ } }, { - "Id": 513, + "Id": 512, "Region": "System", "Function": "WindowsCapabilities", "Arg": { @@ -1044,7 +1029,7 @@ } }, { - "Id": 514, + "Id": 513, "Region": "System", "Function": "UpdateMicrosoftProducts", "Arg": { @@ -1059,7 +1044,7 @@ } }, { - "Id": 515, + "Id": 514, "Region": "System", "Function": "PowerPlan", "Arg": { @@ -1074,7 +1059,7 @@ } }, { - "Id": 516, + "Id": 515, "Region": "System", "Function": "NetworkAdaptersSavePower", "Arg": { @@ -1089,7 +1074,7 @@ } }, { - "Id": 517, + "Id": 516, "Region": "System", "Function": "IPv6Component", "Arg": { @@ -1108,7 +1093,7 @@ } }, { - "Id": 518, + "Id": 517, "Region": "System", "Function": "InputMethod", "Arg": { @@ -1123,7 +1108,7 @@ } }, { - "Id": 519, + "Id": 518, "Region": "System", "Function": "Set-UserShellFolderLocation", "Arg": { @@ -1142,7 +1127,7 @@ } }, { - "Id": 520, + "Id": 519, "Region": "System", "Function": "LatestInstalled.NET", "Arg": { @@ -1157,7 +1142,7 @@ } }, { - "Id": 521, + "Id": 520, "Region": "System", "Function": "WinPrtScrFolder", "Arg": { @@ -1172,7 +1157,7 @@ } }, { - "Id": 522, + "Id": 521, "Region": "System", "Function": "RecommendedTroubleshooting", "Arg": { @@ -1187,7 +1172,7 @@ } }, { - "Id": 523, + "Id": 522, "Region": "System", "Function": "FoldersLaunchSeparateProcess", "Arg": { @@ -1202,7 +1187,7 @@ } }, { - "Id": 524, + "Id": 523, "Region": "System", "Function": "ReservedStorage", "Arg": { @@ -1217,7 +1202,7 @@ } }, { - "Id": 525, + "Id": 524, "Region": "System", "Function": "F1HelpPage", "Arg": { @@ -1232,7 +1217,7 @@ } }, { - "Id": 526, + "Id": 525, "Region": "System", "Function": "NumLock", "Arg": { @@ -1247,7 +1232,7 @@ } }, { - "Id": 527, + "Id": 526, "Region": "System", "Function": "CapsLock", "Arg": { @@ -1262,7 +1247,7 @@ } }, { - "Id": 528, + "Id": 527, "Region": "System", "Function": "StickyShift", "Arg": { @@ -1277,7 +1262,7 @@ } }, { - "Id": 529, + "Id": 528, "Region": "System", "Function": "Autoplay", "Arg": { @@ -1292,7 +1277,7 @@ } }, { - "Id": 530, + "Id": 529, "Region": "System", "Function": "ThumbnailCacheRemoval", "Arg": { @@ -1307,7 +1292,7 @@ } }, { - "Id": 531, + "Id": 530, "Region": "System", "Function": "SaveRestartableApps", "Arg": { @@ -1322,7 +1307,7 @@ } }, { - "Id": 532, + "Id": 531, "Region": "System", "Function": "NetworkDiscovery", "Arg": { @@ -1337,7 +1322,7 @@ } }, { - "Id": 533, + "Id": 532, "Region": "System", "Function": "RestartNotification", "Arg": { @@ -1352,7 +1337,7 @@ } }, { - "Id": 534, + "Id": 533, "Region": "System", "Function": "RestartDeviceAfterUpdate", "Arg": { @@ -1367,7 +1352,7 @@ } }, { - "Id": 535, + "Id": 534, "Region": "System", "Function": "ActiveHours", "Arg": { @@ -1382,7 +1367,7 @@ } }, { - "Id": 536, + "Id": 535, "Region": "System", "Function": "WindowsLatestUpdate", "Arg": { @@ -1397,7 +1382,7 @@ } }, { - "Id": 537, + "Id": 536, "Region": "System", "Function": "Export-Associations", "Arg": { @@ -1408,7 +1393,7 @@ } }, { - "Id": 538, + "Id": 537, "Region": "System", "Function": "Import-Associations", "Arg": { @@ -1419,7 +1404,7 @@ } }, { - "Id": 539, + "Id": 538, "Region": "System", "Function": "DefaultTerminalApp", "Arg": { @@ -1434,7 +1419,7 @@ } }, { - "Id": 540, + "Id": 539, "Region": "System", "Function": "InstallVCRedist", "Arg": { @@ -1445,7 +1430,7 @@ } }, { - "Id": 541, + "Id": 540, "Region": "System", "Function": "InstallDotNetRuntimes", "Arg": { @@ -1456,7 +1441,7 @@ } }, { - "Id": 542, + "Id": 541, "Region": "System", "Function": "RKNBypass", "Arg": { @@ -1471,7 +1456,7 @@ } }, { - "Id": 543, + "Id": 542, "Region": "System", "Function": "Install-WSA", "Arg": { @@ -1482,7 +1467,7 @@ } }, { - "Id": 544, + "Id": 543, "Region": "System", "Function": "PreventEdgeShortcutCreation", "Arg": { @@ -1497,7 +1482,7 @@ } }, { - "Id": 545, + "Id": 544, "Region": "System", "Function": "SATADrivesRemovableMedia", "Arg": { @@ -1512,7 +1497,7 @@ } }, { - "Id": 546, + "Id": 545, "Region": "System", "Function": "Set-Association", "Arg": { @@ -1523,7 +1508,7 @@ } }, { - "Id": 547, + "Id": 546, "Region": "System", "Function": "ProgramPath", "Arg": { @@ -1534,7 +1519,7 @@ } }, { - "Id": 548, + "Id": 547, "Region": "System", "Function": "Extension", "Arg": { @@ -1545,7 +1530,7 @@ } }, { - "Id": 549, + "Id": 548, "Region": "System", "Function": "Icon", "Arg": { @@ -1632,21 +1617,6 @@ { "Id": 803, "Region": "UWP apps", - "Function": "HEVC", - "Arg": { - "Zero": { - "Tag": "Manually", - "ToolTip": "Открыть страницу \"Расширения для видео HEVC от производителя устройства\" в Microsoft Store, чтобы вручную установить расширение для открытия форматов .heic и .heif. Расширение может быть установлено бесплатно без учетной записи Microsoft." - }, - "One": { - "Tag": "Install", - "ToolTip": "Скачать и установить \"Расширения для видео HEVC от производителя устройства\", чтобы иметь возможность открывать форматы .heic и .heif." - } - } - }, - { - "Id": 804, - "Region": "UWP apps", "Function": "CortanaAutostart", "Arg": { "Zero": { @@ -1660,7 +1630,7 @@ } }, { - "Id": 805, + "Id": 804, "Region": "UWP apps", "Function": "TeamsAutostart", "Arg": { diff --git a/src/Sophia_Script_for_Windows_10/Module/Sophia.psm1 b/src/Sophia_Script_for_Windows_10/Module/Sophia.psm1 index a707d3498..6cb15f4b0 100644 --- a/src/Sophia_Script_for_Windows_10/Module/Sophia.psm1 +++ b/src/Sophia_Script_for_Windows_10/Module/Sophia.psm1 @@ -1181,14 +1181,12 @@ function DiagnosticDataLevel { # Security level New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -PropertyType DWord -Value 0 -Force - Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Type DWORD -Value 0 } else { # Required diagnostic data New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -PropertyType DWord -Value 1 -Force - Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Type DWORD -Value 1 } @@ -1200,8 +1198,8 @@ function DiagnosticDataLevel # Optional diagnostic data New-ItemProperty -Path HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection -Name MaxTelemetryAllowed -PropertyType DWord -Value 3 -Force New-ItemProperty -Path HKCU:\Software\Microsoft\Windows\CurrentVersion\Diagnostics\DiagTrack -Name ShowedToastAtLevel -PropertyType DWord -Value 3 -Force - Remove-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Force -ErrorAction Ignore + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Type CLEAR } } @@ -2192,6 +2190,7 @@ function BingSearch New-Item -Path HKCU:\Software\Policies\Microsoft\Windows\Explorer -Force } New-ItemProperty -Path HKCU:\Software\Policies\Microsoft\Windows\Explorer -Name DisableSearchBoxSuggestions -PropertyType DWord -Value 1 -Force + Set-Policy -Scope User -Path Software\Policies\Microsoft\Windows\Explorer -Name DisableSearchBoxSuggestions -Type DWORD -Value 1 } "Enable" @@ -6146,69 +6145,6 @@ function DeliveryOptimization } } -<# - .SYNOPSIS - The Group Policy processing - - .PARAMETER Enable - Always wait for the network at computer startup and logon for workgroup networks - - .PARAMETER Disable - Never wait for the network at computer startup and logon for workgroup networks - - .EXAMPLE - WaitNetworkStartup -Enable - - .EXAMPLE - WaitNetworkStartup -Disable - - .NOTES - Machine-wide -#> -function WaitNetworkStartup -{ - param - ( - [Parameter( - Mandatory = $true, - ParameterSetName = "Enable" - )] - [switch] - $Enable, - - [Parameter( - Mandatory = $true, - ParameterSetName = "Disable" - )] - [switch] - $Disable - ) - - switch ($PSCmdlet.ParameterSetName) - { - "Enable" - { - if ((Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) - { - if (-not (Test-Path -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon")) - { - New-Item -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Force - } - New-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name SyncForegroundPolicy -PropertyType DWord -Value 1 -Force - Set-Policy -Scope Computer -Path "SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name SyncForegroundPolicy -Type DWORD -Value 1 - } - } - "Disable" - { - if ((Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) - { - Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name SyncForegroundPolicy -Force -ErrorAction Ignore - Set-Policy -Scope Computer -Path "SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name SyncForegroundPolicy -Type CLEAR - } - } - } -} - <# .SYNOPSIS Windows manages my default printer @@ -8406,6 +8342,7 @@ function RecommendedTroubleshooting New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -PropertyType DWord -Value 3 -Force New-ItemProperty -Path HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection -Name MaxTelemetryAllowed -PropertyType DWord -Value 3 -Force New-ItemProperty -Path HKCU:\Software\Microsoft\Windows\CurrentVersion\Diagnostics\DiagTrack -Name ShowedToastAtLevel -PropertyType DWord -Value 3 -Force + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Type DWORD -Value 1 # Turn on Windows Error Reporting @@ -8926,6 +8863,11 @@ function NetworkDiscovery $Disable ) + if ((Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) + { + return + } + $FirewallRules = @( # File and printer sharing "@FirewallAPI.dll,-32752", @@ -8938,20 +8880,13 @@ function NetworkDiscovery { "Enable" { - if (-not (Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) - { - Set-NetFirewallRule -Group $FirewallRules -Profile Private -Enabled True - - Set-NetFirewallRule -Profile Public, Private -Name FPS-SMB-In-TCP -Enabled True - Set-NetConnectionProfile -NetworkCategory Private - } + Set-NetFirewallRule -Group $FirewallRules -Profile Private -Enabled True + Set-NetFirewallRule -Profile Public, Private -Name FPS-SMB-In-TCP -Enabled True + Set-NetConnectionProfile -NetworkCategory Private } "Disable" { - if (-not (Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) - { - Set-NetFirewallRule -Group $FirewallRules -Profile Private -Enabled False - } + Set-NetFirewallRule -Group $FirewallRules -Profile Private -Enabled False } } } @@ -13963,6 +13898,7 @@ function CommandLineProcessAudit auditpol /set /subcategory:"{0CCE922B-69AE-11D9-BED3-505054503030}" /success:enable /failure:enable New-ItemProperty -Path HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Audit -Name ProcessCreationIncludeCmdLine_Enabled -PropertyType DWord -Value 1 -Force + Set-Policy -Scope Computer -Path SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Audit -Name ProcessCreationIncludeCmdLine_Enabled -Type DWORD -Value 1 } "Disable" @@ -14023,6 +13959,7 @@ function EventViewerCustomView # Include command line in process creation events New-ItemProperty -Path HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Audit -Name ProcessCreationIncludeCmdLine_Enabled -PropertyType DWord -Value 1 -Force + Set-Policy -Scope Computer -Path SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Audit -Name ProcessCreationIncludeCmdLine_Enabled -Type DWORD -Value 1 $XML = @" @@ -14107,6 +14044,7 @@ function PowerShellModulesLogging } New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging -Name EnableModuleLogging -PropertyType DWord -Value 1 -Force New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging\ModuleNames -Name * -PropertyType String -Value * -Force + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging -Name EnableModuleLogging -Type DWORD -Value 1 Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging\ModuleNames -Name * -Type SZ -Value * } @@ -14114,6 +14052,7 @@ function PowerShellModulesLogging { Remove-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging -Name EnableModuleLogging -Force -ErrorAction Ignore Remove-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging\ModuleNames -Name * -Force -ErrorAction Ignore + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging -Name EnableModuleLogging -Type CLEAR } } @@ -14166,6 +14105,7 @@ function PowerShellScriptsLogging New-Item -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ScriptBlockLogging -Force } New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ScriptBlockLogging -Name EnableScriptBlockLogging -PropertyType DWord -Value 1 -Force + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\PowerShell\ScriptBlockLogging -Name EnableScriptBlockLogging -Type DWORD -Value 1 } "Disable" @@ -14277,6 +14217,7 @@ function SaveZoneInformation New-Item -Path HKCU:\Software\Microsoft\Windows\CurrentVersion\Policies\Attachments -Force } New-ItemProperty -Path HKCU:\Software\Microsoft\Windows\CurrentVersion\Policies\Attachments -Name SaveZoneInformation -PropertyType DWord -Value 1 -Force + Set-Policy -Scope User -Path Software\Microsoft\Windows\CurrentVersion\Policies\Attachments -Name SaveZoneInformation -Type DWORD -Value 1 } "Enable" @@ -15434,6 +15375,7 @@ function UseStoreOpenWith New-Item -Path HKCU:\Software\Policies\Microsoft\Windows\Explorer -Force } New-ItemProperty -Path HKCU:\Software\Policies\Microsoft\Windows\Explorer -Name NoUseStoreOpenWith -PropertyType DWord -Value 1 -Force + Set-Policy -Scope User -Path Software\Policies\Microsoft\Windows\Explorer -Name NoUseStoreOpenWith -Type DWORD -Value 1 } "Show" diff --git a/src/Sophia_Script_for_Windows_10/Sophia.ps1 b/src/Sophia_Script_for_Windows_10/Sophia.ps1 index 039ac1db0..baa0c905b 100644 --- a/src/Sophia_Script_for_Windows_10/Sophia.ps1 +++ b/src/Sophia_Script_for_Windows_10/Sophia.ps1 @@ -672,14 +672,6 @@ DeliveryOptimization -Disable # Включить оптимизацию доставки (значение по умолчанию) # DeliveryOptimization -Enable -# Always wait for the network at computer startup and logon for workgroup networks -# Всегда ждать сеть при запуске и входе в систему для рабочих групп -WaitNetworkStartup -Enable - -# Never wait for the network at computer startup and logon for workgroup networks (default value) -# Никогда не ждать сеть при запуске и входе в систему для рабочих групп (значение по умолчанию) -# WaitNetworkStartup -Disable - # Do not let Windows manage my default printer # Не разрешать Windows управлять принтером, используемым по умолчанию WindowsManageDefaultPrinter -Disable diff --git a/src/Sophia_Script_for_Windows_10_LTSC_2019/Module/Sophia.psm1 b/src/Sophia_Script_for_Windows_10_LTSC_2019/Module/Sophia.psm1 index 4405f0fbb..7a78f1e60 100644 --- a/src/Sophia_Script_for_Windows_10_LTSC_2019/Module/Sophia.psm1 +++ b/src/Sophia_Script_for_Windows_10_LTSC_2019/Module/Sophia.psm1 @@ -1059,8 +1059,8 @@ function DiagnosticDataLevel # Full level New-ItemProperty -Path HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection -Name MaxTelemetryAllowed -PropertyType DWord -Value 3 -Force New-ItemProperty -Path HKCU:\Software\Microsoft\Windows\CurrentVersion\Diagnostics\DiagTrack -Name ShowedToastAtLevel -PropertyType DWord -Value 3 -Force - Remove-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Force -ErrorAction Ignore + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Type CLEAR } } @@ -4775,69 +4775,6 @@ function DeliveryOptimization } } -<# - .SYNOPSIS - The Group Policy processing - - .PARAMETER Enable - Always wait for the network at computer startup and logon for workgroup networks - - .PARAMETER Disable - Never wait for the network at computer startup and logon for workgroup networks - - .EXAMPLE - WaitNetworkStartup -Enable - - .EXAMPLE - WaitNetworkStartup -Disable - - .NOTES - Machine-wide -#> -function WaitNetworkStartup -{ - param - ( - [Parameter( - Mandatory = $true, - ParameterSetName = "Enable" - )] - [switch] - $Enable, - - [Parameter( - Mandatory = $true, - ParameterSetName = "Disable" - )] - [switch] - $Disable - ) - - switch ($PSCmdlet.ParameterSetName) - { - "Enable" - { - if ((Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) - { - if (-not (Test-Path -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon")) - { - New-Item -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Force - } - New-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name SyncForegroundPolicy -PropertyType DWord -Value 1 -Force - Set-Policy -Scope Computer -Path "SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name SyncForegroundPolicy -Type DWORD -Value 1 - } - } - "Disable" - { - if ((Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) - { - Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name SyncForegroundPolicy -Force -ErrorAction Ignore - Set-Policy -Scope Computer -Path "SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name SyncForegroundPolicy -Type CLEAR - } - } - } -} - <# .SYNOPSIS Windows manages my default printer @@ -7298,6 +7235,11 @@ function NetworkDiscovery $Disable ) + if ((Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) + { + return + } + $FirewallRules = @( # File and printer sharing "@FirewallAPI.dll,-32752", @@ -7310,20 +7252,13 @@ function NetworkDiscovery { "Enable" { - if (-not (Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) - { - Set-NetFirewallRule -Group $FirewallRules -Profile Private -Enabled True - - Set-NetFirewallRule -Profile Public, Private -Name FPS-SMB-In-TCP -Enabled True - Set-NetConnectionProfile -NetworkCategory Private - } + Set-NetFirewallRule -Group $FirewallRules -Profile Private -Enabled True + Set-NetFirewallRule -Profile Public, Private -Name FPS-SMB-In-TCP -Enabled True + Set-NetConnectionProfile -NetworkCategory Private } "Disable" { - if (-not (Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) - { - Set-NetFirewallRule -Group $FirewallRules -Profile Private -Enabled False - } + Set-NetFirewallRule -Group $FirewallRules -Profile Private -Enabled False } } } @@ -10480,6 +10415,7 @@ function CommandLineProcessAudit auditpol /set /subcategory:"{0CCE922B-69AE-11D9-BED3-505054503030}" /success:enable /failure:enable New-ItemProperty -Path HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Audit -Name ProcessCreationIncludeCmdLine_Enabled -PropertyType DWord -Value 1 -Force + Set-Policy -Scope Computer -Path SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Audit -Name ProcessCreationIncludeCmdLine_Enabled -Type DWORD -Value 1 } "Disable" @@ -10540,6 +10476,7 @@ function EventViewerCustomView # Include command line in process creation events New-ItemProperty -Path HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Audit -Name ProcessCreationIncludeCmdLine_Enabled -PropertyType DWord -Value 1 -Force + Set-Policy -Scope Computer -Path SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Audit -Name ProcessCreationIncludeCmdLine_Enabled -Type DWORD -Value 1 $XML = @" @@ -10624,6 +10561,7 @@ function PowerShellModulesLogging } New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging -Name EnableModuleLogging -PropertyType DWord -Value 1 -Force New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging\ModuleNames -Name * -PropertyType String -Value * -Force + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging -Name EnableModuleLogging -Type DWORD -Value 1 Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging\ModuleNames -Name * -Type SZ -Value * } @@ -10631,6 +10569,7 @@ function PowerShellModulesLogging { Remove-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging -Name EnableModuleLogging -Force -ErrorAction Ignore Remove-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging\ModuleNames -Name * -Force -ErrorAction Ignore + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging -Name EnableModuleLogging -Type CLEAR } } @@ -10683,6 +10622,7 @@ function PowerShellScriptsLogging New-Item -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ScriptBlockLogging -Force } New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ScriptBlockLogging -Name EnableScriptBlockLogging -PropertyType DWord -Value 1 -Force + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\PowerShell\ScriptBlockLogging -Name EnableScriptBlockLogging -Type DWORD -Value 1 } "Disable" @@ -10794,6 +10734,7 @@ function SaveZoneInformation New-Item -Path HKCU:\Software\Microsoft\Windows\CurrentVersion\Policies\Attachments -Force } New-ItemProperty -Path HKCU:\Software\Microsoft\Windows\CurrentVersion\Policies\Attachments -Name SaveZoneInformation -PropertyType DWord -Value 1 -Force + Set-Policy -Scope User -Path Software\Microsoft\Windows\CurrentVersion\Policies\Attachments -Name SaveZoneInformation -Type DWORD -Value 1 } "Enable" diff --git a/src/Sophia_Script_for_Windows_10_LTSC_2019/Sophia.ps1 b/src/Sophia_Script_for_Windows_10_LTSC_2019/Sophia.ps1 index ac25d82f6..bdcfb2b69 100644 --- a/src/Sophia_Script_for_Windows_10_LTSC_2019/Sophia.ps1 +++ b/src/Sophia_Script_for_Windows_10_LTSC_2019/Sophia.ps1 @@ -521,14 +521,6 @@ DeliveryOptimization -Disable # Включить оптимизацию доставки (значение по умолчанию) # DeliveryOptimization -Enable -# Always wait for the network at computer startup and logon for workgroup networks -# Всегда ждать сеть при запуске и входе в систему для рабочих групп -WaitNetworkStartup -Enable - -# Never wait for the network at computer startup and logon for workgroup networks (default value) -# Никогда не ждать сеть при запуске и входе в систему для рабочих групп (значение по умолчанию) -# WaitNetworkStartup -Disable - # Do not let Windows manage my default printer # Не разрешать Windows управлять принтером, используемым по умолчанию WindowsManageDefaultPrinter -Disable diff --git a/src/Sophia_Script_for_Windows_10_LTSC_2021/Module/Sophia.psm1 b/src/Sophia_Script_for_Windows_10_LTSC_2021/Module/Sophia.psm1 index a8b08711d..eff48a49e 100644 --- a/src/Sophia_Script_for_Windows_10_LTSC_2021/Module/Sophia.psm1 +++ b/src/Sophia_Script_for_Windows_10_LTSC_2021/Module/Sophia.psm1 @@ -1059,8 +1059,8 @@ function DiagnosticDataLevel # Optional diagnostic data New-ItemProperty -Path HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection -Name MaxTelemetryAllowed -PropertyType DWord -Value 3 -Force New-ItemProperty -Path HKCU:\Software\Microsoft\Windows\CurrentVersion\Diagnostics\DiagTrack -Name ShowedToastAtLevel -PropertyType DWord -Value 3 -Force - Remove-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Force -ErrorAction Ignore + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Type CLEAR } } @@ -1843,6 +1843,7 @@ function BingSearch New-Item -Path HKCU:\Software\Policies\Microsoft\Windows\Explorer -Force } New-ItemProperty -Path HKCU:\Software\Policies\Microsoft\Windows\Explorer -Name DisableSearchBoxSuggestions -PropertyType DWord -Value 1 -Force + Set-Policy -Scope User -Path Software\Policies\Microsoft\Windows\Explorer -Name DisableSearchBoxSuggestions -Type DWORD -Value 1 } "Enable" @@ -5147,69 +5148,6 @@ function DeliveryOptimization } } -<# - .SYNOPSIS - The Group Policy processing - - .PARAMETER Enable - Always wait for the network at computer startup and logon for workgroup networks - - .PARAMETER Disable - Never wait for the network at computer startup and logon for workgroup networks - - .EXAMPLE - WaitNetworkStartup -Enable - - .EXAMPLE - WaitNetworkStartup -Disable - - .NOTES - Machine-wide -#> -function WaitNetworkStartup -{ - param - ( - [Parameter( - Mandatory = $true, - ParameterSetName = "Enable" - )] - [switch] - $Enable, - - [Parameter( - Mandatory = $true, - ParameterSetName = "Disable" - )] - [switch] - $Disable - ) - - switch ($PSCmdlet.ParameterSetName) - { - "Enable" - { - if ((Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) - { - if (-not (Test-Path -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon")) - { - New-Item -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Force - } - New-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name SyncForegroundPolicy -PropertyType DWord -Value 1 -Force - Set-Policy -Scope Computer -Path "SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name SyncForegroundPolicy -Type DWORD -Value 1 - } - } - "Disable" - { - if ((Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) - { - Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name SyncForegroundPolicy -Force -ErrorAction Ignore - Set-Policy -Scope Computer -Path "SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name SyncForegroundPolicy -Type CLEAR - } - } - } -} - <# .SYNOPSIS Windows manages my default printer @@ -7352,6 +7290,7 @@ function RecommendedTroubleshooting New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -PropertyType DWord -Value 3 -Force New-ItemProperty -Path HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection -Name MaxTelemetryAllowed -PropertyType DWord -Value 3 -Force New-ItemProperty -Path HKCU:\Software\Microsoft\Windows\CurrentVersion\Diagnostics\DiagTrack -Name ShowedToastAtLevel -PropertyType DWord -Value 3 -Force + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Type DWORD -Value 1 # Turn on Windows Error Reporting @@ -7872,6 +7811,11 @@ function NetworkDiscovery $Disable ) + if ((Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) + { + return + } + $FirewallRules = @( # File and printer sharing "@FirewallAPI.dll,-32752", @@ -7884,20 +7828,13 @@ function NetworkDiscovery { "Enable" { - if (-not (Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) - { - Set-NetFirewallRule -Group $FirewallRules -Profile Private -Enabled True - - Set-NetFirewallRule -Profile Public, Private -Name FPS-SMB-In-TCP -Enabled True - Set-NetConnectionProfile -NetworkCategory Private - } + Set-NetFirewallRule -Group $FirewallRules -Profile Private -Enabled True + Set-NetFirewallRule -Profile Public, Private -Name FPS-SMB-In-TCP -Enabled True + Set-NetConnectionProfile -NetworkCategory Private } "Disable" { - if (-not (Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) - { - Set-NetFirewallRule -Group $FirewallRules -Profile Private -Enabled False - } + Set-NetFirewallRule -Group $FirewallRules -Profile Private -Enabled False } } } @@ -11596,6 +11533,7 @@ function CommandLineProcessAudit auditpol /set /subcategory:"{0CCE922B-69AE-11D9-BED3-505054503030}" /success:enable /failure:enable New-ItemProperty -Path HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Audit -Name ProcessCreationIncludeCmdLine_Enabled -PropertyType DWord -Value 1 -Force + Set-Policy -Scope Computer -Path SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Audit -Name ProcessCreationIncludeCmdLine_Enabled -Type DWORD -Value 1 } "Disable" @@ -11656,6 +11594,7 @@ function EventViewerCustomView # Include command line in process creation events New-ItemProperty -Path HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Audit -Name ProcessCreationIncludeCmdLine_Enabled -PropertyType DWord -Value 1 -Force + Set-Policy -Scope Computer -Path SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Audit -Name ProcessCreationIncludeCmdLine_Enabled -Type DWORD -Value 1 $XML = @" @@ -11740,6 +11679,7 @@ function PowerShellModulesLogging } New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging -Name EnableModuleLogging -PropertyType DWord -Value 1 -Force New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging\ModuleNames -Name * -PropertyType String -Value * -Force + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging -Name EnableModuleLogging -Type DWORD -Value 1 Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging\ModuleNames -Name * -Type SZ -Value * } @@ -11747,6 +11687,7 @@ function PowerShellModulesLogging { Remove-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging -Name EnableModuleLogging -Force -ErrorAction Ignore Remove-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging\ModuleNames -Name * -Force -ErrorAction Ignore + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging -Name EnableModuleLogging -Type CLEAR } } @@ -11799,6 +11740,7 @@ function PowerShellScriptsLogging New-Item -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ScriptBlockLogging -Force } New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ScriptBlockLogging -Name EnableScriptBlockLogging -PropertyType DWord -Value 1 -Force + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\PowerShell\ScriptBlockLogging -Name EnableScriptBlockLogging -Type DWORD -Value 1 } "Disable" @@ -11910,6 +11852,7 @@ function SaveZoneInformation New-Item -Path HKCU:\Software\Microsoft\Windows\CurrentVersion\Policies\Attachments -Force } New-ItemProperty -Path HKCU:\Software\Microsoft\Windows\CurrentVersion\Policies\Attachments -Name SaveZoneInformation -PropertyType DWord -Value 1 -Force + Set-Policy -Scope User -Path Software\Microsoft\Windows\CurrentVersion\Policies\Attachments -Name SaveZoneInformation -Type DWORD -Value 1 } "Enable" diff --git a/src/Sophia_Script_for_Windows_10_LTSC_2021/Sophia.ps1 b/src/Sophia_Script_for_Windows_10_LTSC_2021/Sophia.ps1 index f822799c0..b31685adb 100644 --- a/src/Sophia_Script_for_Windows_10_LTSC_2021/Sophia.ps1 +++ b/src/Sophia_Script_for_Windows_10_LTSC_2021/Sophia.ps1 @@ -577,14 +577,6 @@ DeliveryOptimization -Disable # Включить оптимизацию доставки (значение по умолчанию) # DeliveryOptimization -Enable -# Always wait for the network at computer startup and logon for workgroup networks -# Всегда ждать сеть при запуске и входе в систему для рабочих групп -WaitNetworkStartup -Enable - -# Never wait for the network at computer startup and logon for workgroup networks (default value) -# Никогда не ждать сеть при запуске и входе в систему для рабочих групп (значение по умолчанию) -# WaitNetworkStartup -Disable - # Do not let Windows manage my default printer # Не разрешать Windows управлять принтером, используемым по умолчанию WindowsManageDefaultPrinter -Disable diff --git a/src/Sophia_Script_for_Windows_10_PowerShell_7/Module/Sophia.psm1 b/src/Sophia_Script_for_Windows_10_PowerShell_7/Module/Sophia.psm1 index bfac5e632..3faf34c6f 100644 --- a/src/Sophia_Script_for_Windows_10_PowerShell_7/Module/Sophia.psm1 +++ b/src/Sophia_Script_for_Windows_10_PowerShell_7/Module/Sophia.psm1 @@ -1185,14 +1185,12 @@ function DiagnosticDataLevel { # Security level New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -PropertyType DWord -Value 0 -Force - Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Type DWORD -Value 0 } else { # Required diagnostic data New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -PropertyType DWord -Value 1 -Force - Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Type DWORD -Value 1 } @@ -1204,8 +1202,8 @@ function DiagnosticDataLevel # Optional diagnostic data New-ItemProperty -Path HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection -Name MaxTelemetryAllowed -PropertyType DWord -Value 3 -Force New-ItemProperty -Path HKCU:\Software\Microsoft\Windows\CurrentVersion\Diagnostics\DiagTrack -Name ShowedToastAtLevel -PropertyType DWord -Value 3 -Force - Remove-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Force -ErrorAction Ignore + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Type CLEAR } } @@ -2196,6 +2194,7 @@ function BingSearch New-Item -Path HKCU:\Software\Policies\Microsoft\Windows\Explorer -Force } New-ItemProperty -Path HKCU:\Software\Policies\Microsoft\Windows\Explorer -Name DisableSearchBoxSuggestions -PropertyType DWord -Value 1 -Force + Set-Policy -Scope User -Path Software\Policies\Microsoft\Windows\Explorer -Name DisableSearchBoxSuggestions -Type DWORD -Value 1 } "Enable" @@ -6150,69 +6149,6 @@ function DeliveryOptimization } } -<# - .SYNOPSIS - The Group Policy processing - - .PARAMETER Enable - Always wait for the network at computer startup and logon for workgroup networks - - .PARAMETER Disable - Never wait for the network at computer startup and logon for workgroup networks - - .EXAMPLE - WaitNetworkStartup -Enable - - .EXAMPLE - WaitNetworkStartup -Disable - - .NOTES - Machine-wide -#> -function WaitNetworkStartup -{ - param - ( - [Parameter( - Mandatory = $true, - ParameterSetName = "Enable" - )] - [switch] - $Enable, - - [Parameter( - Mandatory = $true, - ParameterSetName = "Disable" - )] - [switch] - $Disable - ) - - switch ($PSCmdlet.ParameterSetName) - { - "Enable" - { - if ((Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) - { - if (-not (Test-Path -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon")) - { - New-Item -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Force - } - New-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name SyncForegroundPolicy -PropertyType DWord -Value 1 -Force - Set-Policy -Scope Computer -Path "SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name SyncForegroundPolicy -Type DWORD -Value 1 - } - } - "Disable" - { - if ((Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) - { - Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name SyncForegroundPolicy -Force -ErrorAction Ignore - Set-Policy -Scope Computer -Path "SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name SyncForegroundPolicy -Type CLEAR - } - } - } -} - <# .SYNOPSIS Windows manages my default printer @@ -8410,6 +8346,7 @@ function RecommendedTroubleshooting New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -PropertyType DWord -Value 3 -Force New-ItemProperty -Path HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection -Name MaxTelemetryAllowed -PropertyType DWord -Value 3 -Force New-ItemProperty -Path HKCU:\Software\Microsoft\Windows\CurrentVersion\Diagnostics\DiagTrack -Name ShowedToastAtLevel -PropertyType DWord -Value 3 -Force + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Type DWORD -Value 1 # Turn on Windows Error Reporting @@ -8930,6 +8867,11 @@ function NetworkDiscovery $Disable ) + if ((Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) + { + return + } + $FirewallRules = @( # File and printer sharing "@FirewallAPI.dll,-32752", @@ -8942,20 +8884,13 @@ function NetworkDiscovery { "Enable" { - if (-not (Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) - { - Set-NetFirewallRule -Group $FirewallRules -Profile Private -Enabled True - - Set-NetFirewallRule -Profile Public, Private -Name FPS-SMB-In-TCP -Enabled True - Set-NetConnectionProfile -NetworkCategory Private - } + Set-NetFirewallRule -Group $FirewallRules -Profile Private -Enabled True + Set-NetFirewallRule -Profile Public, Private -Name FPS-SMB-In-TCP -Enabled True + Set-NetConnectionProfile -NetworkCategory Private } "Disable" { - if (-not (Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) - { - Set-NetFirewallRule -Group $FirewallRules -Profile Private -Enabled False - } + Set-NetFirewallRule -Group $FirewallRules -Profile Private -Enabled False } } } @@ -13987,6 +13922,7 @@ function CommandLineProcessAudit auditpol /set /subcategory:"{0CCE922B-69AE-11D9-BED3-505054503030}" /success:enable /failure:enable New-ItemProperty -Path HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Audit -Name ProcessCreationIncludeCmdLine_Enabled -PropertyType DWord -Value 1 -Force + Set-Policy -Scope Computer -Path SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Audit -Name ProcessCreationIncludeCmdLine_Enabled -Type DWORD -Value 1 } "Disable" @@ -14047,6 +13983,7 @@ function EventViewerCustomView # Include command line in process creation events New-ItemProperty -Path HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Audit -Name ProcessCreationIncludeCmdLine_Enabled -PropertyType DWord -Value 1 -Force + Set-Policy -Scope Computer -Path SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Audit -Name ProcessCreationIncludeCmdLine_Enabled -Type DWORD -Value 1 $XML = @" @@ -14131,6 +14068,7 @@ function PowerShellModulesLogging } New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging -Name EnableModuleLogging -PropertyType DWord -Value 1 -Force New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging\ModuleNames -Name * -PropertyType String -Value * -Force + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging -Name EnableModuleLogging -Type DWORD -Value 1 Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging\ModuleNames -Name * -Type SZ -Value * } @@ -14138,6 +14076,7 @@ function PowerShellModulesLogging { Remove-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging -Name EnableModuleLogging -Force -ErrorAction Ignore Remove-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging\ModuleNames -Name * -Force -ErrorAction Ignore + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging -Name EnableModuleLogging -Type CLEAR } } @@ -14190,6 +14129,7 @@ function PowerShellScriptsLogging New-Item -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ScriptBlockLogging -Force } New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ScriptBlockLogging -Name EnableScriptBlockLogging -PropertyType DWord -Value 1 -Force + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\PowerShell\ScriptBlockLogging -Name EnableScriptBlockLogging -Type DWORD -Value 1 } "Disable" @@ -14301,6 +14241,7 @@ function SaveZoneInformation New-Item -Path HKCU:\Software\Microsoft\Windows\CurrentVersion\Policies\Attachments -Force } New-ItemProperty -Path HKCU:\Software\Microsoft\Windows\CurrentVersion\Policies\Attachments -Name SaveZoneInformation -PropertyType DWord -Value 1 -Force + Set-Policy -Scope User -Path Software\Microsoft\Windows\CurrentVersion\Policies\Attachments -Name SaveZoneInformation -Type DWORD -Value 1 } "Enable" @@ -15458,6 +15399,7 @@ function UseStoreOpenWith New-Item -Path HKCU:\Software\Policies\Microsoft\Windows\Explorer -Force } New-ItemProperty -Path HKCU:\Software\Policies\Microsoft\Windows\Explorer -Name NoUseStoreOpenWith -PropertyType DWord -Value 1 -Force + Set-Policy -Scope User -Path Software\Policies\Microsoft\Windows\Explorer -Name NoUseStoreOpenWith -Type DWORD -Value 1 } "Show" diff --git a/src/Sophia_Script_for_Windows_10_PowerShell_7/Sophia.ps1 b/src/Sophia_Script_for_Windows_10_PowerShell_7/Sophia.ps1 index d9d2a54bf..09de73ab0 100644 --- a/src/Sophia_Script_for_Windows_10_PowerShell_7/Sophia.ps1 +++ b/src/Sophia_Script_for_Windows_10_PowerShell_7/Sophia.ps1 @@ -681,14 +681,6 @@ DeliveryOptimization -Disable # Включить оптимизацию доставки (значение по умолчанию) # DeliveryOptimization -Enable -# Always wait for the network at computer startup and logon for workgroup networks -# Всегда ждать сеть при запуске и входе в систему для рабочих групп -WaitNetworkStartup -Enable - -# Never wait for the network at computer startup and logon for workgroup networks (default value) -# Никогда не ждать сеть при запуске и входе в систему для рабочих групп (значение по умолчанию) -# WaitNetworkStartup -Disable - # Do not let Windows manage my default printer # Не разрешать Windows управлять принтером, используемым по умолчанию WindowsManageDefaultPrinter -Disable diff --git a/src/Sophia_Script_for_Windows_11/Module/Sophia.psm1 b/src/Sophia_Script_for_Windows_11/Module/Sophia.psm1 index 67daa4c68..7c8247165 100644 --- a/src/Sophia_Script_for_Windows_11/Module/Sophia.psm1 +++ b/src/Sophia_Script_for_Windows_11/Module/Sophia.psm1 @@ -166,7 +166,7 @@ public static string GetString(uint strId) } catch [System.Net.WebException] { - Write-Warning -Message ($Localization.NoResponse -f "https://edgeupdates.microsoft.com") + Write-Warning -Message ($Localization.NoResponse -f "https://edgeupdates.microsoft.com") Write-Error -Message ($Localization.NoResponse -f "https://edgeupdates.microsoft.com") -ErrorAction SilentlyContinue } } @@ -1171,14 +1171,12 @@ function DiagnosticDataLevel { # Diagnostic data off New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -PropertyType DWord -Value 0 -Force - Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Type DWORD -Value 0 } else { # Send required diagnostic data New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -PropertyType DWord -Value 1 -Force - Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Type DWORD -Value 1 } @@ -1190,8 +1188,8 @@ function DiagnosticDataLevel # Optional diagnostic data New-ItemProperty -Path HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection -Name MaxTelemetryAllowed -PropertyType DWord -Value 3 -Force New-ItemProperty -Path HKCU:\Software\Microsoft\Windows\CurrentVersion\Diagnostics\DiagTrack -Name ShowedToastAtLevel -PropertyType DWord -Value 3 -Force - Remove-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Force -ErrorAction Ignore + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Type CLEAR } } @@ -2188,6 +2186,7 @@ function BingSearch New-Item -Path HKCU:\Software\Policies\Microsoft\Windows\Explorer -Force } New-ItemProperty -Path HKCU:\Software\Policies\Microsoft\Windows\Explorer -Name DisableSearchBoxSuggestions -PropertyType DWord -Value 1 -Force + Set-Policy -Scope User -Path Software\Policies\Microsoft\Windows\Explorer -Name DisableSearchBoxSuggestions -Type DWORD -Value 1 } "Enable" @@ -5487,69 +5486,6 @@ function DeliveryOptimization } } -<# - .SYNOPSIS - The Group Policy processing - - .PARAMETER Enable - Always wait for the network at computer startup and logon for workgroup networks - - .PARAMETER Disable - Never wait for the network at computer startup and logon for workgroup networks - - .EXAMPLE - WaitNetworkStartup -Enable - - .EXAMPLE - WaitNetworkStartup -Disable - - .NOTES - Machine-wide -#> -function WaitNetworkStartup -{ - param - ( - [Parameter( - Mandatory = $true, - ParameterSetName = "Enable" - )] - [switch] - $Enable, - - [Parameter( - Mandatory = $true, - ParameterSetName = "Disable" - )] - [switch] - $Disable - ) - - switch ($PSCmdlet.ParameterSetName) - { - "Enable" - { - if ((Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) - { - if (-not (Test-Path -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon")) - { - New-Item -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Force - } - New-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name SyncForegroundPolicy -PropertyType DWord -Value 1 -Force - Set-Policy -Scope Computer -Path "SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name SyncForegroundPolicy -Type DWORD -Value 1 - } - } - "Disable" - { - if ((Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) - { - Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name SyncForegroundPolicy -Force -ErrorAction Ignore - Set-Policy -Scope Computer -Path "SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name SyncForegroundPolicy -Type CLEAR - } - } - } -} - <# .SYNOPSIS Windows manages my default printer @@ -7948,6 +7884,7 @@ function RecommendedTroubleshooting New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -PropertyType DWord -Value 3 -Force New-ItemProperty -Path HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection -Name MaxTelemetryAllowed -PropertyType DWord -Value 3 -Force New-ItemProperty -Path HKCU:\Software\Microsoft\Windows\CurrentVersion\Diagnostics\DiagTrack -Name ShowedToastAtLevel -PropertyType DWord -Value 3 -Force + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Type DWORD -Value 1 # Turn on Windows Error Reporting @@ -8468,6 +8405,11 @@ function NetworkDiscovery $Disable ) + if ((Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) + { + return + } + $FirewallRules = @( # File and printer sharing "@FirewallAPI.dll,-32752", @@ -8480,20 +8422,13 @@ function NetworkDiscovery { "Enable" { - if (-not (Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) - { - Set-NetFirewallRule -Group $FirewallRules -Profile Private -Enabled True - - Set-NetFirewallRule -Profile Public, Private -Name FPS-SMB-In-TCP -Enabled True - Set-NetConnectionProfile -NetworkCategory Private - } + Set-NetFirewallRule -Group $FirewallRules -Profile Private -Enabled True + Set-NetFirewallRule -Profile Public, Private -Name FPS-SMB-In-TCP -Enabled True + Set-NetConnectionProfile -NetworkCategory Private } "Disable" { - if (-not (Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) - { - Set-NetFirewallRule -Group $FirewallRules -Profile Private -Enabled False - } + Set-NetFirewallRule -Group $FirewallRules -Profile Private -Enabled False } } } @@ -13027,6 +12962,7 @@ function CommandLineProcessAudit auditpol /set /subcategory:"{0CCE922B-69AE-11D9-BED3-505054503030}" /success:enable /failure:enable New-ItemProperty -Path HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Audit -Name ProcessCreationIncludeCmdLine_Enabled -PropertyType DWord -Value 1 -Force + Set-Policy -Scope Computer -Path SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Audit -Name ProcessCreationIncludeCmdLine_Enabled -Type DWORD -Value 1 } "Disable" @@ -13087,6 +13023,7 @@ function EventViewerCustomView # Include command line in process creation events New-ItemProperty -Path HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Audit -Name ProcessCreationIncludeCmdLine_Enabled -PropertyType DWord -Value 1 -Force + Set-Policy -Scope Computer -Path SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Audit -Name ProcessCreationIncludeCmdLine_Enabled -Type DWORD -Value 1 $XML = @" @@ -13171,6 +13108,7 @@ function PowerShellModulesLogging } New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging -Name EnableModuleLogging -PropertyType DWord -Value 1 -Force New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging\ModuleNames -Name * -PropertyType String -Value * -Force + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging -Name EnableModuleLogging -Type DWORD -Value 1 Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging\ModuleNames -Name * -Type SZ -Value * } @@ -13178,6 +13116,7 @@ function PowerShellModulesLogging { Remove-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging -Name EnableModuleLogging -Force -ErrorAction Ignore Remove-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging\ModuleNames -Name * -Force -ErrorAction Ignore + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging -Name EnableModuleLogging -Type CLEAR } } @@ -13230,6 +13169,7 @@ function PowerShellScriptsLogging New-Item -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ScriptBlockLogging -Force } New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ScriptBlockLogging -Name EnableScriptBlockLogging -PropertyType DWord -Value 1 -Force + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\PowerShell\ScriptBlockLogging -Name EnableScriptBlockLogging -Type DWORD -Value 1 } "Disable" @@ -13341,6 +13281,7 @@ function SaveZoneInformation New-Item -Path HKCU:\Software\Microsoft\Windows\CurrentVersion\Policies\Attachments -Force } New-ItemProperty -Path HKCU:\Software\Microsoft\Windows\CurrentVersion\Policies\Attachments -Name SaveZoneInformation -PropertyType DWord -Value 1 -Force + Set-Policy -Scope User -Path Software\Microsoft\Windows\CurrentVersion\Policies\Attachments -Name SaveZoneInformation -Type DWORD -Value 1 } "Enable" @@ -13599,7 +13540,7 @@ function DNSoverHTTPS switch ($PSCmdlet.ParameterSetName) { - "Enable" + "Enable" ### { # Set a primary and secondary DNS servers if (-not (Get-CimInstance -ClassName CIM_ComputerSystem).HypervisorPresent) @@ -14402,6 +14343,7 @@ function UseStoreOpenWith New-Item -Path HKCU:\Software\Policies\Microsoft\Windows\Explorer -Force } New-ItemProperty -Path HKCU:\Software\Policies\Microsoft\Windows\Explorer -Name NoUseStoreOpenWith -PropertyType DWord -Value 1 -Force + Set-Policy -Scope User -Path Software\Policies\Microsoft\Windows\Explorer -Name NoUseStoreOpenWith -Type DWORD -Value 1 } "Show" diff --git a/src/Sophia_Script_for_Windows_11/Sophia.ps1 b/src/Sophia_Script_for_Windows_11/Sophia.ps1 index 6b2546137..94440f4d4 100644 --- a/src/Sophia_Script_for_Windows_11/Sophia.ps1 +++ b/src/Sophia_Script_for_Windows_11/Sophia.ps1 @@ -639,14 +639,6 @@ DeliveryOptimization -Disable # Включить оптимизацию доставки (значение по умолчанию) # DeliveryOptimization -Enable -# Always wait for the network at computer startup and logon for workgroup networks -# Всегда ждать сеть при запуске и входе в систему для рабочих групп -WaitNetworkStartup -Enable - -# Never wait for the network at computer startup and logon for workgroup networks (default value) -# Никогда не ждать сеть при запуске и входе в систему для рабочих групп (значение по умолчанию) -# WaitNetworkStartup -Disable - # Do not let Windows manage my default printer # Не разрешать Windows управлять принтером, используемым по умолчанию WindowsManageDefaultPrinter -Disable diff --git a/src/Sophia_Script_for_Windows_11_PowerShell_7/Module/Sophia.psm1 b/src/Sophia_Script_for_Windows_11_PowerShell_7/Module/Sophia.psm1 index 7928aa68c..0ddfa45cb 100644 --- a/src/Sophia_Script_for_Windows_11_PowerShell_7/Module/Sophia.psm1 +++ b/src/Sophia_Script_for_Windows_11_PowerShell_7/Module/Sophia.psm1 @@ -162,7 +162,7 @@ public static string GetString(uint strId) } catch [System.Net.WebException] { - Write-Warning -Message ($Localization.NoResponse -f "https://edgeupdates.microsoft.com") + Write-Warning -Message ($Localization.NoResponse -f "https://edgeupdates.microsoft.com") Write-Error -Message ($Localization.NoResponse -f "https://edgeupdates.microsoft.com") -ErrorAction SilentlyContinue } } @@ -1172,14 +1172,12 @@ function DiagnosticDataLevel { # Diagnostic data off New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -PropertyType DWord -Value 0 -Force - Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Type DWORD -Value 0 } else { # Send required diagnostic data New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -PropertyType DWord -Value 1 -Force - Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Type DWORD -Value 1 } @@ -1191,8 +1189,8 @@ function DiagnosticDataLevel # Optional diagnostic data New-ItemProperty -Path HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection -Name MaxTelemetryAllowed -PropertyType DWord -Value 3 -Force New-ItemProperty -Path HKCU:\Software\Microsoft\Windows\CurrentVersion\Diagnostics\DiagTrack -Name ShowedToastAtLevel -PropertyType DWord -Value 3 -Force - Remove-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Force -ErrorAction Ignore + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Type CLEAR } } @@ -2189,6 +2187,7 @@ function BingSearch New-Item -Path HKCU:\Software\Policies\Microsoft\Windows\Explorer -Force } New-ItemProperty -Path HKCU:\Software\Policies\Microsoft\Windows\Explorer -Name DisableSearchBoxSuggestions -PropertyType DWord -Value 1 -Force + Set-Policy -Scope User -Path Software\Policies\Microsoft\Windows\Explorer -Name DisableSearchBoxSuggestions -Type DWORD -Value 1 } "Enable" @@ -5488,69 +5487,6 @@ function DeliveryOptimization } } -<# - .SYNOPSIS - The Group Policy processing - - .PARAMETER Enable - Always wait for the network at computer startup and logon for workgroup networks - - .PARAMETER Disable - Never wait for the network at computer startup and logon for workgroup networks - - .EXAMPLE - WaitNetworkStartup -Enable - - .EXAMPLE - WaitNetworkStartup -Disable - - .NOTES - Machine-wide -#> -function WaitNetworkStartup -{ - param - ( - [Parameter( - Mandatory = $true, - ParameterSetName = "Enable" - )] - [switch] - $Enable, - - [Parameter( - Mandatory = $true, - ParameterSetName = "Disable" - )] - [switch] - $Disable - ) - - switch ($PSCmdlet.ParameterSetName) - { - "Enable" - { - if ((Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) - { - if (-not (Test-Path -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon")) - { - New-Item -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Force - } - New-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name SyncForegroundPolicy -PropertyType DWord -Value 1 -Force - Set-Policy -Scope Computer -Path "SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name SyncForegroundPolicy -Type DWORD -Value 1 - } - } - "Disable" - { - if ((Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) - { - Remove-ItemProperty -Path "HKLM:\SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name SyncForegroundPolicy -Force -ErrorAction Ignore - Set-Policy -Scope Computer -Path "SOFTWARE\Policies\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name SyncForegroundPolicy -Type CLEAR - } - } - } -} - <# .SYNOPSIS Windows manages my default printer @@ -7949,6 +7885,7 @@ function RecommendedTroubleshooting New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -PropertyType DWord -Value 3 -Force New-ItemProperty -Path HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\DataCollection -Name MaxTelemetryAllowed -PropertyType DWord -Value 3 -Force New-ItemProperty -Path HKCU:\Software\Microsoft\Windows\CurrentVersion\Diagnostics\DiagTrack -Name ShowedToastAtLevel -PropertyType DWord -Value 3 -Force + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\DataCollection -Name AllowTelemetry -Type DWORD -Value 1 # Turn on Windows Error Reporting @@ -8469,6 +8406,11 @@ function NetworkDiscovery $Disable ) + if ((Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) + { + return + } + $FirewallRules = @( # File and printer sharing "@FirewallAPI.dll,-32752", @@ -8481,20 +8423,13 @@ function NetworkDiscovery { "Enable" { - if (-not (Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) - { - Set-NetFirewallRule -Group $FirewallRules -Profile Private -Enabled True - - Set-NetFirewallRule -Profile Public, Private -Name FPS-SMB-In-TCP -Enabled True - Set-NetConnectionProfile -NetworkCategory Private - } + Set-NetFirewallRule -Group $FirewallRules -Profile Private -Enabled True + Set-NetFirewallRule -Profile Public, Private -Name FPS-SMB-In-TCP -Enabled True + Set-NetConnectionProfile -NetworkCategory Private } "Disable" { - if (-not (Get-CimInstance -ClassName CIM_ComputerSystem).PartOfDomain) - { - Set-NetFirewallRule -Group $FirewallRules -Profile Private -Enabled False - } + Set-NetFirewallRule -Group $FirewallRules -Profile Private -Enabled False } } } @@ -13048,6 +12983,7 @@ function CommandLineProcessAudit auditpol /set /subcategory:"{0CCE922B-69AE-11D9-BED3-505054503030}" /success:enable /failure:enable New-ItemProperty -Path HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Audit -Name ProcessCreationIncludeCmdLine_Enabled -PropertyType DWord -Value 1 -Force + Set-Policy -Scope Computer -Path SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Audit -Name ProcessCreationIncludeCmdLine_Enabled -Type DWORD -Value 1 } "Disable" @@ -13108,6 +13044,7 @@ function EventViewerCustomView # Include command line in process creation events New-ItemProperty -Path HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Audit -Name ProcessCreationIncludeCmdLine_Enabled -PropertyType DWord -Value 1 -Force + Set-Policy -Scope Computer -Path SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\System\Audit -Name ProcessCreationIncludeCmdLine_Enabled -Type DWORD -Value 1 $XML = @" @@ -13192,6 +13129,7 @@ function PowerShellModulesLogging } New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging -Name EnableModuleLogging -PropertyType DWord -Value 1 -Force New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging\ModuleNames -Name * -PropertyType String -Value * -Force + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging -Name EnableModuleLogging -Type DWORD -Value 1 Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging\ModuleNames -Name * -Type SZ -Value * } @@ -13199,6 +13137,7 @@ function PowerShellModulesLogging { Remove-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging -Name EnableModuleLogging -Force -ErrorAction Ignore Remove-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging\ModuleNames -Name * -Force -ErrorAction Ignore + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\PowerShell\ModuleLogging -Name EnableModuleLogging -Type CLEAR } } @@ -13251,6 +13190,7 @@ function PowerShellScriptsLogging New-Item -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ScriptBlockLogging -Force } New-ItemProperty -Path HKLM:\SOFTWARE\Policies\Microsoft\Windows\PowerShell\ScriptBlockLogging -Name EnableScriptBlockLogging -PropertyType DWord -Value 1 -Force + Set-Policy -Scope Computer -Path SOFTWARE\Policies\Microsoft\Windows\PowerShell\ScriptBlockLogging -Name EnableScriptBlockLogging -Type DWORD -Value 1 } "Disable" @@ -13362,6 +13302,7 @@ function SaveZoneInformation New-Item -Path HKCU:\Software\Microsoft\Windows\CurrentVersion\Policies\Attachments -Force } New-ItemProperty -Path HKCU:\Software\Microsoft\Windows\CurrentVersion\Policies\Attachments -Name SaveZoneInformation -PropertyType DWord -Value 1 -Force + Set-Policy -Scope User -Path Software\Microsoft\Windows\CurrentVersion\Policies\Attachments -Name SaveZoneInformation -Type DWORD -Value 1 } "Enable" @@ -13620,7 +13561,7 @@ function DNSoverHTTPS switch ($PSCmdlet.ParameterSetName) { - "Enable" + "Enable" ### { # Set a primary and secondary DNS servers if (-not (Get-CimInstance -ClassName CIM_ComputerSystem).HypervisorPresent) @@ -14423,6 +14364,7 @@ function UseStoreOpenWith New-Item -Path HKCU:\Software\Policies\Microsoft\Windows\Explorer -Force } New-ItemProperty -Path HKCU:\Software\Policies\Microsoft\Windows\Explorer -Name NoUseStoreOpenWith -PropertyType DWord -Value 1 -Force + Set-Policy -Scope User -Path Software\Policies\Microsoft\Windows\Explorer -Name NoUseStoreOpenWith -Type DWORD -Value 1 } "Show" diff --git a/src/Sophia_Script_for_Windows_11_PowerShell_7/Sophia.ps1 b/src/Sophia_Script_for_Windows_11_PowerShell_7/Sophia.ps1 index 4d3835320..22cd2b7c9 100644 --- a/src/Sophia_Script_for_Windows_11_PowerShell_7/Sophia.ps1 +++ b/src/Sophia_Script_for_Windows_11_PowerShell_7/Sophia.ps1 @@ -648,14 +648,6 @@ DeliveryOptimization -Disable # Включить оптимизацию доставки (значение по умолчанию) # DeliveryOptimization -Enable -# Always wait for the network at computer startup and logon for workgroup networks -# Всегда ждать сеть при запуске и входе в систему для рабочих групп -WaitNetworkStartup -Enable - -# Never wait for the network at computer startup and logon for workgroup networks (default value) -# Никогда не ждать сеть при запуске и входе в систему для рабочих групп (значение по умолчанию) -# WaitNetworkStartup -Disable - # Do not let Windows manage my default printer # Не разрешать Windows управлять принтером, используемым по умолчанию WindowsManageDefaultPrinter -Disable