Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 46415: [MSVCRT] Enable exports for _gmtime64, _localtime64, _time64
by tkreuzer＠svn.reactos.org 25 Mar '10

25 Mar '10

Author: tkreuzer Date: Thu Mar 25 01:04:00 2010 New Revision: 46415 URL: http://svn.reactos.org/svn/reactos?rev=46415&view=rev Log: [MSVCRT] Enable exports for _gmtime64, _localtime64, _time64 Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.de… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.def [iso-8859-1] Thu Mar 25 01:04:00 2010 @@ -316,7 +316,7 @@ ; _getwche @310 _getws @311 _global_unwind2 @312 -; _gmtime64 @313 + _gmtime64 @313 _heapadd @314 _heapchk @315 _heapmin @316 @@ -373,7 +373,7 @@ _lfind @366 _loaddll @367 _local_unwind2 @368 -; _localtime64 @369 + _localtime64 @369 _lock @370 _locking @371 _logb @372 @@ -539,7 +539,7 @@ _tell @532 _telli64 @533 _tempnam @534 -; _time64 @535 + _time64 @535 _timezone @536 DATA _tolower @537 _toupper @538

1 0

[jimtabor] 46414: - Fix for gdibatch, does not help Acrobat reader 7.
by jimtabor＠svn.reactos.org 24 Mar '10

24 Mar '10

Author: jimtabor Date: Thu Mar 25 00:35:23 2010 New Revision: 46414 URL: http://svn.reactos.org/svn/reactos?rev=46414&view=rev Log: - Fix for gdibatch, does not help Acrobat reader 7. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdibatch.c [iso-8859-1] Thu Mar 25 00:35:23 2010 @@ -66,14 +66,34 @@ FASTCALL GdiFlushUserBatch(PDC dc, PGDIBATCHHDR pHdr) { + BOOL Hit = FALSE; + ULONG Cmd = 0, Size = 0; PDC_ATTR pdcattr = NULL; if (dc) { - pdcattr = dc->pdcattr; - } + pdcattr = dc->pdcattr; + } + + _SEH2_TRY + { + Cmd = pHdr->Cmd; + Size = pHdr->Size; // Return the full size of the structure. + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Hit = TRUE; + } + _SEH2_END; + + if (Hit) + { + DPRINT1("WARNING! GdiBatch Fault!\n"); + return 0; + } + // FYI! The thread is approaching the end of sunset. - switch(pHdr->Cmd) + switch(Cmd) { case GdiBCPatBlt: // Highest pri first! break; @@ -113,7 +133,7 @@ break; } - return pHdr->Size; // Return the full size of the structure. + return Size; } /* @@ -139,7 +159,6 @@ APIENTRY NtGdiFlushUserBatch(VOID) { - BOOL Hit; PTEB pTeb = NtCurrentTeb(); ULONG GdiBatchCount = pTeb->GdiBatchCount; @@ -161,28 +180,13 @@ } // No need to init anything, just go! - for (Hit = FALSE; GdiBatchCount > 0; GdiBatchCount--) - { /* - Looks like a hack, - feels like a hack, - you're right it's a hack, - due to the lack, - of kernel thread locking when it is in sunset! - */ - _SEH2_TRY - { - ((PGDIBATCHHDR)pHdr)->Cmd = ((PGDIBATCHHDR)pHdr)->Cmd; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - Hit = TRUE; - } - _SEH2_END; - - if (Hit) break; - + for (; GdiBatchCount > 0; GdiBatchCount--) + { + ULONG Size; // Process Gdi Batch! - pHdr += GdiFlushUserBatch(pDC, (PGDIBATCHHDR) pHdr); + Size = GdiFlushUserBatch(pDC, (PGDIBATCHHDR) pHdr); + if (!Size) break; + pHdr += Size; } if (pDC)

1 0

[cgutman] 46413: [ACPI] - Fix a warning - Implement some IOCTL_ACPI_EVAL_METHOD handling (no input parameters are supported yet but it should be enough for what cmbatt needs it to do)
by cgutman＠svn.reactos.org 24 Mar '10

24 Mar '10

Author: cgutman Date: Thu Mar 25 00:13:51 2010 New Revision: 46413 URL: http://svn.reactos.org/svn/reactos?rev=46413&view=rev Log: [ACPI] - Fix a warning - Implement some IOCTL_ACPI_EVAL_METHOD handling (no input parameters are supported yet but it should be enough for what cmbatt needs it to do) Added: trunk/reactos/drivers/bus/acpi/eval.c (with props) Modified: trunk/reactos/drivers/bus/acpi/acpi.rbuild trunk/reactos/drivers/bus/acpi/include/acpisys.h trunk/reactos/drivers/bus/acpi/main.c Modified: trunk/reactos/drivers/bus/acpi/acpi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpi.rbui… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpi.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpi.rbuild [iso-8859-1] Thu Mar 25 00:13:51 2010 @@ -26,6 +26,7 @@ </directory> <file>osl.c</file> <file>acpienum.c</file> + <file>eval.c</file> <file>interface.c</file> <file>pnp.c</file> <file>power.c</file> Added: trunk/reactos/drivers/bus/acpi/eval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/eval.c?re… ============================================================================== --- trunk/reactos/drivers/bus/acpi/eval.c (added) +++ trunk/reactos/drivers/bus/acpi/eval.c [iso-8859-1] Thu Mar 25 00:13:51 2010 @@ -1,0 +1,142 @@ +#include <ntddk.h> + +#include <acpi.h> + +#include <acpisys.h> +#include <acpi_bus.h> +#include <acpi_drivers.h> +#include <acpiioct.h> + +#include <glue.h> +#include <accommon.h> +#include <acobject.h> +#include <actypes.h> + +#include <wdmguid.h> +#define NDEBUG +#include <debug.h> + +NTSTATUS +NTAPI +Bus_PDO_EvalMethod(PPDO_DEVICE_DATA DeviceData, + PIRP Irp) +{ + ULONG Signature; + NTSTATUS Status; + ACPI_OBJECT_LIST *ParamList; + PACPI_EVAL_INPUT_BUFFER EvalInputBuff = Irp->AssociatedIrp.SystemBuffer; + ACPI_BUFFER RetBuff = {ACPI_ALLOCATE_BUFFER, NULL}; + PACPI_EVAL_OUTPUT_BUFFER OutputBuf; + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + + if (IrpSp->Parameters.DeviceIoControl.InputBufferLength < sizeof(ULONG)) + return STATUS_INVALID_PARAMETER; + + Signature = *((PULONG)Irp->AssociatedIrp.SystemBuffer); + + switch (Signature) + { + case ACPI_EVAL_INPUT_BUFFER_SIGNATURE: + if (IrpSp->Parameters.DeviceIoControl.InputBufferLength < sizeof(ACPI_EVAL_INPUT_BUFFER)) + return STATUS_INVALID_PARAMETER; + + ParamList = NULL; + break; + + /* FIXME: Support input parameters */ + + default: + DPRINT1("Unsupported input buffer signature: %d\n", Signature); + return STATUS_NOT_IMPLEMENTED; + } + + Status = AcpiEvaluateObject(DeviceData->AcpiHandle, + (CHAR*)EvalInputBuff->MethodName, + ParamList, + &RetBuff); + if (ACPI_SUCCESS(Status)) + { + ACPI_OBJECT *Obj = RetBuff.Pointer; + ULONG ExtraParamLength; + + switch (Obj->Type) + { + case ACPI_TYPE_INTEGER: + ExtraParamLength = sizeof(ULONG); + break; + + case ACPI_TYPE_STRING: + ExtraParamLength = Obj->String.Length; + break; + + case ACPI_TYPE_BUFFER: + ExtraParamLength = Obj->Buffer.Length; + break; + + case ACPI_TYPE_PACKAGE: + DPRINT1("ACPI_TYPE_PACKAGE not supported yet!\n"); + return STATUS_UNSUCCESSFUL; + + default: + ASSERT(FALSE); + return STATUS_UNSUCCESSFUL; + } + + /* Enough space for a ULONG is always included */ + if (ExtraParamLength >= sizeof(ULONG)) + ExtraParamLength -= sizeof(ULONG); + else + ExtraParamLength = 0; + + OutputBuf = ExAllocatePool(NonPagedPool, sizeof(ACPI_EVAL_OUTPUT_BUFFER) + + ExtraParamLength); + if (!OutputBuf) return STATUS_INSUFFICIENT_RESOURCES; + + OutputBuf->Signature = ACPI_EVAL_OUTPUT_BUFFER_SIGNATURE; + OutputBuf->Length = ExtraParamLength + sizeof(ACPI_METHOD_ARGUMENT); + OutputBuf->Count = 1; + + switch (Obj->Type) + { + case ACPI_TYPE_INTEGER: + ACPI_METHOD_SET_ARGUMENT_INTEGER(OutputBuf->Argument, Obj->Integer.Value); + break; + + case ACPI_TYPE_STRING: + ACPI_METHOD_SET_ARGUMENT_STRING(OutputBuf->Argument, Obj->String.Pointer); + break; + + case ACPI_TYPE_BUFFER: + ACPI_METHOD_SET_ARGUMENT_BUFFER(OutputBuf->Argument, Obj->Buffer.Pointer, Obj->Buffer.Length); + break; + + case ACPI_TYPE_PACKAGE: + DPRINT1("ACPI_TYPE_PACKAGE not supported yet!\n"); + return STATUS_UNSUCCESSFUL; + + default: + ASSERT(FALSE); + return STATUS_UNSUCCESSFUL; + } + + if (IrpSp->Parameters.DeviceIoControl.OutputBufferLength >= sizeof(ACPI_EVAL_OUTPUT_BUFFER) + + ExtraParamLength) + { + RtlCopyMemory(Irp->AssociatedIrp.SystemBuffer, OutputBuf, sizeof(ACPI_EVAL_OUTPUT_BUFFER) + + ExtraParamLength); + Irp->IoStatus.Information = sizeof(ACPI_EVAL_OUTPUT_BUFFER) + ExtraParamLength; + ExFreePool(OutputBuf); + return STATUS_SUCCESS; + } + else + { + ExFreePool(OutputBuf); + return STATUS_BUFFER_TOO_SMALL; + } + } + else + { + DPRINT1("Query method %s failed on %p\n", EvalInputBuff->MethodName, DeviceData->AcpiHandle); + return STATUS_UNSUCCESSFUL; + } +} Propchange: trunk/reactos/drivers/bus/acpi/eval.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/bus/acpi/include/acpisys.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/include/a… ============================================================================== --- trunk/reactos/drivers/bus/acpi/include/acpisys.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/include/acpisys.h [iso-8859-1] Thu Mar 25 00:13:51 2010 @@ -92,6 +92,11 @@ NTSTATUS NTAPI +Bus_PDO_EvalMethod(PPDO_DEVICE_DATA DeviceData, + PIRP Irp); + +NTSTATUS +NTAPI Bus_CreateClose ( PDEVICE_OBJECT DeviceObject, PIRP Irp Modified: trunk/reactos/drivers/bus/acpi/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/main.c?re… ============================================================================== --- trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/main.c [iso-8859-1] Thu Mar 25 00:13:51 2010 @@ -5,6 +5,8 @@ #include <acpi_bus.h> #include <acpi_drivers.h> + +#include <acpiioct.h> #define NDEBUG #include <debug.h> @@ -29,7 +31,9 @@ PDEVICE_OBJECT deviceObject = NULL; PFDO_DEVICE_DATA deviceData = NULL; PWCHAR deviceName = NULL; +#ifndef NDEBUG ULONG nameLength; +#endif PAGED_CODE (); @@ -168,32 +172,45 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PIO_STACK_LOCATION IrpSp; - NTSTATUS Status; - - DPRINT("Called. IRP is at (0x%X)\n", Irp); + PIO_STACK_LOCATION irpStack; + NTSTATUS status = STATUS_NOT_SUPPORTED; + PCOMMON_DEVICE_DATA commonData; + + PAGED_CODE (); + + irpStack = IoGetCurrentIrpStackLocation (Irp); + ASSERT (IRP_MJ_DEVICE_CONTROL == irpStack->MajorFunction); + + commonData = (PCOMMON_DEVICE_DATA) DeviceObject->DeviceExtension; Irp->IoStatus.Information = 0; - IrpSp = IoGetCurrentIrpStackLocation(Irp); - switch (IrpSp->Parameters.DeviceIoControl.IoControlCode) { - default: - DPRINT("Unknown IOCTL 0x%X\n", IrpSp->Parameters.DeviceIoControl.IoControlCode); - Status = STATUS_NOT_IMPLEMENTED; - break; - } - - if (Status != STATUS_PENDING) { - Irp->IoStatus.Status = Status; - - DPRINT("Completing IRP at 0x%X\n", Irp); - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } - - DPRINT("Leaving. Status 0x%X\n", Status); - - return Status; + if (!commonData->IsFDO) + { + switch (irpStack->Parameters.DeviceIoControl.IoControlCode) + { + case IOCTL_ACPI_EVAL_METHOD: + status = Bus_PDO_EvalMethod((PPDO_DEVICE_DATA)commonData, + Irp); + break; + + /* TODO: Implement other IOCTLs */ + + default: + DPRINT1("Unsupported IOCTL: %x\n", irpStack->Parameters.DeviceIoControl.IoControlCode); + break; + } + } + else + DPRINT1("IOCTL sent to the ACPI FDO! Kill the caller!\n"); + + if (status != STATUS_PENDING) + { + Irp->IoStatus.Status = status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + return status; } NTSTATUS

1 0

[tkreuzer] 46412: [BEEPMIDI] Fix 64bit compilation
by tkreuzer＠svn.reactos.org 24 Mar '10

24 Mar '10

Author: tkreuzer Date: Thu Mar 25 00:12:31 2010 New Revision: 46412 URL: http://svn.reactos.org/svn/reactos?rev=46412&view=rev Log: [BEEPMIDI] Fix 64bit compilation Modified: trunk/reactos/dll/win32/beepmidi/beepmidi.c Modified: trunk/reactos/dll/win32/beepmidi/beepmidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/beepmidi/beepmid… ============================================================================== --- trunk/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/beepmidi/beepmidi.c [iso-8859-1] Thu Mar 25 00:12:31 2010 @@ -244,7 +244,7 @@ DWORD_PTR parameter1, DWORD_PTR parameter2) { - DPRINT("Calling client - callback 0x%x mmhandle 0x%x\n", (int) device_info->callback, device_info->mme_handle); + DPRINT("Calling client - callback 0x%x mmhandle 0x%x\n", device_info->callback, device_info->mme_handle); return DriverCallback(device_info->callback, HIWORD(device_info->flags), device_info->mme_handle,

1 0

[akhaldi] 46411: [DDK] - Bring in the signedness warning fix by aicom.
by akhaldi＠svn.reactos.org 24 Mar '10

24 Mar '10

Author: akhaldi Date: Thu Mar 25 00:04:11 2010 New Revision: 46411 URL: http://svn.reactos.org/svn/reactos?rev=46411&view=rev Log: [DDK] - Bring in the signedness warning fix by aicom. Modified: branches/header-work/include/ddk/acpiioct.h Modified: branches/header-work/include/ddk/acpiioct.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/acpiioc… ============================================================================== --- branches/header-work/include/ddk/acpiioct.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/acpiioct.h [iso-8859-1] Thu Mar 25 00:04:11 2010 @@ -159,7 +159,7 @@ #define ACPI_METHOD_SET_ARGUMENT_STRING( Argument, StrData ) \ { Argument->Type = ACPI_METHOD_ARGUMENT_STRING; \ - Argument->DataLength = strlen((PUCHAR)StrData) + sizeof(UCHAR); \ + Argument->DataLength = strlen((PCHAR)StrData) + sizeof(UCHAR); \ RtlCopyMemory(&Argument->Data[0],(PUCHAR)StrData,Argument->DataLength); } #define ACPI_METHOD_SET_ARGUMENT_BUFFER( Argument, BuffData, BuffLength ) \

1 0

[tkreuzer] 46410: [NCI] - Fix 64bit stubs [RSYM64] - fix linux compilation
by tkreuzer＠svn.reactos.org 24 Mar '10

24 Mar '10

Author: tkreuzer Date: Thu Mar 25 00:03:33 2010 New Revision: 46410 URL: http://svn.reactos.org/svn/reactos?rev=46410&view=rev Log: [NCI] - Fix 64bit stubs [RSYM64] - fix linux compilation Modified: trunk/reactos/tools/nci/ncitool.c trunk/reactos/tools/rsym/rsym64.h Modified: trunk/reactos/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/ncitool.c?rev=46… ============================================================================== --- trunk/reactos/tools/nci/ncitool.c [iso-8859-1] (original) +++ trunk/reactos/tools/nci/ncitool.c [iso-8859-1] Thu Mar 25 00:03:33 2010 @@ -103,7 +103,7 @@ " ret $0x%x\n\n" #define KernelModeStub_amd64 " movl $0x%x, %%eax\n" \ - " call _KiSystemService\n" \ + " call KiSystemService\n" \ " ret $0x%x\n\n" /* For now, use the usermode stub. We'll optimize later */ @@ -143,7 +143,7 @@ { "i386", 4, KernelModeStub_x86, UserModeStub_x86, ".global _%s@%d\n", "_%s@%d:\n" }, { "amd64", 4, KernelModeStub_amd64, UserModeStub_amd64, - ".global _%s\n", "_%s:\n" }, + ".global %s\n", "%s:\n" }, { "powerpc", 4, KernelModeStub_ppc, UserModeStub_ppc, "\t.globl %s\n", "%s:\n" }, { "mips", 4, KernelModeStub_mips, UserModeStub_mips, Modified: trunk/reactos/tools/rsym/rsym64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym/rsym64.h?rev=46… ============================================================================== --- trunk/reactos/tools/rsym/rsym64.h [iso-8859-1] (original) +++ trunk/reactos/tools/rsym/rsym64.h [iso-8859-1] Thu Mar 25 00:03:33 2010 @@ -2,7 +2,13 @@ //C_ASSERT(sizeof(ULONG) == 4); typedef unsigned char UBYTE; +#if defined(_MSC_VER) || defined(__MINGW32__) typedef unsigned __int64 ULONG64; +#else +#include <stdint.h> +typedef uint64_t ULONG64; +#endif + #define IMAGE_FILE_MACHINE_AMD64 0x8664 #define IMAGE_DIRECTORY_ENTRY_IMPORT 1

1 0

[akhaldi] 46409: [DDK] - Move cfg.h and cfgmgr32.h to PSDK, introduce pragma once, apply consistent formatting, add missing definitions and improve several existing ones. [UNIATA] - DDKAPI -> NTAPI.
by akhaldi＠svn.reactos.org 24 Mar '10

24 Mar '10

Author: akhaldi Date: Wed Mar 24 23:56:18 2010 New Revision: 46409 URL: http://svn.reactos.org/svn/reactos?rev=46409&view=rev Log: [DDK] - Move cfg.h and cfgmgr32.h to PSDK, introduce pragma once, apply consistent formatting, add missing definitions and improve several existing ones. [UNIATA] - DDKAPI -> NTAPI. Added: branches/header-work/include/psdk/cfg.h - copied, changed from r46395, branches/header-work/include/ddk/cfg.h branches/header-work/include/psdk/cfgmgr32.h - copied, changed from r46395, branches/header-work/include/ddk/cfgmgr32.h Removed: branches/header-work/include/ddk/cfg.h branches/header-work/include/ddk/cfgmgr32.h Modified: branches/header-work/drivers/storage/ide/uniata/id_ata.cpp [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/header-work/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/storage/ide… Removed: branches/header-work/include/ddk/cfg.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/cfg.h?r… Removed: branches/header-work/include/ddk/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/cfgmgr3… Copied: branches/header-work/include/psdk/cfg.h (from r46395, branches/header-work/include/ddk/cfg.h) URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/cfg.h?… Copied: branches/header-work/include/psdk/cfgmgr32.h (from r46395, branches/header-work/include/ddk/cfgmgr32.h) URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/cfgmgr…

1 0

[cgutman] 46408: [DDK] - Fix a signedness warning
by cgutman＠svn.reactos.org 24 Mar '10

24 Mar '10

Author: cgutman Date: Wed Mar 24 23:56:16 2010 New Revision: 46408 URL: http://svn.reactos.org/svn/reactos?rev=46408&view=rev Log: [DDK] - Fix a signedness warning Modified: trunk/reactos/include/ddk/acpiioct.h Modified: trunk/reactos/include/ddk/acpiioct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/acpiioct.h?rev… ============================================================================== --- trunk/reactos/include/ddk/acpiioct.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/acpiioct.h [iso-8859-1] Wed Mar 24 23:56:16 2010 @@ -159,7 +159,7 @@ #define ACPI_METHOD_SET_ARGUMENT_STRING( Argument, StrData ) \ { Argument->Type = ACPI_METHOD_ARGUMENT_STRING; \ - Argument->DataLength = strlen((PUCHAR)StrData) + sizeof(UCHAR); \ + Argument->DataLength = strlen((PCHAR)StrData) + sizeof(UCHAR); \ RtlCopyMemory(&Argument->Data[0],(PUCHAR)StrData,Argument->DataLength); } #define ACPI_METHOD_SET_ARGUMENT_BUFFER( Argument, BuffData, BuffLength ) \

1 0

[tkreuzer] 46407: [ACLEDIT] remove $Id fields
by tkreuzer＠svn.reactos.org 24 Mar '10

24 Mar '10

Author: tkreuzer Date: Wed Mar 24 23:56:12 2010 New Revision: 46407 URL: http://svn.reactos.org/svn/reactos?rev=46407&view=rev Log: [ACLEDIT] remove $Id fields Modified: trunk/reactos/dll/win32/acledit/acledit.c trunk/reactos/dll/win32/acledit/stubs.c Modified: trunk/reactos/dll/win32/acledit/acledit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/acledit.… ============================================================================== --- trunk/reactos/dll/win32/acledit/acledit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/acledit/acledit.c [iso-8859-1] Wed Mar 24 23:56:12 2010 @@ -16,8 +16,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* $Id: acledit.c 35011 2008-08-01 16:29:40Z sginsberg $ - * +/* * PROJECT: ReactOS Access Control List Editor * FILE: lib/acledit/acledit.c * PURPOSE: Access Control List Editor Modified: trunk/reactos/dll/win32/acledit/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/acledit/stubs.c?… ============================================================================== --- trunk/reactos/dll/win32/acledit/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/acledit/stubs.c [iso-8859-1] Wed Mar 24 23:56:12 2010 @@ -1,5 +1,4 @@ -/* $Id: stubs.c 35011 2008-08-01 16:29:40Z sginsberg $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Access Control List Editor * FILE: lib/acledit/stubs.c

1 0

[tkreuzer] 46406: [NTOS] - remove KeGetCurrentThread inline function, it's already in the wdm.h, reenable the exported function - Add InitializeSListHead export - Use RtlInitializeSListHead for InititializeSListHead - Add hacks for WDK compilation - Add ValidKernelPte/Pde - Comment out MiSyncARM3WithROS, add a stub instead
by tkreuzer＠svn.reactos.org 24 Mar '10

24 Mar '10

Author: tkreuzer Date: Wed Mar 24 23:02:26 2010 New Revision: 46406 URL: http://svn.reactos.org/svn/reactos?rev=46406&view=rev Log: [NTOS] - remove KeGetCurrentThread inline function, it's already in the wdm.h, reenable the exported function - Add InitializeSListHead export - Use RtlInitializeSListHead for InititializeSListHead - Add hacks for WDK compilation - Add ValidKernelPte/Pde - Comment out MiSyncARM3WithROS, add a stub instead Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/rtl.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/ntoskrnl.h branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/adapter.c branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/arcname.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/thrdobj.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/sysldr.c branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.pspec Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Wed Mar 24 23:02:26 2010 @@ -144,13 +144,6 @@ { /* Flush the TLB by resetting CR3 */ __writecr3(__readcr3()); -} - -FORCEINLINE -PRKTHREAD -KeGetCurrentThread(VOID) -{ - return (PRKTHREAD)__readgsqword(FIELD_OFFSET(KIPCR, Prcb.CurrentThread)); } FORCEINLINE Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Wed Mar 24 23:02:26 2010 @@ -158,13 +158,12 @@ #define MI_MAKE_WRITE_PAGE(x) ((x)->u.Hard.Writable = 1) #endif -#if 0 // FIXME +// FIXME!!! #define PAGE_TO_SECTION_PAGE_DIRECTORY_OFFSET(x) \ ((x) / (4*1024*1024)) #define PAGE_TO_SECTION_PAGE_TABLE_OFFSET(x) \ ((((x)) % (4*1024*1024)) / (4*1024)) -#endif #define NR_SECTION_PAGE_TABLES 1024 #define NR_SECTION_PAGE_ENTRIES 1024 Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/rtl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/rtl.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/rtl.h [iso-8859-1] Wed Mar 24 23:02:26 2010 @@ -1,4 +1,8 @@ #pragma once + +#ifdef _WIN64 +#define InitializeSListHead RtlInitializeSListHead +#endif NTSTATUS NTAPI Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Wed Mar 24 23:02:26 2010 @@ -11,6 +11,12 @@ /* ARM Bringup Hack */ #ifdef _M_ARM #define DbgPrint DbgPrintEarly +#endif + +/* WDK hacks */ +#ifdef _M_AMD64 +#define IoAllocateAdapterChannel _IoAllocateAdapterChannel +#define KeGetCurrentThread _KeGetCurrentThread #endif /* Version Data */ Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/adapter.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/adapter.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/adapter.c [iso-8859-1] Wed Mar 24 23:02:26 2010 @@ -21,6 +21,7 @@ /* FUNCTIONS *****************************************************************/ +#undef IoAllocateAdapterChannel /* * @implemented */ Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] Wed Mar 24 23:02:26 2010 @@ -377,7 +377,9 @@ } goto checkbootcd; +#ifndef _M_AMD64 freeldrhack: +#endif /* * FIXME: In normal conditions, NTLDR/FreeLdr sends the *proper* CDROM * ARC Path name, and what happens here is a comparision of both checksums Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/thrdobj.c [iso-8859-1] Wed Mar 24 23:02:26 2010 @@ -897,7 +897,6 @@ UNIMPLEMENTED; } -#ifndef _M_AMD64 /* * @implemented */ @@ -909,7 +908,6 @@ /* Return the current thread on this PCR */ return _KeGetCurrentThread(); } -#endif /* * @implemented Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Wed Mar 24 23:02:26 2010 @@ -303,6 +303,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ +#ifndef _M_AMD64 // // In Bavaria, this is probably a hate crime // @@ -325,6 +326,7 @@ Pde++; } } +#endif PFN_NUMBER NTAPI Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Wed Mar 24 23:02:26 2010 @@ -26,21 +26,16 @@ /* GLOBALS *****************************************************************/ +/* Template PTE and PDE for a kernel page */ +MMPTE ValidKernelPde = {.u.Hard.Valid = 1, .u.Hard.Write = 1, .u.Hard.Dirty = 1, .u.Hard.Accessed = 1}; +MMPTE ValidKernelPte = {.u.Hard.Valid = 1, .u.Hard.Write = 1, .u.Hard.Dirty = 1, .u.Hard.Accessed = 1}; + /* Sizes */ -//SIZE_T MmBootImageSize; -//SIZE_T MmMinimumNonPagedPoolSize = 256 * 1024; -//SIZE_T MmSizeOfNonPagedPoolInBytes; -//SIZE_T MmMaximumNonPagedPoolInBytes; -//ULONG MmMaximumNonPagedPoolPercent; -//ULONG MmMinAdditionNonPagedPoolPerMb = 32 * 1024; -//ULONG MmMaxAdditionNonPagedPoolPerMb = 400 * 1024; -//SIZE_T MmDefaultMaximumNonPagedPool = 1024 * 1024; -//SIZE_T MmSessionSize = MI_SESSION_SIZE; +///SIZE_T MmSessionSize = MI_SESSION_SIZE; SIZE_T MmSessionViewSize = MI_SESSION_VIEW_SIZE; SIZE_T MmSessionPoolSize = MI_SESSION_POOL_SIZE; SIZE_T MmSessionImageSize = MI_SESSION_IMAGE_SIZE; SIZE_T MmSystemViewSize = MI_SYSTEM_VIEW_SIZE; -//SIZE_T MmSizeOfPagedPoolInBytes = MI_MIN_INIT_PAGED_POOLSIZE; SIZE_T MiNonPagedSystemSize; /* Address ranges */ @@ -66,15 +61,8 @@ ///PVOID MmNonPagedPoolEnd = MI_NONPAGED_POOL_END; // 0xFFFFFAE000000000 PVOID MmHyperSpaceEnd = (PVOID)HYPER_SPACE_END; -//PPHYSICAL_MEMORY_DESCRIPTOR MmPhysicalMemoryBlock; -//ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage = -1; // FIXME: ULONG64 - -//ULONG MmNumberOfSystemPtes; -//PMMPTE MmSystemPagePtes; MMSUPPORT MmSystemCacheWs; -//RTL_BITMAP MiPfnBitMap; -//ULONG64 MxPfnAllocation; ULONG64 MxPfnSizeInBytes; PMEMORY_ALLOCATION_DESCRIPTOR MxFreeDescriptor; @@ -87,7 +75,6 @@ ULONG64 MxFreePageCount = 0; extern PFN_NUMBER MmSystemPageDirectory; -//PFN_NUMBER MmSizeOfPagedPoolInPages = MI_MIN_INIT_PAGED_POOLSIZE / PAGE_SIZE; BOOLEAN MiPfnsInitialized = FALSE; @@ -878,3 +865,18 @@ return STATUS_SUCCESS; } +VOID +FASTCALL +MiSyncARM3WithROS(IN PVOID AddressStart, + IN PVOID AddressEnd) +{ + +} + +NTSTATUS +NTAPI +MiInitMachineDependent(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] Wed Mar 24 23:02:26 2010 @@ -790,7 +790,7 @@ } /* Free the driver */ - MmFreeSection(LdrEntry->DllBase); + //MmFreeSection(LdrEntry->DllBase); /* Check if we're linked in */ if (LdrEntry->InLoadOrderLinks.Flink) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] Wed Mar 24 23:02:26 2010 @@ -347,6 +347,8 @@ @ FASTCALL InterlockedIncrement(ptr) @ FASTCALL InterlockedPopEntrySList(ptr) @ FASTCALL InterlockedPushEntrySList(ptr ptr) +#else +@ stdcall InitializeSListHead(ptr) RtlInitializeSListHead #endif @ stdcall IoAcquireCancelSpinLock(ptr) @ stdcall IoAcquireRemoveLockEx(ptr ptr str long long)

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