Ros-diffs February 2021

ros-diffs@reactos.org

30 participants
434 discussions

[reactos] 01/01: [CMAKE] Fix empty dependencies.graphml being created
by Mark Jansen 07 Feb '21

07 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=35103558e14af35035e2c… commit 35103558e14af35035e2ccc66fbdcabaffb5bfd2 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Feb 7 14:02:01 2021 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Feb 7 14:02:01 2021 +0100 [CMAKE] Fix empty dependencies.graphml being created --- sdk/cmake/CMakeMacros.cmake | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake index 62191f30913..80488a3a63b 100644 --- a/sdk/cmake/CMakeMacros.cmake +++ b/sdk/cmake/CMakeMacros.cmake @@ -18,12 +18,16 @@ function(add_dependency_edge _source _target) endfunction() function(add_dependency_header) - file(WRITE ${REACTOS_BINARY_DIR}/dependencies.graphml "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<graphml>\n <graph id=\"ReactOS dependencies\" edgedefault=\"directed\">\n") + if(GENERATE_DEPENDENCY_GRAPH) + file(WRITE ${REACTOS_BINARY_DIR}/dependencies.graphml "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<graphml>\n <graph id=\"ReactOS dependencies\" edgedefault=\"directed\">\n") + endif() endfunction() function(add_dependency_footer) - add_dependency_node(ntdll) - file(APPEND ${REACTOS_BINARY_DIR}/dependencies.graphml " </graph>\n</graphml>\n") + if(GENERATE_DEPENDENCY_GRAPH) + add_dependency_node(ntdll) + file(APPEND ${REACTOS_BINARY_DIR}/dependencies.graphml " </graph>\n</graphml>\n") + endif() endfunction() function(add_message_headers _type)

1 0

[reactos] 01/01: [WININET] Fix usage of uninitialized variable
by Mark Jansen 07 Feb '21

07 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b809275cbe974261264e0… commit b809275cbe974261264e017012c558a05843197d Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Sun Feb 7 14:00:12 2021 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Feb 7 14:00:12 2021 +0100 [WININET] Fix usage of uninitialized variable --- dll/win32/wininet/internet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/wininet/internet.c b/dll/win32/wininet/internet.c index 9db4c9f3764..a0444e07c3d 100644 --- a/dll/win32/wininet/internet.c +++ b/dll/win32/wininet/internet.c @@ -2405,7 +2405,7 @@ static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai ) static WCHAR *detect_proxy_autoconfig_url_dns(void) { char *fqdn, *domain, *p; - WCHAR *ret; + WCHAR *ret = NULL; if (!(fqdn = get_computer_name( ComputerNamePhysicalDnsFullyQualified ))) return NULL; if (!(domain = get_computer_name( ComputerNamePhysicalDnsDomain )))

1 0

[reactos] 01/01: [NET] Remove the NAME, PRINT and SEND options because we will most likely never have a messenger service
by Eric Kohl 07 Feb '21

07 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=560b66a2d592841afa21a… commit 560b66a2d592841afa21a941b403a20f31a660cf Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 7 13:45:25 2021 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 7 13:45:25 2021 +0100 [NET] Remove the NAME, PRINT and SEND options because we will most likely never have a messenger service --- base/applications/network/net/cmdHelp.c | 21 -- base/applications/network/net/main.c | 3 - sdk/include/reactos/mc/net_msg.mc | 406 ++++++++------------------------ 3 files changed, 101 insertions(+), 329 deletions(-) diff --git a/base/applications/network/net/cmdHelp.c b/base/applications/network/net/cmdHelp.c index dc668db1b59..3a77b908d9e 100644 --- a/base/applications/network/net/cmdHelp.c +++ b/base/applications/network/net/cmdHelp.c @@ -86,13 +86,6 @@ INT cmdHelp(INT argc, WCHAR **argv) return 0; } - if (_wcsicmp(argv[2], L"NAME") == 0) - { - PrintNetMessage(MSG_NAME_SYNTAX); - PrintNetMessage(MSG_NAME_HELP); - return 0; - } - if (_wcsicmp(argv[2], L"PAUSE") == 0) { PrintNetMessage(MSG_PAUSE_SYNTAX); @@ -100,20 +93,6 @@ INT cmdHelp(INT argc, WCHAR **argv) return 0; } - if (_wcsicmp(argv[2], L"PRINT") == 0) - { - PrintNetMessage(MSG_PRINT_SYNTAX); - PrintNetMessage(MSG_PRINT_HELP); - return 0; - } - - if (_wcsicmp(argv[2], L"SEND") == 0) - { - PrintNetMessage(MSG_SEND_SYNTAX); - PrintNetMessage(MSG_SEND_HELP); - return 0; - } - if (_wcsicmp(argv[2], L"SESSION") == 0) { PrintNetMessage(MSG_SESSION_SYNTAX); diff --git a/base/applications/network/net/main.c b/base/applications/network/net/main.c index 5394a70df14..7b3011172d6 100644 --- a/base/applications/network/net/main.c +++ b/base/applications/network/net/main.c @@ -29,10 +29,7 @@ COMMAND cmds[] = {L"help", cmdHelp}, {L"helpmsg", cmdHelpMsg}, {L"localgroup", cmdLocalGroup}, - {L"name", unimplemented}, {L"pause", cmdPause}, - {L"print", unimplemented}, - {L"send", unimplemented}, {L"session", unimplemented}, {L"share", cmdShare}, {L"start", cmdStart}, diff --git a/sdk/include/reactos/mc/net_msg.mc b/sdk/include/reactos/mc/net_msg.mc index 65cd066a00d..658c64f6d28 100644 --- a/sdk/include/reactos/mc/net_msg.mc +++ b/sdk/include/reactos/mc/net_msg.mc @@ -1344,14 +1344,14 @@ Facility=System Language=English The following commands are available: - NET ACCOUNTS NET HELP NET SHARE - NET COMPUTER NET HELPMSG NET START - NET CONFIG NET LOCALGROUP NET STATISTICS - NET CONFIG SERVER NET NAME NET STOP - NET CONFIG WORKSTATION NET PAUSE NET TIME - NET CONTINUE NET PRINT NET USE - NET FILE NET SEND NET USER - NET GROUP NET SESSION NET VIEW + NET ACCOUNTS NET HELP NET STOP + NET COMPUTER NET HELPMSG NET TIME + NET CONFIG NET LOCALGROUP NET USE + NET CONFIG SERVER NET PAUSE NET USER + NET CONFIG WORKSTATION NET SESSION NET VIEW + NET CONTINUE NET SHARE + NET FILE NET START + NET GROUP NET STATISTCS NET HELP SYNTAX explains how to read NET HELP syntax lines. NET HELP command | MORE displays Help one screen at a time. @@ -1359,14 +1359,14 @@ Language=English Language=Polish Dostępne polecenia to: - NET ACCOUNTS NET HELP NET SHARE - NET COMPUTER NET HELPMSG NET START - NET CONFIG NET LOCALGROUP NET STATISTICS - NET CONFIG SERVER NET NAME NET STOP - NET CONFIG WORKSTATION NET PAUSE NET TIME - NET CONTINUE NET PRINT NET USE - NET FILE NET SEND NET USER - NET GROUP NET SESSION NET VIEW + NET ACCOUNTS NET HELP NET STOP + NET COMPUTER NET HELPMSG NET TIME + NET CONFIG NET LOCALGROUP NET USE + NET CONFIG SERVER NET PAUSE NET USER + NET CONFIG WORKSTATION NET SESSION NET VIEW + NET CONTINUE NET SHARE + NET FILE NET START + NET GROUP NET STATISTCS NET HELP SYNTAX wyświetla, jak odczytywać linie składni NET HELP. NET HELP polecenie | MORE wyświetla informacje na jednym ekranie na raz. @@ -1374,14 +1374,14 @@ Language=Polish Language=Romanian Sunt disponibile următoarele comenzi: - NET ACCOUNTS NET HELP NET SHARE - NET COMPUTER NET HELPMSG NET START - NET CONFIG NET LOCALGROUP NET STATISTICS - NET CONFIG SERVER NET NAME NET STOP - NET CONFIG WORKSTATION NET PAUSE NET TIME - NET CONTINUE NET PRINT NET USE - NET FILE NET SEND NET USER - NET GROUP NET SESSION NET VIEW + NET ACCOUNTS NET HELP NET STOP + NET COMPUTER NET HELPMSG NET TIME + NET CONFIG NET LOCALGROUP NET USE + NET CONFIG SERVER NET PAUSE NET USER + NET CONFIG WORKSTATION NET SESSION NET VIEW + NET CONTINUE NET SHARE + NET FILE NET START + NET GROUP NET STATISTCS NET HELP SYNTAX explains how to read NET HELP syntax lines. NET HELP comandă | MORE (pentru afișare paginată). @@ -1389,14 +1389,14 @@ Language=Romanian Language=Russian Доступны следующие команды: - NET ACCOUNTS NET HELP NET SHARE - NET COMPUTER NET HELPMSG NET START - NET CONFIG NET LOCALGROUP NET STATISTICS - NET CONFIG SERVER NET NAME NET STOP - NET CONFIG WORKSTATION NET PAUSE NET TIME - NET CONTINUE NET PRINT NET USE - NET FILE NET SEND NET USER - NET GROUP NET SESSION NET VIEW + NET ACCOUNTS NET HELP NET STOP + NET COMPUTER NET HELPMSG NET TIME + NET CONFIG NET LOCALGROUP NET USE + NET CONFIG SERVER NET PAUSE NET USER + NET CONFIG WORKSTATION NET SESSION NET VIEW + NET CONTINUE NET SHARE + NET FILE NET START + NET GROUP NET STATISTCS NET HELP SYNTAX explains how to read NET HELP syntax lines. NET HELP имя_команды | MORE - постраничный просмотр справки. @@ -1404,14 +1404,14 @@ Language=Russian Language=Spanish Éstos son los argumentos de línea de comandos disponibles: - NET ACCOUNTS NET HELP NET SHARE - NET COMPUTER NET HELPMSG NET START - NET CONFIG NET LOCALGROUP NET STATISTICS - NET CONFIG SERVER NET NAME NET STOP - NET CONFIG WORKSTATION NET PAUSE NET TIME - NET CONTINUE NET PRINT NET USE - NET FILE NET SEND NET USER - NET GROUP NET SESSION NET VIEW + NET ACCOUNTS NET HELP NET STOP + NET COMPUTER NET HELPMSG NET TIME + NET CONFIG NET LOCALGROUP NET USE + NET CONFIG SERVER NET PAUSE NET USER + NET CONFIG WORKSTATION NET SESSION NET VIEW + NET CONTINUE NET SHARE + NET FILE NET START + NET GROUP NET STATISTCS NET HELP SYNTAX explains how to read NET HELP syntax lines. NET HELP command | MORE displays Help one screen at a time. @@ -1419,14 +1419,14 @@ Language=Spanish Language=Turkish Aşağıdaki komutlar kullanılabilir: - NET ACCOUNTS NET HELP NET SHARE - NET COMPUTER NET HELPMSG NET START - NET CONFIG NET LOCALGROUP NET STATISTICS - NET CONFIG SERVER NET NAME NET STOP - NET CONFIG WORKSTATION NET PAUSE NET TIME - NET CONTINUE NET PRINT NET USE - NET FILE NET SEND NET USER - NET GROUP NET SESSION NET VIEW + NET ACCOUNTS NET HELP NET STOP + NET COMPUTER NET HELPMSG NET TIME + NET CONFIG NET LOCALGROUP NET USE + NET CONFIG SERVER NET PAUSE NET USER + NET CONFIG WORKSTATION NET SESSION NET VIEW + NET CONTINUE NET SHARE + NET FILE NET START + NET GROUP NET STATISTCS NET HELP SYNTAX explains how to read NET HELP syntax lines. NET HELP command | MORE displays Help one screen at a time. @@ -1434,14 +1434,14 @@ Language=Turkish Language=Chinese 以下命令可用: - NET ACCOUNTS NET HELP NET SHARE - NET COMPUTER NET HELPMSG NET START - NET CONFIG NET LOCALGROUP NET STATISTICS - NET CONFIG SERVER NET NAME NET STOP - NET CONFIG WORKSTATION NET PAUSE NET TIME - NET CONTINUE NET PRINT NET USE - NET FILE NET SEND NET USER - NET GROUP NET SESSION NET VIEW + NET ACCOUNTS NET HELP NET STOP + NET COMPUTER NET HELPMSG NET TIME + NET CONFIG NET LOCALGROUP NET USE + NET CONFIG SERVER NET PAUSE NET USER + NET CONFIG WORKSTATION NET SESSION NET VIEW + NET CONTINUE NET SHARE + NET FILE NET START + NET GROUP NET STATISTCS NET HELP SYNTAX explains how to read NET HELP syntax lines. NET HELP command | MORE displays Help one screen at a time. @@ -1449,14 +1449,14 @@ Language=Chinese Language=Taiwanese 以下命令是可用的: - NET ACCOUNTS NET HELP NET SHARE - NET COMPUTER NET HELPMSG NET START - NET CONFIG NET LOCALGROUP NET STATISTICS - NET CONFIG SERVER NET NAME NET STOP - NET CONFIG WORKSTATION NET PAUSE NET TIME - NET CONTINUE NET PRINT NET USE - NET FILE NET SEND NET USER - NET GROUP NET SESSION NET VIEW + NET ACCOUNTS NET HELP NET STOP + NET COMPUTER NET HELPMSG NET TIME + NET CONFIG NET LOCALGROUP NET USE + NET CONFIG SERVER NET PAUSE NET USER + NET CONFIG WORKSTATION NET SESSION NET VIEW + NET CONTINUE NET SHARE + NET FILE NET START + NET GROUP NET STATISTCS NET HELP SYNTAX explains how to read NET HELP syntax lines. NET HELP command | MORE displays Help one screen at a time. @@ -1818,74 +1818,6 @@ NET HELP command | MORE displays one screen at a time. MessageId=10020 -SymbolicName=MSG_NAME_SYNTAX -Severity=Success -Facility=System -Language=English -NET NAME ... -. -Language=Polish -NET NAME ... -. -Language=Romanian -NET NAME ... -. -Language=Russian -NET NAME ... -. -Language=Spanish -NET NAME ... -. -Language=Turkish -NET NAME ... -. -Language=Chinese -NET NAME ... -. -Language=Taiwanese -NET NAME ... -. - - -MessageId=10021 -SymbolicName=MSG_NAME_HELP -Severity=Success -Facility=System -Language=English -NAME -... -. -Language=Polish -NAME -... -. -Language=Romanian -NAME -... -. -Language=Russian -NAME -... -. -Language=Spanish -NAME -... -. -Language=Turkish -NAME -... -. -Language=Chinese -NAME -... -. -Language=Taiwanese -NAME -... -. - - -MessageId=10022 SymbolicName=MSG_PAUSE_SYNTAX Severity=Success Facility=System @@ -1915,7 +1847,7 @@ NET PAUSE <服務名稱> . -MessageId=10023 +MessageId=10021 SymbolicName=MSG_PAUSE_HELP Severity=Success Facility=System @@ -1976,143 +1908,7 @@ NET HELP command | MORE displays one screen at a time. . -MessageId=10024 -SymbolicName=MSG_PRINT_SYNTAX -Severity=Success -Facility=System -Language=English -NET PRINT ... -. -Language=Polish -NET PRINT ... -. -Language=Romanian -NET PRINT ... -. -Language=Russian -NET PRINT ... -. -Language=Spanish -NET PRINT ... -. -Language=Turkish -NET PRINT ... -. -Language=Chinese -NET PRINT ... -. -Language=Taiwanese -NET PRINT ... -. - - -MessageId=10025 -SymbolicName=MSG_PRINT_HELP -Severity=Success -Facility=System -Language=English -PRINT -... -. -Language=Polish -PRINT -... -. -Language=Romanian -PRINT -... -. -Language=Russian -PRINT -... -. -Language=Spanish -PRINT -... -. -Language=Turkish -PRINT -... -. -Language=Chinese -PRINT -... -. -Language=Taiwanese -PRINT -... -. - - -MessageId=10026 -SymbolicName=MSG_SEND_SYNTAX -Severity=Success -Facility=System -Language=English -NET SEND ... -. -Language=Polish -NET SEND ... -. -Language=Romanian -NET SEND ... -. -Language=Russian -NET SEND ... -. -Language=Spanish -NET SEND ... -. -Language=Turkish -NET SEND ... -. -Language=Chinese -NET SEND ... -. -Language=Taiwanese -NET SEND ... -. - - -MessageId=10027 -SymbolicName=MSG_SEND_HELP -Severity=Success -Facility=System -Language=English -SEND -... -. -Language=Polish -SEND -... -. -Language=Romanian -SEND -... -. -Language=Russian -SEND -... -. -Language=Spanish -SEND -... -. -Language=Turkish -SEND -... -. -Language=Chinese -SEND -... -. -Language=Taiwanese -SEND -... -. - - -MessageId=10028 +MessageId=10022 SymbolicName=MSG_SESSION_SYNTAX Severity=Success Facility=System @@ -2142,7 +1938,7 @@ NET SESSION ... . -MessageId=10029 +MessageId=10023 SymbolicName=MSG_SESSION_HELP Severity=Success Facility=System @@ -2180,7 +1976,7 @@ SESSION . -MessageId=10030 +MessageId=10024 SymbolicName=MSG_SHARE_SYNTAX Severity=Success Facility=System @@ -2266,7 +2062,7 @@ NET SHARE sharename=drive:path [/GRANT:user,[READ | CHANGE | FULL]] . -MessageId=10031 +MessageId=10025 SymbolicName=MSG_SHARE_HELP Severity=Success Facility=System @@ -2548,7 +2344,7 @@ NET HELP command | MORE displays Help one screen at a time. . -MessageId=10032 +MessageId=10026 SymbolicName=MSG_START_SYNTAX Severity=Success Facility=System @@ -2578,7 +2374,7 @@ NET START [service] . -MessageId=10033 +MessageId=10027 SymbolicName=MSG_START_HELP Severity=Success Facility=System @@ -2672,7 +2468,7 @@ NET HELP command | MORE displays one screen at a time. . -MessageId=10034 +MessageId=10028 SymbolicName=MSG_STATISTICS_SYNTAX Severity=Success Facility=System @@ -2702,7 +2498,7 @@ NET STATISTICS [SERVER | WORKSTATION] . -MessageId=10035 +MessageId=10029 SymbolicName=MSG_STATISTICS_HELP Severity=Success Facility=System @@ -2788,7 +2584,7 @@ NET HELP command | MORE displays one screen at a time. . -MessageId=10036 +MessageId=10030 SymbolicName=MSG_STOP_SYNTAX Severity=Success Facility=System @@ -2818,7 +2614,7 @@ NET STOP <服務名稱> . -MessageId=10037 +MessageId=10031 SymbolicName=MSG_STOP_HELP Severity=Success Facility=System @@ -2912,7 +2708,7 @@ NET HELP command | MORE displays one screen at a time. . -MessageId=10038 +MessageId=10032 SymbolicName=MSG_TIME_SYNTAX Severity=Success Facility=System @@ -2942,7 +2738,7 @@ NET TIME ... . -MessageId=10039 +MessageId=10033 SymbolicName=MSG_TIME_HELP Severity=Success Facility=System @@ -2980,7 +2776,7 @@ TIME . -MessageId=10040 +MessageId=10034 SymbolicName=MSG_USE_SYNTAX Severity=Success Facility=System @@ -3010,7 +2806,7 @@ NET USE ... . -MessageId=10041 +MessageId=10035 SymbolicName=MSG_USE_HELP Severity=Success Facility=System @@ -3048,7 +2844,7 @@ USE . -MessageId=10042 +MessageId=10036 SymbolicName=MSG_USER_SYNTAX Severity=Success Facility=System @@ -3094,7 +2890,7 @@ NET USER [使用者名 [密碼 | *] [選項]] [/DOMAIN] . -MessageId=10043 +MessageId=10037 SymbolicName=MSG_USER_HELP Severity=Success Facility=System @@ -3718,7 +3514,7 @@ NET HELP command | MORE displays Help one screen at a time. . -MessageId=10044 +MessageId=10038 SymbolicName=MSG_VIEW_SYNTAX Severity=Success Facility=System @@ -3748,7 +3544,7 @@ NET VIEW ... . -MessageId=10045 +MessageId=10039 SymbolicName=MSG_VIEW_HELP Severity=Success Facility=System @@ -3786,53 +3582,53 @@ VIEW . -MessageId=10046 +MessageId=10040 SymbolicName=MSG_NET_SYNTAX Severity=Success Facility=System Language=English NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP | - HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION | - SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ] + HELPMSG | LOCALGROUP | PAUSE | SESSION | SHARE | START | + STATISTICS | STOP | TIME | USE | USER | VIEW ] . Language=Polish NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP | - HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION | - SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ] + HELPMSG | LOCALGROUP | PAUSE | SESSION | SHARE | START | + STATISTICS | STOP | TIME | USE | USER | VIEW ] . Language=Romanian NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP | - HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION | - SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ] + HELPMSG | LOCALGROUP | PAUSE | SESSION | SHARE | START | + STATISTICS | STOP | TIME | USE | USER | VIEW ] . Language=Russian NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP | - HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION | - SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ] + HELPMSG | LOCALGROUP | PAUSE | SESSION | SHARE | START | + STATISTICS | STOP | TIME | USE | USER | VIEW ] . Language=Spanish NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP | - HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION | - SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ] + HELPMSG | LOCALGROUP | PAUSE | SESSION | SHARE | START | + STATISTICS | STOP | TIME | USE | USER | VIEW ] . Language=Turkish NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP | - HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION | - SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ] + HELPMSG | LOCALGROUP | PAUSE | SESSION | SHARE | START | + STATISTICS | STOP | TIME | USE | USER | VIEW ] . Language=Chinese NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP | - HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION | - SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ] + HELPMSG | LOCALGROUP | PAUSE | SESSION | SHARE | START | + STATISTICS | STOP | TIME | USE | USER | VIEW ] . Language=Taiwanese NET [ ACCOUNTS | COMPUTER | CONFIG | CONTINUE | FILE | GROUP | HELP | - HELPMSG | LOCALGROUP | NAME | PAUSE | PRINT | SEND | SESSION | - SHARE | START | STATISTICS | STOP | TIME | USE | USER | VIEW ] + HELPMSG | LOCALGROUP | PAUSE | SESSION | SHARE | START | + STATISTICS | STOP | TIME | USE | USER | VIEW ] . -MessageId=10047 +MessageId=10041 SymbolicName=MSG_SYNTAX_HELP Severity=Success Facility=System

1 0

[reactos] 01/01: [SHELL32] Fixing COpenWithMenu.cpp for handling path strings with spaces (#3449)
by Siavosh Kasravi 06 Feb '21

06 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb723c337ac6cfa22f5e7… commit bb723c337ac6cfa22f5e7912c0081ff78423cb5d Author: Siavosh Kasravi <siavoshkc(a)yahoo.com> AuthorDate: Sat Feb 6 17:35:11 2021 +0400 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 6 14:35:11 2021 +0100 [SHELL32] Fixing COpenWithMenu.cpp for handling path strings with spaces (#3449) CORE-17445 Fixing the bug where open with menu where OpenWithMenu does not handle handler's path when there are spaces in the path string, by adding the missing quote marks around %1 when recording the registry entry for file handler. --- dll/win32/shell32/COpenWithMenu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/COpenWithMenu.cpp b/dll/win32/shell32/COpenWithMenu.cpp index 3afb60c65f1..ee6828bcbc5 100644 --- a/dll/win32/shell32/COpenWithMenu.cpp +++ b/dll/win32/shell32/COpenWithMenu.cpp @@ -155,7 +155,7 @@ COpenWithList::SApp *COpenWithList::Add(LPCWSTR pwszPath) if (pApp) { - StringCbPrintfW(pApp->wszCmd, sizeof(pApp->wszCmd), L"\"%s\" %%1", pwszPath); + StringCbPrintfW(pApp->wszCmd, sizeof(pApp->wszCmd), L"\"%s\" \"%%1\"", pwszPath); SaveApp(pApp); }

1 0

[reactos] 01/01: [SETUPLIB] Fix 'unlock' copypasta in debug print (#3448)
by Serge Gautherie 05 Feb '21

05 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32f7474f38cab052f251a… commit 32f7474f38cab052f251aee9df6546fd6d0500b2 Author: Serge Gautherie <32623169+SergeGautherie(a)users.noreply.github.com> AuthorDate: Fri Feb 5 14:10:15 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 5 16:10:15 2021 +0300 [SETUPLIB] Fix 'unlock' copypasta in debug print (#3448) Addendum to 76ac898. --- base/setup/lib/bootsup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/setup/lib/bootsup.c b/base/setup/lib/bootsup.c index b1e11d108d4..d3aad8ee95e 100644 --- a/base/setup/lib/bootsup.c +++ b/base/setup/lib/bootsup.c @@ -600,7 +600,7 @@ InstallBootCodeToDisk( LockStatus = NtFsControlFile(PartitionHandle, NULL, NULL, NULL, &IoStatusBlock, FSCTL_DISMOUNT_VOLUME, NULL, 0, NULL, 0); if (!NT_SUCCESS(LockStatus)) { - DPRINT1("Unable to unlock the volume after installing boot code. Status 0x%08x. Expect problems.\n", LockStatus); + DPRINT1("Unable to dismount the volume after installing boot code. Status 0x%08x. Expect problems.\n", LockStatus); } LockStatus = NtFsControlFile(PartitionHandle, NULL, NULL, NULL, &IoStatusBlock, FSCTL_UNLOCK_VOLUME, NULL, 0, NULL, 0);

1 0

[reactos] 01/01: [GITHUB] Fix labeler rules, attempt 2
by Victor Perevertkin 05 Feb '21

05 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dbcd6efedf444a789b3c1… commit dbcd6efedf444a789b3c121dbb819eddbb55ce6d Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Feb 5 14:58:14 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Feb 5 14:58:14 2021 +0300 [GITHUB] Fix labeler rules, attempt 2 --- .github/labeler.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 8100d1c0a45..98b88afd411 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,6 +1,7 @@ # Labelling by the files touched drivers: - - any: ["drivers/**", "sdk/lib/drivers/**"] + - drivers/** + - sdk/lib/drivers/** - any: ["win32ss/drivers/**", "!win32ss/drivers/font/**"] freeldr:

1 0

[reactos] 01/01: [GITHUB] Fix labeler rules
by Victor Perevertkin 05 Feb '21

05 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d8b8e738444ee32744ad6… commit d8b8e738444ee32744ad6350c426041dce8c54dc Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Feb 5 14:39:25 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Feb 5 14:39:25 2021 +0300 [GITHUB] Fix labeler rules --- .github/labeler.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 54ec3b6c363..8100d1c0a45 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,13 +1,11 @@ # Labelling by the files touched drivers: - - drivers/* - - sdk/lib/drivers/* - - win32ss/drivers/* - - "!win32ss/drivers/font/*" + - any: ["drivers/**", "sdk/lib/drivers/**"] + - any: ["win32ss/drivers/**", "!win32ss/drivers/font/**"] freeldr: - - boot/freeldr/* + - boot/freeldr/** "kernel&hal": - - hal/* - - ntoskrnl/* + - hal/** + - ntoskrnl/**

1 0

[reactos] 01/01: [GITHUB] Fix YAML parsing in labeler.yml
by Victor Perevertkin 05 Feb '21

05 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2660316022457b6ba6b8a… commit 2660316022457b6ba6b8afebeb7f687d7806ba63 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Feb 5 14:00:51 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Feb 5 14:00:51 2021 +0300 [GITHUB] Fix YAML parsing in labeler.yml --- .github/labeler.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index c17dedd2ebe..54ec3b6c363 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -3,7 +3,7 @@ drivers: - drivers/* - sdk/lib/drivers/* - win32ss/drivers/* - - !win32ss/drivers/font/* + - "!win32ss/drivers/font/*" freeldr: - boot/freeldr/*

1 0

[reactos] 01/01: [GITHUB] Add Labeler action for labelling PRs automatically
by Victor Perevertkin 05 Feb '21

05 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f7cf2ee32dd710bfe36b3… commit f7cf2ee32dd710bfe36b3be836fbe29d484c692d Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Fri Feb 5 13:41:03 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Fri Feb 5 13:41:03 2021 +0300 [GITHUB] Add Labeler action for labelling PRs automatically --- .github/labeler.yml | 13 +++++++++++++ .github/workflows/labeler.yml | 11 +++++++++++ 2 files changed, 24 insertions(+) diff --git a/.github/labeler.yml b/.github/labeler.yml new file mode 100644 index 00000000000..c17dedd2ebe --- /dev/null +++ b/.github/labeler.yml @@ -0,0 +1,13 @@ +# Labelling by the files touched +drivers: + - drivers/* + - sdk/lib/drivers/* + - win32ss/drivers/* + - !win32ss/drivers/font/* + +freeldr: + - boot/freeldr/* + +"kernel&hal": + - hal/* + - ntoskrnl/* diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml new file mode 100644 index 00000000000..331ddc9b803 --- /dev/null +++ b/.github/workflows/labeler.yml @@ -0,0 +1,11 @@ +name: "Pull Request Labeler" +on: +- pull_request_target + +jobs: + triage: + runs-on: ubuntu-latest + steps: + - uses: actions/labeler@v3 + with: + repo-token: "${{ secrets.GITHUB_TOKEN }}"

1 0

[reactos] 01/01: [NTOS:SE] Do not use a global lock for tokens (#3445)
by George Bișoc 05 Feb '21

05 Feb '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dd4c113594740a4280ed2… commit dd4c113594740a4280ed2ba78705204aee5cd337 Author: George Bișoc <george.bisoc(a)reactos.org> AuthorDate: Fri Feb 5 10:10:19 2021 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 5 12:10:19 2021 +0300 [NTOS:SE] Do not use a global lock for tokens (#3445) In Windows Server 2003 the lock is initialised on a per-token basis, that is, the lock resource is created in SepDuplicateToken() and SepCreateToken() functions. This ensures that the lock initialisation is done locally for the specific token thus avoiding the need of a global lock. --- ntoskrnl/include/internal/tag.h | 1 + ntoskrnl/se/token.c | 74 +++++++++++++++++++++++++++++++++++++---- sdk/include/ndk/setypes.h | 2 +- 3 files changed, 70 insertions(+), 7 deletions(-) diff --git a/ntoskrnl/include/internal/tag.h b/ntoskrnl/include/internal/tag.h index 3e838c81abe..804a1a93dea 100644 --- a/ntoskrnl/include/internal/tag.h +++ b/ntoskrnl/include/internal/tag.h @@ -181,6 +181,7 @@ #define TAG_SE_HANDLES_TAB 'aHeS' #define TAG_SE_DIR_BUFFER 'bDeS' #define TAG_SE_PROXY_DATA 'dPoT' +#define TAG_SE_TOKEN_LOCK 'lTeS' /* LPC Tags */ #define TAG_LPC_MESSAGE 'McpL' diff --git a/ntoskrnl/se/token.c b/ntoskrnl/se/token.c index d7158d7de01..1f12e0109d2 100644 --- a/ntoskrnl/se/token.c +++ b/ntoskrnl/se/token.c @@ -27,7 +27,6 @@ typedef struct _TOKEN_AUDIT_POLICY_INFORMATION /* GLOBALS ********************************************************************/ POBJECT_TYPE SeTokenObjectType = NULL; -ERESOURCE SepTokenLock; // FIXME: Global lock! TOKEN_SOURCE SeSystemTokenSource = {"*SYSTEM*", {0}}; LUID SeSystemAuthenticationId = SYSTEM_LUID; @@ -83,6 +82,59 @@ static const INFORMATION_CLASS_INFO SeTokenInformationClass[] = { /* FUNCTIONS *****************************************************************/ +/** + * @brief + * Creates a lock for the token. + * + * @param[in,out] Token + * A token which lock has to be created. + * + * @return + * STATUS_SUCCESS if the pool allocation and resource initialisation have + * completed successfully, otherwise STATUS_INSUFFICIENT_RESOURCES on a + * pool allocation failure. + */ +static +NTSTATUS +SepCreateTokenLock( + _Inout_ PTOKEN Token) +{ + PAGED_CODE(); + + Token->TokenLock = ExAllocatePoolWithTag(NonPagedPool, + sizeof(ERESOURCE), + TAG_SE_TOKEN_LOCK); + if (Token->TokenLock == NULL) + { + DPRINT1("SepCreateTokenLock(): Failed to allocate memory!\n"); + return STATUS_INSUFFICIENT_RESOURCES; + } + + ExInitializeResourceLite(Token->TokenLock); + return STATUS_SUCCESS; +} + +/** + * @brief + * Deletes a lock of a token. + * + * @param[in,out] Token + * A token which contains the lock. + * + * @return + * Nothing. + */ +static +VOID +SepDeleteTokenLock( + _Inout_ PTOKEN Token) +{ + PAGED_CODE(); + + ExDeleteResourceLite(Token->TokenLock); + ExFreePoolWithTag(Token->TokenLock, TAG_SE_TOKEN_LOCK); +} + static NTSTATUS SepCompareTokens(IN PTOKEN FirstToken, IN PTOKEN SecondToken, @@ -477,7 +529,13 @@ SepDuplicateToken( AccessToken->TokenType = TokenType; AccessToken->ImpersonationLevel = Level; - AccessToken->TokenLock = &SepTokenLock; // FIXME: Global lock! + /* Initialise the lock for the access token */ + Status = SepCreateTokenLock(AccessToken); + if (!NT_SUCCESS(Status)) + { + ObDereferenceObject(AccessToken); + return Status; + } /* Copy the immutable fields */ RtlCopyLuid(&AccessToken->TokenSource.SourceIdentifier, @@ -491,7 +549,6 @@ SepDuplicateToken( AccessToken->ExpirationTime = Token->ExpirationTime; AccessToken->OriginatingLogonSession = Token->OriginatingLogonSession; - /* Lock the source token and copy the mutable fields */ SepAcquireTokenLockExclusive(Token); @@ -819,6 +876,10 @@ SepDeleteToken(PVOID ObjectBody) if ((AccessToken->TokenFlags & TOKEN_SESSION_NOT_REFERENCED) == 0) SepRmDereferenceLogonSession(&AccessToken->AuthenticationId); + /* Delete the token lock */ + if (AccessToken->TokenLock) + SepDeleteTokenLock(AccessToken); + /* Delete the dynamic information area */ if (AccessToken->DynamicPart) ExFreePoolWithTag(AccessToken->DynamicPart, TAG_TOKEN_DYNAMIC); @@ -833,8 +894,6 @@ SepInitializeTokenImplementation(VOID) UNICODE_STRING Name; OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; - ExInitializeResource(&SepTokenLock); // FIXME: Global lock! - DPRINT("Creating Token Object Type\n"); /* Initialize the Token type */ @@ -976,7 +1035,10 @@ SepCreateToken( AccessToken->TokenType = TokenType; AccessToken->ImpersonationLevel = ImpersonationLevel; - AccessToken->TokenLock = &SepTokenLock; // FIXME: Global lock! + /* Initialise the lock for the access token */ + Status = SepCreateTokenLock(AccessToken); + if (!NT_SUCCESS(Status)) + goto Quit; RtlCopyLuid(&AccessToken->TokenSource.SourceIdentifier, &TokenSource->SourceIdentifier); diff --git a/sdk/include/ndk/setypes.h b/sdk/include/ndk/setypes.h index 55e0d8fdab6..7071ce8ab11 100644 --- a/sdk/include/ndk/setypes.h +++ b/sdk/include/ndk/setypes.h @@ -188,7 +188,7 @@ typedef struct _TOKEN LUID AuthenticationId; /* 0x18 */ LUID ParentTokenId; /* 0x20 */ LARGE_INTEGER ExpirationTime; /* 0x28 */ - struct _ERESOURCE *TokenLock; /* 0x30 */ + PERESOURCE TokenLock; /* 0x30 */ SEP_AUDIT_POLICY AuditPolicy; /* 0x38 */ LUID ModifiedId; /* 0x40 */ ULONG SessionId; /* 0x48 */

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2021