Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sserapion] 36443: Remove references to Infp Functions that collide with inflib names, call the actual functions instead of making small functions that shared the same parameters and just called into inflib anyway, with no changes whatsoever. Make InfpGetIntField's 3rd parameter an INT*
by sserapion＠svn.reactos.org 24 Sep '08

24 Sep '08

Author: sserapion Date: Tue Sep 23 23:07:16 2008 New Revision: 36443 URL: http://svn.reactos.org/svn/reactos?rev=36443&view=rev Log: Remove references to Infp Functions that collide with inflib names, call the actual functions instead of making small functions that shared the same parameters and just called into inflib anyway, with no changes whatsoever. Make InfpGetIntField's 3rd parameter an INT* Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/inffile.c branches/ros-amd64-bringup/reactos/base/setup/usetup/inffile.h branches/ros-amd64-bringup/reactos/base/setup/usetup/usetup.h branches/ros-amd64-bringup/reactos/lib/inflib/infget.c branches/ros-amd64-bringup/reactos/lib/inflib/infpriv.h branches/ros-amd64-bringup/reactos/lib/inflib/infros.h branches/ros-amd64-bringup/reactos/lib/inflib/infrosget.c Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/inffile.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/setup/usetup/inffile.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/setup/usetup/inffile.c [iso-8859-1] Tue Sep 23 23:07:16 2008 @@ -66,46 +66,6 @@ } BOOL WINAPI -InfpFindNextLine( - IN PINFCONTEXT ContextIn, - OUT PINFCONTEXT ContextOut) -{ - return InfFindNextLine(ContextIn, ContextOut); -} - -BOOL WINAPI -InfpGetBinaryField( - IN PINFCONTEXT Context, - IN ULONG FieldIndex, - IN OUT BYTE* ReturnBuffer, - IN ULONG ReturnBufferSize, - OUT PULONG RequiredSize) -{ - return InfGetBinaryField(Context, FieldIndex, ReturnBuffer, ReturnBufferSize, RequiredSize); -} - -DWORD WINAPI -InfpGetFieldCount( - IN PINFCONTEXT Context) -{ - return (DWORD)InfGetFieldCount(Context); -} - -BOOL WINAPI -InfpGetIntField( - IN PINFCONTEXT Context, - IN DWORD FieldIndex, - OUT PINT IntegerValue) -{ - LONG IntegerValueL; - BOOL ret; - - ret = InfGetIntField(Context, FieldIndex, &IntegerValueL); - *IntegerValue = (INT)IntegerValueL; - return ret; -} - -BOOL WINAPI InfpGetMultiSzFieldW( IN PINFCONTEXT Context, IN ULONG FieldIndex, Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/inffile.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/setup/usetup/inffile.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/setup/usetup/inffile.h [iso-8859-1] Tue Sep 23 23:07:16 2008 @@ -37,10 +37,10 @@ #define SetupCloseInfFile InfpCloseInfFile #define SetupFindFirstLineW InfpFindFirstLineW -#define SetupFindNextLine InfpFindNextLine -#define SetupGetBinaryField InfpGetBinaryField -#define SetupGetFieldCount InfpGetFieldCount -#define SetupGetIntField InfpGetIntField +#define SetupFindNextLine InfFindNextLine +#define SetupGetBinaryField InfGetBinaryField +#define SetupGetFieldCount InfGetFieldCount +#define SetupGetIntField InfGetIntField #define SetupGetMultiSzFieldW InfpGetMultiSzFieldW #define SetupGetStringFieldW InfpGetStringFieldW #define SetupOpenInfFileW InfpOpenInfFileW @@ -66,29 +66,6 @@ IN PCWSTR Section, IN PCWSTR Key, IN OUT PINFCONTEXT Context); - -BOOL WINAPI -InfpFindNextLine( - IN PINFCONTEXT ContextIn, - OUT PINFCONTEXT ContextOut); - -BOOL WINAPI -InfpGetBinaryField( - IN PINFCONTEXT Context, - IN ULONG FieldIndex, - IN OUT BYTE* ReturnBuffer, - IN ULONG ReturnBufferSize, - OUT PULONG RequiredSize); - -DWORD WINAPI -InfpGetFieldCount( - IN PINFCONTEXT Context); - -BOOL WINAPI -InfpGetIntField( - IN PINFCONTEXT Context, - IN DWORD FieldIndex, - OUT PINT IntegerValue); BOOL WINAPI InfpGetMultiSzFieldW( Modified: branches/ros-amd64-bringup/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/base/… ============================================================================== --- branches/ros-amd64-bringup/reactos/base/setup/usetup/usetup.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/base/setup/usetup/usetup.h [iso-8859-1] Tue Sep 23 23:07:16 2008 @@ -54,6 +54,7 @@ /* Internal Headers */ #include "interface/consup.h" #include "partlist.h" +#include "infros.h" #include "inffile.h" #include "inicache.h" #include "progress.h" Modified: branches/ros-amd64-bringup/reactos/lib/inflib/infget.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/i… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/inflib/infget.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/inflib/infget.c [iso-8859-1] Tue Sep 23 23:07:16 2008 @@ -271,7 +271,7 @@ INFSTATUS InfpGetIntField(PINFCONTEXT Context, ULONG FieldIndex, - PLONG IntegerValue) + INT* IntegerValue) { PINFCACHELINE CacheLine; PINFCACHEFIELD CacheField; Modified: branches/ros-amd64-bringup/reactos/lib/inflib/infpriv.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/i… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/inflib/infpriv.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/inflib/infpriv.h [iso-8859-1] Tue Sep 23 23:07:16 2008 @@ -116,7 +116,7 @@ PULONG RequiredSize); extern INFSTATUS InfpGetIntField(PINFCONTEXT Context, ULONG FieldIndex, - PLONG IntegerValue); + INT* IntegerValue); extern INFSTATUS InfpGetMultiSzField(PINFCONTEXT Context, ULONG FieldIndex, PTSTR ReturnBuffer, Modified: branches/ros-amd64-bringup/reactos/lib/inflib/infros.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/i… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/inflib/infros.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/inflib/infros.h [iso-8859-1] Tue Sep 23 23:07:16 2008 @@ -49,7 +49,7 @@ PULONG RequiredSize); extern BOOLEAN InfGetIntField(PINFCONTEXT Context, ULONG FieldIndex, - PLONG IntegerValue); + PINT IntegerValue); extern BOOLEAN InfGetMultiSzField(PINFCONTEXT Context, ULONG FieldIndex, PWSTR ReturnBuffer, Modified: branches/ros-amd64-bringup/reactos/lib/inflib/infrosget.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/i… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/inflib/infrosget.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/inflib/infrosget.c [iso-8859-1] Tue Sep 23 23:07:16 2008 @@ -84,7 +84,7 @@ BOOLEAN InfGetIntField(PINFCONTEXT Context, ULONG FieldIndex, - PLONG IntegerValue) + PINT IntegerValue) { return INF_SUCCESS(InfpGetIntField(Context, FieldIndex, IntegerValue)); }

1 0

[cgutman] 36442: - Use timers so the code is much more simple and works better
by cgutman＠svn.reactos.org 23 Sep '08

23 Sep '08

Author: cgutman Date: Tue Sep 23 18:59:43 2008 New Revision: 36442 URL: http://svn.reactos.org/svn/reactos?rev=36442&view=rev Log: - Use timers so the code is much more simple and works better Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Tue Sep 23 18:59:43 2008 @@ -635,24 +635,20 @@ } VOID STDCALL -HangTimer( PVOID Context ) -{ - PLOGICAL_ADAPTER Adapter = Context; - BOOLEAN AddressingReset; - - while (Adapter->NdisMiniportBlock.PnPDeviceState == NdisPnPDeviceStarted) - { - AddressingReset = FALSE; - - NdisMSleep(Adapter->NdisMiniportBlock.CheckForHangSeconds * 1000000); - - if (MiniCheckForHang(Adapter)) - MiniReset(Adapter, &AddressingReset); - - /* FIXME: We should call MiniportSetInformation if AddressingReset is TRUE */ - } - - PsTerminateSystemThread(STATUS_SUCCESS); +MiniportHangDpc( + PKDPC Dpc, + PVOID DeferredContext, + PVOID SystemArgument1, + PVOID SystemArgument2) +{ + PLOGICAL_ADAPTER Adapter = DeferredContext; + BOOLEAN AddressingReset = FALSE; + + + if (MiniCheckForHang(Adapter)) + MiniReset(Adapter, &AddressingReset); + + /* FIXME: We should call MiniportSetInformation if AddressingReset is TRUE */ } @@ -1442,9 +1438,8 @@ PNDIS_CONFIGURATION_PARAMETER ConfigParam; NDIS_HANDLE ConfigHandle; ULONG Size; - HANDLE HangTimerHandle; - -/* FIXME - KIRQL OldIrql; */ + LARGE_INTEGER Timeout; + /* FIXME - KIRQL OldIrql; */ /* * Prepare wrapper context used by HW and configuration routines. @@ -1663,9 +1658,10 @@ Adapter->NdisMiniportBlock.OldPnPDeviceState = Adapter->NdisMiniportBlock.PnPDeviceState; Adapter->NdisMiniportBlock.PnPDeviceState = NdisPnPDeviceStarted; - PsCreateSystemThread(&HangTimerHandle, THREAD_ALL_ACCESS, 0, 0, 0, - HangTimer, Adapter); - ZwClose(HangTimerHandle); + Timeout.QuadPart = (LONGLONG)Adapter->NdisMiniportBlock.CheckForHangSeconds * -1000000; + KeSetTimerEx(&Adapter->NdisMiniportBlock.WakeUpDpcTimer.Timer, Timeout, + Adapter->NdisMiniportBlock.CheckForHangSeconds * 1000, + &Adapter->NdisMiniportBlock.WakeUpDpcTimer.Dpc); /* Put adapter in adapter list for this miniport */ ExInterlockedInsertTailList(&Adapter->NdisMiniportBlock.DriverHandle->DeviceList, &Adapter->MiniportListEntry, &Adapter->NdisMiniportBlock.DriverHandle->Lock); @@ -1721,6 +1717,8 @@ Adapter->NdisMiniportBlock.OldPnPDeviceState = Adapter->NdisMiniportBlock.PnPDeviceState; Adapter->NdisMiniportBlock.PnPDeviceState = NdisPnPDeviceStopped; + + KeCancelTimer(&Adapter->NdisMiniportBlock.WakeUpDpcTimer.Timer); return STATUS_SUCCESS; } @@ -1908,7 +1906,9 @@ Adapter->NdisMiniportBlock.OldPnPDeviceState = 0; Adapter->NdisMiniportBlock.PnPDeviceState = NdisPnPDeviceAdded; - KeInitializeDpc(&Adapter->NdisMiniportBlock.DeferredDpc, MiniportDpc, (PVOID)Adapter); + KeInitializeTimer(&Adapter->NdisMiniportBlock.WakeUpDpcTimer.Timer); + KeInitializeDpc(&Adapter->NdisMiniportBlock.WakeUpDpcTimer.Dpc, MiniportHangDpc, Adapter); + KeInitializeDpc(&Adapter->NdisMiniportBlock.DeferredDpc, MiniportDpc, Adapter); DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING;

1 0

[cgutman] 36441: - Check for miniport hangs at the appropriate time - Call MiniReset if required
by cgutman＠svn.reactos.org 23 Sep '08

23 Sep '08

Author: cgutman Date: Tue Sep 23 15:54:02 2008 New Revision: 36441 URL: http://svn.reactos.org/svn/reactos?rev=36441&view=rev Log: - Check for miniport hangs at the appropriate time - Call MiniReset if required Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Tue Sep 23 15:54:02 2008 @@ -632,6 +632,27 @@ KeLowerIrql(OldIrql); return Status; +} + +VOID STDCALL +HangTimer( PVOID Context ) +{ + PLOGICAL_ADAPTER Adapter = Context; + BOOLEAN AddressingReset; + + while (Adapter->NdisMiniportBlock.PnPDeviceState == NdisPnPDeviceStarted) + { + AddressingReset = FALSE; + + NdisMSleep(Adapter->NdisMiniportBlock.CheckForHangSeconds * 1000000); + + if (MiniCheckForHang(Adapter)) + MiniReset(Adapter, &AddressingReset); + + /* FIXME: We should call MiniportSetInformation if AddressingReset is TRUE */ + } + + PsTerminateSystemThread(STATUS_SUCCESS); } @@ -1421,6 +1442,8 @@ PNDIS_CONFIGURATION_PARAMETER ConfigParam; NDIS_HANDLE ConfigHandle; ULONG Size; + HANDLE HangTimerHandle; + /* FIXME - KIRQL OldIrql; */ /* @@ -1639,6 +1662,10 @@ Adapter->NdisMiniportBlock.OldPnPDeviceState = Adapter->NdisMiniportBlock.PnPDeviceState; Adapter->NdisMiniportBlock.PnPDeviceState = NdisPnPDeviceStarted; + + PsCreateSystemThread(&HangTimerHandle, THREAD_ALL_ACCESS, 0, 0, 0, + HangTimer, Adapter); + ZwClose(HangTimerHandle); /* Put adapter in adapter list for this miniport */ ExInterlockedInsertTailList(&Adapter->NdisMiniportBlock.DriverHandle->DeviceList, &Adapter->MiniportListEntry, &Adapter->NdisMiniportBlock.DriverHandle->Lock);

1 0

[cgutman] 36440: - Uncomment the stubbed CheckForHang handler
by cgutman＠svn.reactos.org 23 Sep '08

23 Sep '08

Author: cgutman Date: Tue Sep 23 15:48:43 2008 New Revision: 36440 URL: http://svn.reactos.org/svn/reactos?rev=36440&view=rev Log: - Uncomment the stubbed CheckForHang handler Modified: branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c Modified: branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] Tue Sep 23 15:48:43 2008 @@ -63,8 +63,7 @@ NDIS_PHYSICAL_ADDRESS HighestAcceptableMax = NDIS_PHYSICAL_ADDRESS_CONST(-1, -1); -#if 0 -static BOOLEAN MiniportCheckForHang( +static BOOLEAN STDCALL MiniportCheckForHang( IN NDIS_HANDLE MiniportAdapterContext) /* * FUNCTION: Examines if an adapter has hung @@ -78,7 +77,6 @@ return FALSE; } -#endif static VOID STDCALL MiniportDisableInterrupt( @@ -920,7 +918,7 @@ NdisZeroMemory(&Miniport, sizeof(Miniport)); Miniport.MajorNdisVersion = DRIVER_NDIS_MAJOR_VERSION; Miniport.MinorNdisVersion = DRIVER_NDIS_MINOR_VERSION; - Miniport.CheckForHangHandler = NULL; //MiniportCheckForHang; + Miniport.CheckForHangHandler = MiniportCheckForHang; Miniport.DisableInterruptHandler = MiniportDisableInterrupt; Miniport.EnableInterruptHandler = MiniportEnableInterrupt; Miniport.HaltHandler = MiniportHalt;

1 0

[fireball] 36439: - Fix ~4.4 million handle limit bug due to memory corruption. ReactOS can now create 16 million handles as expected (thanks Alex).
by fireball＠svn.reactos.org 23 Sep '08

23 Sep '08

Author: fireball Date: Tue Sep 23 15:44:31 2008 New Revision: 36439 URL: http://svn.reactos.org/svn/reactos?rev=36439&view=rev Log: - Fix ~4.4 million handle limit bug due to memory corruption. ReactOS can now create 16 million handles as expected (thanks Alex). Modified: trunk/reactos/ntoskrnl/ex/handle.c Modified: trunk/reactos/ntoskrnl/ex/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/handle.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/handle.c [iso-8859-1] Tue Sep 23 15:44:31 2008 @@ -268,8 +268,7 @@ /* Free the third level table */ ExpFreeTablePagedPool(Process, Level3, - HIGH_LEVEL_ENTRIES * - sizeof(PHANDLE_TABLE_ENTRY)); + SizeOfHandle(HIGH_LEVEL_ENTRIES)); } /* Free the actual table and check if we need to release quota */ @@ -540,7 +539,7 @@ { /* We need a new high level table */ High = ExpAllocateTablePagedPool(HandleTable->QuotaProcess, - HIGH_LEVEL_ENTRIES); + SizeOfHandle(HIGH_LEVEL_ENTRIES)); if (!High) return FALSE; /* Allocate a new mid level table as well */ @@ -550,7 +549,7 @@ /* We failed, free the high level table as welll */ ExpFreeTablePagedPool(HandleTable->QuotaProcess, High, - HIGH_LEVEL_ENTRIES); + SizeOfHandle(HIGH_LEVEL_ENTRIES)); return FALSE; }

1 0

[cgutman] 36438: - Set CheckForHangSeconds to a default value of 2 if it wasn't set in MiniportInitialize
by cgutman＠svn.reactos.org 23 Sep '08

23 Sep '08

Author: cgutman Date: Tue Sep 23 15:17:59 2008 New Revision: 36438 URL: http://svn.reactos.org/svn/reactos?rev=36438&view=rev Log: - Set CheckForHangSeconds to a default value of 2 if it wasn't set in MiniportInitialize Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Tue Sep 23 15:17:59 2008 @@ -1633,6 +1633,10 @@ return (NTSTATUS)NdisStatus; } + /* Check for a hang every two seconds if it wasn't set in MiniportInitialize */ + if (Adapter->NdisMiniportBlock.CheckForHangSeconds == 0) + Adapter->NdisMiniportBlock.CheckForHangSeconds = 2; + Adapter->NdisMiniportBlock.OldPnPDeviceState = Adapter->NdisMiniportBlock.PnPDeviceState; Adapter->NdisMiniportBlock.PnPDeviceState = NdisPnPDeviceStarted;

1 0

[cgutman] 36437: - Set CheckForHangSeconds
by cgutman＠svn.reactos.org 23 Sep '08

23 Sep '08

Author: cgutman Date: Tue Sep 23 15:10:35 2008 New Revision: 36437 URL: http://svn.reactos.org/svn/reactos?rev=36437&view=rev Log: - Set CheckForHangSeconds Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Tue Sep 23 15:10:35 2008 @@ -2129,8 +2129,6 @@ * AdapterType = Specifies the I/O bus interface of the caller's NIC */ { - /* TODO: Take CheckForHandTimeInSeconds into account! */ - PLOGICAL_ADAPTER Adapter = GET_LOGICAL_ADAPTER(MiniportAdapterHandle); NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -2138,6 +2136,8 @@ Adapter->NdisMiniportBlock.MiniportAdapterContext = MiniportAdapterContext; Adapter->NdisMiniportBlock.Flags = AttributeFlags; Adapter->NdisMiniportBlock.AdapterType = AdapterType; + if (CheckForHangTimeInSeconds > 0) + Adapter->NdisMiniportBlock.CheckForHangSeconds = CheckForHangTimeInSeconds; if (AttributeFlags & NDIS_ATTRIBUTE_INTERMEDIATE_DRIVER) NDIS_DbgPrint(MAX_TRACE, ("Intermediate drivers not supported yet.\n")); }

1 0

[sginsberg] 36436: - Attempt satisfy Alex
by sginsberg＠svn.reactos.org 23 Sep '08

23 Sep '08

Author: sginsberg Date: Tue Sep 23 14:54:13 2008 New Revision: 36436 URL: http://svn.reactos.org/svn/reactos?rev=36436&view=rev Log: - Attempt satisfy Alex Modified: trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Tue Sep 23 14:54:13 2008 @@ -11,7 +11,7 @@ // // Define this if you want debugging support // -#define _CM_DEBUG_ 0x01 +#define _CM_DEBUG_ 0x00 // // These define the Debug Masks Supported

1 0

[gedmurphy] 36435: Don't risk a negative array subscript. Fixes our one and only REVERSE_NEGATIVE error Fix for Coverity error CID: 766
by gedmurphy＠svn.reactos.org 23 Sep '08

23 Sep '08

Author: gedmurphy Date: Tue Sep 23 14:02:32 2008 New Revision: 36435 URL: http://svn.reactos.org/svn/reactos?rev=36435&view=rev Log: Don't risk a negative array subscript. Fixes our one and only REVERSE_NEGATIVE error Fix for Coverity error CID: 766 Modified: trunk/reactos/dll/cpl/desk/advappdlg.c Modified: trunk/reactos/dll/cpl/desk/advappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/advappdlg.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/advappdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/advappdlg.c [iso-8859-1] Tue Sep 23 14:02:32 2008 @@ -23,7 +23,6 @@ RECT rect; HBRUSH hbrush; HWND hwndColorButton; - COLORREF crColor = g->ThemeAdv.crColor[nColor]; HGDIOBJ hgdiTmp; if (nColor != -1) @@ -42,7 +41,7 @@ rect.top = 2; rect.right = 22; rect.bottom = 13; - hbrush = CreateSolidBrush(crColor); + hbrush = CreateSolidBrush(g->ThemeAdv.crColor[nColor]); FillRect(hdcCompat, &rect, hbrush); DeleteObject(hbrush);

1 0

[cwittich] 36434: return correct value in SETUPAPI_GetCurrentHwProfile Fix for Coverity error CID: 782
by cwittich＠svn.reactos.org 23 Sep '08

23 Sep '08

Author: cwittich Date: Tue Sep 23 13:44:58 2008 New Revision: 36434 URL: http://svn.reactos.org/svn/reactos?rev=36434&view=rev Log: return correct value in SETUPAPI_GetCurrentHwProfile Fix for Coverity error CID: 782 Modified: trunk/reactos/dll/win32/setupapi/devinst.c Modified: trunk/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/devinst… ============================================================================== --- trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/devinst.c [iso-8859-1] Tue Sep 23 13:44:58 2008 @@ -4592,7 +4592,7 @@ if (hKey != NULL) RegCloseKey(hKey); - return hwProfile; + return ret; } static BOOL

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