Ros-diffs March 2010

ros-diffs@reactos.org

19 participants
896 discussions

[akhaldi] 46490: [XDK] - Autogenerate ntifs.h based on ntifs.template.h - Remove some duplicate definitions between WDM and NTDDK. [DDK] - Remove wmlib.h - Reflect the recent XDK changes.
by akhaldi＠svn.reactos.org 27 Mar '10

27 Mar '10

Author: akhaldi Date: Sat Mar 27 16:31:25 2010 New Revision: 46490 URL: http://svn.reactos.org/svn/reactos?rev=46490&view=rev Log: [XDK] - Autogenerate ntifs.h based on ntifs.template.h - Remove some duplicate definitions between WDM and NTDDK. [DDK] - Remove wmlib.h - Reflect the recent XDK changes. Added: branches/header-work/include/xdk/ccfuncs.h (with props) branches/header-work/include/xdk/cctypes.h (with props) branches/header-work/include/xdk/fsrtlfuncs.h (with props) branches/header-work/include/xdk/fsrtltypes.h (with props) branches/header-work/include/xdk/ntifs.template.h (with props) Removed: branches/header-work/include/ddk/wmlib.h Modified: branches/header-work/include/ddk/ntddk.h branches/header-work/include/ddk/ntifs.h branches/header-work/include/ddk/wdm.h branches/header-work/include/xdk/exfuncs.h branches/header-work/include/xdk/generate.bat branches/header-work/include/xdk/iofuncs.h branches/header-work/include/xdk/iotypes.h branches/header-work/include/xdk/kefuncs.h branches/header-work/include/xdk/mmfuncs.h branches/header-work/include/xdk/mmtypes.h branches/header-work/include/xdk/ntddk.template.h branches/header-work/include/xdk/obfuncs.h branches/header-work/include/xdk/pofuncs.h branches/header-work/include/xdk/potypes.h branches/header-work/include/xdk/psfuncs.h branches/header-work/include/xdk/rtlfuncs.h branches/header-work/include/xdk/rtltypes.h branches/header-work/include/xdk/sefuncs.h branches/header-work/include/xdk/setypes.h branches/header-work/include/xdk/zwfuncs.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/header-work/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntddk.h… Modified: branches/header-work/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntifs.h… Modified: branches/header-work/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/wdm.h?r… Removed: branches/header-work/include/ddk/wmlib.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/wmlib.h… Added: branches/header-work/include/xdk/ccfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/ccfuncs… Added: branches/header-work/include/xdk/cctypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/cctypes… Modified: branches/header-work/include/xdk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/exfuncs… Added: branches/header-work/include/xdk/fsrtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/fsrtlfu… Added: branches/header-work/include/xdk/fsrtltypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/fsrtlty… Modified: branches/header-work/include/xdk/generate.bat URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/generat… Modified: branches/header-work/include/xdk/iofuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/iofuncs… Modified: branches/header-work/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/iotypes… Modified: branches/header-work/include/xdk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/kefuncs… Modified: branches/header-work/include/xdk/mmfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/mmfuncs… Modified: branches/header-work/include/xdk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/mmtypes… Modified: branches/header-work/include/xdk/ntddk.template.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/ntddk.t… Added: branches/header-work/include/xdk/ntifs.template.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/ntifs.t… Modified: branches/header-work/include/xdk/obfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/obfuncs… Modified: branches/header-work/include/xdk/pofuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/pofuncs… Modified: branches/header-work/include/xdk/potypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/potypes… Modified: branches/header-work/include/xdk/psfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/psfuncs… Modified: branches/header-work/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/rtlfunc… Modified: branches/header-work/include/xdk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/rtltype… Modified: branches/header-work/include/xdk/sefuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/sefuncs… Modified: branches/header-work/include/xdk/setypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/setypes… Modified: branches/header-work/include/xdk/zwfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/zwfuncs…

1 0

[tkreuzer] 46489: [CMPBATT] reduce diff to trunk
by tkreuzer＠svn.reactos.org 27 Mar '10

27 Mar '10

Author: tkreuzer Date: Sat Mar 27 15:54:55 2010 New Revision: 46489 URL: http://svn.reactos.org/svn/reactos?rev=46489&view=rev Log: [CMPBATT] reduce diff to trunk Modified: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/cmbatt/cmexec.c Modified: branches/ros-amd64-bringup/reactos/drivers/bus/acpi/cmbatt/cmexec.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/bus/acpi/cmbatt/cmexec.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/bus/acpi/cmbatt/cmexec.c [iso-8859-1] Sat Mar 27 15:54:55 2010 @@ -9,7 +9,6 @@ /* INCLUDES *******************************************************************/ #include "cmbatt.h" -#include "ntstatus.h" /* FUNCTIONS ******************************************************************/ @@ -112,8 +111,8 @@ if (CmBattDebug & 0x4C) DbgPrint("CmBattSendDownStreamIrp: Failed to allocate Irp\n"); return STATUS_INSUFFICIENT_RESOURCES; -} - + } + /* Call ACPI */ if (CmBattDebug & 0x40) DbgPrint("CmBattSendDownStreamIrp: Irp %x [Tid] %x\n", @@ -183,13 +182,13 @@ Status = GetDwordElement(OutputBuffer.Argument, PsrData); if (CmBattDebug & 0x440) DbgPrint("CmBattGetPsrData: _PSR method returned %x \n", *PsrData); -} + } else if (CmBattDebug & 0x44C) { /* Failure */ DbgPrint("CmBattGetPsrData: Failed _PSR method - Status (0x%x)\n", Status); } - + /* Return status */ return Status; } @@ -228,14 +227,14 @@ Status = GetDwordElement(OutputBuffer.Argument, StaData); if (CmBattDebug & 0x440) DbgPrint("CmBattGetStaData: _STA method returned %x \n", *StaData); -} + } else if (CmBattDebug & 0x44C) { /* Failure */ DbgPrint("CmBattGetStaData: Failed _STA method - Status (0x%x)\n", Status); Status = STATUS_NO_SUCH_DEVICE; } - + /* Return status */ return Status; } @@ -274,14 +273,14 @@ Status = GetDwordElement(OutputBuffer.Argument, UniqueId); if (CmBattDebug & 0x440) DbgPrint("CmBattGetUniqueId: _UID method returned %x \n", *UniqueId); -} + } else if (CmBattDebug & 0x44C) { /* Failure */ DbgPrint("CmBattGetUniqueId: Failed _UID method - Status (0x%x)\n", Status); Status = STATUS_NO_SUCH_DEVICE; } - + /* Return status */ return Status; } @@ -332,65 +331,8 @@ CmBattGetBstData(PCMBATT_DEVICE_EXTENSION DeviceExtension, PACPI_BST_DATA BstData) { - PIRP Irp; - NTSTATUS Status; - KEVENT Event; - IO_STATUS_BLOCK IoStatusBlock; - PAGED_CODE(); - - /* Initialize our wait event */ - KeInitializeEvent(&Event, SynchronizationEvent, 0); - - /* Allocate the IRP */ - Irp = IoBuildDeviceIoControlRequest(IoControlCode, - DeviceObject, - InputBuffer, - InputBufferLength, - OutputBuffer, - OutputBufferLength, - 0, - &Event, - &IoStatusBlock); - if (!Irp) - { - /* No IRP, fail */ - if (CmBattDebug & 0x4C) - DbgPrint("CmBattSendDownStreamIrp: Failed to allocate Irp\n"); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Call ACPI */ - if (CmBattDebug & 0x40) - DbgPrint("CmBattSendDownStreamIrp: Irp %x [Tid] %x\n", Irp, KeGetCurrentThread()); - Status = IoCallDriver(DeviceObject, Irp); - if (Status == STATUS_PENDING) - { - /* Wait for completion */ - KeWaitForSingleObject(&Event, - Executive, - KernelMode, - FALSE, - NULL); - Status = Irp->IoStatus.Status; - } - - /* Check if caller wanted output */ - if (OutputBuffer) - { - /* Make sure it's valid ACPI output buffer */ - if ((OutputBuffer->Signature != ACPI_EVAL_OUTPUT_BUFFER_SIGNATURE) || - !(OutputBuffer->Count)) - { - /* It isn't, so set failure code */ - Status = STATUS_ACPI_INVALID_DATA; - } - } - - /* Return status */ - if (CmBattDebug & 0x40) - DbgPrint("CmBattSendDownStreamIrp: Irp %x completed %x! [Tid] %x\n", - Irp, Status, KeGetCurrentThread()); - return Status; -} - + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + /* EOF */

1 0

[cgutman] 46488: [ACPI] - Fix a typo
by cgutman＠svn.reactos.org 27 Mar '10

27 Mar '10

Author: cgutman Date: Sat Mar 27 15:40:36 2010 New Revision: 46488 URL: http://svn.reactos.org/svn/reactos?rev=46488&view=rev Log: [ACPI] - Fix a typo Modified: trunk/reactos/drivers/bus/acpi/main.c 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] Sat Mar 27 15:40:36 2010 @@ -275,7 +275,7 @@ Caps |= SYS_BUTTON_SLEEP; } } - if (wcsstr(((PPDO_DEVICE_DATA)commonData)->HardwareIDs, L"PNP0C0C")) + else if (wcsstr(((PPDO_DEVICE_DATA)commonData)->HardwareIDs, L"PNP0C0C")) { DPRINT1("Control method power button reported to power manager\n"); Caps |= SYS_BUTTON_POWER;

1 0

[tkreuzer] 46487: More formatting fixe
by tkreuzer＠svn.reactos.org 27 Mar '10

27 Mar '10

Author: tkreuzer Date: Sat Mar 27 11:45:04 2010 New Revision: 46487 URL: http://svn.reactos.org/svn/reactos?rev=46487&view=rev Log: More formatting fixe Modified: branches/header-work/include/ddk/ntddk.h branches/header-work/include/ddk/wdm.h branches/header-work/include/psdk/devioctl.h branches/header-work/include/xdk/cmfuncs.h branches/header-work/include/xdk/cmtypes.h branches/header-work/include/xdk/exfuncs.h branches/header-work/include/xdk/extypes.h branches/header-work/include/xdk/halfuncs.h branches/header-work/include/xdk/haltypes.h branches/header-work/include/xdk/iofuncs.h Modified: branches/header-work/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntddk.h… ============================================================================== --- branches/header-work/include/ddk/ntddk.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntddk.h [iso-8859-1] Sat Mar 27 11:45:04 2010 @@ -110,7 +110,6 @@ } ZONE_HEADER, *PZONE_HEADER; #define PROTECTED_POOL 0x80000000 - /****************************************************************************** * I/O Manager Types * @@ -3238,6 +3237,7 @@ /****************************************************************************** * Executive Functions * ******************************************************************************/ + static __inline PVOID ExAllocateFromZone( IN PZONE_HEADER Zone) @@ -3330,8 +3330,6 @@ IN ULONG Value); #endif - - #if (NTDDI_VERSION >= NTDDI_WIN2K) NTKERNELAPI NTSTATUS @@ -3377,9 +3375,7 @@ NTAPI ExRaiseDatatypeMisalignment(VOID); - #endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ - /* Hardware Abstraction Layer Functions */ @@ -3653,10 +3649,10 @@ #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ - /****************************************************************************** * I/O Manager Functions * ******************************************************************************/ + /* * VOID IoAssignArcName( * IN PUNICODE_STRING ArcName, @@ -3682,9 +3678,8 @@ DriverContext->Size = sizeof(IO_DRIVER_CREATE_CONTEXT); } - - #if (NTDDI_VERSION >= NTDDI_WIN2K) + #if !(defined(USE_DMA_MACROS) && (defined(_NTDDK_) || defined(_NTDRIVER_)) || defined(_WDM_INCLUDED_)) NTKERNELAPI NTSTATUS @@ -3903,6 +3898,7 @@ #endif /* (NTDDI_VERSION >= NTDDI_WIN2KSP3) */ #if (NTDDI_VERSION >= NTDDI_WINXP) + NTKERNELAPI NTSTATUS FASTCALL @@ -4016,8 +4012,8 @@ IN PDEVICE_OBJECT TargetDevice, OUT PDEVICE_OBJECT *AttachedToDeviceObject); + #endif /* (NTDDI_VERSION >= NTDDI_WINXP) */ - #if (NTDDI_VERSION >= NTDDI_WS03) NTKERNELAPI @@ -4095,9 +4091,7 @@ IoIsFileObjectIgnoringSharing( IN PFILE_OBJECT FileObject); - #endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ - #if (NTDDI_VERSION >= NTDDI_WIN7) NTSTATUS @@ -4105,9 +4099,7 @@ IoSetFileObjectIgnoreSharing( IN PFILE_OBJECT FileObject); - #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ - /****************************************************************************** * Kernel Debugger Functions * Modified: branches/header-work/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/wdm.h?r… ============================================================================== --- branches/header-work/include/ddk/wdm.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/wdm.h [iso-8859-1] Sat Mar 27 11:45:04 2010 @@ -1966,7 +1966,6 @@ #else #define IF_NTOS_DEBUG(FlagName) if(FALSE) #endif - /****************************************************************************** * Security Manager Types * @@ -11183,7 +11182,6 @@ * I/O Manager Functions * ******************************************************************************/ - /* * NTSTATUS * IoAcquireRemoveLock( @@ -12378,7 +12376,6 @@ #endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ - #if (NTDDI_VERSION >= NTDDI_WINXP) NTKERNELAPI @@ -12538,6 +12535,7 @@ IN ULONG Version, IN ULONG ValueBufferSize, IN PVOID ValueBuffer); + #endif /* (NTDDI_VERSION >= NTDDI_WINXP) */ #if (NTDDI_VERSION >= NTDDI_WINXPSP1) @@ -12550,7 +12548,6 @@ #endif #if (NTDDI_VERSION >= NTDDI_WS03) - NTKERNELAPI NTSTATUS NTAPI @@ -12573,9 +12570,7 @@ IN PVOID InsertContext OPTIONAL); #endif /* (NTDDI_VERSION >= NTDDI_WS03) */ - #if (NTDDI_VERSION >= NTDDI_VISTA) - NTKERNELAPI NTSTATUS NTAPI @@ -12724,7 +12719,6 @@ #endif #if (NTDDI_VERSION >= NTDDI_WIN7) - NTKERNELAPI NTSTATUS NTAPI @@ -13408,7 +13402,6 @@ } #if (NTDDI_VERSION >= NTDDI_WIN2K) - NTKERNELAPI VOID FASTCALL @@ -14068,7 +14061,6 @@ } } - /****************************************************************************** * Object Manager Functions * ******************************************************************************/ @@ -14664,6 +14656,7 @@ } #endif /* USE_DMA_MACROS ... */ + #endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ #ifndef _NTTMAPI_ Modified: branches/header-work/include/psdk/devioctl.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/devioc… ============================================================================== --- branches/header-work/include/psdk/devioctl.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/devioctl.h [iso-8859-1] Sat Mar 27 11:45:04 2010 @@ -24,7 +24,6 @@ #ifndef _DEVIOCTL_ #define _DEVIOCTL_ - #define FILE_DEVICE_BEEP 0x00000001 @@ -98,14 +97,12 @@ /* DEVICE_OBJECT.DeviceType */ #define DEVICE_TYPE ULONG - #define CTL_CODE(DeviceType, Function, Method, Access) \ (((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method)) #define DEVICE_TYPE_FROM_CTL_CODE(ctl) (((ULONG) (ctl & 0xffff0000)) >> 16) #define METHOD_FROM_CTL_CODE(ctrlCode) ((ULONG)(ctrlCode & 3)) - #define METHOD_BUFFERED 0 #define METHOD_IN_DIRECT 1 @@ -115,12 +112,10 @@ #define METHOD_DIRECT_TO_HARDWARE METHOD_IN_DIRECT #define METHOD_DIRECT_FROM_HARDWARE METHOD_OUT_DIRECT - #define FILE_ANY_ACCESS 0x00000000 #define FILE_SPECIAL_ACCESS FILE_ANY_ACCESS #define FILE_READ_ACCESS 0x00000001 #define FILE_WRITE_ACCESS 0x00000002 - #endif /*_DEVIOCTL_ */ Modified: branches/header-work/include/xdk/cmfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/cmfuncs… ============================================================================== --- branches/header-work/include/xdk/cmfuncs.h [iso-8859-1] (original) +++ branches/header-work/include/xdk/cmfuncs.h [iso-8859-1] Sat Mar 27 11:45:04 2010 @@ -66,5 +66,5 @@ #endif // NTDDI_VERSION >= NTDDI_VISTA -$endif +$endif (_WDMDDK_) Modified: branches/header-work/include/xdk/cmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/cmtypes… ============================================================================== --- branches/header-work/include/xdk/cmtypes.h [iso-8859-1] (original) +++ branches/header-work/include/xdk/cmtypes.h [iso-8859-1] Sat Mar 27 11:45:04 2010 @@ -1005,9 +1005,8 @@ CM_SERVICE_VIRTUAL_DISK_BOOT_LOAD | \ CM_SERVICE_USB_DISK_BOOT_LOAD) -$endif +$endif (_WDMDDK_) $if (_NTDDK_) - typedef struct _KEY_NAME_INFORMATION { ULONG NameLength; WCHAR Name[1]; @@ -1045,4 +1044,4 @@ UCHAR IRQMap[16]; } CM_PCCARD_DEVICE_DATA, *PCM_PCCARD_DEVICE_DATA; -$endif /* _NTDDK_ */ +$endif (_NTDDK_) Modified: branches/header-work/include/xdk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/exfuncs… ============================================================================== --- branches/header-work/include/xdk/exfuncs.h [iso-8859-1] (original) +++ branches/header-work/include/xdk/exfuncs.h [iso-8859-1] Sat Mar 27 11:45:04 2010 @@ -1,6 +1,7 @@ /****************************************************************************** * Executive Functions * ******************************************************************************/ + $if (_NTDDK_) static __inline PVOID ExAllocateFromZone( @@ -94,8 +95,7 @@ IN ULONG Value); #endif -$endif - +$endif (_NTDDK_) $if (_WDMDDK_) #define ExInterlockedIncrementLong(Addend,Lock) Exfi386InterlockedIncrementLong(Addend) #define ExInterlockedDecrementLong(Addend,Lock) Exfi386InterlockedDecrementLong(Addend) @@ -325,8 +325,8 @@ KeInitializeEvent(&FastMutex->Event, SynchronizationEvent, FALSE); return; } -$endif - + +$endif (_WDMDDK_) #if (NTDDI_VERSION >= NTDDI_WIN2K) $if (_NTDDK_) NTKERNELAPI @@ -372,8 +372,8 @@ VOID NTAPI ExRaiseDatatypeMisalignment(VOID); -$endif - + +$endif (_NTDDK_) $if (_WDMDDK_) NTKERNELAPI VOID @@ -750,8 +750,8 @@ NTAPI ExUnregisterCallback( IN OUT PVOID CbRegistration); -$endif - + +$endif (_WDMDDK_) #endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ $if (_WDMDDK_) @@ -1036,5 +1036,4 @@ } } -$endif - +$endif (_WDMDDK_) Modified: branches/header-work/include/xdk/extypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/extypes… ============================================================================== --- branches/header-work/include/xdk/extypes.h [iso-8859-1] (original) +++ branches/header-work/include/xdk/extypes.h [iso-8859-1] Sat Mar 27 11:45:04 2010 @@ -1,8 +1,8 @@ /****************************************************************************** * Executive Types * ******************************************************************************/ + $if (_WDMDDK_) - #define EX_RUNDOWN_ACTIVE 0x1 #define EX_RUNDOWN_COUNT_SHIFT 0x1 #define EX_RUNDOWN_COUNT_INC (1 << EX_RUNDOWN_COUNT_SHIFT) @@ -268,9 +268,8 @@ #define IF_NTOS_DEBUG(FlagName) if(FALSE) #endif -$endif /* _WDMDDK_ */ +$endif (_WDMDDK_) $if (_NTDDK_) - typedef struct _ZONE_SEGMENT_HEADER { SINGLE_LIST_ENTRY SegmentList; PVOID Reserved; @@ -285,5 +284,4 @@ #define PROTECTED_POOL 0x80000000 -$endif /* _NTDDK_ */ - +$endif (_NTDDK_) Modified: branches/header-work/include/xdk/halfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/halfunc… ============================================================================== --- branches/header-work/include/xdk/halfuncs.h [iso-8859-1] (original) +++ branches/header-work/include/xdk/halfuncs.h [iso-8859-1] Sat Mar 27 11:45:04 2010 @@ -3,8 +3,8 @@ #if (NTDDI_VERSION >= NTDDI_WIN2K) #if defined(USE_DMA_MACROS) && !defined(_NTHAL_) && (defined(_NTDDK_) || defined(_NTDRIVER_)) || defined(_WDM_INCLUDED_) + $if (_WDMDDK_) - FORCEINLINE PVOID NTAPI @@ -69,9 +69,8 @@ return alignment; } -$endif +$endif (_WDMDDK_) $if (_NTDDK_) - /* Nothing here */ #else /* USE_DMA_MACROS ... */ @@ -141,10 +140,10 @@ IN ULONG NumberOfMapRegisters, IN PDRIVER_CONTROL ExecutionRoutine); -$endif /* _NTDDK_ */ +$endif (_NTDDK_) #endif /* USE_DMA_MACROS ... */ + $if (_NTDDK_) - #if !defined(NO_LEGACY_DRIVERS) NTHALAPI NTSTATUS @@ -273,10 +272,10 @@ IN PSCATTER_GATHER_LIST ScatterGather, IN BOOLEAN WriteToDevice); -$endif /* _NTDDK_ */ +$endif (_NTDDK_) #endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ + $if (_NTDDK_) - #if (NTDDI_VERSION >= NTDDI_WINXP) NTKERNELAPI VOID @@ -342,5 +341,4 @@ #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ -$endif /* _NTDDK_ */ - +$endif (_NTDDK_) Modified: branches/header-work/include/xdk/haltypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/haltype… ============================================================================== --- branches/header-work/include/xdk/haltypes.h [iso-8859-1] (original) +++ branches/header-work/include/xdk/haltypes.h [iso-8859-1] Sat Mar 27 11:45:04 2010 @@ -547,5 +547,5 @@ #define HAL_PLATFORM_DISABLE_UC_MAIN_MEMORY 0x08L #define HAL_PLATFORM_ENABLE_WRITE_COMBINING_MMIO 0x10L #define HAL_PLATFORM_ACPI_TABLES_CACHED 0x20L -$endif - + +$endif (_NTDDK_) Modified: branches/header-work/include/xdk/iofuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/iofuncs… ============================================================================== --- branches/header-work/include/xdk/iofuncs.h [iso-8859-1] (original) +++ branches/header-work/include/xdk/iofuncs.h [iso-8859-1] Sat Mar 27 11:45:04 2010 @@ -1,6 +1,7 @@ /****************************************************************************** * I/O Manager Functions * ******************************************************************************/ + $if (_NTDDK_) /* * VOID IoAssignArcName( @@ -26,9 +27,8 @@ RtlZeroMemory(DriverContext, sizeof(IO_DRIVER_CREATE_CONTEXT)); DriverContext->Size = sizeof(IO_DRIVER_CREATE_CONTEXT); } -$endif - - + +$endif (_NTDDK_) $if (_WDMDDK_) /* * NTSTATUS @@ -571,9 +571,10 @@ WriteToDevice); } #endif -$endif - + +$endif (_WDMDDK_) #if (NTDDI_VERSION >= NTDDI_WIN2K) + $if (_NTDDK_) #if !(defined(USE_DMA_MACROS) && (defined(_NTDDK_) || defined(_NTDRIVER_)) || defined(_WDM_INCLUDED_)) NTKERNELAPI @@ -772,8 +773,8 @@ NTAPI IoSetThreadHardErrorMode( IN BOOLEAN EnableHardErrors); -$endif - + +$endif (_NTDDK_) $if (_WDMDDK_) NTKERNELAPI VOID @@ -1423,7 +1424,7 @@ IoSetTopLevelIrp( IN PIRP Irp OPTIONAL); -$endif +$endif (_WDMDDK_) #endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */ $if (_NTDDK_) @@ -1443,9 +1444,10 @@ IN BOOLEAN Remote); #endif /* (NTDDI_VERSION >= NTDDI_WIN2KSP3) */ -$endif - + +$endif (_NTDDK_) #if (NTDDI_VERSION >= NTDDI_WINXP) + $if (_NTDDK_) NTKERNELAPI NTSTATUS @@ -1559,8 +1561,8 @@ IN PDEVICE_OBJECT SourceDevice, IN PDEVICE_OBJECT TargetDevice, OUT PDEVICE_OBJECT *AttachedToDeviceObject); -$endif - + +$endif (_NTDDK_) $if (_WDMDDK_) NTKERNELAPI NTSTATUS @@ -1719,7 +1721,8 @@ IN ULONG Version, IN ULONG ValueBufferSize, IN PVOID ValueBuffer); -$endif +$endif (_WDMDDK_) + #endif /* (NTDDI_VERSION >= NTDDI_WINXP) */ $if (_WDMDDK_) @@ -1731,8 +1734,8 @@ IN PIRP Irp, IN ULONG RequiredAccess); #endif -$endif - + +$endif (_WDMDDK_) #if (NTDDI_VERSION >= NTDDI_WS03) $if (_NTDDK_) NTKERNELAPI @@ -1740,8 +1743,8 @@ FASTCALL IoGetPagingIoPriority( IN PIRP Irp); -$endif - + +$endif (_NTDDK_) $if (_WDMDDK_) NTKERNELAPI NTSTATUS @@ -1763,7 +1766,7 @@ IN PIRP Irp, IN PIO_CSQ_IRP_CONTEXT Context OPTIONAL, IN PVOID InsertContext OPTIONAL); -$endif +$endif (_WDMDDK_) #endif /* (NTDDI_VERSION >= NTDDI_WS03) */ $if (_NTDDK_) @@ -1777,8 +1780,8 @@ IN OUT PULONG AddressSpace, OUT PPHYSICAL_ADDRESS TranslatedAddress); #endif -$endif - + +$endif (_NTDDK_) #if (NTDDI_VERSION >= NTDDI_VISTA) $if (_NTDDK_) NTKERNELAPI @@ -1835,8 +1838,8 @@ NTAPI IoIsFileObjectIgnoringSharing( IN PFILE_OBJECT FileObject); -$endif - + +$endif (_NTDDK_) $if (_WDMDDK_) NTKERNELAPI NTSTATUS @@ -1970,8 +1973,8 @@ PVOID Data, PULONG RequiredSize, PDEVPROPTYPE Type); -$endif - + +$endif (_WDMDDK_) #endif /* (NTDDI_VERSION >= NTDDI_VISTA) */ $if (_WDMDDK_) @@ -1986,16 +1989,16 @@ IN PDEVICE_OBJECT SparePdo, IN ULONG Flags); #endif -$endif - + +$endif (_WDMDDK_) #if (NTDDI_VERSION >= NTDDI_WIN7) $if (_NTDDK_) NTSTATUS NTAPI IoSetFileObjectIgnoreSharing( IN PFILE_OBJECT FileObject); -$endif - + +$endif (_NTDDK_) $if (_WDMDDK_) NTKERNELAPI NTSTATUS @@ -2038,8 +2041,8 @@ IoGetDeviceNumaNode( IN PDEVICE_OBJECT Pdo, OUT PUSHORT NodeNumber); -$endif - + +$endif (_WDMDDK_) #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ $if (_WDMDDK_) @@ -2280,5 +2283,5 @@ DeviceObject ); } #endif -$endif - + +$endif (_WDMDDK_)

1 0

[tkreuzer] 46486: Formatting fix
by tkreuzer＠svn.reactos.org 27 Mar '10

27 Mar '10

Author: tkreuzer Date: Sat Mar 27 11:34:55 2010 New Revision: 46486 URL: http://svn.reactos.org/svn/reactos?rev=46486&view=rev Log: Formatting fix Modified: branches/header-work/include/xdk/iotypes.h Modified: branches/header-work/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/iotypes… ============================================================================== --- branches/header-work/include/xdk/iotypes.h [iso-8859-1] (original) +++ branches/header-work/include/xdk/iotypes.h [iso-8859-1] Sat Mar 27 11:34:55 2010 @@ -54,8 +54,8 @@ #define IO_RESOURCE_PREFERRED 0x01 #define IO_RESOURCE_DEFAULT 0x02 #define IO_RESOURCE_ALTERNATIVE 0x08 -$endif - + +$endif (_WDMDDK_) $if (_WDMDDK_ || _DEVIOCTL_) #define FILE_DEVICE_BEEP 0x00000001 #define FILE_DEVICE_CD_ROM 0x00000002 @@ -124,9 +124,9 @@ #define FILE_DEVICE_MT_TRANSPORT 0x00000043 #define FILE_DEVICE_BIOMETRIC 0x00000044 #define FILE_DEVICE_PMI 0x00000045 -$endif + +$endif (_WDMDDK_ || _DEVIOCTL_) $if (_WDMDDK_) - #if defined(NT_PROCESSOR_GROUPS) typedef USHORT IRQ_DEVICE_POLICY, *PIRQ_DEVICE_POLICY; @@ -213,11 +213,9 @@ PKDPC BufferChainingDpc; } WAIT_CONTEXT_BLOCK, *PWAIT_CONTEXT_BLOCK; -$endif -$if (_WDMDDK_ || _NTDDK_) +$endif (_WDMDDK_) +$if (_NTDDK_) /* DEVICE_OBJECT.Flags */ -$endif -$if (_NTDDK_) #define DO_DEVICE_HAS_NAME 0x00000040 #define DO_SYSTEM_BOOT_PARTITION 0x00000100 #define DO_LONG_TERM_REQUESTS 0x00000200 @@ -229,8 +227,10 @@ #define DO_SYSTEM_SYSTEM_PARTITION 0x00200000 #define DO_SYSTEM_CRITICAL_PARTITION 0x00400000 #define DO_DISALLOW_EXECUTE 0x00800000 + $endif $if (_WDMDDK_) +/* DEVICE_OBJECT.Flags */ #define DO_VERIFY_VOLUME 0x00000002 #define DO_BUFFERED_IO 0x00000004 #define DO_EXCLUSIVE 0x00000008 @@ -267,14 +267,14 @@ #define FILE_128_BYTE_ALIGNMENT 0x0000007f #define FILE_256_BYTE_ALIGNMENT 0x000000ff #define FILE_512_BYTE_ALIGNMENT 0x000001ff + $endif $if (_WDMDDK_ || _DEVIOCTL_) - /* DEVICE_OBJECT.DeviceType */ #define DEVICE_TYPE ULONG + $endif $if (_WDMDDK_) - typedef struct _DEVICE_OBJECT { CSHORT Type; USHORT Size; @@ -1779,8 +1779,8 @@ #define SL_WATCH_TREE 0x01 #define SL_ALLOW_RAW_MOUNT 0x01 -$endif - + +$endif (_WDMDDK_) $if (_WDMDDK_ || _DEVIOCTL_) #define CTL_CODE(DeviceType, Function, Method, Access) \ (((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method)) @@ -1788,8 +1788,8 @@ #define DEVICE_TYPE_FROM_CTL_CODE(ctl) (((ULONG) (ctl & 0xffff0000)) >> 16) #define METHOD_FROM_CTL_CODE(ctrlCode) ((ULONG)(ctrlCode & 3)) -$endif - + +$endif (_WDMDDK_ || _DEVIOCTL_) $if (_WDMDDK_) #define IRP_NOCACHE 0x00000001 #define IRP_PAGING_IO 0x00000002 @@ -2841,8 +2841,8 @@ #define SL_INVOKE_ON_CANCEL 0x20 #define SL_INVOKE_ON_SUCCESS 0x40 #define SL_INVOKE_ON_ERROR 0x80 -$endif - + +$endif (_WDMDDK_) $if (_WDMDDK_ || _DEVIOCTL_) #define METHOD_BUFFERED 0 #define METHOD_IN_DIRECT 1 @@ -2851,8 +2851,8 @@ #define METHOD_DIRECT_TO_HARDWARE METHOD_IN_DIRECT #define METHOD_DIRECT_FROM_HARDWARE METHOD_OUT_DIRECT -$endif - + +$endif (_WDMDDK_ || _DEVIOCTL_) $if (_WDMDDK_) #define FILE_SUPERSEDED 0x00000000 #define FILE_OPENED 0x00000001 @@ -2941,15 +2941,15 @@ #define FILE_OPEN_REPARSE_POINT 0x00200000 #define FILE_OPEN_NO_RECALL 0x00400000 #define FILE_OPEN_FOR_FREE_SPACE_QUERY 0x00800000 -$endif - + +$endif (_WDMDDK_) $if (_WDMDDK_ || _DEVIOCTL_) #define FILE_ANY_ACCESS 0x00000000 #define FILE_SPECIAL_ACCESS FILE_ANY_ACCESS #define FILE_READ_ACCESS 0x00000001 #define FILE_WRITE_ACCESS 0x00000002 -$endif - + +$endif (_WDMDDK_ || _DEVIOCTL_) $if (_WDMDDK_) #define FILE_ALL_ACCESS \ (STANDARD_RIGHTS_REQUIRED | \ @@ -3771,7 +3771,8 @@ #define PCI_MSIX_TABLE_CONFIG_MINIMUM_SIZE \ RTL_SIZEOF_THROUGH_FIELD(PCI_MSIX_TABLE_CONFIG_INTERFACE, UnmaskTableEntry) -$endif + +$endif (_WDMDDK_) $if (_NTDDK_) #ifndef _ARC_DDK_ #define _ARC_DDK_ @@ -4888,5 +4889,5 @@ SgiInternalConfiguration, MaximumBusDataType } BUS_DATA_TYPE, *PBUS_DATA_TYPE; -$endif - + +$endif (_NTDDK_)

1 0

[jimtabor] 46485: [Win32k] - Kill debug warnings of dc ownership.
by jimtabor＠svn.reactos.org 27 Mar '10

27 Mar '10

Author: jimtabor Date: Sat Mar 27 05:45:31 2010 New Revision: 46485 URL: http://svn.reactos.org/svn/reactos?rev=46485&view=rev Log: [Win32k] - Kill debug warnings of dc ownership. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Sat Mar 27 05:45:31 2010 @@ -642,6 +642,11 @@ DPRINT1("Attempted to change ownership of an DCEhDC 0x%x currently being destroyed!!!\n",pdce->hDC); Hit = TRUE; } + } + else + { + if (!GreGetObjectOwner(pdce->hDC, GDIObjType_DC_TYPE)) + DC_SetOwnership( pdce->hDC, PsGetCurrentProcess()); } if (!Hit) IntGdiDeleteDC(pdce->hDC, TRUE);

1 0

[tkreuzer] 46483: [CRT] - add _wctype table, it's not identical to _ctype as assumed before - point _pwctype to _wctype instead of _ctype - implement __pctype_func and __pwctype_func
by tkreuzer＠svn.reactos.org 27 Mar '10

27 Mar '10

Author: tkreuzer Date: Sat Mar 27 02:14:24 2010 New Revision: 46483 URL: http://svn.reactos.org/svn/reactos?rev=46483&view=rev Log: [CRT] - add _wctype table, it's not identical to _ctype as assumed before - point _pwctype to _wctype instead of _ctype - implement __pctype_func and __pwctype_func Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/ctype.c Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/ctype.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/ctype.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/string/ctype.c [iso-8859-1] Sat Mar 27 02:14:24 2010 @@ -289,8 +289,267 @@ 0 /* 0xff */ }; +const unsigned short _wctype[] = { + 0, /* <EOF>, 0xFFFF */ + _CONTROL, /* CTRL+@, 0x00 */ + _CONTROL, /* CTRL+A, 0x01 */ + _CONTROL, /* CTRL+B, 0x02 */ + _CONTROL, /* CTRL+C, 0x03 */ + _CONTROL, /* CTRL+D, 0x04 */ + _CONTROL, /* CTRL+E, 0x05 */ + _CONTROL, /* CTRL+F, 0x06 */ + _CONTROL, /* CTRL+G, 0x07 */ + _CONTROL, /* CTRL+H, 0x08 */ + _BLANK | _CONTROL | _SPACE, /* CTRL+I, 0x09 */ + _CONTROL | _SPACE, /* CTRL+J, 0x0a */ + _CONTROL | _SPACE, /* CTRL+K, 0x0b */ + _CONTROL | _SPACE, /* CTRL+L, 0x0c */ + _CONTROL | _SPACE, /* CTRL+M, 0x0d */ + _CONTROL, /* CTRL+N, 0x0e */ + _CONTROL, /* CTRL+O, 0x0f */ + _CONTROL, /* CTRL+P, 0x10 */ + _CONTROL, /* CTRL+Q, 0x11 */ + _CONTROL, /* CTRL+R, 0x12 */ + _CONTROL, /* CTRL+S, 0x13 */ + _CONTROL, /* CTRL+T, 0x14 */ + _CONTROL, /* CTRL+U, 0x15 */ + _CONTROL, /* CTRL+V, 0x16 */ + _CONTROL, /* CTRL+W, 0x17 */ + _CONTROL, /* CTRL+X, 0x18 */ + _CONTROL, /* CTRL+Y, 0x19 */ + _CONTROL, /* CTRL+Z, 0x1a */ + _CONTROL, /* CTRL+[, 0x1b */ + _CONTROL, /* CTRL+\, 0x1c */ + _CONTROL, /* CTRL+], 0x1d */ + _CONTROL, /* CTRL+^, 0x1e */ + _CONTROL, /* CTRL+_, 0x1f */ + _SPACE | _BLANK, /* ` ', 0x20 */ + _PUNCT, /* `!', 0x21 */ + _PUNCT, /* 0x22 */ + _PUNCT, /* `#', 0x23 */ + _PUNCT, /* `$', 0x24 */ + _PUNCT, /* `%', 0x25 */ + _PUNCT, /* `&', 0x26 */ + _PUNCT, /* 0x27 */ + _PUNCT, /* `(', 0x28 */ + _PUNCT, /* `)', 0x29 */ + _PUNCT, /* `*', 0x2a */ + _PUNCT, /* `+', 0x2b */ + _PUNCT, /* `,', 0x2c */ + _PUNCT, /* `-', 0x2d */ + _PUNCT, /* `.', 0x2e */ + _PUNCT, /* `/', 0x2f */ + _DIGIT | _HEX, /* `0', 0x30 */ + _DIGIT | _HEX, /* `1', 0x31 */ + _DIGIT | _HEX, /* `2', 0x32 */ + _DIGIT | _HEX, /* `3', 0x33 */ + _DIGIT | _HEX, /* `4', 0x34 */ + _DIGIT | _HEX, /* `5', 0x35 */ + _DIGIT | _HEX, /* `6', 0x36 */ + _DIGIT | _HEX, /* `7', 0x37 */ + _DIGIT | _HEX, /* `8', 0x38 */ + _DIGIT | _HEX, /* `9', 0x39 */ + _PUNCT, /* `:', 0x3a */ + _PUNCT, /* `;', 0x3b */ + _PUNCT, /* `<', 0x3c */ + _PUNCT, /* `=', 0x3d */ + _PUNCT, /* `>', 0x3e */ + _PUNCT, /* `?', 0x3f */ + _PUNCT, /* `@', 0x40 */ + 0x0100 | _UPPER | _HEX, /* `A', 0x41 */ + 0x0100 | _UPPER | _HEX, /* `B', 0x42 */ + 0x0100 | _UPPER | _HEX, /* `C', 0x43 */ + 0x0100 | _UPPER | _HEX, /* `D', 0x44 */ + 0x0100 | _UPPER | _HEX, /* `E', 0x45 */ + 0x0100 | _UPPER | _HEX, /* `F', 0x46 */ + 0x0100 | _UPPER, /* `G', 0x47 */ + 0x0100 | _UPPER, /* `H', 0x48 */ + 0x0100 | _UPPER, /* `I', 0x49 */ + 0x0100 | _UPPER, /* `J', 0x4a */ + 0x0100 | _UPPER, /* `K', 0x4b */ + 0x0100 | _UPPER, /* `L', 0x4c */ + 0x0100 | _UPPER, /* `M', 0x4d */ + 0x0100 | _UPPER, /* `N', 0x4e */ + 0x0100 | _UPPER, /* `O', 0x4f */ + 0x0100 | _UPPER, /* `P', 0x50 */ + 0x0100 | _UPPER, /* `Q', 0x51 */ + 0x0100 | _UPPER, /* `R', 0x52 */ + 0x0100 | _UPPER, /* `S', 0x53 */ + 0x0100 | _UPPER, /* `T', 0x54 */ + 0x0100 | _UPPER, /* `U', 0x55 */ + 0x0100 | _UPPER, /* `V', 0x56 */ + 0x0100 | _UPPER, /* `W', 0x57 */ + 0x0100 | _UPPER, /* `X', 0x58 */ + 0x0100 | _UPPER, /* `Y', 0x59 */ + 0x0100 | _UPPER, /* `Z', 0x5a */ + _PUNCT, /* `[', 0x5b */ + _PUNCT, /* 0x5c */ + _PUNCT, /* `]', 0x5d */ + _PUNCT, /* `^', 0x5e */ + _PUNCT, /* `_', 0x5f */ + _PUNCT, /* 0x60 */ + 0x0100 | _LOWER | _HEX, /* `a', 0x61 */ + 0x0100 | _LOWER | _HEX, /* `b', 0x62 */ + 0x0100 | _LOWER | _HEX, /* `c', 0x63 */ + 0x0100 | _LOWER | _HEX, /* `d', 0x64 */ + 0x0100 | _LOWER | _HEX, /* `e', 0x65 */ + 0x0100 | _LOWER | _HEX, /* `f', 0x66 */ + 0x0100 | _LOWER, /* `g', 0x67 */ + 0x0100 | _LOWER, /* `h', 0x68 */ + 0x0100 | _LOWER, /* `i', 0x69 */ + 0x0100 | _LOWER, /* `j', 0x6a */ + 0x0100 | _LOWER, /* `k', 0x6b */ + 0x0100 | _LOWER, /* `l', 0x6c */ + 0x0100 | _LOWER, /* `m', 0x6d */ + 0x0100 | _LOWER, /* `n', 0x6e */ + 0x0100 | _LOWER, /* `o', 0x6f */ + 0x0100 | _LOWER, /* `p', 0x70 */ + 0x0100 | _LOWER, /* `q', 0x71 */ + 0x0100 | _LOWER, /* `r', 0x72 */ + 0x0100 | _LOWER, /* `s', 0x73 */ + 0x0100 | _LOWER, /* `t', 0x74 */ + 0x0100 | _LOWER, /* `u', 0x75 */ + 0x0100 | _LOWER, /* `v', 0x76 */ + 0x0100 | _LOWER, /* `w', 0x77 */ + 0x0100 | _LOWER, /* `x', 0x78 */ + 0x0100 | _LOWER, /* `y', 0x79 */ + 0x0100 | _LOWER, /* `z', 0x7a */ + _PUNCT, /* `{', 0x7b */ + _PUNCT, /* `|', 0x7c */ + _PUNCT, /* `}', 0x7d */ + _PUNCT, /* `~', 0x7e */ + _CONTROL, /* 0x7f */ + _CONTROL, /* 0x80 */ + _CONTROL, /* 0x81 */ + _CONTROL, /* 0x82 */ + _CONTROL, /* 0x83 */ + _CONTROL, /* 0x84 */ + _CONTROL, /* 0x85 */ + _CONTROL, /* 0x86 */ + _CONTROL, /* 0x87 */ + _CONTROL, /* 0x88 */ + _CONTROL, /* 0x89 */ + _CONTROL, /* 0x8a */ + _CONTROL, /* 0x8b */ + _CONTROL, /* 0x8c */ + _CONTROL, /* 0x8d */ + _CONTROL, /* 0x8e */ + _CONTROL, /* 0x8f */ + _CONTROL, /* 0x90 */ + _CONTROL, /* 0x91 */ + _CONTROL, /* 0x92 */ + _CONTROL, /* 0x93 */ + _CONTROL, /* 0x94 */ + _CONTROL, /* 0x95 */ + _CONTROL, /* 0x96 */ + _CONTROL, /* 0x97 */ + _CONTROL, /* 0x98 */ + _CONTROL, /* 0x99 */ + _CONTROL, /* 0x9a */ + _CONTROL, /* 0x9b */ + _CONTROL, /* 0x9c */ + _CONTROL, /* 0x9d */ + _CONTROL, /* 0x9e */ + _CONTROL, /* 0x9f */ + _BLANK | _SPACE, /* 0xa0 */ + _PUNCT, /* 0xa1 */ + _PUNCT, /* 0xa2 */ + _PUNCT, /* 0xa3 */ + _PUNCT, /* 0xa4 */ + _PUNCT, /* 0xa5 */ + _PUNCT, /* 0xa6 */ + _PUNCT, /* 0xa7 */ + _PUNCT, /* 0xa8 */ + _PUNCT, /* 0xa9 */ + _PUNCT, /* 0xaa */ + _PUNCT, /* 0xab */ + _PUNCT, /* 0xac */ + _PUNCT, /* 0xad */ + _PUNCT, /* 0xae */ + _PUNCT, /* 0xaf */ + _PUNCT, /* 0xb0 */ + _PUNCT, /* 0xb1 */ + _PUNCT | _DIGIT, /* 0xb2 */ + _PUNCT | _DIGIT, /* 0xb3 */ + _PUNCT, /* 0xb4 */ + _PUNCT, /* 0xb5 */ + _PUNCT, /* 0xb6 */ + _PUNCT, /* 0xb7 */ + _PUNCT, /* 0xb8 */ + _PUNCT | _DIGIT, /* 0xb9 */ + _PUNCT, /* 0xba */ + _PUNCT, /* 0xbb */ + _PUNCT, /* 0xbc */ + _PUNCT, /* 0xbd */ + _PUNCT, /* 0xbe */ + _PUNCT, /* 0xbf */ + 0x0100 | _UPPER, /* 0xc0 */ + 0x0100 | _UPPER, /* 0xc1 */ + 0x0100 | _UPPER, /* 0xc2 */ + 0x0100 | _UPPER, /* 0xc3 */ + 0x0100 | _UPPER, /* 0xc4 */ + 0x0100 | _UPPER, /* 0xc5 */ + 0x0100 | _UPPER, /* 0xc6 */ + 0x0100 | _UPPER, /* 0xc7 */ + 0x0100 | _UPPER, /* 0xc8 */ + 0x0100 | _UPPER, /* 0xc9 */ + 0x0100 | _UPPER, /* 0xca */ + 0x0100 | _UPPER, /* 0xcb */ + 0x0100 | _UPPER, /* 0xcc */ + 0x0100 | _UPPER, /* 0xcd */ + 0x0100 | _UPPER, /* 0xce */ + 0x0100 | _UPPER, /* 0xcf */ + 0x0100 | _UPPER, /* 0xd0 */ + 0x0100 | _UPPER, /* 0xd1 */ + 0x0100 | _UPPER, /* 0xd2 */ + 0x0100 | _UPPER, /* 0xd3 */ + 0x0100 | _UPPER, /* 0xd4 */ + 0x0100 | _UPPER, /* 0xd5 */ + 0x0100 | _UPPER, /* 0xd6 */ + _PUNCT, /* 0xd7 */ + 0x0100 | _UPPER, /* 0xd8 */ + 0x0100 | _UPPER, /* 0xd9 */ + 0x0100 | _UPPER, /* 0xda */ + 0x0100 | _UPPER, /* 0xdb */ + 0x0100 | _UPPER, /* 0xdc */ + 0x0100 | _UPPER, /* 0xdd */ + 0x0100 | _UPPER, /* 0xde */ + 0x0100 | _LOWER, /* 0xdf */ + 0x0100 | _LOWER, /* 0xe0 */ + 0x0100 | _LOWER, /* 0xe1 */ + 0x0100 | _LOWER, /* 0xe2 */ + 0x0100 | _LOWER, /* 0xe3 */ + 0x0100 | _LOWER, /* 0xe4 */ + 0x0100 | _LOWER, /* 0xe5 */ + 0x0100 | _LOWER, /* 0xe6 */ + 0x0100 | _LOWER, /* 0xe7 */ + 0x0100 | _LOWER, /* 0xe8 */ + 0x0100 | _LOWER, /* 0xe9 */ + 0x0100 | _LOWER, /* 0xea */ + 0x0100 | _LOWER, /* 0xeb */ + 0x0100 | _LOWER, /* 0xec */ + 0x0100 | _LOWER, /* 0xed */ + 0x0100 | _LOWER, /* 0xee */ + 0x0100 | _LOWER, /* 0xef */ + 0x0100 | _LOWER, /* 0xf0 */ + 0x0100 | _LOWER, /* 0xf1 */ + 0x0100 | _LOWER, /* 0xf2 */ + 0x0100 | _LOWER, /* 0xf3 */ + 0x0100 | _LOWER, /* 0xf4 */ + 0x0100 | _LOWER, /* 0xf5 */ + 0x0100 | _LOWER, /* 0xf6 */ + _PUNCT, /* 0xf7 */ + 0x0100 | _LOWER, /* 0xf8 */ + 0x0100 | _LOWER, /* 0xf9 */ + 0x0100 | _LOWER, /* 0xfa */ + 0x0100 | _LOWER, /* 0xfb */ + 0x0100 | _LOWER, /* 0xfc */ + 0x0100 | _LOWER, /* 0xfd */ + 0x0100 | _LOWER, /* 0xfe */ + 0x0100 | _LOWER /* 0xff */ +}; const unsigned short *_pctype = _ctype + 1; -const unsigned short *_pwctype = _ctype + 1; +const unsigned short *_pwctype = _wctype + 1; /* * @implemented @@ -300,12 +559,22 @@ return &_pctype; } +const unsigned short* __cdecl __pctype_func(void) +{ + return _pctype; +} + /* * @implemented */ const unsigned short **__p__pwctype(void) { return &_pwctype; +} + +const unsigned short* __cdecl __pwctype_func(void) +{ + return _pwctype; } int _isctype (int c, int ctypeFlags)

1 0

[akhaldi] 46482: [DDK] - Move devioctl.h to PSDK, introduce pragma once, apply consistent formatting and add several missing definitions. [XDK] - Autogenerate devioctl.h based on devioctl.template.h
by akhaldi＠svn.reactos.org 27 Mar '10

27 Mar '10

Author: akhaldi Date: Sat Mar 27 02:12:23 2010 New Revision: 46482 URL: http://svn.reactos.org/svn/reactos?rev=46482&view=rev Log: [DDK] - Move devioctl.h to PSDK, introduce pragma once, apply consistent formatting and add several missing definitions. [XDK] - Autogenerate devioctl.h based on devioctl.template.h Added: branches/header-work/include/psdk/devioctl.h - copied, changed from r46476, branches/header-work/include/ddk/devioctl.h branches/header-work/include/xdk/devioctl.template.h (with props) Removed: branches/header-work/include/ddk/devioctl.h Modified: branches/header-work/include/xdk/generate.bat branches/header-work/include/xdk/iotypes.h Removed: branches/header-work/include/ddk/devioctl.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/devioct… ============================================================================== --- branches/header-work/include/ddk/devioctl.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/devioctl.h (removed) @@ -1,106 +1,0 @@ -/* - * devioctl.h - * - * IOCTL definitions - * - * This file is part of the ReactOS ddk. - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ - -#ifndef _DEVIOCTL_ -#define _DEVIOCTL_ - -/* DEVICE_OBJECT.DeviceType */ - -#define DEVICE_TYPE ULONG - -#define FILE_DEVICE_BEEP 0x00000001 -#define FILE_DEVICE_CD_ROM 0x00000002 -#define FILE_DEVICE_CD_ROM_FILE_SYSTEM 0x00000003 -#define FILE_DEVICE_CONTROLLER 0x00000004 -#define FILE_DEVICE_DATALINK 0x00000005 -#define FILE_DEVICE_DFS 0x00000006 -#define FILE_DEVICE_DISK 0x00000007 -#define FILE_DEVICE_DISK_FILE_SYSTEM 0x00000008 -#define FILE_DEVICE_FILE_SYSTEM 0x00000009 -#define FILE_DEVICE_INPORT_PORT 0x0000000a -#define FILE_DEVICE_KEYBOARD 0x0000000b -#define FILE_DEVICE_MAILSLOT 0x0000000c -#define FILE_DEVICE_MIDI_IN 0x0000000d -#define FILE_DEVICE_MIDI_OUT 0x0000000e -#define FILE_DEVICE_MOUSE 0x0000000f -#define FILE_DEVICE_MULTI_UNC_PROVIDER 0x00000010 -#define FILE_DEVICE_NAMED_PIPE 0x00000011 -#define FILE_DEVICE_NETWORK 0x00000012 -#define FILE_DEVICE_NETWORK_BROWSER 0x00000013 -#define FILE_DEVICE_NETWORK_FILE_SYSTEM 0x00000014 -#define FILE_DEVICE_NULL 0x00000015 -#define FILE_DEVICE_PARALLEL_PORT 0x00000016 -#define FILE_DEVICE_PHYSICAL_NETCARD 0x00000017 -#define FILE_DEVICE_PRINTER 0x00000018 -#define FILE_DEVICE_SCANNER 0x00000019 -#define FILE_DEVICE_SERIAL_MOUSE_PORT 0x0000001a -#define FILE_DEVICE_SERIAL_PORT 0x0000001b -#define FILE_DEVICE_SCREEN 0x0000001c -#define FILE_DEVICE_SOUND 0x0000001d -#define FILE_DEVICE_STREAMS 0x0000001e -#define FILE_DEVICE_TAPE 0x0000001f -#define FILE_DEVICE_TAPE_FILE_SYSTEM 0x00000020 -#define FILE_DEVICE_TRANSPORT 0x00000021 -#define FILE_DEVICE_UNKNOWN 0x00000022 -#define FILE_DEVICE_VIDEO 0x00000023 -#define FILE_DEVICE_VIRTUAL_DISK 0x00000024 -#define FILE_DEVICE_WAVE_IN 0x00000025 -#define FILE_DEVICE_WAVE_OUT 0x00000026 -#define FILE_DEVICE_8042_PORT 0x00000027 -#define FILE_DEVICE_NETWORK_REDIRECTOR 0x00000028 -#define FILE_DEVICE_BATTERY 0x00000029 -#define FILE_DEVICE_BUS_EXTENDER 0x0000002a -#define FILE_DEVICE_MODEM 0x0000002b -#define FILE_DEVICE_VDM 0x0000002c -#define FILE_DEVICE_MASS_STORAGE 0x0000002d -#define FILE_DEVICE_SMB 0x0000002e -#define FILE_DEVICE_KS 0x0000002f -#define FILE_DEVICE_CHANGER 0x00000030 -#define FILE_DEVICE_SMARTCARD 0x00000031 -#define FILE_DEVICE_ACPI 0x00000032 -#define FILE_DEVICE_DVD 0x00000033 -#define FILE_DEVICE_FULLSCREEN_VIDEO 0x00000034 -#define FILE_DEVICE_DFS_FILE_SYSTEM 0x00000035 -#define FILE_DEVICE_DFS_VOLUME 0x00000036 -#define FILE_DEVICE_SERENUM 0x00000037 -#define FILE_DEVICE_TERMSRV 0x00000038 -#define FILE_DEVICE_KSEC 0x00000039 -#define FILE_DEVICE_FIPS 0x0000003a - -#define CTL_CODE(DeviceType, Function, Method, Access)( \ - ((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method)) - -#define DEVICE_TYPE_FROM_CTL_CODE(ctl) (((ULONG) (ctl & 0xffff0000)) >> 16) - -#define METHOD_FROM_CTL_CODE(ctrlCode) ((ULONG)((ctrlCode) & 3)) - -#define METHOD_BUFFERED 0 -#define METHOD_IN_DIRECT 1 -#define METHOD_OUT_DIRECT 2 -#define METHOD_NEITHER 3 - -#define METHOD_DIRECT_TO_HARDWARE METHOD_IN_DIRECT -#define METHOD_DIRECT_FROM_HARDWARE METHOD_OUT_DIRECT - -#define FILE_ANY_ACCESS 0x00000000 -#define FILE_SPECIAL_ACCESS FILE_ANY_ACCESS -#define FILE_READ_ACCESS 0x00000001 -#define FILE_WRITE_ACCESS 0x00000002 - -#endif /* !_DEVIOCTL_ */ Copied: branches/header-work/include/psdk/devioctl.h (from r46476, branches/header-work/include/ddk/devioctl.h) URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/devioc… ============================================================================== --- branches/header-work/include/ddk/devioctl.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/devioctl.h [iso-8859-1] Sat Mar 27 02:12:23 2010 @@ -3,7 +3,11 @@ * * IOCTL definitions * - * This file is part of the ReactOS ddk. + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Amine Khaldi + * Timo Kreuzer (timo.kreuzer(a)reactos.org) * * THIS SOFTWARE IS NOT COPYRIGHTED * @@ -16,13 +20,12 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * */ +#pragma once #ifndef _DEVIOCTL_ #define _DEVIOCTL_ -/* DEVICE_OBJECT.DeviceType */ -#define DEVICE_TYPE ULONG #define FILE_DEVICE_BEEP 0x00000001 #define FILE_DEVICE_CD_ROM 0x00000002 @@ -81,26 +84,43 @@ #define FILE_DEVICE_SERENUM 0x00000037 #define FILE_DEVICE_TERMSRV 0x00000038 #define FILE_DEVICE_KSEC 0x00000039 -#define FILE_DEVICE_FIPS 0x0000003a +#define FILE_DEVICE_FIPS 0x0000003A +#define FILE_DEVICE_INFINIBAND 0x0000003B +#define FILE_DEVICE_VMBUS 0x0000003E +#define FILE_DEVICE_CRYPT_PROVIDER 0x0000003F +#define FILE_DEVICE_WPD 0x00000040 +#define FILE_DEVICE_BLUETOOTH 0x00000041 +#define FILE_DEVICE_MT_COMPOSITE 0x00000042 +#define FILE_DEVICE_MT_TRANSPORT 0x00000043 +#define FILE_DEVICE_BIOMETRIC 0x00000044 +#define FILE_DEVICE_PMI 0x00000045 -#define CTL_CODE(DeviceType, Function, Method, Access)( \ - ((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method)) +/* DEVICE_OBJECT.DeviceType */ +#define DEVICE_TYPE ULONG + + +#define CTL_CODE(DeviceType, Function, Method, Access) \ + (((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method)) #define DEVICE_TYPE_FROM_CTL_CODE(ctl) (((ULONG) (ctl & 0xffff0000)) >> 16) -#define METHOD_FROM_CTL_CODE(ctrlCode) ((ULONG)((ctrlCode) & 3)) +#define METHOD_FROM_CTL_CODE(ctrlCode) ((ULONG)(ctrlCode & 3)) + #define METHOD_BUFFERED 0 #define METHOD_IN_DIRECT 1 #define METHOD_OUT_DIRECT 2 #define METHOD_NEITHER 3 -#define METHOD_DIRECT_TO_HARDWARE METHOD_IN_DIRECT -#define METHOD_DIRECT_FROM_HARDWARE METHOD_OUT_DIRECT +#define METHOD_DIRECT_TO_HARDWARE METHOD_IN_DIRECT +#define METHOD_DIRECT_FROM_HARDWARE METHOD_OUT_DIRECT + #define FILE_ANY_ACCESS 0x00000000 #define FILE_SPECIAL_ACCESS FILE_ANY_ACCESS #define FILE_READ_ACCESS 0x00000001 #define FILE_WRITE_ACCESS 0x00000002 -#endif /* !_DEVIOCTL_ */ + + +#endif /*_DEVIOCTL_ */ Added: branches/header-work/include/xdk/devioctl.template.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/devioct… ============================================================================== --- branches/header-work/include/xdk/devioctl.template.h (added) +++ branches/header-work/include/xdk/devioctl.template.h [iso-8859-1] Sat Mar 27 02:12:23 2010 @@ -1,0 +1,31 @@ +/* + * devioctl.h + * + * IOCTL definitions + * + * This file is part of the ReactOS PSDK package. + * + * Contributors: + * Amine Khaldi + * Timo Kreuzer (timo.kreuzer(a)reactos.org) + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ +#pragma once + +#ifndef _DEVIOCTL_ +#define _DEVIOCTL_ + +$define (_DEVIOCTL_) +$include (iotypes.h) + +#endif /*_DEVIOCTL_ */ Propchange: branches/header-work/include/xdk/devioctl.template.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/header-work/include/xdk/generate.bat URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/generat… ============================================================================== --- branches/header-work/include/xdk/generate.bat [iso-8859-1] (original) +++ branches/header-work/include/xdk/generate.bat [iso-8859-1] Sat Mar 27 02:12:23 2010 @@ -2,3 +2,4 @@ ..\..\output-i386\tools\hpp\hpp.exe wdm.template.h wdm.h ..\..\output-i386\tools\hpp\hpp.exe ntddk.template.h ntddk.h +..\..\output-i386\tools\hpp\hpp.exe devioctl.template.h devioctl.h Modified: branches/header-work/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/iotypes… ============================================================================== --- branches/header-work/include/xdk/iotypes.h [iso-8859-1] (original) +++ branches/header-work/include/xdk/iotypes.h [iso-8859-1] Sat Mar 27 02:12:23 2010 @@ -1,6 +1,8 @@ +$if (_WDMDDK_ || _NTDDK_) /****************************************************************************** * I/O Manager Types * ******************************************************************************/ +$endif $if (_WDMDDK_) #define WDM_MAJORVERSION 0x06 @@ -52,7 +54,9 @@ #define IO_RESOURCE_PREFERRED 0x01 #define IO_RESOURCE_DEFAULT 0x02 #define IO_RESOURCE_ALTERNATIVE 0x08 - +$endif + +$if (_WDMDDK_ || _DEVIOCTL_) #define FILE_DEVICE_BEEP 0x00000001 #define FILE_DEVICE_CD_ROM 0x00000002 #define FILE_DEVICE_CD_ROM_FILE_SYSTEM 0x00000003 @@ -120,6 +124,8 @@ #define FILE_DEVICE_MT_TRANSPORT 0x00000043 #define FILE_DEVICE_BIOMETRIC 0x00000044 #define FILE_DEVICE_PMI 0x00000045 +$endif +$if (_WDMDDK_) #if defined(NT_PROCESSOR_GROUPS) @@ -208,7 +214,9 @@ } WAIT_CONTEXT_BLOCK, *PWAIT_CONTEXT_BLOCK; $endif +$if (_WDMDDK_ || _NTDDK_) /* DEVICE_OBJECT.Flags */ +$endif $if (_NTDDK_) #define DO_DEVICE_HAS_NAME 0x00000040 #define DO_SYSTEM_BOOT_PARTITION 0x00000100 @@ -259,9 +267,13 @@ #define FILE_128_BYTE_ALIGNMENT 0x0000007f #define FILE_256_BYTE_ALIGNMENT 0x000000ff #define FILE_512_BYTE_ALIGNMENT 0x000001ff +$endif +$if (_WDMDDK_ || _DEVIOCTL_) /* DEVICE_OBJECT.DeviceType */ #define DEVICE_TYPE ULONG +$endif +$if (_WDMDDK_) typedef struct _DEVICE_OBJECT { CSHORT Type; @@ -1767,14 +1779,18 @@ #define SL_WATCH_TREE 0x01 #define SL_ALLOW_RAW_MOUNT 0x01 - +$endif + +$if (_WDMDDK_ || _DEVIOCTL_) #define CTL_CODE(DeviceType, Function, Method, Access) \ (((DeviceType) << 16) | ((Access) << 14) | ((Function) << 2) | (Method)) #define DEVICE_TYPE_FROM_CTL_CODE(ctl) (((ULONG) (ctl & 0xffff0000)) >> 16) #define METHOD_FROM_CTL_CODE(ctrlCode) ((ULONG)(ctrlCode & 3)) - +$endif + +$if (_WDMDDK_) #define IRP_NOCACHE 0x00000001 #define IRP_PAGING_IO 0x00000002 #define IRP_MOUNT_COMPLETION 0x00000002 @@ -2825,7 +2841,9 @@ #define SL_INVOKE_ON_CANCEL 0x20 #define SL_INVOKE_ON_SUCCESS 0x40 #define SL_INVOKE_ON_ERROR 0x80 - +$endif + +$if (_WDMDDK_ || _DEVIOCTL_) #define METHOD_BUFFERED 0 #define METHOD_IN_DIRECT 1 #define METHOD_OUT_DIRECT 2 @@ -2833,7 +2851,9 @@ #define METHOD_DIRECT_TO_HARDWARE METHOD_IN_DIRECT #define METHOD_DIRECT_FROM_HARDWARE METHOD_OUT_DIRECT - +$endif + +$if (_WDMDDK_) #define FILE_SUPERSEDED 0x00000000 #define FILE_OPENED 0x00000001 #define FILE_CREATED 0x00000002 @@ -2921,12 +2941,16 @@ #define FILE_OPEN_REPARSE_POINT 0x00200000 #define FILE_OPEN_NO_RECALL 0x00400000 #define FILE_OPEN_FOR_FREE_SPACE_QUERY 0x00800000 - +$endif + +$if (_WDMDDK_ || _DEVIOCTL_) #define FILE_ANY_ACCESS 0x00000000 #define FILE_SPECIAL_ACCESS FILE_ANY_ACCESS #define FILE_READ_ACCESS 0x00000001 #define FILE_WRITE_ACCESS 0x00000002 - +$endif + +$if (_WDMDDK_) #define FILE_ALL_ACCESS \ (STANDARD_RIGHTS_REQUIRED | \ SYNCHRONIZE | \ @@ -3749,7 +3773,6 @@ RTL_SIZEOF_THROUGH_FIELD(PCI_MSIX_TABLE_CONFIG_INTERFACE, UnmaskTableEntry) $endif $if (_NTDDK_) - #ifndef _ARC_DDK_ #define _ARC_DDK_ typedef enum _CONFIGURATION_TYPE {

1 0

[akhaldi] 46481: [DDK] dciddi.h : - Introduce pragma once, apply consistent formatting, add missing definitions and improve several existing ones.
by akhaldi＠svn.reactos.org 27 Mar '10

27 Mar '10

Author: akhaldi Date: Sat Mar 27 01:32:37 2010 New Revision: 46481 URL: http://svn.reactos.org/svn/reactos?rev=46481&view=rev Log: [DDK] dciddi.h : - Introduce pragma once, apply consistent formatting, add missing definitions and improve several existing ones. Modified: branches/header-work/include/ddk/dciddi.h Modified: branches/header-work/include/ddk/dciddi.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/dciddi.… ============================================================================== --- branches/header-work/include/ddk/dciddi.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/dciddi.h [iso-8859-1] Sat Mar 27 01:32:37 2010 @@ -1,59 +1,193 @@ -/* - * DCI driver interface - * - * Copyright (C) 2001 Ove Kaaven - * - * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef __WINE_DCIDDI_H -#define __WINE_DCIDDI_H +#pragma once #ifdef __cplusplus extern "C" { #endif /* DCI Command Escape */ -#define DCICOMMAND 3075 -#define DCI_VERSION 0x0100 +#define DCICOMMAND 3075 +#define DCI_VERSION 0x0100 -#define DCICREATEPRIMARYSURFACE 1 -#define DCICREATEOFFSCREENSURFACE 2 -#define DCICREATEOVERLAYSURFACE 3 -#define DCIENUMSURFACE 4 -#define DCIESCAPE 5 +#define DCICREATEPRIMARYSURFACE 1 +#define DCICREATEOFFSCREENSURFACE 2 +#define DCICREATEOVERLAYSURFACE 3 +#define DCIENUMSURFACE 4 +#define DCIESCAPE 5 /* DCI Errors */ -#define DCI_OK 0 +#define DCI_OK 0 +#define DCI_FAIL_GENERIC -1 +#define DCI_FAIL_UNSUPPORTEDVERSION -2 +#define DCI_FAIL_INVALIDSURFACE -3 +#define DCI_FAIL_UNSUPPORTED -4 +#define DCI_ERR_CURRENTLYNOTAVAIL -5 +#define DCI_ERR_INVALIDRECT -6 +#define DCI_ERR_UNSUPPORTEDFORMAT -7 +#define DCI_ERR_UNSUPPORTEDMASK -8 +#define DCI_ERR_TOOBIGHEIGHT -9 +#define DCI_ERR_TOOBIGWIDTH -10 +#define DCI_ERR_TOOBIGSIZE -11 +#define DCI_ERR_OUTOFMEMORY -12 +#define DCI_ERR_INVALIDPOSITION -13 +#define DCI_ERR_INVALIDSTRETCH -14 +#define DCI_ERR_INVALIDCLIPLIST -15 +#define DCI_ERR_SURFACEISOBSCURED -16 +#define DCI_ERR_XALIGN -17 +#define DCI_ERR_YALIGN -18 +#define DCI_ERR_XYALIGN -19 +#define DCI_ERR_WIDTHALIGN -20 +#define DCI_ERR_HEIGHTALIGN -21 +#define DCI_STATUS_POINTERCHANGED 1 +#define DCI_STATUS_STRIDECHANGED 2 +#define DCI_STATUS_FORMATCHANGED 4 +#define DCI_STATUS_SURFACEINFOCHANGED 8 +#define DCI_STATUS_CHROMAKEYCHANGED 16 +#define DCI_STATUS_WASSTILLDRAWING 32 + +#define DCI_SUCCESS(error) (((DCIRVAL)error) >= 0) + +/* DCI Capability Flags */ +#define DCI_SURFACE_TYPE 0x0000000F +#define DCI_PRIMARY 0x00000000 +#define DCI_OFFSCREEN 0x00000001 +#define DCI_OVERLAY 0x00000002 +#define DCI_VISIBLE 0x00000010 +#define DCI_CHROMAKEY 0x00000020 +#define DCI_1632_ACCESS 0x00000040 +#define DCI_DWORDSIZE 0x00000080 +#define DCI_DWORDALIGN 0x00000100 +#define DCI_WRITEONLY 0x00000200 +#define DCI_ASYNC 0x00000400 +#define DCI_CAN_STRETCHX 0x00001000 +#define DCI_CAN_STRETCHY 0x00002000 +#define DCI_CAN_STRETCHXY (DCI_CAN_STRETCHX | DCI_CAN_STRETCHY) +#define DCI_CAN_STRETCHXN 0x00004000 +#define DCI_CAN_STRETCHYN 0x00008000 +#define DCI_CAN_STRETCHXYN (DCI_CAN_STRETCHXN | DCI_CAN_STRETCHYN) +#define DCI_CANOVERLAY 0x00010000 + +/* DCI FOURCC definitions for extended DIB formats */ +#ifndef YVU9 +#define YVU9 mmioFOURCC('Y','V','U','9') +#endif +#ifndef Y411 +#define Y411 mmioFOURCC('Y','4','1','1') +#endif +#ifndef YUY2 +#define YUY2 mmioFOURCC('Y','U','Y','2') +#endif +#ifndef YVYU +#define YVYU mmioFOURCC('Y','V','Y','U') +#endif +#ifndef UYVY +#define UYVY mmioFOURCC('U','Y','V','Y') +#endif +#ifndef Y211 +#define Y211 mmioFOURCC('Y','2','1','1') +#endif + +#if (WINVER < 0x0400) + +#ifndef RDH_RECTANGLES + +typedef struct tagRECTL { + LONG left; + LONG top; + LONG right; + LONG bottom; +} RECTL, *PRECTL, NEAR* NPRECTL, FAR* LPRECTL, CONST FAR* LPCRECTL; + +#define RDH_RECTANGLES 0 + +typedef struct tagRGNDATAHEADER { + DWORD dwSize; + DWORD iType; + DWORD nCount; + DWORD nRgnSize; + RECTL rcBound; +} RGNDATAHEADER, *PRGNDATAHEADER, NEAR* NPRGNDATAHEADER, FAR* LPRGNDATAHEADER, CONST FAR* LPCRGNDATAHEADER; + +typedef struct tagRGNDATA { + RGNDATAHEADER rdh; + char Buffer[1]; +} RGNDATA, *PRGNDATA, NEAR* NPRGNDATA, FAR* LPRGNDATA, CONST FAR* LPCRGNDATA; + +#endif /* RDH_RECTANGLES */ + +#endif /* (WINVER < 0x0400) */ typedef int DCIRVAL; /* DCI callback return type */ -/***************************************************************************** - * Escape command structures - */ +/* Escape command structures */ + typedef struct _DCICMD { - DWORD dwCommand; - DWORD dwParam1; - DWORD dwParam2; - DWORD dwVersion; - DWORD dwReserved; + DWORD dwCommand; + DWORD dwParam1; + DWORD dwParam2; + DWORD dwVersion; + DWORD dwReserved; } DCICMD,*LPDCICMD; + +typedef struct _DCICREATEINPUT { + DCICMD cmd; + DWORD dwCompression; + DWORD dwMask[3]; + DWORD dwWidth; + DWORD dwHeight; + DWORD dwDCICaps; + DWORD dwBitCount; + LPVOID lpSurface; +} DCICREATEINPUT, FAR *LPDCICREATEINPUT; + +typedef struct _DCISURFACEINFO { + DWORD dwSize; + DWORD dwDCICaps; + DWORD dwCompression; + DWORD dwMask[3]; + DWORD dwWidth; + DWORD dwHeight; + LONG lStride; + DWORD dwBitCount; + ULONG_PTR dwOffSurface; + WORD wSelSurface; + WORD wReserved; + DWORD dwReserved1; + DWORD dwReserved2; + DWORD dwReserved3; + DCIRVAL (CALLBACK *BeginAccess) (LPVOID, LPRECT); + void (CALLBACK *EndAccess) (LPVOID); + void (CALLBACK *DestroySurface) (LPVOID); +} DCISURFACEINFO, FAR *LPDCISURFACEINFO; + +typedef void +(*ENUM_CALLBACK)( + LPDCISURFACEINFO lpSurfaceInfo, + LPVOID lpContext); + +typedef struct _DCIENUMINPUT { + DCICMD cmd; + RECT rSrc; + RECT rDst; + void (CALLBACK *EnumCallback)(LPDCISURFACEINFO, LPVOID); + LPVOID lpContext; +} DCIENUMINPUT, FAR *LPDCIENUMINPUT; + +typedef DCISURFACEINFO DCIPRIMARY, FAR *LPDCIPRIMARY; + +typedef struct _DCIOFFSCREEN { + DCISURFACEINFO dciInfo; + DCIRVAL (CALLBACK *Draw) (LPVOID); + DCIRVAL (CALLBACK *SetClipList) (LPVOID, LPRGNDATA); + DCIRVAL (CALLBACK *SetDestination) (LPVOID, LPRECT, LPRECT); +} DCIOFFSCREEN, FAR *LPDCIOFFSCREEN; + +typedef struct _DCIOVERLAY{ + DCISURFACEINFO dciInfo; + DWORD dwChromakeyValue; + DWORD dwChromakeyMask; +} DCIOVERLAY, FAR *LPDCIOVERLAY; #ifdef __cplusplus } /* extern "C" */ #endif - -#endif /* __WINE_DCIDDI_H */

1 0

[akhaldi] 46480: [DDK] - Move compstui.h to PSDK, introduce pragma once, apply consistent formatting, add missing definitions and improve several existing ones.
by akhaldi＠svn.reactos.org 27 Mar '10

27 Mar '10

Author: akhaldi Date: Sat Mar 27 01:08:19 2010 New Revision: 46480 URL: http://svn.reactos.org/svn/reactos?rev=46480&view=rev Log: [DDK] - Move compstui.h to PSDK, introduce pragma once, apply consistent formatting, add missing definitions and improve several existing ones. Added: branches/header-work/include/psdk/compstui.h - copied, changed from r46476, branches/header-work/include/ddk/compstui.h Removed: branches/header-work/include/ddk/compstui.h Removed: branches/header-work/include/ddk/compstui.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/compstu… ============================================================================== --- branches/header-work/include/ddk/compstui.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/compstui.h (removed) @@ -1,71 +1,0 @@ -/* - * Definitions for Common Property Sheet User Interface - * - * Copyright 2006 Detlef Riekenberg - * - * 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 - * - */ - -#ifndef _COMPSTUI_ -#define _COMPSTUI_ - -#ifdef __cplusplus -extern "C" { -#endif - -/* DEFINES */ - -#define PROPSHEETUI_INFO_VERSION 0x0100 - -#define PSUIINFO_UNICODE 1 - -/* return-values for CommonPropertySheetUI on success */ -#define CPSUI_CANCEL 0 -#define CPSUI_OK 1 -#define CPSUI_RESTARTWINDOWS 2 -#define CPSUI_REBOOTSYSTEM 3 - - -/* TYPES */ -typedef DWORD (CALLBACK *PFNCOMPROPSHEET)(HANDLE, UINT, LPARAM, LPARAM); - -typedef struct _PROPSHEETUI_INFO { - WORD cbSize; - WORD Version; - WORD Flags; /* set PSUIINFO_UNICODE for UNICODE */ - WORD Reason; - HANDLE hComPropSheet; - PFNCOMPROPSHEET pfnComPropSheet; - LPARAM lParamInit; - DWORD UserData; - DWORD Result; - } PROPSHEETUI_INFO, *PPROPSHEETUI_INFO; - -typedef LONG (CALLBACK *PFNPROPSHEETUI)(PROPSHEETUI_INFO, LPARAM); - -/* FUNCTIONS */ -LONG WINAPI CommonPropertySheetUIA(HWND, PFNPROPSHEETUI, LPARAM, LPDWORD); -LONG WINAPI CommonPropertySheetUIW(HWND, PFNPROPSHEETUI, LPARAM, LPDWORD); -#define CommonPropertySheetUI WINELIB_NAME_AW(CommonPropertySheetUI) - -ULONG_PTR WINAPI GetPSTUIUserData(HWND); -BOOL WINAPI SetPSTUIUserData(HWND, ULONG_PTR); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* _COMPSTUI_ */ Copied: branches/header-work/include/psdk/compstui.h (from r46476, branches/header-work/include/ddk/compstui.h) URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/compst… ============================================================================== --- branches/header-work/include/ddk/compstui.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/compstui.h [iso-8859-1] Sat Mar 27 01:08:19 2010 @@ -1,71 +1,945 @@ -/* - * Definitions for Common Property Sheet User Interface - * - * Copyright 2006 Detlef Riekenberg - * - * 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 - * - */ - -#ifndef _COMPSTUI_ -#define _COMPSTUI_ +#pragma once #ifdef __cplusplus extern "C" { #endif +#define IDI_CPSUI_ICONID_FIRST 64000 + +#define IDI_CPSUI_EMPTY 64000 +#define IDI_CPSUI_SEL_NONE 64001 +#define IDI_CPSUI_WARNING 64002 +#define IDI_CPSUI_NO 64003 +#define IDI_CPSUI_YES 64004 +#define IDI_CPSUI_FALSE 64005 +#define IDI_CPSUI_TRUE 64006 +#define IDI_CPSUI_OFF 64007 +#define IDI_CPSUI_ON 64008 +#define IDI_CPSUI_PAPER_OUTPUT 64009 +#define IDI_CPSUI_ENVELOPE 64010 +#define IDI_CPSUI_MEM 64011 +#define IDI_CPSUI_FONTCARTHDR 64012 +#define IDI_CPSUI_FONTCART 64013 +#define IDI_CPSUI_STAPLER_ON 64014 +#define IDI_CPSUI_STAPLER_OFF 64015 +#define IDI_CPSUI_HT_HOST 64016 +#define IDI_CPSUI_HT_DEVICE 64017 +#define IDI_CPSUI_TT_PRINTASGRAPHIC 64018 +#define IDI_CPSUI_TT_DOWNLOADSOFT 64019 +#define IDI_CPSUI_TT_DOWNLOADVECT 64020 +#define IDI_CPSUI_TT_SUBDEV 64021 +#define IDI_CPSUI_PORTRAIT 64022 +#define IDI_CPSUI_LANDSCAPE 64023 +#define IDI_CPSUI_ROT_LAND 64024 +#define IDI_CPSUI_AUTOSEL 64025 +#define IDI_CPSUI_PAPER_TRAY 64026 +#define IDI_CPSUI_PAPER_TRAY2 64027 +#define IDI_CPSUI_PAPER_TRAY3 64028 +#define IDI_CPSUI_TRANSPARENT 64029 +#define IDI_CPSUI_COLLATE 64030 +#define IDI_CPSUI_DUPLEX_NONE 64031 +#define IDI_CPSUI_DUPLEX_HORZ 64032 +#define IDI_CPSUI_DUPLEX_VERT 64033 +#define IDI_CPSUI_RES_DRAFT 64034 +#define IDI_CPSUI_RES_LOW 64035 +#define IDI_CPSUI_RES_MEDIUM 64036 +#define IDI_CPSUI_RES_HIGH 64037 +#define IDI_CPSUI_RES_PRESENTATION 64038 +#define IDI_CPSUI_MONO 64039 +#define IDI_CPSUI_COLOR 64040 +#define IDI_CPSUI_DITHER_NONE 64041 +#define IDI_CPSUI_DITHER_COARSE 64042 +#define IDI_CPSUI_DITHER_FINE 64043 +#define IDI_CPSUI_DITHER_LINEART 64044 +#define IDI_CPSUI_SCALING 64045 +#define IDI_CPSUI_COPY 64046 +#define IDI_CPSUI_HTCLRADJ 64047 +#define IDI_CPSUI_HALFTONE_SETUP 64048 +#define IDI_CPSUI_WATERMARK 64049 +#define IDI_CPSUI_ERROR 64050 +#define IDI_CPSUI_ICM_OPTION 64051 +#define IDI_CPSUI_ICM_METHOD 64052 +#define IDI_CPSUI_ICM_INTENT 64053 +#define IDI_CPSUI_STD_FORM 64054 +#define IDI_CPSUI_OUTBIN 64055 +#define IDI_CPSUI_OUTPUT 64056 +#define IDI_CPSUI_GRAPHIC 64057 +#define IDI_CPSUI_ADVANCE 64058 +#define IDI_CPSUI_DOCUMENT 64059 +#define IDI_CPSUI_DEVICE 64060 +#define IDI_CPSUI_DEVICE2 64061 +#define IDI_CPSUI_PRINTER 64062 +#define IDI_CPSUI_PRINTER2 64063 +#define IDI_CPSUI_PRINTER3 64064 +#define IDI_CPSUI_PRINTER4 64065 +#define IDI_CPSUI_OPTION 64066 +#define IDI_CPSUI_OPTION2 64067 +#define IDI_CPSUI_STOP 64068 +#define IDI_CPSUI_NOTINSTALLED 64069 +#define IDI_CPSUI_WARNING_OVERLAY 64070 +#define IDI_CPSUI_STOP_WARNING_OVERLAY 64071 +#define IDI_CPSUI_GENERIC_OPTION 64072 +#define IDI_CPSUI_GENERIC_ITEM 64073 +#define IDI_CPSUI_RUN_DIALOG 64074 +#define IDI_CPSUI_QUESTION 64075 +#define IDI_CPSUI_FORMTRAYASSIGN 64076 +#define IDI_CPSUI_PRINTER_FOLDER 64077 +#define IDI_CPSUI_INSTALLABLE_OPTION 64078 +#define IDI_CPSUI_PRINTER_FEATURE 64079 +#define IDI_CPSUI_DEVICE_FEATURE 64080 +#define IDI_CPSUI_FONTSUB 64081 +#define IDI_CPSUI_POSTSCRIPT 64082 +#define IDI_CPSUI_TELEPHONE 64083 +#define IDI_CPSUI_DUPLEX_NONE_L 64084 +#define IDI_CPSUI_DUPLEX_HORZ_L 64085 +#define IDI_CPSUI_DUPLEX_VERT_L 64086 +#define IDI_CPSUI_LF_PEN_PLOTTER 64087 +#define IDI_CPSUI_SF_PEN_PLOTTER 64088 +#define IDI_CPSUI_LF_RASTER_PLOTTER 64089 +#define IDI_CPSUI_SF_RASTER_PLOTTER 64090 +#define IDI_CPSUI_ROLL_PAPER 64091 +#define IDI_CPSUI_PEN_CARROUSEL 64092 +#define IDI_CPSUI_PLOTTER_PEN 64093 +#define IDI_CPSUI_MANUAL_FEED 64094 +#define IDI_CPSUI_FAX 64095 +#define IDI_CPSUI_PAGE_PROTECT 64096 +#define IDI_CPSUI_ENVELOPE_FEED 64097 +#define IDI_CPSUI_FONTCART_SLOT 64098 +#define IDI_CPSUI_LAYOUT_BMP_PORTRAIT 64099 +#define IDI_CPSUI_LAYOUT_BMP_ARROWL 64100 +#define IDI_CPSUI_LAYOUT_BMP_ARROWS 64101 +#define IDI_CPSUI_LAYOUT_BMP_BOOKLETL 64102 +#define IDI_CPSUI_LAYOUT_BMP_BOOKLETP 64103 +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define IDI_CPSUI_LAYOUT_BMP_ARROWLR 64104 +#define IDI_CPSUI_LAYOUT_BMP_ROT_PORT 64105 +#define IDI_CPSUI_LAYOUT_BMP_BOOKLETL_NB 64106 +#define IDI_CPSUI_LAYOUT_BMP_BOOKLETP_NB 64107 +#define IDI_CPSUI_ROT_PORT 64110 +#define IDI_CPSUI_NUP_BORDER 64111 +#define IDI_CPSUI_ICONID_LAST 64111 +#else +#define IDI_CPSUI_ICONID_LAST 64103 +#endif + +#define IDS_CPSUI_STRID_FIRST 64700 + +#define IDS_CPSUI_SETUP 64700 +#define IDS_CPSUI_MORE 64701 +#define IDS_CPSUI_CHANGE 64702 +#define IDS_CPSUI_OPTION 64703 +#define IDS_CPSUI_OF 64704 +#define IDS_CPSUI_RANGE_FROM 64705 +#define IDS_CPSUI_TO 64706 +#define IDS_CPSUI_COLON_SEP 64707 +#define IDS_CPSUI_LEFT_ANGLE 64708 +#define IDS_CPSUI_RIGHT_ANGLE 64709 +#define IDS_CPSUI_SLASH_SEP 64710 +#define IDS_CPSUI_PERCENT 64711 +#define IDS_CPSUI_LBCB_NOSEL 64712 +#define IDS_CPSUI_PROPERTIES 64713 +#define IDS_CPSUI_DEFAULTDOCUMENT 64714 +#define IDS_CPSUI_DOCUMENT 64715 +#define IDS_CPSUI_ADVANCEDOCUMENT 64716 +#define IDS_CPSUI_PRINTER 64717 +#define IDS_CPSUI_AUTOSELECT 64718 +#define IDS_CPSUI_PAPER_OUTPUT 64719 +#define IDS_CPSUI_GRAPHIC 64720 +#define IDS_CPSUI_OPTIONS 64721 +#define IDS_CPSUI_ADVANCED 64722 +#define IDS_CPSUI_STDDOCPROPTAB 64723 +#define IDS_CPSUI_STDDOCPROPTVTAB 64724 +#define IDS_CPSUI_DEVICEOPTIONS 64725 +#define IDS_CPSUI_FALSE 64726 +#define IDS_CPSUI_TRUE 64727 +#define IDS_CPSUI_NO 64728 +#define IDS_CPSUI_YES 64729 +#define IDS_CPSUI_OFF 64730 +#define IDS_CPSUI_ON 64731 +#define IDS_CPSUI_DEFAULT 64732 +#define IDS_CPSUI_ERROR 64733 +#define IDS_CPSUI_NONE 64734 +#define IDS_CPSUI_NOT 64735 +#define IDS_CPSUI_EXIST 64736 +#define IDS_CPSUI_NOTINSTALLED 64737 +#define IDS_CPSUI_ORIENTATION 64738 +#define IDS_CPSUI_SCALING 64739 +#define IDS_CPSUI_NUM_OF_COPIES 64740 +#define IDS_CPSUI_SOURCE 64741 +#define IDS_CPSUI_PRINTQUALITY 64742 +#define IDS_CPSUI_RESOLUTION 64743 +#define IDS_CPSUI_COLOR_APPERANCE 64744 +#define IDS_CPSUI_DUPLEX 64745 +#define IDS_CPSUI_TTOPTION 64746 +#define IDS_CPSUI_FORMNAME 64747 +#define IDS_CPSUI_ICM 64748 +#define IDS_CPSUI_ICMMETHOD 64749 +#define IDS_CPSUI_ICMINTENT 64750 +#define IDS_CPSUI_MEDIA 64751 +#define IDS_CPSUI_DITHERING 64752 +#define IDS_CPSUI_PORTRAIT 64753 +#define IDS_CPSUI_LANDSCAPE 64754 +#define IDS_CPSUI_ROT_LAND 64755 +#define IDS_CPSUI_COLLATE 64756 +#define IDS_CPSUI_COLLATED 64757 +#define IDS_CPSUI_PRINTFLDSETTING 64758 +#define IDS_CPSUI_DRAFT 64759 +#define IDS_CPSUI_LOW 64760 +#define IDS_CPSUI_MEDIUM 64761 +#define IDS_CPSUI_HIGH 64762 +#define IDS_CPSUI_PRESENTATION 64763 +#define IDS_CPSUI_COLOR 64764 +#define IDS_CPSUI_GRAYSCALE 64765 +#define IDS_CPSUI_MONOCHROME 64766 +#define IDS_CPSUI_SIMPLEX 64767 +#define IDS_CPSUI_HORIZONTAL 64768 +#define IDS_CPSUI_VERTICAL 64769 +#define IDS_CPSUI_LONG_SIDE 64770 +#define IDS_CPSUI_SHORT_SIDE 64771 +#define IDS_CPSUI_TT_PRINTASGRAPHIC 64772 +#define IDS_CPSUI_TT_DOWNLOADSOFT 64773 +#define IDS_CPSUI_TT_DOWNLOADVECT 64774 +#define IDS_CPSUI_TT_SUBDEV 64775 +#define IDS_CPSUI_ICM_BLACKWHITE 64776 +#define IDS_CPSUI_ICM_NO 64777 +#define IDS_CPSUI_ICM_YES 64778 +#define IDS_CPSUI_ICM_SATURATION 64779 +#define IDS_CPSUI_ICM_CONTRAST 64780 +#define IDS_CPSUI_ICM_COLORMETRIC 64781 +#define IDS_CPSUI_STANDARD 64782 +#define IDS_CPSUI_GLOSSY 64783 +#define IDS_CPSUI_TRANSPARENCY 64784 +#define IDS_CPSUI_REGULAR 64785 +#define IDS_CPSUI_BOND 64786 +#define IDS_CPSUI_COARSE 64787 +#define IDS_CPSUI_FINE 64788 +#define IDS_CPSUI_LINEART 64789 +#define IDS_CPSUI_ERRDIFFUSE 64790 +#define IDS_CPSUI_HALFTONE 64791 +#define IDS_CPSUI_HTCLRADJ 64792 +#define IDS_CPSUI_USE_HOST_HT 64793 +#define IDS_CPSUI_USE_DEVICE_HT 64794 +#define IDS_CPSUI_USE_PRINTER_HT 64795 +#define IDS_CPSUI_OUTBINASSIGN 64796 +#define IDS_CPSUI_WATERMARK 64797 +#define IDS_CPSUI_FORMTRAYASSIGN 64798 +#define IDS_CPSUI_UPPER_TRAY 64799 +#define IDS_CPSUI_ONLYONE 64800 +#define IDS_CPSUI_LOWER_TRAY 64801 +#define IDS_CPSUI_MIDDLE_TRAY 64802 +#define IDS_CPSUI_MANUAL_TRAY 64803 +#define IDS_CPSUI_ENVELOPE_TRAY 64804 +#define IDS_CPSUI_ENVMANUAL_TRAY 64805 +#define IDS_CPSUI_TRACTOR_TRAY 64806 +#define IDS_CPSUI_SMALLFMT_TRAY 64807 +#define IDS_CPSUI_LARGEFMT_TRAY 64808 +#define IDS_CPSUI_LARGECAP_TRAY 64809 +#define IDS_CPSUI_CASSETTE_TRAY 64810 +#define IDS_CPSUI_DEFAULT_TRAY 64811 +#define IDS_CPSUI_FORMSOURCE 64812 +#define IDS_CPSUI_MANUALFEED 64813 +#define IDS_CPSUI_PRINTERMEM_KB 64814 +#define IDS_CPSUI_PRINTERMEM_MB 64815 +#define IDS_CPSUI_PAGEPROTECT 64816 +#define IDS_CPSUI_HALFTONE_SETUP 64817 +#define IDS_CPSUI_INSTFONTCART 64818 +#define IDS_CPSUI_SLOT1 64819 +#define IDS_CPSUI_SLOT2 64820 +#define IDS_CPSUI_SLOT3 64821 +#define IDS_CPSUI_SLOT4 64822 +#define IDS_CPSUI_LEFT_SLOT 64823 +#define IDS_CPSUI_RIGHT_SLOT 64824 +#define IDS_CPSUI_STAPLER 64825 +#define IDS_CPSUI_STAPLER_ON 64826 +#define IDS_CPSUI_STAPLER_OFF 64827 +#define IDS_CPSUI_STACKER 64828 +#define IDS_CPSUI_MAILBOX 64829 +#define IDS_CPSUI_COPY 64830 +#define IDS_CPSUI_COPIES 64831 +#define IDS_CPSUI_TOTAL 64832 +#define IDS_CPSUI_MAKE 64833 +#define IDS_CPSUI_PRINT 64834 +#define IDS_CPSUI_FAX 64835 +#define IDS_CPSUI_PLOT 64836 +#define IDS_CPSUI_SLOW 64837 +#define IDS_CPSUI_FAST 64838 +#define IDS_CPSUI_ROTATED 64839 +#define IDS_CPSUI_RESET 64840 +#define IDS_CPSUI_ALL 64841 +#define IDS_CPSUI_DEVICE 64842 +#define IDS_CPSUI_SETTINGS 64843 +#define IDS_CPSUI_REVERT 64844 +#define IDS_CPSUI_CHANGES 64845 +#define IDS_CPSUI_CHANGED 64846 +#define IDS_CPSUI_WARNING 64847 +#define IDS_CPSUI_ABOUT 64848 +#define IDS_CPSUI_VERSION 64849 +#define IDS_CPSUI_NO_NAME 64850 +#define IDS_CPSUI_SETTING 64851 +#define IDS_CPSUI_DEVICE_SETTINGS 64852 +#define IDS_CPSUI_STDDOCPROPTAB1 64853 +#define IDS_CPSUI_STDDOCPROPTAB2 64854 +#define IDS_CPSUI_PAGEORDER 64855 +#define IDS_CPSUI_FRONTTOBACK 64856 +#define IDS_CPSUI_BACKTOFRONT 64857 +#define IDS_CPSUI_QUALITY_SETTINGS 64858 +#define IDS_CPSUI_QUALITY_DRAFT 64859 +#define IDS_CPSUI_QUALITY_BETTER 64860 +#define IDS_CPSUI_QUALITY_BEST 64861 +#define IDS_CPSUI_QUALITY_CUSTOM 64862 +#define IDS_CPSUI_OUTPUTBIN 64863 +#define IDS_CPSUI_NUP 64864 +#define IDS_CPSUI_NUP_NORMAL 64865 +#define IDS_CPSUI_NUP_TWOUP 64866 +#define IDS_CPSUI_NUP_FOURUP 64867 +#define IDS_CPSUI_NUP_SIXUP 64868 +#define IDS_CPSUI_NUP_NINEUP 64869 +#define IDS_CPSUI_NUP_SIXTEENUP 64870 +#define IDS_CPSUI_SIDE1 64871 +#define IDS_CPSUI_SIDE2 64872 +#define IDS_CPSUI_BOOKLET 64873 +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define IDS_CPSUI_POSTER 64874 +#define IDS_CPSUI_POSTER_2x2 64875 +#define IDS_CPSUI_POSTER_3x3 64876 +#define IDS_CPSUI_POSTER_4x4 64877 +#define IDS_CPSUI_NUP_DIRECTION 64878 +#define IDS_CPSUI_RIGHT_THEN_DOWN 64879 +#define IDS_CPSUI_DOWN_THEN_RIGHT 64880 +#define IDS_CPSUI_LEFT_THEN_DOWN 64881 +#define IDS_CPSUI_DOWN_THEN_LEFT 64882 +#define IDS_CPSUI_MANUAL_DUPLEX 64883 +#define IDS_CPSUI_MANUAL_DUPLEX_ON 64884 +#define IDS_CPSUI_MANUAL_DUPLEX_OFF 64885 +#define IDS_CPSUI_ROT_PORT 64886 +#define IDS_CPSUI_STAPLE 64887 +#define IDS_CPSUI_BOOKLET_EDGE 64888 +#define IDS_CPSUI_BOOKLET_EDGE_LEFT 64889 +#define IDS_CPSUI_BOOKLET_EDGE_RIGHT 64890 +#define IDS_CPSUI_NUP_BORDER 64891 +#define IDS_CPSUI_NUP_BORDERED 64892 +#define IDS_CPSUI_STRID_LAST 64892 +#else +#define IDS_CPSUI_STRID_LAST 64873 +#endif + +#if (!defined(RC_INVOKED)) + /* DEFINES */ -#define PROPSHEETUI_INFO_VERSION 0x0100 - -#define PSUIINFO_UNICODE 1 +#define TVOT_2STATES 0 +#define TVOT_3STATES 1 +#define TVOT_UDARROW 2 +#define TVOT_TRACKBAR 3 +#define TVOT_SCROLLBAR 4 +#define TVOT_LISTBOX 5 +#define TVOT_COMBOBOX 6 +#define TVOT_EDITBOX 7 +#define TVOT_PUSHBUTTON 8 +#define TVOT_CHKBOX 9 +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define TVOT_NSTATES_EX 10 +#define TVOT_LAST TVOT_NSTATES_EX +#else +#define TVOT_LAST TVOT_CHKBOX +#endif +#define TVOT_NONE (TVOT_LAST + 1) + +#define CHKBOXS_FALSE_TRUE 0 +#define CHKBOXS_NO_YES 1 +#define CHKBOXS_OFF_ON 2 +#define CHKBOXS_FALSE_PDATA 3 +#define CHKBOXS_NO_PDATA 4 +#define CHKBOXS_OFF_PDATA 5 +#define CHKBOXS_NONE_PDATA 6 + +#define PUSHBUTTON_TYPE_DLGPROC 0 +#define PUSHBUTTON_TYPE_CALLBACK 1 +#define PUSHBUTTON_TYPE_HTCLRADJ 2 +#define PUSHBUTTON_TYPE_HTSETUP 3 + +#define MAX_RES_STR_CHARS 160 + +#define OPTPF_HIDE 0x01 +#define OPTPF_DISABLED 0x02 +#define OPTPF_ICONID_AS_HICON 0x04 +#define OPTPF_OVERLAY_WARNING_ICON 0x08 +#define OPTPF_OVERLAY_STOP_ICON 0x10 +#define OPTPF_OVERLAY_NO_ICON 0x20 +#define OPTPF_USE_HDLGTEMPLATE 0x40 + +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define OPTPF_MASK 0x7f +#endif + +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define OPTCF_HIDE 0x01 +#define OPTCF_MASK 0x01 +#endif + +#define OPTTF_TYPE_DISABLED 0x01 +#define OPTTF_NOSPACE_BEFORE_POSTFIX 0x02 + +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define OPTTF_MASK 0x03 +#endif + +#define OTS_LBCB_SORT 0x0001 +#define OTS_LBCB_PROPPAGE_LBUSECB 0x0002 +#define OTS_LBCB_PROPPAGE_CBUSELB 0x0004 +#define OTS_LBCB_INCL_ITEM_NONE 0x0008 +#define OTS_LBCB_NO_ICON16_IN_ITEM 0x0010 +#define OTS_PUSH_INCL_SETUP_TITLE 0x0020 +#define OTS_PUSH_NO_DOT_DOT_DOT 0x0040 +#define OTS_PUSH_ENABLE_ALWAYS 0x0080 + +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define OTS_MASK 0x00ff +#endif + +#define EPF_PUSH_TYPE_DLGPROC 0x0001 +#define EPF_INCL_SETUP_TITLE 0x0002 +#define EPF_NO_DOT_DOT_DOT 0x0004 +#define EPF_ICONID_AS_HICON 0x0008 +#define EPF_OVERLAY_WARNING_ICON 0x0010 +#define EPF_OVERLAY_STOP_ICON 0x0020 +#define EPF_OVERLAY_NO_ICON 0x0040 +#define EPF_USE_HDLGTEMPLATE 0x0080 + +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define EPF_MASK 0x00ff +#endif + +#define ECBF_CHECKNAME_AT_FRONT 0x0001 +#define ECBF_CHECKNAME_ONLY_ENABLED 0x0002 +#define ECBF_ICONID_AS_HICON 0x0004 +#define ECBF_OVERLAY_WARNING_ICON 0x0008 +#define ECBF_OVERLAY_ECBICON_IF_CHECKED 0x0010 +#define ECBF_OVERLAY_STOP_ICON 0x0020 +#define ECBF_OVERLAY_NO_ICON 0x0040 +#define ECBF_CHECKNAME_ONLY 0x0080 + +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define ECBF_MASK 0x00ff +#endif + +#define OPTIF_COLLAPSE 0x00000001L +#define OPTIF_HIDE 0x00000002L +#define OPTIF_CALLBACK 0x00000004L +#define OPTIF_CHANGED 0x00000008L +#define OPTIF_CHANGEONCE 0x00000010L +#define OPTIF_DISABLED 0x00000020L +#define OPTIF_ECB_CHECKED 0x00000040L +#define OPTIF_EXT_HIDE 0x00000080L +#define OPTIF_EXT_DISABLED 0x00000100L +#define OPTIF_SEL_AS_HICON 0x00000200L +#define OPTIF_EXT_IS_EXTPUSH 0x00000400L +#define OPTIF_NO_GROUPBOX_NAME 0x00000800L +#define OPTIF_OVERLAY_WARNING_ICON 0x00001000L +#define OPTIF_OVERLAY_STOP_ICON 0x00002000L +#define OPTIF_OVERLAY_NO_ICON 0x00004000L +#define OPTIF_INITIAL_TVITEM 0x00008000L +#define OPTIF_HAS_POIEXT 0x00010000L + +#define OPTIF_MASK 0x0001ffffL + + +#define DMPUB_NONE 0 +#define DMPUB_FIRST 1 + +#define DMPUB_ORIENTATION 1 +#define DMPUB_SCALE 2 +#define DMPUB_COPIES_COLLATE 3 +#define DMPUB_DEFSOURCE 4 +#define DMPUB_PRINTQUALITY 5 +#define DMPUB_COLOR 6 +#define DMPUB_DUPLEX 7 +#define DMPUB_TTOPTION 8 +#define DMPUB_FORMNAME 9 +#define DMPUB_ICMMETHOD 10 +#define DMPUB_ICMINTENT 11 +#define DMPUB_MEDIATYPE 12 +#define DMPUB_DITHERTYPE 13 +#define DMPUB_OUTPUTBIN 14 +#define DMPUB_QUALITY 15 +#define DMPUB_NUP 16 +#define DMPUB_PAGEORDER 17 +#if (NTDDI_VERSION >= NTDDI_VISTA) +#define DMPUB_NUP_DIRECTION 18 +#define DMPUB_MANUAL_DUPLEX 19 +#define DMPUB_STAPLE 20 +#define DMPUB_BOOKLET_EDGE 21 +#define DMPUB_LAST 21 +#else +#define DMPUB_LAST 17 +#endif + +#define DMPUB_OEM_PAPER_ITEM 97 +#define DMPUB_OEM_GRAPHIC_ITEM 98 +#define DMPUB_OEM_ROOT_ITEM 99 +#define DMPUB_USER 100 + +#define MAKE_DMPUB_HIDEBIT(DMPub) (DWORD)(((DWORD)0x01 << ((DMPub) - 1))) +#define IS_DMPUB_HIDDEN(dw, DMPub) (BOOL)((DWORD)(dw) & MAKE_DMPUB_HIDEBIT(DMPub)) + +#define OIEXTF_ANSI_STRING 0x0001 + +#define CPSUICB_REASON_SEL_CHANGED 0 +#define CPSUICB_REASON_PUSHBUTTON 1 +#define CPSUICB_REASON_ECB_CHANGED 2 +#define CPSUICB_REASON_DLGPROC 3 +#define CPSUICB_REASON_UNDO_CHANGES 4 +#define CPSUICB_REASON_EXTPUSH 5 +#define CPSUICB_REASON_APPLYNOW 6 +#define CPSUICB_REASON_OPTITEM_SETFOCUS 7 +#define CPSUICB_REASON_ITEMS_REVERTED 8 +#define CPSUICB_REASON_ABOUT 9 +#define CPSUICB_REASON_SETACTIVE 10 +#define CPSUICB_REASON_KILLACTIVE 11 + +#define CPSUICB_ACTION_NONE 0 +#define CPSUICB_ACTION_OPTIF_CHANGED 1 +#define CPSUICB_ACTION_REINIT_ITEMS 2 +#define CPSUICB_ACTION_NO_APPLY_EXIT 3 +#define CPSUICB_ACTION_ITEMS_APPLIED 4 + +#define DP_STD_TREEVIEWPAGE 0xFFFF +#define DP_STD_DOCPROPPAGE2 0xFFFE +#define DP_STD_DOCPROPPAGE1 0XFFFD +#define DP_STD_RESERVED_START 0xFFF0 + +#define MAX_DLGPAGE_COUNT 64 + +#define DPF_ICONID_AS_HICON 0x0001 +#define DPF_USE_HDLGTEMPLATE 0x0002 + +#define CPSUIF_UPDATE_PERMISSION 0x0001 +#define CPSUIF_ICONID_AS_HICON 0x0002 +#define CPSUIF_ABOUT_CALLBACK 0x0004 + +#define CPSUI_PDLGPAGE_DOCPROP (PDLGPAGE)1 +#define CPSUI_PDLGPAGE_ADVDOCPROP (PDLGPAGE)2 +#define CPSUI_PDLGPAGE_PRINTERPROP (PDLGPAGE)3 +#define CPSUI_PDLGPAGE_TREEVIEWONLY (PDLGPAGE)4 + +#define CPSUI_PDLGPAGE_TREEVIWONLY CPSUI_PDLGPAGE_TREEVIEWONLY + +#define CPSFUNC_ADD_HPROPSHEETPAGE 0 +#define CPSFUNC_ADD_PROPSHEETPAGEW 1 +#define CPSFUNC_ADD_PCOMPROPSHEETUIA 2 +#define CPSFUNC_ADD_PCOMPROPSHEETUIW 3 +#define CPSFUNC_ADD_PFNPROPSHEETUIA 4 +#define CPSFUNC_ADD_PFNPROPSHEETUIW 5 +#define CPSFUNC_DELETE_HCOMPROPSHEET 6 +#define CPSFUNC_SET_HSTARTPAGE 7 +#define CPSFUNC_GET_PAGECOUNT 8 +#define CPSFUNC_SET_RESULT 9 +#define CPSFUNC_GET_HPSUIPAGES 10 +#define CPSFUNC_LOAD_CPSUI_STRINGA 11 +#define CPSFUNC_LOAD_CPSUI_STRINGW 12 +#define CPSFUNC_LOAD_CPSUI_ICON 13 +#define CPSFUNC_GET_PFNPROPSHEETUI_ICON 14 +#define CPSFUNC_ADD_PROPSHEETPAGEA 15 +#define CPSFUNC_INSERT_PSUIPAGEA 16 +#define CPSFUNC_INSERT_PSUIPAGEW 17 +#define CPSFUNC_SET_PSUIPAGE_TITLEA 18 +#define CPSFUNC_SET_PSUIPAGE_TITLEW 19 +#define CPSFUNC_SET_PSUIPAGE_ICON 20 +#define CPSFUNC_SET_DATABLOCK 21 +#define CPSFUNC_QUERY_DATABLOCK 22 +#define CPSFUNC_SET_DMPUB_HIDEBITS 23 +#define CPSFUNC_IGNORE_CPSUI_PSN_APPLY 24 +#define CPSFUNC_DO_APPLY_CPSUI 25 + +#if (NTDDI_VERSION >= NTDDI_WINXP) +#define CPSFUNC_SET_FUSION_CONTEXT 26 +#define MAX_CPSFUNC_INDEX 26 +#else +#define MAX_CPSFUNC_INDEX 25 +#endif + +#ifdef UNICODE +#define CPSFUNC_ADD_PCOMPROPSHEETUI CPSFUNC_ADD_PCOMPROPSHEETUIW +#define CPSFUNC_ADD_PFNPROPSHEETUI CPSFUNC_ADD_PFNPROPSHEETUIW +#define CPSFUNC_LOAD_CPSUI_STRING CPSFUNC_LOAD_CPSUI_STRINGW +#define CPSFUNC_ADD_PROPSHEETPAGE CPSFUNC_ADD_PROPSHEETPAGEW +#define CPSFUNC_INSERT_PSUIPAGE CPSFUNC_INSERT_PSUIPAGEW +#define CPSFUNC_SET_PSUIPAGE_TITLE CPSFUNC_SET_PSUIPAGE_TITLEW + +#else +#define CPSFUNC_ADD_PCOMPROPSHEETUI CPSFUNC_ADD_PCOMPROPSHEETUIA +#define CPSFUNC_ADD_PFNPROPSHEETUI CPSFUNC_ADD_PFNPROPSHEETUIA +#define CPSFUNC_LOAD_CPSUI_STRING CPSFUNC_LOAD_CPSUI_STRINGA +#define CPSFUNC_ADD_PROPSHEETPAGE CPSFUNC_ADD_PROPSHEETPAGEA +#define CPSFUNC_INSERT_PSUIPAGE CPSFUNC_INSERT_PSUIPAGEA +#define CPSFUNC_SET_PSUIPAGE_TITLE CPSFUNC_SET_PSUIPAGE_TITLEA + +#endif + +#define SR_OWNER 0 +#define SR_OWNER_PARENT 1 + +#define HINSPSUIPAGE_FIRST (HANDLE)0xFFFFFFFE +#define HINSPSUIPAGE_LAST (HANDLE)0xFFFFFFFF +#define HINSPSUIPAGE_INDEX(i) (HANDLE)MAKELONG(i, 0); + +#define PSUIPAGEINSERT_GROUP_PARENT 0 +#define PSUIPAGEINSERT_PCOMPROPSHEETUI 1 +#define PSUIPAGEINSERT_PFNPROPSHEETUI 2 +#define PSUIPAGEINSERT_PROPSHEETPAGE 3 +#define PSUIPAGEINSERT_HPROPSHEETPAGE 4 +#define PSUIPAGEINSERT_DLL 5 +#define MAX_PSUIPAGEINSERT_INDEX 5 + +#define INSPSUIPAGE_MODE_BEFORE 0 +#define INSPSUIPAGE_MODE_AFTER 1 +#define INSPSUIPAGE_MODE_FIRST_CHILD 2 +#define INSPSUIPAGE_MODE_LAST_CHILD 3 +#define INSPSUIPAGE_MODE_INDEX 4 + +#define SSP_TVPAGE 10000 +#define SSP_STDPAGE1 10001 +#define SSP_STDPAGE2 10002 + +#define APPLYCPSUI_NO_NEWDEF 0x00000001 +#define APPLYCPSUI_OK_CANCEL_BUTTON 0x00000002 + +#define PROPSHEETUI_REASON_INIT 0 +#define PROPSHEETUI_REASON_GET_INFO_HEADER 1 +#define PROPSHEETUI_REASON_DESTROY 2 +#define PROPSHEETUI_REASON_SET_RESULT 3 +#define PROPSHEETUI_REASON_GET_ICON 4 +#define MAX_PROPSHEETUI_REASON_INDEX 4 + +#define PROPSHEETUI_INFO_VERSION 0x0100 + +#define PSUIINFO_UNICODE 0x0001 /* return-values for CommonPropertySheetUI on success */ -#define CPSUI_CANCEL 0 -#define CPSUI_OK 1 -#define CPSUI_RESTARTWINDOWS 2 -#define CPSUI_REBOOTSYSTEM 3 - +#define CPSUI_CANCEL 0 +#define CPSUI_OK 1 +#define CPSUI_RESTARTWINDOWS 2 +#define CPSUI_REBOOTSYSTEM 3 + +#define ERR_CPSUI_GETLASTERROR -1 +#define ERR_CPSUI_ALLOCMEM_FAILED -2 +#define ERR_CPSUI_INVALID_PDATA -3 +#define ERR_CPSUI_INVALID_LPARAM -4 +#define ERR_CPSUI_NULL_HINST -5 +#define ERR_CPSUI_NULL_CALLERNAME -6 +#define ERR_CPSUI_NULL_OPTITEMNAME -7 +#define ERR_CPSUI_NO_PROPSHEETPAGE -8 +#define ERR_CPSUI_TOO_MANY_PROPSHEETPAGES -9 +#define ERR_CPSUI_CREATEPROPPAGE_FAILED -10 +#define ERR_CPSUI_MORE_THAN_ONE_TVPAGE -11 +#define ERR_CPSUI_MORE_THAN_ONE_STDPAGE -12 +#define ERR_CPSUI_INVALID_PDLGPAGE -13 +#define ERR_CPSUI_INVALID_DLGPAGE_CBSIZE -14 +#define ERR_CPSUI_TOO_MANY_DLGPAGES -15 +#define ERR_CPSUI_INVALID_DLGPAGEIDX -16 +#define ERR_CPSUI_SUBITEM_DIFF_DLGPAGEIDX -17 +#define ERR_CPSUI_NULL_POPTITEM -18 +#define ERR_CPSUI_INVALID_OPTITEM_CBSIZE -19 +#define ERR_CPSUI_INVALID_OPTTYPE_CBSIZE -20 +#define ERR_CPSUI_INVALID_OPTTYPE_COUNT -21 +#define ERR_CPSUI_NULL_POPTPARAM -22 +#define ERR_CPSUI_INVALID_OPTPARAM_CBSIZE -23 +#define ERR_CPSUI_INVALID_EDITBOX_PSEL -24 +#define ERR_CPSUI_INVALID_EDITBOX_BUF_SIZE -25 +#define ERR_CPSUI_INVALID_ECB_CBSIZE -26 +#define ERR_CPSUI_NULL_ECB_PTITLE -27 +#define ERR_CPSUI_NULL_ECB_PCHECKEDNAME -28 +#define ERR_CPSUI_INVALID_DMPUBID -29 +#define ERR_CPSUI_INVALID_DMPUB_TVOT -30 +#define ERR_CPSUI_CREATE_TRACKBAR_FAILED -31 +#define ERR_CPSUI_CREATE_UDARROW_FAILED -32 +#define ERR_CPSUI_CREATE_IMAGELIST_FAILED -33 +#define ERR_CPSUI_INVALID_TVOT_TYPE -34 +#define ERR_CPSUI_INVALID_LBCB_TYPE -35 +#define ERR_CPSUI_SUBITEM_DIFF_OPTIF_HIDE -36 +#define ERR_CPSUI_INVALID_PUSHBUTTON_TYPE -38 +#define ERR_CPSUI_INVALID_EXTPUSH_CBSIZE -39 +#define ERR_CPSUI_NULL_EXTPUSH_DLGPROC -40 +#define ERR_CPSUI_NO_EXTPUSH_DLGTEMPLATEID -41 +#define ERR_CPSUI_NULL_EXTPUSH_CALLBACK -42 +#define ERR_CPSUI_DMCOPIES_USE_EXTPUSH -43 +#define ERR_CPSUI_ZERO_OPTITEM -44 + +#define ERR_CPSUI_FUNCTION_NOT_IMPLEMENTED -9999 +#define ERR_CPSUI_INTERNAL_ERROR -10000 + +#define PSUIHDRF_OBSOLETE 0x0001 +#define PSUIHDRF_NOAPPLYNOW 0x0002 +#define PSUIHDRF_PROPTITLE 0x0004 +#define PSUIHDRF_USEHICON 0x0008 +#define PSUIHDRF_DEFTITLE 0x0010 +#define PSUIHDRF_EXACT_PTITLE 0x0020 /* TYPES */ -typedef DWORD (CALLBACK *PFNCOMPROPSHEET)(HANDLE, UINT, LPARAM, LPARAM); + +#if (NTDDI_VERSION >= NTDDI_VISTA) +typedef struct _OPTCOMBO { + WORD cbSize; + BYTE Flags; + WORD cListItem; + POPTPARAM pListItem; + LONG Sel; + DWORD dwReserved[3]; +} OPTCOMBO, *POPTCOMBO; +#endif + +typedef struct _OPTPARAM { + WORD cbSize; + BYTE Flags; + BYTE Style; + LPTSTR pData; + ULONG_PTR IconID; + LPARAM lParam; + ULONG_PTR dwReserved[2]; +} OPTPARAM, *POPTPARAM; + +typedef struct _OPTTYPE { + WORD cbSize; + BYTE Type; + BYTE Flags; + WORD Count; + WORD BegCtrlID; + POPTPARAM pOptParam; + WORD Style; + WORD wReserved[3]; + ULONG_PTR dwReserved[3]; +} OPTTYPE, *POPTTYPE; + +typedef struct _EXTPUSH { + WORD cbSize; + WORD Flags; + LPTSTR pTitle; + union { + DLGPROC DlgProc; + FARPROC pfnCallBack; + } DUMMYUNIONNAME; + ULONG_PTR IconID; + union { + WORD DlgTemplateID; + HANDLE hDlgTemplate; + } DUMMYUNIONNAME; + ULONG_PTR dwReserved[3]; +} EXTPUSH, *PEXTPUSH; + +typedef struct _EXTCHKBOX { + WORD cbSize; + WORD Flags; + LPTSTR pTitle; + LPTSTR pSeparator; + LPTSTR pCheckedName; + ULONG_PTR IconID; + WORD wReserved[4]; + ULONG_PTR dwReserved[2]; +} EXTCHKBOX, *PEXTCHKBOX; + +typedef struct _OIEXT { + WORD cbSize; + WORD Flags; + HINSTANCE hInstCaller; + LPTSTR pHelpFile; + ULONG_PTR dwReserved[4]; +} OIEXT, *POIEXT; + +typedef struct _OPTITEM { + WORD cbSize; + BYTE Level; + BYTE DlgPageIdx; + DWORD Flags; + ULONG_PTR UserData; + LPTSTR pName; + union { + LONG Sel; + LPTSTR pSel; + } DUMMYUNIONNAME; + union { + PEXTCHKBOX pExtChkBox; + PEXTPUSH pExtPush; + } DUMMYUNIONNAME2; + POPTTYPE pOptType; + DWORD HelpIndex; + BYTE DMPubID; + BYTE UserItemID; + WORD wReserved; + POIEXT pOIExt; + ULONG_PTR dwReserved[3]; +} OPTITEM, *POPTITEM; + +typedef struct _CPSUICBPARAM { + WORD cbSize; + WORD Reason; + HWND hDlg; + POPTITEM pOptItem; + WORD cOptItem; + WORD Flags; + POPTITEM pCurItem; + union { + LONG OldSel; + LPTSTR pOldSel; + } DUMMYUNIONNAME; + ULONG_PTR UserData; + ULONG_PTR Result; +} CPSUICBPARAM, *PCPSUICBPARAM; + +typedef LONG +(APIENTRY *_CPSUICALLBACK)( + PCPSUICBPARAM pCPSUICBParam); + +#define CPSUICALLBACK LONG APIENTRY + +typedef struct _DLGPAGE { + WORD cbSize; + WORD Flags; + DLGPROC DlgProc; + LPTSTR pTabName; + ULONG_PTR IconID; + union { + WORD DlgTemplateID; + HANDLE hDlgTemplate; + } DUMMYUNIONNAME; +} DLGPAGE, *PDLGPAGE; + +typedef struct _COMPROPSHEETUI { + WORD cbSize; + WORD Flags; + HINSTANCE hInstCaller; + LPTSTR pCallerName; + ULONG_PTR UserData; + LPTSTR pHelpFile; + _CPSUICALLBACK pfnCallBack; + POPTITEM pOptItem; + PDLGPAGE pDlgPage; + WORD cOptItem; + WORD cDlgPage; + ULONG_PTR IconID; + LPTSTR pOptItemName; + WORD CallerVersion; + WORD OptItemVersion; + ULONG_PTR dwReserved[4]; +} COMPROPSHEETUI, *PCOMPROPSHEETUI; + +typedef struct _SETRESULT_INFO { + WORD cbSize; + WORD wReserved; + HANDLE hSetResult; + LRESULT Result; +} SETRESULT_INFO, *PSETRESULT_INFO; + +typedef struct _INSERTPSUIPAGE_INFO { + WORD cbSize; + BYTE Type; + BYTE Mode; + ULONG_PTR dwData1; + ULONG_PTR dwData2; + ULONG_PTR dwData3; +} INSERTPSUIPAGE_INFO, *PINSERTPSUIPAGE_INFO; + +typedef LONG_PTR +(CALLBACK *PFNCOMPROPSHEET)( + HANDLE hComPropSheet, + UINT Function, + LPARAM lParam1, + LPARAM lParam2); + +typedef struct _PSPINFO { + WORD cbSize; + WORD wReserved; + HANDLE hComPropSheet; + HANDLE hCPSUIPage; + PFNCOMPROPSHEET pfnComPropSheet; +} PSPINFO, *PPSPINFO; + +#define PPSPINFO_FROM_WM_INITDIALOG_LPARAM(lParam) \ + (PPSPINFO)((LPBYTE)lParam + ((LPPROPSHEETPAGE)lParam)->dwSize) + +typedef struct _CPSUIDATABLOCK { + DWORD cbData; + LPBYTE pbData; +} CPSUIDATABLOCK, *PCPSUIDATABLOCK; typedef struct _PROPSHEETUI_INFO { - WORD cbSize; - WORD Version; - WORD Flags; /* set PSUIINFO_UNICODE for UNICODE */ - WORD Reason; - HANDLE hComPropSheet; - PFNCOMPROPSHEET pfnComPropSheet; - LPARAM lParamInit; - DWORD UserData; - DWORD Result; - } PROPSHEETUI_INFO, *PPROPSHEETUI_INFO; - -typedef LONG (CALLBACK *PFNPROPSHEETUI)(PROPSHEETUI_INFO, LPARAM); + WORD cbSize; + WORD Version; + WORD Flags; + WORD Reason; + HANDLE hComPropSheet; + PFNCOMPROPSHEET pfnComPropSheet; + LPARAM lParamInit; + ULONG_PTR UserData; + ULONG_PTR Result; +} PROPSHEETUI_INFO, *PPROPSHEETUI_INFO; + +typedef struct _PROPSHEETUI_GETICON_INFO { + WORD cbSize; + WORD Flags; + WORD cxIcon; + WORD cyIcon; + HICON hIcon; +} PROPSHEETUI_GETICON_INFO, *PPROPSHEETUI_GETICON_INFO; + +typedef LONG +(FAR *PFNPROPSHEETUI)( + PPROPSHEETUI_INFO pPSUIInfo, + LPARAM lParam); + +typedef struct _PROPSHEETUI_INFO_HEADER { + WORD cbSize; + WORD Flags; + LPTSTR pTitle; + HWND hWndParent; + HINSTANCE hInst; + union { + HICON hIcon; + ULONG_PTR IconID; + } DUMMYUNIONNAME; +} PROPSHEETUI_INFO_HEADER, *PPROPSHEETUI_INFO_HEADER; /* FUNCTIONS */ -LONG WINAPI CommonPropertySheetUIA(HWND, PFNPROPSHEETUI, LPARAM, LPDWORD); -LONG WINAPI CommonPropertySheetUIW(HWND, PFNPROPSHEETUI, LPARAM, LPDWORD); -#define CommonPropertySheetUI WINELIB_NAME_AW(CommonPropertySheetUI) - + +LONG +APIENTRY +CommonPropertySheetUIA( + HWND hWndOwner, + PFNPROPSHEETUI pfnPropSheetUI, + LPARAM lParam, + LPDWORD pResult); + +LONG +APIENTRY +CommonPropertySheetUIW( + HWND hWndOwner, + PFNPROPSHEETUI pfnPropSheetUI, + LPARAM lParam, + LPDWORD pResult); + +#ifdef UNICODE +#define CommonPropertySheetUI CommonPropertySheetUIW +#else +#define CommonPropertySheetUI CommonPropertySheetUIA +#endif + +ULONG_PTR +APIENTRY +GetCPSUIUserData( + HWND hDlg); + +BOOL +APIENTRY +SetCPSUIUserData( + HWND hDlg, + ULONG_PTR CPSUIUserData); + +#endif /* (!defined(RC_INVOKED)) */ + +/* FIXME : These declarations doesn't exist in the official header */ ULONG_PTR WINAPI GetPSTUIUserData(HWND); -BOOL WINAPI SetPSTUIUserData(HWND, ULONG_PTR); +BOOL WINAPI SetPSTUIUserData(HWND, ULONG_PTR); + #ifdef __cplusplus } /* extern "C" */ #endif - -#endif /* _COMPSTUI_ */

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
90
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2010