Ros-diffs September 2020

ros-diffs@reactos.org

25 participants
382 discussions

[reactos] 01/01: [CONSRV] Improve zh-CN translation (#3157)

by chirsz

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd2eaf1e51d9afd7a21c2… commit cd2eaf1e51d9afd7a21c2e4dfdd019174a7bc382 Author: chirsz <31474766+chirsz-ever(a)users.noreply.github.com> AuthorDate: Sun Sep 13 00:23:05 2020 +0800 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 12 18:23:05 2020 +0200 [CONSRV] Improve zh-CN translation (#3157) The new word is more in line with PRC people's usage habits, and it is actually used in the Simplified Chinese translation of Windows. --- win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc b/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc index 3509f505fb3..4552ba0471a 100644 --- a/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc +++ b/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc @@ -5,7 +5,7 @@ BEGIN IDS_EDIT "编辑" IDS_MARK "标记" IDS_COPY "复制\tEnter" - IDS_PASTE "黏贴" + IDS_PASTE "粘贴" IDS_SELECTALL "全部选择" IDS_SCROLL "滚动" IDS_FIND "查找..."

4 years, 3 months

[reactos] 01/01: [SHELL32_APITEST] Strengthen ShellExecuteW testcase (#3165)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de9c32bfed29f76694073… commit de9c32bfed29f766940735e1fc851692b94d2b54 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Sep 13 00:47:56 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Sep 13 00:47:56 2020 +0900 [SHELL32_APITEST] Strengthen ShellExecuteW testcase (#3165) Add tests for special folders. CORE-16939 --- .../rostests/apitests/shell32/ShellExecuteW.cpp | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/modules/rostests/apitests/shell32/ShellExecuteW.cpp b/modules/rostests/apitests/shell32/ShellExecuteW.cpp index 0111783d0e6..b722615df67 100644 --- a/modules/rostests/apitests/shell32/ShellExecuteW.cpp +++ b/modules/rostests/apitests/shell32/ShellExecuteW.cpp @@ -119,6 +119,32 @@ START_TEST(ShellExecuteW) hWnd = FindWindowW(L"CabinetWClass", L"Search Results"); PostMessage(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); } + + // TEST #7: Open My Documents ("::{450d8fba-ad25-11d0-98a8-0800361b1103}") + hInstance = ShellExecuteW(NULL, NULL, L"::{450d8fba-ad25-11d0-98a8-0800361b1103}", NULL, NULL, SW_SHOWNORMAL); + ret = (INT)(UINT_PTR)hInstance; + ok(ret > 31, "TEST #7: ret:%d, LastError: %ld\n", ret, GetLastError()); + trace("TEST #7 ret: %d.\n", ret); + if (hInstance) + { + Sleep(WAIT_SLEEP); + // Terminate Window + hWnd = FindWindowW(L"CabinetWClass", NULL); + PostMessage(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); + } + + // TEST #8: Open My Documents ("shell:::{450d8fba-ad25-11d0-98a8-0800361b1103}") + hInstance = ShellExecuteW(NULL, L"open", L"shell:::{450d8fba-ad25-11d0-98a8-0800361b1103}", NULL, NULL, SW_SHOWNORMAL); + ret = (INT)(UINT_PTR)hInstance; + ok(ret > 31, "TEST #8: ret:%d, LastError: %ld\n", ret, GetLastError()); + trace("TEST #8 ret: %d.\n", ret); + if (hInstance) + { + Sleep(WAIT_SLEEP); + // Terminate Window + hWnd = FindWindowW(L"CabinetWClass", NULL); + PostMessage(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); + } } // Windows Server 2003 and Windows XP SP3 return values (Win 7 returns 42 in all cases)

4 years, 3 months

[reactos] 01/01: [KERNEL32_VISTA][NTDLL_VISTA][RTL_VISTA] Move Vista Rtl functions from kernel32_vista and ntdll_vista to rtl_vista (#3149)

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=61192390cf62f8a1806fc… commit 61192390cf62f8a1806fc6a6ecbc0b66e4e444ca Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Sep 12 15:04:02 2020 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 12 15:04:02 2020 +0200 [KERNEL32_VISTA][NTDLL_VISTA][RTL_VISTA] Move Vista Rtl functions from kernel32_vista and ntdll_vista to rtl_vista (#3149) * Move RtlRunOnce functions from kernel32_vista to rtl_vista and export them from ntdll_vista * Move condvar.c and srw.c from ntdll_vista to rtl_vista * Move ntdll_vista build script to a subfolder of ntdll The RtlRunOnce functions are taken from wine, completely unmodified. The code that was in kernel32_vista had change that used a global keyed_event handle, but was never initialized, so we were still passing NULL thus using the global ExpCritSecOutOfMemoryEvent. --- dll/ntdll/CMakeLists.txt | 2 + .../ntdll_vista => ntdll/nt_0600}/CMakeLists.txt | 14 +-- dll/{win32/ntdll_vista => ntdll/nt_0600}/DllMain.c | 0 .../ntdll_vista => ntdll/nt_0600}/ntdll_vista.spec | 4 + dll/win32/CMakeLists.txt | 1 - dll/win32/kernel32_vista/CMakeLists.txt | 2 +- dll/win32/kernel32_vista/InitOnceExecuteOnce.c | 105 +-------------------- sdk/lib/rtl/CMakeLists.txt | 10 ++ {dll/win32/ntdll_vista => sdk/lib/rtl}/condvar.c | 0 {dll/win32/ntdll_vista => sdk/lib/rtl}/rtl_vista.h | 11 ++- .../InitOnceExecuteOnce.c => sdk/lib/rtl/runonce.c | 49 +++++----- {dll/win32/ntdll_vista => sdk/lib/rtl}/srw.c | 0 12 files changed, 62 insertions(+), 136 deletions(-) diff --git a/dll/ntdll/CMakeLists.txt b/dll/ntdll/CMakeLists.txt index 6ad60fd8404..09e077cb4e6 100644 --- a/dll/ntdll/CMakeLists.txt +++ b/dll/ntdll/CMakeLists.txt @@ -1,4 +1,6 @@ +add_subdirectory(nt_0600) + spec2def(ntdll.dll def/ntdll.spec ADD_IMPORTLIB) add_definitions( diff --git a/dll/win32/ntdll_vista/CMakeLists.txt b/dll/ntdll/nt_0600/CMakeLists.txt similarity index 74% rename from dll/win32/ntdll_vista/CMakeLists.txt rename to dll/ntdll/nt_0600/CMakeLists.txt index d0edd56c6c0..061502ac7f1 100644 --- a/dll/win32/ntdll_vista/CMakeLists.txt +++ b/dll/ntdll/nt_0600/CMakeLists.txt @@ -1,20 +1,22 @@ -remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502) -add_definitions(-D_WIN32_WINNT=0x600 -DWINVER=0x600 +spec2def(ntdll_vista.dll ntdll_vista.spec ADD_IMPORTLIB) + +add_definitions( -D__NTDLL__ -D_NTOSKRNL_ - -D_NTSYSTEM_) + -DCRTDLL) -spec2def(ntdll_vista.dll ntdll_vista.spec ADD_IMPORTLIB) +include_directories( + BEFORE include + ${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys) list(APPEND SOURCE DllMain.c - condvar.c - srw.c ${CMAKE_CURRENT_BINARY_DIR}/ntdll_vista.def) add_library(ntdll_vista MODULE ${SOURCE}) set_module_type(ntdll_vista win32dll ENTRYPOINT DllMain 12) +target_link_libraries(ntdll_vista rtl_vista) if(ARCH STREQUAL "arm") target_link_libraries(ntdll_vista chkstk) endif() diff --git a/dll/win32/ntdll_vista/DllMain.c b/dll/ntdll/nt_0600/DllMain.c similarity index 100% rename from dll/win32/ntdll_vista/DllMain.c rename to dll/ntdll/nt_0600/DllMain.c diff --git a/dll/win32/ntdll_vista/ntdll_vista.spec b/dll/ntdll/nt_0600/ntdll_vista.spec similarity index 70% rename from dll/win32/ntdll_vista/ntdll_vista.spec rename to dll/ntdll/nt_0600/ntdll_vista.spec index 2bcde610d01..1a3098dde3f 100644 --- a/dll/win32/ntdll_vista/ntdll_vista.spec +++ b/dll/ntdll/nt_0600/ntdll_vista.spec @@ -8,3 +8,7 @@ @ stdcall RtlReleaseSRWLockShared(ptr) @ stdcall RtlAcquireSRWLockExclusive(ptr) @ stdcall RtlReleaseSRWLockExclusive(ptr) +@ stdcall RtlRunOnceInitialize(ptr) +@ stdcall RtlRunOnceBeginInitialize(ptr long ptr) +@ stdcall RtlRunOnceComplete(ptr long ptr) +@ stdcall RtlRunOnceExecuteOnce(ptr ptr ptr ptr) diff --git a/dll/win32/CMakeLists.txt b/dll/win32/CMakeLists.txt index 66a82d2d3b9..01e6dee240e 100644 --- a/dll/win32/CMakeLists.txt +++ b/dll/win32/CMakeLists.txt @@ -140,7 +140,6 @@ add_subdirectory(netid) add_subdirectory(netmsg) add_subdirectory(newdev) add_subdirectory(npptools) -add_subdirectory(ntdll_vista) add_subdirectory(ntdsapi) add_subdirectory(ntlanman) add_subdirectory(ntmarta) diff --git a/dll/win32/kernel32_vista/CMakeLists.txt b/dll/win32/kernel32_vista/CMakeLists.txt index 068297a4a03..915346689a1 100644 --- a/dll/win32/kernel32_vista/CMakeLists.txt +++ b/dll/win32/kernel32_vista/CMakeLists.txt @@ -15,7 +15,7 @@ list(APPEND SOURCE add_library(kernel32_vista MODULE ${SOURCE}) set_module_type(kernel32_vista win32dll ENTRYPOINT DllMain 12) -add_importlibs(kernel32_vista kernel32 ntdll) +add_importlibs(kernel32_vista kernel32 ntdll_vista ntdll) add_delay_importlibs(kernel32_vista ntdll_vista) add_dependencies(kernel32_vista psdk) add_cd_file(TARGET kernel32_vista DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/kernel32_vista/InitOnceExecuteOnce.c b/dll/win32/kernel32_vista/InitOnceExecuteOnce.c index b9073fd0fd3..1ef59160aef 100644 --- a/dll/win32/kernel32_vista/InitOnceExecuteOnce.c +++ b/dll/win32/kernel32_vista/InitOnceExecuteOnce.c @@ -5,107 +5,8 @@ #include <wine/config.h> #include <wine/port.h> -/* Taken from Wine ntdll/sync.c */ - -HANDLE keyed_event = NULL; - -static DWORD WINAPI RtlRunOnceBeginInitialize( RTL_RUN_ONCE *once, ULONG flags, void **context ) -{ - if (flags & RTL_RUN_ONCE_CHECK_ONLY) - { - ULONG_PTR val = (ULONG_PTR)once->Ptr; - - if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; - if ((val & 3) != 2) return STATUS_UNSUCCESSFUL; - if (context) *context = (void *)(val & ~3); - return STATUS_SUCCESS; - } - - for (;;) - { - ULONG_PTR next, val = (ULONG_PTR)once->Ptr; - - switch (val & 3) - { - case 0: /* first time */ - if (!interlocked_cmpxchg_ptr( &once->Ptr, - (flags & RTL_RUN_ONCE_ASYNC) ? (void *)3 : (void *)1, 0 )) - return STATUS_PENDING; - break; - - case 1: /* in progress, wait */ - if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; - next = val & ~3; - if (interlocked_cmpxchg_ptr( &once->Ptr, (void *)((ULONG_PTR)&next | 1), - (void *)val ) == (void *)val) - NtWaitForKeyedEvent( keyed_event, &next, FALSE, NULL ); - break; - - case 2: /* done */ - if (context) *context = (void *)(val & ~3); - return STATUS_SUCCESS; - - case 3: /* in progress, async */ - if (!(flags & RTL_RUN_ONCE_ASYNC)) return STATUS_INVALID_PARAMETER; - return STATUS_PENDING; - } - } -} - -static DWORD WINAPI RtlpRunOnceComplete( RTL_RUN_ONCE *once, ULONG flags, void *context ) -{ - if ((ULONG_PTR)context & 3) return STATUS_INVALID_PARAMETER; - - if (flags & RTL_RUN_ONCE_INIT_FAILED) - { - if (context) return STATUS_INVALID_PARAMETER; - if (flags & RTL_RUN_ONCE_ASYNC) return STATUS_INVALID_PARAMETER; - } - else context = (void *)((ULONG_PTR)context | 2); - - for (;;) - { - ULONG_PTR val = (ULONG_PTR)once->Ptr; - - switch (val & 3) - { - case 1: /* in progress */ - if (interlocked_cmpxchg_ptr( &once->Ptr, context, (void *)val ) != (void *)val) break; - val &= ~3; - while (val) - { - ULONG_PTR next = *(ULONG_PTR *)val; - NtReleaseKeyedEvent( keyed_event, (void *)val, FALSE, NULL ); - val = next; - } - return STATUS_SUCCESS; - - case 3: /* in progress, async */ - if (!(flags & RTL_RUN_ONCE_ASYNC)) return STATUS_INVALID_PARAMETER; - if (interlocked_cmpxchg_ptr( &once->Ptr, context, (void *)val ) != (void *)val) break; - return STATUS_SUCCESS; - - default: - return STATUS_UNSUCCESSFUL; - } - } -} - -static DWORD WINAPI RtlpRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN func, - void *param, void **context ) -{ - DWORD ret = RtlRunOnceBeginInitialize( once, 0, context ); - - if (ret != STATUS_PENDING) return ret; - - if (!func( once, param, context )) - { - RtlpRunOnceComplete( once, RTL_RUN_ONCE_INIT_FAILED, NULL ); - return STATUS_UNSUCCESSFUL; - } - - return RtlpRunOnceComplete( once, 0, context ? *context : NULL ); -} +DWORD WINAPI RtlRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN func, + void *param, void **context ); /* Taken from Wine kernel32/sync.c */ @@ -114,5 +15,5 @@ static DWORD WINAPI RtlpRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_IN */ BOOL NTAPI InitOnceExecuteOnce( INIT_ONCE *once, PINIT_ONCE_FN func, void *param, void **context ) { - return !RtlpRunOnceExecuteOnce( once, (PRTL_RUN_ONCE_INIT_FN)func, param, context ); + return !RtlRunOnceExecuteOnce( once, (PRTL_RUN_ONCE_INIT_FN)func, param, context ); } diff --git a/sdk/lib/rtl/CMakeLists.txt b/sdk/lib/rtl/CMakeLists.txt index 573e4c08026..65bf915b45d 100644 --- a/sdk/lib/rtl/CMakeLists.txt +++ b/sdk/lib/rtl/CMakeLists.txt @@ -114,3 +114,13 @@ add_asm_files(rtl_asm ${ASM_SOURCE}) add_library(rtl ${SOURCE} ${rtl_asm}) add_pch(rtl rtl.h SOURCE) add_dependencies(rtl psdk asm) + +list(APPEND SOURCE_VISTA + condvar.c + runonce.c + srw.c +) + +add_library(rtl_vista ${SOURCE_VISTA}) +add_pch(rtl rtl_vista.h SOURCE_VISTA) +add_dependencies(rtl_vista psdk) diff --git a/dll/win32/ntdll_vista/condvar.c b/sdk/lib/rtl/condvar.c similarity index 100% rename from dll/win32/ntdll_vista/condvar.c rename to sdk/lib/rtl/condvar.c diff --git a/dll/win32/ntdll_vista/rtl_vista.h b/sdk/lib/rtl/rtl_vista.h similarity index 90% rename from dll/win32/ntdll_vista/rtl_vista.h rename to sdk/lib/rtl/rtl_vista.h index 9f96f15b50d..ef887b77681 100644 --- a/dll/win32/ntdll_vista/rtl_vista.h +++ b/sdk/lib/rtl/rtl_vista.h @@ -6,8 +6,13 @@ * PROGRAMMER: Alex Ionescu */ -#ifndef RTL_H -#define RTL_H +#ifndef RTL_VISTA_H +#define RTL_VISTA_H + +#undef _WIN32_WINNT +#undef WINVER +#define _WIN32_WINNT 0x600 +#define WINVER 0x600 /* We're a core NT DLL, we don't import syscalls */ #define _INC_SWPRINTF_INL_ @@ -54,4 +59,4 @@ #define InterlockedBitTestAndSet64 _interlockedbittestandset64 #endif -#endif /* RTL_H */ +#endif /* RTL_VISTA_H */ diff --git a/dll/win32/kernel32_vista/InitOnceExecuteOnce.c b/sdk/lib/rtl/runonce.c similarity index 69% copy from dll/win32/kernel32_vista/InitOnceExecuteOnce.c copy to sdk/lib/rtl/runonce.c index b9073fd0fd3..10401287983 100644 --- a/dll/win32/kernel32_vista/InitOnceExecuteOnce.c +++ b/sdk/lib/rtl/runonce.c @@ -1,15 +1,22 @@ -#include "k32_vista.h" +/* Taken from Wine ntdll/sync.c */ -#include <ndk/exfuncs.h> +#include "rtl_vista.h" #include <wine/config.h> #include <wine/port.h> -/* Taken from Wine ntdll/sync.c */ - -HANDLE keyed_event = NULL; +/****************************************************************** + * RtlRunOnceInitialize (NTDLL.@) + */ +void WINAPI RtlRunOnceInitialize( RTL_RUN_ONCE *once ) +{ + once->Ptr = NULL; +} -static DWORD WINAPI RtlRunOnceBeginInitialize( RTL_RUN_ONCE *once, ULONG flags, void **context ) +/****************************************************************** + * RtlRunOnceBeginInitialize (NTDLL.@) + */ +DWORD WINAPI RtlRunOnceBeginInitialize( RTL_RUN_ONCE *once, ULONG flags, void **context ) { if (flags & RTL_RUN_ONCE_CHECK_ONLY) { @@ -38,7 +45,7 @@ static DWORD WINAPI RtlRunOnceBeginInitialize( RTL_RUN_ONCE *once, ULONG flags, next = val & ~3; if (interlocked_cmpxchg_ptr( &once->Ptr, (void *)((ULONG_PTR)&next | 1), (void *)val ) == (void *)val) - NtWaitForKeyedEvent( keyed_event, &next, FALSE, NULL ); + NtWaitForKeyedEvent( 0, &next, FALSE, NULL ); break; case 2: /* done */ @@ -52,7 +59,10 @@ static DWORD WINAPI RtlRunOnceBeginInitialize( RTL_RUN_ONCE *once, ULONG flags, } } -static DWORD WINAPI RtlpRunOnceComplete( RTL_RUN_ONCE *once, ULONG flags, void *context ) +/****************************************************************** + * RtlRunOnceComplete (NTDLL.@) + */ +DWORD WINAPI RtlRunOnceComplete( RTL_RUN_ONCE *once, ULONG flags, void *context ) { if ((ULONG_PTR)context & 3) return STATUS_INVALID_PARAMETER; @@ -75,7 +85,7 @@ static DWORD WINAPI RtlpRunOnceComplete( RTL_RUN_ONCE *once, ULONG flags, void * while (val) { ULONG_PTR next = *(ULONG_PTR *)val; - NtReleaseKeyedEvent( keyed_event, (void *)val, FALSE, NULL ); + NtReleaseKeyedEvent( 0, (void *)val, FALSE, NULL ); val = next; } return STATUS_SUCCESS; @@ -91,8 +101,11 @@ static DWORD WINAPI RtlpRunOnceComplete( RTL_RUN_ONCE *once, ULONG flags, void * } } -static DWORD WINAPI RtlpRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN func, - void *param, void **context ) +/****************************************************************** + * RtlRunOnceExecuteOnce (NTDLL.@) + */ +DWORD WINAPI RtlRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_INIT_FN func, + void *param, void **context ) { DWORD ret = RtlRunOnceBeginInitialize( once, 0, context ); @@ -100,19 +113,9 @@ static DWORD WINAPI RtlpRunOnceExecuteOnce( RTL_RUN_ONCE *once, PRTL_RUN_ONCE_IN if (!func( once, param, context )) { - RtlpRunOnceComplete( once, RTL_RUN_ONCE_INIT_FAILED, NULL ); + RtlRunOnceComplete( once, RTL_RUN_ONCE_INIT_FAILED, NULL ); return STATUS_UNSUCCESSFUL; } - return RtlpRunOnceComplete( once, 0, context ? *context : NULL ); -} - -/* Taken from Wine kernel32/sync.c */ - -/* - * @implemented - */ -BOOL NTAPI InitOnceExecuteOnce( INIT_ONCE *once, PINIT_ONCE_FN func, void *param, void **context ) -{ - return !RtlpRunOnceExecuteOnce( once, (PRTL_RUN_ONCE_INIT_FN)func, param, context ); + return RtlRunOnceComplete( once, 0, context ? *context : NULL ); } diff --git a/dll/win32/ntdll_vista/srw.c b/sdk/lib/rtl/srw.c similarity index 100% rename from dll/win32/ntdll_vista/srw.c rename to sdk/lib/rtl/srw.c

4 years, 3 months

[reactos] 01/01: [ASM] Fix boot with VS 16.7.3 / MSVC 19.27

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2aca4b279563ec536f013… commit 2aca4b279563ec536f013a4bd29f4b177e401ffe Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Sep 10 17:25:42 2020 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Sat Sep 12 15:01:04 2020 +0200 [ASM] Fix boot with VS 16.7.3 / MSVC 19.27 See https://developercommunity.visualstudio.com/content/problem/1180800/ml-x86-… --- boot/environ/app/rosload/i386/osxfera.s | 1 - boot/environ/lib/arch/i386/transfer.s | 1 - boot/freeldr/freeldr/arch/i386/multiboot.S | 2 +- hal/halx86/generic/systimer.S | 5 ----- hal/halx86/up/pic.S | 5 ----- ntoskrnl/ke/i386/trap.s | 2 +- sdk/include/asm/asm.inc | 2 +- sdk/lib/crt/math/i386/alldiv_asm.s | 4 ---- sdk/lib/crt/math/i386/pow_asm.s | 2 +- 9 files changed, 4 insertions(+), 20 deletions(-) diff --git a/boot/environ/app/rosload/i386/osxfera.s b/boot/environ/app/rosload/i386/osxfera.s index 3a555b81462..1418f164b35 100644 --- a/boot/environ/app/rosload/i386/osxfera.s +++ b/boot/environ/app/rosload/i386/osxfera.s @@ -16,7 +16,6 @@ EXTERN _OslKernelIdt:FWORD /* FUNCTIONS ****************************************************************/ .code -ASSUME nothing PUBLIC _OslArchTransferToKernel _OslArchTransferToKernel: diff --git a/boot/environ/lib/arch/i386/transfer.s b/boot/environ/lib/arch/i386/transfer.s index f7c60b6abc5..d87938363fc 100644 --- a/boot/environ/lib/arch/i386/transfer.s +++ b/boot/environ/lib/arch/i386/transfer.s @@ -21,7 +21,6 @@ EXTERN _BootApp32Parameters:DWORD /* FUNCTIONS ****************************************************************/ .code -ASSUME nothing PUBLIC _Archx86TransferTo32BitApplicationAsm _Archx86TransferTo32BitApplicationAsm: diff --git a/boot/freeldr/freeldr/arch/i386/multiboot.S b/boot/freeldr/freeldr/arch/i386/multiboot.S index 296ce0de73f..e176a64d54c 100644 --- a/boot/freeldr/freeldr/arch/i386/multiboot.S +++ b/boot/freeldr/freeldr/arch/i386/multiboot.S @@ -55,7 +55,7 @@ EXTERN __bss_end__:DWORD #ifdef _USE_ML .MBDATA SEGMENT PUBLIC 'DATA' -ASSUME nothing +//ASSUME nothing #endif /* Align to 32 bits boundary */ diff --git a/hal/halx86/generic/systimer.S b/hal/halx86/generic/systimer.S index 57e29f3c21e..be41fe1f179 100644 --- a/hal/halx86/generic/systimer.S +++ b/hal/halx86/generic/systimer.S @@ -35,11 +35,6 @@ EXTERN _DbgBreakPoint@0:PROC #define PIT_MODE HEX(43) #define SYSTEM_CTRL_PORT_A HEX(92) -/* GLOBALS *******************************************************************/ - -.data -ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING - /* FUNCTIONS *****************************************************************/ .code diff --git a/hal/halx86/up/pic.S b/hal/halx86/up/pic.S index 3f65a5545d8..f93bb972a01 100644 --- a/hal/halx86/up/pic.S +++ b/hal/halx86/up/pic.S @@ -11,11 +11,6 @@ #include <ks386.inc> -/* GLOBALS *******************************************************************/ - -.data -ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING - /* FUNCTIONS *****************************************************************/ .code diff --git a/ntoskrnl/ke/i386/trap.s b/ntoskrnl/ke/i386/trap.s index f3496f0ebc3..2f8070725d5 100644 --- a/ntoskrnl/ke/i386/trap.s +++ b/ntoskrnl/ke/i386/trap.s @@ -30,7 +30,7 @@ ENDM /* GLOBALS *******************************************************************/ .data -ASSUME nothing +ASSUME CS:nothing .align 16 diff --git a/sdk/include/asm/asm.inc b/sdk/include/asm/asm.inc index 458fce72f12..afbfdf24cd8 100644 --- a/sdk/include/asm/asm.inc +++ b/sdk/include/asm/asm.inc @@ -27,7 +27,7 @@ OPTION DOTNAME .686P .XMM .MODEL FLAT -ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING +ASSUME FS:NOTHING, GS:NOTHING #endif /* Explicit radix in MASM syntax */ diff --git a/sdk/lib/crt/math/i386/alldiv_asm.s b/sdk/lib/crt/math/i386/alldiv_asm.s index 74f5fff9b79..27580bcfc20 100644 --- a/sdk/lib/crt/math/i386/alldiv_asm.s +++ b/sdk/lib/crt/math/i386/alldiv_asm.s @@ -38,10 +38,6 @@ PUBLIC __alldiv - /* DATA ********************************************************************/ -.data -ASSUME CS:NOTHING, DS:NOTHING, ES:NOTHING, FS:NOTHING, GS:NOTHING - /* FUNCTIONS ***************************************************************/ .code diff --git a/sdk/lib/crt/math/i386/pow_asm.s b/sdk/lib/crt/math/i386/pow_asm.s index 2f33b2d0fbe..476430a8873 100644 --- a/sdk/lib/crt/math/i386/pow_asm.s +++ b/sdk/lib/crt/math/i386/pow_asm.s @@ -30,7 +30,7 @@ PUBLIC _pow .data -ASSUME nothing +ASSUME cs:nothing .align ALIGNARG(4) ASM_TYPE_DIRECTIVE(infinity,@object)

4 years, 3 months

[reactos] 01/01: [CABMAN] Replace linked lists with std::list CORE-17231

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b5d2da6d3565fcfce4f41… commit b5d2da6d3565fcfce4f414ad6f1a4cd3f80585f5 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Sep 3 18:12:25 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Sep 12 13:25:55 2020 +0200 [CABMAN] Replace linked lists with std::list CORE-17231 --- sdk/tools/cabman/cabinet.cxx | 293 +++++++++++-------------------------------- sdk/tools/cabman/cabinet.h | 23 +--- 2 files changed, 76 insertions(+), 240 deletions(-) diff --git a/sdk/tools/cabman/cabinet.cxx b/sdk/tools/cabman/cabinet.cxx index 1db3ce4e07a..175efef918a 100644 --- a/sdk/tools/cabman/cabinet.cxx +++ b/sdk/tools/cabman/cabinet.cxx @@ -83,13 +83,6 @@ CCabinet::CCabinet() CabinetReservedFileBuffer = NULL; CabinetReservedFileSize = 0; - FolderListHead = NULL; - FolderListTail = NULL; - FileListHead = NULL; - FileListTail = NULL; - CriteriaListHead = NULL; - CriteriaListTail = NULL; - Codec = NULL; CodecId = -1; CodecSelected = false; @@ -251,15 +244,7 @@ ULONG CCabinet::AddSearchCriteria(const char* SearchCriteria) return CAB_STATUS_NOMEMORY; } - Criteria->Prev = CriteriaListTail; - Criteria->Next = NULL; - - if(CriteriaListTail) - CriteriaListTail->Next = Criteria; - else - CriteriaListHead = Criteria; - - CriteriaListTail = Criteria; + CriteriaList.push_back(Criteria); // Set the actual criteria string Criteria->Search = SearchCriteria; @@ -272,22 +257,11 @@ void CCabinet::DestroySearchCriteria() * FUNCTION: Destroys the list with the search criteria */ { - PSEARCH_CRITERIA Criteria; - PSEARCH_CRITERIA NextCriteria; - - Criteria = CriteriaListHead; - - while(Criteria) + for (PSEARCH_CRITERIA Criteria : CriteriaList) { - NextCriteria = Criteria->Next; - delete Criteria; - - Criteria = NextCriteria; } - - CriteriaListHead = NULL; - CriteriaListTail = NULL; + CriteriaList.clear(); } bool CCabinet::HasSearchCriteria() @@ -297,7 +271,7 @@ bool CCabinet::HasSearchCriteria() * Whether we have search criteria or not. */ { - return (CriteriaListHead != NULL); + return !CriteriaList.empty(); } bool CCabinet::SetCompressionCodec(const char* CodecName) @@ -406,7 +380,6 @@ ULONG CCabinet::Open() * Status of operation */ { - PCFFOLDER_NODE FolderNode; ULONG Status; ULONG Index; @@ -508,7 +481,7 @@ ULONG CCabinet::Open() /* Read all folders */ for (Index = 0; Index < CABHeader.FolderCount; Index++) { - FolderNode = NewFolderNode(); + PCFFOLDER_NODE FolderNode = NewFolderNode(); if (!FolderNode) { DPRINT(MIN_TRACE, ("Insufficient resources.\n")); @@ -537,16 +510,14 @@ ULONG CCabinet::Open() } /* Read data blocks for all folders */ - FolderNode = FolderListHead; - while (FolderNode != NULL) + for (PCFFOLDER_NODE Node : FolderList) { - Status = ReadDataBlocks(FolderNode); + Status = ReadDataBlocks(Node); if (Status != CAB_STATUS_SUCCESS) { DPRINT(MIN_TRACE, ("ReadDataBlocks() failed (%u).\n", (UINT)Status)); return Status; } - FolderNode = FolderNode->Next; } } return CAB_STATUS_SUCCESS; @@ -576,7 +547,7 @@ ULONG CCabinet::FindFirst(PCAB_SEARCH Search) */ { RestartSearch = false; - Search->Next = FileListHead; + Search->Next = FileList.begin(); return FindNext(Search); } @@ -591,54 +562,49 @@ ULONG CCabinet::FindNext(PCAB_SEARCH Search) */ { bool bFound = false; - PSEARCH_CRITERIA Criteria; ULONG Status; if (RestartSearch) { - Search->Next = FileListHead; + Search->Next = FileList.begin(); /* Skip split files already extracted */ - while ((Search->Next) && - (Search->Next->File.FileControlID > CAB_FILE_MAX_FOLDER) && - (Search->Next->File.FileOffset <= LastFileOffset)) + while ((Search->Next != FileList.end()) && + ((*Search->Next)->File.FileControlID > CAB_FILE_MAX_FOLDER) && + ((*Search->Next)->File.FileOffset <= LastFileOffset)) { DPRINT(MAX_TRACE, ("Skipping file (%s) FileOffset (0x%X) LastFileOffset (0x%X).\n", - Search->Next->FileName.c_str(), (UINT)Search->Next->File.FileOffset, (UINT)LastFileOffset)); - Search->Next = Search->Next->Next; + (*Search->Next)->FileName.c_str(), (UINT)(*Search->Next)->File.FileOffset, (UINT)LastFileOffset)); + Search->Next++; } RestartSearch = false; } /* Check each search criteria against each file */ - while(Search->Next) + while(Search->Next != FileList.end()) { // Some features (like displaying cabinets) don't require search criteria, so we can just break here. // If a feature requires it, handle this in the ParseCmdline() function in "main.cxx". - if(!CriteriaListHead) + if (CriteriaList.empty()) break; - Criteria = CriteriaListHead; - - while(Criteria) + for (PSEARCH_CRITERIA Criteria : CriteriaList) { - if(MatchFileNamePattern(Search->Next->FileName.c_str(), Criteria->Search.c_str())) + if (MatchFileNamePattern((*Search->Next)->FileName.c_str(), Criteria->Search.c_str())) { bFound = true; break; } - - Criteria = Criteria->Next; } if(bFound) break; - Search->Next = Search->Next->Next; + Search->Next++; } - if (!Search->Next) + if (Search->Next == FileList.end()) { if (strlen(DiskNext) > 0) { @@ -652,17 +618,17 @@ ULONG CCabinet::FindNext(PCAB_SEARCH Search) if (Status != CAB_STATUS_SUCCESS) return Status; - Search->Next = FileListHead; - if (!Search->Next) + Search->Next = FileList.begin(); + if (Search->Next == FileList.end()) return CAB_STATUS_NOFILE; } else return CAB_STATUS_NOFILE; } - Search->File = &Search->Next->File; - Search->FileName = Search->Next->FileName; - Search->Next = Search->Next->Next; + Search->File = &(*Search->Next)->File; + Search->FileName = (*Search->Next)->FileName; + Search->Next++; return CAB_STATUS_SUCCESS; } @@ -901,7 +867,7 @@ ULONG CCabinet::ExtractFile(const char* FileName) } /* The file is continued in the first data block in the folder */ - File->DataBlock = CurrentFolderNode->DataListHead; + File->DataBlock = CurrentFolderNode->DataList.front(); /* Search to start of file */ if (fseek(FileHandle, (off_t)File->DataBlock->AbsoluteOffset, SEEK_SET) != 0) @@ -1339,14 +1305,12 @@ ULONG CCabinet::WriteDisk(ULONG MoreDisks) * Status of operation */ { - PCFFILE_NODE FileNode; ULONG Status; ContinueFile = false; - FileNode = FileListHead; - while (FileNode != NULL) + for (auto it = FileList.begin(); it != FileList.end();) { - Status = WriteFileToScratchStorage(FileNode); + Status = WriteFileToScratchStorage(*it); if (Status != CAB_STATUS_SUCCESS) return Status; @@ -1378,7 +1342,7 @@ ULONG CCabinet::WriteDisk(ULONG MoreDisks) else { ContinueFile = false; - FileNode = FileNode->Next; + it++; } } @@ -1398,8 +1362,6 @@ ULONG CCabinet::WriteDisk(ULONG MoreDisks) CloseDisk(); NewDisk(); CreateNewDisk = false; - - ASSERT(FileNode == FileListHead); } if ((CurrentIBufferSize > 0) || (CurrentOBufferSize > 0)) @@ -1425,7 +1387,6 @@ ULONG CCabinet::CommitDisk(ULONG MoreDisks) * Status of operation */ { - PCFFOLDER_NODE FolderNode; ULONG Status; OnCabinetName(CurrentDiskNumber, CabinetName); @@ -1463,8 +1424,7 @@ ULONG CCabinet::CommitDisk(ULONG MoreDisks) WriteFileEntries(); /* Write data blocks */ - FolderNode = FolderListHead; - while (FolderNode != NULL) + for (PCFFOLDER_NODE FolderNode : FolderList) { if (FolderNode->Commit) { @@ -1474,7 +1434,6 @@ ULONG CCabinet::CommitDisk(ULONG MoreDisks) /* Remove data blocks for folder */ DestroyDataNodes(FolderNode); } - FolderNode = FolderNode->Next; } fclose(FileHandle); @@ -1613,7 +1572,6 @@ bool CCabinet::CreateSimpleCabinet() const char* pszFile; char szFilePath[PATH_MAX]; char szFile[PATH_MAX]; - PSEARCH_CRITERIA Criteria; ULONG Status; #if defined(_WIN32) @@ -1634,9 +1592,7 @@ bool CCabinet::CreateSimpleCabinet() } // Add each file in the criteria list - Criteria = CriteriaListHead; - - while(Criteria) + for (PSEARCH_CRITERIA Criteria : CriteriaList) { // Store the file path with a trailing slash in szFilePath ConvertPath(Criteria->Search); @@ -1730,8 +1686,6 @@ bool CCabinet::CreateSimpleCabinet() closedir(dirp); } #endif - - Criteria = Criteria->Next; } Status = WriteDisk(false); @@ -1862,24 +1816,20 @@ PCFFOLDER_NODE CCabinet::LocateFolderNode(ULONG Index) * Pointer to folder node or NULL if the folder node was not found */ { - PCFFOLDER_NODE Node; - switch (Index) { case CAB_FILE_SPLIT: - return FolderListTail; + return FolderList.back(); case CAB_FILE_CONTINUED: case CAB_FILE_PREV_NEXT: - return FolderListHead; + return FolderList.front(); } - Node = FolderListHead; - while (Node != NULL) + for (PCFFOLDER_NODE Node : FolderList) { if (Node->Index == Index) return Node; - Node = Node->Next; } return NULL; } @@ -1894,15 +1844,12 @@ ULONG CCabinet::GetAbsoluteOffset(PCFFILE_NODE File) * Status of operation */ { - PCFDATA_NODE Node; - DPRINT(MAX_TRACE, ("FileName '%s' FileOffset (0x%X) FileSize (%u).\n", File->FileName.c_str(), (UINT)File->File.FileOffset, (UINT)File->File.FileSize)); - Node = CurrentFolderNode->DataListHead; - while (Node != NULL) + for (PCFDATA_NODE Node : CurrentFolderNode->DataList) { DPRINT(MAX_TRACE, ("GetAbsoluteOffset(): Comparing (0x%X, 0x%X) (%u).\n", (UINT)Node->UncompOffset, @@ -1919,8 +1866,6 @@ ULONG CCabinet::GetAbsoluteOffset(PCFFILE_NODE File) File->DataBlock = Node; return CAB_STATUS_SUCCESS; } - - Node = Node->Next; } return CAB_STATUS_INVALID_CAB; } @@ -1939,13 +1884,11 @@ ULONG CCabinet::LocateFile(const char* FileName, * Current folder is set to the folder of the file */ { - PCFFILE_NODE Node; ULONG Status; DPRINT(MAX_TRACE, ("FileName '%s'\n", FileName)); - Node = FileListHead; - while (Node != NULL) + for (PCFFILE_NODE Node : FileList) { if (strcasecmp(FileName, Node->FileName.c_str()) == 0) { @@ -1965,7 +1908,6 @@ ULONG CCabinet::LocateFile(const char* FileName, *File = Node; return Status; } - Node = Node->Next; } return CAB_STATUS_NOFILE; } @@ -2162,14 +2104,7 @@ PCFFOLDER_NODE CCabinet::NewFolderNode() Node->Folder.CompressionType = CAB_COMP_NONE; - Node->Prev = FolderListTail; - - if (FolderListTail != NULL) - FolderListTail->Next = Node; - else - FolderListHead = Node; - - FolderListTail = Node; + FolderList.push_back(Node); return Node; } @@ -2190,14 +2125,7 @@ PCFFILE_NODE CCabinet::NewFileNode() if (!Node) return NULL; - Node->Prev = FileListTail; - - if (FileListTail != NULL) - FileListTail->Next = Node; - else - FileListHead = Node; - - FileListTail = Node; + FileList.push_back(Node); return Node; } @@ -2218,14 +2146,7 @@ PCFDATA_NODE CCabinet::NewDataNode(PCFFOLDER_NODE FolderNode) if (!Node) return NULL; - Node->Prev = FolderNode->DataListTail; - - if (FolderNode->DataListTail != NULL) - FolderNode->DataListTail->Next = Node; - else - FolderNode->DataListHead = Node; - - FolderNode->DataListTail = Node; + FolderNode->DataList.push_back(Node); return Node; } @@ -2238,18 +2159,11 @@ void CCabinet::DestroyDataNodes(PCFFOLDER_NODE FolderNode) * FolderNode = Pointer to folder node */ { - PCFDATA_NODE PrevNode; - PCFDATA_NODE NextNode; - - NextNode = FolderNode->DataListHead; - while (NextNode != NULL) + for (PCFDATA_NODE Node : FolderNode->DataList) { - PrevNode = NextNode->Next; - delete NextNode; - NextNode = PrevNode; + delete Node; } - FolderNode->DataListHead = NULL; - FolderNode->DataListTail = NULL; + FolderNode->DataList.clear(); } @@ -2258,18 +2172,11 @@ void CCabinet::DestroyFileNodes() * FUNCTION: Destroys file nodes */ { - PCFFILE_NODE PrevNode; - PCFFILE_NODE NextNode; - - NextNode = FileListHead; - while (NextNode != NULL) + for (PCFFILE_NODE Node : FileList) { - PrevNode = NextNode->Next; - delete NextNode; - NextNode = PrevNode; + delete Node; } - FileListHead = NULL; - FileListTail = NULL; + FileList.clear(); } @@ -2278,33 +2185,13 @@ void CCabinet::DestroyDeletedFileNodes() * FUNCTION: Destroys file nodes that are marked for deletion */ { - PCFFILE_NODE CurNode; - PCFFILE_NODE NextNode; - - CurNode = FileListHead; - while (CurNode != NULL) + for (auto it = FileList.begin(); it != FileList.end(); ) { - NextNode = CurNode->Next; + PCFFILE_NODE CurNode = *it; if (CurNode->Delete) { - if (CurNode->Prev != NULL) - CurNode->Prev->Next = CurNode->Next; - else - { - FileListHead = CurNode->Next; - if (FileListHead) - FileListHead->Prev = NULL; - } - - if (CurNode->Next != NULL) - CurNode->Next->Prev = CurNode->Prev; - else - { - FileListTail = CurNode->Prev; - if (FileListTail) - FileListTail->Next = NULL; - } + it = FileList.erase(it); DPRINT(MAX_TRACE, ("Deleting file node: '%s'\n", CurNode->FileName.c_str())); @@ -2312,7 +2199,10 @@ void CCabinet::DestroyDeletedFileNodes() delete CurNode; } - CurNode = NextNode; + else + { + it++; + } } } @@ -2322,19 +2212,12 @@ void CCabinet::DestroyFolderNodes() * FUNCTION: Destroys folder nodes */ { - PCFFOLDER_NODE PrevNode; - PCFFOLDER_NODE NextNode; - - NextNode = FolderListHead; - while (NextNode != NULL) + for (PCFFOLDER_NODE Node : FolderList) { - PrevNode = NextNode->Next; - DestroyDataNodes(NextNode); - delete NextNode; - NextNode = PrevNode; + DestroyDataNodes(Node); + delete Node; } - FolderListHead = NULL; - FolderListTail = NULL; + FolderList.clear(); } @@ -2343,40 +2226,23 @@ void CCabinet::DestroyDeletedFolderNodes() * FUNCTION: Destroys folder nodes that are marked for deletion */ { - PCFFOLDER_NODE CurNode; - PCFFOLDER_NODE NextNode; - - CurNode = FolderListHead; - while (CurNode != NULL) + for (auto it = FolderList.begin(); it != FolderList.end();) { - NextNode = CurNode->Next; + PCFFOLDER_NODE CurNode = *it; if (CurNode->Delete) { - if (CurNode->Prev != NULL) - CurNode->Prev->Next = CurNode->Next; - else - { - FolderListHead = CurNode->Next; - if (FolderListHead) - FolderListHead->Prev = NULL; - } - - if (CurNode->Next != NULL) - CurNode->Next->Prev = CurNode->Prev; - else - { - FolderListTail = CurNode->Prev; - if (FolderListTail) - FolderListTail->Next = NULL; - } + it = FolderList.erase(it); DestroyDataNodes(CurNode); delete CurNode; TotalFolderSize -= sizeof(CFFOLDER); } - CurNode = NextNode; + else + { + it++; + } } } @@ -2611,8 +2477,6 @@ ULONG CCabinet::WriteCabinetHeader(bool MoreDisks) * Status of operation */ { - PCFFOLDER_NODE FolderNode; - PCFFILE_NODE FileNode; ULONG BytesWritten; ULONG Size; @@ -2631,16 +2495,13 @@ ULONG CCabinet::WriteCabinetHeader(bool MoreDisks) /* Set absolute folder offsets */ BytesWritten = Size + TotalFolderSize + TotalFileSize; CABHeader.FolderCount = 0; - FolderNode = FolderListHead; - while (FolderNode != NULL) + for (PCFFOLDER_NODE FolderNode : FolderList) { FolderNode->Folder.DataOffset = BytesWritten; BytesWritten += FolderNode->TotalFolderSize; CABHeader.FolderCount++; - - FolderNode = FolderNode->Next; } /* Set absolute offset of file table */ @@ -2648,12 +2509,10 @@ ULONG CCabinet::WriteCabinetHeader(bool MoreDisks) /* Count number of files to be committed */ CABHeader.FileCount = 0; - FileNode = FileListHead; - while (FileNode != NULL) + for (PCFFILE_NODE FileNode : FileList) { if (FileNode->Commit) CABHeader.FileCount++; - FileNode = FileNode->Next; } CABHeader.CabinetSize = DiskSize; @@ -2750,12 +2609,9 @@ ULONG CCabinet::WriteFolderEntries() * Status of operation */ { - PCFFOLDER_NODE FolderNode; - DPRINT(MAX_TRACE, ("Writing folder table.\n")); - FolderNode = FolderListHead; - while (FolderNode != NULL) + for (PCFFOLDER_NODE FolderNode : FolderList) { if (FolderNode->Commit) { @@ -2768,7 +2624,6 @@ ULONG CCabinet::WriteFolderEntries() return CAB_STATUS_CANNOT_WRITE; } } - FolderNode = FolderNode->Next; } return CAB_STATUS_SUCCESS; @@ -2782,13 +2637,11 @@ ULONG CCabinet::WriteFileEntries() * Status of operation */ { - PCFFILE_NODE File; bool SetCont = false; DPRINT(MAX_TRACE, ("Writing file table.\n")); - File = FileListHead; - while (File != NULL) + for (PCFFILE_NODE File : FileList) { if (File->Commit) { @@ -2829,8 +2682,6 @@ ULONG CCabinet::WriteFileEntries() SetCont = false; } } - - File = File->Next; } return CAB_STATUS_SUCCESS; } @@ -2845,15 +2696,13 @@ ULONG CCabinet::CommitDataBlocks(PCFFOLDER_NODE FolderNode) * Status of operation */ { - PCFDATA_NODE DataNode; ULONG BytesRead; ULONG Status; - DataNode = FolderNode->DataListHead; - if (DataNode != NULL) - Status = ScratchFile->Seek(DataNode->ScratchFilePosition); + if (!FolderNode->DataList.empty()) + Status = ScratchFile->Seek(FolderNode->DataList.front()->ScratchFilePosition); - while (DataNode != NULL) + for (PCFDATA_NODE DataNode : FolderNode->DataList) { DPRINT(MAX_TRACE, ("Reading block at (0x%X) CompSize (%u) UncompSize (%u).\n", (UINT)DataNode->ScratchFilePosition, @@ -2881,8 +2730,6 @@ ULONG CCabinet::CommitDataBlocks(PCFFOLDER_NODE FolderNode) DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } - - DataNode = DataNode->Next; } return CAB_STATUS_SUCCESS; } diff --git a/sdk/tools/cabman/cabinet.h b/sdk/tools/cabman/cabinet.h index a78d3553d6d..0940436d975 100644 --- a/sdk/tools/cabman/cabinet.h +++ b/sdk/tools/cabman/cabinet.h @@ -26,6 +26,7 @@ #include <string.h> #include <limits.h> #include <string> +#include <list> #ifndef PATH_MAX #define PATH_MAX MAX_PATH @@ -204,8 +205,6 @@ C_ASSERT(sizeof(CFDATA) == 8); typedef struct _CFDATA_NODE { - struct _CFDATA_NODE *Next = nullptr; - struct _CFDATA_NODE *Prev = nullptr; ULONG ScratchFilePosition = 0; // Absolute offset in scratch file ULONG AbsoluteOffset = 0; // Absolute offset in cabinet ULONG UncompOffset = 0; // Uncompressed offset in folder @@ -214,13 +213,10 @@ typedef struct _CFDATA_NODE typedef struct _CFFOLDER_NODE { - struct _CFFOLDER_NODE *Next = nullptr; - struct _CFFOLDER_NODE *Prev = nullptr; ULONG UncompOffset = 0; // File size accumulator ULONG AbsoluteOffset = 0; ULONG TotalFolderSize = 0; // Total size of folder in current disk - PCFDATA_NODE DataListHead = nullptr; - PCFDATA_NODE DataListTail = nullptr; + std::list<PCFDATA_NODE> DataList; ULONG Index = 0; bool Commit = false; // true if the folder should be committed bool Delete = false; // true if marked for deletion @@ -229,8 +225,6 @@ typedef struct _CFFOLDER_NODE typedef struct _CFFILE_NODE { - struct _CFFILE_NODE *Next = nullptr; - struct _CFFILE_NODE *Prev = nullptr; CFFILE File = { 0 }; std::string FileName; PCFDATA_NODE DataBlock = nullptr; // First data block of file. NULL if not known @@ -241,14 +235,12 @@ typedef struct _CFFILE_NODE typedef struct _SEARCH_CRITERIA { - struct _SEARCH_CRITERIA *Next = nullptr; // Pointer to next search criteria - struct _SEARCH_CRITERIA *Prev = nullptr; // Pointer to previous search criteria std::string Search; // The actual search criteria } SEARCH_CRITERIA, *PSEARCH_CRITERIA; typedef struct _CAB_SEARCH { - PCFFILE_NODE Next = nullptr; // Pointer to next node + std::list<PCFFILE_NODE>::iterator Next; // Pointer to next node PCFFILE File = nullptr; // Pointer to current CFFILE std::string FileName; // Current filename } CAB_SEARCH, *PCAB_SEARCH; @@ -456,14 +448,11 @@ private: ULONG CabinetReserved; ULONG FolderReserved; ULONG DataReserved; - PCFFOLDER_NODE FolderListHead; - PCFFOLDER_NODE FolderListTail; + std::list<PCFFOLDER_NODE> FolderList; PCFFOLDER_NODE CurrentFolderNode; PCFDATA_NODE CurrentDataNode; - PCFFILE_NODE FileListHead; - PCFFILE_NODE FileListTail; - PSEARCH_CRITERIA CriteriaListHead; - PSEARCH_CRITERIA CriteriaListTail; + std::list<PCFFILE_NODE> FileList; + std::list<PSEARCH_CRITERIA> CriteriaList; CCABCodec *Codec; LONG CodecId; bool CodecSelected;

4 years, 3 months

[reactos] 01/01: [FONTEXT] Initial implementation of CFontExt::DoGetFontTitle (#3127)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=183e1eb71bf4df393ecc8… commit 183e1eb71bf4df393ecc84d49e524cfa1ff05c4a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 12 09:40:48 2020 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 12 09:40:48 2020 +0900 [FONTEXT] Initial implementation of CFontExt::DoGetFontTitle (#3127) This PR is a preparation of fonts folder implementation. CORE-12861 --- dll/shellext/fontext/CFontExt.cpp | 36 ++++++++++++++++++++++++++---------- dll/shellext/fontext/CFontExt.hpp | 2 +- sdk/include/reactos/undocgdi.h | 32 ++++++++++++++++++++++---------- 3 files changed, 49 insertions(+), 21 deletions(-) diff --git a/dll/shellext/fontext/CFontExt.cpp b/dll/shellext/fontext/CFontExt.cpp index c157104c7e9..03d03f420b1 100644 --- a/dll/shellext/fontext/CFontExt.cpp +++ b/dll/shellext/fontext/CFontExt.cpp @@ -7,6 +7,7 @@ */ #include "precomp.h" +#include "undocgdi.h" // for GetFontResourceInfoW WINE_DEFAULT_DEBUG_CHANNEL(fontext); @@ -454,12 +455,8 @@ STDMETHODIMP CFontExt::DragEnter(IDataObject* pDataObj, DWORD grfKeyState, POINT if (FAILED_UNEXPECTEDLY(hr)) return hr; -#if 1 // Please implement DoGetFontTitle - return DRAGDROP_S_CANCEL; -#else *pdwEffect = DROPEFFECT_COPY; return S_OK; -#endif } STDMETHODIMP CFontExt::DragOver(DWORD grfKeyState, POINTL pt, DWORD* pdwEffect) @@ -567,8 +564,8 @@ HRESULT CFontExt::DoInstallFontFile(LPCWSTR pszFontPath, LPCWSTR pszFontsDir, HK WCHAR szDestFile[MAX_PATH]; LPCWSTR pszFileTitle = PathFindFileName(pszFontPath); - WCHAR szFontName[512]; - if (!DoGetFontTitle(pszFontPath, szFontName)) + CStringW strFontName; + if (!DoGetFontTitle(pszFontPath, strFontName)) return E_FAIL; RemoveFontResourceW(pszFileTitle); @@ -581,7 +578,7 @@ HRESULT CFontExt::DoInstallFontFile(LPCWSTR pszFontPath, LPCWSTR pszFontsDir, HK return E_FAIL; } - if (!AddFontResourceW(pszFileTitle)) + if (!AddFontResourceW(szDestFile)) { ERR("AddFontResourceW('%S') failed\n", pszFileTitle); DeleteFileW(szDestFile); @@ -589,7 +586,8 @@ HRESULT CFontExt::DoInstallFontFile(LPCWSTR pszFontPath, LPCWSTR pszFontsDir, HK } DWORD cbData = (wcslen(pszFileTitle) + 1) * sizeof(WCHAR); - LONG nError = RegSetValueExW(hkeyFonts, szFontName, 0, REG_SZ, (const BYTE *)szFontName, cbData); + LONG nError = RegSetValueExW(hkeyFonts, strFontName, 0, REG_SZ, + (const BYTE *)pszFileTitle, cbData); if (nError) { ERR("RegSetValueExW failed with %ld\n", nError); @@ -601,8 +599,26 @@ HRESULT CFontExt::DoInstallFontFile(LPCWSTR pszFontPath, LPCWSTR pszFontsDir, HK return S_OK; } -HRESULT CFontExt::DoGetFontTitle(LPCWSTR pszFontPath, LPCWSTR pszFontName) +HRESULT +CFontExt::DoGetFontTitle(IN LPCWSTR pszFontPath, OUT CStringW& strFontName) { - // TODO: + DWORD cbInfo = 0; + BOOL ret = GetFontResourceInfoW(pszFontPath, &cbInfo, NULL, 1); + if (!ret || !cbInfo) + { + ERR("GetFontResourceInfoW failed\n"); + return E_FAIL; + } + + LPWSTR pszBuffer = strFontName.GetBuffer(cbInfo / sizeof(WCHAR)); + ret = GetFontResourceInfoW(pszFontPath, &cbInfo, pszBuffer, 1); + strFontName.ReleaseBuffer(); + if (ret) + { + TRACE("pszFontName: %S\n", (LPCWSTR)strFontName); + return S_OK; + } + + ERR("GetFontResourceInfoW failed\n"); return E_FAIL; } diff --git a/dll/shellext/fontext/CFontExt.hpp b/dll/shellext/fontext/CFontExt.hpp index 6e3a178042d..ba868628957 100644 --- a/dll/shellext/fontext/CFontExt.hpp +++ b/dll/shellext/fontext/CFontExt.hpp @@ -93,5 +93,5 @@ public: END_COM_MAP() HRESULT DoInstallFontFile(LPCWSTR pszFontPath, LPCWSTR pszFontsDir, HKEY hkeyFonts); - HRESULT DoGetFontTitle(LPCWSTR pszFontPath, LPCWSTR pszFontName); + HRESULT DoGetFontTitle(IN LPCWSTR pszFontPath, OUT CStringW& strFontName); }; diff --git a/sdk/include/reactos/undocgdi.h b/sdk/include/reactos/undocgdi.h index 9abdbef9443..5826d4e9540 100644 --- a/sdk/include/reactos/undocgdi.h +++ b/sdk/include/reactos/undocgdi.h @@ -2,6 +2,10 @@ #ifndef _UNDOCGDI_H #define _UNDOCGDI_H +#ifdef __cplusplus +extern "C" { +#endif + #define DS_TILE 0x2 #define DS_TRANSPARENTALPHA 0x4 #define DS_TRANSPARENTCLR 0x8 @@ -26,19 +30,27 @@ typedef struct GDI_DRAW_STREAM_TAG DWORD crTransparent; // transparent color. } GDI_DRAW_STREAM, *PGDI_DRAW_STREAM; -BOOL -WINAPI -GdiDrawStream(HDC dc, ULONG l, PGDI_DRAW_STREAM pDS); +BOOL WINAPI GdiDrawStream(HDC dc, ULONG l, PGDI_DRAW_STREAM pDS); -BOOL -WINAPI +BOOL WINAPI GetTextExtentExPointWPri( HDC hdc, - LPCWSTR lpwsz, + LPCWSTR lpwsz, INT cwc, - INT dxMax, - LPINT pcCh, - LPINT pdxOut, + INT dxMax, + LPINT pcCh, + LPINT pdxOut, LPSIZE psize); -#endif \ No newline at end of file +BOOL WINAPI +GetFontResourceInfoW( + _In_z_ LPCWSTR lpFileName, + _Inout_ DWORD *pdwBufSize, + _Out_writes_to_opt_(*pdwBufSize, 1) PVOID lpBuffer, + _In_ DWORD dwType); + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif

4 years, 3 months

[reactos] 01/01: [CERTUTIL] Add skeleton application with support for -hashfile

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee69ca786af5e2d13c380… commit ee69ca786af5e2d13c380323d784909f92f80649 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Thu Sep 10 23:40:52 2020 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Fri Sep 11 15:29:28 2020 +0200 [CERTUTIL] Add skeleton application with support for -hashfile --- base/applications/cmdutils/CMakeLists.txt | 1 + base/applications/cmdutils/certutil/CMakeLists.txt | 13 ++ base/applications/cmdutils/certutil/certutil.c | 155 +++++++++++++++++++++ base/applications/cmdutils/certutil/precomp.h | 16 +++ 4 files changed, 185 insertions(+) diff --git a/base/applications/cmdutils/CMakeLists.txt b/base/applications/cmdutils/CMakeLists.txt index d2a800ca416..dd8a7ab2b06 100644 --- a/base/applications/cmdutils/CMakeLists.txt +++ b/base/applications/cmdutils/CMakeLists.txt @@ -1,5 +1,6 @@ add_subdirectory(at) add_subdirectory(attrib) +add_subdirectory(certutil) add_subdirectory(chcp) add_subdirectory(clip) add_subdirectory(comp) diff --git a/base/applications/cmdutils/certutil/CMakeLists.txt b/base/applications/cmdutils/certutil/CMakeLists.txt new file mode 100644 index 00000000000..bb9cd3a2fde --- /dev/null +++ b/base/applications/cmdutils/certutil/CMakeLists.txt @@ -0,0 +1,13 @@ + +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) + +list(APPEND SOURCE + certutil.c + precomp.h) + +add_executable(certutil ${SOURCE}) +set_module_type(certutil win32cui UNICODE) +target_link_libraries(certutil conutils ${PSEH_LIB}) +add_importlibs(certutil advapi32 msvcrt kernel32) +add_pch(certutil precomp.h SOURCE) +add_cd_file(TARGET certutil DESTINATION reactos/system32 FOR all) diff --git a/base/applications/cmdutils/certutil/certutil.c b/base/applications/cmdutils/certutil/certutil.c new file mode 100644 index 00000000000..7d6d2d68987 --- /dev/null +++ b/base/applications/cmdutils/certutil/certutil.c @@ -0,0 +1,155 @@ +/* + * PROJECT: ReactOS certutil + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: CertUtil stub + * COPYRIGHT: Copyright 2020 Mark Jansen (mark.jansen(a)reactos.org) + * + * Note: Only -hashfile is implemented for now, the rest is not present! + */ + +#include "precomp.h" +#include <wincrypt.h> +#include <stdlib.h> + + +static BOOL hash_file(LPCWSTR Filename) +{ + HCRYPTPROV hProv; + BOOL bSuccess = FALSE; + + HANDLE hFile = CreateFileW(Filename, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL); + + if (hFile == INVALID_HANDLE_VALUE) + { + ConPrintf(StdOut, L"CertUtil: -hashfile command failed: %d\n", GetLastError()); + return bSuccess; + } + + if (CryptAcquireContextW(&hProv, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) + { + HCRYPTHASH hHash; + + if (CryptCreateHash(hProv, CALG_SHA1, 0, 0, &hHash)) + { + BYTE Buffer[2048]; + DWORD cbRead; + + while ((bSuccess = ReadFile(hFile, Buffer, sizeof(Buffer), &cbRead, NULL))) + { + if (cbRead == 0) + break; + + if (!CryptHashData(hHash, Buffer, cbRead, 0)) + { + bSuccess = FALSE; + ConPrintf(StdOut, L"CertUtil: -hashfile command failed to hash: %d\n", GetLastError()); + break; + } + } + + if (bSuccess) + { + BYTE rgbHash[20]; + DWORD cbHash, n; + + if (CryptGetHashParam(hHash, HP_HASHVAL, rgbHash, &cbHash, 0)) + { + ConPrintf(StdOut, L"SHA1 hash of %s:\n", Filename); + for (n = 0; n < cbHash; ++n) + { + ConPrintf(StdOut, L"%02x", rgbHash[n]); + } + ConPuts(StdOut, L"\n"); + } + else + { + ConPrintf(StdOut, L"CertUtil: -hashfile command failed to extract hash: %d\n", GetLastError()); + bSuccess = FALSE; + } + } + + CryptDestroyHash(hHash); + } + else + { + ConPrintf(StdOut, L"CertUtil: -hashfile command no algorithm: %d\n", GetLastError()); + } + + CryptReleaseContext(hProv, 0); + } + else + { + ConPrintf(StdOut, L"CertUtil: -hashfile command no context: %d\n", GetLastError()); + } + + CloseHandle(hFile); + return bSuccess; +} + + +static void print_usage() +{ + ConPuts(StdOut, L"Verbs:\n"); + ConPuts(StdOut, L" -hashfile -- Display cryptographic hash over a file\n"); + ConPuts(StdOut, L"\n"); + ConPuts(StdOut, L"CertUtil -? -- Display a list of all verbs\n"); + ConPuts(StdOut, L"CertUtil -hashfile -? -- Display help text for the 'hashfile' verb\n"); +} + +int wmain(int argc, WCHAR *argv[]) +{ + int n; + + /* Initialize the Console Standard Streams */ + ConInitStdStreams(); + + if (argc == 1) /* i.e. no commandline arguments given */ + { + print_usage(); + return EXIT_SUCCESS; + } + + for (n = 1; n < argc; ++n) + { + if (!_wcsicmp(argv[n], L"-?")) + { + print_usage(); + return EXIT_SUCCESS; + } + else if (!_wcsicmp(argv[n], L"-hashfile")) + { + if (argc == 3) + { + if (!_wcsicmp(argv[n+1], L"-?")) + { + print_usage(); + return EXIT_SUCCESS; + } + else + { + if (!hash_file(argv[n+1])) + { + /* hash_file prints the failure itself */ + return EXIT_FAILURE; + } + + ConPuts(StdOut, L"CertUtil: -hashfile command completed successfully\n"); + return EXIT_SUCCESS; + } + } + else + { + ConPrintf(StdOut, L"CertUtil: -hashfile expected 1 argument, got %d\n", argc - 2); + return EXIT_FAILURE; + } + } + else + { + ConPrintf(StdOut, L"CertUtil: Unknown verb: %s\n", argv[n]); + return EXIT_FAILURE; + } + } + + return EXIT_SUCCESS; +} diff --git a/base/applications/cmdutils/certutil/precomp.h b/base/applications/cmdutils/certutil/precomp.h new file mode 100644 index 00000000000..0c8e115bf5e --- /dev/null +++ b/base/applications/cmdutils/certutil/precomp.h @@ -0,0 +1,16 @@ +#ifndef __CERTUTIL_PRECOMP_H +#define __CERTUTIL_PRECOMP_H + +/* INCLUDES ******************************************************************/ + +#include <stdarg.h> + +#include <windef.h> +#include <winbase.h> +#include <winreg.h> +#include <winuser.h> + +#include <conutils.h> + + +#endif /* __CERTUTIL_PRECOMP_H */

4 years, 3 months

[reactos] 01/01: [FILESYSTEMS] Fix pool memory disclosure in filesystem drivers supporting FS_INFORMATION_CLASS.FileFsVolumeInformation (#2975)

by Nguyen Trung Khanh

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=166f815e7b66966e5703c… commit 166f815e7b66966e5703c15275e3620bbedcd8a4 Author: Nguyen Trung Khanh <nguyentrungkhanh97(a)gmail.com> AuthorDate: Fri Sep 11 19:51:35 2020 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 11 15:51:35 2020 +0300 [FILESYSTEMS] Fix pool memory disclosure in filesystem drivers supporting FS_INFORMATION_CLASS.FileFsVolumeInformation (#2975) * FileFsVolumeInformation-memory-disclosure * remove unnecessary assignment to 0 * fix --- drivers/filesystems/cdfs/volinfo.c | 4 ++++ drivers/filesystems/fastfat/volume.c | 3 ++- drivers/filesystems/nfs/nfs41_driver.c | 4 ++++ drivers/filesystems/npfs/volinfo.c | 8 ++------ drivers/filesystems/udfs/volinfo.cpp | 3 +++ 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/drivers/filesystems/cdfs/volinfo.c b/drivers/filesystems/cdfs/volinfo.c index f61c9758868..0a0ef10bd57 100644 --- a/drivers/filesystems/cdfs/volinfo.c +++ b/drivers/filesystems/cdfs/volinfo.c @@ -160,6 +160,10 @@ Return Value: // and false if it couldn't wait for any I/O to complete. // +#ifdef __REACTOS__ + RtlZeroMemory(Irp->AssociatedIrp.SystemBuffer, Length); +#endif // __REACTOS__ + switch (IrpSp->Parameters.QueryVolume.FsInformationClass) { case FileFsSizeInformation: diff --git a/drivers/filesystems/fastfat/volume.c b/drivers/filesystems/fastfat/volume.c index f4f8f738ebf..e1eba1fd2a7 100644 --- a/drivers/filesystems/fastfat/volume.c +++ b/drivers/filesystems/fastfat/volume.c @@ -48,7 +48,6 @@ FsdGetFsVolumeInformation( RtlCopyMemory(FsVolumeInfo->VolumeLabel, DeviceObject->Vpb->VolumeLabel, *BufferLength); - *BufferLength = 0; } else { @@ -457,6 +456,8 @@ VfatQueryVolumeInformation( DPRINT("FsInformationClass %d\n", FsInformationClass); DPRINT("SystemBuffer %p\n", SystemBuffer); + RtlZeroMemory(SystemBuffer, BufferLength); + switch (FsInformationClass) { case FileFsVolumeInformation: diff --git a/drivers/filesystems/nfs/nfs41_driver.c b/drivers/filesystems/nfs/nfs41_driver.c index 90b57c8f270..86e8b594a9b 100644 --- a/drivers/filesystems/nfs/nfs41_driver.c +++ b/drivers/filesystems/nfs/nfs41_driver.c @@ -4546,6 +4546,10 @@ NTSTATUS nfs41_QueryVolumeInformation( status = check_nfs41_dirquery_args(RxContext); if (status) goto out; +#ifdef __REACTOS__ + RtlZeroMemory(RxContext->Info.Buffer, RxContext->Info.LengthRemaining); +#endif // __REACTOS__ + switch (InfoClass) { case FileFsVolumeInformation: if ((ULONG)RxContext->Info.LengthRemaining >= DevExt->VolAttrsLen) { diff --git a/drivers/filesystems/npfs/volinfo.c b/drivers/filesystems/npfs/volinfo.c index 4e3cf9f9229..36fe75f349a 100644 --- a/drivers/filesystems/npfs/volinfo.c +++ b/drivers/filesystems/npfs/volinfo.c @@ -27,8 +27,6 @@ NpQueryFsVolumeInfo(IN PVOID Buffer, *Length -= FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel); - InfoBuffer->VolumeCreationTime.QuadPart = 0; - InfoBuffer->VolumeSerialNumber = 0; InfoBuffer->SupportsObjects = 0; NameLength = 18; @@ -61,8 +59,6 @@ NpQueryFsSizeInfo(IN PVOID Buffer, *Length -= sizeof(*InfoBuffer); - InfoBuffer->TotalAllocationUnits.QuadPart = 0; - InfoBuffer->AvailableAllocationUnits.QuadPart = 0; InfoBuffer->SectorsPerAllocationUnit = 1; InfoBuffer->BytesPerSector = 1; @@ -78,8 +74,6 @@ NpQueryFsDeviceInfo(IN PVOID Buffer, PFILE_FS_DEVICE_INFORMATION InfoBuffer = Buffer; TRACE("Entered\n"); - InfoBuffer->DeviceType = 0; - InfoBuffer->Characteristics = 0; InfoBuffer->DeviceType = FILE_DEVICE_NAMED_PIPE; *Length -= sizeof(*InfoBuffer); @@ -153,6 +147,8 @@ NpCommonQueryVolumeInformation(IN PDEVICE_OBJECT DeviceObject, Length = IoStack->Parameters.QueryVolume.Length; InfoClass = IoStack->Parameters.QueryVolume.FsInformationClass; + RtlZeroMemory(Buffer, Length); + switch (InfoClass) { case FileFsVolumeInformation: diff --git a/drivers/filesystems/udfs/volinfo.cpp b/drivers/filesystems/udfs/volinfo.cpp index 2197fb29611..470e9113516 100644 --- a/drivers/filesystems/udfs/volinfo.cpp +++ b/drivers/filesystems/udfs/volinfo.cpp @@ -197,6 +197,9 @@ UDFCommonQueryVolInfo( try_return(RC); } #endif //UDF_ENABLE_SECURITY + + RtlZeroMemory(Irp->AssociatedIrp.SystemBuffer, Length); + switch (IrpSp->Parameters.QueryVolume.FsInformationClass) { case FileFsVolumeInformation:

4 years, 3 months

[reactos] 01/01: [FILESYSTEMS] Fix pool memory disclosure in NtQueryAttributesFile handlers (#2926)

by Nguyen Trung Khanh

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ede7a20a17e59476a181b… commit ede7a20a17e59476a181b326d6050b12580f7813 Author: Nguyen Trung Khanh <nguyentrungkhanh97(a)gmail.com> AuthorDate: Fri Sep 11 19:47:43 2020 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 11 15:47:43 2020 +0300 [FILESYSTEMS] Fix pool memory disclosure in NtQueryAttributesFile handlers (#2926) Fix pool memory disclosure caused by alignment bytes at the end of the _FILE_BASIC_INFORMATION structure --- drivers/filesystems/cdfs/fileinfo.c | 2 ++ drivers/filesystems/fastfat/finfo.c | 2 ++ drivers/filesystems/ntfs/finfo.c | 2 ++ drivers/filesystems/reiserfs/src/fileinfo.c | 4 +++- 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/filesystems/cdfs/fileinfo.c b/drivers/filesystems/cdfs/fileinfo.c index 62c929bac4a..40056c586f6 100644 --- a/drivers/filesystems/cdfs/fileinfo.c +++ b/drivers/filesystems/cdfs/fileinfo.c @@ -899,6 +899,8 @@ Return Value: // We only support creation, last modify and last write times on Cdfs. // + RtlZeroMemory(Buffer, sizeof(FILE_BASIC_INFORMATION)); + Buffer->LastWriteTime.QuadPart = Buffer->CreationTime.QuadPart = Buffer->ChangeTime.QuadPart = Fcb->CreationTime; diff --git a/drivers/filesystems/fastfat/finfo.c b/drivers/filesystems/fastfat/finfo.c index 576adb2e18d..755ba6a9917 100644 --- a/drivers/filesystems/fastfat/finfo.c +++ b/drivers/filesystems/fastfat/finfo.c @@ -293,6 +293,8 @@ VfatGetBasicInformation( if (*BufferLength < sizeof(FILE_BASIC_INFORMATION)) return STATUS_BUFFER_OVERFLOW; + RtlZeroMemory(BasicInfo, sizeof(FILE_BASIC_INFORMATION)); + if (vfatVolumeIsFatX(DeviceExt)) { FsdDosDateTimeToSystemTime(DeviceExt, diff --git a/drivers/filesystems/ntfs/finfo.c b/drivers/filesystems/ntfs/finfo.c index d7a55cbad39..757c971e159 100644 --- a/drivers/filesystems/ntfs/finfo.c +++ b/drivers/filesystems/ntfs/finfo.c @@ -107,6 +107,8 @@ NtfsGetBasicInformation(PFILE_OBJECT FileObject, if (*BufferLength < sizeof(FILE_BASIC_INFORMATION)) return STATUS_BUFFER_TOO_SMALL; + RtlZeroMemory(BasicInfo, sizeof(FILE_BASIC_INFORMATION)); + BasicInfo->CreationTime.QuadPart = FileName->CreationTime; BasicInfo->LastAccessTime.QuadPart = FileName->LastAccessTime; BasicInfo->LastWriteTime.QuadPart = FileName->LastWriteTime; diff --git a/drivers/filesystems/reiserfs/src/fileinfo.c b/drivers/filesystems/reiserfs/src/fileinfo.c index 4e24380b68b..8e7c16b94d5 100644 --- a/drivers/filesystems/reiserfs/src/fileinfo.c +++ b/drivers/filesystems/reiserfs/src/fileinfo.c @@ -3,7 +3,7 @@ * PROJECT: ReiserFs file system driver for Windows NT/2000/XP/Vista. * FILE: fileinfo.c * PURPOSE: - * PROGRAMMER: Mark Piper, Matt Wu, Bo Brant�n. + * PROGRAMMER: Mark Piper, Matt Wu, Bo Brantén. * HOMEPAGE: * UPDATE HISTORY: */ @@ -140,6 +140,8 @@ RfsdQueryInformation (IN PRFSD_IRP_CONTEXT IrpContext) } FileBasicInformation = (PFILE_BASIC_INFORMATION) Buffer; + + RtlZeroMemory(FileBasicInformation, sizeof(FILE_BASIC_INFORMATION)); FileBasicInformation->CreationTime = RfsdSysTime(Fcb->Inode->i_ctime);

4 years, 3 months

[reactos] 01/01: [SHELL32] Fix regression CORE-12364

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=35dbdaaa0ee79f4fb064b… commit 35dbdaaa0ee79f4fb064bc10446b75961369168e Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Sep 11 02:24:42 2020 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Sep 11 02:24:42 2020 +0200 [SHELL32] Fix regression CORE-12364 The sorting in explorer broke by SVN r73128 == git 24fcf531e78423b314a2d6a4ac750df69e478e3a Thanks to Doug Lyons for providing this patch. I do intend to port it back into 0.4.14RC. --- dll/win32/shell32/folders/CRegFolder.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dll/win32/shell32/folders/CRegFolder.cpp b/dll/win32/shell32/folders/CRegFolder.cpp index 6398109247d..6dc12770212 100644 --- a/dll/win32/shell32/folders/CRegFolder.cpp +++ b/dll/win32/shell32/folders/CRegFolder.cpp @@ -474,7 +474,15 @@ HRESULT WINAPI CRegFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, P } /* Guid folders come first compared to everything else */ - return MAKE_COMPARE_HRESULT(clsid1 ? -1 : 1); + /* And Drives come before folders in My Computer */ + if (_ILIsMyComputer(m_pidlRoot)) + { + return MAKE_COMPARE_HRESULT(clsid1 ? 1 : -1); + } + else + { + return MAKE_COMPARE_HRESULT(clsid1 ? -1 : 1); + } } HRESULT WINAPI CRegFolder::CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut)

4 years, 3 months

← Newer
1
...
29
30
31
32
33
34
35
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2020