Ros-diffs August 2011

ros-diffs@reactos.org

18 participants
498 discussions

[cgutman] 53331: - Enable PnP debugging
by cgutman＠svn.reactos.org 20 Aug '11

20 Aug '11

Author: cgutman Date: Sat Aug 20 01:32:41 2011 New Revision: 53331 URL: http://svn.reactos.org/svn/reactos?rev=53331&view=rev Log: - Enable PnP debugging Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Sat Aug 20 01:32:41 2011 @@ -10,7 +10,7 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> /* GLOBALS *******************************************************************/ Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpres.c [iso-8859-1] Sat Aug 20 01:32:41 2011 @@ -9,7 +9,7 @@ #include <ntoskrnl.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> static

1 0

[cgutman] 53330: [HAL] - Hey Arch, don't combine code for 2 different length calculation algorithms into 1 broken mess
by cgutman＠svn.reactos.org 19 Aug '11

19 Aug '11

Author: cgutman Date: Fri Aug 19 23:29:21 2011 New Revision: 53330 URL: http://svn.reactos.org/svn/reactos?rev=53330&view=rev Log: [HAL] - Hey Arch, don't combine code for 2 different length calculation algorithms into 1 broken mess Modified: trunk/reactos/hal/halx86/generic/acpi/halacpi.c Modified: trunk/reactos/hal/halx86/generic/acpi/halacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/acpi/ha… ============================================================================== --- trunk/reactos/hal/halx86/generic/acpi/halacpi.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/acpi/halacpi.c [iso-8859-1] Fri Aug 19 23:29:21 2011 @@ -986,7 +986,7 @@ /* Compute size of the list and allocate it */ ListSize = FIELD_OFFSET(IO_RESOURCE_REQUIREMENTS_LIST, List[0].Descriptors) + - ((Count - 1) * sizeof(IO_RESOURCE_DESCRIPTOR)); + (Count * sizeof(IO_RESOURCE_DESCRIPTOR)); DPRINT1("Resource list size: %d\n", ListSize); RequirementsList = ExAllocatePoolWithTag(PagedPool, ListSize, ' laH'); if (RequirementsList)

1 0

[cgutman] 53329: [HAL] - Add (and fix) more validation and debugging
by cgutman＠svn.reactos.org 19 Aug '11

19 Aug '11

Author: cgutman Date: Fri Aug 19 23:11:03 2011 New Revision: 53329 URL: http://svn.reactos.org/svn/reactos?rev=53329&view=rev Log: [HAL] - Add (and fix) more validation and debugging Modified: trunk/reactos/hal/halx86/generic/acpi/halacpi.c trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c Modified: trunk/reactos/hal/halx86/generic/acpi/halacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/acpi/ha… ============================================================================== --- trunk/reactos/hal/halx86/generic/acpi/halacpi.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/acpi/halacpi.c [iso-8859-1] Fri Aug 19 23:11:03 2011 @@ -948,6 +948,7 @@ ResourceList->InterfaceType = PNPBus; ResourceList->List[0].Version = 1; ResourceList->List[0].Revision = 1; + ResourceList->List[0].Count = 0; /* Is there a SCI? */ if (HalpFixedAcpiDescTable.sci_int_vector) @@ -981,10 +982,12 @@ /* Get ACPI resources */ HalpAcpiDetectResourceListSize(&Count); + DPRINT1("Resource count: %d\n", Count); /* Compute size of the list and allocate it */ ListSize = FIELD_OFFSET(IO_RESOURCE_REQUIREMENTS_LIST, List[0].Descriptors) + ((Count - 1) * sizeof(IO_RESOURCE_DESCRIPTOR)); + DPRINT1("Resource list size: %d\n", ListSize); RequirementsList = ExAllocatePoolWithTag(PagedPool, ListSize, ' laH'); if (RequirementsList) { @@ -998,6 +1001,9 @@ { /* It worked, return it */ *Requirements = RequirementsList; + + /* Validate the list */ + ASSERT(RequirementsList->List[0].Count == Count); } else { Modified: trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/acpi/ha… ============================================================================== --- trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c [iso-8859-1] Fri Aug 19 23:11:03 2011 @@ -353,8 +353,9 @@ { /* Query ACPI requirements */ Status = HalpQueryAcpiResourceRequirements(&RequirementsList); + if (!NT_SUCCESS(Status)) return Status; + ASSERT(RequirementsList->AlternativeLists == 1); - if (!NT_SUCCESS(Status)) return Status; /* Allocate the resourcel ist */ ResourceList = ExAllocatePoolWithTag(PagedPool,

1 0

[cgutman] 53328: [HAL] - Fix the length calculation for the resource requirements list
by cgutman＠svn.reactos.org 19 Aug '11

19 Aug '11

Author: cgutman Date: Fri Aug 19 22:00:48 2011 New Revision: 53328 URL: http://svn.reactos.org/svn/reactos?rev=53328&view=rev Log: [HAL] - Fix the length calculation for the resource requirements list Modified: trunk/reactos/hal/halx86/generic/acpi/halacpi.c Modified: trunk/reactos/hal/halx86/generic/acpi/halacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/acpi/ha… ============================================================================== --- trunk/reactos/hal/halx86/generic/acpi/halacpi.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/acpi/halacpi.c [iso-8859-1] Fri Aug 19 22:00:48 2011 @@ -983,8 +983,8 @@ HalpAcpiDetectResourceListSize(&Count); /* Compute size of the list and allocate it */ - ListSize = sizeof(IO_RESOURCE_LIST) * (Count - 1) + - sizeof(IO_RESOURCE_REQUIREMENTS_LIST); + ListSize = FIELD_OFFSET(IO_RESOURCE_REQUIREMENTS_LIST, List[0].Descriptors) + + ((Count - 1) * sizeof(IO_RESOURCE_DESCRIPTOR)); RequirementsList = ExAllocatePoolWithTag(PagedPool, ListSize, ' laH'); if (RequirementsList) {

1 0

[fireball] 53327: [NTDLL/LDR] - Fix acquiring image path from process parameters block (the if condition was inverted so that normalization didn't occur when it should). - Reenable the image option...
by fireball＠svn.reactos.org 19 Aug '11

19 Aug '11

Author: fireball Date: Fri Aug 19 21:36:16 2011 New Revision: 53327 URL: http://svn.reactos.org/svn/reactos?rev=53327&view=rev Log: [NTDLL/LDR] - Fix acquiring image path from process parameters block (the if condition was inverted so that normalization didn't occur when it should). - Reenable the image options initialization code. Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Fri Aug 19 21:36:16 2011 @@ -1311,16 +1311,15 @@ NTAPI LdrpInitializeExecutionOptions(PUNICODE_STRING ImagePathName, PPEB Peb, PHKEY OptionsKey) { - //NTSTATUS Status; - //HKEY KeyHandle; - //ULONG ExecuteOptions, MinimumStackCommit = 0, GlobalFlag; + NTSTATUS Status; + HKEY KeyHandle; + ULONG ExecuteOptions, MinimumStackCommit = 0, GlobalFlag; /* Return error if we were not provided a pointer where to save the options key handle */ if (!OptionsKey) return STATUS_INVALID_HANDLE; /* Zero initialize the optinos key pointer */ *OptionsKey = NULL; -#if 0 /* Open the options key */ Status = LdrOpenImageFileOptionsKey(ImagePathName, 0, &KeyHandle); @@ -1409,7 +1408,7 @@ // Status = LdrpInitializeApplicationVerifierPackage(ImagePathName, Peb, 1, FALSE); } } -#endif + return STATUS_SUCCESS; } @@ -1466,8 +1465,8 @@ /* Get the image path */ ImagePath = Peb->ProcessParameters->ImagePathName.Buffer; - /* Check if it's normalized */ - if (Peb->ProcessParameters->Flags & RTL_USER_PROCESS_PARAMETERS_NORMALIZED) + /* Check if it's not normalized */ + if (!(Peb->ProcessParameters->Flags & RTL_USER_PROCESS_PARAMETERS_NORMALIZED)) { /* Normalize it*/ ImagePath = (PWSTR)((ULONG_PTR)ImagePath + (ULONG_PTR)Peb->ProcessParameters);

1 0

[tkreuzer] 53326: [RTL] Hack around lds inability to detect used functions, when they are exported.
by tkreuzer＠svn.reactos.org 19 Aug '11

19 Aug '11

Author: tkreuzer Date: Fri Aug 19 21:14:11 2011 New Revision: 53326 URL: http://svn.reactos.org/svn/reactos?rev=53326&view=rev Log: [RTL] Hack around lds inability to detect used functions, when they are exported. Modified: trunk/reactos/lib/rtl/largeint.c Modified: trunk/reactos/lib/rtl/largeint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/largeint.c?rev=533… ============================================================================== --- trunk/reactos/lib/rtl/largeint.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/largeint.c [iso-8859-1] Fri Aug 19 21:14:11 2011 @@ -14,10 +14,13 @@ /* FUNCTIONS *****************************************************************/ -#undef RtlUlonglongByteSwap -#undef RtlUlongByteSwap +/* HACK: ld is too stupid to understand that we need the functions + when we export them, so we force it to be linked this way. */ +#ifdef __GNUC__ #undef RtlUshortByteSwap - +USHORT FASTCALL RtlUshortByteSwap(USHORT Source); +PVOID Dummy = RtlUshortByteSwap; +#endif /* * @implemented

1 0

[cgutman] 53325: [HAL] - Simplify device extension setup - Allocate memory for existing PDOs in the device relations struct
by cgutman＠svn.reactos.org 19 Aug '11

19 Aug '11

Author: cgutman Date: Fri Aug 19 20:56:39 2011 New Revision: 53325 URL: http://svn.reactos.org/svn/reactos?rev=53325&view=rev Log: [HAL] - Simplify device extension setup - Allocate memory for existing PDOs in the device relations struct Modified: trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c Modified: trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/acpi/ha… ============================================================================== --- trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c [iso-8859-1] Fri Aug 19 20:56:39 2011 @@ -82,6 +82,7 @@ FdoExtension->ExtensionType = FdoExtensionType; FdoExtension->PhysicalDeviceObject = TargetDevice; FdoExtension->FunctionalDeviceObject = DeviceObject; + FdoExtension->ChildPdoList = NULL; /* FDO is done initializing */ DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; @@ -115,26 +116,24 @@ /* Setup the PDO device extension */ PdoExtension = PdoDeviceObject->DeviceExtension; - PdoExtension->Next = NULL; PdoExtension->ExtensionType = PdoExtensionType; PdoExtension->PhysicalDeviceObject = PdoDeviceObject; PdoExtension->ParentFdoExtension = FdoExtension; PdoExtension->PdoType = AcpiPdo; + + /* Add the PDO to the head of the list */ + PdoExtension->Next = FdoExtension->ChildPdoList; + FdoExtension->ChildPdoList = PdoExtension; + + /* Initialization is finished */ + PdoDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; /* Find the ACPI watchdog table */ Wdrt = HalAcpiGetTable(0, 'TRDW'); - if (!Wdrt) - { - /* None exists, there is nothing to do more */ - PdoDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - FdoExtension->ChildPdoList = PdoExtension; - } - else + if (Wdrt) { /* FIXME: TODO */ DPRINT1("You have an ACPI Watchdog. That's great! You should be proud ;-)\n"); - PdoDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; - FdoExtension->ChildPdoList = PdoExtension; } /* Invalidate device relations since we added a new device */ @@ -191,7 +190,13 @@ PdoExtension = PdoExtension->Next; PdoCount++; } - + + /* Add the PDOs that already exist in the device relations */ + if (*DeviceRelations) + { + PdoCount += (*DeviceRelations)->Count; + } + /* Allocate our structure */ FdoRelations = ExAllocatePoolWithTag(PagedPool, FIELD_OFFSET(DEVICE_RELATIONS,

1 0

[tkreuzer] 53324: [RTL] - Fix this rbuild thingie
by tkreuzer＠svn.reactos.org 19 Aug '11

19 Aug '11

Author: tkreuzer Date: Fri Aug 19 20:55:54 2011 New Revision: 53324 URL: http://svn.reactos.org/svn/reactos?rev=53324&view=rev Log: [RTL] - Fix this rbuild thingie Modified: trunk/reactos/lib/rtl/rtl.rbuild Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=533… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Fri Aug 19 20:55:54 2011 @@ -6,10 +6,6 @@ <define name="_NTSYSTEM_" /> <define name="_NTDLLBUILD_" /> <include base="rtl">.</include> - - <if property="NEWSPRINTF" value="1"> - <define name="USE_NEW_SPRINTF" /> - </if> <if property="ARCH" value="i386"> <directory name="i386"> @@ -38,7 +34,6 @@ <file>debug_asm.S</file> </directory> <file>mem.c</file> - <file>memgen.c</file> </if> <if property="ARCH" value="amd64"> <directory name="amd64"> @@ -49,7 +44,6 @@ <file>stubs.c</file> </directory> <file>mem.c</file> - <file>memgen.c</file> </if> <file>access.c</file> <file>acl.c</file> @@ -57,6 +51,7 @@ <file>assert.c</file> <file>atom.c</file> <file>avltable.c</file> + <file>byteswap.c</file> <file>bitmap.c</file> <file>bootdata.c</file> <file>compress.c</file>

1 0

[cgutman] 53323: - Enable debug prints temporarily in an attempt to help diagnose the ACPI issues
by cgutman＠svn.reactos.org 19 Aug '11

19 Aug '11

Author: cgutman Date: Fri Aug 19 20:01:32 2011 New Revision: 53323 URL: http://svn.reactos.org/svn/reactos?rev=53323&view=rev Log: - Enable debug prints temporarily in an attempt to help diagnose the ACPI issues Modified: trunk/reactos/drivers/bus/acpi/acpienum.c trunk/reactos/drivers/bus/acpi/buspdo.c trunk/reactos/drivers/bus/acpi/pnp.c trunk/reactos/hal/halx86/generic/acpi/halacpi.c trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c Modified: trunk/reactos/drivers/bus/acpi/acpienum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpienum.… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpienum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpienum.c [iso-8859-1] Fri Aug 19 20:01:32 2011 @@ -13,7 +13,7 @@ #include <acpi_drivers.h> #include <list.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> #define HAS_CHILDREN(d) ((d)->children.next != &((d)->children)) Modified: trunk/reactos/drivers/bus/acpi/buspdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/buspdo.c?… ============================================================================== --- trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] Fri Aug 19 20:01:32 2011 @@ -11,7 +11,7 @@ #include <initguid.h> #include <poclass.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> #ifdef ALLOC_PRAGMA Modified: trunk/reactos/drivers/bus/acpi/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/pnp.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/pnp.c [iso-8859-1] Fri Aug 19 20:01:32 2011 @@ -7,7 +7,7 @@ #include <acpi_drivers.h> #include <wdmguid.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> NTSTATUS Modified: trunk/reactos/hal/halx86/generic/acpi/halacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/acpi/ha… ============================================================================== --- trunk/reactos/hal/halx86/generic/acpi/halacpi.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/acpi/halacpi.c [iso-8859-1] Fri Aug 19 20:01:32 2011 @@ -9,7 +9,7 @@ /* INCLUDES *******************************************************************/ #include <hal.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> /* GLOBALS ********************************************************************/ Modified: trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/acpi/ha… ============================================================================== --- trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/acpi/halpnpdd.c [iso-8859-1] Fri Aug 19 20:01:32 2011 @@ -9,7 +9,7 @@ /* INCLUDES *******************************************************************/ #include <hal.h> -#define NDEBUG +//#define NDEBUG #include <debug.h> typedef enum _EXTENSION_TYPE

1 0

[tfaber] 53322: [KMTESTS] - ExResource: Fix a TODO - Fix warnings. All of them.
by tfaber＠svn.reactos.org 19 Aug '11

19 Aug '11

Author: tfaber Date: Fri Aug 19 19:03:46 2011 New Revision: 53322 URL: http://svn.reactos.org/svn/reactos?rev=53322&view=rev Log: [KMTESTS] - ExResource: Fix a TODO - Fix warnings. All of them. Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_platform.h branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeSpinLock.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ObType.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_platform.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_platform.h [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_platform.h [iso-8859-1] Fri Aug 19 19:03:46 2011 @@ -29,18 +29,14 @@ #ifdef KMT_EMULATE_KERNEL #define ok_irql(i) -#ifdef __GNUC__ -#define KIRQL __attribute__((__unused__)) int -#elif !defined __GNUC__ #define KIRQL int -#endif /* !defined __GNUC__ */ typedef const UCHAR CUCHAR, *PCUCHAR; typedef ULONG LOGICAL, *PLOGICAL; #undef KeRaiseIrql -#define KeRaiseIrql(new, old) +#define KeRaiseIrql(new, old) *(old) = 123 #undef KeLowerIrql -#define KeLowerIrql(i) +#define KeLowerIrql(i) (void)(i) #define ExAllocatePool(type, size) HeapAlloc(GetProcessHeap(), 0, size) #define ExAllocatePoolWithTag(type, size, tag) HeapAlloc(GetProcessHeap(), 0, size) #define ExFreePool(p) HeapFree(GetProcessHeap(), 0, p) Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] Fri Aug 19 19:03:46 2011 @@ -104,7 +104,8 @@ extern PKMT_RESULTBUFFER ResultBuffer; #ifdef __GNUC__ -#define KMT_FORMAT(type, fmt, first) __attribute__((__format__(type, fmt, first))) +/* TODO: GCC doesn't understand %wZ :( */ +#define KMT_FORMAT(type, fmt, first) /*__attribute__((__format__(type, fmt, first)))*/ #elif !defined __GNUC__ #define KMT_FORMAT(type, fmt, first) #endif /* !defined __GNUC__ */ Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExInterlocked.c [iso-8859-1] Fri Aug 19 19:03:46 2011 @@ -136,14 +136,14 @@ } #define CheckInterlockedCmpXchg(Function, Type, Print, Val, Cmp, Xchg, \ - ExpectedValue, ExpectedRet, ...) do \ + ExpectedValue, ExpectedRet) do \ { \ Type Ret##Type = 0; \ Type Value##Type = Val; \ Status = STATUS_SUCCESS; \ _SEH2_TRY { \ SaveState(OldState); \ - Ret##Type = Function(&Value##Type, Xchg, Cmp, ##__VA_ARGS__); \ + Ret##Type = Function(&Value##Type, Xchg, Cmp); \ SaveState(NewState); \ CheckState(&OldState, &NewState); \ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ @@ -236,13 +236,13 @@ } while (0) #define CheckInterlockedOpLargeNoRet(Function, Type, Print, Val, Op, \ - ExpectedValue, ...) do \ -{ \ - Type Value##Type = Val; \ - Status = STATUS_SUCCESS; \ - _SEH2_TRY { \ - SaveState(OldState); \ - Function(&Value##Type, Op, ##__VA_ARGS__); \ + ExpectedValue) do \ +{ \ + Type Value##Type = Val; \ + Status = STATUS_SUCCESS; \ + _SEH2_TRY { \ + SaveState(OldState); \ + Function(&Value##Type, Op); \ SaveState(NewState); \ CheckState(&OldState, &NewState); \ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { \ @@ -305,7 +305,7 @@ /* Exchange */ CheckInterlockedOp(InterlockedExchange, LONG, "%ld", 5, 8, 8L, 5L); - CheckInterlockedOp(InterlockedExchangePointer, PVOID, "%p", (PVOID)700, (PVOID)93, (PVOID)93, (PVOID)700); + CheckInterlockedOpNoArg(InterlockedExchangePointer, PVOID, "%p", (PVOID)700, (PVOID)93, (PVOID)700, (PVOID)93); #undef InterlockedExchange #ifdef _M_IX86 CheckInterlockedOp(InterlockedExchange, LONG, "%ld", 5, 8, 8L, 5L); Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c [iso-8859-1] Fri Aug 19 19:03:46 2011 @@ -25,9 +25,6 @@ ULONG ContentionCount; USHORT NumberOfSharedWaiters; USHORT NumberOfExclusiveWaiters; -#if defined(_WIN64) - PVOID Reserved2; /* TODO: not sure if this should be in here for 2k3 */ -#endif _ANONYMOUS_UNION union { PVOID Address; ULONG_PTR CreatorBackTraceIndex; @@ -51,7 +48,6 @@ ok_eq_ulong((Res)->ContentionCount, 0LU); \ ok_eq_uint((Res)->NumberOfSharedWaiters, 0); \ ok_eq_uint((Res)->NumberOfExclusiveWaiters, 0); \ - /* ok_eq_pointer((Res)->Reserved2, NULL); */ \ ok_eq_pointer((Res)->Address, NULL); \ ok_eq_ulongptr((Res)->SpinLock, 0); \ } while (0) Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeSpinLock.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeSpinLock.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeSpinLock.c [iso-8859-1] Fri Aug 19 19:03:46 2011 @@ -108,8 +108,11 @@ DEFINE_ACQUIRE(AcquireInStackNoRaise, FALSE, KeAcquireInStackQueuedSpinLockAtDpcLevel(SpinLock, &CheckData->QueueHandle)) DEFINE_RELEASE(ReleaseInStackNoRaise, FALSE, KeReleaseInStackQueuedSpinLockFromDpcLevel(&CheckData->QueueHandle)) +/* TODO: test these functions. They behave weirdly, though */ +#if 0 DEFINE_ACQUIRE(AcquireForDpc, TRUE, CheckData->Irql = KeAcquireSpinLockForDpc(SpinLock)) DEFINE_RELEASE(ReleaseForDpc, TRUE, KeReleaseSpinLockForDpc(SpinLock, CheckData->Irql)) +#endif DEFINE_ACQUIRE(AcquireInStackForDpc, FALSE, KeAcquireInStackQueuedSpinLockForDpc(SpinLock, &CheckData->QueueHandle)) DEFINE_RELEASE(ReleaseInStackForDpc, FALSE, KeReleaseInStackQueuedSpinLockForDpc(&CheckData->QueueHandle)) Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ObType.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ObType.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ObType.c [iso-8859-1] Fri Aug 19 19:03:46 2011 @@ -178,10 +178,12 @@ { WCHAR DirectoryName[sizeof "\\ObjectTypes\\" - 1]; WCHAR TypeName[15]; - } Name = { L"\\ObjectTypes\\" }; + } Name; OBJECT_ATTRIBUTES ObjectAttributes; HANDLE ObjectTypeHandle; UNICODE_STRING ObjectPath; + + RtlCopyMemory(&Name.DirectoryName, L"\\ObjectTypes\\", sizeof Name.DirectoryName); for (i = 0; i < NUM_OBTYPES; ++i) {

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2011