Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 03/04: [WIN32K] Mark default as unreachable.
by Thomas Faber 30 Oct '21

30 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4bc95812fd70ea382e234… commit 4bc95812fd70ea382e234b3c8e2e043f51fcae3a Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Oct 15 22:31:38 2021 -0400 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri Oct 29 22:06:49 2021 -0400 [WIN32K] Mark default as unreachable. Powered by clang-cl. --- win32ss/user/ntuser/defwnd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/win32ss/user/ntuser/defwnd.c b/win32ss/user/ntuser/defwnd.c index 4bfe24e3d55..660fd4c1494 100644 --- a/win32ss/user/ntuser/defwnd.c +++ b/win32ss/user/ntuser/defwnd.c @@ -486,8 +486,7 @@ DefWndGetIcon(PWND pWnd, WPARAM wParam, LPARAM lParam) case ICON_SMALL2: hIconRet = UserGetProp(pWnd, gpsi->atomIconSmProp, TRUE); break; - default: - break; + DEFAULT_UNREACHABLE; } return (LRESULT)hIconRet; }

1 0

[reactos] 02/04: [WIN32K] Remove unnecessary if in NtUserGetGUIThreadInfo.
by Thomas Faber 30 Oct '21

30 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3235e35dee1fb20b462e5… commit 3235e35dee1fb20b462e55a60fcafef63fe70638 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Oct 15 22:30:34 2021 -0400 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri Oct 29 22:06:49 2021 -0400 [WIN32K] Remove unnecessary if in NtUserGetGUIThreadInfo. This condition is already checked above. Powered by clang-cl. --- win32ss/user/ntuser/misc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/misc.c b/win32ss/user/ntuser/misc.c index f8c0d3e1ec3..10fa0144f16 100644 --- a/win32ss/user/ntuser/misc.c +++ b/win32ss/user/ntuser/misc.c @@ -426,7 +426,7 @@ NtUserGetGUIThreadInfo( MsgQueue = W32Thread->MessageQueue; else { - if ( Desktop ) MsgQueue = Desktop->ActiveMessageQueue; + MsgQueue = Desktop->ActiveMessageQueue; } } else

1 0

[reactos] 01/04: [WIN32K] Fix uninitialized hNewMenu use in MENU_DoNextMenu.
by Thomas Faber 30 Oct '21

30 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=42657493ef5b1dd7e7718… commit 42657493ef5b1dd7e7718ecf5f3c84606e5d8e9f Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Fri Oct 15 22:30:04 2021 -0400 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Fri Oct 29 22:06:46 2021 -0400 [WIN32K] Fix uninitialized hNewMenu use in MENU_DoNextMenu. See also: Wine's implementation. Powered by clang-cl. --- win32ss/user/ntuser/menu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 3c006fcd5a6..fb169b6e472 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -3813,6 +3813,7 @@ static LRESULT FASTCALL MENU_DoNextMenu(MTRACKER* pmt, UINT Vk, UINT wFlags) /* switch to the system menu */ MenuTmp = get_win_sys_menu(hNewWnd); if (MenuTmp) hNewMenu = UserHMGetHandle(MenuTmp); + else hNewMenu = NULL; } else return FALSE;

1 0

[reactos] 01/01: [NETSTAT] Fix coverity #1477187 "Double free" (#4069)
by Efe Itietie 28 Oct '21

28 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e75fc924045d4bcc8a2d… commit 0e75fc924045d4bcc8a2d859a905f251711cb1ce Author: Efe Itietie <omoiti00(a)gmail.com> AuthorDate: Mon Oct 25 11:08:03 2021 -0700 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Oct 28 17:26:09 2021 +0300 [NETSTAT] Fix coverity #1477187 "Double free" (#4069) Within the current ShowTcpTable function logic, tcpTable would be freed twice. The bug was introduced in b695971c. Remove the second tcpTable free and fix coverity #1477187. CORE-17831 --- base/applications/network/netstat/netstat.c | 1 - 1 file changed, 1 deletion(-) diff --git a/base/applications/network/netstat/netstat.c b/base/applications/network/netstat/netstat.c index bee7f834fd0..b1d177effec 100644 --- a/base/applications/network/netstat/netstat.c +++ b/base/applications/network/netstat/netstat.c @@ -434,7 +434,6 @@ BOOL ShowTcpTable(VOID) { ConResPrintf(StdErr, IDS_ERROR_TCP_SNAPSHOT); DoFormatMessage(error); - HeapFree(GetProcessHeap(), 0, tcpTable); return FALSE; }

1 0

[reactos] 06/06: [CODEOWNERS] Don't automatically add me to apitests and CMake PRs.
by Thomas Faber 28 Oct '21

28 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f4ccc518e35fe7747cfdf… commit f4ccc518e35fe7747cfdf0d92173d0b8cac29222 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Oct 16 11:33:53 2021 -0400 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Oct 27 19:27:33 2021 -0400 [CODEOWNERS] Don't automatically add me to apitests and CMake PRs. Still feel free to request my review explicitly if desired. --- CODEOWNERS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 13d3ad435c6..86f8aa11961 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -39,7 +39,7 @@ ## As responsible, he may refuse a local patch if you did not try to ## upstream your changes. -## If you want to get listed in that file, either put yourself in the +## If you want to get listed in this file, either put yourself in the ## file and push it, or open a pull request. You can also ask a person ## who has push access to add yourself. @@ -121,8 +121,8 @@ # R: learn-more, learn_more, Mark Jansen # R: ThFabba, Thomas Faber # S: Maintained -/sdk/cmake/ @learn-more @ThFabba -*.cmake @learn-more @ThFabba +/sdk/cmake/ @learn-more +*.cmake @learn-more # File Patch API # M: learn-more, learn_more, Mark Jansen @@ -225,7 +225,7 @@ # R: learn-more, learn_more, Mark Jansen # R: ThFabba, Thomas Faber # S: Maintained -/modules/rostests/apitests/ @learn-more @ThFabba +/modules/rostests/apitests/ @learn-more # ReactOS Kernel-Mode Tests # M: ThFabba, Thomas Faber

1 0

[reactos] 05/06: [USBUHCI] Fix always-false HcFlavor checks.
by Thomas Faber 28 Oct '21

28 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb3e2c7c8b8111bbbf0b6… commit fb3e2c7c8b8111bbbf0b6881573a203d8c8ec659 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Oct 9 16:01:47 2021 -0400 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Oct 27 19:27:33 2021 -0400 [USBUHCI] Fix always-false HcFlavor checks. Powered by clang-cl. --- drivers/usb/usbuhci/roothub.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/usb/usbuhci/roothub.c b/drivers/usb/usbuhci/roothub.c index 286e5c3fd3d..7c166122c68 100644 --- a/drivers/usb/usbuhci/roothub.c +++ b/drivers/usb/usbuhci/roothub.c @@ -195,13 +195,13 @@ UhciRHPortResetComplete(IN PVOID uhciExtension, PortControl.PortEnableDisableChange = 1; WRITE_PORT_USHORT(PortControlRegister, PortControl.AsUSHORT); - if (UhciExtension->HcFlavor == UHCI_VIA && - UhciExtension->HcFlavor == UHCI_VIA_x01 && - UhciExtension->HcFlavor == UHCI_VIA_x02 && - UhciExtension->HcFlavor == UHCI_VIA_x03 && + if (UhciExtension->HcFlavor == UHCI_VIA || + UhciExtension->HcFlavor == UHCI_VIA_x01 || + UhciExtension->HcFlavor == UHCI_VIA_x02 || + UhciExtension->HcFlavor == UHCI_VIA_x03 || UhciExtension->HcFlavor == UHCI_VIA_x04) { - DPRINT("UhciRHPortResetComplete: Via chip. FIXME\n"); + DPRINT1("UhciRHPortResetComplete: Via chip. FIXME\n"); DbgBreakPoint(); return; } @@ -266,10 +266,10 @@ UhciRHSetFeaturePortReset(IN PVOID uhciExtension, UhciExtension->ResetPortMask = ResetPortMask | PortBit; - if (UhciExtension->HcFlavor == UHCI_VIA && - UhciExtension->HcFlavor == UHCI_VIA_x01 && - UhciExtension->HcFlavor == UHCI_VIA_x02 && - UhciExtension->HcFlavor == UHCI_VIA_x03 && + if (UhciExtension->HcFlavor == UHCI_VIA || + UhciExtension->HcFlavor == UHCI_VIA_x01 || + UhciExtension->HcFlavor == UHCI_VIA_x02 || + UhciExtension->HcFlavor == UHCI_VIA_x03 || UhciExtension->HcFlavor == UHCI_VIA_x04) { DPRINT1("UhciRHSetFeaturePortReset: Via chip. FIXME\n");

1 0

[reactos] 04/06: [USBEHCI] Avoid uninitialized return status in EHCI_ReopenEndpoint.
by Thomas Faber 28 Oct '21

28 Oct '21

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=555eec03061a28858af8e… commit 555eec03061a28858af8e4e0909f063a1f8940ec Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Sat Oct 9 16:01:06 2021 -0400 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Oct 27 19:27:33 2021 -0400 [USBEHCI] Avoid uninitialized return status in EHCI_ReopenEndpoint. Powered by clang-cl. --- drivers/usb/usbehci/usbehci.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/usb/usbehci/usbehci.c b/drivers/usb/usbehci/usbehci.c index bdfd889ff1f..d7ce4aae37a 100644 --- a/drivers/usb/usbehci/usbehci.c +++ b/drivers/usb/usbehci/usbehci.c @@ -603,6 +603,7 @@ EHCI_ReopenEndpoint(IN PVOID ehciExtension, QH->sqh.HwQH.EndpointCaps.HubAddr = EndpointProperties->HubAddr; + MPStatus = MP_STATUS_SUCCESS; break; default:

1 0

[reactos] 03/06: [USBPORT] Don't use NTAPI for variadic function.
by Thomas Faber 28 Oct '21

28 Oct '21

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,

1 0

[reactos] 02/06: [SACDRV] Fix uninitialized variable usage.
by Thomas Faber 28 Oct '21

28 Oct '21

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; \

1 0

[reactos] 01/06: [NDIS] Allow timer initialization at DISPATCH_LEVEL.
by Thomas Faber 28 Oct '21

28 Oct '21

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);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs