Ros-diffs October 2021

ros-diffs@reactos.org

26 participants
116 discussions

[reactos] 03/06: [USBPORT] Don't use NTAPI for variadic function.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e7574ee5e8b92d969ed7d… commit e7574ee5e8b92d969ed7db5a9fc50c81a63b28e3 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Oct 9 16:00:24 2021 -0400 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Oct 27 19:27:33 2021 -0400 [USBPORT] Don't use NTAPI for variadic function. Powered by clang-cl. --- drivers/usb/usbport/debug.c | 1 - drivers/usb/usbport/usbport.h | 1 - sdk/include/reactos/drivers/usbport/usbmport.h | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/usb/usbport/debug.c b/drivers/usb/usbport/debug.c index 1d2662d5e33..4e04bfabcd7 100644 --- a/drivers/usb/usbport/debug.c +++ b/drivers/usb/usbport/debug.c @@ -16,7 +16,6 @@ #include "usbdebug.h" ULONG -NTAPI USBPORT_DbgPrint(IN PVOID MiniPortExtension, IN ULONG Level, IN PCH Format, diff --git a/drivers/usb/usbport/usbport.h b/drivers/usb/usbport/usbport.h index 286ea9d5c82..04936bfe304 100644 --- a/drivers/usb/usbport/usbport.h +++ b/drivers/usb/usbport/usbport.h @@ -744,7 +744,6 @@ USBPORT_DoneTransfer( /* debug.c */ ULONG -NTAPI USBPORT_DbgPrint( IN PVOID MiniPortExtension, IN ULONG Level, diff --git a/sdk/include/reactos/drivers/usbport/usbmport.h b/sdk/include/reactos/drivers/usbport/usbmport.h index bdb0dd9ccac..60cc85cc474 100644 --- a/sdk/include/reactos/drivers/usbport/usbmport.h +++ b/sdk/include/reactos/drivers/usbport/usbmport.h @@ -396,7 +396,7 @@ typedef MPSTATUS /* Port functions */ typedef ULONG -(NTAPI *PUSBPORT_DBG_PRINT)( +(*PUSBPORT_DBG_PRINT)( PVOID, ULONG, PCH,

3 years, 1 month

[reactos] 02/06: [SACDRV] Fix uninitialized variable usage.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4be3bc682dbffb845318b… commit 4be3bc682dbffb845318b868eb3f9de1d8ece1c5 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Oct 9 15:59:58 2021 -0400 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Oct 27 19:27:32 2021 -0400 [SACDRV] Fix uninitialized variable usage. Powered by clang-cl. --- drivers/sac/driver/data.c | 41 ++++++++++++++++++++++------------------- drivers/sac/driver/sacdrv.h | 1 + 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/drivers/sac/driver/data.c b/drivers/sac/driver/data.c index d7f1ae09d09..face230f688 100644 --- a/drivers/sac/driver/data.c +++ b/drivers/sac/driver/data.c @@ -153,27 +153,29 @@ FreeDeviceData(IN PDEVICE_OBJECT DeviceObject) /* Get the device extension and see how far we had gotten */ DeviceExtension = (PSAC_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - if ((GlobalDataInitialized) && (DeviceExtension->Initialized)) + if (!(GlobalDataInitialized) || !(DeviceExtension->Initialized)) { - /* Attempt to rundown while holding the lock */ + goto Exit; + } + + /* Attempt to rundown while holding the lock */ + KeAcquireSpinLock(&DeviceExtension->Lock, &OldIrql); + while (DeviceExtension->RundownInProgress) + { + SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC FreeDeviceData: Waiting....\n"); + + /* Initiate and wait for rundown */ + KeInitializeEvent(&DeviceExtension->RundownEvent, SynchronizationEvent, 0); + KeReleaseSpinLock(&DeviceExtension->Lock, OldIrql); + Status = KeWaitForSingleObject(&DeviceExtension->RundownEvent, + Executive, + KernelMode, + FALSE, + NULL); + ASSERT(Status == STATUS_SUCCESS); + + /* Re-acquire the lock and check if rundown is done */ KeAcquireSpinLock(&DeviceExtension->Lock, &OldIrql); - while (DeviceExtension->RundownInProgress) - { - SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC FreeDeviceData: Waiting....\n"); - - /* Initiate and wait for rundown */ - KeInitializeEvent(&DeviceExtension->RundownEvent, SynchronizationEvent, 0); - KeReleaseSpinLock(&DeviceExtension->Lock, OldIrql); - Status = KeWaitForSingleObject(&DeviceExtension->RundownEvent, - Executive, - KernelMode, - FALSE, - NULL); - ASSERT(Status == STATUS_SUCCESS); - - /* Re-acquire the lock and check if rundown is done */ - KeAcquireSpinLock(&DeviceExtension->Lock, &OldIrql); - } } /* Now set the rundown flag while we cancel the timer */ @@ -205,6 +207,7 @@ FreeDeviceData(IN PDEVICE_OBJECT DeviceObject) KeAcquireSpinLock(&DeviceExtension->Lock, &OldIrql); DeviceExtension->Initialized = FALSE; KeReleaseSpinLock(&DeviceExtension->Lock, OldIrql); +Exit: SAC_DBG(SAC_DBG_ENTRY_EXIT, "SAC FreeDeviceData: Exiting.\n"); } diff --git a/drivers/sac/driver/sacdrv.h b/drivers/sac/driver/sacdrv.h index 0280b6c9d1c..9c44671985f 100644 --- a/drivers/sac/driver/sacdrv.h +++ b/drivers/sac/driver/sacdrv.h @@ -74,6 +74,7 @@ { \ if (!VerifyEventWaitable(Attributes->x, &Object, &WaitObject)) \ { \ + Status = STATUS_INVALID_HANDLE; \ goto FailChannel; \ } \ Channel->x = Attributes->x; \

3 years, 1 month

[reactos] 01/06: [NDIS] Allow timer initialization at DISPATCH_LEVEL.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4eb45209ea9782abf5e2c… commit 4eb45209ea9782abf5e2c766d696ad9a75b5d076 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Oct 9 13:47:26 2021 -0400 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Oct 27 19:27:27 2021 -0400 [NDIS] Allow timer initialization at DISPATCH_LEVEL. Spotted by Mortal Wombat. --- drivers/network/ndis/ndis/time.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/network/ndis/ndis/time.c b/drivers/network/ndis/ndis/time.c index a35ea90107a..5234447da4c 100644 --- a/drivers/network/ndis/ndis/time.c +++ b/drivers/network/ndis/ndis/time.c @@ -80,10 +80,10 @@ NdisInitializeTimer( * FunctionContext: context (param 2) to be passed to the timer function when it runs * NOTES: * - TimerFunction will be called at DISPATCH_LEVEL - * - call at IRQL = PASSIVE_LEVEL + * - Must be called at IRQL <= DISPATCH_LEVEL */ { - PAGED_CODE(); + ASSERT_IRQL(DISPATCH_LEVEL); ASSERT(Timer); KeInitializeTimer (&Timer->Timer); @@ -203,10 +203,10 @@ NdisMInitializeTimer( * FunctionContext: argument passed to TimerFunction when it is called * NOTES: * - TimerFunction is called at IRQL = DISPATCH_LEVEL - * - call at IRQL = PASSIVE_LEVEL + * - Must be called at IRQL <= DISPATCH_LEVEL */ { - PAGED_CODE(); + ASSERT_IRQL(DISPATCH_LEVEL); ASSERT(Timer); KeInitializeTimer (&Timer->Timer);

3 years, 1 month

[reactos] 01/01: [MSHTML] Disable DDEEXEC settings of image files (#4074)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ebe441d1ab9d7b804071… commit 8ebe441d1ab9d7b804071265a4b0f0c3c339d791 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Oct 27 08:42:31 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 27 08:42:31 2021 +0900 [MSHTML] Disable DDEEXEC settings of image files (#4074) CORE-10227 --- dll/win32/mshtml/mshtml.inf | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dll/win32/mshtml/mshtml.inf b/dll/win32/mshtml/mshtml.inf index 9abfa2dc202..b7807c14ad3 100644 --- a/dll/win32/mshtml/mshtml.inf +++ b/dll/win32/mshtml/mshtml.inf @@ -107,9 +107,9 @@ HKCR,".gif","Content Type",,"image/gif" HKCR,"giffile",,,"GIF Image" HKCR,"giffile\CLSID",,,"%CLSID_HTMLDocument%" ;;HKCR,"giffile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" -HKCR,"giffile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," +;;HKCR,"giffile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," ;;HKCR,"giffile\shell\open\ddeexec\Application",,,"IExplore" -HKCR,"giffile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" +;;HKCR,"giffile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"giffile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,9" ;; GZIP @@ -154,9 +154,9 @@ HKCR,".jpe","Content Type",,"image/jpeg" HKCR,"jpegfile",,,"JPEG Image" HKCR,"jpegfile\CLSID",,,"%CLSID_HTMLDocument%" ;;HKCR,"jpegfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" -HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," +;;HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," ;;HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" -HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" +;;HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"jpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" ;; JPEG @@ -169,9 +169,9 @@ HKCR,".jpeg","Content Type",,"image/jpeg" HKCR,"jpegfile",,,"JPEG Image" HKCR,"jpegfile\CLSID",,,"%CLSID_HTMLDocument%" ;;HKCR,"jpegfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" -HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," +;;HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," ;;HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" -HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" +;;HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"jpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" ;; JPG @@ -180,9 +180,9 @@ HKCR,".jpg","Content Type",,"image/jpeg" HKCR,"jpegfile",,,"JPEG Image" HKCR,"jpegfile\CLSID",,,"%CLSID_HTMLDocument%" ;;HKCR,"jpegfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" -HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," +;;HKCR,"jpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," ;;HKCR,"jpegfile\shell\open\ddeexec\Application",,,"IExplore" -HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" +;;HKCR,"jpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"jpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" ;; MHTML @@ -217,9 +217,9 @@ HKCR,".jfif","Content Type",,"image/jpeg" HKCR,"pjpegfile",,,"JPEG Image" HKCR,"pjpegfile\CLSID",,,"%CLSID_HTMLDocument%" ;;HKCR,"pjpegfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" -HKCR,"pjpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," +;;HKCR,"pjpegfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," ;;HKCR,"pjpegfile\shell\open\ddeexec\Application",,,"IExplore" -HKCR,"pjpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" +;;HKCR,"pjpegfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"pjpegfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,8" ;; PNG @@ -230,9 +230,9 @@ HKCR,".png","Content Type",,"image/png" HKCR,"pngfile",,,"PNG Image" HKCR,"pngfile\CLSID",,,"%CLSID_HTMLDocument%" ;;HKCR,"pngfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe""" -nohome" -HKCR,"pngfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," +;;HKCR,"pngfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," ;;HKCR,"pngfile\shell\open\ddeexec\Application",,,"IExplore" -HKCR,"pngfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" +;;HKCR,"pngfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"pngfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,9" ;; PS @@ -273,9 +273,9 @@ HKCR,".xbm","Content Type",,"image/x-xbitmap" HKCR,"xbmfile",,,"XBM Image" HKCR,"xbmfile\CLSID",,,"%CLSID_HTMLDocument%" ;;HKCR,"xbmfile\shell\open\command",,,"""%16422%\Internet Explorer\iexplore.exe"" -nohome" -HKCR,"xbmfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," +;;HKCR,"xbmfile\shell\open\ddeexec",,,"""file:%%1"",,-1,,,,," ;;HKCR,"xbmfile\shell\open\ddeexec\Application",,,"IExplore" -HKCR,"xbmfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" +;;HKCR,"xbmfile\shell\open\ddeexec\Topic",,,"WWW_OpenURL" ;; HKCR,"xbmfile\DefaultIcon",,,"%16422%\Internet Explorer\iexplore.exe,9" ;; XML

3 years, 1 month

[reactos] 01/01: [IMM32] Forward ImmSetHotKey to USER32.CliImmSetHotKey (#4075)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5b7473753226ea74f96c6… commit 5b7473753226ea74f96c667ad5421390845f5aca Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Oct 27 08:40:15 2021 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Oct 27 08:40:15 2021 +0900 [IMM32] Forward ImmSetHotKey to USER32.CliImmSetHotKey (#4075) - Modify imm32.spec. CORE-11700 --- dll/win32/imm32/imm32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index 02217013950..956b8a7cee2 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -101,7 +101,7 @@ @ stdcall ImmSetCompositionStringW(ptr long ptr long ptr long) @ stdcall ImmSetCompositionWindow(ptr ptr) @ stdcall ImmSetConversionStatus(ptr long long) -#@ stdcall ImmSetHotKey(long long long ptr) user32.CliImmSetHotKey +@ stdcall ImmSetHotKey(long long long ptr) user32.CliImmSetHotKey @ stdcall ImmSetOpenStatus(ptr long) @ stdcall ImmSetStatusWindowPos(ptr ptr) @ stdcall ImmShowSoftKeyboard(ptr long)

3 years, 1 month

[reactos] 01/01: [CMAKE] Remove __inline substitutions

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ca4b0f257287ff9c5acc… commit 8ca4b0f257287ff9c5acc875899c0844acdcc876 Author: Victor Perevertkin <victor.perevertkin(a)reactos.org> AuthorDate: Tue Oct 26 22:21:11 2021 +0300 Commit: Victor Perevertkin <victor.perevertkin(a)reactos.org> CommitDate: Tue Oct 26 22:51:03 2021 +0300 [CMAKE] Remove __inline substitutions All supported compilers can do C99 now, this is not needed anymore. --- CMakeLists.txt | 4 ---- sdk/cmake/gcc.cmake | 2 -- sdk/cmake/msvc.cmake | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f02a6023eae..899960ab68e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -140,10 +140,6 @@ if(NOT CMAKE_CROSSCOMPILING) if(MSVC_VERSION GREATER 1699) add_definitions(/D_ALLOW_KEYWORD_MACROS) endif() - if(NOT USE_CLANG_CL) - # FIXME: Inspect - add_definitions(/Dinline=__inline) - endif() endif() add_subdirectory(sdk/include/host) diff --git a/sdk/cmake/gcc.cmake b/sdk/cmake/gcc.cmake index 65085aba793..921583cb276 100644 --- a/sdk/cmake/gcc.cmake +++ b/sdk/cmake/gcc.cmake @@ -166,8 +166,6 @@ elseif(ARCH STREQUAL "arm") add_definitions(-D__MSVCRT__) # DUBIOUS endif() -add_definitions(-D_inline=__inline) - # Fix build with GLIBCXX + our c++ headers add_definitions(-D_GLIBCXX_HAVE_BROKEN_VSWPRINTF) diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake index 8377e717739..5645f83dc31 100644 --- a/sdk/cmake/msvc.cmake +++ b/sdk/cmake/msvc.cmake @@ -30,7 +30,7 @@ if(ARCH STREQUAL "i386") add_definitions(/DWIN32 /D_WINDOWS) endif() -add_definitions(/Dinline=__inline /D__STDC__=1) +add_definitions(/D__STDC__=1) # Ignore any "standard" include paths, and do not use any default CRT library. if(NOT USE_CLANG_CL)

3 years, 1 month

[reactos] 02/02: [USBUHCI] Fix wrong sizeof access (#4070)

by Efe Itietie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c73c86419e46c079ad00e… commit c73c86419e46c079ad00e5e5761e8889f5f9fdb2 Author: Efe Itietie <omoiti00(a)gmail.com> AuthorDate: Mon Oct 25 10:58:46 2021 -0700 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Oct 26 17:10:51 2021 +0300 [USBUHCI] Fix wrong sizeof access (#4070) Reviewed-by: Victor Perevertkin <victor.perevertkin(a)reactos.org> Reviewed-by: Thomas Faber <thomas.faber(a)reactos.org> --- drivers/usb/usbuhci/roothub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/usbuhci/roothub.c b/drivers/usb/usbuhci/roothub.c index 2916ef5cc3e..286e5c3fd3d 100644 --- a/drivers/usb/usbuhci/roothub.c +++ b/drivers/usb/usbuhci/roothub.c @@ -241,7 +241,7 @@ UhciRHSetFeaturePortResetWorker(IN PUHCI_EXTENSION UhciExtension, RegPacket.UsbPortRequestAsyncCallback(UhciExtension, 10, // TimerValue pPort, - sizeof(pPort), + sizeof(*pPort), UhciRHPortResetComplete); }

3 years, 2 months

[reactos] 01/02: [USBEHCI] Fix coverity #1476930 "Wrong sizeOf access" (#4070)

by Efe Itietie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=feae6fbc6453564d82c0a… commit feae6fbc6453564d82c0a887f7d9815b65751da6 Author: Efe Itietie <omoiti00(a)gmail.com> AuthorDate: Mon Oct 25 10:56:16 2021 -0700 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Oct 26 17:10:51 2021 +0300 [USBEHCI] Fix coverity #1476930 "Wrong sizeOf access" (#4070) Reviewed-by: Victor Perevertkin <victor.perevertkin(a)reactos.org> Reviewed-by: Thomas Faber <thomas.faber(a)reactos.org> --- drivers/usb/usbehci/roothub.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/usbehci/roothub.c b/drivers/usb/usbehci/roothub.c index 67b39bfba90..a693d309ff1 100644 --- a/drivers/usb/usbehci/roothub.c +++ b/drivers/usb/usbehci/roothub.c @@ -154,7 +154,7 @@ EHCI_RH_GetRootHubData(IN PVOID ehciExtension, } else { - /* Ganged power switching (all ports� power at once) */ + /* Ganged power switching (all ports' power at once) */ HubCharacteristics.PowerControlMode = 0; } @@ -355,7 +355,7 @@ EHCI_RH_PortResetComplete(IN PVOID ehciExtension, RegPacket.UsbPortRequestAsyncCallback(EhciExtension, 50, // TimerValue Port, - sizeof(Port), + sizeof(*Port), EHCI_RH_FinishReset); }

3 years, 2 months

[reactos] 01/01: [UDFS] Fix crash on boot in release builds with UDFS removable media inserted (#4061) CORE-17598

by Doug Lyons

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a91f5e8e4db2fc9af3d09… commit a91f5e8e4db2fc9af3d09175e537f16307db17f3 Author: Doug Lyons <douglyons(a)douglyons.com> AuthorDate: Mon Oct 25 15:21:43 2021 -0500 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Oct 25 22:21:43 2021 +0200 [UDFS] Fix crash on boot in release builds with UDFS removable media inserted (#4061) CORE-17598 Changes to specific files and their effects are as follows: create.cpp - Allows booting past second stage with UDFS media inserted without BSOD close.cpp - Allows shutdown without hang dircntrl.cpp - Allows New Hardware Wizard not to hang on initial third phase install --- drivers/filesystems/udfs/close.cpp | 24 ++++++++++++------------ drivers/filesystems/udfs/create.cpp | 2 +- drivers/filesystems/udfs/dircntrl.cpp | 12 ++++++------ 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/filesystems/udfs/close.cpp b/drivers/filesystems/udfs/close.cpp index 62f98188380..efd4224782b 100644 --- a/drivers/filesystems/udfs/close.cpp +++ b/drivers/filesystems/udfs/close.cpp @@ -921,18 +921,18 @@ UDFCloseAllXXXDelayedInDir( IN BOOLEAN System ) { - PUDF_FILE_INFO* PassedList = NULL; - ULONG PassedListSize = 0; - PUDF_FILE_INFO* FoundList = NULL; - ULONG FoundListSize = 0; - NTSTATUS RC; - ULONG i; - BOOLEAN ResAcq = FALSE; - BOOLEAN AcquiredVcb = FALSE; - UDFNTRequiredFCB* NtReqFcb; - PUDF_FILE_INFO CurFileInfo; - PFE_LIST_ENTRY CurListPtr; - PFE_LIST_ENTRY* ListPtrArray = NULL; + PUDF_FILE_INFO* PassedList = NULL; + ULONG PassedListSize = 0; + PUDF_FILE_INFO* FoundList = NULL; + ULONG FoundListSize = 0; + NTSTATUS RC; + ULONG i; + _SEH2_VOLATILE BOOLEAN ResAcq = FALSE; + _SEH2_VOLATILE BOOLEAN AcquiredVcb = FALSE; + UDFNTRequiredFCB* NtReqFcb; + PUDF_FILE_INFO CurFileInfo; + PFE_LIST_ENTRY CurListPtr; + PFE_LIST_ENTRY* ListPtrArray = NULL; _SEH2_TRY { diff --git a/drivers/filesystems/udfs/create.cpp b/drivers/filesystems/udfs/create.cpp index 50d7f39d32c..79509977c1c 100644 --- a/drivers/filesystems/udfs/create.cpp +++ b/drivers/filesystems/udfs/create.cpp @@ -204,7 +204,7 @@ UDFCommonCreate( ACCESS_MASK DesiredAccess; PACCESS_STATE AccessState; - PVCB Vcb = NULL; + _SEH2_VOLATILE PVCB Vcb = NULL; _SEH2_VOLATILE BOOLEAN AcquiredVcb = FALSE; BOOLEAN OpenExisting = FALSE; PERESOURCE Res1 = NULL; diff --git a/drivers/filesystems/udfs/dircntrl.cpp b/drivers/filesystems/udfs/dircntrl.cpp index 26099e326a7..ce6b52dcc1d 100644 --- a/drivers/filesystems/udfs/dircntrl.cpp +++ b/drivers/filesystems/udfs/dircntrl.cpp @@ -134,8 +134,8 @@ UDFCommonDirControl( PFILE_OBJECT FileObject = NULL; PtrUDFFCB Fcb = NULL; PtrUDFCCB Ccb = NULL; - PVCB Vcb = NULL; - BOOLEAN AcquiredVcb = FALSE; + _SEH2_VOLATILE PVCB Vcb = NULL; + _SEH2_VOLATILE BOOLEAN AcquiredVcb = FALSE; TmPrint(("UDFCommonDirControl: \n")); // BrutePoint(); @@ -226,8 +226,8 @@ UDFQueryDirectory( BOOLEAN PostRequest = FALSE; PtrUDFNTRequiredFCB NtReqFcb = NULL; BOOLEAN CanWait = FALSE; - PVCB Vcb = NULL; - BOOLEAN AcquiredFCB = FALSE; + _SEH2_VOLATILE PVCB Vcb = NULL; + _SEH2_VOLATILE BOOLEAN AcquiredFCB = FALSE; unsigned long BufferLength = 0; UNICODE_STRING SearchPattern; PUNICODE_STRING PtrSearchPattern; @@ -696,8 +696,8 @@ UDFNotifyChangeDirectory( BOOLEAN CanWait = FALSE; ULONG CompletionFilter = 0; BOOLEAN WatchTree = FALSE; - PVCB Vcb = NULL; - BOOLEAN AcquiredFCB = FALSE; + _SEH2_VOLATILE PVCB Vcb = NULL; + _SEH2_VOLATILE BOOLEAN AcquiredFCB = FALSE; PEXTENDED_IO_STACK_LOCATION pStackLocation = (PEXTENDED_IO_STACK_LOCATION) IrpSp; UDFPrint(("UDFNotifyChangeDirectory\n"));

3 years, 2 months

[reactos] 01/01: [LIVECD] Add more registry entries for vbemp/vgamp

by Hervé Poussineau

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cd48bc7af813e0b45de21… commit cd48bc7af813e0b45de21b544d13f4022cd01caf Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Mon Oct 25 21:39:10 2021 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Mon Oct 25 21:44:45 2021 +0200 [LIVECD] Add more registry entries for vbemp/vgamp CORE-17579 --- win32ss/drivers/miniport/vbe/vbemp_reg.inf | 1 + win32ss/drivers/miniport/vga/vga_reg.inf | 1 + 2 files changed, 2 insertions(+) diff --git a/win32ss/drivers/miniport/vbe/vbemp_reg.inf b/win32ss/drivers/miniport/vbe/vbemp_reg.inf index 3b532c9fe9c..f3c36248311 100644 --- a/win32ss/drivers/miniport/vbe/vbemp_reg.inf +++ b/win32ss/drivers/miniport/vbe/vbemp_reg.inf @@ -6,6 +6,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ImagePath",0x00020000,"system32\dr HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Type",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\VBE","Tag",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\VBE\Video","Service",0x00000000,"VBE" HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","InstalledDisplayDrivers",0x00010000,"framebuf" HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\VBE\Device0","DefaultSettings.VRefresh",0x00010001,1 diff --git a/win32ss/drivers/miniport/vga/vga_reg.inf b/win32ss/drivers/miniport/vga/vga_reg.inf index 28d2d4eed8a..6a11511eec5 100644 --- a/win32ss/drivers/miniport/vga/vga_reg.inf +++ b/win32ss/drivers/miniport/vga/vga_reg.inf @@ -6,6 +6,7 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Vga","ImagePath",0x00020000,"system32\dr HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Start",0x00010001,0x00000004 HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Type",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Vga","Tag",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\Vga\Video","Service",0x00000000,"Vga" HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","VgaCompatible",0x00010001,1 HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\System\CurrentControlSet\Services\Vga\Device0","InstalledDisplayDrivers",0x00010000,"vgaddi"

3 years, 2 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2021