Ros-diffs April 2010

ros-diffs@reactos.org

22 participants
435 discussions

[janderwald] 46877: [PSDK] - Add clock property handler prototypes

by janderwald＠svn.reactos.org

Author: janderwald Date: Thu Apr 15 11:44:03 2010 New Revision: 46877 URL: http://svn.reactos.org/svn/reactos?rev=46877&view=rev Log: [PSDK] - Add clock property handler prototypes Modified: trunk/reactos/include/psdk/ks.h trunk/reactos/include/psdk/ksmedia.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4687… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Thu Apr 15 11:44:03 2010 @@ -2019,6 +2019,76 @@ } KSCLOCK_FUNCTIONTABLE, *PKSCLOCK_FUNCTIONTABLE; +#define DEFINE_KSPROPERTY_ITEM_CLOCK_TIME(Handler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_CLOCK_TIME,\ + (Handler),\ + sizeof(KSPROPERTY),\ + sizeof(LONGLONG),\ + NULL, NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_CLOCK_PHYSICALTIME(Handler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_CLOCK_PHYSICALTIME,\ + (Handler),\ + sizeof(KSPROPERTY),\ + sizeof(LONGLONG),\ + NULL, NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_CLOCK_CORRELATEDTIME(Handler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_CLOCK_CORRELATEDTIME,\ + (Handler),\ + sizeof(KSPROPERTY),\ + sizeof(KSCORRELATED_TIME),\ + NULL, NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_CLOCK_CORRELATEDPHYSICALTIME(Handler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_CLOCK_CORRELATEDPHYSICALTIME,\ + (Handler),\ + sizeof(KSPROPERTY),\ + sizeof(KSCORRELATED_TIME),\ + NULL, NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_CLOCK_RESOLUTION(Handler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_CLOCK_RESOLUTION,\ + (Handler),\ + sizeof(KSPROPERTY),\ + sizeof(KSRESOLUTION),\ + NULL, NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_CLOCK_STATE(Handler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_CLOCK_STATE,\ + (Handler),\ + sizeof(KSPROPERTY),\ + sizeof(KSSTATE),\ + NULL, NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_CLOCK_FUNCTIONTABLE(Handler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_CLOCK_FUNCTIONTABLE,\ + (Handler),\ + sizeof(KSPROPERTY),\ + sizeof(KSCLOCK_FUNCTIONTABLE),\ + NULL, NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_CLOCKSET(ClockSet,\ + PropTime, PropPhysicalTime,\ + PropCorrelatedTime, PropCorrelatedPhysicalTime,\ + PropResolution, PropState, PropFunctionTable)\ +DEFINE_KSPROPERTY_TABLE(ClockSet) {\ + DEFINE_KSPROPERTY_ITEM_CLOCK_TIME(PropTime),\ + DEFINE_KSPROPERTY_ITEM_CLOCK_PHYSICALTIME(PropPhysicalTime),\ + DEFINE_KSPROPERTY_ITEM_CLOCK_CORRELATEDTIME(PropCorrelatedTime),\ + DEFINE_KSPROPERTY_ITEM_CLOCK_CORRELATEDPHYSICALTIME(PropCorrelatedPhysicalTime),\ + DEFINE_KSPROPERTY_ITEM_CLOCK_RESOLUTION(PropResolution),\ + DEFINE_KSPROPERTY_ITEM_CLOCK_STATE(PropState),\ + DEFINE_KSPROPERTY_ITEM_CLOCK_FUNCTIONTABLE(PropFunctionTable)\ +} + /* =============================================================== Objects ??? SORT ME! */ Modified: trunk/reactos/include/psdk/ksmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksmedia.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ksmedia.h [iso-8859-1] Thu Apr 15 11:44:03 2010 @@ -13,6 +13,8 @@ /* KS CATEGORIES */ + +typedef LONGLONG REFERENCE_TIME; #define EXTRACT_WAVEFORMATEX_ID(Guid)\ (USHORT)((Guid)->Data1)

14 years, 8 months

[cgutman] 46876: [PCMCIA] - Add a mostly stubbed PCMCIA driver - pcmcia.c is complete but fdo.c and pdo.c are completely unimplemented

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Apr 15 03:59:15 2010 New Revision: 46876 URL: http://svn.reactos.org/svn/reactos?rev=46876&view=rev Log: [PCMCIA] - Add a mostly stubbed PCMCIA driver - pcmcia.c is complete but fdo.c and pdo.c are completely unimplemented Added: trunk/reactos/drivers/bus/pcmcia/ trunk/reactos/drivers/bus/pcmcia/fdo.c (with props) trunk/reactos/drivers/bus/pcmcia/pcmcia.c (with props) trunk/reactos/drivers/bus/pcmcia/pcmcia.h (with props) trunk/reactos/drivers/bus/pcmcia/pcmcia.rbuild (with props) trunk/reactos/drivers/bus/pcmcia/pcmcia.rc (with props) trunk/reactos/drivers/bus/pcmcia/pdo.c (with props) Modified: trunk/reactos/drivers/bus/directory.rbuild Modified: trunk/reactos/drivers/bus/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/directory.rbui… ============================================================================== --- trunk/reactos/drivers/bus/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/directory.rbuild [iso-8859-1] Thu Apr 15 03:59:15 2010 @@ -13,4 +13,7 @@ <directory name="pcix"> <xi:include href="pcix/pcix.rbuild" /> </directory> +<directory name="pcmcia"> + <xi:include href="pcmcia/pcmcia.rbuild" /> +</directory> </group> Added: trunk/reactos/drivers/bus/pcmcia/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcmcia/fdo.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcmcia/fdo.c (added) +++ trunk/reactos/drivers/bus/pcmcia/fdo.c [iso-8859-1] Thu Apr 15 03:59:15 2010 @@ -1,0 +1,25 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel + * FILE: drivers/bus/pcmcia/fdo.c + * PURPOSE: PCMCIA Bus Driver + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ + +#include <pcmcia.h> + +//#define NDEBUG +#include <debug.h> + +NTSTATUS +NTAPI +PcmciaFdoPlugPlay(PPCMCIA_FDO_EXTENSION FdoExt, + PIRP Irp) +{ + UNIMPLEMENTED + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_NOT_SUPPORTED; +} + Propchange: trunk/reactos/drivers/bus/pcmcia/fdo.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcmcia/pcmcia.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcmcia/pcmcia.… ============================================================================== --- trunk/reactos/drivers/bus/pcmcia/pcmcia.c (added) +++ trunk/reactos/drivers/bus/pcmcia/pcmcia.c [iso-8859-1] Thu Apr 15 03:59:15 2010 @@ -1,0 +1,217 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel + * FILE: drivers/bus/pcmcia/pcmcia.c + * PURPOSE: PCMCIA Bus Driver + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ + +#include <pcmcia.h> + +//#define NDEBUG +#include <debug.h> + +NTSTATUS +NTAPI +PcmciaCreateClose(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + DPRINT("PCMCIA: Create/Close\n"); + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +PcmciaDeviceControl(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + NTSTATUS Status; + + DPRINT("PCMCIA: DeviceIoControl\n"); + + Irp->IoStatus.Information = 0; + + switch (IrpSp->Parameters.DeviceIoControl.IoControlCode) + { + default: + DPRINT1("PCMCIA: Unknown ioctl code: %x\n", IrpSp->Parameters.DeviceIoControl.IoControlCode); + Status = STATUS_NOT_SUPPORTED; + } + + Irp->IoStatus.Status = Status; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +VOID +NTAPI +PcmciaUnload(PDRIVER_OBJECT DriverObject) +{ + DPRINT("PCMCIA: Unload\n"); +} + +NTSTATUS +NTAPI +PcmciaPlugPlay(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PPCMCIA_COMMON_EXTENSION Common = DeviceObject->DeviceExtension; + + DPRINT("PCMCIA: PnP\n"); + if (Common->IsFDO) + { + return PcmciaFdoPlugPlay((PPCMCIA_FDO_EXTENSION)Common, + Irp); + } + else + { + return PcmciaPdoPlugPlay((PPCMCIA_PDO_EXTENSION)Common, + Irp); + } +} + +NTSTATUS +NTAPI +PcmciaPower(PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PPCMCIA_COMMON_EXTENSION Common = DeviceObject->DeviceExtension; + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + NTSTATUS Status; + + switch (IrpSp->MinorFunction) + { + case IRP_MN_QUERY_POWER: + /* I don't see any reason that we should care */ + DPRINT("PCMCIA: IRP_MN_QUERY_POWER\n"); + Status = STATUS_SUCCESS; + break; + + case IRP_MN_POWER_SEQUENCE: + DPRINT("PCMCIA: IRP_MN_POWER_SEQUENCE\n"); + RtlCopyMemory(IrpSp->Parameters.PowerSequence.PowerSequence, + &Common->PowerSequence, + sizeof(POWER_SEQUENCE)); + Status = STATUS_SUCCESS; + break; + + case IRP_MN_WAIT_WAKE: + /* Not really sure about this */ + DPRINT("PCMCIA: IRP_MN_WAIT_WAKE\n"); + Status = STATUS_NOT_SUPPORTED; + break; + + case IRP_MN_SET_POWER: + DPRINT("PCMCIA: IRP_MN_SET_POWER\n"); + if (IrpSp->Parameters.Power.Type == SystemPowerState) + { + Common->SystemPowerState = IrpSp->Parameters.Power.State.SystemState; + + Status = STATUS_SUCCESS; + } + else + { + Common->DevicePowerState = IrpSp->Parameters.Power.State.DeviceState; + + /* Update the POWER_SEQUENCE struct */ + if (Common->DevicePowerState <= PowerDeviceD1) + Common->PowerSequence.SequenceD1++; + + if (Common->DevicePowerState <= PowerDeviceD2) + Common->PowerSequence.SequenceD2++; + + if (Common->DevicePowerState <= PowerDeviceD3) + Common->PowerSequence.SequenceD3++; + + /* Start the underlying device if we are handling this for a PDO */ + if (!Common->IsFDO) + Status = PcmciaPdoSetPowerState((PPCMCIA_PDO_EXTENSION)Common); + else + Status = STATUS_SUCCESS; + } + + /* Report that we changed state to the Power Manager */ + PoSetPowerState(DeviceObject, IrpSp->Parameters.Power.Type, IrpSp->Parameters.Power.State); + break; + + default: + DPRINT1("PCMCIA: Invalid MN code in MJ_POWER handler %x\n", IrpSp->MinorFunction); + ASSERT(FALSE); + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +NTSTATUS +NTAPI +PcmciaAddDevice(PDRIVER_OBJECT DriverObject, + PDEVICE_OBJECT PhysicalDeviceObject) +{ + PPCMCIA_FDO_EXTENSION FdoExt; + PDEVICE_OBJECT Fdo; + NTSTATUS Status; + + DPRINT("PCMCIA: AddDevice\n"); + + Status = IoCreateDevice(DriverObject, + sizeof(*FdoExt), + NULL, + FILE_DEVICE_BUS_EXTENDER, + FILE_DEVICE_SECURE_OPEN, + FALSE, + &Fdo); + if (!NT_SUCCESS(Status)) return Status; + + FdoExt = Fdo->DeviceExtension; + + RtlZeroMemory(FdoExt, sizeof(*FdoExt)); + + InitializeListHead(&FdoExt->ChildDeviceList); + KeInitializeSpinLock(&FdoExt->Lock); + + FdoExt->Common.Self = Fdo; + FdoExt->Common.IsFDO = TRUE; + FdoExt->Common.State = dsStopped; + + FdoExt->Ldo = IoAttachDeviceToDeviceStack(Fdo, + PhysicalDeviceObject); + + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; + + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +DriverEntry(PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) +{ + DriverObject->MajorFunction[IRP_MJ_CREATE] = PcmciaCreateClose; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = PcmciaCreateClose; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = PcmciaDeviceControl; + DriverObject->MajorFunction[IRP_MJ_PNP] = PcmciaPlugPlay; + DriverObject->MajorFunction[IRP_MJ_POWER] = PcmciaPower; + + DriverObject->DriverExtension->AddDevice = PcmciaAddDevice; + DriverObject->DriverUnload = PcmciaUnload; + + DPRINT1("PCMCIA: DriverEntry\n"); + + return STATUS_SUCCESS; +} Propchange: trunk/reactos/drivers/bus/pcmcia/pcmcia.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcmcia/pcmcia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcmcia/pcmcia.… ============================================================================== --- trunk/reactos/drivers/bus/pcmcia/pcmcia.h (added) +++ trunk/reactos/drivers/bus/pcmcia/pcmcia.h [iso-8859-1] Thu Apr 15 03:59:15 2010 @@ -1,0 +1,51 @@ +#pragma once + +#include <ntifs.h> +#include <wdmguid.h> +#include <stdio.h> +#include <ntddk.h> + +typedef enum { + dsStopped, + dsStarted, + dsPaused, + dsRemoved, + dsSurpriseRemoved +} PCMCIA_DEVICE_STATE; + +typedef struct _PCMCIA_COMMON_EXTENSION { + PDEVICE_OBJECT Self; + BOOLEAN IsFDO; + POWER_SEQUENCE PowerSequence; + PCMCIA_DEVICE_STATE State; + DEVICE_POWER_STATE DevicePowerState; + SYSTEM_POWER_STATE SystemPowerState; +} PCMCIA_COMMON_EXTENSION, *PPCMCIA_COMMON_EXTENSION; + +typedef struct _PCMCIA_PDO_EXTENSION { + PCMCIA_COMMON_EXTENSION Common; +} PCMCIA_PDO_EXTENSION, *PPCMCIA_PDO_EXTENSION; + +typedef struct _PCMCIA_FDO_EXTENSION { + PCMCIA_COMMON_EXTENSION Common; + PDEVICE_OBJECT Ldo; + LIST_ENTRY ChildDeviceList; + KSPIN_LOCK Lock; +} PCMCIA_FDO_EXTENSION, *PPCMCIA_FDO_EXTENSION; + +/* pdo.c */ +NTSTATUS +NTAPI +PcmciaPdoPlugPlay(PPCMCIA_PDO_EXTENSION PdoExt, + PIRP Irp); + +NTSTATUS +NTAPI +PcmciaPdoSetPowerState(PPCMCIA_PDO_EXTENSION PdoExt); + +/* fdo.c */ +NTSTATUS +NTAPI +PcmciaFdoPlugPlay(PPCMCIA_FDO_EXTENSION FdoExt, + PIRP Irp); + Propchange: trunk/reactos/drivers/bus/pcmcia/pcmcia.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcmcia/pcmcia.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcmcia/pcmcia.… ============================================================================== --- trunk/reactos/drivers/bus/pcmcia/pcmcia.rbuild (added) +++ trunk/reactos/drivers/bus/pcmcia/pcmcia.rbuild [iso-8859-1] Thu Apr 15 03:59:15 2010 @@ -1,0 +1,12 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="pcmcia" type="kernelmodedriver" installbase="system32/drivers" installname="pcmcia.sys"> + <bootstrap installbase="$(CDOUTPUT)" /> + <include base="pcmcia">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>fdo.c</file> + <file>pcmcia.c</file> + <file>pdo.c</file> + <file>pcmcia.rc</file> +</module> Propchange: trunk/reactos/drivers/bus/pcmcia/pcmcia.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcmcia/pcmcia.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcmcia/pcmcia.… ============================================================================== --- trunk/reactos/drivers/bus/pcmcia/pcmcia.rc (added) +++ trunk/reactos/drivers/bus/pcmcia/pcmcia.rc [iso-8859-1] Thu Apr 15 03:59:15 2010 @@ -1,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "PCMCIA Bus Driver\0" +#define REACTOS_STR_INTERNAL_NAME "pcmcia\0" +#define REACTOS_STR_ORIGINAL_FILENAME "pcmcia.sys\0" +#include <reactos/version.rc> Propchange: trunk/reactos/drivers/bus/pcmcia/pcmcia.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/bus/pcmcia/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcmcia/pdo.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcmcia/pdo.c (added) +++ trunk/reactos/drivers/bus/pcmcia/pdo.c [iso-8859-1] Thu Apr 15 03:59:15 2010 @@ -1,0 +1,34 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS Kernel + * FILE: drivers/bus/pcmcia/pdo.c + * PURPOSE: PCMCIA Bus Driver + * PROGRAMMERS: Cameron Gutman (cameron.gutman(a)reactos.org) + */ + +#include <pcmcia.h> + +//#define NDEBUG +#include <debug.h> + +NTSTATUS +NTAPI +PcmciaPdoPlugPlay(PPCMCIA_PDO_EXTENSION PdoExt, + PIRP Irp) +{ + UNIMPLEMENTED + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_NOT_SUPPORTED; +} + +NTSTATUS +NTAPI +PcmciaPdoSetPowerState(PPCMCIA_PDO_EXTENSION PdoExt) +{ + UNIMPLEMENTED + + return STATUS_SUCCESS; +} + Propchange: trunk/reactos/drivers/bus/pcmcia/pdo.c ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 8 months

[jmorlan] 46875: [WIN32K] Since r43772 we now normalize VK_LCONTROL/VK_RCONTROL to VK_CONTROL rather than VK_LCONTROL (and ditto for shift/alt), so update SetKeyState to handle this. Fixes bug 4945.

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Thu Apr 15 02:25:30 2010 New Revision: 46875 URL: http://svn.reactos.org/svn/reactos?rev=46875&view=rev Log: [WIN32K] Since r43772 we now normalize VK_LCONTROL/VK_RCONTROL to VK_CONTROL rather than VK_LCONTROL (and ditto for shift/alt), so update SetKeyState to handle this. Fixes bug 4945. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Thu Apr 15 02:25:30 2010 @@ -88,12 +88,12 @@ gQueueKeyStateTable[vk] ^= KS_LOCK_BIT; } - if (ext && vk == VK_LSHIFT) - vk = VK_RSHIFT; - if (ext && vk == VK_LCONTROL) - vk = VK_RCONTROL; - if (ext && vk == VK_LMENU) - vk = VK_RMENU; + if (vk == VK_SHIFT) + vk = ext ? VK_RSHIFT : VK_LSHIFT; + if (vk == VK_CONTROL) + vk = ext ? VK_RCONTROL : VK_LCONTROL; + if (vk == VK_MENU) + vk = ext ? VK_RMENU : VK_LMENU; if (down) gQueueKeyStateTable[vk] |= KS_DOWN_BIT;

14 years, 8 months

[dreimer] 46874: Introduce %_BUILDBOT_SVNSKIPMAINTRUNK% as first of maybe more coming BuildBot Vars to skip the updating of the main trunk source when ssvn is used to do so. If its being set to "1" it only updates rosapps and rostests if existant. This is needed for Olaf Siejka's Windows Buildbot project. As Default its set to "0" and thus all behaves as before. UNTESTED

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu Apr 15 00:03:45 2010 New Revision: 46874 URL: http://svn.reactos.org/svn/reactos?rev=46874&view=rev Log: Introduce %_BUILDBOT_SVNSKIPMAINTRUNK% as first of maybe more coming BuildBot Vars to skip the updating of the main trunk source when ssvn is used to do so. If its being set to "1" it only updates rosapps and rostests if existant. This is needed for Olaf Siejka's Windows Buildbot project. As Default its set to "0" and thus all behaves as before. UNTESTED Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Thu Apr 15 00:03:45 2010 @@ -45,6 +45,7 @@ $global:_ROSBE_LOGDIR = "$pwd\RosBE-Logs" $global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386" $global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\$ENV:ROS_ARCH" +$global:_BUILDBOT_SVNSKIPMAINTRUNK = "0" if ("$ENV:_ROSBE_NOSYSPATH" -eq "1") { $global:_ROSBE_ORIGINALPATH = "$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools;$ENV:SystemRoot\system32;$ENV:SystemRoot;$ENV:SystemRoot\System32\Wbem;$ENV:SYSTEMROOT\System32\WindowsPowerShell\v1.0\" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Thu Apr 15 00:03:45 2010 @@ -31,7 +31,9 @@ if ("$_ROSBE_SSVN_JOB" -eq "update") { if ("$($arg[1])" -ne "") { $temparg = $arg[1] - IEX "& svn.exe update -r $temparg" + if ("$_BUILDBOT_SVNSKIPMAINTRUNK" -ne "1") { + IEX "& svn.exe update -r $temparg" + } if (Test-Path "modules\rosapps\.") { Set-Location modules\rosapps "Updating RosApps..." @@ -45,7 +47,9 @@ Set-Location "$_ROSBE_ROSSOURCEDIR" } } else { - IEX "& svn.exe update" + if ("$_BUILDBOT_SVNSKIPMAINTRUNK" -ne "1") { + IEX "& svn.exe update" + } if (Test-Path "modules\rosapps\.") { Set-Location modules\rosapps "Updating RosApps..." Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Thu Apr 15 00:03:45 2010 @@ -39,6 +39,7 @@ set _ROSBE_SHOWVERSION=0 set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\i386 set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%ROS_ARCH% +set _BUILDBOT_SVNSKIPMAINTRUNK=0 if "%_ROSBE_NOSYSPATH%" == "1" ( set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Thu Apr 15 00:03:45 2010 @@ -142,7 +142,9 @@ ) if "!_ROSBE_SSVN_JOB!" == "update" ( if not "%2" == "" ( - svn.exe update -r %2 + if not "%_BUILDBOT_SVNSKIPMAINTRUNK%" == "1" ( + svn.exe update -r %2 + ) if exist "modules\rosapps\." ( cd modules\rosapps echo Updating RosApps... @@ -156,7 +158,9 @@ cd "%_ROSBE_ROSSOURCEDIR%" ) ) else ( - svn.exe update + if not "%_BUILDBOT_SVNSKIPMAINTRUNK%" == "1" ( + svn.exe update + ) if exist "modules\rosapps\." ( cd modules\rosapps echo Updating RosApps...

14 years, 8 months

[gschneider] 46873: [NOTEPAD] Convert NULL characters to spaces when reading binary files See issue #3573 for more details.

by gschneider＠svn.reactos.org

Author: gschneider Date: Wed Apr 14 22:43:23 2010 New Revision: 46873 URL: http://svn.reactos.org/svn/reactos?rev=46873&view=rev Log: [NOTEPAD] Convert NULL characters to spaces when reading binary files See issue #3573 for more details. Modified: trunk/reactos/base/applications/notepad/text.c Modified: trunk/reactos/base/applications/notepad/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/text.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/text.c [iso-8859-1] Wed Apr 14 22:43:23 2010 @@ -51,7 +51,7 @@ { DWORD dwSize; LPBYTE pBytes = NULL; - LPCWSTR pszText; + LPWSTR pszText; LPWSTR pszAllocText = NULL; DWORD dwPos, i; DWORD dwCharCount; @@ -110,7 +110,7 @@ /* fall through */ case ENCODING_UNICODE: - pszText = (LPCWSTR) &pBytes[dwPos]; + pszText = (LPWSTR) &pBytes[dwPos]; dwCharCount = (dwSize - dwPos) / sizeof(WCHAR); break; @@ -173,6 +173,10 @@ adwEolnCount[EOLN_CR]++; else adwEolnCount[EOLN_LF]++; + break; + + case '\0': + pszText[i] = ' '; break; } }

14 years, 8 months

[fireball] 46872: - Enable clipped text output. Solves issues like caption text being printed outside of window's caption when window is being made too small.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Apr 14 22:37:43 2010 New Revision: 46872 URL: http://svn.reactos.org/svn/reactos?rev=46872&view=rev Log: - Enable clipped text output. Solves issues like caption text being printed outside of window's caption when window is being made too small. Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c branches/arwinss/reactos/dll/win32/winent.drv/winent.h Modified: branches/arwinss/reactos/dll/win32/winent.drv/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/font.c [iso-8859-1] Wed Apr 14 22:37:43 2010 @@ -586,7 +586,7 @@ BOOL retv = FALSE; //HDC hdc = physDev->hUserDC; //int textPixel, backgroundPixel; - //HRGN saved_region = 0; + HRGN saved_region = 0; BOOL disable_antialias = FALSE; AA_Type aa_type = AA_None; //DIBSECTION bmp; @@ -662,12 +662,10 @@ HRGN clip_region; clip_region = CreateRectRgnIndirect( lprect ); -#if 0 /* make a copy of the current device region */ saved_region = CreateRectRgn( 0, 0, 0, 0 ); CombineRgn( saved_region, physDev->region, 0, RGN_COPY ); RosDrv_SetDeviceClipping( physDev, saved_region, clip_region ); -#endif DeleteObject( clip_region ); } @@ -848,10 +846,8 @@ if (flags & ETO_CLIPPED) { /* restore the device region */ -#if 0 RosDrv_SetDeviceClipping( physDev, saved_region, 0 ); DeleteObject( saved_region ); -#endif } retv = TRUE; Modified: branches/arwinss/reactos/dll/win32/winent.drv/winent.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/winent.h [iso-8859-1] Wed Apr 14 22:37:43 2010 @@ -45,6 +45,7 @@ int DIB_GetBitmapInfo( const BITMAPINFOHEADER *header, LONG *width, LONG *height, WORD *bpp, WORD *compr ); +void CDECL RosDrv_SetDeviceClipping( NTDRV_PDEVICE *physDev, HRGN vis_rgn, HRGN clip_rgn ); /* font.c */ VOID

14 years, 8 months

[fireball] 46871: - Add a clipping region cache to the usermode DC structure and use it in SetDeviceClipping calls instead of creating an empty region all the time. Speed increase and also it's needed for further text output improvements.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Apr 14 22:23:38 2010 New Revision: 46871 URL: http://svn.reactos.org/svn/reactos?rev=46871&view=rev Log: - Add a clipping region cache to the usermode DC structure and use it in SetDeviceClipping calls instead of creating an empty region all the time. Speed increase and also it's needed for further text output improvements. Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c branches/arwinss/reactos/include/psdk/ntrosgdi.h Modified: branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/gdidrv.c [iso-8859-1] Wed Apr 14 22:23:38 2010 @@ -229,6 +229,10 @@ /* No font is selected */ physDev->cache_index = -1; + /* Create a usermode clipping region (same as kernelmode one, just to reduce + amount of syscalls) */ + physDev->region = CreateRectRgn( 0, 0, 0, 0 ); + /* Return allocated physical DC to the caller */ *pdev = physDev; @@ -262,6 +266,9 @@ BOOL CDECL RosDrv_DeleteDC( NTDRV_PDEVICE *physDev ) { BOOL res; + + /* Delete usermode copy of a clipping region */ + DeleteObject( physDev->region ); /* Delete kernel DC */ res = RosGdiDeleteDC(physDev->hKernelDC); @@ -798,37 +805,25 @@ void CDECL RosDrv_SetDeviceClipping( NTDRV_PDEVICE *physDev, HRGN vis_rgn, HRGN clip_rgn ) { RGNDATA *data; - HRGN dc_rgn; DWORD size; //FIXME("SetDeviceClipping hdc %x\n", physDev->hUserDC); - /* Create a dummy region (FIXME: create it once!) */ - dc_rgn = CreateRectRgn(0,0,0,0); - if (!dc_rgn) return; - - /* Update dcRegion to become a combined region */ - CombineRgn( dc_rgn, vis_rgn, clip_rgn, clip_rgn ? RGN_AND : RGN_COPY ); + /* Update dc region to become a combined region */ + CombineRgn( physDev->region, vis_rgn, clip_rgn, clip_rgn ? RGN_AND : RGN_COPY ); /* Get region data size */ - if (!(size = GetRegionData( dc_rgn, 0, NULL ))) - { - DeleteObject(dc_rgn); + if (!(size = GetRegionData( physDev->region, 0, NULL ))) return; - } /* Allocate memory for it */ if (!(data = HeapAlloc( GetProcessHeap(), 0, size ))) - { - DeleteObject(dc_rgn); return; - } /* Get region data */ - if (!GetRegionData( dc_rgn, size, data )) + if (!GetRegionData( physDev->region, size, data )) { HeapFree( GetProcessHeap(), 0, data ); - DeleteObject(dc_rgn); return; } @@ -837,7 +832,6 @@ /* Free memory and delete clipping region */ HeapFree( GetProcessHeap(), 0, data ); - DeleteObject(dc_rgn); } BOOL CDECL RosDrv_SetDeviceGammaRamp(NTDRV_PDEVICE *physDev, LPVOID ramp) Modified: branches/arwinss/reactos/include/psdk/ntrosgdi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/nt… ============================================================================== --- branches/arwinss/reactos/include/psdk/ntrosgdi.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/psdk/ntrosgdi.h [iso-8859-1] Wed Apr 14 22:23:38 2010 @@ -10,9 +10,10 @@ typedef struct _NTDRV_PDEVICE { - HDC hUserDC; - HDC hKernelDC; - int cache_index; /* cache of a currently selected font */ + HDC hUserDC; + HDC hKernelDC; + HRGN region; /* Device region (visible region & clip region) */ + int cache_index; /* cache of a currently selected font */ } NTDRV_PDEVICE, *PNTDRV_PDEVICE; typedef struct _ROS_DCINFO

14 years, 8 months

[gschneider] 46870: [DESK] - Create a function for updating the currently selected theme id - Call this function before saving theme data to the registry, fixes saving invalid theme indexes - Remove unnecessary header tags See issue #5016 for more details.

by gschneider＠svn.reactos.org

Author: gschneider Date: Wed Apr 14 21:08:27 2010 New Revision: 46870 URL: http://svn.reactos.org/svn/reactos?rev=46870&view=rev Log: [DESK] - Create a function for updating the currently selected theme id - Call this function before saving theme data to the registry, fixes saving invalid theme indexes - Remove unnecessary header tags See issue #5016 for more details. Modified: trunk/reactos/dll/cpl/desk/appearance.c trunk/reactos/dll/cpl/desk/effappdlg.c Modified: trunk/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/appearance.c?… ============================================================================== --- trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/appearance.c [iso-8859-1] Wed Apr 14 21:08:27 2010 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Display Control Panel * FILE: lib/cpl/desk/appearance.c @@ -486,11 +485,17 @@ return TRUE; } +static void +UpdateSelectedThemeId(HWND hwndDlg, GLOBALS *g) +{ + int sel; + sel = SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_COLORSCHEME, CB_GETCURSEL, 0, 0); + g->Theme.Id = SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_COLORSCHEME, CB_GETITEMDATA, (WPARAM)sel, 0); +} INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) { - INT i; GLOBALS *g; LPNMHDR lpnm; @@ -538,8 +543,7 @@ { PropSheet_Changed(GetParent(hwndDlg), hwndDlg); g->Theme.bHasChanged = TRUE; - i = SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_COLORSCHEME, CB_GETCURSEL, 0, 0); - g->Theme.Id = SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_COLORSCHEME, CB_GETITEMDATA, (WPARAM)i, 0); + UpdateSelectedThemeId(hwndDlg, g); LoadThemeFromReg(g); //SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_PREVIEW, WM_PAINT, 0, 0); } @@ -557,6 +561,7 @@ case PSN_APPLY: if (g->Theme.bHasChanged) { + UpdateSelectedThemeId(hwndDlg, g); ApplyTheme(g); } return TRUE; Modified: trunk/reactos/dll/cpl/desk/effappdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/effappdlg.c?r… ============================================================================== --- trunk/reactos/dll/cpl/desk/effappdlg.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/effappdlg.c [iso-8859-1] Wed Apr 14 21:08:27 2010 @@ -1,5 +1,4 @@ -/* $Id: effappdlg.c 24836 2007-02-12 03:12:56Z tkreuzer $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Display Control Panel * FILE: dll/cpl/desk/effappdlg.c

14 years, 8 months

[tkreuzer] 46869: [NDIS] Fix build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Apr 14 21:01:16 2010 New Revision: 46869 URL: http://svn.reactos.org/svn/reactos?rev=46869&view=rev Log: [NDIS] Fix build Modified: branches/header-work/drivers/network/ndis/ndis/buffer.c Modified: branches/header-work/drivers/network/ndis/ndis/buffer.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/network/ndi… ============================================================================== --- branches/header-work/drivers/network/ndis/ndis/buffer.c [iso-8859-1] (original) +++ branches/header-work/drivers/network/ndis/ndis/buffer.c [iso-8859-1] Wed Apr 14 21:01:16 2010 @@ -908,6 +908,7 @@ } } +#undef NdisGetFirstBufferFromPacketSafe /* * @implemented */

14 years, 8 months

[tkreuzer] 46868: [KERNEL32] - ULONG -> ULONG_PTR / SIZE_T - cast -> HandleToUlong - remove leading underscore from amd64 asm

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Apr 14 17:15:50 2010 New Revision: 46868 URL: http://svn.reactos.org/svn/reactos?rev=46868&view=rev Log: [KERNEL32] - ULONG -> ULONG_PTR / SIZE_T - cast -> HandleToUlong - remove leading underscore from amd64 asm Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/include/kernel32.h branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/utils.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/process/proc.c branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/amd64/fiber.S branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/amd64/thread.S branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/thread.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/include/kernel32.h [iso-8859-1] Wed Apr 14 17:15:50 2010 @@ -31,7 +31,7 @@ #endif #define IsConsoleHandle(h) \ - (((((ULONG)h) & 0x10000003) == 0x3) ? TRUE : FALSE) + (((((ULONG_PTR)h) & 0x10000003) == 0x3) ? TRUE : FALSE) #define HANDLE_DETACHED_PROCESS (HANDLE)-2 #define HANDLE_CREATE_NEW_CONSOLE (HANDLE)-3 @@ -108,8 +108,8 @@ NTSTATUS WINAPI BasepCreateStack(HANDLE hProcess, - ULONG StackReserve, - ULONG StackCommit, + SIZE_T StackReserve, + SIZE_T StackCommit, PINITIAL_TEB InitialTeb); VOID Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/utils.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/utils.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/misc/utils.c [iso-8859-1] Wed Apr 14 17:15:50 2010 @@ -191,8 +191,8 @@ NTSTATUS WINAPI BasepCreateStack(HANDLE hProcess, - ULONG StackReserve, - ULONG StackCommit, + SIZE_T StackReserve, + SIZE_T StackCommit, PINITIAL_TEB InitialTeb) { NTSTATUS Status; @@ -292,7 +292,7 @@ /* Create a guard page */ if (UseGuard) { - ULONG GuardPageSize = SystemBasicInfo.PageSize; + SIZE_T GuardPageSize = SystemBasicInfo.PageSize; ULONG Dummy; /* Attempt maximum space possible */ @@ -388,12 +388,12 @@ /* The other registers are undefined */ /* Setup the Segments */ - Context->SegGs = KGDT_64_DATA | RPL_MASK; - Context->SegEs = KGDT_64_DATA | RPL_MASK; - Context->SegDs = KGDT_64_DATA | RPL_MASK; - Context->SegCs = KGDT_64_R3_CODE | RPL_MASK; - Context->SegSs = KGDT_64_DATA | RPL_MASK; - Context->SegFs = KGDT_32_R3_TEB; + Context->SegGs = KGDT64_R3_DATA | RPL_MASK; + Context->SegEs = KGDT64_R3_DATA | RPL_MASK; + Context->SegDs = KGDT64_R3_DATA | RPL_MASK; + Context->SegCs = KGDT64_R3_CODE | RPL_MASK; + Context->SegSs = KGDT64_R3_DATA | RPL_MASK; + Context->SegFs = KGDT64_R3_CMTEB; /* Set the EFLAGS */ Context->EFlags = 0x3000; /* IOPL 3 */ Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/process/proc.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/process/proc.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/process/proc.c [iso-8859-1] Wed Apr 14 17:15:50 2010 @@ -284,7 +284,7 @@ WINAPI GetCurrentProcessId(VOID) { - return (DWORD)GetTeb()->ClientId.UniqueProcess; + return HandleToUlong(GetTeb()->ClientId.UniqueProcess); } @@ -355,7 +355,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; CLIENT_ID ClientId; - ClientId.UniqueProcess = (HANDLE)dwProcessId; + ClientId.UniqueProcess = UlongToHandle(dwProcessId); ClientId.UniqueThread = 0; InitializeObjectAttributes(&ObjectAttributes, @@ -559,7 +559,7 @@ WINAPI FlushInstructionCache(HANDLE hProcess, LPCVOID lpBaseAddress, - DWORD dwSize) + SIZE_T dwSize) { NTSTATUS Status; Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/amd64/fiber.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/amd64/fiber.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/amd64/fiber.S [iso-8859-1] Wed Apr 14 17:15:50 2010 @@ -9,9 +9,9 @@ #include <ndk/asm.h> -.globl _SwitchToFiber +.globl SwitchToFiber .intel_syntax noprefix -_SwitchToFiber: +SwitchToFiber: /* FIXME: TODO */ ret 4 Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/amd64/thread.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/amd64/thread.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/amd64/thread.S [iso-8859-1] Wed Apr 14 17:15:50 2010 @@ -6,11 +6,11 @@ * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ -.globl _BaseThreadStartupThunk -.globl _BaseProcessStartThunk +.globl BaseThreadStartupThunk +.globl BaseProcessStartThunk .intel_syntax noprefix -_BaseThreadStartupThunk: +BaseThreadStartupThunk: /* Start out fresh */ xor rbp, rbp @@ -18,15 +18,15 @@ push rbx /* lpParameter */ push rax /* lpStartAddress */ push 0 /* Return RIP */ - jmp _BaseThreadStartup + jmp BaseThreadStartup -_BaseProcessStartThunk: +BaseProcessStartThunk: /* Start out fresh */ xor rbp, rbp push rax /* lpStartAddress */ push 0 /* Return RIP */ - jmp _BaseProcessStartup + jmp BaseProcessStartup /* EOF */ Modified: branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/thread.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/kernel32/thread/thread.c [iso-8859-1] Wed Apr 14 17:15:50 2010 @@ -232,7 +232,7 @@ } /* Success */ - if(lpThreadId) *lpThreadId = (DWORD)ClientId.UniqueThread; + if(lpThreadId) *lpThreadId = HandleToUlong(ClientId.UniqueThread); /* Resume it if asked */ if (!(dwCreationFlags & CREATE_SUSPENDED)) @@ -344,7 +344,7 @@ WINAPI GetCurrentThreadId(VOID) { - return (DWORD)(NtCurrentTeb()->ClientId).UniqueThread; + return HandleToUlong(NtCurrentTeb()->ClientId.UniqueThread); } /* @@ -754,7 +754,7 @@ return 0; } - return (DWORD)ThreadBasic.ClientId.UniqueProcess; + return HandleToUlong(ThreadBasic.ClientId.UniqueProcess); } /* @@ -777,7 +777,7 @@ return 0; } - return (DWORD)ThreadBasic.ClientId.UniqueThread; + return HandleToUlong(ThreadBasic.ClientId.UniqueThread); } /*

14 years, 8 months

← Newer
1
...
17
18
19
20
21
22
23
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2010