Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 67521: [DDK/XDK] - Improve definition of ExInterlockedCompareExchange64 and interlocked SList functions and improve some annotations based on native header - Update processor feature con...
by tkreuzer＠svn.reactos.org 02 May '15

02 May '15

Author: tkreuzer Date: Sat May 2 22:20:18 2015 New Revision: 67521 URL: http://svn.reactos.org/svn/reactos?rev=67521&view=rev Log: [DDK/XDK] - Improve definition of ExInterlockedCompareExchange64 and interlocked SList functions and improve some annotations based on native header - Update processor feature constants Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/xdk/exfuncs.h trunk/reactos/include/xdk/ketypes.h trunk/reactos/include/xdk/rtlfuncs.h trunk/reactos/include/xdk/winnt_old.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=6752… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sat May 2 22:20:18 2015 @@ -1181,24 +1181,38 @@ } SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX;; /* Processor features */ -#define PF_FLOATING_POINT_PRECISION_ERRATA 0 -#define PF_FLOATING_POINT_EMULATED 1 -#define PF_COMPARE_EXCHANGE_DOUBLE 2 -#define PF_MMX_INSTRUCTIONS_AVAILABLE 3 -#define PF_PPC_MOVEMEM_64BIT_OK 4 -#define PF_ALPHA_BYTE_INSTRUCTIONS 5 -#define PF_XMMI_INSTRUCTIONS_AVAILABLE 6 -#define PF_3DNOW_INSTRUCTIONS_AVAILABLE 7 -#define PF_RDTSC_INSTRUCTION_AVAILABLE 8 -#define PF_PAE_ENABLED 9 -#define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 -#define PF_SSE_DAZ_MODE_AVAILABLE 11 -#define PF_NX_ENABLED 12 -#define PF_SSE3_INSTRUCTIONS_AVAILABLE 13 -#define PF_COMPARE_EXCHANGE128 14 -#define PF_COMPARE64_EXCHANGE128 15 -#define PF_CHANNELS_ENABLED 16 -#define PF_XSAVE_ENABLED 17 +#define PF_FLOATING_POINT_PRECISION_ERRATA 0 +#define PF_FLOATING_POINT_EMULATED 1 +#define PF_COMPARE_EXCHANGE_DOUBLE 2 +#define PF_MMX_INSTRUCTIONS_AVAILABLE 3 +#define PF_PPC_MOVEMEM_64BIT_OK 4 +#define PF_ALPHA_BYTE_INSTRUCTIONS 5 +#define PF_XMMI_INSTRUCTIONS_AVAILABLE 6 +#define PF_3DNOW_INSTRUCTIONS_AVAILABLE 7 +#define PF_RDTSC_INSTRUCTION_AVAILABLE 8 +#define PF_PAE_ENABLED 9 +#define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 +#define PF_SSE_DAZ_MODE_AVAILABLE 11 +#define PF_NX_ENABLED 12 +#define PF_SSE3_INSTRUCTIONS_AVAILABLE 13 +#define PF_COMPARE_EXCHANGE128 14 +#define PF_COMPARE64_EXCHANGE128 15 +#define PF_CHANNELS_ENABLED 16 +#define PF_XSAVE_ENABLED 17 +#define PF_ARM_VFP_32_REGISTERS_AVAILABLE 18 +#define PF_ARM_NEON_INSTRUCTIONS_AVAILABLE 19 +#define PF_SECOND_LEVEL_ADDRESS_TRANSLATION 20 +#define PF_VIRT_FIRMWARE_ENABLED 21 +#define PF_RDWRFSGSBASE_AVAILABLE 22 +#define PF_FASTFAIL_AVAILABLE 23 +#define PF_ARM_DIVIDE_INSTRUCTION_AVAILABLE 24 +#define PF_ARM_64BIT_LOADSTORE_ATOMIC 25 +#define PF_ARM_EXTERNAL_CACHE_AVAILABLE 26 +#define PF_ARM_FMAC_INSTRUCTIONS_AVAILABLE 27 +#define PF_RDRAND_INSTRUCTION_AVAILABLE 28 +#define PF_ARM_V8_INSTRUCTIONS_AVAILABLE 29 +#define PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE 30 +#define PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE 31 #define MAXIMUM_WAIT_OBJECTS 64 @@ -11645,77 +11659,77 @@ #if !defined(_WINBASE_) -#if defined(_WIN64) && (defined(_NTDRIVER_) || defined(_NTDDK_) || defined(_NTIFS_) || defined(_NTHAL_) || defined(_NTOSP_)) +#if defined(_WIN64) && !defined(_NTSYSTEM_) && (defined(_NTDRIVER_) || defined(_NTDDK_) || defined(_NTIFS_) || defined(_NTHAL_) || !defined(_NTOSP_)) NTKERNELAPI VOID InitializeSListHead( _Out_ PSLIST_HEADER SListHead); -#else +#else /* defined(_WIN64) && ... */ + +/* HACK */ +_IRQL_requires_max_(APC_LEVEL) +NTKERNELAPI +DECLSPEC_NORETURN +VOID +NTAPI +ExRaiseStatus( + _In_ NTSTATUS Status); FORCEINLINE VOID InitializeSListHead( _Out_ PSLIST_HEADER SListHead) { +#if defined(_WIN64) + if (((ULONG_PTR)SListHead & 0xf) != 0) { + ExRaiseStatus(STATUS_DATATYPE_MISALIGNMENT); + } #if defined(_IA64_) - ULONG64 FeatureBits; -#endif - -#if defined(_WIN64) - if (((ULONG_PTR)SListHead & 0xf) != 0) { - RtlRaiseStatus(STATUS_DATATYPE_MISALIGNMENT); - } -#endif - RtlZeroMemory(SListHead, sizeof(SLIST_HEADER)); -#if defined(_IA64_) - FeatureBits = __getReg(CV_IA64_CPUID4); - if ((FeatureBits & KF_16BYTE_INSTR) != 0) { - SListHead->Header16.HeaderType = 1; - SListHead->Header16.Init = 1; - } -#endif + SListHead->Region = (ULONG_PTR)SListHead & VRN_MASK; +#else + SListHead->Region = 0; +#endif /* _IA64_ */ +#endif /* _WIN64 */ + SListHead->Alignment = 0; } -#endif - -#if defined(_WIN64) - -#define InterlockedPopEntrySList(Head) \ - ExpInterlockedPopEntrySList(Head) - -#define InterlockedPushEntrySList(Head, Entry) \ - ExpInterlockedPushEntrySList(Head, Entry) - -#define InterlockedFlushSList(Head) \ - ExpInterlockedFlushSList(Head) - -#define QueryDepthSList(Head) \ - ExQueryDepthSList(Head) - -#else /* !defined(_WIN64) */ +#endif /* defined(_WIN64) && ... */ + +#ifdef _X86_ + +NTKERNELAPI +PSLIST_ENTRY +FASTCALL +InterlockedPushEntrySList( + _Inout_ PSLIST_HEADER SListHead, + _Inout_ __drv_aliasesMem PSLIST_ENTRY SListEntry); NTKERNELAPI PSLIST_ENTRY FASTCALL InterlockedPopEntrySList( - _Inout_ PSLIST_HEADER ListHead); - -NTKERNELAPI -PSLIST_ENTRY -FASTCALL -InterlockedPushEntrySList( - _Inout_ PSLIST_HEADER ListHead, - _Inout_ __drv_aliasesMem PSLIST_ENTRY ListEntry); - -#define InterlockedFlushSList(ListHead) \ - ExInterlockedFlushSList(ListHead) - -#define QueryDepthSList(Head) \ - ExQueryDepthSList(Head) - -#endif /* !defined(_WIN64) */ + _Inout_ PSLIST_HEADER SListHead); + +#define InterlockedFlushSList(SListHead) \ + ExInterlockedFlushSList(SListHead) + +#else /* !_X86_ */ + +#define InterlockedPushEntrySList(SListHead, SListEntry) \ + ExpInterlockedPushEntrySList(SListHead, SListEntry) + +#define InterlockedPopEntrySList(SListHead) \ + ExpInterlockedPopEntrySList(SListHead) + +#define InterlockedFlushSList(SListHead) \ + ExpInterlockedFlushSList(SListHead) + +#endif /* _X86_ */ + +#define QueryDepthSList(SListHead) \ + ExQueryDepthSList(SListHead) #endif /* !defined(_WINBASE_) */ @@ -14787,77 +14801,95 @@ #define ExInterlockedPushEntryList ExfInterlockedPushEntryList #endif /* defined(_X86_) */ -#if defined(_WIN64) - -#if defined(_NTDRIVER_) || defined(_NTDDK_) || defined(_NTIFS_) || \ - defined(_NTHAL_) || defined(_NTOSP_) +#ifdef _X86_ + +#ifdef _WIN2K_COMPAT_SLIST_USAGE + +NTKERNELAPI +PSLIST_ENTRY +FASTCALL +ExInterlockedPushEntrySList( + _Inout_ PSLIST_HEADER SListHead, + _Inout_ __drv_aliasesMem PSLIST_ENTRY SListEntry, + _Inout_opt_ _Requires_lock_not_held_(*_Curr_) PKSPIN_LOCK Lock); + +NTKERNELAPI +PSLIST_ENTRY +FASTCALL +ExInterlockedPopEntrySList( + _Inout_ PSLIST_HEADER SListHead, + _Inout_opt_ _Requires_lock_not_held_(*_Curr_) PKSPIN_LOCK Lock); + +#else /* !_WIN2K_COMPAT_SLIST_USAGE */ + +#define ExInterlockedPushEntrySList(SListHead, SListEntry, Lock) \ + InterlockedPushEntrySList(SListHead, SListEntry) + +#define ExInterlockedPopEntrySList(SListHead, Lock) \ + InterlockedPopEntrySList(SListHead) + +#endif /* _WIN2K_COMPAT_SLIST_USAGE */ + +NTKERNELAPI +PSLIST_ENTRY +FASTCALL +ExInterlockedFlushSList( + _Inout_ PSLIST_HEADER SListHead); + +#ifdef NONAMELESSUNION +#define ExQueryDepthSList(SListHead) (SListHead)->s.Depth +#else +#define ExQueryDepthSList(SListHead) (SListHead)->Depth +#endif + +#else /* !_X86_ */ + +NTKERNELAPI +PSLIST_ENTRY +ExpInterlockedPushEntrySList( + _Inout_ PSLIST_HEADER SListHead, + _Inout_ __drv_aliasesMem PSLIST_ENTRY SListEntry); + +NTKERNELAPI +PSLIST_ENTRY +ExpInterlockedPopEntrySList( + _Inout_ PSLIST_HEADER SListHead); + +NTKERNELAPI +PSLIST_ENTRY +ExpInterlockedFlushSList( + _Inout_ PSLIST_HEADER SListHead); + +#if !defined(_NTSYSTEM_) && (defined(_NTDRIVER_) || defined(_NTDDK_) || defined(_NTIFS_) || defined(_NTHAL_) || defined(_NTOSP_)) NTKERNELAPI USHORT -ExQueryDepthSList(_In_ PSLIST_HEADER ListHead); +ExQueryDepthSList(_In_ PSLIST_HEADER SListHead); #else FORCEINLINE USHORT -ExQueryDepthSList(_In_ PSLIST_HEADER ListHead) +ExQueryDepthSList(_In_ PSLIST_HEADER SListHead) { - return (USHORT)(ListHead->Alignment & 0xffff); +#ifdef _WIN64 + return (USHORT)(SListHead->Alignment & 0xffff); +#else /* !_WIN64 */ + return (USHORT)SListHead->Depth; +#endif /* _WIN64 */ } #endif -NTKERNELAPI -PSLIST_ENTRY -ExpInterlockedFlushSList( - PSLIST_HEADER ListHead); - -NTKERNELAPI -PSLIST_ENTRY -ExpInterlockedPopEntrySList( - _Inout_ PSLIST_HEADER ListHead); - -NTKERNELAPI -PSLIST_ENTRY -ExpInterlockedPushEntrySList( - _Inout_ PSLIST_HEADER ListHead, - _Inout_ __drv_aliasesMem PSLIST_ENTRY ListEntry); - -#define ExInterlockedFlushSList(Head) \ - ExpInterlockedFlushSList(Head) -#define ExInterlockedPopEntrySList(Head, Lock) \ - ExpInterlockedPopEntrySList(Head) -#define ExInterlockedPushEntrySList(Head, Entry, Lock) \ - ExpInterlockedPushEntrySList(Head, Entry) - -#else /* !defined(_WIN64) */ - -#ifdef NONAMELESSUNION -#define ExQueryDepthSList(listhead) (listhead)->s.Depth -#else -#define ExQueryDepthSList(listhead) (listhead)->Depth -#endif - -NTKERNELAPI -PSINGLE_LIST_ENTRY -FASTCALL -ExInterlockedFlushSList( - _Inout_ PSLIST_HEADER ListHead); - -#endif /* !defined(_WIN64) */ +#define ExInterlockedPushEntrySList(SListHead, SListEntry, Lock) \ + ExpInterlockedPushEntrySList(SListHead, SListEntry) + +#define ExInterlockedPopEntrySList(SListHead, Lock) \ + ExpInterlockedPopEntrySList(SListHead) + +#define ExInterlockedFlushSList(SListHead) \ + ExpInterlockedFlushSList(SListHead) + +#endif /* _X86_ */ + #if defined(_WIN2K_COMPAT_SLIST_USAGE) && defined(_X86_) - -NTKERNELAPI -PSINGLE_LIST_ENTRY -FASTCALL -ExInterlockedPopEntrySList( - _Inout_ PSLIST_HEADER ListHead, - _Inout_ _Requires_lock_not_held_(*_Curr_) PKSPIN_LOCK Lock); - -NTKERNELAPI -PSINGLE_LIST_ENTRY -FASTCALL -ExInterlockedPushEntrySList( - _Inout_ PSLIST_HEADER ListHead, - _Inout_ __drv_aliasesMem PSINGLE_LIST_ENTRY ListEntry, - _Inout_ _Requires_lock_not_held_(*_Curr_) PKSPIN_LOCK Lock); _IRQL_requires_max_(APC_LEVEL) NTKERNELAPI @@ -14875,13 +14907,6 @@ _In_ PVOID Entry); #else /* !_WIN2K_COMPAT_SLIST_USAGE */ - -#if !defined(_WIN64) -#define ExInterlockedPopEntrySList(_ListHead, _Lock) \ - InterlockedPopEntrySList(_ListHead) -#define ExInterlockedPushEntrySList(_ListHead, _ListEntry, _Lock) \ - InterlockedPushEntrySList(_ListHead, _ListEntry) -#endif _IRQL_requires_max_(APC_LEVEL) static __inline @@ -15282,12 +15307,7 @@ _In_ ULONG Increment, _Inout_ _Requires_lock_not_held_(*_Curr_) PKSPIN_LOCK Lock); -#if defined(_AMD64_) || defined(_IA64_) - -#define ExInterlockedCompareExchange64(Destination, Exchange, Comperand, Lock) \ - InterlockedCompareExchange64(Destination, *(Exchange), *(Comperand)) - -#elif defined(_X86_) +#if defined(_M_IX86) NTKERNELAPI LONGLONG @@ -15302,16 +15322,10 @@ #else -NTKERNELAPI -LONGLONG -FASTCALL -ExInterlockedCompareExchange64( - IN OUT LONGLONG volatile *Destination, - IN PLONGLONG Exchange, - IN PLONGLONG Comparand, - IN PKSPIN_LOCK Lock); - -#endif /* defined(_AMD64_) || defined(_IA64_) */ +#define ExInterlockedCompareExchange64(Destination, Exchange, Comperand, Lock) \ + InterlockedCompareExchange64(Destination, *(Exchange), *(Comperand)) + +#endif /* defined(_M_IX86) */ NTKERNELAPI PLIST_ENTRY @@ -15689,6 +15703,12 @@ ExFlushLookasideListEx( _Inout_ PLOOKASIDE_LIST_EX Lookaside); +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:__WARNING_MEMORY_NOT_ACQUIRED) +#endif + +__drv_allocatesMem(Mem) _Must_inspect_result_ _IRQL_requires_max_(DISPATCH_LEVEL) FORCEINLINE @@ -15721,12 +15741,16 @@ return Entry; } +#ifdef _MSC_VER +#pragma warning(pop) +#endif + _IRQL_requires_max_(DISPATCH_LEVEL) FORCEINLINE VOID ExFreeToLookasideListEx( _Inout_ PLOOKASIDE_LIST_EX Lookaside, - _In_ PVOID Entry) + _In_ __drv_freesMem(Entry) PVOID Entry) { Lookaside->L.TotalFrees += 1; if (ExQueryDepthSList(&Lookaside->L.ListHead) >= Lookaside->L.Depth) { @@ -15755,8 +15779,12 @@ #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ +__drv_allocatesMem(Mem) _IRQL_requires_max_(DISPATCH_LEVEL) -static __inline PVOID +_Ret_maybenull_ +_Post_writable_byte_size_(Lookaside->L.Size) +static __inline +PVOID ExAllocateFromNPagedLookasideList( _Inout_ PNPAGED_LOOKASIDE_LIST Lookaside) { @@ -15794,10 +15822,11 @@ } _IRQL_requires_max_(DISPATCH_LEVEL) -static __inline VOID +static __inline +VOID ExFreeToNPagedLookasideList( _Inout_ PNPAGED_LOOKASIDE_LIST Lookaside, - _In_ PVOID Entry) + _In_ __drv_freesMem(Mem) PVOID Entry) { Lookaside->L.TotalFrees++; #ifdef NONAMELESSUNION Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=6… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat May 2 22:20:18 2015 @@ -2569,18 +2569,40 @@ #define PROCESSOR_ARCHITECTURE_MSIL 8 #define PROCESSOR_ARCHITECTURE_AMD64 9 #define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF -#define PF_FLOATING_POINT_PRECISION_ERRATA 0 -#define PF_FLOATING_POINT_EMULATED 1 -#define PF_COMPARE_EXCHANGE_DOUBLE 2 -#define PF_MMX_INSTRUCTIONS_AVAILABLE 3 -#define PF_PPC_MOVEMEM_64BIT_OK 4 -#define PF_ALPHA_BYTE_INSTRUCTIONS 5 -#define PF_XMMI_INSTRUCTIONS_AVAILABLE 6 -#define PF_3DNOW_INSTRUCTIONS_AVAILABLE 7 -#define PF_RDTSC_INSTRUCTION_AVAILABLE 8 -#define PF_PAE_ENABLED 9 -#define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 -#define PF_NX_ENABLED 12 + +/* Processor features */ +#define PF_FLOATING_POINT_PRECISION_ERRATA 0 +#define PF_FLOATING_POINT_EMULATED 1 +#define PF_COMPARE_EXCHANGE_DOUBLE 2 +#define PF_MMX_INSTRUCTIONS_AVAILABLE 3 +#define PF_PPC_MOVEMEM_64BIT_OK 4 +#define PF_ALPHA_BYTE_INSTRUCTIONS 5 +#define PF_XMMI_INSTRUCTIONS_AVAILABLE 6 +#define PF_3DNOW_INSTRUCTIONS_AVAILABLE 7 +#define PF_RDTSC_INSTRUCTION_AVAILABLE 8 +#define PF_PAE_ENABLED 9 +#define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 +#define PF_SSE_DAZ_MODE_AVAILABLE 11 +#define PF_NX_ENABLED 12 +#define PF_SSE3_INSTRUCTIONS_AVAILABLE 13 +#define PF_COMPARE_EXCHANGE128 14 +#define PF_COMPARE64_EXCHANGE128 15 +#define PF_CHANNELS_ENABLED 16 +#define PF_XSAVE_ENABLED 17 +#define PF_ARM_VFP_32_REGISTERS_AVAILABLE 18 +#define PF_ARM_NEON_INSTRUCTIONS_AVAILABLE 19 +#define PF_SECOND_LEVEL_ADDRESS_TRANSLATION 20 +#define PF_VIRT_FIRMWARE_ENABLED 21 +#define PF_RDWRFSGSBASE_AVAILABLE 22 +#define PF_FASTFAIL_AVAILABLE 23 +#define PF_ARM_DIVIDE_INSTRUCTION_AVAILABLE 24 +#define PF_ARM_64BIT_LOADSTORE_ATOMIC 25 +#define PF_ARM_EXTERNAL_CACHE_AVAILABLE 26 +#define PF_ARM_FMAC_INSTRUCTIONS_AVAILABLE 27 +#define PF_RDRAND_INSTRUCTION_AVAILABLE 28 +#define PF_ARM_V8_INSTRUCTIONS_AVAILABLE 29 +#define PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE 30 +#define PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE 31 /* also in ddk/ntifs.h */ #define FILE_ACTION_ADDED 0x00000001 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] Sat May 2 22:20:18 2015 @@ -84,77 +84,95 @@ #define ExInterlockedPushEntryList ExfInterlockedPushEntryList #endif /* defined(_X86_) */ -#if defined(_WIN64) - -#if defined(_NTDRIVER_) || defined(_NTDDK_) || defined(_NTIFS_) || \ - defined(_NTHAL_) || defined(_NTOSP_) +#ifdef _X86_ + +#ifdef _WIN2K_COMPAT_SLIST_USAGE + +NTKERNELAPI +PSLIST_ENTRY +FASTCALL +ExInterlockedPushEntrySList( + _Inout_ PSLIST_HEADER SListHead, + _Inout_ __drv_aliasesMem PSLIST_ENTRY SListEntry, + _Inout_opt_ _Requires_lock_not_held_(*_Curr_) PKSPIN_LOCK Lock); + +NTKERNELAPI +PSLIST_ENTRY +FASTCALL +ExInterlockedPopEntrySList( + _Inout_ PSLIST_HEADER SListHead, + _Inout_opt_ _Requires_lock_not_held_(*_Curr_) PKSPIN_LOCK Lock); + +#else /* !_WIN2K_COMPAT_SLIST_USAGE */ + +#define ExInterlockedPushEntrySList(SListHead, SListEntry, Lock) \ + InterlockedPushEntrySList(SListHead, SListEntry) + +#define ExInterlockedPopEntrySList(SListHead, Lock) \ + InterlockedPopEntrySList(SListHead) + +#endif /* _WIN2K_COMPAT_SLIST_USAGE */ + +NTKERNELAPI +PSLIST_ENTRY +FASTCALL +ExInterlockedFlushSList( + _Inout_ PSLIST_HEADER SListHead); + +#ifdef NONAMELESSUNION +#define ExQueryDepthSList(SListHead) (SListHead)->s.Depth +#else +#define ExQueryDepthSList(SListHead) (SListHead)->Depth +#endif + +#else /* !_X86_ */ + +NTKERNELAPI +PSLIST_ENTRY +ExpInterlockedPushEntrySList( + _Inout_ PSLIST_HEADER SListHead, + _Inout_ __drv_aliasesMem PSLIST_ENTRY SListEntry); + +NTKERNELAPI +PSLIST_ENTRY +ExpInterlockedPopEntrySList( + _Inout_ PSLIST_HEADER SListHead); + +NTKERNELAPI +PSLIST_ENTRY +ExpInterlockedFlushSList( + _Inout_ PSLIST_HEADER SListHead); + +#if !defined(_NTSYSTEM_) && (defined(_NTDRIVER_) || defined(_NTDDK_) || defined(_NTIFS_) || defined(_NTHAL_) || defined(_NTOSP_)) NTKERNELAPI USHORT -ExQueryDepthSList(_In_ PSLIST_HEADER ListHead); +ExQueryDepthSList(_In_ PSLIST_HEADER SListHead); #else FORCEINLINE USHORT -ExQueryDepthSList(_In_ PSLIST_HEADER ListHead) +ExQueryDepthSList(_In_ PSLIST_HEADER SListHead) { - return (USHORT)(ListHead->Alignment & 0xffff); +#ifdef _WIN64 + return (USHORT)(SListHead->Alignment & 0xffff); +#else /* !_WIN64 */ + return (USHORT)SListHead->Depth; +#endif /* _WIN64 */ } #endif -NTKERNELAPI -PSLIST_ENTRY -ExpInterlockedFlushSList( - PSLIST_HEADER ListHead); - -NTKERNELAPI -PSLIST_ENTRY -ExpInterlockedPopEntrySList( - _Inout_ PSLIST_HEADER ListHead); - -NTKERNELAPI -PSLIST_ENTRY -ExpInterlockedPushEntrySList( - _Inout_ PSLIST_HEADER ListHead, - _Inout_ __drv_aliasesMem PSLIST_ENTRY ListEntry); - -#define ExInterlockedFlushSList(Head) \ - ExpInterlockedFlushSList(Head) -#define ExInterlockedPopEntrySList(Head, Lock) \ - ExpInterlockedPopEntrySList(Head) -#define ExInterlockedPushEntrySList(Head, Entry, Lock) \ - ExpInterlockedPushEntrySList(Head, Entry) - -#else /* !defined(_WIN64) */ - -#ifdef NONAMELESSUNION -#define ExQueryDepthSList(listhead) (listhead)->s.Depth -#else -#define ExQueryDepthSList(listhead) (listhead)->Depth -#endif - -NTKERNELAPI -PSINGLE_LIST_ENTRY -FASTCALL -ExInterlockedFlushSList( - _Inout_ PSLIST_HEADER ListHead); - -#endif /* !defined(_WIN64) */ +#define ExInterlockedPushEntrySList(SListHead, SListEntry, Lock) \ + ExpInterlockedPushEntrySList(SListHead, SListEntry) + +#define ExInterlockedPopEntrySList(SListHead, Lock) \ + ExpInterlockedPopEntrySList(SListHead) + +#define ExInterlockedFlushSList(SListHead) \ + ExpInterlockedFlushSList(SListHead) + +#endif /* _X86_ */ + #if defined(_WIN2K_COMPAT_SLIST_USAGE) && defined(_X86_) - -NTKERNELAPI -PSINGLE_LIST_ENTRY -FASTCALL -ExInterlockedPopEntrySList( - _Inout_ PSLIST_HEADER ListHead, - _Inout_ _Requires_lock_not_held_(*_Curr_) PKSPIN_LOCK Lock); - -NTKERNELAPI -PSINGLE_LIST_ENTRY -FASTCALL -ExInterlockedPushEntrySList( - _Inout_ PSLIST_HEADER ListHead, - _Inout_ __drv_aliasesMem PSINGLE_LIST_ENTRY ListEntry, - _Inout_ _Requires_lock_not_held_(*_Curr_) PKSPIN_LOCK Lock); _IRQL_requires_max_(APC_LEVEL) NTKERNELAPI @@ -172,13 +190,6 @@ _In_ PVOID Entry); #else /* !_WIN2K_COMPAT_SLIST_USAGE */ - -#if !defined(_WIN64) -#define ExInterlockedPopEntrySList(_ListHead, _Lock) \ - InterlockedPopEntrySList(_ListHead) -#define ExInterlockedPushEntrySList(_ListHead, _ListEntry, _Lock) \ - InterlockedPushEntrySList(_ListHead, _ListEntry) -#endif _IRQL_requires_max_(APC_LEVEL) static __inline @@ -693,12 +704,7 @@ _In_ ULONG Increment, _Inout_ _Requires_lock_not_held_(*_Curr_) PKSPIN_LOCK Lock); -#if defined(_AMD64_) || defined(_IA64_) - -#define ExInterlockedCompareExchange64(Destination, Exchange, Comperand, Lock) \ - InterlockedCompareExchange64(Destination, *(Exchange), *(Comperand)) - -#elif defined(_X86_) +#if defined(_M_IX86) NTKERNELAPI LONGLONG @@ -713,16 +719,10 @@ #else -NTKERNELAPI -LONGLONG -FASTCALL -ExInterlockedCompareExchange64( - IN OUT LONGLONG volatile *Destination, - IN PLONGLONG Exchange, - IN PLONGLONG Comparand, - IN PKSPIN_LOCK Lock); - -#endif /* defined(_AMD64_) || defined(_IA64_) */ +#define ExInterlockedCompareExchange64(Destination, Exchange, Comperand, Lock) \ + InterlockedCompareExchange64(Destination, *(Exchange), *(Comperand)) + +#endif /* defined(_M_IX86) */ NTKERNELAPI PLIST_ENTRY @@ -1189,6 +1189,12 @@ ExFlushLookasideListEx( _Inout_ PLOOKASIDE_LIST_EX Lookaside); +#ifdef _MSC_VER +#pragma warning(push) +#pragma warning(disable:__WARNING_MEMORY_NOT_ACQUIRED) +#endif + +__drv_allocatesMem(Mem) _Must_inspect_result_ _IRQL_requires_max_(DISPATCH_LEVEL) FORCEINLINE @@ -1221,12 +1227,16 @@ return Entry; } +#ifdef _MSC_VER +#pragma warning(pop) +#endif + _IRQL_requires_max_(DISPATCH_LEVEL) FORCEINLINE VOID ExFreeToLookasideListEx( _Inout_ PLOOKASIDE_LIST_EX Lookaside, - _In_ PVOID Entry) + _In_ __drv_freesMem(Entry) PVOID Entry) { Lookaside->L.TotalFrees += 1; if (ExQueryDepthSList(&Lookaside->L.ListHead) >= Lookaside->L.Depth) { @@ -1255,8 +1265,12 @@ #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */ -_IRQL_requires_max_(DISPATCH_LEVEL) -static __inline PVOID +__drv_allocatesMem(Mem) +_IRQL_requires_max_(DISPATCH_LEVEL) +_Ret_maybenull_ +_Post_writable_byte_size_(Lookaside->L.Size) +static __inline +PVOID ExAllocateFromNPagedLookasideList( _Inout_ PNPAGED_LOOKASIDE_LIST Lookaside) { @@ -1294,10 +1308,11 @@ } _IRQL_requires_max_(DISPATCH_LEVEL) -static __inline VOID +static __inline +VOID ExFreeToNPagedLookasideList( _Inout_ PNPAGED_LOOKASIDE_LIST Lookaside, - _In_ PVOID Entry) + _In_ __drv_freesMem(Mem) PVOID Entry) { Lookaside->L.TotalFrees++; #ifdef NONAMELESSUNION 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] Sat May 2 22:20:18 2015 @@ -118,24 +118,38 @@ } SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX;; /* Processor features */ -#define PF_FLOATING_POINT_PRECISION_ERRATA 0 -#define PF_FLOATING_POINT_EMULATED 1 -#define PF_COMPARE_EXCHANGE_DOUBLE 2 -#define PF_MMX_INSTRUCTIONS_AVAILABLE 3 -#define PF_PPC_MOVEMEM_64BIT_OK 4 -#define PF_ALPHA_BYTE_INSTRUCTIONS 5 -#define PF_XMMI_INSTRUCTIONS_AVAILABLE 6 -#define PF_3DNOW_INSTRUCTIONS_AVAILABLE 7 -#define PF_RDTSC_INSTRUCTION_AVAILABLE 8 -#define PF_PAE_ENABLED 9 -#define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 -#define PF_SSE_DAZ_MODE_AVAILABLE 11 -#define PF_NX_ENABLED 12 -#define PF_SSE3_INSTRUCTIONS_AVAILABLE 13 -#define PF_COMPARE_EXCHANGE128 14 -#define PF_COMPARE64_EXCHANGE128 15 -#define PF_CHANNELS_ENABLED 16 -#define PF_XSAVE_ENABLED 17 +#define PF_FLOATING_POINT_PRECISION_ERRATA 0 +#define PF_FLOATING_POINT_EMULATED 1 +#define PF_COMPARE_EXCHANGE_DOUBLE 2 +#define PF_MMX_INSTRUCTIONS_AVAILABLE 3 +#define PF_PPC_MOVEMEM_64BIT_OK 4 +#define PF_ALPHA_BYTE_INSTRUCTIONS 5 +#define PF_XMMI_INSTRUCTIONS_AVAILABLE 6 +#define PF_3DNOW_INSTRUCTIONS_AVAILABLE 7 +#define PF_RDTSC_INSTRUCTION_AVAILABLE 8 +#define PF_PAE_ENABLED 9 +#define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 +#define PF_SSE_DAZ_MODE_AVAILABLE 11 +#define PF_NX_ENABLED 12 +#define PF_SSE3_INSTRUCTIONS_AVAILABLE 13 +#define PF_COMPARE_EXCHANGE128 14 +#define PF_COMPARE64_EXCHANGE128 15 +#define PF_CHANNELS_ENABLED 16 +#define PF_XSAVE_ENABLED 17 +#define PF_ARM_VFP_32_REGISTERS_AVAILABLE 18 +#define PF_ARM_NEON_INSTRUCTIONS_AVAILABLE 19 +#define PF_SECOND_LEVEL_ADDRESS_TRANSLATION 20 +#define PF_VIRT_FIRMWARE_ENABLED 21 +#define PF_RDWRFSGSBASE_AVAILABLE 22 +#define PF_FASTFAIL_AVAILABLE 23 +#define PF_ARM_DIVIDE_INSTRUCTION_AVAILABLE 24 +#define PF_ARM_64BIT_LOADSTORE_ATOMIC 25 +#define PF_ARM_EXTERNAL_CACHE_AVAILABLE 26 +#define PF_ARM_FMAC_INSTRUCTIONS_AVAILABLE 27 +#define PF_RDRAND_INSTRUCTION_AVAILABLE 28 +#define PF_ARM_V8_INSTRUCTIONS_AVAILABLE 29 +#define PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE 30 +#define PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE 31 #define MAXIMUM_WAIT_OBJECTS 64 Modified: trunk/reactos/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] Sat May 2 22:20:18 2015 @@ -3301,77 +3301,77 @@ #if !defined(_WINBASE_) -#if defined(_WIN64) && (defined(_NTDRIVER_) || defined(_NTDDK_) || defined(_NTIFS_) || defined(_NTHAL_) || defined(_NTOSP_)) +#if defined(_WIN64) && !defined(_NTSYSTEM_) && (defined(_NTDRIVER_) || defined(_NTDDK_) || defined(_NTIFS_) || defined(_NTHAL_) || !defined(_NTOSP_)) NTKERNELAPI VOID InitializeSListHead( _Out_ PSLIST_HEADER SListHead); -#else +#else /* defined(_WIN64) && ... */ + +/* HACK */ +_IRQL_requires_max_(APC_LEVEL) +NTKERNELAPI +DECLSPEC_NORETURN +VOID +NTAPI +ExRaiseStatus( + _In_ NTSTATUS Status); FORCEINLINE VOID InitializeSListHead( _Out_ PSLIST_HEADER SListHead) { +#if defined(_WIN64) + if (((ULONG_PTR)SListHead & 0xf) != 0) { + ExRaiseStatus(STATUS_DATATYPE_MISALIGNMENT); + } #if defined(_IA64_) - ULONG64 FeatureBits; -#endif - -#if defined(_WIN64) - if (((ULONG_PTR)SListHead & 0xf) != 0) { - RtlRaiseStatus(STATUS_DATATYPE_MISALIGNMENT); - } -#endif - RtlZeroMemory(SListHead, sizeof(SLIST_HEADER)); -#if defined(_IA64_) - FeatureBits = __getReg(CV_IA64_CPUID4); - if ((FeatureBits & KF_16BYTE_INSTR) != 0) { - SListHead->Header16.HeaderType = 1; - SListHead->Header16.Init = 1; - } -#endif -} - -#endif - -#if defined(_WIN64) - -#define InterlockedPopEntrySList(Head) \ - ExpInterlockedPopEntrySList(Head) - -#define InterlockedPushEntrySList(Head, Entry) \ - ExpInterlockedPushEntrySList(Head, Entry) - -#define InterlockedFlushSList(Head) \ - ExpInterlockedFlushSList(Head) - -#define QueryDepthSList(Head) \ - ExQueryDepthSList(Head) - -#else /* !defined(_WIN64) */ + SListHead->Region = (ULONG_PTR)SListHead & VRN_MASK; +#else + SListHead->Region = 0; +#endif /* _IA64_ */ +#endif /* _WIN64 */ + SListHead->Alignment = 0; +} + +#endif /* defined(_WIN64) && ... */ + +#ifdef _X86_ + +NTKERNELAPI +PSLIST_ENTRY +FASTCALL +InterlockedPushEntrySList( + _Inout_ PSLIST_HEADER SListHead, + _Inout_ __drv_aliasesMem PSLIST_ENTRY SListEntry); NTKERNELAPI PSLIST_ENTRY FASTCALL InterlockedPopEntrySList( - _Inout_ PSLIST_HEADER ListHead); - -NTKERNELAPI -PSLIST_ENTRY -FASTCALL -InterlockedPushEntrySList( - _Inout_ PSLIST_HEADER ListHead, - _Inout_ __drv_aliasesMem PSLIST_ENTRY ListEntry); - -#define InterlockedFlushSList(ListHead) \ - ExInterlockedFlushSList(ListHead) - -#define QueryDepthSList(Head) \ - ExQueryDepthSList(Head) - -#endif /* !defined(_WIN64) */ + _Inout_ PSLIST_HEADER SListHead); + +#define InterlockedFlushSList(SListHead) \ + ExInterlockedFlushSList(SListHead) + +#else /* !_X86_ */ + +#define InterlockedPushEntrySList(SListHead, SListEntry) \ + ExpInterlockedPushEntrySList(SListHead, SListEntry) + +#define InterlockedPopEntrySList(SListHead) \ + ExpInterlockedPopEntrySList(SListHead) + +#define InterlockedFlushSList(SListHead) \ + ExpInterlockedFlushSList(SListHead) + +#endif /* _X86_ */ + +#define QueryDepthSList(SListHead) \ + ExQueryDepthSList(SListHead) #endif /* !defined(_WINBASE_) */ Modified: trunk/reactos/include/xdk/winnt_old.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/winnt_old.h?re… ============================================================================== --- trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/winnt_old.h [iso-8859-1] Sat May 2 22:20:18 2015 @@ -674,18 +674,40 @@ #define PROCESSOR_ARCHITECTURE_MSIL 8 #define PROCESSOR_ARCHITECTURE_AMD64 9 #define PROCESSOR_ARCHITECTURE_UNKNOWN 0xFFFF -#define PF_FLOATING_POINT_PRECISION_ERRATA 0 -#define PF_FLOATING_POINT_EMULATED 1 -#define PF_COMPARE_EXCHANGE_DOUBLE 2 -#define PF_MMX_INSTRUCTIONS_AVAILABLE 3 -#define PF_PPC_MOVEMEM_64BIT_OK 4 -#define PF_ALPHA_BYTE_INSTRUCTIONS 5 -#define PF_XMMI_INSTRUCTIONS_AVAILABLE 6 -#define PF_3DNOW_INSTRUCTIONS_AVAILABLE 7 -#define PF_RDTSC_INSTRUCTION_AVAILABLE 8 -#define PF_PAE_ENABLED 9 -#define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 -#define PF_NX_ENABLED 12 + +/* Processor features */ +#define PF_FLOATING_POINT_PRECISION_ERRATA 0 +#define PF_FLOATING_POINT_EMULATED 1 +#define PF_COMPARE_EXCHANGE_DOUBLE 2 +#define PF_MMX_INSTRUCTIONS_AVAILABLE 3 +#define PF_PPC_MOVEMEM_64BIT_OK 4 +#define PF_ALPHA_BYTE_INSTRUCTIONS 5 +#define PF_XMMI_INSTRUCTIONS_AVAILABLE 6 +#define PF_3DNOW_INSTRUCTIONS_AVAILABLE 7 +#define PF_RDTSC_INSTRUCTION_AVAILABLE 8 +#define PF_PAE_ENABLED 9 +#define PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 +#define PF_SSE_DAZ_MODE_AVAILABLE 11 +#define PF_NX_ENABLED 12 +#define PF_SSE3_INSTRUCTIONS_AVAILABLE 13 +#define PF_COMPARE_EXCHANGE128 14 +#define PF_COMPARE64_EXCHANGE128 15 +#define PF_CHANNELS_ENABLED 16 +#define PF_XSAVE_ENABLED 17 +#define PF_ARM_VFP_32_REGISTERS_AVAILABLE 18 +#define PF_ARM_NEON_INSTRUCTIONS_AVAILABLE 19 +#define PF_SECOND_LEVEL_ADDRESS_TRANSLATION 20 +#define PF_VIRT_FIRMWARE_ENABLED 21 +#define PF_RDWRFSGSBASE_AVAILABLE 22 +#define PF_FASTFAIL_AVAILABLE 23 +#define PF_ARM_DIVIDE_INSTRUCTION_AVAILABLE 24 +#define PF_ARM_64BIT_LOADSTORE_ATOMIC 25 +#define PF_ARM_EXTERNAL_CACHE_AVAILABLE 26 +#define PF_ARM_FMAC_INSTRUCTIONS_AVAILABLE 27 +#define PF_RDRAND_INSTRUCTION_AVAILABLE 28 +#define PF_ARM_V8_INSTRUCTIONS_AVAILABLE 29 +#define PF_ARM_V8_CRYPTO_INSTRUCTIONS_AVAILABLE 30 +#define PF_ARM_V8_CRC32_INSTRUCTIONS_AVAILABLE 31 /* also in ddk/ntifs.h */ #define FILE_ACTION_ADDED 0x00000001

1 0

[tkreuzer] 67520: [XDK/DDK/NDK] Simplify RtlXxxByteSwap macros (use them unconditionally)
by tkreuzer＠svn.reactos.org 02 May '15

02 May '15

Author: tkreuzer Date: Sat May 2 22:19:47 2015 New Revision: 67520 URL: http://svn.reactos.org/svn/reactos?rev=67520&view=rev Log: [XDK/DDK/NDK] Simplify RtlXxxByteSwap macros (use them unconditionally) Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/xdk/rtlfuncs.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=6752… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sat May 2 22:19:47 2015 @@ -11528,15 +11528,9 @@ #endif /* !defined(MIDL_PASS) */ /* Byte Swap Functions */ -#if (defined(_M_IX86) && (_MSC_FULL_VER > 13009037 || defined(__GNUC__))) || \ - ((defined(_M_AMD64) || defined(_M_IA64)) \ - && (_MSC_FULL_VER > 13009175 || defined(__GNUC__))) - #define RtlUshortByteSwap(_x) _byteswap_ushort((USHORT)(_x)) #define RtlUlongByteSwap(_x) _byteswap_ulong((_x)) #define RtlUlonglongByteSwap(_x) _byteswap_uint64((_x)) - -#endif #if DBG Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sat May 2 22:19:47 2015 @@ -1730,46 +1730,18 @@ // #ifdef NTOS_MODE_USER -#if (defined(_M_IX86) && (_MSC_FULL_VER > 13009037)) || \ - ((defined(_M_AMD64) || \ - defined(_M_IA64)) && (_MSC_FULL_VER > 13009175)) - unsigned short __cdecl _byteswap_ushort(unsigned short); unsigned long __cdecl _byteswap_ulong (unsigned long); unsigned __int64 __cdecl _byteswap_uint64(unsigned __int64); +#ifdef _MSC_VER #pragma intrinsic(_byteswap_ushort) #pragma intrinsic(_byteswap_ulong) #pragma intrinsic(_byteswap_uint64) +#endif // _MSC_VER #define RtlUshortByteSwap(_x) _byteswap_ushort((USHORT)(_x)) #define RtlUlongByteSwap(_x) _byteswap_ulong((_x)) #define RtlUlonglongByteSwap(_x) _byteswap_uint64((_x)) -#elif defined (__GNUC__) - -#define RtlUshortByteSwap(_x) _byteswap_ushort((USHORT)(_x)) -#define RtlUlongByteSwap(_x) _byteswap_ulong((_x)) -#define RtlUlonglongByteSwap(_x) _byteswap_uint64((_x)) - -#else - -#if (NTDDI_VERSION >= NTDDI_WIN2K) -NTSYSAPI -USHORT -FASTCALL -RtlUshortByteSwap(IN USHORT Source); - -NTSYSAPI -ULONG -FASTCALL -RtlUlongByteSwap(IN ULONG Source); - -NTSYSAPI -ULONGLONG -FASTCALL -RtlUlonglongByteSwap(IN ULONGLONG Source); -#endif - -#endif #endif // NTOS_MODE_USER // Modified: trunk/reactos/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] Sat May 2 22:19:47 2015 @@ -3184,15 +3184,9 @@ #endif /* !defined(MIDL_PASS) */ /* Byte Swap Functions */ -#if (defined(_M_IX86) && (_MSC_FULL_VER > 13009037 || defined(__GNUC__))) || \ - ((defined(_M_AMD64) || defined(_M_IA64)) \ - && (_MSC_FULL_VER > 13009175 || defined(__GNUC__))) - #define RtlUshortByteSwap(_x) _byteswap_ushort((USHORT)(_x)) #define RtlUlongByteSwap(_x) _byteswap_ulong((_x)) #define RtlUlonglongByteSwap(_x) _byteswap_uint64((_x)) - -#endif #if DBG

1 0

[tkreuzer] 67519: [CRT] Fix MSVC warnings
by tkreuzer＠svn.reactos.org 02 May '15

02 May '15

Author: tkreuzer Date: Sat May 2 22:19:31 2015 New Revision: 67519 URL: http://svn.reactos.org/svn/reactos?rev=67519&view=rev Log: [CRT] Fix MSVC warnings Modified: trunk/reactos/lib/sdk/crt/string/scanf.h Modified: trunk/reactos/lib/sdk/crt/string/scanf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/scanf.h… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] Sat May 2 22:19:31 2015 @@ -297,7 +297,7 @@ if (!seendigit) break; /* not a valid number */ st = 1; if (!suppress) { -#define _SET_NUMBER_(type) *va_arg(ap, type*) = negative ? -cur : cur +#define _SET_NUMBER_(type) *va_arg(ap, type*) = negative ? -(LONGLONG)cur : cur if (I64_prefix) _SET_NUMBER_(LONGLONG); else if (l_prefix) _SET_NUMBER_(LONG); else if (h_prefix == 1) _SET_NUMBER_(short int); @@ -640,7 +640,7 @@ if ((*(format - 1)) < *(format + 1)) RtlSetBits(&bitMask, *(format - 1) +1 , *(format + 1) - *(format - 1)); else - RtlSetBits(&bitMask, *(format + 1) , *(format - 1) - *(format + 1)); + RtlSetBits(&bitMask, *(format + 1) , *(format - 1) - *(format + 1)); format++; } else RtlSetBits(&bitMask, *format, 1);

1 0

[hbelusca] 67518: [NTVDM] Mouse: - Remove now useless code in mouse support in BIOS. - Implement INT 33h, AH=1Bh "Return mouse sensitivity" (returning hardcoded standard values since we don't suppo...
by hbelusca＠svn.reactos.org 02 May '15

02 May '15

Author: hbelusca Date: Sat May 2 20:48:08 2015 New Revision: 67518 URL: http://svn.reactos.org/svn/reactos?rev=67518&view=rev Log: [NTVDM] Mouse: - Remove now useless code in mouse support in BIOS. - Implement INT 33h, AH=1Bh "Return mouse sensitivity" (returning hardcoded standard values since we don't support custom sensitivities) (AH=13h and 1Ah are marked as UNSUPPORTED). - INT 33h, AH=1Fh "Disable mouse driver" returns in ES:BX the old INT 33h vector value: implement that. - Implement INT 33h, AH=21h "Software reset", AH=24h and 4Dh and 6Dh "Software version and mouse info", "pointer to copyright string" and "version 'string'" functionalities. DOS: - Initialize in Win2k3-ntvdm-compatible order the DOS drivers: NUL, then CON, then XMS, and then EMS. - Fix segment/offset inversion usage in INT 21h, AH=5Ch "Lock/Unlock region of file": when using MAKELONG macro to build a far pointer, the first parameter (loword) is the offset, and the second parameter (hiword) is the segment. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.c [iso-8859-1] Sat May 2 20:48:08 2015 @@ -17,11 +17,7 @@ #include "bios32p.h" #include "io.h" -#include "hardware/mouse.h" #include "hardware/ps2.h" - -// HACK: For the PS/2 bypass and MOUSE.COM driver direct call -#include "dos/mouse32.h" /* PRIVATE VARIABLES **********************************************************/ Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/moubios32.h [iso-8859-1] Sat May 2 20:48:08 2015 @@ -11,63 +11,6 @@ /* DEFINES ********************************************************************/ -#if 0 // This code is for the MOUSE.COM driver - -enum -{ - MOUSE_BUTTON_LEFT, - MOUSE_BUTTON_RIGHT, - MOUSE_BUTTON_MIDDLE, - NUM_MOUSE_BUTTONS -}; - -typedef struct _MOUSE_USER_HANDLER -{ - /* - * CallMask format: see table: http://www.ctyme.com/intr/rb-5968.htm#Table3171 - * Alternatively, see table: http://www.ctyme.com/intr/rb-5981.htm#Table3174 - */ - USHORT CallMask; - ULONG Callback; // Far pointer to the callback -} MOUSE_USER_HANDLER, *PMOUSE_USER_HANDLER; - -typedef struct _MOUSE_DRIVER_STATE -{ - SHORT ShowCount; - COORD Position; - WORD Character; - WORD ButtonState; - WORD PressCount[NUM_MOUSE_BUTTONS]; - COORD LastPress[NUM_MOUSE_BUTTONS]; - WORD ReleaseCount[NUM_MOUSE_BUTTONS]; - COORD LastRelease[NUM_MOUSE_BUTTONS]; - SHORT HorizCount; - SHORT VertCount; - WORD MickeysPerCellHoriz; - WORD MickeysPerCellVert; - - /* - * User Subroutine Handlers called on mouse events - */ - MOUSE_USER_HANDLER Handler0; // Handler compatible MS MOUSE v1.0+ - MOUSE_USER_HANDLER Handlers[3]; // Handlers compatible MS MOUSE v6.0+ - - struct - { - WORD ScreenMask; - WORD CursorMask; - } TextCursor; - - struct - { - COORD HotSpot; - WORD ScreenMask[16]; - WORD CursorMask[16]; - } GraphicsCursor; -} MOUSE_DRIVER_STATE, *PMOUSE_DRIVER_STATE; - -#endif - /* FUNCTIONS ******************************************************************/ VOID BiosMousePs2Interface(LPWORD Stack); Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Sat May 2 20:48:08 2015 @@ -768,7 +768,6 @@ { setES(HIWORD(INDOS_POINTER)); setBX(LOWORD(INDOS_POINTER)); - break; } @@ -1650,7 +1649,7 @@ if (getAL() == 0x00) { /* Lock region of file */ - if (DosLockFile(getBX(), MAKELONG(getCX(), getDX()), MAKELONG(getSI(), getDI()))) + if (DosLockFile(getBX(), MAKELONG(getDX(), getCX()), MAKELONG(getDI(), getSI()))) { Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; } @@ -1663,7 +1662,7 @@ else if (getAL() == 0x01) { /* Unlock region of file */ - if (DosUnlockFile(getBX(), MAKELONG(getCX(), getDX()), MAKELONG(getSI(), getDI()))) + if (DosUnlockFile(getBX(), MAKELONG(getDX(), getCX()), MAKELONG(getDI(), getSI()))) { Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; } @@ -2015,6 +2014,12 @@ RegisterDosInt32(0x29, DosFastConOut ); // DOS 2+ Fast Console Output RegisterDosInt32(0x2F, DosInt2Fh ); + /* Load the CON driver */ + ConDrvInitialize(); + + /* Load the XMS driver (HIMEM) */ + XmsInitialize(); + /* Load the EMS driver */ if (!EmsDrvInitialize(EMS_TOTAL_PAGES)) { @@ -2022,12 +2027,6 @@ "Try reducing the number of EMS pages.\n"); } - /* Load the XMS driver (HIMEM) */ - XmsInitialize(); - - /* Load the CON driver */ - ConDrvInitialize(); - return TRUE; } Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] Sat May 2 20:48:08 2015 @@ -29,16 +29,25 @@ /* PRIVATE VARIABLES **********************************************************/ -#define MICKEYS_PER_CELL_HORIZ 8 -#define MICKEYS_PER_CELL_VERT 16 +// FIXME: Because I don't know a better place to store the string +// I temporarily put it in BIOS space. This need to be moved to a +// proper place when this driver is interfaced correctly with DOS. +#define COPYRIGHT_POINTER MAKELONG(0xE100, 0xF000) +static const CHAR MouseCopyright[] = "ROS PS/2 16/32-bit Mouse Driver Compatible MS-MOUSE 6.26 Copyright (C) ReactOS Team 1996-2015"; + +// See FIXME from above. +#define VERSION_POINTER MAKELONG(0xE160, 0xF000) +static PWORD Version; + +#define MICKEYS_PER_CELL_HORIZ 8 +#define MICKEYS_PER_CELL_VERT 16 static BOOLEAN DriverEnabled = FALSE; static MOUSE_DRIVER_STATE DriverState; static DWORD OldIrqHandler; +static DWORD OldIntHandler; /* PRIVATE FUNCTIONS **********************************************************/ - -extern VOID WINAPI BiosMouseIrq(LPWORD Stack); static VOID PaintMouseCursor(VOID) { @@ -590,6 +599,13 @@ break; } + /* Define Double-Speed Threshold */ + case 0x13: + { + DPRINT1("INT 33h, AH=13h: Mouse double-speed threshold is UNSUPPORTED\n"); + break; + } + /* Exchange Interrupt Subroutines, compatible MS MOUSE v3.0+ (see function 0x0C) */ case 0x14: { @@ -772,11 +788,31 @@ break; } + /* Set Mouse Sensitivity */ + case 0x1A: + { + DPRINT1("INT 33h, AH=1Ah: Mouse sensitivity is UNSUPPORTED\n"); + break; + } + + /* Return Mouse Sensitivity */ + case 0x1B: + { + DPRINT1("INT 33h, AH=1Bh: Mouse sensitivity is UNSUPPORTED\n"); + + /* Return default values */ + setBX(50); // Horizontal speed + setCX(50); // Vertical speed + setDX(50); // Double speed threshold + break; + } + /* Disable Mouse Driver */ case 0x1F: { - setES(0x0000); - setBX(0x0000); + /* INT 33h vector before the mouse driver was first installed */ + setES(HIWORD(OldIntHandler)); + setBX(LOWORD(OldIntHandler)); DosMouseDisable(); break; @@ -786,6 +822,75 @@ case 0x20: { DosMouseEnable(); + break; + } + + /* Software Reset */ + case 0x21: + { + /* + * See: http://www.htl-steyr.ac.at/~morg/pcinfo/hardware/interrupts/inte3sq8.htm + * for detailed information and differences with respect to subfunction 0x00: + * http://www.htl-steyr.ac.at/~morg/pcinfo/hardware/interrupts/inte3j74.htm + */ + + SHORT i; + + DriverState.ShowCount = 0; + DriverState.ButtonState = 0; + + /* Initialize the default clipping range */ + DriverState.MinX = 0; + DriverState.MaxX = MOUSE_MAX_HORIZ - 1; + DriverState.MinY = 0; + DriverState.MaxY = MOUSE_MAX_VERT - 1; + + /* Initialize the counters */ + DriverState.HorizCount = DriverState.VertCount = 0; + + for (i = 0; i < NUM_MOUSE_BUTTONS; i++) + { + DriverState.PressCount[i] = DriverState.ReleaseCount[i] = 0; + } + + /* Return mouse information */ + setAX(0xFFFF); // Hardware & driver installed + setBX(NUM_MOUSE_BUTTONS); + + break; + } + + /* Get Software Version, Mouse Type, and IRQ Number, compatible MS MOUSE v6.26+ */ + case 0x24: + { + setBX(MOUSE_VERSION); // Version Number + + // FIXME: To be determined at runtime! + setCH(0x04); // PS/2 Type + setCL(0x00); // PS/2 Interrupt + + break; + } + + /* Return Pointer to Copyright String */ + case 0x4D: + { + setES(HIWORD(COPYRIGHT_POINTER)); + setDI(LOWORD(COPYRIGHT_POINTER)); + break; + } + + /* Get Version String (pointer) */ + case 0x6D: + { + /* + * The format of the version "string" is: + * Offset Size Description + * 00h BYTE major version + * 01h BYTE minor version (BCD) + */ + setES(HIWORD(VERSION_POINTER)); + setDI(LOWORD(VERSION_POINTER)); break; } @@ -883,6 +988,16 @@ /* Clear the state */ RtlZeroMemory(&DriverState, sizeof(DriverState)); + /* Setup the version variable in BCD format, compatible MS-MOUSE */ + Version = (PWORD)FAR_POINTER(VERSION_POINTER); + *Version = MAKEWORD(MOUSE_VERSION/0x0100, MOUSE_VERSION%0x0100); + + /* Mouse Driver Copyright */ + RtlCopyMemory(FAR_POINTER(COPYRIGHT_POINTER), MouseCopyright, sizeof(MouseCopyright)-1); + + /* Get the old mouse service interrupt handler */ + OldIntHandler = ((PDWORD)BaseAddress)[DOS_MOUSE_INTERRUPT]; + /* Initialize the interrupt handler */ RegisterDosInt32(DOS_MOUSE_INTERRUPT, DosMouseService); @@ -892,6 +1007,9 @@ VOID DosMouseCleanup(VOID) { + /* Restore the old mouse service interrupt handler */ + ((PDWORD)BaseAddress)[DOS_MOUSE_INTERRUPT] = OldIntHandler; + if (DriverState.ShowCount > 0) EraseMouseCursor(); DosMouseDisable(); } Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.h [iso-8859-1] Sat May 2 20:48:08 2015 @@ -10,6 +10,11 @@ #define _MOUSE32_H_ /* DEFINES ********************************************************************/ + +// +// We are ROS PS/2 Mouse Driver Version 6.26, compatible MS-MOUSE 6.26 +// +#define MOUSE_VERSION MAKEWORD(0x26, 0x06) #define DOS_MOUSE_INTERRUPT 0x33 #define MOUSE_IRQ_INT 0x74

1 0

[akhaldi] 67517: [BOOTDATA] Add missing font DPI entries in registry. By Ziliang Guo. CORE-8902
by akhaldi＠svn.reactos.org 02 May '15

02 May '15

Author: akhaldi Date: Sat May 2 19:55:55 2015 New Revision: 67517 URL: http://svn.reactos.org/svn/reactos?rev=67517&view=rev Log: [BOOTDATA] Add missing font DPI entries in registry. By Ziliang Guo. CORE-8902 Modified: trunk/reactos/boot/bootdata/hivesft.inf trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sat May 2 19:55:55 2015 @@ -261,6 +261,7 @@ ; Font substitutes HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Fonts",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes",,0x00000012 +HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontDPI","LogPixels",0x00010003,96 ; win32k GRE initialization HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\GRE_Initialize",,0x00000012 Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Sat May 2 19:55:55 2015 @@ -401,6 +401,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\IDConfigDB",,0x00000012 HKLM,"SYSTEM\CurrentControlSet\Control\IDConfigDB","CurrentConfig",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Control\IDConfigDB\Hardware Profiles\0000","FriendlyName",0x00000000,"New Hardware Profile" +HKLM,"SYSTEM\CurrentControlSet\Hardware Profiles\Current\Software\Fonts","LogPixels",0x00010003,96 ; Keyboard Layouts HKLM,"SYSTEM\CurrentControlSet\Control\Keyboard Layouts\00000401","Layout File",0x00000000,"kbda1.dll"

1 0

[akhaldi] 67516: [SYSSETUP] Fix timezone setup in the unattended install of ReactOS. Spotted and fixed by V. CORE-9648
by akhaldi＠svn.reactos.org 02 May '15

02 May '15

Author: akhaldi Date: Sat May 2 19:48:26 2015 New Revision: 67516 URL: http://svn.reactos.org/svn/reactos?rev=67516&view=rev Log: [SYSSETUP] Fix timezone setup in the unattended install of ReactOS. Spotted and fixed by V. CORE-9648 Modified: trunk/reactos/dll/win32/syssetup/wizard.c Modified: trunk/reactos/dll/win32/syssetup/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/wizard.… ============================================================================== --- trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/wizard.c [iso-8859-1] Sat May 2 19:48:26 2015 @@ -1219,27 +1219,36 @@ BOOL bFound = FALSE; unsigned long iLanguageID; - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SYSTEM\\CurrentControlSet\\Control\\NLS\\Language", - 0, - KEY_ALL_ACCESS, - &hKey)) - return FALSE; - - dwValueSize = 9 * sizeof(WCHAR); - if (RegQueryValueExW(hKey, - L"Default", - NULL, - NULL, - (LPBYTE)szLanguageIdString, - &dwValueSize)) - { + if (*lpIndex == -1) + { + *lpIndex = 85; /* fallback to GMT time zone */ + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\NLS\\Language", + 0, + KEY_ALL_ACCESS, + &hKey)) + return FALSE; + + dwValueSize = 9 * sizeof(WCHAR); + if (RegQueryValueExW(hKey, + L"Default", + NULL, + NULL, + (LPBYTE)szLanguageIdString, + &dwValueSize)) + { + RegCloseKey(hKey); + return FALSE; + } + + iLanguageID = wcstoul(szLanguageIdString, NULL, 16); RegCloseKey(hKey); - return FALSE; - } - - iLanguageID = wcstoul(szLanguageIdString, NULL, 16); - RegCloseKey(hKey); + } + else + { + iLanguageID = *lpIndex; + } if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones", @@ -1515,7 +1524,7 @@ else { ShowTimeZoneList(GetDlgItem(hwndDlg, IDC_TIMEZONELIST), - SetupData, 85 /* GMT time zone */); + SetupData, -1); SendDlgItemMessage(hwndDlg, IDC_AUTODAYLIGHT, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); }

1 0

[akhaldi] 67515: [WBEMDISP_WINETEST] Import from Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 02 May '15

02 May '15

Author: akhaldi Date: Sat May 2 19:40:48 2015 New Revision: 67515 URL: http://svn.reactos.org/svn/reactos?rev=67515&view=rev Log: [WBEMDISP_WINETEST] Import from Wine Staging 1.7.37. CORE-9246 Added: trunk/rostests/winetests/wbemdisp/ (with props) trunk/rostests/winetests/wbemdisp/CMakeLists.txt (with props) trunk/rostests/winetests/wbemdisp/testlist.c (with props) trunk/rostests/winetests/wbemdisp/wbemdisp.c (with props) Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Sat May 2 19:40:48 2015 @@ -104,6 +104,7 @@ add_subdirectory(uxtheme) add_subdirectory(vbscript) add_subdirectory(version) +add_subdirectory(wbemdisp) add_subdirectory(wbemprox) add_subdirectory(windowscodecs) add_subdirectory(windowscodecsext) Propchange: trunk/rostests/winetests/wbemdisp/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat May 2 19:40:48 2015 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/winetests/wbemdisp/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/winetests/wbemdisp/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Added: trunk/rostests/winetests/wbemdisp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wbemdisp/CMakeL… ============================================================================== --- trunk/rostests/winetests/wbemdisp/CMakeLists.txt (added) +++ trunk/rostests/winetests/wbemdisp/CMakeLists.txt [iso-8859-1] Sat May 2 19:40:48 2015 @@ -0,0 +1,7 @@ + +add_definitions(-DUSE_WINE_TODOS) +add_executable(wbemdisp_winetest wbemdisp.c testlist.c) +target_link_libraries(wbemdisp_winetest uuid) +set_module_type(wbemdisp_winetest win32cui) +add_importlibs(wbemdisp_winetest oleaut32 ole32 user32 msvcrt kernel32) +add_cd_file(TARGET wbemdisp_winetest DESTINATION reactos/bin FOR all) Propchange: trunk/rostests/winetests/wbemdisp/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/wbemdisp/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wbemdisp/testli… ============================================================================== --- trunk/rostests/winetests/wbemdisp/testlist.c (added) +++ trunk/rostests/winetests/wbemdisp/testlist.c [iso-8859-1] Sat May 2 19:40:48 2015 @@ -0,0 +1,12 @@ +/* Automatically generated by make depend; DO NOT EDIT!! */ + +#define STANDALONE +#include <wine/test.h> + +extern void func_wbemdisp(void); + +const struct test winetest_testlist[] = +{ + { "wbemdisp", func_wbemdisp }, + { 0, 0 } +}; Propchange: trunk/rostests/winetests/wbemdisp/testlist.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rostests/winetests/wbemdisp/wbemdisp.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wbemdisp/wbemdi… ============================================================================== --- trunk/rostests/winetests/wbemdisp/wbemdisp.c (added) +++ trunk/rostests/winetests/wbemdisp/wbemdisp.c [iso-8859-1] Sat May 2 19:40:48 2015 @@ -0,0 +1,251 @@ +/* + * Copyright 2015 Hans Leidekker for CodeWeavers + * + * 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 + */ + +#define COBJMACROS + +#include <stdio.h> +#include "windows.h" +#include "initguid.h" +#include "objidl.h" +#include "wbemdisp.h" +#include "wine/test.h" + +DEFINE_GUID(CLSID_WINMGMTS,0x172bddf8,0xceea,0x11d1,0x8b,0x05,0x00,0x60,0x08,0x06,0xd9,0xb6); +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + +static void test_ParseDisplayName(void) +{ + static const WCHAR biosW[] = {'W','i','n','3','2','_','B','i','o','s',0}; + static const WCHAR manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',0}; + static const WCHAR versionW[] = {'v','e','r','s','i','o','n',0}; + static const WCHAR nosuchW[] = {'N','o','S','u','c','h',0}; + static const WCHAR name1[] = + {'w','i','n','m','g','m','t','s',':',0}; + static const WCHAR name2[] = + {'w','i','n','m','g','m','t','s',':','\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',0}; + static const WCHAR name3[] = + {'w','i','n','m','g','m','t','s',':','\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',':', + 'W','i','n','3','2','_','L','o','g','i','c','a','l','D','i','s','k','.', + 'D','e','v','i','c','e','I','D','=','\'','C',':','\'',0}; + static const WCHAR name4[] = + {'w','i','n','m','g','m','t','s',':','\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',':', + 'W','i','n','3','2','_','S','e','r','v','i','c','e',0}; + static const struct + { + const WCHAR *name; + HRESULT hr; + REFIID iid; + ULONG eaten; + } tests[] = + { + { name1, S_OK, &IID_ISWbemServices, sizeof(name1)/sizeof(name1[0]) - 1 }, + { name2, S_OK, &IID_ISWbemServices, sizeof(name2)/sizeof(name2[0]) - 1 }, + { name3, S_OK, &IID_ISWbemObject, sizeof(name3)/sizeof(name3[0]) - 1 }, + { name4, S_OK, &IID_ISWbemObject, sizeof(name4)/sizeof(name4[0]) - 1 } + }; + LCID english = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); + IParseDisplayName *displayname; + IBindCtx *ctx; + IMoniker *moniker; + IUnknown *obj; + BSTR str; + ULONG i, eaten, count; + HRESULT hr; + + hr = CoCreateInstance( &CLSID_WINMGMTS, NULL, CLSCTX_INPROC_SERVER, &IID_IParseDisplayName, (void **)&displayname ); + if (hr != S_OK) + { + win_skip( "can't create instance of WINMGMTS\n" ); + return; + } + + hr = CreateBindCtx( 0, &ctx ); + ok( hr == S_OK, "got %x\n", hr ); + + for (i =0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + str = SysAllocString( tests[i].name ); + eaten = 0xdeadbeef; + moniker = NULL; + hr = IParseDisplayName_ParseDisplayName( displayname, NULL, str, &eaten, &moniker ); + SysFreeString( str ); + ok( hr == tests[i].hr, "%u: got %x\n", i, hr ); + ok( eaten == tests[i].eaten, "%u: got %u\n", i, eaten ); + if (moniker) + { + obj = NULL; + hr = IMoniker_BindToObject( moniker, ctx, NULL, tests[i].iid, (void **)&obj ); + ok( hr == S_OK, "%u: got %x\n", i, hr ); + if (obj) IUnknown_Release( obj ); + IMoniker_Release( moniker ); + } + } + + str = SysAllocString( name1 ); + eaten = 0xdeadbeef; + moniker = NULL; + hr = IParseDisplayName_ParseDisplayName( displayname, NULL, str, &eaten, &moniker ); + SysFreeString( str ); + ok( hr == S_OK, "got %x\n", hr ); + ok( eaten == lstrlenW(name1), "got %u\n", eaten ); + if (moniker) + { + ISWbemServices *services = NULL; + + hr = IMoniker_BindToObject( moniker, ctx, NULL, &IID_IUnknown, (void **)&services ); + ok( hr == S_OK, "got %x\n", hr ); + if (services) + { + ISWbemObjectSet *objectset = NULL; + + str = SysAllocString( biosW ); + hr = ISWbemServices_InstancesOf( services, str, 0, NULL, &objectset ); + SysFreeString( str ); + ok( hr == S_OK, "got %x\n", hr ); + if (objectset) + { + hr = ISWbemObjectSet_get__NewEnum( objectset, &obj ); + ok( hr == S_OK, "got %x\n", hr ); + if (obj) + { + IEnumVARIANT *enumvar = NULL; + + hr = IUnknown_QueryInterface( obj, &IID_IEnumVARIANT, (void **)&enumvar ); + ok( hr == S_OK, "got %x\n", hr ); + + if (enumvar) + { + VARIANT var, res; + ULONG fetched; + IDispatch *dispatch = NULL; + DISPID dispid; + DISPPARAMS params; + UINT arg_err; + + fetched = 0xdeadbeef; + hr = IEnumVARIANT_Next( enumvar, 0, &var, &fetched ); + ok( hr == S_OK, "got %x\n", hr ); + ok( !fetched, "got %u\n", fetched ); + + fetched = 0xdeadbeef; + V_VT( &var ) = VT_ERROR; + V_ERROR( &var ) = 0xdeadbeef; + hr = IEnumVARIANT_Next( enumvar, 1, &var, &fetched ); + ok( hr == S_OK, "got %x\n", hr ); + ok( fetched == 1, "got %u\n", fetched ); + ok( V_VT( &var ) == VT_DISPATCH, "got %u\n", V_VT( &var ) ); + ok( V_DISPATCH( &var ) != (IDispatch *)0xdeadbeef, "got %u\n", V_VT( &var ) ); + + dispatch = V_DISPATCH( &var ); + count = 0; + hr = IDispatch_GetTypeInfoCount( dispatch, &count ); + ok( hr == S_OK, "got %x\n", hr ); + ok( count == 1, "got %u\n", count ); + + str = SysAllocString( manufacturerW ); + dispid = 0xdeadbeef; + hr = IDispatch_GetIDsOfNames( dispatch, &IID_NULL, &str, 1, english, &dispid ); + SysFreeString( str ); + ok( hr == S_OK, "got %x\n", hr ); + ok( dispid == 0x1800001 || dispid == 0x10b /* win2k */, "got %x\n", dispid ); + + str = SysAllocString( versionW ); + dispid = 0xdeadbeef; + hr = IDispatch_GetIDsOfNames( dispatch, &IID_NULL, &str, 1, english, &dispid ); + SysFreeString( str ); + ok( hr == S_OK, "got %x\n", hr ); + ok( dispid == 0x1800002 || dispid == 0x119 /* win2k */, "got %x\n", dispid ); + + str = SysAllocString( nosuchW ); + dispid = 0xdeadbeef; + hr = IDispatch_GetIDsOfNames( dispatch, &IID_NULL, &str, 1, english, &dispid ); + SysFreeString( str ); + ok( hr == DISP_E_UNKNOWNNAME, "got %x\n", hr ); + ok( dispid == DISPID_UNKNOWN, "got %x\n", dispid ); + + str = SysAllocString( manufacturerW ); + dispid = 0xdeadbeef; + hr = IDispatch_GetIDsOfNames( dispatch, &IID_NULL, &str, 1, english, &dispid ); + SysFreeString( str ); + ok( hr == S_OK, "got %x\n", hr ); + ok( dispid == 0x1800001 || dispid == 0x10b /* win2k */, "got %x\n", dispid ); + + if (dispid == 0x1800001) /* crashes on win2k */ + { + V_VT( &res ) = VT_ERROR; + V_BSTR( &res ) = (BSTR)0xdeadbeef; + params.rgvarg = (VARIANTARG *)0xdeadbeef; + params.rgdispidNamedArgs = (DISPID *)0xdeadbeef; + params.cArgs = params.cNamedArgs = 0xdeadbeef; + arg_err = 0xdeadbeef; + hr = IDispatch_Invoke( dispatch, DISPID_UNKNOWN, &IID_NULL, english, + DISPATCH_METHOD|DISPATCH_PROPERTYGET, + &params, &res, NULL, &arg_err ); + ok( hr == DISP_E_MEMBERNOTFOUND || hr == S_OK /* winxp */, "got %x\n", hr ); + ok( params.rgvarg == (VARIANTARG *)0xdeadbeef, "got %p\n", params.rgvarg ); + ok( params.rgdispidNamedArgs == (DISPID *)0xdeadbeef, "got %p\n", params.rgdispidNamedArgs ); + ok( params.cArgs == 0xdeadbeef, "got %u\n", params.cArgs ); + ok( params.cNamedArgs == 0xdeadbeef, "got %u\n", params.cNamedArgs ); + ok( V_VT( &res ) == VT_ERROR, "got %u\n", V_VT( &res ) ); + ok( V_ERROR( &res ) == 0xdeadbeef, "got %u\n", V_VT( &res ) ); + ok( arg_err == 0xdeadbeef, "got %u\n", arg_err ); + if (hr == S_OK) VariantClear( &res ); + } + + V_VT( &res ) = VT_ERROR; + V_BSTR( &res ) = (BSTR)0xdeadbeef; + memset( &params, 0, sizeof(params) ); + hr = IDispatch_Invoke( dispatch, dispid, &IID_NULL, english, + DISPATCH_METHOD|DISPATCH_PROPERTYGET, + &params, &res, NULL, NULL ); + ok( hr == S_OK, "got %x\n", hr ); + ok( params.rgvarg == NULL, "got %p\n", params.rgvarg ); + ok( params.rgdispidNamedArgs == NULL, "got %p\n", params.rgdispidNamedArgs ); + ok( !params.cArgs, "got %u\n", params.cArgs ); + ok( !params.cNamedArgs, "got %u\n", params.cNamedArgs ); + ok( V_VT( &res ) == VT_BSTR, "got %u\n", V_VT( &res ) ); + ok( V_BSTR( &res ) != (BSTR)0xdeadbeef, "got %u\n", V_VT( &res ) ); + VariantClear( &res ); + VariantClear( &var ); + + fetched = 0xdeadbeef; + hr = IEnumVARIANT_Next( enumvar, 1, &var, &fetched ); + ok( hr == S_FALSE, "got %x\n", hr ); + ok( !fetched, "got %u\n", fetched ); + + IEnumVARIANT_Release( enumvar ); + } + IUnknown_Release( obj ); + } + ISWbemObjectSet_Release( objectset ); + } + IUnknown_Release( services ); + } + IMoniker_Release( moniker ); + } + + IBindCtx_Release( ctx ); + IParseDisplayName_Release( displayname ); +} + +START_TEST(wbemdisp) +{ + CoInitialize( NULL ); + test_ParseDisplayName(); + CoUninitialize(); +} Propchange: trunk/rostests/winetests/wbemdisp/wbemdisp.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 67514: [WBEMDISP] Sync with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 02 May '15

02 May '15

Author: akhaldi Date: Sat May 2 19:38:14 2015 New Revision: 67514 URL: http://svn.reactos.org/svn/reactos?rev=67514&view=rev Log: [WBEMDISP] Sync with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt trunk/reactos/dll/win32/wbemdisp/guid.c trunk/reactos/dll/win32/wbemdisp/locator.c trunk/reactos/dll/win32/wbemdisp/main.c trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemdisp/CMakeLists.txt [iso-8859-1] Sat May 2 19:38:14 2015 @@ -27,6 +27,6 @@ set_module_type(wbemdisp win32dll) target_link_libraries(wbemdisp uuid wine) add_dependencies(wbemdisp stdole2 wbemdisp_idlheader) -add_importlibs(wbemdisp oleaut32 msvcrt kernel32 ntdll) +add_importlibs(wbemdisp oleaut32 ole32 msvcrt kernel32 ntdll) add_pch(wbemdisp wbemdisp_private.h SOURCE) add_cd_file(TARGET wbemdisp DESTINATION reactos/system32/wbem FOR all) Modified: trunk/reactos/dll/win32/wbemdisp/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/guid.c?… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/guid.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemdisp/guid.c [iso-8859-1] Sat May 2 19:38:14 2015 @@ -12,5 +12,7 @@ #include <initguid.h> #include <wbemdisp_classes.h> #include <wbemdisp.h> +#include <wbemcli.h> +#include <wmiutils.h> /* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Modified: trunk/reactos/dll/win32/wbemdisp/locator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/locator… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/locator.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemdisp/locator.c [iso-8859-1] Sat May 2 19:38:14 2015 @@ -18,78 +18,16 @@ #include "wbemdisp_private.h" -#include <winnls.h> -#include <oleauto.h> - -struct locator -{ - ISWbemLocator ISWbemLocator_iface; - LONG refs; -}; - -static inline struct locator *impl_from_ISWbemLocator( ISWbemLocator *iface ) -{ - return CONTAINING_RECORD( iface, struct locator, ISWbemLocator_iface ); -} - -static ULONG WINAPI locator_AddRef( - ISWbemLocator *iface ) -{ - struct locator *locator = impl_from_ISWbemLocator( iface ); - return InterlockedIncrement( &locator->refs ); -} - -static ULONG WINAPI locator_Release( - ISWbemLocator *iface ) -{ - struct locator *locator = impl_from_ISWbemLocator( iface ); - LONG refs = InterlockedDecrement( &locator->refs ); - if (!refs) - { - TRACE( "destroying %p\n", locator ); - heap_free( locator ); - } - return refs; -} - -static HRESULT WINAPI locator_QueryInterface( - ISWbemLocator *iface, - REFIID riid, - void **ppvObject ) -{ - struct locator *locator = impl_from_ISWbemLocator( iface ); - - TRACE( "%p, %s, %p\n", locator, debugstr_guid( riid ), ppvObject ); - - if (IsEqualGUID( riid, &IID_ISWbemLocator ) || - IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IUnknown )) - { - *ppvObject = iface; - } - else - { - FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); - return E_NOINTERFACE; - } - ISWbemLocator_AddRef( iface ); - return S_OK; -} - -static HRESULT WINAPI locator_GetTypeInfoCount( - ISWbemLocator *iface, - UINT *count ) -{ - struct locator *locator = impl_from_ISWbemLocator( iface ); - - TRACE( "%p, %p\n", locator, count ); - *count = 1; - return S_OK; -} +#include <wbemcli.h> + +static HRESULT EnumVARIANT_create( IEnumWbemClassObject *, IEnumVARIANT ** ); enum type_id { ISWbemLocator_tid, + ISWbemObject_tid, + ISWbemObjectSet_tid, + ISWbemServices_tid, last_tid }; @@ -98,7 +36,10 @@ static REFIID wbemdisp_tid_id[] = { - &IID_ISWbemLocator + &IID_ISWbemLocator, + &IID_ISWbemObject, + &IID_ISWbemObjectSet, + &IID_ISWbemServices }; static HRESULT get_typeinfo( enum type_id tid, ITypeInfo **ret ) @@ -132,6 +73,1179 @@ ITypeInfo_Release( typeinfo ); } *ret = wbemdisp_typeinfo[tid]; + ITypeInfo_AddRef( *ret ); + return S_OK; +} + +#define DISPID_BASE 0x1800000 + +struct member +{ + BSTR name; + DISPID dispid; +}; + +struct object +{ + ISWbemObject ISWbemObject_iface; + LONG refs; + IWbemClassObject *object; + struct member *members; + UINT nb_members; + DISPID last_dispid; +}; + +static inline struct object *impl_from_ISWbemObject( + ISWbemObject *iface ) +{ + return CONTAINING_RECORD( iface, struct object, ISWbemObject_iface ); +} + +static ULONG WINAPI object_AddRef( + ISWbemObject *iface ) +{ + struct object *object = impl_from_ISWbemObject( iface ); + return InterlockedIncrement( &object->refs ); +} + +static ULONG WINAPI object_Release( + ISWbemObject *iface ) +{ + struct object *object = impl_from_ISWbemObject( iface ); + LONG refs = InterlockedDecrement( &object->refs ); + if (!refs) + { + UINT i; + + TRACE( "destroying %p\n", object ); + IWbemClassObject_Release( object->object ); + for (i = 0; i < object->nb_members; i++) SysFreeString( object->members[i].name ); + heap_free( object->members ); + heap_free( object ); + } + return refs; +} + +static HRESULT WINAPI object_QueryInterface( + ISWbemObject *iface, + REFIID riid, + void **ppvObject ) +{ + struct object *object = impl_from_ISWbemObject( iface ); + + TRACE( "%p %s %p\n", object, debugstr_guid(riid), ppvObject ); + + if (IsEqualGUID( riid, &IID_ISWbemObject ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = object; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemObject_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI object_GetTypeInfoCount( + ISWbemObject *iface, + UINT *count ) +{ + struct object *object = impl_from_ISWbemObject( iface ); + + TRACE( "%p, %p\n", object, count ); + *count = 1; + return S_OK; +} + +static HRESULT WINAPI object_GetTypeInfo( + ISWbemObject *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + struct object *object = impl_from_ISWbemObject( iface ); + FIXME( "%p, %u, %u, %p\n", object, index, lcid, info ); + return E_NOTIMPL; +} + +#define DISPID_BASE 0x1800000 + +static HRESULT init_members( struct object *object ) +{ + LONG bound, i; + SAFEARRAY *sa; + HRESULT hr; + + if (object->members) return S_OK; + + hr = IWbemClassObject_GetNames( object->object, NULL, 0, NULL, &sa ); + if (FAILED( hr )) return hr; + hr = SafeArrayGetUBound( sa, 1, &bound ); + if (FAILED( hr )) + { + SafeArrayDestroy( sa ); + return hr; + } + if (!(object->members = heap_alloc( sizeof(struct member) * (bound + 1) ))) + { + SafeArrayDestroy( sa ); + return E_OUTOFMEMORY; + } + for (i = 0; i <= bound; i++) + { + hr = SafeArrayGetElement( sa, &i, &object->members[i].name ); + if (FAILED( hr )) + { + for (i--; i >= 0; i--) SysFreeString( object->members[i].name ); + SafeArrayDestroy( sa ); + heap_free( object->members ); + object->members = NULL; + return E_OUTOFMEMORY; + } + object->members[i].dispid = 0; + } + object->nb_members = bound + 1; + SafeArrayDestroy( sa ); + return S_OK; +} + +static DISPID get_member_dispid( struct object *object, const WCHAR *name ) +{ + UINT i; + for (i = 0; i < object->nb_members; i++) + { + if (!strcmpiW( object->members[i].name, name )) + { + if (!object->members[i].dispid) object->members[i].dispid = ++object->last_dispid; + return object->members[i].dispid; + } + } + return DISPID_UNKNOWN; +} + +static HRESULT WINAPI object_GetIDsOfNames( + ISWbemObject *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + struct object *object = impl_from_ISWbemObject( iface ); + HRESULT hr; + UINT i; + + TRACE( "%p, %s, %p, %u, %u, %p\n", object, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = init_members( object ); + if (FAILED( hr )) return hr; + + for (i = 0; i < count; i++) + { + if ((dispid[i] = get_member_dispid( object, names[i] )) == DISPID_UNKNOWN) break; + } + if (i != count) return DISP_E_UNKNOWNNAME; + return S_OK; +} + +static BSTR get_member_name( struct object *object, DISPID dispid ) +{ + UINT i; + for (i = 0; i < object->nb_members; i++) + { + if (object->members[i].dispid == dispid) return object->members[i].name; + } + return NULL; +} + +static HRESULT WINAPI object_Invoke( + ISWbemObject *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + struct object *object = impl_from_ISWbemObject( iface ); + BSTR name; + + TRACE( "%p, %x, %s, %u, %x, %p, %p, %p, %p\n", object, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + if (flags != (DISPATCH_METHOD|DISPATCH_PROPERTYGET)) + { + FIXME( "flags %x not supported\n", flags ); + return E_NOTIMPL; + } + if (!(name = get_member_name( object, member ))) + return DISP_E_MEMBERNOTFOUND; + + memset( params, 0, sizeof(*params) ); + return IWbemClassObject_Get( object->object, name, 0, result, NULL, NULL ); +} + +static HRESULT WINAPI object_Put_( + ISWbemObject *iface, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + ISWbemObjectPath **objWbemObjectPath ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static const ISWbemObjectVtbl object_vtbl = +{ + object_QueryInterface, + object_AddRef, + object_Release, + object_GetTypeInfoCount, + object_GetTypeInfo, + object_GetIDsOfNames, + object_Invoke, + object_Put_ +}; + +static HRESULT SWbemObject_create( IWbemClassObject *wbem_object, ISWbemObject **obj ) +{ + struct object *object; + + TRACE( "%p, %p\n", obj, wbem_object ); + + if (!(object = heap_alloc( sizeof(*object) ))) return E_OUTOFMEMORY; + object->ISWbemObject_iface.lpVtbl = &object_vtbl; + object->refs = 1; + object->object = wbem_object; + IWbemClassObject_AddRef( object->object ); + object->members = NULL; + object->nb_members = 0; + object->last_dispid = DISPID_BASE; + + *obj = &object->ISWbemObject_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} + +struct objectset +{ + ISWbemObjectSet ISWbemObjectSet_iface; + LONG refs; + IEnumWbemClassObject *objectenum; +}; + +static inline struct objectset *impl_from_ISWbemObjectSet( + ISWbemObjectSet *iface ) +{ + return CONTAINING_RECORD( iface, struct objectset, ISWbemObjectSet_iface ); +} + +static ULONG WINAPI objectset_AddRef( + ISWbemObjectSet *iface ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + return InterlockedIncrement( &objectset->refs ); +} + +static ULONG WINAPI objectset_Release( + ISWbemObjectSet *iface ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + LONG refs = InterlockedDecrement( &objectset->refs ); + if (!refs) + { + TRACE( "destroying %p\n", objectset ); + IEnumWbemClassObject_Release( objectset->objectenum ); + heap_free( objectset ); + } + return refs; +} + +static HRESULT WINAPI objectset_QueryInterface( + ISWbemObjectSet *iface, + REFIID riid, + void **ppvObject ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + + TRACE( "%p %s %p\n", objectset, debugstr_guid(riid), ppvObject ); + + if (IsEqualGUID( riid, &IID_ISWbemObjectSet ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = objectset; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemObjectSet_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI objectset_GetTypeInfoCount( + ISWbemObjectSet *iface, + UINT *count ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + TRACE( "%p, %p\n", objectset, count ); + *count = 1; + return S_OK; +} + +static HRESULT WINAPI objectset_GetTypeInfo( + ISWbemObjectSet *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + TRACE( "%p, %u, %u, %p\n", objectset, index, lcid, info ); + + return get_typeinfo( ISWbemObjectSet_tid, info ); +} + +static HRESULT WINAPI objectset_GetIDsOfNames( + ISWbemObjectSet *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", objectset, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemObjectSet_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI objectset_Invoke( + ISWbemObjectSet *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", objectset, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemObjectSet_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &objectset->ISWbemObjectSet_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI objectset_get__NewEnum( + ISWbemObjectSet *iface, + IUnknown **pUnk ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + IEnumWbemClassObject *objectenum; + HRESULT hr; + + TRACE( "%p, %p\n", objectset, pUnk ); + + hr = IEnumWbemClassObject_Clone( objectset->objectenum, &objectenum ); + if (FAILED( hr )) return hr; + + hr = EnumVARIANT_create( objectenum, (IEnumVARIANT **)pUnk ); + IEnumWbemClassObject_Release( objectenum ); + return hr; +} + +static HRESULT WINAPI objectset_Item( + ISWbemObjectSet *iface, + BSTR strObjectPath, + LONG iFlags, + ISWbemObject **objWbemObject ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI objectset_get_Count( + ISWbemObjectSet *iface, + LONG *iCount ) +{ + struct objectset *objectset = impl_from_ISWbemObjectSet( iface ); + LONG count = 0, total = 0; + + TRACE( "%p, %p\n", objectset, iCount ); + + while (IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ) == S_OK) count++; + + IEnumWbemClassObject_Reset( objectset->objectenum ); + while (IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ) == S_OK) total++; + + count = total - count; + IEnumWbemClassObject_Reset( objectset->objectenum ); + while (count--) IEnumWbemClassObject_Skip( objectset->objectenum, WBEM_INFINITE, 1 ); + + *iCount = total; + return S_OK; +} + +static HRESULT WINAPI objectset_get_Security_( + ISWbemObjectSet *iface, + ISWbemSecurity **objWbemSecurity ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI objectset_ItemIndex( + ISWbemObjectSet *iface, + LONG lIndex, + ISWbemObject **objWbemObject ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static const ISWbemObjectSetVtbl objectset_vtbl = +{ + objectset_QueryInterface, + objectset_AddRef, + objectset_Release, + objectset_GetTypeInfoCount, + objectset_GetTypeInfo, + objectset_GetIDsOfNames, + objectset_Invoke, + objectset_get__NewEnum, + objectset_Item, + objectset_get_Count, + objectset_get_Security_, + objectset_ItemIndex +}; + +static HRESULT SWbemObjectSet_create( IEnumWbemClassObject *wbem_objectenum, ISWbemObjectSet **obj ) +{ + struct objectset *objectset; + + TRACE( "%p, %p\n", obj, wbem_objectenum ); + + if (!(objectset = heap_alloc( sizeof(*objectset) ))) return E_OUTOFMEMORY; + objectset->ISWbemObjectSet_iface.lpVtbl = &objectset_vtbl; + objectset->refs = 1; + objectset->objectenum = wbem_objectenum; + IEnumWbemClassObject_AddRef( objectset->objectenum ); + + *obj = &objectset->ISWbemObjectSet_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} + +struct enumvar +{ + IEnumVARIANT IEnumVARIANT_iface; + LONG refs; + IEnumWbemClassObject *objectenum; +}; + +static inline struct enumvar *impl_from_IEnumVARIANT( + IEnumVARIANT *iface ) +{ + return CONTAINING_RECORD( iface, struct enumvar, IEnumVARIANT_iface ); +} + +static ULONG WINAPI enumvar_AddRef( + IEnumVARIANT *iface ) +{ + struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); + return InterlockedIncrement( &enumvar->refs ); +} + +static ULONG WINAPI enumvar_Release( + IEnumVARIANT *iface ) +{ + struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); + LONG refs = InterlockedDecrement( &enumvar->refs ); + if (!refs) + { + TRACE( "destroying %p\n", enumvar ); + IEnumWbemClassObject_Release( enumvar->objectenum ); + heap_free( enumvar ); + } + return refs; +} + +static HRESULT WINAPI enumvar_QueryInterface( + IEnumVARIANT *iface, + REFIID riid, + void **ppvObject ) +{ + struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); + + TRACE( "%p %s %p\n", enumvar, debugstr_guid(riid), ppvObject ); + + if (IsEqualGUID( riid, &IID_IEnumVARIANT ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = enumvar; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + IEnumVARIANT_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI enumvar_Next( IEnumVARIANT *iface, ULONG celt, VARIANT *var, ULONG *fetched ) +{ + struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); + IWbemClassObject *obj; + ULONG count = 0; + + TRACE( "%p, %u, %p, %p\n", iface, celt, var, fetched ); + + if (celt) IEnumWbemClassObject_Next( enumvar->objectenum, WBEM_INFINITE, 1, &obj, &count ); + if (count) + { + ISWbemObject *sobj; + HRESULT hr; + + hr = SWbemObject_create( obj, &sobj ); + IWbemClassObject_Release( obj ); + if (FAILED( hr )) return hr; + + V_VT( var ) = VT_DISPATCH; + V_DISPATCH( var ) = (IDispatch *)sobj; + } + if (fetched) *fetched = count; + return (count < celt) ? S_FALSE : S_OK; +} + +static HRESULT WINAPI enumvar_Skip( IEnumVARIANT *iface, ULONG celt ) +{ + struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); + + TRACE( "%p, %u\n", iface, celt ); + + return IEnumWbemClassObject_Skip( enumvar->objectenum, WBEM_INFINITE, celt ); +} + +static HRESULT WINAPI enumvar_Reset( IEnumVARIANT *iface ) +{ + struct enumvar *enumvar = impl_from_IEnumVARIANT( iface ); + + TRACE( "%p\n", iface ); + + return IEnumWbemClassObject_Reset( enumvar->objectenum ); +} + +static HRESULT WINAPI enumvar_Clone( IEnumVARIANT *iface, IEnumVARIANT **penum ) +{ + FIXME( "%p, %p\n", iface, penum ); + return E_NOTIMPL; +} + +static const struct IEnumVARIANTVtbl enumvar_vtbl = +{ + enumvar_QueryInterface, + enumvar_AddRef, + enumvar_Release, + enumvar_Next, + enumvar_Skip, + enumvar_Reset, + enumvar_Clone +}; + +static HRESULT EnumVARIANT_create( IEnumWbemClassObject *objectenum, IEnumVARIANT **obj ) +{ + struct enumvar *enumvar; + + if (!(enumvar = heap_alloc( sizeof(*enumvar) ))) return E_OUTOFMEMORY; + enumvar->IEnumVARIANT_iface.lpVtbl = &enumvar_vtbl; + enumvar->refs = 1; + enumvar->objectenum = objectenum; + IEnumWbemClassObject_AddRef( enumvar->objectenum ); + + *obj = &enumvar->IEnumVARIANT_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} + +struct services +{ + ISWbemServices ISWbemServices_iface; + LONG refs; + IWbemServices *services; +}; + +static inline struct services *impl_from_ISWbemServices( + ISWbemServices *iface ) +{ + return CONTAINING_RECORD( iface, struct services, ISWbemServices_iface ); +} + +static ULONG WINAPI services_AddRef( + ISWbemServices *iface ) +{ + struct services *services = impl_from_ISWbemServices( iface ); + return InterlockedIncrement( &services->refs ); +} + +static ULONG WINAPI services_Release( + ISWbemServices *iface ) +{ + struct services *services = impl_from_ISWbemServices( iface ); + LONG refs = InterlockedDecrement( &services->refs ); + if (!refs) + { + TRACE( "destroying %p\n", services ); + IWbemServices_Release( services->services ); + heap_free( services ); + } + return refs; +} + +static HRESULT WINAPI services_QueryInterface( + ISWbemServices *iface, + REFIID riid, + void **ppvObject ) +{ + struct services *services = impl_from_ISWbemServices( iface ); + + TRACE( "%p %s %p\n", services, debugstr_guid(riid), ppvObject ); + + if (IsEqualGUID( riid, &IID_ISWbemServices ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = services; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemServices_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI services_GetTypeInfoCount( + ISWbemServices *iface, + UINT *count ) +{ + struct services *services = impl_from_ISWbemServices( iface ); + TRACE( "%p, %p\n", services, count ); + + *count = 1; + return S_OK; +} + +static HRESULT WINAPI services_GetTypeInfo( + ISWbemServices *iface, + UINT index, + LCID lcid, + ITypeInfo **info ) +{ + struct services *services = impl_from_ISWbemServices( iface ); + TRACE( "%p, %u, %u, %p\n", services, index, lcid, info ); + + return get_typeinfo( ISWbemServices_tid, info ); +} + +static HRESULT WINAPI services_GetIDsOfNames( + ISWbemServices *iface, + REFIID riid, + LPOLESTR *names, + UINT count, + LCID lcid, + DISPID *dispid ) +{ + struct services *services = impl_from_ISWbemServices( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %s, %p, %u, %u, %p\n", services, debugstr_guid(riid), names, count, lcid, dispid ); + + if (!names || !count || !dispid) return E_INVALIDARG; + + hr = get_typeinfo( ISWbemServices_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_GetIDsOfNames( typeinfo, names, count, dispid ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI services_Invoke( + ISWbemServices *iface, + DISPID member, + REFIID riid, + LCID lcid, + WORD flags, + DISPPARAMS *params, + VARIANT *result, + EXCEPINFO *excep_info, + UINT *arg_err ) +{ + struct services *services = impl_from_ISWbemServices( iface ); + ITypeInfo *typeinfo; + HRESULT hr; + + TRACE( "%p, %d, %s, %d, %d, %p, %p, %p, %p\n", services, member, debugstr_guid(riid), + lcid, flags, params, result, excep_info, arg_err ); + + hr = get_typeinfo( ISWbemServices_tid, &typeinfo ); + if (SUCCEEDED(hr)) + { + hr = ITypeInfo_Invoke( typeinfo, &services->ISWbemServices_iface, member, flags, + params, result, excep_info, arg_err ); + ITypeInfo_Release( typeinfo ); + } + return hr; +} + +static HRESULT WINAPI services_Get( + ISWbemServices *iface, + BSTR strObjectPath, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + ISWbemObject **objWbemObject ) +{ + struct services *services = impl_from_ISWbemServices( iface ); + IWbemClassObject *obj; + HRESULT hr; + + TRACE( "%p, %s, %d, %p, %p\n", iface, debugstr_w(strObjectPath), iFlags, objWbemNamedValueSet, + objWbemObject ); + + if (objWbemNamedValueSet) FIXME( "ignoring context\n" ); + + hr = IWbemServices_GetObject( services->services, strObjectPath, iFlags, NULL, &obj, NULL ); + if (hr != S_OK) return hr; + + hr = SWbemObject_create( obj, objWbemObject ); + IWbemClassObject_Release( obj ); + return hr; +} + +static HRESULT WINAPI services_GetAsync( + ISWbemServices *iface, + IDispatch *objWbemSink, + BSTR strObjectPath, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_Delete( + ISWbemServices *iface, + BSTR strObjectPath, + LONG iFlags, + IDispatch *objWbemNamedValueSet ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_DeleteAsync( + ISWbemServices* This, + IDispatch *objWbemSink, + BSTR strObjectPath, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static BSTR build_query_string( const WCHAR *class ) +{ + static const WCHAR selectW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0}; + UINT len = strlenW(class) + sizeof(selectW) / sizeof(selectW[0]); + BSTR ret; + + if (!(ret = SysAllocStringLen( NULL, len ))) return NULL; + strcpyW( ret, selectW ); + strcatW( ret, class ); + return ret; +} + +static HRESULT WINAPI services_InstancesOf( + ISWbemServices *iface, + BSTR strClass, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + ISWbemObjectSet **objWbemObjectSet ) +{ + static const WCHAR wqlW[] = {'W','Q','L',0}; + BSTR query, wql = SysAllocString( wqlW ); + HRESULT hr; + + TRACE( "%p, %s, %x, %p, %p\n", iface, debugstr_w(strClass), iFlags, objWbemNamedValueSet, + objWbemObjectSet ); + + if (!(query = build_query_string( strClass ))) + { + SysFreeString( wql ); + return E_OUTOFMEMORY; + } + hr = ISWbemServices_ExecQuery( iface, query, wql, iFlags, objWbemNamedValueSet, objWbemObjectSet ); + SysFreeString( wql ); + SysFreeString( query ); + return hr; +} + +static HRESULT WINAPI services_InstancesOfAsync( + ISWbemServices *iface, + IDispatch *objWbemSink, + BSTR strClass, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_SubclassesOf( + ISWbemServices *iface, + BSTR strSuperclass, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + ISWbemObjectSet **objWbemObjectSet ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_SubclassesOfAsync( + ISWbemServices *iface, + IDispatch *objWbemSink, + BSTR strSuperclass, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_ExecQuery( + ISWbemServices *iface, + BSTR strQuery, + BSTR strQueryLanguage, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + ISWbemObjectSet **objWbemObjectSet ) +{ + struct services *services = impl_from_ISWbemServices( iface ); + IEnumWbemClassObject *iter; + HRESULT hr; + + TRACE( "%p, %s, %s, %x, %p, %p\n", iface, debugstr_w(strQuery), debugstr_w(strQueryLanguage), + iFlags, objWbemNamedValueSet, objWbemObjectSet ); + + if (objWbemNamedValueSet) FIXME( "ignoring context\n" ); + + hr = IWbemServices_ExecQuery( services->services, strQueryLanguage, strQuery, iFlags, NULL, &iter ); + if (hr != S_OK) return hr; + + hr = SWbemObjectSet_create( iter, objWbemObjectSet ); + IEnumWbemClassObject_Release( iter ); + return hr; +} + +static HRESULT WINAPI services_ExecQueryAsync( + ISWbemServices *iface, + IDispatch *objWbemSink, + BSTR strQuery, + BSTR strQueryLanguage, + LONG lFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_AssociatorsOf( + ISWbemServices *iface, + BSTR strObjectPath, + BSTR strAssocClass, + BSTR strResultClass, + BSTR strResultRole, + BSTR strRole, + VARIANT_BOOL bClassesOnly, + VARIANT_BOOL bSchemaOnly, + BSTR strRequiredAssocQualifier, + BSTR strRequiredQualifier, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + ISWbemObjectSet **objWbemObjectSet ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_AssociatorsOfAsync( + ISWbemServices *iface, + IDispatch *objWbemSink, + BSTR strObjectPath, + BSTR strAssocClass, + BSTR strResultClass, + BSTR strResultRole, + BSTR strRole, + VARIANT_BOOL bClassesOnly, + VARIANT_BOOL bSchemaOnly, + BSTR strRequiredAssocQualifier, + BSTR strRequiredQualifier, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_ReferencesTo( + ISWbemServices *iface, + BSTR strObjectPath, + BSTR strResultClass, + BSTR strRole, + VARIANT_BOOL bClassesOnly, + VARIANT_BOOL bSchemaOnly, + BSTR strRequiredQualifier, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + ISWbemObjectSet **objWbemObjectSet ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_ReferencesToAsync( + ISWbemServices *iface, + IDispatch *objWbemSink, + BSTR strObjectPath, + BSTR strResultClass, + BSTR strRole, + VARIANT_BOOL bClassesOnly, + VARIANT_BOOL bSchemaOnly, + BSTR strRequiredQualifier, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_ExecNotificationQuery( + ISWbemServices *iface, + BSTR strQuery, + BSTR strQueryLanguage, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + ISWbemEventSource **objWbemEventSource ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_ExecNotificationQueryAsync( + ISWbemServices *iface, + IDispatch *objWbemSink, + BSTR strQuery, + BSTR strQueryLanguage, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_ExecMethod( + ISWbemServices *iface, + BSTR strObjectPath, + BSTR strMethodName, + IDispatch *objWbemInParameters, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + ISWbemObject **objWbemOutParameters ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_ExecMethodAsync( + ISWbemServices *iface, + IDispatch *objWbemSink, + BSTR strObjectPath, + BSTR strMethodName, + IDispatch *objWbemInParameters, + LONG iFlags, + IDispatch *objWbemNamedValueSet, + IDispatch *objWbemAsyncContext ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI services_get_Security_( + ISWbemServices *iface, + ISWbemSecurity **objWbemSecurity ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static const ISWbemServicesVtbl services_vtbl = +{ + services_QueryInterface, + services_AddRef, + services_Release, + services_GetTypeInfoCount, + services_GetTypeInfo, + services_GetIDsOfNames, + services_Invoke, + services_Get, + services_GetAsync, + services_Delete, + services_DeleteAsync, + services_InstancesOf, + services_InstancesOfAsync, + services_SubclassesOf, + services_SubclassesOfAsync, + services_ExecQuery, + services_ExecQueryAsync, + services_AssociatorsOf, + services_AssociatorsOfAsync, + services_ReferencesTo, + services_ReferencesToAsync, + services_ExecNotificationQuery, + services_ExecNotificationQueryAsync, + services_ExecMethod, + services_ExecMethodAsync, + services_get_Security_ +}; + +static HRESULT SWbemServices_create( IWbemServices *wbem_services, ISWbemServices **obj ) +{ + struct services *services; + + TRACE( "%p, %p\n", obj, wbem_services ); + + if (!(services = heap_alloc( sizeof(*services) ))) return E_OUTOFMEMORY; + services->ISWbemServices_iface.lpVtbl = &services_vtbl; + services->refs = 1; + services->services = wbem_services; + IWbemServices_AddRef( services->services ); + + *obj = &services->ISWbemServices_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} + +struct locator +{ + ISWbemLocator ISWbemLocator_iface; + LONG refs; + IWbemLocator *locator; +}; + +static inline struct locator *impl_from_ISWbemLocator( ISWbemLocator *iface ) +{ + return CONTAINING_RECORD( iface, struct locator, ISWbemLocator_iface ); +} + +static ULONG WINAPI locator_AddRef( + ISWbemLocator *iface ) +{ + struct locator *locator = impl_from_ISWbemLocator( iface ); + return InterlockedIncrement( &locator->refs ); +} + +static ULONG WINAPI locator_Release( + ISWbemLocator *iface ) +{ + struct locator *locator = impl_from_ISWbemLocator( iface ); + LONG refs = InterlockedDecrement( &locator->refs ); + if (!refs) + { + TRACE( "destroying %p\n", locator ); + IWbemLocator_Release( locator->locator ); + heap_free( locator ); + } + return refs; +} + +static HRESULT WINAPI locator_QueryInterface( + ISWbemLocator *iface, + REFIID riid, + void **ppvObject ) +{ + struct locator *locator = impl_from_ISWbemLocator( iface ); + + TRACE( "%p, %s, %p\n", locator, debugstr_guid( riid ), ppvObject ); + + if (IsEqualGUID( riid, &IID_ISWbemLocator ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + ISWbemLocator_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI locator_GetTypeInfoCount( + ISWbemLocator *iface, + UINT *count ) +{ + struct locator *locator = impl_from_ISWbemLocator( iface ); + + TRACE( "%p, %p\n", locator, count ); + *count = 1; return S_OK; } @@ -200,6 +1314,31 @@ return hr; } +static BSTR build_resource_string( BSTR server, BSTR namespace ) +{ + static const WCHAR defaultW[] = {'r','o','o','t','\\','d','e','f','a','u','l','t',0}; + ULONG len, len_server = 0, len_namespace = 0; + BSTR ret; + + if (server && *server) len_server = strlenW( server ); + else len_server = 1; + if (namespace && *namespace) len_namespace = strlenW( namespace ); + else len_namespace = sizeof(defaultW) / sizeof(defaultW[0]) - 1; + + if (!(ret = SysAllocStringLen( NULL, 2 + len_server + 1 + len_namespace ))) return NULL; + + ret[0] = ret[1] = '\\'; + if (server && *server) strcpyW( ret + 2, server ); + else ret[2] = '.'; + + len = len_server + 2; + ret[len++] = '\\'; + + if (namespace && *namespace) strcpyW( ret + len, namespace ); + else strcpyW( ret + len, defaultW ); + return ret; +} + static HRESULT WINAPI locator_ConnectServer( ISWbemLocator *iface, BSTR strServer, @@ -212,10 +1351,33 @@ IDispatch *objWbemNamedValueSet, ISWbemServices **objWbemServices ) { - FIXME( "%p, %s, %s, %s, %p, %s, %s, 0x%08x, %p, %p\n", iface, debugstr_w(strServer), + struct locator *locator = impl_from_ISWbemLocator( iface ); + IWbemServices *services; + BSTR resource; + HRESULT hr; + + TRACE( "%p, %s, %s, %s, %p, %s, %s, 0x%08x, %p, %p\n", iface, debugstr_w(strServer), debugstr_w(strNamespace), debugstr_w(strUser), strPassword, debugstr_w(strLocale), debugstr_w(strAuthority), iSecurityFlags, objWbemNamedValueSet, objWbemServices ); - return E_NOTIMPL; + + if (objWbemNamedValueSet) FIXME( "context not supported\n" ); + + if (!locator->locator) + { + hr = CoCreateInstance( &CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, + (void **)&locator->locator ); + if (hr != S_OK) return hr; + } + + if (!(resource = build_resource_string( strServer, strNamespace ))) return E_OUTOFMEMORY; + hr = IWbemLocator_ConnectServer( locator->locator, resource, strUser, strPassword, strLocale, + iSecurityFlags, strAuthority, NULL, &services ); + SysFreeString( resource ); + if (hr != S_OK) return hr; + + hr = SWbemServices_create( services, objWbemServices ); + IWbemServices_Release( services ); + return hr; } static HRESULT WINAPI locator_get_Security_( @@ -248,6 +1410,7 @@ if (!(locator = heap_alloc( sizeof(*locator) ))) return E_OUTOFMEMORY; locator->ISWbemLocator_iface.lpVtbl = &locator_vtbl; locator->refs = 1; + locator->locator = NULL; *obj = &locator->ISWbemLocator_iface; TRACE( "returning iface %p\n", *obj ); Modified: trunk/reactos/dll/win32/wbemdisp/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/main.c?… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemdisp/main.c [iso-8859-1] Sat May 2 19:38:14 2015 @@ -19,9 +19,252 @@ #include "wbemdisp_private.h" #include <rpcproxy.h> +#include <wmiutils.h> #include <wbemdisp_classes.h> static HINSTANCE instance; + +struct moniker +{ + IMoniker IMoniker_iface; + LONG refs; + IUnknown *obj; +}; + +static inline struct moniker *impl_from_IMoniker( + IMoniker *iface ) +{ + return CONTAINING_RECORD( iface, struct moniker, IMoniker_iface ); +} + +static ULONG WINAPI moniker_AddRef( + IMoniker *iface ) +{ + struct moniker *moniker = impl_from_IMoniker( iface ); + return InterlockedIncrement( &moniker->refs ); +} + +static ULONG WINAPI moniker_Release( + IMoniker *iface ) +{ + struct moniker *moniker = impl_from_IMoniker( iface ); + LONG refs = InterlockedDecrement( &moniker->refs ); + if (!refs) + { + TRACE( "destroying %p\n", moniker ); + IUnknown_Release( moniker->obj ); + heap_free( moniker ); + } + return refs; +} + +static HRESULT WINAPI moniker_QueryInterface( + IMoniker *iface, REFIID riid, void **ppvObject ) +{ + struct moniker *moniker = impl_from_IMoniker( iface ); + + TRACE( "%p, %s, %p\n", moniker, debugstr_guid( riid ), ppvObject ); + + if (IsEqualGUID( riid, &IID_IMoniker ) || + IsEqualGUID( riid, &IID_IUnknown )) + { + *ppvObject = iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid(riid) ); + return E_NOINTERFACE; + } + IMoniker_AddRef( iface ); + return S_OK; +} + +static HRESULT WINAPI moniker_GetClassID( + IMoniker *iface, CLSID *pClassID ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_IsDirty( + IMoniker *iface ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_Load( + IMoniker *iface, IStream *pStm ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_Save( + IMoniker *iface, IStream *pStm, BOOL fClearDirty ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_GetSizeMax( + IMoniker *iface, ULARGE_INTEGER *pcbSize ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_BindToObject( + IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, REFIID riidResult, void **ppvResult ) +{ + struct moniker *moniker = impl_from_IMoniker( iface ); + + TRACE( "%p, %p, %p, %s, %p\n", iface, pbc, pmkToLeft, debugstr_guid(riidResult), ppvResult ); + return IUnknown_QueryInterface( moniker->obj, riidResult, ppvResult ); +} + +static HRESULT WINAPI moniker_BindToStorage( + IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, REFIID riid, void **ppvObj ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_Reduce( + IMoniker *iface, IBindCtx *pbc, DWORD dwReduceHowFar, IMoniker **ppmkToLeft, IMoniker **ppmkReduced ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_ComposeWith( + IMoniker *iface, IMoniker *pmkRight, BOOL fOnlyIfNotGeneric, IMoniker **ppmkComposite ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_Enum( + IMoniker *iface, BOOL fForward, IEnumMoniker **ppenumMoniker ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_IsEqual( + IMoniker *iface, IMoniker *pmkOtherMoniker ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_Hash( + IMoniker *iface, DWORD *pdwHash ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_IsRunning( + IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, IMoniker *pmkNewlyRunning ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_GetTimeOfLastChange( + IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, FILETIME *pFileTime ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_Inverse( + IMoniker *iface, IMoniker **ppmk ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_CommonPrefixWith( + IMoniker *iface, IMoniker *pmkOther, IMoniker **ppmkPrefix ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_RelativePathTo( + IMoniker *iface, IMoniker *pmkOther, IMoniker **ppmkRelPath ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_GetDisplayName( + IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR *ppszDisplayName ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_ParseDisplayName( + IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR pszDisplayName, ULONG *pchEaten, + IMoniker **ppmkOut ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static HRESULT WINAPI moniker_IsSystemMoniker( + IMoniker *iface, DWORD *pdwMksys ) +{ + FIXME( "\n" ); + return E_NOTIMPL; +} + +static const IMonikerVtbl moniker_vtbl = +{ + moniker_QueryInterface, + moniker_AddRef, + moniker_Release, + moniker_GetClassID, + moniker_IsDirty, + moniker_Load, + moniker_Save, + moniker_GetSizeMax, + moniker_BindToObject, + moniker_BindToStorage, + moniker_Reduce, + moniker_ComposeWith, + moniker_Enum, + moniker_IsEqual, + moniker_Hash, + moniker_IsRunning, + moniker_GetTimeOfLastChange, + moniker_Inverse, + moniker_CommonPrefixWith, + moniker_RelativePathTo, + moniker_GetDisplayName, + moniker_ParseDisplayName, + moniker_IsSystemMoniker +}; + +static HRESULT Moniker_create( IUnknown *unk, IMoniker **obj ) +{ + struct moniker *moniker; + + TRACE( "%p, %p\n", unk, obj ); + + if (!(moniker = heap_alloc( sizeof(*moniker) ))) return E_OUTOFMEMORY; + moniker->IMoniker_iface.lpVtbl = &moniker_vtbl; + moniker->refs = 1; + moniker->obj = unk; + IUnknown_AddRef( moniker->obj ); + + *obj = &moniker->IMoniker_iface; + TRACE( "returning iface %p\n", *obj ); + return S_OK; +} static HRESULT WINAPI WinMGMTS_QueryInterface(IParseDisplayName *iface, REFIID riid, void **ppv) { @@ -51,11 +294,118 @@ return 1; } +static HRESULT parse_path( const WCHAR *str, BSTR *server, BSTR *namespace, BSTR *relative ) +{ + IWbemPath *path; + ULONG len; + HRESULT hr; + + *server = *namespace = *relative = NULL; + + hr = CoCreateInstance( &CLSID_WbemDefPath, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemPath, (void **)&path ); + if (hr != S_OK) return hr; + + hr = IWbemPath_SetText( path, WBEMPATH_CREATE_ACCEPT_ALL, str ); + if (hr != S_OK) goto done; + + len = 0; + hr = IWbemPath_GetServer( path, &len, NULL ); + if (hr == S_OK) + { + if (!(*server = SysAllocStringLen( NULL, len ))) + { + hr = E_OUTOFMEMORY; + goto done; + } + hr = IWbemPath_GetServer( path, &len, *server ); + if (hr != S_OK) goto done; + } + + len = 0; + hr = IWbemPath_GetText( path, WBEMPATH_GET_NAMESPACE_ONLY, &len, NULL ); + if (hr == S_OK) + { + if (!(*namespace = SysAllocStringLen( NULL, len ))) + { + hr = E_OUTOFMEMORY; + goto done; + } + hr = IWbemPath_GetText( path, WBEMPATH_GET_NAMESPACE_ONLY, &len, *namespace ); + if (hr != S_OK) goto done; + } + len = 0; + hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, NULL ); + if (hr == S_OK) + { + if (!(*relative = SysAllocStringLen( NULL, len ))) + { + hr = E_OUTOFMEMORY; + goto done; + } + hr = IWbemPath_GetText( path, WBEMPATH_GET_RELATIVE_ONLY, &len, *relative ); + } + +done: + IWbemPath_Release( path ); + if (hr != S_OK) + { + SysFreeString( *server ); + SysFreeString( *namespace ); + SysFreeString( *relative ); + } + return hr; +} + static HRESULT WINAPI WinMGMTS_ParseDisplayName(IParseDisplayName *iface, IBindCtx *pbc, LPOLESTR pszDisplayName, ULONG *pchEaten, IMoniker **ppmkOut) { - FIXME("(%p %s %p %p)\n", pbc, debugstr_w(pszDisplayName), pchEaten, ppmkOut); - return E_NOTIMPL; + static const WCHAR prefixW[] = {'w','i','n','m','g','m','t','s',':',0}; + const DWORD prefix_len = sizeof(prefixW) / sizeof(prefixW[0]) - 1; + ISWbemLocator *locator = NULL; + ISWbemServices *services = NULL; + ISWbemObject *obj = NULL; + BSTR server, namespace, relative; + WCHAR *p; + HRESULT hr; + + TRACE( "%p, %p, %s, %p, %p\n", iface, pbc, debugstr_w(pszDisplayName), pchEaten, ppmkOut ); + + if (strncmpiW( pszDisplayName, prefixW, prefix_len )) return MK_E_SYNTAX; + + p = pszDisplayName + prefix_len; + if (*p == '{') + { + FIXME( "ignoring security settings\n" ); + while (*p && *p != '}') p++; + if (*p == '}') p++; + if (*p == '!') p++; + } + hr = parse_path( p, &server, &namespace, &relative ); + if (hr != S_OK) return hr; + + hr = SWbemLocator_create( (void **)&locator ); + if (hr != S_OK) goto done; + + hr = ISWbemLocator_ConnectServer( locator, server, namespace, NULL, NULL, NULL, NULL, 0, NULL, &services ); + if (hr != S_OK) goto done; + + if (!relative || !*relative) Moniker_create( (IUnknown *)services, ppmkOut ); + else + { + hr = ISWbemServices_Get( services, relative, 0, NULL, &obj ); + if (hr != S_OK) goto done; + hr = Moniker_create( (IUnknown *)obj, ppmkOut ); + } + +done: + if (obj) ISWbemObject_Release( obj ); + if (services) ISWbemServices_Release( services ); + if (locator) ISWbemLocator_Release( locator ); + SysFreeString( server ); + SysFreeString( namespace ); + SysFreeString( relative ); + if (hr == S_OK) *pchEaten = strlenW( pszDisplayName ); + return hr; } static const IParseDisplayNameVtbl WinMGMTSVtbl = { Modified: trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wbemdisp/wbemdis… ============================================================================== --- trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wbemdisp/wbemdisp_private.h [iso-8859-1] Sat May 2 19:38:14 2015 @@ -32,9 +32,12 @@ #include <windef.h> #include <winbase.h> #include <objbase.h> +#include <oleauto.h> #include <wbemdisp.h> #include <wine/debug.h> +#include <wine/unicode.h> + WINE_DEFAULT_DEBUG_CHANNEL(wbemdisp); HRESULT SWbemLocator_create(LPVOID *) DECLSPEC_HIDDEN; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat May 2 19:38:14 2015 @@ -200,7 +200,7 @@ reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to WineStaging-1.7.37 reactos/dll/win32/version # Synced to WineStaging-1.7.37 -reactos/dll/win32/wbemdisp # Synced to Wine-1.7.27 +reactos/dll/win32/wbemdisp # Synced to WineStaging-1.7.37 reactos/dll/win32/wbemprox # Synced to WineStaging-1.7.37 reactos/dll/win32/windowscodecs # Synced to Wine-1.7.27 reactos/dll/win32/windowscodecsext # Synced to Wine-1.7.27

1 0

[aandrejevic] 67513: [NTVDM] Save/restore the processor state when executing/terminating nested tasks.
by aandrejevic＠svn.reactos.org 02 May '15

02 May '15

Author: aandrejevic Date: Sat May 2 18:51:03 2015 New Revision: 67513 URL: http://svn.reactos.org/svn/reactos?rev=67513&view=rev Log: [NTVDM] Save/restore the processor state when executing/terminating nested tasks. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.c [iso-8859-1] Sat May 2 18:51:03 2015 @@ -44,6 +44,56 @@ PspBlock->CommandLineSize = min(*(PBYTE)CommandLine, DOS_CMDLINE_LENGTH); CommandLine++; RtlCopyMemory(PspBlock->CommandLine, CommandLine, DOS_CMDLINE_LENGTH); +} + +static inline VOID DosSaveState(VOID) +{ + PDOS_REGISTER_STATE State; + WORD StackPointer = getSP(); + + /* Allocate stack space for the registers */ + StackPointer -= sizeof(DOS_REGISTER_STATE); + State = SEG_OFF_TO_PTR(getSS(), StackPointer); + + /* Save */ + State->EAX = getEAX(); + State->ECX = getECX(); + State->EDX = getEDX(); + State->EBX = getEBX(); + State->ESP = getESP(); + State->EBP = getEBP(); + State->ESI = getESI(); + State->EDI = getEDI(); + State->DS = getDS(); + State->ES = getES(); + State->FS = getFS(); + State->GS = getGS(); + State->Flags = getEFLAGS(); +} + +static inline VOID DosRestoreState(VOID) +{ + PDOS_REGISTER_STATE State; + WORD StackPointer = getSP(); + + /* SS:SP points to the stack on the last entry to INT 21h */ + StackPointer -= (STACK_FLAGS + 1) * 2; /* Interrupt parameters */ + StackPointer -= sizeof(DOS_REGISTER_STATE); /* Pushed state structure */ + State = SEG_OFF_TO_PTR(getSS(), StackPointer); + + /* Restore */ + setEAX(State->EAX); + setECX(State->ECX); + setEDX(State->EDX); + setEBX(State->EBX); + setEBP(State->EBP); + setESI(State->ESI); + setEDI(State->EDI); + setDS(State->DS); + setES(State->ES); + setFS(State->FS); + setGS(State->GS); + setEFLAGS(State->Flags); } static WORD DosCopyEnvironmentBlock(LPCSTR Environment OPTIONAL, @@ -432,6 +482,9 @@ if (LoadType == DOS_LOAD_AND_EXECUTE) { + /* Save the program state */ + if (CurrentPsp != SYSTEM_PSP) DosSaveState(); + /* Set the initial segment registers */ setDS(Segment); setES(Segment); @@ -750,6 +803,9 @@ PDOS_MCB CurrentMcb; LPDWORD IntVecTable = (LPDWORD)((ULONG_PTR)BaseAddress); PDOS_PSP PspBlock = SEGMENT_TO_PSP(Psp); +#ifndef STANDALONE + VDM_COMMAND_INFO CommandInfo; +#endif DPRINT("DosTerminateProcess: Psp 0x%04X, ReturnCode 0x%02X, KeepResident 0x%04X\n", Psp, @@ -818,29 +874,25 @@ { ResetEvent(VdmTaskEvent); CpuUnsimulate(); + return; } } #ifndef STANDALONE - // FIXME: This is probably not the best way to do it - /* Check if this was a nested DOS task */ - if (CurrentPsp != SYSTEM_PSP) - { - VDM_COMMAND_INFO CommandInfo; - - /* Decrement the re-entry count */ - CommandInfo.TaskId = SessionId; - CommandInfo.VDMState = VDM_DEC_REENTER_COUNT; - GetNextVDMCommand(&CommandInfo); - - /* Clear the structure */ - RtlZeroMemory(&CommandInfo, sizeof(CommandInfo)); - - /* Update the VDM state of the task */ - CommandInfo.TaskId = SessionId; - CommandInfo.VDMState = VDM_FLAG_DONT_WAIT; - GetNextVDMCommand(&CommandInfo); - } + + /* Decrement the re-entry count */ + CommandInfo.TaskId = SessionId; + CommandInfo.VDMState = VDM_DEC_REENTER_COUNT; + GetNextVDMCommand(&CommandInfo); + + /* Clear the structure */ + RtlZeroMemory(&CommandInfo, sizeof(CommandInfo)); + + /* Update the VDM state of the task */ + CommandInfo.TaskId = SessionId; + CommandInfo.VDMState = VDM_FLAG_DONT_WAIT; + GetNextVDMCommand(&CommandInfo); + #endif /* Save the return code - Normal termination */ @@ -850,6 +902,9 @@ setSS(HIWORD(SEGMENT_TO_PSP(CurrentPsp)->LastStack)); setSP(LOWORD(SEGMENT_TO_PSP(CurrentPsp)->LastStack)); + /* Restore the program state */ + DosRestoreState(); + /* Return control to the parent process */ CpuExecute(HIWORD(PspBlock->TerminateAddress), LOWORD(PspBlock->TerminateAddress)); Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/process.h [iso-8859-1] Sat May 2 18:51:03 2015 @@ -72,6 +72,13 @@ }; } DOS_EXEC_PARAM_BLOCK, *PDOS_EXEC_PARAM_BLOCK; +typedef struct _DOS_REGISTER_STATE +{ + DWORD Flags; + WORD GS, FS, ES, DS; + DWORD EDI, ESI, EBP, ESP, EBX, EDX, ECX, EAX; +} DOS_REGISTER_STATE, *PDOS_REGISTER_STATE; + #pragma pack(pop) /* VARIABLES ******************************************************************/

1 0

[aandrejevic] 67512: [FAST486] When storing a segment selector, the operand size attribute is only ignored when writing to memory (where it's treated as if it's always 16-bit).
by aandrejevic＠svn.reactos.org 02 May '15

02 May '15

Author: aandrejevic Date: Sat May 2 16:09:00 2015 New Revision: 67512 URL: http://svn.reactos.org/svn/reactos?rev=67512&view=rev Log: [FAST486] When storing a segment selector, the operand size attribute is only ignored when writing to memory (where it's treated as if it's always 16-bit). Modified: trunk/reactos/lib/fast486/opcodes.c Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Sat May 2 16:09:00 2015 @@ -3832,13 +3832,16 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeMovStoreSeg) { - BOOLEAN AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + BOOLEAN OperandSize, AddressSize; FAST486_MOD_REG_RM ModRegRm; /* Make sure this is the right instruction */ ASSERT(Opcode == 0x8C); + OperandSize = AddressSize = State->SegmentRegs[FAST486_REG_CS].Size; + TOGGLE_ADSIZE(AddressSize); + TOGGLE_OPSIZE(OperandSize); /* Get the operands */ if (!Fast486ParseModRegRm(State, AddressSize, &ModRegRm)) @@ -3854,10 +3857,21 @@ return; } - Fast486WriteModrmWordOperands(State, - &ModRegRm, - FALSE, - State->SegmentRegs[ModRegRm.Register].Selector); + /* When the other operand is a memory location, always use 16-bit */ + if (OperandSize && !ModRegRm.Memory) + { + Fast486WriteModrmDwordOperands(State, + &ModRegRm, + FALSE, + State->SegmentRegs[ModRegRm.Register].Selector); + } + else + { + Fast486WriteModrmWordOperands(State, + &ModRegRm, + FALSE, + State->SegmentRegs[ModRegRm.Register].Selector); + } } FAST486_OPCODE_HANDLER(Fast486OpcodeLea)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs