Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[tkreuzer] 53321: [RTL] - Rename memgen.c to byteswap.c and merge with the implementations from largeint.c, that were using intrinsics - Fix amd64 build
by tkreuzer＠svn.reactos.org 19 Aug '11

19 Aug '11

Author: tkreuzer Date: Fri Aug 19 18:39:47 2011 New Revision: 53321 URL: http://svn.reactos.org/svn/reactos?rev=53321&view=rev Log: [RTL] - Rename memgen.c to byteswap.c and merge with the implementations from largeint.c, that were using intrinsics - Fix amd64 build Added: trunk/reactos/lib/rtl/byteswap.c - copied, changed from r53298, trunk/reactos/lib/rtl/memgen.c Removed: trunk/reactos/lib/rtl/memgen.c Modified: trunk/reactos/lib/rtl/CMakeLists.txt trunk/reactos/lib/rtl/heap.c trunk/reactos/lib/rtl/largeint.c trunk/reactos/lib/rtl/mem.c Modified: trunk/reactos/lib/rtl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] Fri Aug 19 18:39:47 2011 @@ -14,6 +14,7 @@ avltable.c bitmap.c bootdata.c + byteswap.c compress.c condvar.c crc32.c @@ -80,13 +81,11 @@ amd64/slist.S amd64/unwind.c amd64/stubs.c - mem.c - memgen.c) + mem.c) elseif(ARCH MATCHES arm) list(APPEND SOURCE arm/debug_asm.S - mem.c - memgen.c) + mem.c) elseif(ARCH MATCHES powerpc) list(APPEND SOURCE powerpc/debug.c Copied: trunk/reactos/lib/rtl/byteswap.c (from r53298, trunk/reactos/lib/rtl/memgen.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/byteswap.c?p2=trun… ============================================================================== --- trunk/reactos/lib/rtl/memgen.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/byteswap.c [iso-8859-1] Fri Aug 19 18:39:47 2011 @@ -26,10 +26,16 @@ * * @implemented */ -USHORT FASTCALL -RtlUshortByteSwap (IN USHORT Source) +USHORT +FASTCALL +RtlUshortByteSwap( + IN USHORT Source) { - return (Source >> 8) | (Source << 8); +#if defined(_M_IX86) || defined(_M_AMD64) + return _byteswap_ushort(Source); +#else + return (Source >> 8) | (Source << 8); +#endif } @@ -47,10 +53,13 @@ ULONG FASTCALL RtlUlongByteSwap( - IN ULONG Source -) + IN ULONG Source) { - return ((ULONG)RtlUshortByteSwap((USHORT)Source) << 16) | RtlUshortByteSwap((USHORT)(Source >> 16)); +#if defined(_M_IX86) || defined(_M_AMD64) + return _byteswap_ulong(Source); +#else + return ((ULONG)RtlUshortByteSwap((USHORT)Source) << 16) | RtlUshortByteSwap((USHORT)(Source >> 16)); +#endif } @@ -68,9 +77,14 @@ * @implemented */ ULONGLONG FASTCALL -RtlUlonglongByteSwap (IN ULONGLONG Source) +RtlUlonglongByteSwap( + IN ULONGLONG Source) { - return ((ULONGLONG) RtlUlongByteSwap (Source) << 32) | RtlUlongByteSwap (Source>>32); +#if defined(_M_IX86) || defined(_M_AMD64) + return _byteswap_uint64(Source); +#else + return ((ULONGLONG) RtlUlongByteSwap (Source) << 32) | RtlUlongByteSwap (Source>>32); +#endif } Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=53321&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Fri Aug 19 18:39:47 2011 @@ -79,10 +79,6 @@ HEAP_TAIL_FILL, HEAP_TAIL_FILL }; - - -ULONG NTAPI -RtlCompareMemoryUlong(PVOID Source, ULONG Length, ULONG Value); /* FUNCTIONS *****************************************************************/ 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 18:39:47 2011 @@ -18,36 +18,7 @@ #undef RtlUlongByteSwap #undef RtlUshortByteSwap -/* - * @implemented - */ -USHORT -FASTCALL -RtlUshortByteSwap(IN USHORT Source) -{ - return _byteswap_ushort(Source); -} - -/* - * @implemented - */ -ULONG -FASTCALL -RtlUlongByteSwap(IN ULONG Source) -{ - return _byteswap_ulong(Source); -} - -/* - * @implemented - */ -ULONGLONG -FASTCALL -RtlUlonglongByteSwap(IN ULONGLONG Source) -{ - return _byteswap_uint64(Source); -} - + /* * @implemented */ Modified: trunk/reactos/lib/rtl/mem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/mem.c?rev=53321&r1… ============================================================================== --- trunk/reactos/lib/rtl/mem.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/mem.c [iso-8859-1] Fri Aug 19 18:39:47 2011 @@ -46,11 +46,11 @@ /* * @implemented */ -ULONG +SIZE_T NTAPI RtlCompareMemoryUlong ( PVOID Source, - ULONG Length, + SIZE_T Length, ULONG Value ) /* @@ -63,8 +63,8 @@ */ { PULONG ptr = (PULONG)Source; - ULONG len = Length / sizeof(ULONG); - ULONG i; + ULONG_PTR len = Length / sizeof(ULONG); + ULONG_PTR i; for (i = 0; i < len; i++) { @@ -73,7 +73,7 @@ ptr++; } - return (ULONG)((PCHAR)ptr - (PCHAR)Source); + return (SIZE_T)((PCHAR)ptr - (PCHAR)Source); } Removed: trunk/reactos/lib/rtl/memgen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/memgen.c?rev=53320… ============================================================================== --- trunk/reactos/lib/rtl/memgen.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/memgen.c (removed) @@ -1,77 +1,0 @@ -/* COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/rtl/mem.c - * PURPOSE: Memory functions - * PROGRAMMER: David Welch (welch(a)mcmail.com) - */ - -/* INCLUDES *****************************************************************/ - -#include <rtl.h> - -#define NDEBUG -#include <debug.h> - -#undef RtlUlonglongByteSwap -#undef RtlUlongByteSwap -#undef RtlUshortByteSwap - -/************************************************************************* - * RtlUshortByteSwap - * - * Swap the bytes of an unsigned short value. - * - * NOTES - * Based on the inline versions in Wine winternl.h - * - * @implemented - */ -USHORT FASTCALL -RtlUshortByteSwap (IN USHORT Source) -{ - return (Source >> 8) | (Source << 8); -} - - - -/************************************************************************* - * RtlUlongByteSwap [NTDLL.@] - * - * Swap the bytes of an unsigned int value. - * - * NOTES - * Based on the inline versions in Wine winternl.h - * - * @implemented - */ -ULONG -FASTCALL -RtlUlongByteSwap( - IN ULONG Source -) -{ - return ((ULONG)RtlUshortByteSwap((USHORT)Source) << 16) | RtlUshortByteSwap((USHORT)(Source >> 16)); -} - - -/************************************************************************* - * RtlUlonglongByteSwap - * - * Swap the bytes of an unsigned long long value. - * - * PARAMS - * i [I] Value to swap bytes of - * - * RETURNS - * The value with its bytes swapped. - * - * @implemented - */ -ULONGLONG FASTCALL -RtlUlonglongByteSwap (IN ULONGLONG Source) -{ - return ((ULONGLONG) RtlUlongByteSwap (Source) << 32) | RtlUlongByteSwap (Source>>32); -} - - -/* EOF */

1 0

[tkreuzer] 53320: [CRT] - Remove duplicated functions - Fix MSVC amd64 build - cleanup the cmake file a little - creadit wine for their code
by tkreuzer＠svn.reactos.org 19 Aug '11

19 Aug '11

Author: tkreuzer Date: Fri Aug 19 18:10:17 2011 New Revision: 53320 URL: http://svn.reactos.org/svn/reactos?rev=53320&view=rev Log: [CRT] - Remove duplicated functions - Fix MSVC amd64 build - cleanup the cmake file a little - creadit wine for their code Added: trunk/reactos/lib/sdk/crt/float/amd64/ (with props) trunk/reactos/lib/sdk/crt/float/amd64/clearfp.S (with props) trunk/reactos/lib/sdk/crt/float/amd64/fpreset.S (with props) trunk/reactos/lib/sdk/crt/float/amd64/logb.S (with props) Modified: trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c trunk/reactos/lib/sdk/crt/float/i386/statfp.c trunk/reactos/lib/sdk/crt/math/amd64/ceilf.S trunk/reactos/lib/sdk/crt/math/amd64/floorf.S trunk/reactos/lib/sdk/crt/math/stubs.c trunk/reactos/lib/sdk/crt/stdio/file.c trunk/reactos/lib/sdk/crt/time/futime.c trunk/reactos/lib/sdk/crt/time/utime.c Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Fri Aug 19 18:10:17 2011 @@ -1,3 +1,4 @@ + list(APPEND CRT_SOURCE conio/cgets.c conio/cputs.c @@ -313,24 +314,6 @@ float/i386/fpreset.c float/i386/logb.c float/i386/statfp.c - setjmp/i386/setjmp.s) - if(MSVC) - list(APPEND CRT_SOURCE - except/i386/cpp.s) - endif() -elseif(ARCH MATCHES amd64) - list(APPEND CRT_SOURCE - except/amd64/seh.s - float/i386/clearfp.c - float/i386/cntrlfp.c - float/i386/fpreset.c - float/i386/logb.c - float/i386/statfp.c - setjmp/amd64/setjmp.s) -endif() - -if(ARCH MATCHES i386) - list(APPEND CRT_SOURCE math/i386/alldiv_asm.s math/i386/alldvrm_asm.s math/i386/allmul_asm.s @@ -366,6 +349,7 @@ mem/i386/memmove_asm.s mem/i386/memset_asm.s misc/i386/readcr4.S + setjmp/i386/setjmp.s string/i386/strcat_asm.s string/i386/strchr_asm.s string/i386/strcmp_asm.s @@ -386,8 +370,43 @@ string/i386/wcsncpy_asm.s string/i386/wcsnlen_asm.s string/i386/wcsrchr_asm.s) -else() + if(MSVC) + list(APPEND CRT_SOURCE + except/i386/cpp.s) + endif() +elseif(ARCH MATCHES amd64) list(APPEND CRT_SOURCE + except/amd64/seh.s + float/amd64/clearfp.S + float/i386/cntrlfp.c + float/amd64/fpreset.S + float/amd64/logb.S + float/i386/statfp.c + math/amd64/alldiv.S + math/amd64/atan.S + math/amd64/atan2.S + math/amd64/ceil.S + math/amd64/ceilf.S + math/amd64/exp.S + math/amd64/fabs.S + math/amd64/floor.S + math/amd64/floorf.S + math/amd64/fmod.S + math/amd64/fmodf.S + math/amd64/ldexp.S + math/amd64/log.S + math/amd64/log10.S + math/amd64/pow.S + math/amd64/sqrt.S + math/amd64/sqrtf.S + math/amd64/tan.S + setjmp/amd64/setjmp.s) +endif() + +if(NOT ARCH MATCHES i386) + list(APPEND CRT_SOURCE + math/cos.c + math/sin.c math/stubs.c mem/memchr.c mem/memcpy.c @@ -415,30 +434,6 @@ string/wcsrchr.c) endif() -if(ARCH MATCHES amd64) - list(APPEND CRT_SOURCE - math/cos.c - math/sin.c - math/amd64/alldiv.S - math/amd64/atan.S - math/amd64/atan2.S - math/amd64/ceil.S - math/amd64/ceilf.S - math/amd64/exp.S - math/amd64/fabs.S - math/amd64/floor.S - math/amd64/floorf.S - math/amd64/fmod.S - math/amd64/fmodf.S - math/amd64/ldexp.S - math/amd64/log.S - math/amd64/log10.S - math/amd64/pow.S - math/amd64/sqrt.S - math/amd64/sqrtf.S - math/amd64/tan.S) -endif() - add_library(crt ${CRT_SOURCE}) target_link_libraries(crt chkstk) set_property(TARGET crt PROPERTY COMPILE_DEFINITIONS __MINGW_IMPORT=extern USE_MSVCRT_PREFIX _MSVCRT_LIB_ _MSVCRT_ _MT) Propchange: trunk/reactos/lib/sdk/crt/float/amd64/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Fri Aug 19 18:10:17 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/lib/sdk/crt/float/amd64/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/lib/sdk/crt/float/amd64/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/lib/sdk/crt/float/amd64/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/lib/sdk/crt/float/amd64/clearfp.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/amd64/cl… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/amd64/clearfp.S (added) +++ trunk/reactos/lib/sdk/crt/float/amd64/clearfp.S [iso-8859-1] Fri Aug 19 18:10:17 2011 @@ -1,0 +1,15 @@ + + + +#include <asm.inc> + +.code64 + +PUBLIC _clearfp +FUNC _clearfp + .ENDPROLOG + fnclex + +ENDFUNC _clearfp + +END Propchange: trunk/reactos/lib/sdk/crt/float/amd64/clearfp.S ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/float/amd64/fpreset.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/amd64/fp… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/amd64/fpreset.S (added) +++ trunk/reactos/lib/sdk/crt/float/amd64/fpreset.S [iso-8859-1] Fri Aug 19 18:10:17 2011 @@ -1,0 +1,11 @@ + +#include <asm.inc> + +.code64 + +FUNC _fpreset + .endprolog + fninit +ENDFUNC _fpreset + +END Propchange: trunk/reactos/lib/sdk/crt/float/amd64/fpreset.S ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/lib/sdk/crt/float/amd64/logb.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/amd64/lo… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/amd64/logb.S (added) +++ trunk/reactos/lib/sdk/crt/float/amd64/logb.S [iso-8859-1] Fri Aug 19 18:10:17 2011 @@ -1,0 +1,16 @@ + + +#include <asm.inc> + +.code64 + +FUNC _logb + .endprolog + + fld dword ptr [rsp + 8] + fxtract + fstp st + ret +ENDFUNC _logb + +END Propchange: trunk/reactos/lib/sdk/crt/float/amd64/logb.S ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/i386/cnt… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/i386/cntrlfp.c [iso-8859-1] Fri Aug 19 18:10:17 2011 @@ -45,8 +45,10 @@ /* Get fp control word */ #if defined(__GNUC__) __asm__ __volatile__( "fstcw %0" : "=m" (fpword) : ); +#elif defined(_M_IX86) + __asm fstcw [fpword]; #else - __asm fstcw [fpword]; + #pragma message("FIXME: _control87 is halfplemented") #endif TRACE("Control word before : %08x\n", fpword); @@ -98,8 +100,10 @@ /* Put fp control word */ #if defined(__GNUC__) __asm__ __volatile__( "fldcw %0" : : "m" (fpword) ); +#elif defined(_M_IX86) + __asm fldcw [fpword]; #else - __asm fldcw [fpword]; + #pragma message("FIXME: _control87 is halfplemented") #endif return flags; Modified: trunk/reactos/lib/sdk/crt/float/i386/statfp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/i386/sta… ============================================================================== --- trunk/reactos/lib/sdk/crt/float/i386/statfp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/float/i386/statfp.c [iso-8859-1] Fri Aug 19 18:10:17 2011 @@ -28,8 +28,10 @@ unsigned int fpword; #if defined(__GNUC__) __asm__ __volatile__( "fstsw %0" : "=m" (fpword) : ); +#elif defined(_M_IX86) + __asm fstsw [fpword]; #else - __asm fstsw [fpword]; + #pragma message("FIXME: _statusfp is halfplemented") #endif if (fpword & 0x1) retVal |= _SW_INVALID; if (fpword & 0x2) retVal |= _SW_DENORMAL; Modified: trunk/reactos/lib/sdk/crt/math/amd64/ceilf.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/cei… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/ceilf.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/ceilf.S [iso-8859-1] Fri Aug 19 18:10:17 2011 @@ -15,11 +15,12 @@ .code64 PUBLIC ceilf -ceilf: +FUNC ceilf sub rsp, 16 + .ENDPROLOG /* Put parameter on the stack */ - movss [rsp], xmm0 + movss dword ptr [rsp], xmm0 fld dword ptr [rsp] /* Change fpu control word to round up */ @@ -37,9 +38,10 @@ fldcw [rsp + 8] fstp dword ptr [rsp] - movss xmm0, [rsp] + movss xmm0, dword ptr [rsp] add rsp, 16 ret +ENDFUNC ceilf END Modified: trunk/reactos/lib/sdk/crt/math/amd64/floorf.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/flo… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/amd64/floorf.S [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/amd64/floorf.S [iso-8859-1] Fri Aug 19 18:10:17 2011 @@ -15,18 +15,19 @@ .code64 PUBLIC floorf -floorf: +FUNC floorf sub rsp, 16 + .ENDPROLOG /* Put parameter on the stack */ - movss [rsp], xmm0 + movss dword ptr [rsp], xmm0 fld dword ptr [rsp] /* Change fpu control word to round down */ fstcw [rsp] mov eax, [rsp] - or eax, 0x00400 - and eax, 0x0f7ff + or eax, HEX(000400) + and eax, HEX(00f7ff) mov [rsp + 8], eax fldcw [rsp + 8] @@ -37,8 +38,9 @@ fldcw [rsp] fstp dword ptr [rsp] - movss xmm0, [rsp] + movss xmm0, dword ptr [rsp] add rsp, 16 ret +ENDFUNC floorf END Modified: trunk/reactos/lib/sdk/crt/math/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/stubs.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/math/stubs.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/math/stubs.c [iso-8859-1] Fri Aug 19 18:10:17 2011 @@ -132,89 +132,3 @@ return fmod(x, y); } -/* The following functions are likely workarounds for the pentium fdiv bug */ -void __stdcall _adj_fdiv_m32( unsigned int arg ) -{ - FIXME("_adj_fdiv_m32 stub\n"); -} -void __stdcall _adj_fdiv_m32i( int arg ) -{ - FIXME("_adj_fdiv_m32i stub\n"); -} - -void __stdcall _adj_fdiv_m64( unsigned __int64 arg ) -{ - FIXME("_adj_fdiv_m64 stub\n"); -} - -void _adj_fdiv_r(void) -{ - FIXME("_adj_fdiv_r stub\n"); -} - -void __stdcall _adj_fdivr_m32( unsigned int arg ) -{ - FIXME("_adj_fdivr_m32i stub\n"); -} - -void __stdcall _adj_fdivr_m32i( int arg ) -{ - FIXME("_adj_fdivr_m32i stub\n"); -} - -void __stdcall _adj_fdivr_m64( unsigned __int64 arg ) -{ - FIXME("_adj_fdivr_m64 stub\n"); -} - -void _adj_fpatan(void) -{ - FIXME("_adj_fpatan stub\n"); -} - -void __stdcall _adj_fdiv_m16i( short arg ) -{ - FIXME("_adj_fdiv_m16i stub\n"); -} - -void __stdcall _adj_fdivr_m16i( short arg ) -{ - FIXME("_adj_fdivr_m16i stub\n"); -} - -void _adj_fprem(void) -{ - FIXME("_adj_fprem stub\n"); -} - -void _adj_fprem1(void) -{ - FIXME("_adj_fprem1 stub\n"); -} - -void _adj_fptan(void) -{ - FIXME("_adj_fptan stub\n"); -} - -void _safe_fdiv(void) -{ - FIXME("_safe_fdiv stub\n"); -} - -void _safe_fdivr(void) -{ - FIXME("_safe_fdivr stub\n"); -} - -void _safe_fprem(void) -{ - FIXME("_safe_fprem stub\n"); -} - -void _safe_fprem1(void) -{ - FIXME("_safe_fprem1 stub\n"); -} - - Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Fri Aug 19 18:10:17 2011 @@ -1134,41 +1134,6 @@ { TRACE(":FILE* (%p) fd (%d)\n",file,file->_file); return file->_file; -} - -/********************************************************************* - * _futime (MSVCRT.@) - */ -int CDECL _futime(int fd, struct _utimbuf *t) -{ - HANDLE hand = fdtoh(fd); - FILETIME at, wt; - - if (hand == INVALID_HANDLE_VALUE) - return -1; - - if (!t) - { - time_t currTime; - time(&currTime); - RtlSecondsSince1970ToTime(currTime, (LARGE_INTEGER *)&at); - wt = at; - } - else - { - RtlSecondsSince1970ToTime(t->actime, (LARGE_INTEGER *)&at); - if (t->actime == t->modtime) - wt = at; - else - RtlSecondsSince1970ToTime(t->modtime, (LARGE_INTEGER *)&wt); - } - - if (!SetFileTime(hand, NULL, &at, &wt)) - { - _dosmaperr(GetLastError()); - return -1 ; - } - return 0; } /********************************************************************* @@ -1751,38 +1716,6 @@ } /********************************************************************* - * _utime (MSVCRT.@) - */ -int CDECL _utime(const char* path, struct _utimbuf *t) -{ - int fd = _open(path, _O_WRONLY | _O_BINARY); - - if (fd > 0) - { - int retVal = _futime(fd, t); - _close(fd); - return retVal; - } - return -1; -} - -/********************************************************************* - * _wutime (MSVCRT.@) - */ -int CDECL _wutime(const wchar_t* path, struct _utimbuf *t) -{ - int fd = _wopen(path, _O_WRONLY | _O_BINARY); - - if (fd > 0) - { - int retVal = _futime(fd, t); - _close(fd); - return retVal; - } - return -1; -} - -/********************************************************************* * _write (MSVCRT.@) */ int CDECL _write(int fd, const void* buf, unsigned int count) Modified: trunk/reactos/lib/sdk/crt/time/futime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/futime.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/futime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/futime.c [iso-8859-1] Fri Aug 19 18:10:17 2011 @@ -3,8 +3,37 @@ * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/futime.c * PURPOSE: Implementation of _futime - * PROGRAMERS: Timo Kreuzer + * PROGRAMERS: Wine team */ + +/* + * msvcrt.dll file functions + * + * Copyright 1996,1998 Marcus Meissner + * Copyright 1996 Jukka Iivonen + * Copyright 1997,2000 Uwe Bonnes + * Copyright 2000 Jon Griffiths + * Copyright 2004 Eric Pouech + * Copyright 2004 Juan Lang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + * TODO + * Use the file flag hints O_SEQUENTIAL, O_RANDOM, O_SHORT_LIVED + */ + #include <precomp.h> #define RC_INVOKED 1 // to prevent inline functions #include <time.h> @@ -16,7 +45,7 @@ /****************************************************************************** * \name _futime * \brief Set a files modification time. - * \param [out] ptimeb Pointer to a structure of type struct _timeb that + * \param [out] ptimeb Pointer to a structure of type struct _timeb that * recieves the current time. * \sa http://msdn.microsoft.com/en-us/library/95e68951.aspx */ Modified: trunk/reactos/lib/sdk/crt/time/utime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/utime.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/utime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/utime.c [iso-8859-1] Fri Aug 19 18:10:17 2011 @@ -3,15 +3,44 @@ * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/utime.c * PURPOSE: Implementation of utime, _wutime - * PROGRAMERS: Timo Kreuzer + * PROGRAMERS: Wine team */ + +/* + * msvcrt.dll file functions + * + * Copyright 1996,1998 Marcus Meissner + * Copyright 1996 Jukka Iivonen + * Copyright 1997,2000 Uwe Bonnes + * Copyright 2000 Jon Griffiths + * Copyright 2004 Eric Pouech + * Copyright 2004 Juan Lang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + * TODO + * Use the file flag hints O_SEQUENTIAL, O_RANDOM, O_SHORT_LIVED + */ + #include <precomp.h> #include <tchar.h> #define RC_INVOKED 1 // to prevent inline functions #include <sys/utime.h> #include "bitsfixup.h" -int +int _tutime(const _TCHAR* path, struct _utimbuf *t) { int fd = _topen(path, _O_WRONLY | _O_BINARY);

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