Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/02: [CMAKE] Silence warnings about unused variables on release builds
by Timo Kreuzer 25 Oct '24

25 Oct '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c9a99bf63a1f6869958f8… commit c9a99bf63a1f6869958f8a308541b336cc4027b6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 19 13:01:24 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Oct 25 14:37:52 2024 +0300 [CMAKE] Silence warnings about unused variables on release builds --- sdk/cmake/gcc.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index dd8753ba060..860594ef38d 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -142,6 +142,8 @@ endif() # FIXME: Revisit this to see if we even need these levels if(CMAKE_BUILD_TYPE STREQUAL "Release") add_compile_options(-O2 -DNDEBUG=) + add_compile_options(-Wno-unused-variable) + add_compile_options(-Wno-unused-but-set-variable) else() if(OPTIMIZE STREQUAL "1") add_compile_options(-Os)

1 0

[reactos] 01/02: [CMAKE] Fix warning about redefinition of NDEBUG on release builds
by Timo Kreuzer 25 Oct '24

25 Oct '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a5c5c19bcf061cd39c2e8… commit a5c5c19bcf061cd39c2e8670cc76099f584371c9 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 19 12:01:50 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Oct 25 14:37:52 2024 +0300 [CMAKE] Fix warning about redefinition of NDEBUG on release builds "-DNDEBUG" will result in NDEBUG being defined as 0. To define it to nothing, like we do in our code, it must be "-DNDEBUG=" --- dll/3rdparty/libpng/CMakeLists.txt | 2 +- dll/3rdparty/libtiff/CMakeLists.txt | 2 +- dll/opengl/glu32/CMakeLists.txt | 2 +- overrides-gcc.cmake | 4 ++-- sdk/cmake/gcc.cmake | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dll/3rdparty/libpng/CMakeLists.txt b/dll/3rdparty/libpng/CMakeLists.txt index 2e293d369c5..e7599539562 100644 --- a/dll/3rdparty/libpng/CMakeLists.txt +++ b/dll/3rdparty/libpng/CMakeLists.txt @@ -1,7 +1,7 @@ add_definitions( -DWIN32 - -DNDEBUG + -DNDEBUG= -D_WINDOWS -DPNG_BUILD_DLL) diff --git a/dll/3rdparty/libtiff/CMakeLists.txt b/dll/3rdparty/libtiff/CMakeLists.txt index f7c0b904c23..2aff720a340 100644 --- a/dll/3rdparty/libtiff/CMakeLists.txt +++ b/dll/3rdparty/libtiff/CMakeLists.txt @@ -1,7 +1,7 @@ add_definitions( -DWIN32 - -DNDEBUG + -DNDEBUG= -DUSE_WIN32_FILEIO -DTIF_PLATFORM_CONSOLE) diff --git a/dll/opengl/glu32/CMakeLists.txt b/dll/opengl/glu32/CMakeLists.txt index f60619510b6..82e36ce5508 100644 --- a/dll/opengl/glu32/CMakeLists.txt +++ b/dll/opengl/glu32/CMakeLists.txt @@ -8,7 +8,7 @@ include_directories(BEFORE add_definitions( -DBUILD_GLU32 - -DNDEBUG + -DNDEBUG= -DLIBRARYBUILD -DRESOLVE_3D_TEXTURE_SUPPORT) diff --git a/overrides-gcc.cmake b/overrides-gcc.cmake index 854caf26aa9..6760d7b2039 100644 --- a/overrides-gcc.cmake +++ b/overrides-gcc.cmake @@ -1,8 +1,8 @@ foreach(lang C CXX ASM) set(CMAKE_${lang}_FLAGS_DEBUG "") - set(CMAKE_${lang}_FLAGS_MINSIZEREL "-Os -DNDEBUG") + set(CMAKE_${lang}_FLAGS_MINSIZEREL "-Os -DNDEBUG=") set(CMAKE_${lang}_FLAGS_RELEASE "") - set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG") + set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG=") set(CMAKE_${lang}_IMPLICIT_LINK_LIBRARIES "") set(CMAKE_${lang}_IMPLICIT_LINK_DIRECTORIES "") endforeach() diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 1cac600cf6f..dd8753ba060 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -141,7 +141,7 @@ endif() # Optimizations # FIXME: Revisit this to see if we even need these levels if(CMAKE_BUILD_TYPE STREQUAL "Release") - add_compile_options(-O2 -DNDEBUG) + add_compile_options(-O2 -DNDEBUG=) else() if(OPTIMIZE STREQUAL "1") add_compile_options(-Os)

1 0

[reactos] 01/01: [WKSSVC] Store the workstation configuration in the Registry
by Eric Kohl 25 Oct '24

25 Oct '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=88b3d86b2987be81de939… commit 88b3d86b2987be81de939b4a97943a207af2ccec Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Oct 25 10:54:20 2024 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Oct 25 10:54:20 2024 +0200 [WKSSVC] Store the workstation configuration in the Registry --- base/services/wkssvc/info.c | 771 +++++++++++++++++++++++++++++++++++++-- base/services/wkssvc/precomp.h | 4 + base/services/wkssvc/rpcserver.c | 6 +- 3 files changed, 745 insertions(+), 36 deletions(-) diff --git a/base/services/wkssvc/info.c b/base/services/wkssvc/info.c index 0cca6b7e788..98e90256ecd 100644 --- a/base/services/wkssvc/info.c +++ b/base/services/wkssvc/info.c @@ -22,41 +22,742 @@ WKSTA_INFO_502 WkstaInfo502; VOID InitWorkstationInfo(VOID) { - WkstaInfo502.wki502_char_wait = 0; - WkstaInfo502.wki502_collection_time = 250; - WkstaInfo502.wki502_maximum_collection_count = 16; - WkstaInfo502.wki502_keep_conn = 600; - WkstaInfo502.wki502_max_cmds = 50; - WkstaInfo502.wki502_sess_timeout = 60; - WkstaInfo502.wki502_siz_char_buf = 512; - WkstaInfo502.wki502_max_threads = 17; - WkstaInfo502.wki502_lock_quota = 6144; - WkstaInfo502.wki502_lock_increment = 10; - WkstaInfo502.wki502_lock_maximum = 500; - WkstaInfo502.wki502_pipe_increment = 10; - WkstaInfo502.wki502_pipe_maximum = 500; - WkstaInfo502.wki502_cache_file_timeout = 40; - WkstaInfo502.wki502_dormant_file_limit = 0; /* 1 */ - WkstaInfo502.wki502_read_ahead_throughput = 0; - WkstaInfo502.wki502_num_mailslot_buffers = 3; - WkstaInfo502.wki502_num_srv_announce_buffers = 20; - WkstaInfo502.wki502_max_illegal_datagram_events = 5; - WkstaInfo502.wki502_illegal_datagram_event_reset_frequency = 3600; - WkstaInfo502.wki502_log_election_packets = 0; - WkstaInfo502.wki502_use_opportunistic_locking = 1; - WkstaInfo502.wki502_use_unlock_behind = 1; - WkstaInfo502.wki502_use_close_behind = 1; - WkstaInfo502.wki502_buf_named_pipes = 1; - WkstaInfo502.wki502_use_lock_read_unlock = 1; - WkstaInfo502.wki502_utilize_nt_caching = 1; - WkstaInfo502.wki502_use_raw_read = 1; - WkstaInfo502.wki502_use_raw_write = 1; - WkstaInfo502.wki502_use_write_raw_data = 0; - WkstaInfo502.wki502_use_encryption = 1; - WkstaInfo502.wki502_buf_files_deny_write = 0; - WkstaInfo502.wki502_buf_read_only_files = 0; - WkstaInfo502.wki502_force_core_create_mode = 0; - WkstaInfo502.wki502_use_512_byte_max_transfer = 0; + HKEY hInfoKey = NULL; + DWORD dwType, dwSize, dwValue; + DWORD dwError; + + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services\\LanmanWorkstation\\Parameters", + 0, + KEY_READ, + &hInfoKey); + if (dwError != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW() failed!\n"); + return; + } + + dwSize = sizeof(dwValue); + dwError = RegQueryValueExW(hInfoKey, + L"CharWait", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if ((dwError == ERROR_SUCCESS) && (dwValue <= 65535)) + WkstaInfo502.wki502_char_wait = dwValue; + else + WkstaInfo502.wki502_char_wait = 0; + + dwSize = sizeof(dwValue); + dwError = RegQueryValueExW(hInfoKey, + L"CollectionTime", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if ((dwError == ERROR_SUCCESS) && (dwValue <= 65535000)) + WkstaInfo502.wki502_collection_time = dwValue; + else + WkstaInfo502.wki502_collection_time = 250; + + dwSize = sizeof(dwValue); + dwError = RegQueryValueExW(hInfoKey, + L"MaximumCollectionCount", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if ((dwError == ERROR_SUCCESS) && (dwValue <= 65535)) + WkstaInfo502.wki502_maximum_collection_count = dwValue; + else + WkstaInfo502.wki502_maximum_collection_count = 16; + + dwSize = sizeof(dwValue); + dwError = RegQueryValueExW(hInfoKey, + L"KeepConn", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if ((dwError == ERROR_SUCCESS) && (dwValue >= 1) && (dwValue <= 65535)) + WkstaInfo502.wki502_keep_conn = dwValue; + else + WkstaInfo502.wki502_keep_conn = 600; + + dwSize = sizeof(dwValue); + dwError = RegQueryValueExW(hInfoKey, + L"MaxCmds", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if ((dwError == ERROR_SUCCESS) && (dwValue >= 50) && (dwValue <= 65535)) + WkstaInfo502.wki502_max_cmds = dwValue; + else + WkstaInfo502.wki502_max_cmds = 50; + + dwSize = sizeof(dwValue); + dwError = RegQueryValueExW(hInfoKey, + L"SessTimeout", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if ((dwError == ERROR_SUCCESS) && (dwValue >= 60) && (dwValue <= 65535)) + WkstaInfo502.wki502_sess_timeout = dwValue; + else + WkstaInfo502.wki502_sess_timeout = 60; + + + dwSize = sizeof(dwValue); + dwError = RegQueryValueExW(hInfoKey, + L"SizCharBuf", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if ((dwError == ERROR_SUCCESS) && (dwValue >= 64) && (dwValue <= 4096)) + WkstaInfo502.wki502_siz_char_buf = dwValue; + else + WkstaInfo502.wki502_siz_char_buf = 512; + + dwSize = sizeof(dwValue); + dwError = RegQueryValueExW(hInfoKey, + L"MaxThreads", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if ((dwError == ERROR_SUCCESS) && (dwValue >= 1) && (dwValue <= 256)) + WkstaInfo502.wki502_max_threads = dwValue; + else + WkstaInfo502.wki502_max_threads = 17; + + dwSize = sizeof(dwValue); + dwError = RegQueryValueExW(hInfoKey, + L"LockQuota", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_lock_quota = dwValue; + else + WkstaInfo502.wki502_lock_quota = 6144; + + dwSize = sizeof(dwValue); + dwError = RegQueryValueExW(hInfoKey, + L"LockQuota", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_lock_quota = dwValue; + else + WkstaInfo502.wki502_lock_quota = 6144; + + dwSize = sizeof(dwValue); + dwError = RegQueryValueExW(hInfoKey, + L"LockIncrement", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_lock_increment = dwValue; + else + WkstaInfo502.wki502_lock_increment = 10; + + dwSize = sizeof(dwValue); + dwError = RegQueryValueExW(hInfoKey, + L"LockMaximum", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_lock_maximum = dwValue; + else + WkstaInfo502.wki502_lock_maximum = 500; + + dwSize = sizeof(dwValue); + dwError = RegQueryValueExW(hInfoKey, + L"PipeIncrement", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_pipe_increment = dwValue; + else + WkstaInfo502.wki502_pipe_increment = 10; + + dwSize = sizeof(dwValue); + dwError = RegQueryValueExW(hInfoKey, + L"PipeMaximum", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_pipe_maximum = dwValue; + else + WkstaInfo502.wki502_pipe_maximum = 500; + + dwSize = sizeof(dwValue); + dwError = RegQueryValueExW(hInfoKey, + L"CacheFileTimeout", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_cache_file_timeout = dwValue; + else + WkstaInfo502.wki502_cache_file_timeout = 40; + + dwSize = sizeof(dwValue); + dwError = RegQueryValueExW(hInfoKey, + L"DormantFileLimit", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS && dwValue >= 1) + WkstaInfo502.wki502_dormant_file_limit = dwValue; + else + WkstaInfo502.wki502_dormant_file_limit = 1; + + dwSize = sizeof(dwValue); + dwError = RegQueryValueExW(hInfoKey, + L"ReadAheadThroughput", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_read_ahead_throughput = dwValue; + else + WkstaInfo502.wki502_read_ahead_throughput = 0; + + dwSize = sizeof(dwValue); + dwError = RegQueryValueExW(hInfoKey, + L"MailslotBuffers", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_num_mailslot_buffers = dwValue; + else + WkstaInfo502.wki502_num_mailslot_buffers = 3; + + dwSize = sizeof(dwValue); + dwError = RegQueryValueExW(hInfoKey, + L"ServerAnnounceBuffers", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_num_srv_announce_buffers = dwValue; + else + WkstaInfo502.wki502_num_srv_announce_buffers = 20; + + dwSize = sizeof(dwValue); + dwError = RegQueryValueExW(hInfoKey, + L"NumIllegalDatagramEvents", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_max_illegal_datagram_events = dwValue; + else + WkstaInfo502.wki502_max_illegal_datagram_events = 5; + + dwSize = sizeof(dwValue); + dwError = RegQueryValueExW(hInfoKey, + L"IllegalDatagramResetTime", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_illegal_datagram_event_reset_frequency = dwValue; + else + WkstaInfo502.wki502_illegal_datagram_event_reset_frequency = 3600; + + dwSize = sizeof(dwValue); + dwError = RegQueryValueExW(hInfoKey, + L"LogElectionPackets", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_log_election_packets = dwValue; + else + WkstaInfo502.wki502_log_election_packets = 0; + + dwSize = sizeof(dwValue); + dwError = RegQueryValueExW(hInfoKey, + L"UseOpportunisticLocking", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_use_opportunistic_locking = dwValue; + else + WkstaInfo502.wki502_use_opportunistic_locking = 1; + + dwSize = sizeof(dwValue); + dwError = RegQueryValueExW(hInfoKey, + L"UseUnlockBehind", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_use_unlock_behind = dwValue; + else + WkstaInfo502.wki502_use_unlock_behind = 1; + + dwError = RegQueryValueExW(hInfoKey, + L"UseCloseBehind", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_use_close_behind = dwValue; + else + WkstaInfo502.wki502_use_close_behind = 1; + + dwError = RegQueryValueExW(hInfoKey, + L"BufNamedPipes", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_buf_named_pipes = dwValue; + else + WkstaInfo502.wki502_buf_named_pipes = 1; + + dwError = RegQueryValueExW(hInfoKey, + L"UseLockReadUnlock", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_use_lock_read_unlock = dwValue; + else + WkstaInfo502.wki502_use_lock_read_unlock = 1; + + dwError = RegQueryValueExW(hInfoKey, + L"UtilizeNtCaching", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_utilize_nt_caching = dwValue; + else + WkstaInfo502.wki502_utilize_nt_caching = 1; + + dwError = RegQueryValueExW(hInfoKey, + L"UseRawRead", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_use_raw_read = dwValue; + else + WkstaInfo502.wki502_use_raw_read = 1; + + dwError = RegQueryValueExW(hInfoKey, + L"UseRawWrite", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_use_raw_write = dwValue; + else + WkstaInfo502.wki502_use_raw_write = 1; + + dwError = RegQueryValueExW(hInfoKey, + L"UseWriteRawData", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_use_write_raw_data = dwValue; + else + WkstaInfo502.wki502_use_write_raw_data = 0; + + dwError = RegQueryValueExW(hInfoKey, + L"UseEncryption", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_use_encryption = dwValue; + else + WkstaInfo502.wki502_use_encryption = 1; + + dwError = RegQueryValueExW(hInfoKey, + L"BufFilesDenyWrite", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_buf_files_deny_write = dwValue; + else + WkstaInfo502.wki502_buf_files_deny_write = 0; + + dwError = RegQueryValueExW(hInfoKey, + L"BufReadOnlyFiles", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_buf_read_only_files = dwValue; + else + WkstaInfo502.wki502_buf_read_only_files = 0; + + dwError = RegQueryValueExW(hInfoKey, + L"ForceCoreCreateMode", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_force_core_create_mode = dwValue; + else + WkstaInfo502.wki502_force_core_create_mode = 0; + + dwError = RegQueryValueExW(hInfoKey, + L"Use512ByteMaxTransfer", + 0, + &dwType, + (PBYTE)&dwValue, + &dwSize); + if (dwError == ERROR_SUCCESS) + WkstaInfo502.wki502_use_512_byte_max_transfer = dwValue; + else + WkstaInfo502.wki502_use_512_byte_max_transfer = 0; + + RegCloseKey(hInfoKey); +} + + +VOID +SaveWorkstationInfo( + _In_ DWORD Level) +{ + HKEY hInfoKey = NULL; + DWORD dwError; + + dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"System\\CurrentControlSet\\Services\\LanmanWorkstation\\Parameters", + 0, + KEY_WRITE, + &hInfoKey); + if (dwError != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW() failed!\n"); + return; + } + + switch (Level) + { + case 502: + RegSetValueExW(hInfoKey, + L"CharWait", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_char_wait, + sizeof(DWORD)); + + RegSetValueExW(hInfoKey, + L"CollectionTime", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_collection_time, + sizeof(DWORD)); + + RegSetValueExW(hInfoKey, + L"MaximumCollectionCount", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_maximum_collection_count, + sizeof(DWORD)); + + RegSetValueExW(hInfoKey, + L"KeepConn", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_keep_conn, + sizeof(DWORD)); + + RegSetValueExW(hInfoKey, + L"MaxCmds", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_max_cmds, + sizeof(DWORD)); + + RegSetValueExW(hInfoKey, + L"SessTimeout", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_sess_timeout, + sizeof(DWORD)); + + RegSetValueExW(hInfoKey, + L"SizCharBuf", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_siz_char_buf, + sizeof(DWORD)); + + RegSetValueExW(hInfoKey, + L"MaxThreads", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_max_threads, + sizeof(DWORD)); + + RegSetValueExW(hInfoKey, + L"LockQuota", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_lock_quota, + sizeof(DWORD)); + + RegSetValueExW(hInfoKey, + L"LockIncrement", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_lock_increment, + sizeof(DWORD)); + + RegSetValueExW(hInfoKey, + L"LockMaximum", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_lock_maximum, + sizeof(DWORD)); + + RegSetValueExW(hInfoKey, + L"PipeIncrement", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_pipe_increment, + sizeof(DWORD)); + + RegSetValueExW(hInfoKey, + L"PipeMaximum", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_pipe_maximum, + sizeof(DWORD)); + + RegSetValueExW(hInfoKey, + L"CacheFileTimeout", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_cache_file_timeout, + sizeof(DWORD)); + + RegSetValueExW(hInfoKey, + L"DormantFileLimit", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_dormant_file_limit, + sizeof(DWORD)); + + RegSetValueExW(hInfoKey, + L"ReadAheadThroughput", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_read_ahead_throughput, + sizeof(DWORD)); + + RegSetValueExW(hInfoKey, + L"MailslotBuffers", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_num_mailslot_buffers, + sizeof(DWORD)); + + RegSetValueExW(hInfoKey, + L"ServerAnnounceBuffers", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_num_srv_announce_buffers, + sizeof(DWORD)); + + RegSetValueExW(hInfoKey, + L"NumIllegalDatagramEvents", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_max_illegal_datagram_events, + sizeof(DWORD)); + + RegSetValueExW(hInfoKey, + L"IllegalDatagramResetTime", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_illegal_datagram_event_reset_frequency, + sizeof(DWORD)); + + RegSetValueExW(hInfoKey, + L"LogElectionPackets", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_log_election_packets, + sizeof(BOOL)); + + RegSetValueExW(hInfoKey, + L"UseOpportunisticLocking", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_use_opportunistic_locking, + sizeof(BOOL)); + + RegSetValueExW(hInfoKey, + L"UseUnlockBehind", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_use_unlock_behind, + sizeof(BOOL)); + + RegSetValueExW(hInfoKey, + L"UseCloseBehind", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_use_close_behind, + sizeof(BOOL)); + + RegSetValueExW(hInfoKey, + L"BufNamedPipes", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_buf_named_pipes, + sizeof(BOOL)); + + RegSetValueExW(hInfoKey, + L"UseLockReadUnlock", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_use_lock_read_unlock, + sizeof(BOOL)); + + RegSetValueExW(hInfoKey, + L"UtilizeNtCaching", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_utilize_nt_caching, + sizeof(BOOL)); + + RegSetValueExW(hInfoKey, + L"UseRawRead", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_use_raw_read, + sizeof(BOOL)); + + RegSetValueExW(hInfoKey, + L"UseRawWrite", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_use_raw_write, + sizeof(BOOL)); + + RegSetValueExW(hInfoKey, + L"UseWriteRawData", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_use_write_raw_data, + sizeof(BOOL)); + + RegSetValueExW(hInfoKey, + L"UseEncryption", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_use_encryption, + sizeof(BOOL)); + + RegSetValueExW(hInfoKey, + L"BufFilesDenyWrite", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_buf_files_deny_write, + sizeof(BOOL)); + + RegSetValueExW(hInfoKey, + L"BufReadOnlyFiles", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_buf_read_only_files, + sizeof(BOOL)); + + RegSetValueExW(hInfoKey, + L"ForceCoreCreateMode", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_force_core_create_mode, + sizeof(BOOL)); + + RegSetValueExW(hInfoKey, + L"Use512ByteMaxTransfer", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_use_512_byte_max_transfer, + sizeof(BOOL)); + break; + + case 1013: + RegSetValueExW(hInfoKey, + L"KeepConn", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_keep_conn, + sizeof(DWORD)); + break; + + case 1018: + RegSetValueExW(hInfoKey, + L"SessTimeout", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_sess_timeout, + sizeof(DWORD)); + break; + + case 1046: + RegSetValueExW(hInfoKey, + L"DormantFileLimit", + 0, + REG_DWORD, + (PBYTE)&WkstaInfo502.wki502_dormant_file_limit, + sizeof(DWORD)); + break; + } + + RegCloseKey(hInfoKey); } /* EOF */ diff --git a/base/services/wkssvc/precomp.h b/base/services/wkssvc/precomp.h index 6c1622d0e65..b6d575316ab 100644 --- a/base/services/wkssvc/precomp.h +++ b/base/services/wkssvc/precomp.h @@ -50,6 +50,10 @@ NetpGetJoinInformation( VOID InitWorkstationInfo(VOID); +VOID +SaveWorkstationInfo( + _In_ DWORD Level); + /* rpcserver.c */ DWORD diff --git a/base/services/wkssvc/rpcserver.c b/base/services/wkssvc/rpcserver.c index f8e3655e099..703e35e6935 100644 --- a/base/services/wkssvc/rpcserver.c +++ b/base/services/wkssvc/rpcserver.c @@ -341,7 +341,11 @@ NetrWkstaSetInfo( break; } - /* FIXME: Store the workstation info in the registry */ + /* Save the workstation in the registry */ + if (dwResult == NERR_Success) + SaveWorkstationInfo(Level); + + /* FIXME: Notify the redirector */ return dwResult; }

1 0

[reactos] 02/02: [MSCTFIME][MSUTB][SHDOCVW] Remove __cxa_pure_virtual
by Timo Kreuzer 24 Oct '24

24 Oct '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=678aa63b3a8b064a057bc… commit 678aa63b3a8b064a057bcd614e9fb04193e7c4ec Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 19 14:30:55 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Oct 24 18:39:50 2024 +0300 [MSCTFIME][MSUTB][SHDOCVW] Remove __cxa_pure_virtual Instead link to cpprt. This fixes build with GCC 13, which generates symbols that conflict with __cxa_pure_virtual, if there is a pure virtual function in a vtable. Importing __cxa_pure_virtual from a library works for all versions of GCC. --- dll/ime/msctfime/CMakeLists.txt | 2 +- dll/ime/msctfime/msctfime.cpp | 5 ----- dll/win32/msutb/CMakeLists.txt | 2 +- dll/win32/msutb/msutb.cpp | 9 ++------- dll/win32/shdocvw/CMakeLists.txt | 2 +- dll/win32/shdocvw/objects.cpp | 6 ------ dll/win32/shdocvw/objects.h | 1 - 7 files changed, 5 insertions(+), 22 deletions(-) diff --git a/dll/ime/msctfime/CMakeLists.txt b/dll/ime/msctfime/CMakeLists.txt index 88c174912fd..dc867fc0c44 100644 --- a/dll/ime/msctfime/CMakeLists.txt +++ b/dll/ime/msctfime/CMakeLists.txt @@ -20,7 +20,7 @@ add_library(msctfime MODULE ${CMAKE_CURRENT_BINARY_DIR}/msctfime.def) set_module_type(msctfime win32dll UNICODE) set_target_properties(msctfime PROPERTIES SUFFIX ".ime") -target_link_libraries(msctfime wine uuid cicero) +target_link_libraries(msctfime cpprt wine uuid cicero) add_importlibs(msctfime user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_delay_importlibs(msctfime uxtheme shlwapi comctl32 msctf oleaut32 imm32) add_cd_file(TARGET msctfime DESTINATION reactos/system32 FOR all) diff --git a/dll/ime/msctfime/msctfime.cpp b/dll/ime/msctfime/msctfime.cpp index 60176204374..3ba326b1aa1 100644 --- a/dll/ime/msctfime/msctfime.cpp +++ b/dll/ime/msctfime/msctfime.cpp @@ -17,11 +17,6 @@ BOOL gfTFInitLib = FALSE; CRITICAL_SECTION g_csLock; CDispAttrPropCache *g_pPropCache = NULL; -EXTERN_C void __cxa_pure_virtual(void) -{ - ERR("__cxa_pure_virtual\n"); -} - /// Selects or unselects the input context. /// @implemented static HRESULT diff --git a/dll/win32/msutb/CMakeLists.txt b/dll/win32/msutb/CMakeLists.txt index df523425cff..a82bc47f384 100644 --- a/dll/win32/msutb/CMakeLists.txt +++ b/dll/win32/msutb/CMakeLists.txt @@ -13,7 +13,7 @@ add_library(msutb MODULE ${CMAKE_CURRENT_BINARY_DIR}/msutb.def) set_module_type(msutb win32dll UNICODE) add_dependencies(msutb msctf psdk) -target_link_libraries(msutb wine uuid atl_classes cicero) +target_link_libraries(msutb cpprt wine uuid atl_classes cicero) add_importlibs(msutb user32 gdi32 advapi32 msvcrt kernel32 ntdll) add_delay_importlibs(msutb uxtheme imm32 shlwapi comctl32 msctf ole32 oleacc oleaut32 shell32) add_cd_file(TARGET msutb DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/msutb/msutb.cpp b/dll/win32/msutb/msutb.cpp index 4f307c3e82d..f5fa02186bd 100644 --- a/dll/win32/msutb/msutb.cpp +++ b/dll/win32/msutb/msutb.cpp @@ -81,11 +81,6 @@ BOOL g_fRTL = FALSE; #define TIMER_ID_DOACCDEFAULTACTION 11 -EXTERN_C void __cxa_pure_virtual(void) -{ - ERR("__cxa_pure_virtual\n"); -} - class CMsUtbModule : public CComModule { }; @@ -1188,7 +1183,7 @@ protected: public: CButtonIconItem(CTrayIconWnd *pWnd, DWORD dwUnknown24); - + STDMETHOD_(BOOL, OnMsg)(WPARAM wParam, LPARAM lParam) override; STDMETHOD_(BOOL, OnDelayMsg)(UINT uMsg) override; }; @@ -1581,7 +1576,7 @@ public: void StartModalInput(ITfLangBarEventSink *pSink, DWORD dwThreadId); void StopModalInput(DWORD dwThreadId); - + CTipbarThread *_CreateThread(DWORD dwThreadId); CTipbarThread *_FindThread(DWORD dwThreadId); void EnsureFocusThread(); diff --git a/dll/win32/shdocvw/CMakeLists.txt b/dll/win32/shdocvw/CMakeLists.txt index 764663a42ed..119e8aaf882 100644 --- a/dll/win32/shdocvw/CMakeLists.txt +++ b/dll/win32/shdocvw/CMakeLists.txt @@ -24,7 +24,7 @@ target_include_directories(shdocvw BEFORE PRIVATE ) set_module_type(shdocvw win32dll UNICODE) -target_link_libraries(shdocvw uuid wine) +target_link_libraries(shdocvw cpprt uuid wine) add_delay_importlibs(shdocvw shell32 user32 gdi32 ole32 oleaut32 ieframe) add_importlibs(shdocvw shlwapi advapi32 msvcrt comctl32 kernel32 ntdll) add_dependencies(shdocvw stdole2) diff --git a/dll/win32/shdocvw/objects.cpp b/dll/win32/shdocvw/objects.cpp index 2ad4275d4e3..177f62e9936 100644 --- a/dll/win32/shdocvw/objects.cpp +++ b/dll/win32/shdocvw/objects.cpp @@ -25,12 +25,6 @@ void operator delete(void *ptr, size_t size) ::LocalFree(ptr); } -EXTERN_C void __cxa_pure_virtual(void) -{ - ERR("__cxa_pure_virtual\n"); - ::DebugBreak(); -} - BEGIN_OBJECT_MAP(ObjectMap) OBJECT_ENTRY(CLSID_SH_FavBand, CFavBand) OBJECT_ENTRY(CLSID_ExplorerBand, CExplorerBand) diff --git a/dll/win32/shdocvw/objects.h b/dll/win32/shdocvw/objects.h index 9720fbec060..c8f778fb55b 100644 --- a/dll/win32/shdocvw/objects.h +++ b/dll/win32/shdocvw/objects.h @@ -32,7 +32,6 @@ void *operator new(size_t size); void operator delete(void *ptr); void operator delete(void *ptr, size_t size); -EXTERN_C void __cxa_pure_virtual(void); #endif /* def C++ */ EXTERN_C VOID SHDOCVW_Init(HINSTANCE hInstance);

1 0

[reactos] 01/02: [CPPRT] Add cpprt for GCC, tool
by Timo Kreuzer 24 Oct '24

24 Oct '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81b8d07acd653c2a14a13… commit 81b8d07acd653c2a14a13cd8e1aac3dcf4ec20c6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 19 13:57:29 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Oct 24 18:39:50 2024 +0300 [CPPRT] Add cpprt for GCC, tool - Link it to libsup++ - Add __cxa_pure_virtual --- sdk/cmake/gcc.cmake | 1 - sdk/lib/CMakeLists.txt | 2 +- sdk/lib/cpprt/CMakeLists.txt | 34 ++++++++++++++++++++++------------ sdk/lib/cpprt/__cxa_pure_virtual.cpp | 13 +++++++++++++ 4 files changed, 36 insertions(+), 14 deletions(-) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index cecbd895cd4..1cac600cf6f 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -601,5 +601,4 @@ target_compile_definitions(libstdc++ INTERFACE "$<$<COMPILE_LANGUAGE:CXX>:PAL_ST # Create our alias libraries add_library(cppstl ALIAS libstdc++) -add_library(cpprt ALIAS libsupc++) diff --git a/sdk/lib/CMakeLists.txt b/sdk/lib/CMakeLists.txt index 7c751ab8976..34dc04870fd 100644 --- a/sdk/lib/CMakeLists.txt +++ b/sdk/lib/CMakeLists.txt @@ -13,9 +13,9 @@ add_subdirectory(conutils) add_subdirectory(cportlib) add_subdirectory(crt) add_subdirectory(cryptlib) +add_subdirectory(cpprt) if(MSVC) - add_subdirectory(cpprt) add_subdirectory(RunTmChk) else() add_subdirectory(gcc-compat) diff --git a/sdk/lib/cpprt/CMakeLists.txt b/sdk/lib/cpprt/CMakeLists.txt index 94632d39ea5..ab3a0251338 100644 --- a/sdk/lib/cpprt/CMakeLists.txt +++ b/sdk/lib/cpprt/CMakeLists.txt @@ -3,20 +3,30 @@ include_directories( ${REACTOS_SOURCE_DIR}/sdk/lib/crt/include ${REACTOS_SOURCE_DIR}/sdk/include/c++) -list(APPEND SOURCE - ehvec.cpp - new_nothrow.cpp - terminate.cpp - typeinfo.cpp) - -if(ARCH STREQUAL "i386") - add_asm_files(cpprt_asm i386/cpprt.s) -elseif(ARCH STREQUAL "amd64") - add_asm_files(cpprt_asm amd64/cpprt.s) -elseif(ARCH STREQUAL "arm") - add_asm_files(cpprt_asm arm/cpprt.s) +# We need different things, depending on the compiler +if(MSVC) + list(APPEND SOURCE + ehvec.cpp + new_nothrow.cpp + terminate.cpp + typeinfo.cpp) + if(ARCH STREQUAL "i386") + add_asm_files(cpprt_asm i386/cpprt.s) + elseif(ARCH STREQUAL "amd64") + add_asm_files(cpprt_asm amd64/cpprt.s) + elseif(ARCH STREQUAL "arm") + add_asm_files(cpprt_asm arm/cpprt.s) + endif() +else() + list(APPEND SOURCE + __cxa_pure_virtual.cpp) endif() add_library(cpprt ${SOURCE} ${cpprt_asm}) set_target_cpp_properties(cpprt WITH_EXCEPTIONS) add_dependencies(cpprt xdk) + +# On GCC builds, we need to link against libsupc++ +if(NOT MSVC) + target_link_libraries(cpprt libsupc++) +endif() diff --git a/sdk/lib/cpprt/__cxa_pure_virtual.cpp b/sdk/lib/cpprt/__cxa_pure_virtual.cpp new file mode 100644 index 00000000000..229690d9431 --- /dev/null +++ b/sdk/lib/cpprt/__cxa_pure_virtual.cpp @@ -0,0 +1,13 @@ +/* + * PROJECT: ReactOS C++ runtime library + * LICENSE: MIT (https://spdx.org/licenses/MIT) + * PURPOSE: __cxa_pure_virtual implementation + * COPYRIGHT: Copyright 2024 Timo Kreuzer <timo.kreuzer(a)reactos.org> + */ + +#include <intrin.h> + +extern "C" void __cxa_pure_virtual(void) +{ + __debugbreak(); +}

1 0

[reactos] 01/01: [SHELL32][SHELL32_APITEST] Fix ShellExecuteEx IDLIST folder (#7464)
by Whindmar Saksit 24 Oct '24

24 Oct '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea87f9102b1c4484d4240… commit ea87f9102b1c4484d4240708e828e236aad4ebb6 Author: Whindmar Saksit <whindsaks(a)proton.me> AuthorDate: Thu Oct 24 16:44:53 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Oct 24 16:44:53 2024 +0200 [SHELL32][SHELL32_APITEST] Fix ShellExecuteEx IDLIST folder (#7464) This is mainly to fix the shell32 apitest, a better way to handle SEE_MASK_IDLIST should be investigated in the future. --- dll/win32/shell32/shlexec.cpp | 20 +++++-- .../rostests/apitests/shell32/ShellExecuteEx.cpp | 42 +++++++++----- modules/rostests/apitests/shell32/closewnd.cpp | 64 ++++++++++++++++------ modules/rostests/apitests/shell32/closewnd.h | 1 + 4 files changed, 90 insertions(+), 37 deletions(-) diff --git a/dll/win32/shell32/shlexec.cpp b/dll/win32/shell32/shlexec.cpp index 2e1d0e2a443..3a665288535 100644 --- a/dll/win32/shell32/shlexec.cpp +++ b/dll/win32/shell32/shlexec.cpp @@ -287,11 +287,12 @@ static BOOL SHELL_ArgifyW(WCHAR* out, DWORD len, const WCHAR* fmt, const WCHAR* else cmd = lpFile; - used += wcslen(cmd); + SIZE_T cmdlen = wcslen(cmd); + used += cmdlen; if (used < len) { wcscpy(res, cmd); - res += wcslen(cmd); + res += cmdlen; } } found_p1 = TRUE; @@ -1730,7 +1731,7 @@ static BOOL SHELL_translate_idlist(LPSHELLEXECUTEINFOW sei, LPWSTR wszParameters sei->fMask &= ~SEE_MASK_INVOKEIDLIST; } else { - WCHAR target[MAX_PATH]; + WCHAR target[max(MAX_PATH, _countof(buffer))]; DWORD attribs; DWORD resultLen; /* Check if we're executing a directory and if so use the @@ -1744,10 +1745,19 @@ static BOOL SHELL_translate_idlist(LPSHELLEXECUTEINFOW sei, LPWSTR wszParameters buffer, sizeof(buffer))) { SHELL_ArgifyW(wszApplicationName, dwApplicationNameLen, buffer, target, (LPITEMIDLIST)sei->lpIDList, NULL, &resultLen, - (sei->lpDirectory && *sei->lpDirectory) ? sei->lpDirectory : NULL); + !StrIsNullOrEmpty(sei->lpDirectory) ? sei->lpDirectory : NULL); if (resultLen > dwApplicationNameLen) - ERR("Argify buffer not large enough... truncating\n"); + ERR("Argify buffer not large enough... truncating\n"); // FIXME: Report this to the caller? appKnownSingular = FALSE; + // HACKFIX: We really want the !appKnownSingular code in SHELL_execute to split the + // parameters for us but we cannot guarantee that the exe in the registry is quoted. + // We have now turned 'explorer.exe "%1" into 'explorer.exe "c:\path\from\pidl"' and + // need to split to application and parameters. + LPCWSTR params = PathGetArgsW(wszApplicationName); + lstrcpynW(wszParameters, params, parametersLen); + PathRemoveArgsW(wszApplicationName); + PathUnquoteSpacesW(wszApplicationName); + appKnownSingular = TRUE; } sei->fMask &= ~SEE_MASK_INVOKEIDLIST; } diff --git a/modules/rostests/apitests/shell32/ShellExecuteEx.cpp b/modules/rostests/apitests/shell32/ShellExecuteEx.cpp index 2c26b33be37..64759a49c1e 100644 --- a/modules/rostests/apitests/shell32/ShellExecuteEx.cpp +++ b/modules/rostests/apitests/shell32/ShellExecuteEx.cpp @@ -14,6 +14,7 @@ #include <stdio.h> #include <strsafe.h> #include <versionhelpers.h> +#include <shellutils.h> #include "shell32_apitest_sub.h" static WCHAR s_win_dir[MAX_PATH]; @@ -313,8 +314,7 @@ static BOOL TEST_Start(void) static void TEST_End(void) { - Sleep(500); - GetWindowList(&s_List2); + GetWindowListForClose(&s_List2); CloseNewWindows(&s_List1, &s_List2); FreeWindowList(&s_List1); FreeWindowList(&s_List2); @@ -368,26 +368,40 @@ static void test_properties() static void test_sei_lpIDList() { - if (IsWindowsVistaOrGreater()) + // Note: SEE_MASK_FLAG_NO_UI prevents the test from blocking with a MessageBox + WCHAR path[MAX_PATH]; + + /* This tests ShellExecuteEx with lpIDList for explorer C:\ */ + GetSystemDirectoryW(path, _countof(path)); + PathStripToRootW(path); + LPITEMIDLIST pidl = ILCreateFromPathW(path); + if (!pidl) { - skip("Vista+\n"); + skip("Unable to initialize test\n"); return; } - /* This tests ShellExecuteEx with lpIDList for explorer C:\ */ - - /* ITEMIDLIST for CLSID of 'My Computer' followed by PIDL for 'C:\' */ - BYTE lpitemidlist[30] = { 0x14, 0, 0x1f, 0, 0xe0, 0x4f, 0xd0, 0x20, 0xea, - 0x3a, 0x69, 0x10, 0xa2, 0xd8, 0x08, 0, 0x2b, 0x30, 0x30, 0x9d, // My Computer - 0x8, 0, 0x23, 0x43, 0x3a, 0x5c, 0x5c, 0, 0, 0,}; // C:\\ + NUL-NUL ending - SHELLEXECUTEINFOW ShellExecInfo = { sizeof(ShellExecInfo) }; - ShellExecInfo.fMask = SEE_MASK_IDLIST; - ShellExecInfo.hwnd = NULL; ShellExecInfo.nShow = SW_SHOWNORMAL; - ShellExecInfo.lpIDList = lpitemidlist; + ShellExecInfo.fMask = SEE_MASK_IDLIST | SEE_MASK_FLAG_NO_UI | SEE_MASK_FLAG_DDEWAIT; + ShellExecInfo.lpIDList = pidl; BOOL ret = ShellExecuteExW(&ShellExecInfo); ok_int(ret, TRUE); + ILFree(pidl); + + /* This tests ShellExecuteEx with lpIDList going through IContextMenu */ + CCoInit ComInit; + pidl = SHCloneSpecialIDList(NULL, CSIDL_PROFILE, TRUE); + if (!pidl) + { + skip("Unable to initialize test\n"); + return; + } + ShellExecInfo.fMask = SEE_MASK_INVOKEIDLIST | SEE_MASK_FLAG_NO_UI | SEE_MASK_FLAG_DDEWAIT; + ShellExecInfo.lpIDList = pidl; + ret = ShellExecuteExW(&ShellExecInfo); + ok_int(ret, TRUE); + ILFree(pidl); } static BOOL diff --git a/modules/rostests/apitests/shell32/closewnd.cpp b/modules/rostests/apitests/shell32/closewnd.cpp index d868f65fd79..2a7d8991b5c 100644 --- a/modules/rostests/apitests/shell32/closewnd.cpp +++ b/modules/rostests/apitests/shell32/closewnd.cpp @@ -37,6 +37,33 @@ void GetWindowList(PWINDOW_LIST pList) EnumWindows(EnumWindowsProc, (LPARAM)pList); } +void GetWindowListForClose(PWINDOW_LIST pList) +{ + for (UINT tries = 5; tries--;) + { + if (tries) + FreeWindowList(pList); + GetWindowList(pList); + Sleep(500); + WINDOW_LIST list; + GetWindowList(&list); + SIZE_T count = list.m_chWnds; + FreeWindowList(&list); + if (count == pList->m_chWnds) + break; + } +} + +static HWND FindInWindowList(const WINDOW_LIST &list, HWND hWnd) +{ + for (SIZE_T i = 0; i < list.m_chWnds; ++i) + { + if (list.m_phWnds[i] == hWnd) + return hWnd; + } + return NULL; +} + HWND FindNewWindow(PWINDOW_LIST List1, PWINDOW_LIST List2) { for (SIZE_T i2 = 0; i2 < List2->m_chWnds; ++i2) @@ -61,30 +88,31 @@ HWND FindNewWindow(PWINDOW_LIST List1, PWINDOW_LIST List2) return NULL; } -#define TRIALS_COUNT 8 +static void WaitForForegroundWindow(HWND hWnd, UINT wait = 250) +{ + for (UINT waited = 0, interval = 50; waited < wait; waited += interval) + { + if (GetForegroundWindow() == hWnd || !IsWindowVisible(hWnd)) + return; + Sleep(interval); + } +} void CloseNewWindows(PWINDOW_LIST List1, PWINDOW_LIST List2) { - INT cDiff = List2->m_chWnds - List1->m_chWnds; - for (INT j = 0; j < cDiff; ++j) + for (SIZE_T i = 0; i < List2->m_chWnds; ++i) { - HWND hWnd = FindNewWindow(List1, List2); - if (!hWnd) - break; - - for (INT i = 0; i < TRIALS_COUNT; ++i) - { - if (!IsWindow(hWnd)) - break; + HWND hWnd = List2->m_phWnds[i]; + if (!IsWindow(hWnd) || FindInWindowList(*List1, hWnd)) + continue; - SwitchToThisWindow(hWnd, TRUE); + SwitchToThisWindow(hWnd, TRUE); + WaitForForegroundWindow(hWnd); - // Alt+F4 - keybd_event(VK_MENU, 0x38, 0, 0); - keybd_event(VK_F4, 0x3E, 0, 0); - keybd_event(VK_F4, 0x3E, KEYEVENTF_KEYUP, 0); - keybd_event(VK_MENU, 0x38, KEYEVENTF_KEYUP, 0); - Sleep(100); + if (!PostMessageW(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0)) + { + DWORD_PTR result; + SendMessageTimeoutW(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0, 0, 3000, &result); } } } diff --git a/modules/rostests/apitests/shell32/closewnd.h b/modules/rostests/apitests/shell32/closewnd.h index 367c058b054..096ce88c1fe 100644 --- a/modules/rostests/apitests/shell32/closewnd.h +++ b/modules/rostests/apitests/shell32/closewnd.h @@ -14,6 +14,7 @@ typedef struct WINDOW_LIST } WINDOW_LIST, *PWINDOW_LIST; void GetWindowList(PWINDOW_LIST pList); +void GetWindowListForClose(PWINDOW_LIST pList); HWND FindNewWindow(PWINDOW_LIST List1, PWINDOW_LIST List2); void CloseNewWindows(PWINDOW_LIST List1, PWINDOW_LIST List2); void FreeWindowList(PWINDOW_LIST pList);

1 0

[reactos] 02/02: [SDK:CRT] Reenable malloc.h inclusion in xmmintrin.h (#6464)
by Hermès Bélusca-Maïto 24 Oct '24

24 Oct '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=90aee8453f2aec3920eec… commit 90aee8453f2aec3920eecfada9265ef6624d2605 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Feb 8 17:42:33 2024 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Oct 24 12:06:38 2024 +0200 [SDK:CRT] Reenable malloc.h inclusion in xmmintrin.h (#6464) Addendum to commit 318d696f0 --- sdk/include/crt/xmmintrin.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/crt/xmmintrin.h b/sdk/include/crt/xmmintrin.h index a539f09be3b..224cbc25f1b 100644 --- a/sdk/include/crt/xmmintrin.h +++ b/sdk/include/crt/xmmintrin.h @@ -29,7 +29,7 @@ #endif #if !defined _VCRT_BUILD && !defined _INC_MALLOC -//#include <malloc.h> // FIXME: This breaks build +#include <malloc.h> // For _mm_malloc() and _mm_free() #endif #ifdef __cplusplus

1 0

[reactos] 01/02: [WINE/MSVCRT] Fix MSVCRT_size_t, MSVCRT_intptr_t and MSVCRT_uintptr_t typedefs (#6464)
by Hermès Bélusca-Maïto 24 Oct '24

24 Oct '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab7fbd08a7c82aeb9f9c2… commit ab7fbd08a7c82aeb9f9c2dda49b59f23f2cf794e Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Oct 24 12:03:37 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Oct 24 12:06:17 2024 +0200 [WINE/MSVCRT] Fix MSVCRT_size_t, MSVCRT_intptr_t and MSVCRT_uintptr_t typedefs (#6464) Make these definitions compatible with the other ambient size_t and (u)intptr_t types used in the rest of our code base. This partly reverts the corresponding typedef changes from wine commit https://github.com/wine-mirror/wine/commit/d8ab5a14aac6d8f9dc493225e352a457… "msvcrt: Use intptr_t or size_t instead of long where appropriate." --- modules/rostests/winetests/msvcrt/msvcrt.h | 6 +++--- sdk/lib/crt/wine/msvcrt.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/rostests/winetests/msvcrt/msvcrt.h b/modules/rostests/winetests/msvcrt/msvcrt.h index 66f6bd00e96..2a158cb4541 100644 --- a/modules/rostests/winetests/msvcrt/msvcrt.h +++ b/modules/rostests/winetests/msvcrt/msvcrt.h @@ -64,9 +64,9 @@ typedef unsigned __int64 MSVCRT_size_t; typedef __int64 MSVCRT_intptr_t; typedef unsigned __int64 MSVCRT_uintptr_t; #else -typedef unsigned long MSVCRT_size_t; -typedef long MSVCRT_intptr_t; -typedef unsigned long MSVCRT_uintptr_t; +typedef unsigned int MSVCRT_size_t; +typedef int MSVCRT_intptr_t; +typedef unsigned int MSVCRT_uintptr_t; #endif typedef unsigned int MSVCRT__dev_t; typedef int MSVCRT__off_t; diff --git a/sdk/lib/crt/wine/msvcrt.h b/sdk/lib/crt/wine/msvcrt.h index 47199794248..10d98c44dbf 100644 --- a/sdk/lib/crt/wine/msvcrt.h +++ b/sdk/lib/crt/wine/msvcrt.h @@ -80,9 +80,9 @@ typedef unsigned __int64 MSVCRT_size_t; typedef __int64 MSVCRT_intptr_t; typedef unsigned __int64 MSVCRT_uintptr_t; #else -typedef unsigned long MSVCRT_size_t; -typedef long MSVCRT_intptr_t; -typedef unsigned long MSVCRT_uintptr_t; +typedef unsigned int MSVCRT_size_t; +typedef int MSVCRT_intptr_t; +typedef unsigned int MSVCRT_uintptr_t; #endif #ifdef _CRTDLL typedef short MSVCRT__dev_t;

1 0

[reactos] 01/01: [WKSSVC] Implement undocumented NetrWkstaGetInfo Level 502 and NetrWkstaSetInfo
by Eric Kohl 23 Oct '24

23 Oct '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=51b55982e4cb7dfbd396a… commit 51b55982e4cb7dfbd396a94aee3929f03f73f63b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Wed Oct 23 23:48:01 2024 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Wed Oct 23 23:48:33 2024 +0200 [WKSSVC] Implement undocumented NetrWkstaGetInfo Level 502 and NetrWkstaSetInfo - Provide default Level 502 data only. - Level 502 data need to be stored in the Registry. --- base/services/wkssvc/CMakeLists.txt | 1 + base/services/wkssvc/info.c | 62 +++++++++++++++++++ base/services/wkssvc/precomp.h | 12 ++++ base/services/wkssvc/rpcserver.c | 118 +++++++++++++++++++++++++++++++++++- base/services/wkssvc/wkssvc.c | 2 + 5 files changed, 192 insertions(+), 3 deletions(-) diff --git a/base/services/wkssvc/CMakeLists.txt b/base/services/wkssvc/CMakeLists.txt index 8ce12e206bb..2bdaa71b1e0 100644 --- a/base/services/wkssvc/CMakeLists.txt +++ b/base/services/wkssvc/CMakeLists.txt @@ -5,6 +5,7 @@ spec2def(wkssvc.dll wkssvc.spec ADD_IMPORTLIB) add_library(wkssvc MODULE domain.c + info.c rpcserver.c wkssvc.c wkssvc.rc diff --git a/base/services/wkssvc/info.c b/base/services/wkssvc/info.c new file mode 100644 index 00000000000..0cca6b7e788 --- /dev/null +++ b/base/services/wkssvc/info.c @@ -0,0 +1,62 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Services + * FILE: base/services/wkssvc/info.c + * PURPOSE: Workstation service + * PROGRAMMER: Eric Kohl + */ + +/* INCLUDES *****************************************************************/ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wkssvc); + +/* GLOBALS *******************************************************************/ + +WKSTA_INFO_502 WkstaInfo502; + + +/* FUNCTIONS *****************************************************************/ + +VOID +InitWorkstationInfo(VOID) +{ + WkstaInfo502.wki502_char_wait = 0; + WkstaInfo502.wki502_collection_time = 250; + WkstaInfo502.wki502_maximum_collection_count = 16; + WkstaInfo502.wki502_keep_conn = 600; + WkstaInfo502.wki502_max_cmds = 50; + WkstaInfo502.wki502_sess_timeout = 60; + WkstaInfo502.wki502_siz_char_buf = 512; + WkstaInfo502.wki502_max_threads = 17; + WkstaInfo502.wki502_lock_quota = 6144; + WkstaInfo502.wki502_lock_increment = 10; + WkstaInfo502.wki502_lock_maximum = 500; + WkstaInfo502.wki502_pipe_increment = 10; + WkstaInfo502.wki502_pipe_maximum = 500; + WkstaInfo502.wki502_cache_file_timeout = 40; + WkstaInfo502.wki502_dormant_file_limit = 0; /* 1 */ + WkstaInfo502.wki502_read_ahead_throughput = 0; + WkstaInfo502.wki502_num_mailslot_buffers = 3; + WkstaInfo502.wki502_num_srv_announce_buffers = 20; + WkstaInfo502.wki502_max_illegal_datagram_events = 5; + WkstaInfo502.wki502_illegal_datagram_event_reset_frequency = 3600; + WkstaInfo502.wki502_log_election_packets = 0; + WkstaInfo502.wki502_use_opportunistic_locking = 1; + WkstaInfo502.wki502_use_unlock_behind = 1; + WkstaInfo502.wki502_use_close_behind = 1; + WkstaInfo502.wki502_buf_named_pipes = 1; + WkstaInfo502.wki502_use_lock_read_unlock = 1; + WkstaInfo502.wki502_utilize_nt_caching = 1; + WkstaInfo502.wki502_use_raw_read = 1; + WkstaInfo502.wki502_use_raw_write = 1; + WkstaInfo502.wki502_use_write_raw_data = 0; + WkstaInfo502.wki502_use_encryption = 1; + WkstaInfo502.wki502_buf_files_deny_write = 0; + WkstaInfo502.wki502_buf_read_only_files = 0; + WkstaInfo502.wki502_force_core_create_mode = 0; + WkstaInfo502.wki502_use_512_byte_max_transfer = 0; +} + +/* EOF */ diff --git a/base/services/wkssvc/precomp.h b/base/services/wkssvc/precomp.h index ac6d6e8d0c7..6c1622d0e65 100644 --- a/base/services/wkssvc/precomp.h +++ b/base/services/wkssvc/precomp.h @@ -22,10 +22,18 @@ #include <wine/debug.h> +#define WKSTA_KEEPCONN_PARMNUM 13 +#define WKSTA_MAXCMDS_PARMNUM 15 +#define WKSTA_SESSTIMEOUT_PARMNUM 18 +#define WKSTA_DORMANTFILELIMIT_PARMNUM 46 + extern OSVERSIONINFOW VersionInfo; extern HANDLE LsaHandle; extern ULONG LsaAuthenticationPackage; +extern WKSTA_INFO_502 WkstaInfo502; + + /* domain.c */ NET_API_STATUS @@ -37,6 +45,10 @@ NetpGetJoinInformation( LPWSTR *NameBuffer, PNETSETUP_JOIN_STATUS BufferType); +/* info */ + +VOID +InitWorkstationInfo(VOID); /* rpcserver.c */ diff --git a/base/services/wkssvc/rpcserver.c b/base/services/wkssvc/rpcserver.c index d95cab57e94..f8e3655e099 100644 --- a/base/services/wkssvc/rpcserver.c +++ b/base/services/wkssvc/rpcserver.c @@ -208,8 +208,21 @@ NetrWkstaGetInfo( *WkstaInfo = pWkstaInfo; break; + case 502: + pWkstaInfo = midl_user_allocate(sizeof(WKSTA_INFO_502)); + if (pWkstaInfo == NULL) + { + dwResult = ERROR_NOT_ENOUGH_MEMORY; + break; + } + + CopyMemory(&pWkstaInfo->WkstaInfo502, &WkstaInfo502, sizeof(WKSTA_INFO_502)); + + *WkstaInfo = pWkstaInfo; + break; + default: - FIXME("Level %d unimplemented\n", Level); + FIXME("Level %lu unimplemented\n", Level); dwResult = ERROR_INVALID_LEVEL; break; } @@ -230,8 +243,107 @@ NetrWkstaSetInfo( LPWKSTA_INFO WkstaInfo, unsigned long *ErrorParameter) { - UNIMPLEMENTED; - return 0; + DWORD dwResult = NERR_Success; + + TRACE("NetrWkstaSetInfo(%lu %p %p)\n", + Level, WkstaInfo, ErrorParameter); + + switch (Level) + { + case 502: + if (WkstaInfo->WkstaInfo502.wki502_keep_conn >= 1 && WkstaInfo->WkstaInfo502.wki502_keep_conn <= 65535) + { + WkstaInfo502.wki502_keep_conn = WkstaInfo->WkstaInfo502.wki502_keep_conn; + + if (WkstaInfo->WkstaInfo502.wki502_max_cmds >= 50 && WkstaInfo->WkstaInfo502.wki502_max_cmds <= 65535) + { + WkstaInfo502.wki502_max_cmds = WkstaInfo->WkstaInfo502.wki502_max_cmds; + + if (WkstaInfo->WkstaInfo502.wki502_sess_timeout >= 60 && WkstaInfo->WkstaInfo502.wki502_sess_timeout <= 65535) + { + WkstaInfo502.wki502_sess_timeout = WkstaInfo->WkstaInfo502.wki502_sess_timeout; + + if (WkstaInfo->WkstaInfo502.wki502_dormant_file_limit != 0) + { + WkstaInfo502.wki502_dormant_file_limit = WkstaInfo->WkstaInfo502.wki502_dormant_file_limit; + } + else + { + if (ErrorParameter) + *ErrorParameter = WKSTA_DORMANTFILELIMIT_PARMNUM; + dwResult = ERROR_INVALID_PARAMETER; + } + } + else + { + if (ErrorParameter) + *ErrorParameter = WKSTA_SESSTIMEOUT_PARMNUM; + dwResult = ERROR_INVALID_PARAMETER; + } + } + else + { + if (ErrorParameter) + *ErrorParameter = WKSTA_MAXCMDS_PARMNUM; + dwResult = ERROR_INVALID_PARAMETER; + } + } + else + { + if (ErrorParameter) + *ErrorParameter = WKSTA_KEEPCONN_PARMNUM; + dwResult = ERROR_INVALID_PARAMETER; + } + break; + + case 1013: + if (WkstaInfo->WkstaInfo1013.wki1013_keep_conn >= 1 && WkstaInfo->WkstaInfo1013.wki1013_keep_conn <= 65535) + { + WkstaInfo502.wki502_keep_conn = WkstaInfo->WkstaInfo1013.wki1013_keep_conn; + } + else + { + if (ErrorParameter) + *ErrorParameter = WKSTA_KEEPCONN_PARMNUM; + dwResult = ERROR_INVALID_PARAMETER; + } + break; + + case 1018: + if (WkstaInfo->WkstaInfo1018.wki1018_sess_timeout >= 60 && WkstaInfo->WkstaInfo1018.wki1018_sess_timeout <= 65535) + { + WkstaInfo502.wki502_sess_timeout = WkstaInfo->WkstaInfo1018.wki1018_sess_timeout; + } + else + { + if (ErrorParameter) + *ErrorParameter = WKSTA_SESSTIMEOUT_PARMNUM; + dwResult = ERROR_INVALID_PARAMETER; + } + break; + + case 1046: + if (WkstaInfo->WkstaInfo1046.wki1046_dormant_file_limit != 0) + { + WkstaInfo502.wki502_dormant_file_limit = WkstaInfo->WkstaInfo1046.wki1046_dormant_file_limit; + } + else + { + if (ErrorParameter) + *ErrorParameter = WKSTA_DORMANTFILELIMIT_PARMNUM; + dwResult = ERROR_INVALID_PARAMETER; + } + break; + + default: + FIXME("Level %lu unimplemented\n", Level); + dwResult = ERROR_INVALID_LEVEL; + break; + } + + /* FIXME: Store the workstation info in the registry */ + + return dwResult; } diff --git a/base/services/wkssvc/wkssvc.c b/base/services/wkssvc/wkssvc.c index dbb485f5a6e..d286cf0216d 100644 --- a/base/services/wkssvc/wkssvc.c +++ b/base/services/wkssvc/wkssvc.c @@ -85,6 +85,8 @@ ServiceInit(VOID) VersionInfo.dwOSVersionInfoSize = sizeof(VersionInfo); GetVersionExW(&VersionInfo); + InitWorkstationInfo(); + Status = LsaRegisterLogonProcess(&ProcessName, &LsaHandle, &Mode);

1 0

[reactos] 01/01: [SETUPLIB] GetSourcePaths(): Fix determination of the installation source path.
by Hermès Bélusca-Maïto 23 Oct '24

23 Oct '24

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ddb05d44326c189e67e1… commit 3ddb05d44326c189e67e1d71298e236048b2146a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Oct 23 15:20:46 2024 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Oct 23 23:19:58 2024 +0200 [SETUPLIB] GetSourcePaths(): Fix determination of the installation source path. Refine the algorithm introduced in commit c560342f08 (r75667, r75676), whereby the installation source path is based on the full image file path of the installer program, and of the \SystemRoot symlink. Also reverts commit 6f389a35db "Add a workaround for installing from USB drives" CORE-17818 + SAL2-annotate and add Doxygen comments. ---- In case the \SystemRoot full path prefixes the image file path, use the resolved \SystemRoot as the installation source path. Otherwise, use the image file path. The \SystemRoot symlink target resolution needs full path reparsing, because it can reference other symlinks. This is what happens, for example when booting the installation from a removable hard-disk. We can have: \SystemRoot ---> \Device\Harddisk1\Partition1\ReactOS and: \Device\Harddisk1\Partition1 ---> \Device\HarddiskVolume2 etc. and we wish to resolve \SystemRoot to: \Device\HarddiskVolume2\ReactOS instead of keeping the former version (using Harddisk1\Partition1). We then verify whether it prefixes the image file path, which is a fully reparsed path. --- base/setup/lib/setuplib.c | 194 +++++++++++++++++++++++++++++----------------- base/setup/lib/setuplib.h | 6 +- 2 files changed, 124 insertions(+), 76 deletions(-) diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index f8a961ab3c1..632db24ec29 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -378,29 +378,48 @@ Quit: #endif } +/** + * @brief + * Determine the installation source path and isolate its useful + * path components (root path and source sub-directory). + * + * The installation source path is based either on the installer's + * image file path, or on the \SystemRoot full path. + * + * In case the \SystemRoot full path prefixes the image file path, + * use the resolved \SystemRoot as the installation source path. + * Otherwise, use the image file path. + * + * The returned strings are allocated with RtlCreateUnicodeString(), + * and need to be freed with RtlFreeUnicodeString() after being used. + * + * Example of output: + * SourcePath: '\Device\CdRom0\I386' + * SourceRootPath: '\Device\CdRom0' + * SourceRootDir: '\I386' + **/ NTSTATUS GetSourcePaths( - OUT PUNICODE_STRING SourcePath, - OUT PUNICODE_STRING SourceRootPath, - OUT PUNICODE_STRING SourceRootDir) + _Out_ PUNICODE_STRING SourcePath, + _Out_ PUNICODE_STRING SourceRootPath, + _Out_ PUNICODE_STRING SourceRootDir) { NTSTATUS Status; - HANDLE LinkHandle; - OBJECT_ATTRIBUTES ObjectAttributes; - UCHAR ImageFileBuffer[sizeof(UNICODE_STRING) + MAX_PATH * sizeof(WCHAR)]; - PUNICODE_STRING InstallSourcePath = (PUNICODE_STRING)&ImageFileBuffer; - WCHAR SystemRootBuffer[MAX_PATH] = L""; - UNICODE_STRING SystemRootPath = RTL_CONSTANT_STRING(L"\\SystemRoot"); ULONG BufferSize; PWCHAR Ptr; + HANDLE LinkHandle; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + struct { OBJECT_NAME_INFORMATION; WCHAR Buffer[MAX_PATH]; } ImageFileBuffer; + PUNICODE_STRING InstallSourcePath = &ImageFileBuffer.Name; + struct { OBJECT_NAME_INFORMATION; WCHAR Buffer[MAX_PATH]; } SystemRootBuffer; + PUNICODE_STRING SystemRootPath = &SystemRootBuffer.Name; + const UNICODE_STRING SystemRoot = RTL_CONSTANT_STRING(L"\\SystemRoot"); - // FIXME: commented out to allow installation from USB -#if 0 - /* Determine the installation source path via the full path of the installer */ + /* Retrieve the installer's full image file path */ RtlInitEmptyUnicodeString(InstallSourcePath, - (PWSTR)((ULONG_PTR)ImageFileBuffer + sizeof(UNICODE_STRING)), - sizeof(ImageFileBuffer) - sizeof(UNICODE_STRING) - /* Reserve space for a NULL terminator */ - sizeof(UNICODE_NULL)); + ImageFileBuffer.Buffer, + sizeof(ImageFileBuffer.Buffer)); BufferSize = sizeof(ImageFileBuffer); Status = NtQueryInformationProcess(NtCurrentProcess(), ProcessImageFileName, @@ -410,75 +429,114 @@ GetSourcePaths( // STATUS_INFO_LENGTH_MISMATCH or STATUS_BUFFER_TOO_SMALL ? if (!NT_SUCCESS(Status)) return Status; - - /* Manually NULL-terminate */ + ASSERT(InstallSourcePath->Length < InstallSourcePath->MaximumLength); + + /* Go to the beginning of the path component, stop at the separator */ + Ptr = ImageFileBuffer.Buffer + (InstallSourcePath->Length / sizeof(WCHAR)); + while ((Ptr > ImageFileBuffer.Buffer) && (*Ptr != OBJ_NAME_PATH_SEPARATOR)) + --Ptr; + /* Strip the trailing file name (at the separator or beginning of buffer) + * and manually NULL-terminate */ + InstallSourcePath->Length = (ULONG_PTR)Ptr - (ULONG_PTR)ImageFileBuffer.Buffer; InstallSourcePath->Buffer[InstallSourcePath->Length / sizeof(WCHAR)] = UNICODE_NULL; - /* Strip the trailing file name */ - Ptr = wcsrchr(InstallSourcePath->Buffer, OBJ_NAME_PATH_SEPARATOR); - if (Ptr) - *Ptr = UNICODE_NULL; - InstallSourcePath->Length = wcslen(InstallSourcePath->Buffer) * sizeof(WCHAR); -#endif /* - * Now resolve the full path to \SystemRoot. In case it prefixes - * the installation source path determined from the full path of - * the installer, we use instead the resolved \SystemRoot as the - * installation source path. - * Otherwise, we use instead the path from the full installer path. + * Now, resolve the \SystemRoot symlink target full path. + * + * The symlink target path resolution requires reparsing, because it + * can reference other symlinks. This is what happens, for example when + * booting the installation from a removable hard-disk. We can have: + * + * \SystemRoot ---> \Device\Harddisk1\Partition1\ReactOS + * and: \Device\Harddisk1\Partition1 ---> \Device\HarddiskVolume2 + * etc. + * and we wish to resolve \SystemRoot to: \Device\HarddiskVolume2\ReactOS + * + * We then verify whether it prefixes the image file path obtained + * from the step above, which is a fully reparsed path. + * + * - Using NtOpenSymbolicLinkObject(SYMBOLIC_LINK_QUERY) followed by + * NtQuerySymbolicLinkObject() would only resolve the first symlink + * but not the others (\Device\Harddisk1\Partition1 left as is). + * + * - Since \SystemRoot has to point to a directory, we try opening + * the directory itself: NtOpenFile(..., FILE_DIRECTORY_FILE). + * + * - A call to NtQueryInformationFile(FileNameInformation) alone on + * the obtained handle would only retrieve the FS directory name, + * i.e. \ReactOS , but not the whole NT path. + * + * - We therefore use NtQueryObject(), which allows retrieving the + * full resolved NT path (device name + FS directory name). */ InitializeObjectAttributes(&ObjectAttributes, - &SystemRootPath, + (PUNICODE_STRING)&SystemRoot, OBJ_CASE_INSENSITIVE, NULL, NULL); - Status = NtOpenSymbolicLinkObject(&LinkHandle, - SYMBOLIC_LINK_QUERY, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - /* - * We failed at opening the \SystemRoot link (usually due to wrong - * access rights). Do not consider this as a fatal error, but use - * instead the image file path as the installation source path. - */ - DPRINT1("NtOpenSymbolicLinkObject(%wZ) failed with Status 0x%08lx\n", - &SystemRootPath, Status); - goto InitPaths; - } - - RtlInitEmptyUnicodeString(&SystemRootPath, - SystemRootBuffer, - sizeof(SystemRootBuffer)); - - /* Resolve the link and close its handle */ - Status = NtQuerySymbolicLinkObject(LinkHandle, - &SystemRootPath, - &BufferSize); - NtClose(LinkHandle); + RtlInitEmptyUnicodeString(SystemRootPath, + SystemRootBuffer.Buffer, + sizeof(SystemRootBuffer.Buffer)); + Status = NtOpenFile(&LinkHandle, + SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT + /*| FILE_OPEN_FOR_BACKUP_INTENT*/); + if (NT_SUCCESS(Status)) + { + /* Resolve the path and close its handle */ + Status = NtQueryObject(LinkHandle, + ObjectNameInformation, + &SystemRootBuffer, + sizeof(SystemRootBuffer), + &BufferSize); + NtClose(LinkHandle); + } + /* If any of the calls above failed, try to naively resolve the symlink */ if (!NT_SUCCESS(Status)) - return Status; // Unexpected error - - /* Check whether the resolved \SystemRoot is a prefix of the image file path */ - // FIXME: commented out to allow installation from USB - // if (RtlPrefixUnicodeString(&SystemRootPath, InstallSourcePath, TRUE)) { - /* Yes it is, so we use instead SystemRoot as the installation source path */ - InstallSourcePath = &SystemRootPath; + RtlInitEmptyUnicodeString(SystemRootPath, + SystemRootBuffer.Buffer, + sizeof(SystemRootBuffer.Buffer)); + + Status = NtOpenSymbolicLinkObject(&LinkHandle, + SYMBOLIC_LINK_QUERY, + &ObjectAttributes); + if (NT_SUCCESS(Status)) + { + /* Resolve the link and close its handle */ + Status = NtQuerySymbolicLinkObject(LinkHandle, + SystemRootPath, + &BufferSize); + NtClose(LinkHandle); + } } + ASSERT(SystemRootPath->Length < SystemRootPath->MaximumLength); + + /* + * If the resolved \SystemRoot is a prefix of the image file path, + * use \SystemRoot instead as the installation source path. + * + * If opening the \SystemRoot link failed (usually due to wrong + * access rights), do not consider this as a fatal error, and + * use the image file path as the installation source path. + */ + if (NT_SUCCESS(Status) && RtlPrefixUnicodeString(SystemRootPath, InstallSourcePath, TRUE)) + InstallSourcePath = SystemRootPath; -InitPaths: /* - * Retrieve the different source path components + * Retrieve the different source path components. */ RtlCreateUnicodeString(SourcePath, InstallSourcePath->Buffer); - /* Strip trailing directory */ + /* Isolate and strip the trailing (source root) directory */ Ptr = wcsrchr(InstallSourcePath->Buffer, OBJ_NAME_PATH_SEPARATOR); if (Ptr) { @@ -986,10 +1044,6 @@ InitializeSetup( NTSTATUS Status; /* Get the source path and source root path */ - // - // NOTE: Sometimes the source path may not be in SystemRoot !! - // (and this is the case when using the 1st-stage GUI setup!) - // Status = GetSourcePaths(&pSetupData->SourcePath, &pSetupData->SourceRootPath, &pSetupData->SourceRootDir); @@ -998,12 +1052,6 @@ InitializeSetup( DPRINT1("GetSourcePaths() failed (Status 0x%08lx)\n", Status); return ERROR_NO_SOURCE_DRIVE; } - /* - * Example of output: - * SourcePath: '\Device\CdRom0\I386' - * SourceRootPath: '\Device\CdRom0' - * SourceRootDir: '\I386' - */ DPRINT1("SourcePath (1): '%wZ'\n", &pSetupData->SourcePath); DPRINT1("SourceRootPath (1): '%wZ'\n", &pSetupData->SourceRootPath); DPRINT1("SourceRootDir (1): '%wZ'\n", &pSetupData->SourceRootDir); diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h index 93edbebad14..a69f7bba877 100644 --- a/base/setup/lib/setuplib.h +++ b/base/setup/lib/setuplib.h @@ -171,9 +171,9 @@ InstallSetupInfFile( NTSTATUS GetSourcePaths( - OUT PUNICODE_STRING SourcePath, - OUT PUNICODE_STRING SourceRootPath, - OUT PUNICODE_STRING SourceRootDir); + _Out_ PUNICODE_STRING SourcePath, + _Out_ PUNICODE_STRING SourceRootPath, + _Out_ PUNICODE_STRING SourceRootDir); ERROR_NUMBER LoadSetupInf(

1 0

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