Ros-diffs August 2010

ros-diffs@reactos.org

14 participants
282 discussions

[akhaldi] 48511: [XDK] - Introduce some _ANONYMOUS_STRUCT and NONAMELESSUNION based definitions. [DDK] - Update XDK generated headers to reflect the recent changes. - Update some header guards. - Add some missing new lines at the end of files. - Fix PUSB_DEVICE_HANDLE guard. - Introduce some _ANONYMOUS_STRUCT and NONAMELESSUNION based definitions. [PSDK] - Update some header guards. - Add missing new line at the end of driverspecs.h [NDIS] - Update the ndis header guard.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Aug 10 13:53:10 2010 New Revision: 48511 URL: http://svn.reactos.org/svn/reactos?rev=48511&view=rev Log: [XDK] - Introduce some _ANONYMOUS_STRUCT and NONAMELESSUNION based definitions. [DDK] - Update XDK generated headers to reflect the recent changes. - Update some header guards. - Add some missing new lines at the end of files. - Fix PUSB_DEVICE_HANDLE guard. - Introduce some _ANONYMOUS_STRUCT and NONAMELESSUNION based definitions. [PSDK] - Update some header guards. - Add missing new line at the end of driverspecs.h [NDIS] - Update the ndis header guard. Modified: trunk/reactos/drivers/network/ndis/include/miniport.h trunk/reactos/include/ddk/dxapi.h trunk/reactos/include/ddk/mce.h trunk/reactos/include/ddk/ndis.h trunk/reactos/include/ddk/ndistapi.h trunk/reactos/include/ddk/ndiswan.h trunk/reactos/include/ddk/ntddpcm.h trunk/reactos/include/ddk/oprghdlr.h trunk/reactos/include/ddk/usbbusif.h trunk/reactos/include/ddk/wdm.h trunk/reactos/include/psdk/driverspecs.h trunk/reactos/include/psdk/ntdd8042.h trunk/reactos/include/psdk/ntddcdrm.h trunk/reactos/include/psdk/ntddcdvd.h trunk/reactos/include/psdk/ntdddisk.h trunk/reactos/include/psdk/ntddndis.h trunk/reactos/include/psdk/ntddpar.h trunk/reactos/include/psdk/ntddser.h trunk/reactos/include/psdk/ntddtape.h trunk/reactos/include/psdk/ntddvdeo.h trunk/reactos/include/psdk/ntddvol.h trunk/reactos/include/psdk/winddi.h trunk/reactos/include/xdk/exfuncs.h trunk/reactos/include/xdk/iofuncs.h trunk/reactos/include/xdk/iotypes.h trunk/reactos/include/xdk/ketypes.h trunk/reactos/include/xdk/wmifuncs.h trunk/reactos/include/xdk/x86/ke.h Modified: trunk/reactos/drivers/network/ndis/include/miniport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/inclu… ============================================================================== --- trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/include/miniport.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -27,7 +27,7 @@ PDRIVER_OBJECT DriverObject; /* Driver object of miniport */ LIST_ENTRY DeviceList; /* Adapters created by miniport */ PUNICODE_STRING RegistryPath; /* SCM Registry key */ -#if !defined(_MSC_VER) && defined(__NDIS_H) +#if !defined(_MSC_VER) && defined(_NDIS_) } NDIS_M_DRIVER_BLOCK_COMPATIBILITY_HACK_DONT_USE; #else } NDIS_M_DRIVER_BLOCK, *PNDIS_M_DRIVER_BLOCK; Modified: trunk/reactos/include/ddk/dxapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/dxapi.h?rev=48… ============================================================================== --- trunk/reactos/include/ddk/dxapi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/dxapi.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -1,5 +1,5 @@ ULONG -DxApiGetVersion(); +DxApiGetVersion(void); ULONG DxApi( Modified: trunk/reactos/include/ddk/mce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/mce.h?rev=4851… ============================================================================== --- trunk/reactos/include/ddk/mce.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/mce.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -3,7 +3,7 @@ #if defined(_X86_) || defined(_IA64_) || defined(_AMD64_) typedef union _MCI_ADDR { - struct { + _ANONYMOUS_STRUCT struct { ULONG Address; ULONG Reserved; } DUMMYSTRUCTNAME; @@ -157,7 +157,7 @@ typedef union _ERROR_REVISION { USHORT Revision; - struct { + _ANONYMOUS_STRUCT struct { UCHAR Minor; UCHAR Major; } DUMMYSTRUCTNAME; @@ -174,7 +174,7 @@ typedef union _ERROR_TIMESTAMP { ULONGLONG TimeStamp; - struct { + _ANONYMOUS_STRUCT struct { UCHAR Seconds; UCHAR Minutes; UCHAR Hours; @@ -201,7 +201,7 @@ typedef union _ERROR_RECORD_VALID { UCHAR Valid; - struct { + _ANONYMOUS_STRUCT struct { UCHAR OemPlatformID:1; UCHAR Reserved:7; } DUMMYSTRUCTNAME; @@ -219,7 +219,7 @@ typedef union _ERROR_RECOVERY_INFO { UCHAR RecoveryInfo; - struct { + _ANONYMOUS_STRUCT struct { UCHAR Corrected:1; UCHAR NotContained:1; UCHAR Reset:1; @@ -236,7 +236,7 @@ ULONG Length; } ERROR_SECTION_HEADER, *PERROR_SECTION_HEADER; -#if !defined(__midl) && defined(_MSC_EXTENSIONS) +#if !defined(__midl) __inline USHORT NTAPI @@ -245,16 +245,20 @@ { PERROR_SECTION_HEADER section = (PERROR_SECTION_HEADER)((ULONG64)Log + sizeof(*Log)); USHORT lid = (USHORT)((UCHAR)(section->Reserved)); +#ifdef NONAMELESSUNION + lid |= (USHORT)((UCHAR)(Log->TimeStamp.s.Reserved) << 8); +#else lid |= (USHORT)((UCHAR)(Log->TimeStamp.Reserved) << 8); +#endif return( lid ); } -#endif +#endif /* !__midl */ #define ERROR_PROCESSOR_GUID {0xe429faf1, 0x3cb7, 0x11d4, {0xbc, 0xa7, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81}} typedef union _ERROR_MODINFO_VALID { ULONGLONG Valid; - struct { + _ANONYMOUS_STRUCT struct { ULONGLONG CheckInfo:1; ULONGLONG RequestorIdentifier:1; ULONGLONG ResponderIdentifier:1; @@ -291,7 +295,7 @@ typedef union _ERROR_CACHE_CHECK { ULONGLONG CacheCheck; - struct { + _ANONYMOUS_STRUCT struct { ULONGLONG Operation:4; ULONGLONG Level:2; ULONGLONG Reserved1:2; @@ -324,7 +328,7 @@ typedef union _ERROR_CACHE_CHECK { ULONGLONG CacheCheck; - struct { + _ANONYMOUS_STRUCT struct { ULONGLONG Operation:4; ULONGLONG Level:2; ULONGLONG Reserved1:2; @@ -367,7 +371,7 @@ typedef union _ERROR_TLB_CHECK { ULONGLONG TlbCheck; - struct { + _ANONYMOUS_STRUCT struct { ULONGLONG TRSlot:8; ULONGLONG TRSlotValid:1; ULONGLONG Reserved1:1; @@ -407,7 +411,7 @@ typedef union _ERROR_BUS_CHECK { ULONGLONG BusCheck; - struct { + _ANONYMOUS_STRUCT struct { ULONGLONG Size:5; ULONGLONG Internal:1; ULONGLONG External:1; @@ -434,7 +438,7 @@ typedef union _ERROR_BUS_CHECK { ULONGLONG BusCheck; - struct { + _ANONYMOUS_STRUCT struct { ULONGLONG Size:5; ULONGLONG Internal:1; ULONGLONG External:1; @@ -484,7 +488,7 @@ typedef union _ERROR_REGFILE_CHECK { ULONGLONG RegFileCheck; - struct { + _ANONYMOUS_STRUCT struct { ULONGLONG Identifier:4; ULONGLONG Operation:4; ULONGLONG RegisterNumber:7; @@ -518,7 +522,7 @@ typedef union _ERROR_MS_CHECK { ULONGLONG MsCheck; - struct { + _ANONYMOUS_STRUCT struct { ULONGLONG StructureIdentifier:5; ULONGLONG Level:3; ULONGLONG ArrayId:4; @@ -561,7 +565,7 @@ typedef union _ERROR_PROCESSOR_VALID { ULONGLONG Valid; - struct { + _ANONYMOUS_STRUCT struct { ULONGLONG ErrorMap:1; ULONGLONG StateParameter:1; ULONGLONG CRLid:1; @@ -578,7 +582,7 @@ typedef union _ERROR_PROCESSOR_ERROR_MAP { ULONGLONG ErrorMap; - struct { + _ANONYMOUS_STRUCT struct { ULONGLONG Cid:4; ULONGLONG Tid:4; ULONGLONG Eic:4; @@ -597,7 +601,7 @@ typedef union _ERROR_PROCESSOR_STATE_PARAMETER { ULONGLONG StateParameter; - struct { + _ANONYMOUS_STRUCT struct { ULONGLONG reserved0:2; ULONGLONG rz:1; ULONGLONG ra:1; @@ -641,7 +645,7 @@ typedef union _PROCESSOR_LOCAL_ID { ULONGLONG LocalId; - struct { + _ANONYMOUS_STRUCT struct { ULONGLONG reserved:16; ULONGLONG eid:8; ULONGLONG id:8; @@ -664,7 +668,7 @@ typedef union _ERROR_PROCESSOR_STATIC_INFO_VALID { ULONGLONG Valid; - struct { + _ANONYMOUS_STRUCT struct { ULONGLONG MinState:1; ULONGLONG BR:1; ULONGLONG CR:1; @@ -730,7 +734,7 @@ typedef union _ERROR_STATUS { ULONGLONG Status; - struct { + _ANONYMOUS_STRUCT struct { ULONGLONG Reserved0:8; ULONGLONG Type:8; ULONGLONG Address:1; @@ -750,7 +754,7 @@ typedef union _ERROR_BUS_SPECIFIC_DATA { ULONGLONG BusSpecificData; - struct { + _ANONYMOUS_STRUCT struct { ULONGLONG LockAsserted:1; ULONGLONG DeferLogged:1; ULONGLONG IOQEmpty:1; @@ -777,7 +781,7 @@ typedef union _ERROR_MEMORY_VALID { ULONGLONG Valid; - struct { + _ANONYMOUS_STRUCT struct { ULONGLONG ErrorStatus:1; ULONGLONG PhysicalAddress:1; ULONGLONG AddressMask:1; @@ -825,7 +829,7 @@ typedef union _ERROR_PCI_BUS_VALID { ULONGLONG Valid; - struct { + _ANONYMOUS_STRUCT struct { ULONGLONG ErrorStatus:1; ULONGLONG ErrorType:1; ULONGLONG Id:1; @@ -881,7 +885,7 @@ typedef union _ERROR_PCI_COMPONENT_VALID { ULONGLONG Valid; - struct { + _ANONYMOUS_STRUCT struct { ULONGLONG ErrorStatus:1; ULONGLONG Info:1; ULONGLONG MemoryMappedRegistersPairs:1; @@ -919,7 +923,7 @@ typedef union _ERROR_SYSTEM_EVENT_LOG_VALID { ULONGLONG Valid; - struct { + _ANONYMOUS_STRUCT struct { ULONGLONG RecordId:1; ULONGLONG RecordType:1; ULONGLONG GeneratorId:1; @@ -954,7 +958,7 @@ typedef union _ERROR_SMBIOS_VALID { ULONGLONG Valid; - struct { + _ANONYMOUS_STRUCT struct { ULONGLONG EventType:1; ULONGLONG Length:1; ULONGLONG TimeStamp:1; @@ -978,7 +982,7 @@ typedef union _ERROR_PLATFORM_SPECIFIC_VALID { ULONGLONG Valid; - struct { + _ANONYMOUS_STRUCT struct { ULONGLONG ErrorStatus:1; ULONGLONG RequestorId:1; ULONGLONG ResponderId:1; @@ -1007,7 +1011,7 @@ typedef union _ERROR_PLATFORM_BUS_VALID { ULONGLONG Valid; - struct { + _ANONYMOUS_STRUCT struct { ULONGLONG ErrorStatus:1; ULONGLONG RequestorId:1; ULONGLONG ResponderId:1; @@ -1036,7 +1040,7 @@ typedef union _ERROR_PLATFORM_HOST_CONTROLLER_VALID { ULONGLONG Valid; - struct { + _ANONYMOUS_STRUCT struct { ULONGLONG ErrorStatus:1; ULONGLONG RequestorId:1; ULONGLONG ResponderId:1; Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=485… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -29,8 +29,8 @@ * NDIS51_MINIPORT - Building NDIS 5.1 miniport driver */ -#ifndef __NDIS_H -#define __NDIS_H +#ifndef _NDIS_ +#define _NDIS_ #ifndef NDIS_WDM #define NDIS_WDM 0 @@ -5987,6 +5987,6 @@ } #endif -#endif /* __NDIS_H */ +#endif /* _NDIS_ */ /* EOF */ Modified: trunk/reactos/include/ddk/ndistapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndistapi.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ndistapi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndistapi.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -20,8 +20,10 @@ * */ -#ifndef __NDISTAPI_H -#define __NDISTAPI_H +#pragma once + +#ifndef _NDIS_TAPI_ +#define _NDIS_TAPI_ #include "ndis.h" @@ -1301,4 +1303,4 @@ } #endif -#endif /* __NDISTAPI_H */ +#endif /* _NDIS_TAPI_ */ Modified: trunk/reactos/include/ddk/ndiswan.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndiswan.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ndiswan.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndiswan.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -21,6 +21,9 @@ */ #pragma once + +#ifndef _NDIS_WAN_ +#define _NDIS_WAN_ #ifdef __cplusplus extern "C" { @@ -352,3 +355,6 @@ #ifdef __cplusplus } #endif + +#endif /* _NDIS_WAN_ */ + Modified: trunk/reactos/include/ddk/ntddpcm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddpcm.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntddpcm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddpcm.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -20,8 +20,8 @@ * */ -#ifndef __NTDDPCM_H -#define __NTDDPCM_H +#ifndef _NTDDPCMH_ +#define _NTDDPCMH_ #ifdef __cplusplus extern "C" { @@ -156,4 +156,4 @@ } #endif -#endif /* __NTDDPCM_H */ +#endif /* _NTDDPCMH_ */ Modified: trunk/reactos/include/ddk/oprghdlr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/oprghdlr.h?rev… ============================================================================== --- trunk/reactos/include/ddk/oprghdlr.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/oprghdlr.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -40,4 +40,4 @@ #define ACPI_OPREGION_REGION_SPACE_SMB 0x4 #define ACPI_OPREGION_READ 0x0 #define ACPI_OPREGION_WRITE 0x1 -#define ACPI_OPREGION_ACCESS_AT_HIGH_LEVEL 0x1 +#define ACPI_OPREGION_ACCESS_AT_HIGH_LEVEL 0x1 Modified: trunk/reactos/include/ddk/usbbusif.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbbusif.h?rev… ============================================================================== --- trunk/reactos/include/ddk/usbbusif.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/usbbusif.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -8,7 +8,7 @@ #if (NTDDI_VERSION >= NTDDI_WINXP) -#if !defined(_USBBUSIF_) +#if !defined(_HUBBUSIF_) typedef PVOID PUSB_DEVICE_HANDLE; #endif Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=4851… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -1242,7 +1242,7 @@ CSHORT Size; LIST_ENTRY DeviceListHead; KSPIN_LOCK Lock; - #if defined(_AMD64_) +# if defined(_AMD64_) _ANONYMOUS_UNION union { BOOLEAN Busy; _ANONYMOUS_STRUCT struct { @@ -1250,9 +1250,9 @@ LONG64 Hint:56; } DUMMYSTRUCTNAME; } DUMMYUNIONNAME; - #else +# else BOOLEAN Busy; - #endif +# endif } KDEVICE_QUEUE, *PKDEVICE_QUEUE, *RESTRICTED_POINTER PRKDEVICE_QUEUE; #define TIMER_EXPIRED_INDEX_BITS 6 @@ -1374,9 +1374,9 @@ ULARGE_INTEGER DueTime; LIST_ENTRY TimerListEntry; struct _KDPC *Dpc; - #if !defined(_X86_) +# if !defined(_X86_) ULONG Processor; - #endif +# endif ULONG Period; } KTIMER, *PKTIMER, *RESTRICTED_POINTER PRKTIMER; @@ -5692,30 +5692,35 @@ ULONG_PTR Reserved; } SCATTER_GATHER_ELEMENT, *PSCATTER_GATHER_ELEMENT; -#if defined(_MSC_EXTENSIONS) - +#if defined(_MSC_EXTENSIONS) || defined(__GNUC__) + +#if defined(_MSC_VER) #if _MSC_VER >= 1200 #pragma warning(push) #endif #pragma warning(disable:4200) +#endif /* _MSC_VER */ + typedef struct _SCATTER_GATHER_LIST { ULONG NumberOfElements; ULONG_PTR Reserved; SCATTER_GATHER_ELEMENT Elements[1]; } SCATTER_GATHER_LIST, *PSCATTER_GATHER_LIST; +#if defined(_MSC_VER) #if _MSC_VER >= 1200 #pragma warning(pop) #else #pragma warning(default:4200) #endif - -#else +#endif /* _MSC_VER */ + +#else /* defined(_MSC_EXTENSIONS) || defined(__GNUC__) */ struct _SCATTER_GATHER_LIST; typedef struct _SCATTER_GATHER_LIST SCATTER_GATHER_LIST, *PSCATTER_GATHER_LIST; -#endif +#endif /* defined(_MSC_EXTENSIONS) || defined(__GNUC__) */ typedef NTSTATUS (NTAPI DRIVER_ADD_DEVICE)( @@ -7803,9 +7808,15 @@ OUT PLARGE_INTEGER CurrentCount) { for (;;) { +#ifdef NONAMELESSUNION + CurrentCount->s.HighPart = KeTickCount.High1Time; + CurrentCount->s.LowPart = KeTickCount.LowPart; + if (CurrentCount->s.HighPart == KeTickCount.High2Time) break; +#else CurrentCount->HighPart = KeTickCount.High1Time; CurrentCount->LowPart = KeTickCount.LowPart; if (CurrentCount->HighPart == KeTickCount.High2Time) break; +#endif YieldProcessor(); } } @@ -12748,7 +12759,11 @@ { ASSERT(Irp->CurrentLocation <= Irp->StackCount); Irp->CurrentLocation++; +#ifdef NONAMELESSUNION + Irp->Tail.Overlay.s.u.CurrentStackLocation++; +#else Irp->Tail.Overlay.CurrentStackLocation++; +#endif } FORCEINLINE @@ -12758,7 +12773,11 @@ { ASSERT(Irp->CurrentLocation > 0); Irp->CurrentLocation--; +#ifdef NONAMELESSUNION + Irp->Tail.Overlay.s.u.CurrentStackLocation--; +#else Irp->Tail.Overlay.CurrentStackLocation--; +#endif } FORCEINLINE @@ -12767,7 +12786,11 @@ IN PIRP Irp) { ASSERT(Irp->CurrentLocation > 0); +#ifdef NONAMELESSUNION + return ((Irp)->Tail.Overlay.s.u.CurrentStackLocation - 1 ); +#else return ((Irp)->Tail.Overlay.CurrentStackLocation - 1 ); +#endif } FORCEINLINE @@ -12858,7 +12881,11 @@ IN PIRP Irp) { ASSERT(Irp->CurrentLocation <= Irp->StackCount + 1); +#ifdef NONAMELESSUNION + return Irp->Tail.Overlay.s.u.CurrentStackLocation; +#else return Irp->Tail.Overlay.CurrentStackLocation; +#endif } FORCEINLINE @@ -13243,7 +13270,11 @@ #else /* !defined(_WIN64) */ +#ifdef NONAMELESSUNION +#define ExQueryDepthSList(listhead) (listhead)->s.Depth +#else #define ExQueryDepthSList(listhead) (listhead)->Depth +#endif NTKERNELAPI PSINGLE_LIST_ENTRY @@ -13300,6 +13331,15 @@ PVOID Entry; Lookaside->L.TotalAllocates++; +#ifdef NONAMELESSUNION + Entry = InterlockedPopEntrySList(&Lookaside->L.u.ListHead); + if (Entry == NULL) { + Lookaside->L.u2.AllocateMisses++; + Entry = (Lookaside->L.u4.Allocate)(Lookaside->L.Type, + Lookaside->L.Size, + Lookaside->L.Tag); + } +#else /* NONAMELESSUNION */ Entry = InterlockedPopEntrySList(&Lookaside->L.ListHead); if (Entry == NULL) { Lookaside->L.AllocateMisses++; @@ -13307,6 +13347,7 @@ Lookaside->L.Size, Lookaside->L.Tag); } +#endif /* NONAMELESSUNION */ return Entry; } @@ -13317,12 +13358,21 @@ IN PVOID Entry) { Lookaside->L.TotalFrees++; +#ifdef NONAMELESSUNION + if (ExQueryDepthSList(&Lookaside->L.u.ListHead) >= Lookaside->L.Depth) { + Lookaside->L.u3.FreeMisses++; + (Lookaside->L.u5.Free)(Entry); + } else { + InterlockedPushEntrySList(&Lookaside->L.u.ListHead, (PSLIST_ENTRY)Entry); + } +#else /* NONAMELESSUNION */ if (ExQueryDepthSList(&Lookaside->L.ListHead) >= Lookaside->L.Depth) { Lookaside->L.FreeMisses++; (Lookaside->L.Free)(Entry); } else { InterlockedPushEntrySList(&Lookaside->L.ListHead, (PSLIST_ENTRY)Entry); } +#endif /* NONAMELESSUNION */ } #endif /* _WIN2K_COMPAT_SLIST_USAGE */ @@ -13936,6 +13986,16 @@ PVOID Entry; Lookaside->L.TotalAllocates += 1; +#ifdef NONAMELESSUNION + Entry = InterlockedPopEntrySList(&Lookaside->L.u.ListHead); + if (Entry == NULL) { + Lookaside->L.u2.AllocateMisses += 1; + Entry = (Lookaside->L.u4.AllocateEx)(Lookaside->L.Type, + Lookaside->L.Size, + Lookaside->L.Tag, + Lookaside); + } +#else /* NONAMELESSUNION */ Entry = InterlockedPopEntrySList(&Lookaside->L.ListHead); if (Entry == NULL) { Lookaside->L.AllocateMisses += 1; @@ -13944,6 +14004,7 @@ Lookaside->L.Tag, Lookaside); } +#endif /* NONAMELESSUNION */ return Entry; } @@ -13986,6 +14047,20 @@ PVOID Entry; Lookaside->L.TotalAllocates++; +#ifdef NONAMELESSUNION +#if defined(_WIN2K_COMPAT_SLIST_USAGE) && defined(_X86_) + Entry = ExInterlockedPopEntrySList(&Lookaside->L.u.ListHead, + &Lookaside->Lock__ObsoleteButDoNotDelete); +#else + Entry = InterlockedPopEntrySList(&Lookaside->L.u.ListHead); +#endif + if (Entry == NULL) { + Lookaside->L.u2.AllocateMisses++; + Entry = (Lookaside->L.u4.Allocate)(Lookaside->L.Type, + Lookaside->L.Size, + Lookaside->L.Tag); + } +#else /* NONAMELESSUNION */ #if defined(_WIN2K_COMPAT_SLIST_USAGE) && defined(_X86_) Entry = ExInterlockedPopEntrySList(&Lookaside->L.ListHead, &Lookaside->Lock__ObsoleteButDoNotDelete); @@ -13998,6 +14073,7 @@ Lookaside->L.Size, Lookaside->L.Tag); } +#endif /* NONAMELESSUNION */ return Entry; } @@ -14007,6 +14083,20 @@ IN PVOID Entry) { Lookaside->L.TotalFrees++; +#ifdef NONAMELESSUNION + if (ExQueryDepthSList(&Lookaside->L.u.ListHead) >= Lookaside->L.Depth) { + Lookaside->L.u3.FreeMisses++; + (Lookaside->L.u5.Free)(Entry); + } else { +#if defined(_WIN2K_COMPAT_SLIST_USAGE) && defined(_X86_) + ExInterlockedPushEntrySList(&Lookaside->L.u.ListHead, + (PSLIST_ENTRY)Entry, + &Lookaside->Lock__ObsoleteButDoNotDelete); +#else + InterlockedPushEntrySList(&Lookaside->L.u.ListHead, (PSLIST_ENTRY)Entry); +#endif + } +#else /* NONAMELESSUNION */ if (ExQueryDepthSList(&Lookaside->L.ListHead) >= Lookaside->L.Depth) { Lookaside->L.FreeMisses++; (Lookaside->L.Free)(Entry); @@ -14019,6 +14109,7 @@ InterlockedPushEntrySList(&Lookaside->L.ListHead, (PSLIST_ENTRY)Entry); #endif } +#endif /* NONAMELESSUNION */ } /****************************************************************************** @@ -14225,7 +14316,7 @@ #endif #endif /* RUN_WPP */ - #if (NTDDI_VERSION >= NTDDI_WINXP) +#if (NTDDI_VERSION >= NTDDI_WINXP) NTKERNELAPI NTSTATUS Modified: trunk/reactos/include/psdk/driverspecs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/driverspecs.h… ============================================================================== --- trunk/reactos/include/psdk/driverspecs.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/driverspecs.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -26,4 +26,4 @@ #define __inout -#define __deref_out_ecount(Size) +#define __deref_out_ecount(Size) Modified: trunk/reactos/include/psdk/ntdd8042.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdd8042.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntdd8042.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdd8042.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -20,8 +20,8 @@ * */ -#ifndef __NTDD8042_H -#define __NTDD8042_H +#ifndef _NTDD8042_ +#define _NTDD8042_ #include "ntddkbd.h" #include "ntddmou.h" @@ -205,4 +205,4 @@ } #endif -#endif /* __NTDD8042_H */ +#endif /* _NTDD8042_ */ Modified: trunk/reactos/include/psdk/ntddcdrm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddcdrm.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntddcdrm.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddcdrm.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -20,8 +20,8 @@ * */ -#ifndef __NTDDCDRM_H -#define __NTDDCDRM_H +#ifndef _NTDDCDRM_ +#define _NTDDCDRM_ #include "ntddstor.h" @@ -342,4 +342,4 @@ } #endif -#endif /* __NTDDCDRM_H */ +#endif /* _NTDDCDRM_ */ Modified: trunk/reactos/include/psdk/ntddcdvd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddcdvd.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntddcdvd.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddcdvd.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -20,8 +20,8 @@ * */ -#ifndef __NTDDCDVD_H -#define __NTDDCDVD_H +#ifndef _NTDDCDVD_ +#define _NTDDCDVD_ #include "ntddstor.h" @@ -205,4 +205,4 @@ } #endif -#endif /* __NTDDCDVD_H */ +#endif /* _NTDDCDVD_ */ Modified: trunk/reactos/include/psdk/ntdddisk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdddisk.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntdddisk.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdddisk.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -20,8 +20,8 @@ * */ -#ifndef __NTDDDISK_H -#define __NTDDDISK_H +#ifndef _NTDDDISK_H_ +#define _NTDDDISK_H_ /* Helper macro to enable gcc's extension. */ #ifndef __GNU_EXTENSION @@ -606,4 +606,4 @@ } #endif -#endif /* __NTDDDISK_H */ +#endif /* _NTDDDISK_H_ */ Modified: trunk/reactos/include/psdk/ntddndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddndis.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntddndis.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddndis.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -20,8 +20,8 @@ * */ -#ifndef __NTDDNDIS_H -#define __NTDDNDIS_H +#ifndef _NTDDNDIS_ +#define _NTDDNDIS_ #ifdef __cplusplus extern "C" { @@ -326,7 +326,7 @@ NdisMediaStateDisconnected } NDIS_MEDIA_STATE, *PNDIS_MEDIA_STATE; -#ifndef __NDIS_H +#ifndef _NDIS_ typedef int NDIS_STATUS, *PNDIS_STATUS; #endif @@ -379,4 +379,4 @@ } #endif -#endif /* __NTDDNDIS_H */ +#endif /* _NTDDNDIS_ */ Modified: trunk/reactos/include/psdk/ntddpar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddpar.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ntddpar.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddpar.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -20,8 +20,8 @@ * */ -#ifndef __NTDDPAR_H -#define __NTDDPAR_H +#ifndef _NTDDPAR_ +#define _NTDDPAR_ #ifdef __cplusplus extern "C" { @@ -110,4 +110,4 @@ } #endif -#endif /* __NTDDPAR_H */ +#endif /* _NTDDPAR_ */ Modified: trunk/reactos/include/psdk/ntddser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddser.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ntddser.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddser.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -20,8 +20,8 @@ * */ -#ifndef __NTDDSER_H -#define __NTDDSER_H +#ifndef _NTDDSER_ +#define _NTDDSER_ #ifdef __cplusplus extern "C" { @@ -444,4 +444,4 @@ } #endif -#endif /* __NTDDSER_H */ +#endif /* _NTDDSER_ */ Modified: trunk/reactos/include/psdk/ntddtape.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddtape.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntddtape.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddtape.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -20,8 +20,8 @@ * */ -#ifndef __NTDDTAPE_H -#define __NTDDTAPE_H +#ifndef _NTDDTAPE_ +#define _NTDDTAPE_ #include "ntddstor.h" @@ -71,4 +71,4 @@ } #endif -#endif /* __NTDDTAPE_H */ +#endif /* _NTDDTAPE_ */ Modified: trunk/reactos/include/psdk/ntddvdeo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddvdeo.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntddvdeo.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddvdeo.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -20,8 +20,8 @@ * */ -#ifndef __NTDDVDEO_H -#define __NTDDVDEO_H +#ifndef _NTDDVDEO_ +#define _NTDDVDEO_ #ifdef __cplusplus extern "C" { @@ -473,4 +473,4 @@ } #endif -#endif /* __NTDDVDEO_H */ +#endif /* _NTDDVDEO_ */ Modified: trunk/reactos/include/psdk/ntddvol.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddvol.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ntddvol.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddvol.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -20,8 +20,8 @@ * */ -#ifndef __NTDDVOL_H -#define __NTDDVOL_H +#ifndef _NTDDVOL_ +#define _NTDDVOL_ #ifdef __cplusplus extern "C" { @@ -132,4 +132,4 @@ } #endif -#endif /* __NTDDVOL_H */ +#endif /* _NTDDVOL_ */ Modified: trunk/reactos/include/psdk/winddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winddi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/winddi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winddi.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -84,7 +84,7 @@ DECLARE_HANDLE(DHPDEV); DECLARE_HANDLE(HDRVOBJ); -#ifndef __NTDDVDEO_H +#ifndef _NTDDVDEO_ typedef struct _ENG_EVENT *PEVENT; #endif Modified: trunk/reactos/include/xdk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/exfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/exfuncs.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -114,7 +114,11 @@ #else /* !defined(_WIN64) */ +#ifdef NONAMELESSUNION +#define ExQueryDepthSList(listhead) (listhead)->s.Depth +#else #define ExQueryDepthSList(listhead) (listhead)->Depth +#endif NTKERNELAPI PSINGLE_LIST_ENTRY @@ -171,6 +175,15 @@ PVOID Entry; Lookaside->L.TotalAllocates++; +#ifdef NONAMELESSUNION + Entry = InterlockedPopEntrySList(&Lookaside->L.u.ListHead); + if (Entry == NULL) { + Lookaside->L.u2.AllocateMisses++; + Entry = (Lookaside->L.u4.Allocate)(Lookaside->L.Type, + Lookaside->L.Size, + Lookaside->L.Tag); + } +#else /* NONAMELESSUNION */ Entry = InterlockedPopEntrySList(&Lookaside->L.ListHead); if (Entry == NULL) { Lookaside->L.AllocateMisses++; @@ -178,6 +191,7 @@ Lookaside->L.Size, Lookaside->L.Tag); } +#endif /* NONAMELESSUNION */ return Entry; } @@ -188,12 +202,21 @@ IN PVOID Entry) { Lookaside->L.TotalFrees++; +#ifdef NONAMELESSUNION + if (ExQueryDepthSList(&Lookaside->L.u.ListHead) >= Lookaside->L.Depth) { + Lookaside->L.u3.FreeMisses++; + (Lookaside->L.u5.Free)(Entry); + } else { + InterlockedPushEntrySList(&Lookaside->L.u.ListHead, (PSLIST_ENTRY)Entry); + } +#else /* NONAMELESSUNION */ if (ExQueryDepthSList(&Lookaside->L.ListHead) >= Lookaside->L.Depth) { Lookaside->L.FreeMisses++; (Lookaside->L.Free)(Entry); } else { InterlockedPushEntrySList(&Lookaside->L.ListHead, (PSLIST_ENTRY)Entry); } +#endif /* NONAMELESSUNION */ } #endif /* _WIN2K_COMPAT_SLIST_USAGE */ @@ -1002,6 +1025,16 @@ PVOID Entry; Lookaside->L.TotalAllocates += 1; +#ifdef NONAMELESSUNION + Entry = InterlockedPopEntrySList(&Lookaside->L.u.ListHead); + if (Entry == NULL) { + Lookaside->L.u2.AllocateMisses += 1; + Entry = (Lookaside->L.u4.AllocateEx)(Lookaside->L.Type, + Lookaside->L.Size, + Lookaside->L.Tag, + Lookaside); + } +#else /* NONAMELESSUNION */ Entry = InterlockedPopEntrySList(&Lookaside->L.ListHead); if (Entry == NULL) { Lookaside->L.AllocateMisses += 1; @@ -1010,6 +1043,7 @@ Lookaside->L.Tag, Lookaside); } +#endif /* NONAMELESSUNION */ return Entry; } @@ -1052,6 +1086,20 @@ PVOID Entry; Lookaside->L.TotalAllocates++; +#ifdef NONAMELESSUNION +#if defined(_WIN2K_COMPAT_SLIST_USAGE) && defined(_X86_) + Entry = ExInterlockedPopEntrySList(&Lookaside->L.u.ListHead, + &Lookaside->Lock__ObsoleteButDoNotDelete); +#else + Entry = InterlockedPopEntrySList(&Lookaside->L.u.ListHead); +#endif + if (Entry == NULL) { + Lookaside->L.u2.AllocateMisses++; + Entry = (Lookaside->L.u4.Allocate)(Lookaside->L.Type, + Lookaside->L.Size, + Lookaside->L.Tag); + } +#else /* NONAMELESSUNION */ #if defined(_WIN2K_COMPAT_SLIST_USAGE) && defined(_X86_) Entry = ExInterlockedPopEntrySList(&Lookaside->L.ListHead, &Lookaside->Lock__ObsoleteButDoNotDelete); @@ -1064,6 +1112,7 @@ Lookaside->L.Size, Lookaside->L.Tag); } +#endif /* NONAMELESSUNION */ return Entry; } @@ -1073,6 +1122,20 @@ IN PVOID Entry) { Lookaside->L.TotalFrees++; +#ifdef NONAMELESSUNION + if (ExQueryDepthSList(&Lookaside->L.u.ListHead) >= Lookaside->L.Depth) { + Lookaside->L.u3.FreeMisses++; + (Lookaside->L.u5.Free)(Entry); + } else { +#if defined(_WIN2K_COMPAT_SLIST_USAGE) && defined(_X86_) + ExInterlockedPushEntrySList(&Lookaside->L.u.ListHead, + (PSLIST_ENTRY)Entry, + &Lookaside->Lock__ObsoleteButDoNotDelete); +#else + InterlockedPushEntrySList(&Lookaside->L.u.ListHead, (PSLIST_ENTRY)Entry); +#endif + } +#else /* NONAMELESSUNION */ if (ExQueryDepthSList(&Lookaside->L.ListHead) >= Lookaside->L.Depth) { Lookaside->L.FreeMisses++; (Lookaside->L.Free)(Entry); @@ -1085,6 +1148,7 @@ InterlockedPushEntrySList(&Lookaside->L.ListHead, (PSLIST_ENTRY)Entry); #endif } +#endif /* NONAMELESSUNION */ } -$endif (_WDMDDK_) +$endif (_WDMDDK_) Modified: trunk/reactos/include/xdk/iofuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iofuncs.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/iofuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/iofuncs.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -2435,7 +2435,11 @@ { ASSERT(Irp->CurrentLocation <= Irp->StackCount); Irp->CurrentLocation++; +#ifdef NONAMELESSUNION + Irp->Tail.Overlay.s.u.CurrentStackLocation++; +#else Irp->Tail.Overlay.CurrentStackLocation++; +#endif } FORCEINLINE @@ -2445,7 +2449,11 @@ { ASSERT(Irp->CurrentLocation > 0); Irp->CurrentLocation--; +#ifdef NONAMELESSUNION + Irp->Tail.Overlay.s.u.CurrentStackLocation--; +#else Irp->Tail.Overlay.CurrentStackLocation--; +#endif } FORCEINLINE @@ -2454,7 +2462,11 @@ IN PIRP Irp) { ASSERT(Irp->CurrentLocation > 0); +#ifdef NONAMELESSUNION + return ((Irp)->Tail.Overlay.s.u.CurrentStackLocation - 1 ); +#else return ((Irp)->Tail.Overlay.CurrentStackLocation - 1 ); +#endif } FORCEINLINE @@ -2545,7 +2557,11 @@ IN PIRP Irp) { ASSERT(Irp->CurrentLocation <= Irp->StackCount + 1); +#ifdef NONAMELESSUNION + return Irp->Tail.Overlay.s.u.CurrentStackLocation; +#else return Irp->Tail.Overlay.CurrentStackLocation; +#endif } FORCEINLINE Modified: trunk/reactos/include/xdk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/iotypes.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -2029,30 +2029,35 @@ ULONG_PTR Reserved; } SCATTER_GATHER_ELEMENT, *PSCATTER_GATHER_ELEMENT; -#if defined(_MSC_EXTENSIONS) - +#if defined(_MSC_EXTENSIONS) || defined(__GNUC__) + +#if defined(_MSC_VER) #if _MSC_VER >= 1200 #pragma warning(push) #endif #pragma warning(disable:4200) +#endif /* _MSC_VER */ + typedef struct _SCATTER_GATHER_LIST { ULONG NumberOfElements; ULONG_PTR Reserved; SCATTER_GATHER_ELEMENT Elements[1]; } SCATTER_GATHER_LIST, *PSCATTER_GATHER_LIST; +#if defined(_MSC_VER) #if _MSC_VER >= 1200 #pragma warning(pop) #else #pragma warning(default:4200) #endif - -#else +#endif /* _MSC_VER */ + +#else /* defined(_MSC_EXTENSIONS) || defined(__GNUC__) */ struct _SCATTER_GATHER_LIST; typedef struct _SCATTER_GATHER_LIST SCATTER_GATHER_LIST, *PSCATTER_GATHER_LIST; -#endif +#endif /* defined(_MSC_EXTENSIONS) || defined(__GNUC__) */ typedef NTSTATUS (NTAPI DRIVER_ADD_DEVICE)( Modified: trunk/reactos/include/xdk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/xdk/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/ketypes.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -678,7 +678,7 @@ CSHORT Size; LIST_ENTRY DeviceListHead; KSPIN_LOCK Lock; - #if defined(_AMD64_) +# if defined(_AMD64_) _ANONYMOUS_UNION union { BOOLEAN Busy; _ANONYMOUS_STRUCT struct { @@ -686,9 +686,9 @@ LONG64 Hint:56; } DUMMYSTRUCTNAME; } DUMMYUNIONNAME; - #else +# else BOOLEAN Busy; - #endif +# endif } KDEVICE_QUEUE, *PKDEVICE_QUEUE, *RESTRICTED_POINTER PRKDEVICE_QUEUE; #define TIMER_EXPIRED_INDEX_BITS 6 @@ -810,9 +810,9 @@ ULARGE_INTEGER DueTime; LIST_ENTRY TimerListEntry; struct _KDPC *Dpc; - #if !defined(_X86_) +# if !defined(_X86_) ULONG Processor; - #endif +# endif ULONG Period; } KTIMER, *PKTIMER, *RESTRICTED_POINTER PRKTIMER; Modified: trunk/reactos/include/xdk/wmifuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/wmifuncs.h?rev… ============================================================================== --- trunk/reactos/include/xdk/wmifuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/wmifuncs.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -16,7 +16,7 @@ #endif #endif /* RUN_WPP */ - #if (NTDDI_VERSION >= NTDDI_WINXP) +#if (NTDDI_VERSION >= NTDDI_WINXP) NTKERNELAPI NTSTATUS Modified: trunk/reactos/include/xdk/x86/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/x86/ke.h?rev=4… ============================================================================== --- trunk/reactos/include/xdk/x86/ke.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/x86/ke.h [iso-8859-1] Tue Aug 10 13:53:10 2010 @@ -151,9 +151,15 @@ OUT PLARGE_INTEGER CurrentCount) { for (;;) { +#ifdef NONAMELESSUNION + CurrentCount->s.HighPart = KeTickCount.High1Time; + CurrentCount->s.LowPart = KeTickCount.LowPart; + if (CurrentCount->s.HighPart == KeTickCount.High2Time) break; +#else CurrentCount->HighPart = KeTickCount.High1Time; CurrentCount->LowPart = KeTickCount.LowPart; if (CurrentCount->HighPart == KeTickCount.High2Time) break; +#endif YieldProcessor(); } }

14 years, 4 months

[akhaldi] 48510: [PSDK] - Add some missing headers' headers.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Aug 10 11:27:27 2010 New Revision: 48510 URL: http://svn.reactos.org/svn/reactos?rev=48510&view=rev Log: [PSDK] - Add some missing headers' headers. Modified: trunk/reactos/include/psdk/d3dnthal.h trunk/reactos/include/psdk/ddrawint.h trunk/reactos/include/psdk/dmksctrl.h trunk/reactos/include/psdk/ntdd1394.h trunk/reactos/include/psdk/ntddbeep.h trunk/reactos/include/psdk/ntddft.h trunk/reactos/include/psdk/ntddtdi.h trunk/reactos/include/psdk/unknown.h Modified: trunk/reactos/include/psdk/d3dnthal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3dnthal.h?re… ============================================================================== --- trunk/reactos/include/psdk/d3dnthal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/d3dnthal.h [iso-8859-1] Tue Aug 10 11:27:27 2010 @@ -1,5 +1,21 @@ -/* +/* + * d3dnthal.h + * * Direct3D NT driver interface + * + * Contributors: + * Created by Ge van Geldorp + * + * 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 __DDK_D3DNTHAL_H Modified: trunk/reactos/include/psdk/ddrawint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddrawint.h?re… ============================================================================== --- trunk/reactos/include/psdk/ddrawint.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ddrawint.h [iso-8859-1] Tue Aug 10 11:27:27 2010 @@ -1,5 +1,21 @@ /* + * ddrawint.h + * * DirectDraw NT driver interface + * + * Contributors: + * Created by Ge van Geldorp + * + * 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 __DD_INCLUDED__ Modified: trunk/reactos/include/psdk/dmksctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dmksctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/dmksctrl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/dmksctrl.h [iso-8859-1] Tue Aug 10 11:27:27 2010 @@ -1,3 +1,21 @@ +/* + * dmksctrl.h + * + * Contributors: + * Created by Johannes Anderwald + * + * 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 _IKsControl_ #define _IKsControl_ @@ -38,6 +56,3 @@ }; #endif - - - Modified: trunk/reactos/include/psdk/ntdd1394.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntdd1394.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntdd1394.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntdd1394.h [iso-8859-1] Tue Aug 10 11:27:27 2010 @@ -1,3 +1,20 @@ +/* + * ntdd1394.h + * + * Contributors: + * Created by Magnus Olsen + * + * 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 _NTDD1394_H_ #define _NTDD1394_H_ Modified: trunk/reactos/include/psdk/ntddbeep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddbeep.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntddbeep.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddbeep.h [iso-8859-1] Tue Aug 10 11:27:27 2010 @@ -1,3 +1,20 @@ +/* + * ntddbeep.h + * + * Contributors: + * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> + * + * 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 _NTDDBEEP_ #define _NTDDBEEP_ Modified: trunk/reactos/include/psdk/ntddft.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddft.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/ntddft.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddft.h [iso-8859-1] Tue Aug 10 11:27:27 2010 @@ -1,3 +1,20 @@ +/* + * ntddft.h + * + * Contributors: + * Created by Alex Ionescu + * + * 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 _NTDDFT_ #define _NTDDFT_ Modified: trunk/reactos/include/psdk/ntddtdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntddtdi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ntddtdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntddtdi.h [iso-8859-1] Tue Aug 10 11:27:27 2010 @@ -1,3 +1,20 @@ +/* + * ntddtdi.h + * + * Contributors: + * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> + * + * 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 _NTDDTDI_ #define _NTDDTDI_ Modified: trunk/reactos/include/psdk/unknown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/unknown.h?rev… ============================================================================== --- trunk/reactos/include/psdk/unknown.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/unknown.h [iso-8859-1] Tue Aug 10 11:27:27 2010 @@ -1,3 +1,21 @@ +/* + * unknown.h + * + * Contributors: + * Created by Magnus Olsen + * + * 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 __unknwn_h__ #define __unknwn_h__

14 years, 4 months

[akhaldi] 48509: [PSDK] - Add WINELIB_NAME_AW and DECL_WINELIB_TYPE_AW to the wine specific imm.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Aug 10 10:25:10 2010 New Revision: 48509 URL: http://svn.reactos.org/svn/reactos?rev=48509&view=rev Log: [PSDK] - Add WINELIB_NAME_AW and DECL_WINELIB_TYPE_AW to the wine specific imm.h. Modified: trunk/reactos/include/reactos/wine/ddk/imm.h Modified: trunk/reactos/include/reactos/wine/ddk/imm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/ddk/i… ============================================================================== --- trunk/reactos/include/reactos/wine/ddk/imm.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/ddk/imm.h [iso-8859-1] Tue Aug 10 10:25:10 2010 @@ -3,6 +3,25 @@ #define _WINE_IMM_H_ #include <psdk/wingdi.h> + +#ifdef WINE_NO_UNICODE_MACROS +# define WINELIB_NAME_AW(func) \ + func##_must_be_suffixed_with_W_or_A_in_this_context \ + func##_must_be_suffixed_with_W_or_A_in_this_context +#else /* WINE_NO_UNICODE_MACROS */ +# ifdef UNICODE +# define WINELIB_NAME_AW(func) func##W +# else +# define WINELIB_NAME_AW(func) func##A +# endif +#endif /* WINE_NO_UNICODE_MACROS */ + +#ifdef WINE_NO_UNICODE_MACROS +# define DECL_WINELIB_TYPE_AW(type) /* nothing */ +#else +# define DECL_WINELIB_TYPE_AW(type) typedef WINELIB_NAME_AW(type) type; +#endif + #include <psdk/imm.h> typedef struct _tagINPUTCONTEXT {

14 years, 4 months

[cgutman] 48508: [MSWSOCK] - Don't release the critical section because we don't own it - Don't close the socket that we just created - Fix a typo in SockSetInformation that broke it completely

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Aug 10 08:52:48 2010 New Revision: 48508 URL: http://svn.reactos.org/svn/reactos?rev=48508&view=rev Log: [MSWSOCK] - Don't release the critical section because we don't own it - Don't close the socket that we just created - Fix a typo in SockSetInformation that broke it completely Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/accept.c branches/aicom-network-branch/dll/win32/mswsock/msafd/proc.c Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/accept.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/mswsock/msafd/accept.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/mswsock/msafd/accept.c [iso-8859-1] Tue Aug 10 08:52:48 2010 @@ -825,9 +825,6 @@ Socket->SharedData.SizeOfLocalAddress); AcceptedSocket->SharedData.SizeOfLocalAddress = Socket->SharedData.SizeOfLocalAddress; - /* We can release the accepted socket's lock now */ - LeaveCriticalSection(&AcceptedSocket->Lock); - /* Send IOCTL to Accept */ AcceptData.UseSAN = SockSanEnabled; Status = NtDeviceIoControlFile(Socket->WshContext.Handle, @@ -894,8 +891,8 @@ &ErrorCode); /* Dereference the socket and clear its pointer for error code logic */ - SockDereferenceSocket(Socket); LeaveCriticalSection(&Socket->Lock); + SockDereferenceSocket(Socket); Socket = NULL; error: @@ -919,7 +916,7 @@ if (AcceptedSocket) { /* Check if the accepted socket also has a handle */ - if (ErrorCode == NO_ERROR) + if (ErrorCode != NO_ERROR) { /* Close the socket */ SockCloseSocket(AcceptedSocket); Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/proc.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/mswsock/msafd/proc.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/mswsock/msafd/proc.c [iso-8859-1] Tue Aug 10 08:52:48 2010 @@ -142,7 +142,7 @@ NULL, NULL, &IoStatusBlock, - IOCTL_AFD_GET_INFO, + IOCTL_AFD_SET_INFO, &AfdInfo, sizeof(AfdInfo), NULL,

14 years, 4 months

[cgutman] 48507: [WS2_32] - Fix a crash when running with ws2_32 debugging on

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Aug 10 07:14:42 2010 New Revision: 48507 URL: http://svn.reactos.org/svn/reactos?rev=48507&view=rev Log: [WS2_32] - Fix a crash when running with ws2_32 debugging on Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] Tue Aug 10 07:14:42 2010 @@ -642,7 +642,7 @@ if (Socket == INVALID_SOCKET) WSASetLastError(Errno); - if ( addr ) + if ( addr && addrlen ) { #if DBG LPSOCKADDR_IN sa = (LPSOCKADDR_IN)addr;

14 years, 4 months

[cgutman] 48506: [MSWSOCK] - Leave the socket's critical section before clearing it's pointer - Fixes the deadlock that occurs after successfully calling accept

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Aug 10 06:46:00 2010 New Revision: 48506 URL: http://svn.reactos.org/svn/reactos?rev=48506&view=rev Log: [MSWSOCK] - Leave the socket's critical section before clearing it's pointer - Fixes the deadlock that occurs after successfully calling accept Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/accept.c Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/accept.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/mswsock/msafd/accept.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/mswsock/msafd/accept.c [iso-8859-1] Tue Aug 10 06:46:00 2010 @@ -895,6 +895,7 @@ /* Dereference the socket and clear its pointer for error code logic */ SockDereferenceSocket(Socket); + LeaveCriticalSection(&Socket->Lock); Socket = NULL; error:

14 years, 4 months

[cgutman] 48505: [MSWSOCK] - Fix two more nasty typos that broke WSPListen

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Aug 10 06:14:13 2010 New Revision: 48505 URL: http://svn.reactos.org/svn/reactos?rev=48505&view=rev Log: [MSWSOCK] - Fix two more nasty typos that broke WSPListen Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/listen.c Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/mswsock/msafd/listen.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/mswsock/msafd/listen.c [iso-8859-1] Tue Aug 10 06:14:13 2010 @@ -47,7 +47,7 @@ EnterCriticalSection(&Socket->Lock); /* If the socket is connection-less, fail */ - if (MSAFD_IS_DGRAM_SOCK(Socket)); + if (MSAFD_IS_DGRAM_SOCK(Socket)) { /* Fail */ ErrorCode = WSAEOPNOTSUPP; @@ -61,9 +61,9 @@ ErrorCode = NO_ERROR; goto error; } - else if (Socket->SharedData.State != SocketConnected) + else if (Socket->SharedData.State != SocketBound) { - /* If we're not connected, fail */ + /* If we're not bound, fail */ ErrorCode = WSAEINVAL; goto error; }

14 years, 4 months

[cgutman] 48504: [MSWSOCK] - Fix a fatal typo - Add events that were missing which broke WSPSelect on connect and accept

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Aug 10 06:02:29 2010 New Revision: 48504 URL: http://svn.reactos.org/svn/reactos?rev=48504&view=rev Log: [MSWSOCK] - Fix a fatal typo - Add events that were missing which broke WSPSelect on connect and accept Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/select.c Modified: branches/aicom-network-branch/dll/win32/mswsock/msafd/select.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/dll/win32/… ============================================================================== --- branches/aicom-network-branch/dll/win32/mswsock/msafd/select.c [iso-8859-1] (original) +++ branches/aicom-network-branch/dll/win32/mswsock/msafd/select.c [iso-8859-1] Tue Aug 10 06:02:29 2010 @@ -750,8 +750,10 @@ /* Fill out handle info */ HandleArray->Handle = (SOCKET)readfds->fd_array[i]; HandleArray->Events = AFD_EVENT_RECEIVE | - AFD_EVENT_DISCONNECT | - AFD_EVENT_ABORT; + AFD_EVENT_DISCONNECT | + AFD_EVENT_CLOSE | + AFD_EVENT_ABORT | + AFD_EVENT_ACCEPT; /* Move to the next one */ HandleArray++; @@ -760,7 +762,7 @@ { /* Fill out handle info */ HandleArray->Handle = (SOCKET)writefds->fd_array[i]; - HandleArray->Events = AFD_EVENT_SEND; + HandleArray->Events = AFD_EVENT_SEND | AFD_EVENT_CONNECT; /* Move to the next one */ HandleArray++; @@ -776,7 +778,7 @@ } /* Check if a timeout was given */ - if (timeout) + if (!timeout) { /* Inifinte Timeout */ PollInfo->Timeout.u.LowPart = -1;

14 years, 4 months

[tkreuzer] 48503: Add include guards in wine/ddk/imm.h and inlude it from wine/imm.h

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Aug 10 01:08:03 2010 New Revision: 48503 URL: http://svn.reactos.org/svn/reactos?rev=48503&view=rev Log: Add include guards in wine/ddk/imm.h and inlude it from wine/imm.h Modified: trunk/reactos/include/reactos/wine/ddk/imm.h trunk/reactos/include/reactos/wine/imm.h Modified: trunk/reactos/include/reactos/wine/ddk/imm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/ddk/i… ============================================================================== --- trunk/reactos/include/reactos/wine/ddk/imm.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/ddk/imm.h [iso-8859-1] Tue Aug 10 01:08:03 2010 @@ -1,6 +1,8 @@ + +#ifndef _WINE_IMM_H_ +#define _WINE_IMM_H_ #include <psdk/wingdi.h> - #include <psdk/imm.h> typedef struct _tagINPUTCONTEXT { @@ -27,3 +29,5 @@ } INPUTCONTEXT, *LPINPUTCONTEXT; LPINPUTCONTEXT WINAPI ImmLockIMC(HIMC); + +#endif /* _WINE_IMM_H_ */ Modified: trunk/reactos/include/reactos/wine/imm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/imm.h… ============================================================================== --- trunk/reactos/include/reactos/wine/imm.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/imm.h [iso-8859-1] Tue Aug 10 01:08:03 2010 @@ -1,1 +1,2 @@ +#include "ddk/imm.h"

14 years, 4 months

[akhaldi] 48502: [PSDK] - Move INPUTCONTEXT and ImmLockIMC to the wine imm.h - Add wingdi.h inclusion.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Tue Aug 10 00:46:27 2010 New Revision: 48502 URL: http://svn.reactos.org/svn/reactos?rev=48502&view=rev Log: [PSDK] - Move INPUTCONTEXT and ImmLockIMC to the wine imm.h - Add wingdi.h inclusion. Added: trunk/reactos/include/reactos/wine/imm.h (with props) Modified: trunk/reactos/include/psdk/imm.h trunk/reactos/include/reactos/wine/ddk/imm.h Modified: trunk/reactos/include/psdk/imm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/imm.h?rev=485… ============================================================================== --- trunk/reactos/include/psdk/imm.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/imm.h [iso-8859-1] Tue Aug 10 00:46:27 2010 @@ -119,36 +119,12 @@ DECL_WINELIB_TYPE_AW(IMEMENUITEMINFO) DECL_WINELIB_TYPE_AW(LPIMEMENUITEMINFO) - typedef struct _tagCOMPOSITIONFORM { DWORD dwStyle; POINT ptCurrentPos; RECT rcArea; } COMPOSITIONFORM, *LPCOMPOSITIONFORM; - -typedef struct _tagINPUTCONTEXT { - HWND hWnd; - BOOL fOpen; - POINT ptStatusWndPos; - POINT ptSoftKbdPos; - DWORD fdwConversion; - DWORD fdwSentence; - union { - LOGFONTA A; - LOGFONTW W; - } lfFont; - COMPOSITIONFORM cfCompForm; - CANDIDATEFORM cfCandForm[4]; - HIMCC hCompStr; - HIMCC hCandInfo; - HIMCC hGuideLine; - HIMCC hPrivate; - DWORD dwNumMsgBuf; - HIMCC hMsgBuf; - DWORD fdwInit; - DWORD dwReserve[3]; -} INPUTCONTEXT, *LPINPUTCONTEXT; typedef struct _tagIMEINFO { DWORD dwPrivateDataSize; @@ -233,7 +209,6 @@ #define NI_SETCANDIDATE_PAGESIZE 0x0017 #define NI_IMEMENUSELECTED 0x0018 -LPINPUTCONTEXT WINAPI ImmLockIMC(HIMC); BOOL WINAPI ImmUnlockIMC(HIMC); DWORD WINAPI ImmGetIMCLockCount(HIMC); HIMCC WINAPI ImmCreateIMCC(DWORD); Modified: trunk/reactos/include/reactos/wine/ddk/imm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/ddk/i… ============================================================================== --- trunk/reactos/include/reactos/wine/ddk/imm.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/ddk/imm.h [iso-8859-1] Tue Aug 10 00:46:27 2010 @@ -1,2 +1,29 @@ + +#include <psdk/wingdi.h> #include <psdk/imm.h> + +typedef struct _tagINPUTCONTEXT { + HWND hWnd; + BOOL fOpen; + POINT ptStatusWndPos; + POINT ptSoftKbdPos; + DWORD fdwConversion; + DWORD fdwSentence; + union { + LOGFONTA A; + LOGFONTW W; + } lfFont; + COMPOSITIONFORM cfCompForm; + CANDIDATEFORM cfCandForm[4]; + HIMCC hCompStr; + HIMCC hCandInfo; + HIMCC hGuideLine; + HIMCC hPrivate; + DWORD dwNumMsgBuf; + HIMCC hMsgBuf; + DWORD fdwInit; + DWORD dwReserve[3]; +} INPUTCONTEXT, *LPINPUTCONTEXT; + +LPINPUTCONTEXT WINAPI ImmLockIMC(HIMC); Added: trunk/reactos/include/reactos/wine/imm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/imm.h… ============================================================================== --- trunk/reactos/include/reactos/wine/imm.h (added) +++ trunk/reactos/include/reactos/wine/imm.h [iso-8859-1] Tue Aug 10 00:46:27 2010 @@ -1,0 +1,1 @@ + Propchange: trunk/reactos/include/reactos/wine/imm.h ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 4 months

← Newer
1
...
14
15
16
17
18
19
20
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2010