Ros-diffs April 2008

ros-diffs@reactos.org

21 participants
395 discussions

[greatlrd] 33005: add some new define to ks.h for ksuser.dll that will be merge from reactx branch
by greatlrd＠svn.reactos.org 17 Apr '08

17 Apr '08

Author: greatlrd Date: Thu Apr 17 13:00:39 2008 New Revision: 33005 URL: http://svn.reactos.org/svn/reactos?rev=33005&view=rev Log: add some new define to ks.h for ksuser.dll that will be merge from reactx branch Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=3300… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Thu Apr 17 13:00:39 2008 @@ -56,6 +56,15 @@ #define KSDDKAPI +#define KSSTRING_Filter L"{9B365890-165F-11D0-A195-0020AFD156E4}" +#define KSSTRING_Pin L"{146F1A80-4791-11D0-A5D6-28DB04C10000}" +#define KSSTRING_Clock L"{53172480-4791-11D0-A5D6-28DB04C10000}" +#define KSSTRING_Allocator L"{642F5D00-4791-11D0-A5D6-28DB04C10000}" +#define KSSTRING_AllocatorEx L"{091BB63B-603F-11D1-B067-00A0C9062802}" +#define KSSTRING_TopologyNode L"{0621061A-EE75-11D0-B915-00A0C9223196}" + +#define KSDATAFORMAT_BIT_ATTRIBUTES 1 +#define KSDATAFORMAT_ATTRIBUTES (1 << KSDATAFORMAT_BIT_ATTRIBUTES) typedef PVOID PKSWORKER; /* ===============================================================

1 0

[greatlrd] 33004: This header file is for set the version number of all reactx dll files. it is not in use yet, it is small merge from reactx branch
by greatlrd＠svn.reactos.org 17 Apr '08

17 Apr '08

Author: greatlrd Date: Thu Apr 17 12:59:34 2008 New Revision: 33004 URL: http://svn.reactos.org/svn/reactos?rev=33004&view=rev Log: This header file is for set the version number of all reactx dll files. it is not in use yet, it is small merge from reactx branch Added: trunk/reactos/include/reactos/reactx.h (with props) Added: trunk/reactos/include/reactos/reactx.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/reactx.h?r… ============================================================================== --- trunk/reactos/include/reactos/reactx.h (added) +++ trunk/reactos/include/reactos/reactx.h [iso-8859-1] Thu Apr 17 12:59:34 2008 @@ -1,0 +1,4 @@ +#define REACTOS_FILEVERSION 5,3,0,900 +#define REACTOS_STR_FILE_VERSION "5.3.0.900" +#define REACTOS_PRODUCTVERSION 5,3,0,900 +#define REACTOS_STR_PRODUCT_VERSION "5.3" Propchange: trunk/reactos/include/reactos/reactx.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 33003: commit the working ks.h header, we need fixing portcls.h before we can commit it to trunk
by greatlrd＠svn.reactos.org 17 Apr '08

17 Apr '08

Author: greatlrd Date: Thu Apr 17 12:37:43 2008 New Revision: 33003 URL: http://svn.reactos.org/svn/reactos?rev=33003&view=rev Log: commit the working ks.h header, we need fixing portcls.h before we can commit it to trunk Modified: branches/reactx/reactos/include/dxsdk/ks.h Modified: branches/reactx/reactos/include/dxsdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/dxsdk/ks… ============================================================================== --- branches/reactx/reactos/include/dxsdk/ks.h [iso-8859-1] (original) +++ branches/reactx/reactos/include/dxsdk/ks.h [iso-8859-1] Thu Apr 17 12:37:43 2008 @@ -511,7 +511,7 @@ KSEVENTS_ERESOURCE } KSEVENTS_LOCKTYPE; - #if !defined(__WIDL_WTYPES_H) + #if !defined(__wtypes_h__) enum VARENUM { VT_EMPTY = 0, @@ -2077,7 +2077,7 @@ #ifndef _NTOS_ - void __inline KsGateTurnInputOn(IN PKSGATE Gate OPTIONAL) + static __inline void KsGateTurnInputOn(IN PKSGATE Gate OPTIONAL) { while (Gate && (InterlockedIncrement(&Gate->Count) == 1)) { @@ -2085,7 +2085,7 @@ } } - void __inline KsGateTurnInputOff(IN PKSGATE Gate OPTIONAL) + static __inline void KsGateTurnInputOff(IN PKSGATE Gate OPTIONAL) { while (Gate && (InterlockedDecrement(&Gate->Count) == 0)) { @@ -2093,16 +2093,18 @@ } } - BOOLEAN __inline KsGateGetStateUnsafe(IN PKSGATE Gate) - { - ASSERT(Gate); + static __inline BOOLEAN KsGateGetStateUnsafe(IN PKSGATE Gate) + { + // FIXME ASSERT create error at compiling + //ASSERT(Gate); return((BOOLEAN)(Gate->Count > 0)); } - BOOLEAN __inline KsGateCaptureThreshold(IN PKSGATE Gate) + static __inline BOOLEAN KsGateCaptureThreshold(IN PKSGATE Gate) { BOOLEAN captured; - ASSERT(Gate); + // FIXME ASSERT create error at compiling + // ASSERT(Gate); captured = (BOOLEAN)(InterlockedCompareExchange(&Gate->Count,0,1) == 1); if (captured) @@ -2112,9 +2114,10 @@ return captured; } - void __inline KsGateInitialize( IN PKSGATE Gate, IN LONG InitialCount, IN PKSGATE NextGate OPTIONAL, IN BOOLEAN StateToPropagate) - { - ASSERT(Gate); + static __inline void KsGateInitialize( IN PKSGATE Gate, IN LONG InitialCount, IN PKSGATE NextGate OPTIONAL, IN BOOLEAN StateToPropagate) + { + // FIXME ASSERT create error at compiling + // ASSERT(Gate); Gate->Count = InitialCount; Gate->NextGate = NextGate; @@ -2137,28 +2140,29 @@ } } - void __inline KsGateInitializeAnd( IN PKSGATE AndGate, IN PKSGATE NextOrGate OPTIONAL) + static __inline void KsGateInitializeAnd( IN PKSGATE AndGate, IN PKSGATE NextOrGate OPTIONAL) { KsGateInitialize(AndGate,1,NextOrGate,TRUE); } - void __inline KsGateInitializeOr(IN PKSGATE OrGate, IN PKSGATE NextAndGate OPTIONAL) + static __inline void KsGateInitializeOr(IN PKSGATE OrGate, IN PKSGATE NextAndGate OPTIONAL) { KsGateInitialize(OrGate,0,NextAndGate,FALSE); } - void __inline KsGateAddOnInputToAnd(IN PKSGATE AndGate) { UNREFERENCED_PARAMETER (AndGate); } - void __inline KsGateRemoveOnInputFromAnd(IN PKSGATE AndGate) { UNREFERENCED_PARAMETER (AndGate); } - void __inline KsGateRemoveOnInputFromOr(IN PKSGATE OrGate) { KsGateTurnInputOff(OrGate); } - void __inline KsGateRemoveOffInputFromOr(IN PKSGATE OrGate) { UNREFERENCED_PARAMETER (OrGate); } - void __inline KsGateAddOnInputToOr(IN PKSGATE OrGate) { KsGateTurnInputOn(OrGate); } - void __inline KsGateRemoveOffInputFromAnd(IN PKSGATE AndGate) { KsGateTurnInputOn(AndGate); } - void __inline KsGateAddOffInputToOr(IN PKSGATE OrGate) { UNREFERENCED_PARAMETER (OrGate); } - void __inline KsGateAddOffInputToAnd(IN PKSGATE AndGate) { KsGateTurnInputOff(AndGate); } - - void __inline KsGateTerminateOr(IN PKSGATE OrGate) - { - ASSERT(OrGate); + static __inline void KsGateAddOnInputToAnd(IN PKSGATE AndGate) { UNREFERENCED_PARAMETER (AndGate); } + static __inline void KsGateRemoveOnInputFromAnd(IN PKSGATE AndGate) { UNREFERENCED_PARAMETER (AndGate); } + static __inline void KsGateRemoveOnInputFromOr(IN PKSGATE OrGate) { KsGateTurnInputOff(OrGate); } + static __inline void KsGateRemoveOffInputFromOr(IN PKSGATE OrGate) { UNREFERENCED_PARAMETER (OrGate); } + static __inline void KsGateAddOnInputToOr(IN PKSGATE OrGate) { KsGateTurnInputOn(OrGate); } + static __inline void KsGateRemoveOffInputFromAnd(IN PKSGATE AndGate) { KsGateTurnInputOn(AndGate); } + static __inline void KsGateAddOffInputToOr(IN PKSGATE OrGate) { UNREFERENCED_PARAMETER (OrGate); } + static __inline void KsGateAddOffInputToAnd(IN PKSGATE AndGate) { KsGateTurnInputOff(AndGate); } + + static __inline void KsGateTerminateOr(IN PKSGATE OrGate) + { + // FIXME ASSERT create error at compiling + // ASSERT(OrGate); if (KsGateGetStateUnsafe(OrGate)) { KsGateRemoveOnInputFromAnd(OrGate->NextGate); @@ -2169,9 +2173,10 @@ } } - void __inline KsGateTerminateAnd( IN PKSGATE AndGate) - { - ASSERT(AndGate); + static __inline void KsGateTerminateAnd( IN PKSGATE AndGate) + { + // FIXME ASSERT create error at compiling + // ASSERT(AndGate); if (KsGateGetStateUnsafe(AndGate)) { KsGateRemoveOnInputFromOr(AndGate->NextGate); @@ -2471,7 +2476,7 @@ ULONG Count; }; - #if defined(_UNKNOWN_H_) || defined(__IUnknown_INTERFACE_DEFINED__) + #if defined(__unknwn_h__) || defined(__IUnknown_INTERFACE_DEFINED__) #if !defined(_IKsControl_) #define _IKsControl_ @@ -2554,7 +2559,7 @@ #if (!defined( RT_STRING )) #define RT_STRING MAKEINTRESOURCE( 6 ) - #define RT_RCDATA MAKEINTRESOURCE( 10 ) + #define RT_RCDATA MAKEINTRESOURCE( 10 ) #endif typedef enum @@ -2568,7 +2573,7 @@ KsAllocateDefaultClock(OUT PKSDEFAULTCLOCK* DefaultClock); KSDDKAPI NTSTATUS NTAPI - KsAllocateDefaultClockEx(OUT PKSDEFAULTCLOCK* DefaultClock, + KsAllocateDefaultClockEx(OUT PKSDEFAULTCLOCK* DefaultClock, IN PVOID Context OPTIONAL, IN PFNKSSETTIMER SetTimer OPTIONAL, IN PFNKSCANCELTIMER CancelTimer OPTIONAL, @@ -3493,111 +3498,110 @@ #define KsDiscard(Object,Pointer) KsRemoveItemFromObjectBag((Object)->Bag, (PVOID)(Pointer), TRUE) - void __inline - KsFilterAddEvent(IN PKSFILTER Filter, IN PKSEVENT_ENTRY EventEntry) + + static __inline void KsFilterAddEvent(IN PKSFILTER Filter, IN PKSEVENT_ENTRY EventEntry) { KsAddEvent(Filter,EventEntry); } - void __inline KsPinAddEvent(IN PKSPIN Pin, IN PKSEVENT_ENTRY EventEntry) + + static __inline void KsPinAddEvent(IN PKSPIN Pin, IN PKSEVENT_ENTRY EventEntry) { KsAddEvent(Pin,EventEntry); } - void __inline KsFilterGenerateEvents(IN PKSFILTER Filter, IN const GUID* EventSet OPTIONAL, + static __inline void KsFilterGenerateEvents(IN PKSFILTER Filter, IN const GUID* EventSet OPTIONAL, IN ULONG EventId, IN ULONG DataSize, IN PVOID Data OPTIONAL, IN PFNKSGENERATEEVENTCALLBACK CallBack OPTIONAL, IN PVOID CallBackContext OPTIONAL) { KsGenerateEvents(Filter, EventSet, EventId, DataSize, Data, CallBack, CallBackContext); } - void __inline KsPinGenerateEvents(IN PKSPIN Pin, IN const GUID* EventSet OPTIONAL, IN ULONG EventId, IN ULONG DataSize, + static __inline void KsPinGenerateEvents(IN PKSPIN Pin, IN const GUID* EventSet OPTIONAL, IN ULONG EventId, IN ULONG DataSize, IN PVOID Data OPTIONAL, IN PFNKSGENERATEEVENTCALLBACK CallBack OPTIONAL,IN PVOID CallBackContext OPTIONAL) { KsGenerateEvents(Pin, EventSet, EventId, DataSize, Data, CallBack, CallBackContext); } - PKSFILTER __inline KsGetFilterFromFileObject(IN PFILE_OBJECT FileObject) + static __inline PKSFILTER KsGetFilterFromFileObject(IN PFILE_OBJECT FileObject) { return (PKSFILTER) KsGetObjectFromFileObject(FileObject); } - PKSPIN __inline KsGetPinFromFileObject(IN PFILE_OBJECT FileObject) + static __inline PKSPIN KsGetPinFromFileObject(IN PFILE_OBJECT FileObject) { return (PKSPIN) KsGetObjectFromFileObject(FileObject); } - PKSDEVICE __inline KsFilterFactoryGetParentDevice(IN PKSFILTERFACTORY FilterFactory) + static __inline PKSDEVICE KsFilterFactoryGetParentDevice(IN PKSFILTERFACTORY FilterFactory) { return (PKSDEVICE) KsGetParent((PVOID) FilterFactory); } - PKSFILTERFACTORY __inline KsFilterGetParentFilterFactory(IN PKSFILTER Filter) + static __inline PKSFILTERFACTORY KsFilterGetParentFilterFactory(IN PKSFILTER Filter) { return (PKSFILTERFACTORY) KsGetParent((PVOID) Filter); } - PKSFILTERFACTORY __inline KsDeviceGetFirstChildFilterFactory(IN PKSDEVICE Device) + static __inline PKSFILTERFACTORY KsDeviceGetFirstChildFilterFactory(IN PKSDEVICE Device) { return (PKSFILTERFACTORY) KsGetFirstChild((PVOID) Device); } - PKSFILTER __inline KsFilterFactoryGetFirstChildFilter(IN PKSFILTERFACTORY FilterFactory) + static __inline PKSFILTER KsFilterFactoryGetFirstChildFilter(IN PKSFILTERFACTORY FilterFactory) { return (PKSFILTER) KsGetFirstChild((PVOID) FilterFactory); } - PKSFILTERFACTORY __inline KsFilterFactoryGetNextSiblingFilterFactory(IN PKSFILTERFACTORY FilterFactory) + static __inline PKSFILTERFACTORY KsFilterFactoryGetNextSiblingFilterFactory(IN PKSFILTERFACTORY FilterFactory) { return (PKSFILTERFACTORY) KsGetNextSibling((PVOID) FilterFactory); } - PKSFILTER __inline KsFilterGetNextSiblingFilter(IN PKSFILTER Filter) + static __inline PKSFILTER KsFilterGetNextSiblingFilter(IN PKSFILTER Filter) { return (PKSFILTER) KsGetNextSibling((PVOID) Filter); } - PKSDEVICE __inline KsFilterFactoryGetDevice(IN PKSFILTERFACTORY FilterFactory) + static __inline PKSDEVICE KsFilterFactoryGetDevice(IN PKSFILTERFACTORY FilterFactory) { return KsGetDevice((PVOID) FilterFactory); } - PKSDEVICE __inline KsFilterGetDevice(IN PKSFILTER Filter) + static __inline PKSDEVICE KsFilterGetDevice(IN PKSFILTER Filter) { return KsGetDevice((PVOID) Filter); } - PKSDEVICE __inline KsPinGetDevice(IN PKSPIN Pin) + static __inline PKSDEVICE KsPinGetDevice(IN PKSPIN Pin) { return KsGetDevice((PVOID) Pin); } - void __inline KsFilterAcquireControl(IN PKSFILTER Filter) + static __inline void KsFilterAcquireControl(IN PKSFILTER Filter) { KsAcquireControl((PVOID) Filter); } - void __inline KsFilterReleaseControl(IN PKSFILTER Filter) + static __inline void KsFilterReleaseControl(IN PKSFILTER Filter) { KsReleaseControl((PVOID) Filter); } - void __inline KsPinAcquireControl(IN PKSPIN Pin) + static __inline void KsPinAcquireControl(IN PKSPIN Pin) { KsAcquireControl((PVOID) Pin); } - void __inline KsPinReleaseControl(IN PKSPIN Pin) + static __inline void KsPinReleaseControl(IN PKSPIN Pin) { KsReleaseControl((PVOID) Pin); } - #if defined(_UNKNOWN_H_) || defined(__IUnknown_FWD_DEFINED__) - - #ifndef PUNKNOWN - typedef IUnknown *PUNKNOWN; - #endif + #if defined(_UNKNOWN_H_) || defined(__unknwn_h__) + + KSDDKAPI NTSTATUS NTAPI KsPinGetReferenceClockInterface(IN PKSPIN Pin, @@ -3610,42 +3614,42 @@ KSDDKAPI PUNKNOWN NTAPI KsGetOuterUnknown(IN PVOID Object); - PUNKNOWN __inline KsDeviceRegisterAggregatedClientUnknown(IN PKSDEVICE Device, IN PUNKNOWN ClientUnknown) + static __inline PUNKNOWN KsDeviceRegisterAggregatedClientUnknown(IN PKSDEVICE Device, IN PUNKNOWN ClientUnknown) { return KsRegisterAggregatedClientUnknown((PVOID) Device,ClientUnknown); } - PUNKNOWN __inline KsDeviceGetOuterUnknown(IN PKSDEVICE Device) + static __inline PUNKNOWN KsDeviceGetOuterUnknown(IN PKSDEVICE Device) { return KsGetOuterUnknown((PVOID) Device); } - PUNKNOWN __inline KsFilterFactoryRegisterAggregatedClientUnknown(IN PKSFILTERFACTORY FilterFactory, IN PUNKNOWN ClientUnknown) + static __inline PUNKNOWN KsFilterFactoryRegisterAggregatedClientUnknown(IN PKSFILTERFACTORY FilterFactory, IN PUNKNOWN ClientUnknown) { return KsRegisterAggregatedClientUnknown((PVOID) FilterFactory,ClientUnknown); } - PUNKNOWN __inline KsFilterFactoryGetOuterUnknown(IN PKSFILTERFACTORY FilterFactory) + static __inline PUNKNOWN KsFilterFactoryGetOuterUnknown(IN PKSFILTERFACTORY FilterFactory) { return KsGetOuterUnknown((PVOID) FilterFactory); } - PUNKNOWN __inline KsFilterRegisterAggregatedClientUnknown(IN PKSFILTER Filter, IN PUNKNOWN ClientUnknown) + static __inline PUNKNOWN KsFilterRegisterAggregatedClientUnknown(IN PKSFILTER Filter, IN PUNKNOWN ClientUnknown) { return KsRegisterAggregatedClientUnknown((PVOID) Filter,ClientUnknown); } - PUNKNOWN __inline KsFilterGetOuterUnknown(IN PKSFILTER Filter) + static __inline PUNKNOWN KsFilterGetOuterUnknown(IN PKSFILTER Filter) { return KsGetOuterUnknown((PVOID) Filter); } - PUNKNOWN __inline KsPinRegisterAggregatedClientUnknown(IN PKSPIN Pin, IN PUNKNOWN ClientUnknown ) + static __inline PUNKNOWN KsPinRegisterAggregatedClientUnknown(IN PKSPIN Pin, IN PUNKNOWN ClientUnknown ) { return KsRegisterAggregatedClientUnknown((PVOID) Pin,ClientUnknown); } - PUNKNOWN __inline KsPinGetOuterUnknown(IN PKSPIN Pin) + static __inline PUNKNOWN KsPinGetOuterUnknown(IN PKSPIN Pin) { return KsGetOuterUnknown((PVOID) Pin); }

1 0

[dchapyshev] 33002: - Fix build
by dchapyshev＠svn.reactos.org 17 Apr '08

17 Apr '08

Author: dchapyshev Date: Thu Apr 17 09:38:15 2008 New Revision: 33002 URL: http://svn.reactos.org/svn/reactos?rev=33002&view=rev Log: - Fix build Modified: trunk/reactos/include/dxsdk/errors.h Modified: trunk/reactos/include/dxsdk/errors.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/errors.h?rev… ============================================================================== --- trunk/reactos/include/dxsdk/errors.h [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/errors.h [iso-8859-1] Thu Apr 17 09:38:15 2008 @@ -15,7 +15,7 @@ #define VFW_FIRST_CODE 0x200 #define MAX_ERROR_TEXT_LEN 160 -#include <VFWMSGS.H> +#include <vfwmsgs.h> typedef BOOL (WINAPI* AMGETERRORTEXTPROCA)(HRESULT, char *, DWORD); typedef BOOL (WINAPI* AMGETERRORTEXTPROCW)(HRESULT, WCHAR *, DWORD);

1 0

[dchapyshev] 33001: - Fix build
by dchapyshev＠svn.reactos.org 17 Apr '08

17 Apr '08

Author: dchapyshev Date: Thu Apr 17 09:25:10 2008 New Revision: 33001 URL: http://svn.reactos.org/svn/reactos?rev=33001&view=rev Log: - Fix build Modified: trunk/reactos/dll/directx/ksproxy/ksproxy.c Modified: trunk/reactos/dll/directx/ksproxy/ksproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/ksprox… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/ksproxy.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksproxy/ksproxy.c [iso-8859-1] Thu Apr 17 09:25:10 2008 @@ -23,7 +23,7 @@ #include <wchar.h> #include <tchar.h> #include <ks.h> -#include <dshow.h> +#include <DShow.h> HRESULT WINAPI KsSynchronousDeviceControl(

1 0

[dchapyshev] 33000: - Add msdmo.dll, pdh.dll, qedit.dll, quartz.dll, ksuser.dll, ksproxy.ax to bootcd
by dchapyshev＠svn.reactos.org 17 Apr '08

17 Apr '08

Author: dchapyshev Date: Thu Apr 17 08:45:34 2008 New Revision: 33000 URL: http://svn.reactos.org/svn/reactos?rev=33000&view=rev Log: - Add msdmo.dll, pdh.dll, qedit.dll, quartz.dll, ksuser.dll, ksproxy.ax to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Thu Apr 17 08:45:34 2008 @@ -127,10 +127,15 @@ dll\directx\dxdiagn\dxdiagn.dll 1 dll\directx\ddraw\ddraw.dll 1 dll\directx\d3d8thk\d3d8thk.dll 1 +dll\directx\devenum\devenum.dll 1 +dll\directx\ksproxy\ksproxy.ax 1 +dll\directx\ksuser\ksuser.dll 1 +dll\directx\msdmo\msdmo.dll 1 +dll\directx\quartz\quartz.dll 1 +dll\directx\qedit\qedit.dll 1 dll\directx\wine\d3d8\d3d8.dll 1 dll\directx\wine\wined3d\wined3d.dll 1 dll\directx\wine\d3d9\d3d9.dll 1 -dll\directx\devenum\devenum.dll 1 dll\keyboard\kbdbgm\kbdbgm.dll 1 dll\keyboard\kbdbgt\kbdbgt.dll 1 @@ -235,6 +240,7 @@ dll\win32\oledlg\oledlg.dll 1 dll\win32\olepro32\olepro32.dll 1 dll\win32\opengl32\opengl32.dll 1 +dll\win32\pdh\pdh.dll 1 dll\win32\powrprof\powrprof.dll 1 dll\win32\printui\printui.dll 1 dll\win32\psapi\psapi.dll 1

1 0

[dchapyshev] 32999: - Add msdmo.dll, pdh.dll, qedit.dll, quartz.dll, ksuser.dll, ksproxy.ax
by dchapyshev＠svn.reactos.org 17 Apr '08

17 Apr '08

Author: dchapyshev Date: Thu Apr 17 08:45:02 2008 New Revision: 32999 URL: http://svn.reactos.org/svn/reactos?rev=32999&view=rev Log: - Add msdmo.dll, pdh.dll, qedit.dll, quartz.dll, ksuser.dll, ksproxy.ax Added: trunk/reactos/dll/directx/ksproxy/ trunk/reactos/dll/directx/ksproxy/ksproxy.c (with props) trunk/reactos/dll/directx/ksproxy/ksproxy.def (with props) trunk/reactos/dll/directx/ksproxy/ksproxy.rbuild (with props) trunk/reactos/dll/directx/ksproxy/ksproxy.rc (with props) trunk/reactos/dll/directx/ksuser/ trunk/reactos/dll/directx/ksuser/ksuser.c (with props) trunk/reactos/dll/directx/ksuser/ksuser.def (with props) trunk/reactos/dll/directx/ksuser/ksuser.rbuild (with props) trunk/reactos/dll/directx/ksuser/ksuser.rc (with props) trunk/reactos/dll/directx/msdmo/ trunk/reactos/dll/directx/msdmo/msdmo.c (with props) trunk/reactos/dll/directx/msdmo/msdmo.rbuild (with props) trunk/reactos/dll/directx/msdmo/msdmo.rc (with props) trunk/reactos/dll/directx/msdmo/msdmo.spec (with props) trunk/reactos/dll/directx/qedit/ trunk/reactos/dll/directx/qedit/qedit.c (with props) trunk/reactos/dll/directx/qedit/qedit.rbuild (with props) trunk/reactos/dll/directx/qedit/qedit.rc (with props) trunk/reactos/dll/directx/qedit/qedit.spec (with props) trunk/reactos/dll/directx/quartz/ trunk/reactos/dll/directx/quartz/quartz.c (with props) trunk/reactos/dll/directx/quartz/quartz.rbuild (with props) trunk/reactos/dll/directx/quartz/quartz.rc (with props) trunk/reactos/dll/directx/quartz/quartz.spec (with props) trunk/reactos/dll/win32/pdh/ trunk/reactos/dll/win32/pdh/pdh.rbuild (with props) trunk/reactos/dll/win32/pdh/pdh.spec (with props) trunk/reactos/dll/win32/pdh/pdh_main.c (with props) Modified: trunk/reactos/dll/directx/directx.rbuild trunk/reactos/dll/win32/win32.rbuild Modified: trunk/reactos/dll/directx/directx.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/directx.rbuild… ============================================================================== --- trunk/reactos/dll/directx/directx.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/directx.rbuild [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -28,6 +28,21 @@ <directory name="dxdiagn"> <xi:include href="dxdiagn/dxdiagn.rbuild" /> </directory> + <directory name="ksproxy"> + <xi:include href="ksproxy/ksproxy.rbuild" /> + </directory> + <directory name="ksuser"> + <xi:include href="ksuser/ksuser.rbuild" /> + </directory> + <directory name="msdmo"> + <xi:include href="msdmo/msdmo.rbuild" /> + </directory> + <directory name="qedit"> + <xi:include href="qedit/qedit.rbuild" /> + </directory> + <directory name="quartz"> + <xi:include href="quartz/quartz.rbuild" /> + </directory> <directory name="wine"> <xi:include href="wine/wine.rbuild" /> Added: trunk/reactos/dll/directx/ksproxy/ksproxy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/ksprox… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/ksproxy.c (added) +++ trunk/reactos/dll/directx/ksproxy/ksproxy.c [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -1,0 +1,113 @@ +/* + * KSPROXY.AX - ReactOS WDM Streaming ActiveMovie Proxy + * + * Copyright 2008 Dmitry Chapyshev + * + * 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 + */ + +#include <windows.h> +#include <stdio.h> +#include <wchar.h> +#include <tchar.h> +#include <ks.h> +#include <dshow.h> + +HRESULT WINAPI +KsSynchronousDeviceControl( + HANDLE Handle, + ULONG IoControl, + PVOID InBuffer, + ULONG InLength, + PVOID OutBuffer, + ULONG OutLength, + PULONG BytesReturned) +{ + return NOERROR; +} + +HRESULT WINAPI +KsResolveRequiredAttributes( + PKSDATARANGE DataRange, + KSMULTIPLE_ITEM *Attributes OPTIONAL) +{ + return NOERROR; +} + +HRESULT WINAPI +KsOpenDefaultDevice( + REFGUID Category, + ACCESS_MASK Access, + PHANDLE DeviceHandle) +{ + return NOERROR; +} + +HRESULT WINAPI +KsGetMultiplePinFactoryItems( + HANDLE FilterHandle, + ULONG PinFactoryId, + ULONG PropertyId, + PVOID *Items) +{ + return NOERROR; +} + +HRESULT WINAPI +KsGetMediaTypeCount( + HANDLE FilterHandle, + ULONG PinFactoryId, + ULONG *MediaTypeCount) +{ + return NOERROR; +} + +HRESULT WINAPI +KsGetMediaType( + int Position, + AM_MEDIA_TYPE *AmMediaType, + HANDLE FilterHandle, + ULONG PinFactoryId) +{ + return NOERROR; +} + +HRESULT WINAPI +DllUnregisterServer(void) +{ + return S_OK; +} + +HRESULT WINAPI +DllRegisterServer(void) +{ + return S_OK; +} + +HRESULT WINAPI +DllGetClassObject( + REFCLSID rclsid, + REFIID riid, + LPVOID *ppv) +{ + return S_OK; +} + +HRESULT WINAPI +DllCanUnloadNow(void) +{ + return S_OK; +} + Propchange: trunk/reactos/dll/directx/ksproxy/ksproxy.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/ksproxy/ksproxy.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/ksprox… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/ksproxy.def (added) +++ trunk/reactos/dll/directx/ksproxy/ksproxy.def [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -1,0 +1,12 @@ +LIBRARY ksproxy.ax +EXPORTS +DllCanUnloadNow +DllGetClassObject +DllRegisterServer +DllUnregisterServer +KsGetMediaType +KsGetMediaTypeCount +KsGetMultiplePinFactoryItems +KsOpenDefaultDevice +KsResolveRequiredAttributes +KsSynchronousDeviceControl Propchange: trunk/reactos/dll/directx/ksproxy/ksproxy.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/ksproxy/ksproxy.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/ksprox… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/ksproxy.rbuild (added) +++ trunk/reactos/dll/directx/ksproxy/ksproxy.rbuild [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -1,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="ksproxy" type="win32dll" baseaddress="${BASEADDRESS_KSPROXY}" installbase="system32" installname="ksproxy.ax" allowwarnings="true"> + <importlibrary definition="ksproxy.def" /> + <include base="ksproxy">.</include> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <library>advapi32</library> + <library>kernel32</library> + <library>ntdll</library> + <file>ksproxy.c</file> + <file>ksproxy.rc</file> +</module> +</group> Propchange: trunk/reactos/dll/directx/ksproxy/ksproxy.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/ksproxy/ksproxy.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksproxy/ksprox… ============================================================================== --- trunk/reactos/dll/directx/ksproxy/ksproxy.rc (added) +++ trunk/reactos/dll/directx/ksproxy/ksproxy.rc [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -1,0 +1,12 @@ + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS WDM Streaming ActiveMovie Proxy\0" +#define REACTOS_STR_INTERNAL_NAME "ksproxy\0" +#define REACTOS_STR_ORIGINAL_FILENAME "ksproxy.ax\0" + +#define REACTOS_FILEVERSION 5,3,0,900 +#define REACTOS_STR_FILE_VERSION "5.3.0.900" +#define REACTOS_PRODUCTVERSION 5,3,0,900 +#define REACTOS_STR_PRODUCT_VERSION "5.3" + +#include <reactos/version.rc> Propchange: trunk/reactos/dll/directx/ksproxy/ksproxy.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/ksuser/ksuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.c (added) +++ trunk/reactos/dll/directx/ksuser/ksuser.c [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -1,0 +1,63 @@ +/* + * KSUSER.DLL - ReactOS User CSA Library + * + * Copyright 2008 Dmitry Chapyshev + * + * 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 + */ + +#include <windows.h> +#include <stdio.h> +#include <wchar.h> +#include <tchar.h> +#include <ks.h> + +KSDDKAPI NTSTATUS NTAPI +KsCreateAllocator( + HANDLE ConnectionHandle, + PKSALLOCATOR_FRAMING AllocatorFraming, + PHANDLE AllocatorHandle) +{ + return STATUS_SUCCESS; +} + +KSDDKAPI NTSTATUS NTAPI +KsCreateClock( + HANDLE ConnectionHandle, + PKSCLOCK_CREATE ClockCreate, + PHANDLE ClockHandle) +{ + return STATUS_SUCCESS; +} + +KSDDKAPI NTSTATUS NTAPI +KsCreatePin( + HANDLE FilterHandle, + PKSPIN_CONNECT Connect, + ACCESS_MASK DesiredAccess, + PHANDLE ConnectionHandle) +{ + return STATUS_SUCCESS; +} + +KSDDKAPI NTSTATUS NTAPI +KsCreateTopologyNode( + HANDLE ParentHandle, + PKSNODE_CREATE NodeCreate, + ACCESS_MASK DesiredAccess, + PHANDLE NodeHandle) +{ + return STATUS_SUCCESS; +} Propchange: trunk/reactos/dll/directx/ksuser/ksuser.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/ksuser/ksuser.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.def (added) +++ trunk/reactos/dll/directx/ksuser/ksuser.def [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -1,0 +1,7 @@ +LIBRARY ksuser.dll +EXPORTS +KsCreateAllocator +KsCreateClock +KsCreatePin +KsCreateTopologyNode +; EOF Propchange: trunk/reactos/dll/directx/ksuser/ksuser.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/ksuser/ksuser.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.rbuild (added) +++ trunk/reactos/dll/directx/ksuser/ksuser.rbuild [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -1,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="ksuser" type="win32dll" baseaddress="${BASEADDRESS_KSUSER}" installbase="system32" installname="ksuser.dll" allowwarnings="true"> + <importlibrary definition="ksuser.def" /> + <include base="ksuser">.</include> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <library>advapi32</library> + <library>kernel32</library> + <library>ntdll</library> + <file>ksuser.c</file> + <file>ksuser.rc</file> +</module> +</group> Propchange: trunk/reactos/dll/directx/ksuser/ksuser.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/ksuser/ksuser.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.… ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.rc (added) +++ trunk/reactos/dll/directx/ksuser/ksuser.rc [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -1,0 +1,12 @@ + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS User CSA Library\0" +#define REACTOS_STR_INTERNAL_NAME "ksuser\0" +#define REACTOS_STR_ORIGINAL_FILENAME "ksuser.dll\0" + +#define REACTOS_FILEVERSION 5,3,0,900 +#define REACTOS_STR_FILE_VERSION "5.3.0.900" +#define REACTOS_PRODUCTVERSION 5,3,0,900 +#define REACTOS_STR_PRODUCT_VERSION "5.3" + +#include <reactos/version.rc> Propchange: trunk/reactos/dll/directx/ksuser/ksuser.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/msdmo/msdmo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdmo/msdmo.c?… ============================================================================== --- trunk/reactos/dll/directx/msdmo/msdmo.c (added) +++ trunk/reactos/dll/directx/msdmo/msdmo.c [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -1,0 +1,124 @@ +/* + * MSDMO.DLL - ReactOS DMO Runtime + * + * Copyright 2008 Dmitry Chapyshev + * + * 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 + */ + +#include <windows.h> +#include <stdio.h> +#include <wchar.h> +#include <tchar.h> + +typedef struct _DMO_PARTIAL_MEDIATYPE +{ + GUID type; + GUID subtype; +} DMO_PARTIAL_MEDIATYPE, *PDMO_PARTIAL_MEDIATYPE; + +typedef struct _IEnumDMO IEnumDMO; + +typedef struct _DMOMediaType +{ + GUID majortype; + GUID subtype; + BOOL bFixedSizeSamples; + BOOL bTemporalCompression; + ULONG lSampleSize; + GUID formattype; + IUnknown *pUnk; + ULONG cbFormat; + BYTE *pbFormat; +} DMO_MEDIA_TYPE; + +HRESULT WINAPI DMOEnum( + REFGUID guidCategory, + DWORD dwFlags, + DWORD cInTypes, + const DMO_PARTIAL_MEDIATYPE *pInTypes, + DWORD cOutTypes, + const DMO_PARTIAL_MEDIATYPE *pOutTypes, + IEnumDMO **ppEnum) +{ + return S_OK; +} + +HRESULT WINAPI DMOGetName(REFCLSID clsidDMO, WCHAR szName[]) +{ + return S_OK; +} + +HRESULT WINAPI DMOGetTypes(REFCLSID clsidDMO, + ULONG ulInputTypesRequested, + ULONG* pulInputTypesSupplied, + DMO_PARTIAL_MEDIATYPE* pInputTypes, + ULONG ulOutputTypesRequested, + ULONG* pulOutputTypesSupplied, + DMO_PARTIAL_MEDIATYPE* pOutputTypes) +{ + return S_OK; +} + +HRESULT WINAPI DMORegister( + LPCWSTR szName, + REFCLSID clsidDMO, + REFGUID guidCategory, + DWORD dwFlags, + DWORD cInTypes, + const DMO_PARTIAL_MEDIATYPE *pInTypes, + DWORD cOutTypes, + const DMO_PARTIAL_MEDIATYPE *pOutTypes +) +{ + return S_OK; +} + +HRESULT WINAPI DMOUnregister(REFCLSID clsidDMO, REFGUID guidCategory) +{ + return S_OK; +} + +HRESULT WINAPI MoCopyMediaType(DMO_MEDIA_TYPE* pdst, + const DMO_MEDIA_TYPE* psrc) +{ + return S_OK; +} + +HRESULT WINAPI MoCreateMediaType(DMO_MEDIA_TYPE** ppmedia, DWORD cbFormat) +{ + return S_OK; +} + +HRESULT WINAPI MoDeleteMediaType(DMO_MEDIA_TYPE* pmedia) +{ + return S_OK; +} + +HRESULT WINAPI MoDuplicateMediaType(DMO_MEDIA_TYPE** ppdst, + const DMO_MEDIA_TYPE* psrc) +{ + return S_OK; +} + +HRESULT WINAPI MoFreeMediaType(DMO_MEDIA_TYPE* pmedia) +{ + return S_OK; +} + +HRESULT WINAPI MoInitMediaType(DMO_MEDIA_TYPE* pmedia, DWORD cbFormat) +{ + return S_OK; +} Propchange: trunk/reactos/dll/directx/msdmo/msdmo.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/msdmo/msdmo.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdmo/msdmo.rb… ============================================================================== --- trunk/reactos/dll/directx/msdmo/msdmo.rbuild (added) +++ trunk/reactos/dll/directx/msdmo/msdmo.rbuild [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -1,0 +1,16 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="msdmo" type="win32dll" baseaddress="${BASEADDRESS_MSDMO}" installbase="system32" installname="msdmo.dll" allowwarnings="true"> + <importlibrary definition="msdmo.spec.def" /> + <include base="msdmo">.</include> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <library>advapi32</library> + <library>kernel32</library> + <library>ntdll</library> + <file>msdmo.c</file> + <file>msdmo.rc</file> + <file>msdmo.spec</file> +</module> +</group> Propchange: trunk/reactos/dll/directx/msdmo/msdmo.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/msdmo/msdmo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdmo/msdmo.rc… ============================================================================== --- trunk/reactos/dll/directx/msdmo/msdmo.rc (added) +++ trunk/reactos/dll/directx/msdmo/msdmo.rc [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -1,0 +1,12 @@ + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS DMO Runtime\0" +#define REACTOS_STR_INTERNAL_NAME "msdmo\0" +#define REACTOS_STR_ORIGINAL_FILENAME "msdmo.dll\0" + +#define REACTOS_FILEVERSION 5,3,0,900 +#define REACTOS_STR_FILE_VERSION "5.3.0.900" +#define REACTOS_PRODUCTVERSION 5,3,0,900 +#define REACTOS_STR_PRODUCT_VERSION "5.3" + +#include <reactos/version.rc> Propchange: trunk/reactos/dll/directx/msdmo/msdmo.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/msdmo/msdmo.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdmo/msdmo.sp… ============================================================================== --- trunk/reactos/dll/directx/msdmo/msdmo.spec (added) +++ trunk/reactos/dll/directx/msdmo/msdmo.spec [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -1,0 +1,15 @@ +@ stdcall DMOEnum(ptr long long ptr long ptr ptr) +@ stdcall DMOGetName(ptr wstr) +@ stdcall DMOGetTypes(ptr long ptr ptr long ptr ptr) +@ stub DMOGuidToStrA +@ stub DMOGuidToStrW +@ stdcall DMORegister(wstr ptr ptr long long ptr long ptr) +@ stub DMOStrToGuidA +@ stub DMOStrToGuidW +@ stdcall DMOUnregister(ptr ptr) +@ stdcall MoCopyMediaType(ptr ptr) +@ stdcall MoCreateMediaType(ptr long) +@ stdcall MoDeleteMediaType(ptr) +@ stdcall MoDuplicateMediaType(ptr ptr) +@ stdcall MoFreeMediaType(ptr) +@ stdcall MoInitMediaType(ptr long) Propchange: trunk/reactos/dll/directx/msdmo/msdmo.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/qedit/qedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/qedit.c?… ============================================================================== --- trunk/reactos/dll/directx/qedit/qedit.c (added) +++ trunk/reactos/dll/directx/qedit/qedit.c [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -1,0 +1,51 @@ +/* + * QEDIT.DLL - ReactOS DirectShow Editing + * + * Copyright 2008 Dmitry Chapyshev + * + * 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 + */ + +#include <windows.h> +#include <stdio.h> +#include <wchar.h> +#include <tchar.h> + +HRESULT WINAPI +DllCanUnloadNow(void) +{ + return S_OK; +} + +HRESULT WINAPI +DllGetClassObject( + REFCLSID rclsid, + REFIID riid, + LPVOID *ppv) +{ + return S_OK; +} + +HRESULT WINAPI +DllRegisterServer(void) +{ + return S_OK; +} + +HRESULT WINAPI +DllUnregisterServer(void) +{ + return S_OK; +} Propchange: trunk/reactos/dll/directx/qedit/qedit.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/qedit/qedit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/qedit.rb… ============================================================================== --- trunk/reactos/dll/directx/qedit/qedit.rbuild (added) +++ trunk/reactos/dll/directx/qedit/qedit.rbuild [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -1,0 +1,16 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="qedit" type="win32dll" baseaddress="${BASEADDRESS_QEDIT}" installbase="system32" installname="qedit.dll" allowwarnings="true"> + <importlibrary definition="qedit.spec.def" /> + <include base="qedit">.</include> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <library>advapi32</library> + <library>kernel32</library> + <library>ntdll</library> + <file>qedit.c</file> + <file>qedit.rc</file> + <file>qedit.spec</file> +</module> +</group> Propchange: trunk/reactos/dll/directx/qedit/qedit.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/qedit/qedit.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/qedit.rc… ============================================================================== --- trunk/reactos/dll/directx/qedit/qedit.rc (added) +++ trunk/reactos/dll/directx/qedit/qedit.rc [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -1,0 +1,12 @@ + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS DirectShow Editing\0" +#define REACTOS_STR_INTERNAL_NAME "qedit\0" +#define REACTOS_STR_ORIGINAL_FILENAME "qedit.dll\0" + +#define REACTOS_FILEVERSION 5,3,0,900 +#define REACTOS_STR_FILE_VERSION "5.3.0.900" +#define REACTOS_PRODUCTVERSION 5,3,0,900 +#define REACTOS_STR_PRODUCT_VERSION "5.3" + +#include <reactos/version.rc> Propchange: trunk/reactos/dll/directx/qedit/qedit.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/qedit/qedit.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/qedit.sp… ============================================================================== --- trunk/reactos/dll/directx/qedit/qedit.spec (added) +++ trunk/reactos/dll/directx/qedit/qedit.spec [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -1,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() Propchange: trunk/reactos/dll/directx/qedit/qedit.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/quartz/quartz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/quartz.… ============================================================================== --- trunk/reactos/dll/directx/quartz/quartz.c (added) +++ trunk/reactos/dll/directx/quartz/quartz.c [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -1,0 +1,93 @@ +/* + * QUERTZ.DLL - ReactOS DirectShow Runtime + * + * Copyright 2008 Dmitry Chapyshev + * + * 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 + */ + +#include <windows.h> +#include <stdio.h> +#include <wchar.h> +#include <tchar.h> + +#define MAX_ERROR_TEXT_LEN 160 + +DWORD WINAPI +AMGetErrorTextA(HRESULT hr, LPTSTR buffer, DWORD maxlen) +{ + int len; + static const TCHAR format[] = {'E','r','r','o','r',':',' ','0','x','%','l','x',0}; + TCHAR error[MAX_ERROR_TEXT_LEN]; + + if (!buffer) return 0; + _stprintf(error, format, hr); + if ((len = _tcslen(error)) >= maxlen) return 0; + _tcscpy(buffer, error); + return len; +} + +DWORD WINAPI +AMGetErrorTextW(HRESULT hr, LPWSTR buffer, DWORD maxlen) +{ + int len; + static const WCHAR format[] = {'E','r','r','o','r',':',' ','0','x','%','l','x',0}; + WCHAR error[MAX_ERROR_TEXT_LEN]; + + if (!buffer) return 0; + swprintf(error, format, hr); + if ((len = wcslen(error)) >= maxlen) return 0; + wcscpy(buffer, error); + return len; +} + +LONG WINAPI +AmpFactorToDB(LONG ampfactor) +{ + return 0; +} + +LONG WINAPI +DBToAmpFactor(LONG db) +{ + /* Avoid divide by zero (probably during range computation) in Windows Media Player 6.4 */ + if (db < -1000) + return 0; + return 100; +} + +HRESULT WINAPI +DllCanUnloadNow(void) +{ + return S_OK; +} + +HRESULT WINAPI +DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) +{ + return S_OK; +} + +HRESULT WINAPI +DllRegisterServer(void) +{ + return S_OK; +} + +HRESULT WINAPI +DllUnregisterServer(void) +{ + return S_OK; +} Propchange: trunk/reactos/dll/directx/quartz/quartz.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/quartz/quartz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/quartz.… ============================================================================== --- trunk/reactos/dll/directx/quartz/quartz.rbuild (added) +++ trunk/reactos/dll/directx/quartz/quartz.rbuild [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -1,0 +1,16 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<group> +<module name="quartz" type="win32dll" baseaddress="${BASEADDRESS_QUARTZ}" installbase="system32" installname="quartz.dll" allowwarnings="true"> + <importlibrary definition="quartz.spec.def" /> + <include base="quartz">.</include> + <define name="WINVER">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <library>advapi32</library> + <library>kernel32</library> + <library>ntdll</library> + <file>quartz.c</file> + <file>quartz.rc</file> + <file>quartz.spec</file> +</module> +</group> Propchange: trunk/reactos/dll/directx/quartz/quartz.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/quartz/quartz.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/quartz.… ============================================================================== --- trunk/reactos/dll/directx/quartz/quartz.rc (added) +++ trunk/reactos/dll/directx/quartz/quartz.rc [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -1,0 +1,12 @@ + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS DirectShow Runtime\0" +#define REACTOS_STR_INTERNAL_NAME "quartz\0" +#define REACTOS_STR_ORIGINAL_FILENAME "quartz.dll\0" + +#define REACTOS_FILEVERSION 5,3,0,900 +#define REACTOS_STR_FILE_VERSION "5.3.0.900" +#define REACTOS_PRODUCTVERSION 5,3,0,900 +#define REACTOS_STR_PRODUCT_VERSION "5.3" + +#include <reactos/version.rc> Propchange: trunk/reactos/dll/directx/quartz/quartz.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/quartz/quartz.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/quartz.… ============================================================================== --- trunk/reactos/dll/directx/quartz/quartz.spec (added) +++ trunk/reactos/dll/directx/quartz/quartz.spec [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -1,0 +1,9 @@ +@ stdcall AMGetErrorTextA(long ptr long) +@ stdcall AMGetErrorTextW(long ptr long) +@ stdcall AmpFactorToDB(long) +@ stdcall DBToAmpFactor(long) +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() +@ stub GetProxyDllInfo Propchange: trunk/reactos/dll/directx/quartz/quartz.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/pdh/pdh.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/pdh.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/pdh/pdh.rbuild (added) +++ trunk/reactos/dll/win32/pdh/pdh.rbuild [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -1,0 +1,16 @@ +<module name="pdh" type="win32dll" baseaddress="${BASEADDRESS_PDH}" installbase="system32" installname="pdh.dll" allowwarnings="true" entrypoint="0"> + <importlibrary definition="pdh.spec.def" /> + <include base="pdh">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__REACTOS__" /> + <define name="__WINESRC__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <define name="WINVER">0x600</define> + <library>wine</library> + <library>kernel32</library> + <library>ntdll</library> + <file>pdh_main.c</file> + <file>pdh.spec</file> +</module> Propchange: trunk/reactos/dll/win32/pdh/pdh.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/pdh/pdh.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/pdh.spec?rev… ============================================================================== --- trunk/reactos/dll/win32/pdh/pdh.spec (added) +++ trunk/reactos/dll/win32/pdh/pdh.spec [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -1,0 +1,163 @@ +1 stub PdhPlaGetLogFileNameA +@ stub PdhAdd009CounterA +@ stub PdhAdd009CounterW +@ stdcall PdhAddCounterA(ptr str long ptr) +@ stdcall PdhAddCounterW(ptr wstr long ptr) +@ stdcall PdhAddEnglishCounterA(ptr str long ptr) +@ stdcall PdhAddEnglishCounterW(ptr wstr long ptr) +@ stub PdhBindInputDataSourceA +@ stub PdhBindInputDataSourceW +@ stub PdhBrowseCountersA +@ stub PdhBrowseCountersHA +@ stub PdhBrowseCountersHW +@ stub PdhBrowseCountersW +@ stdcall PdhCalculateCounterFromRawValue(ptr long ptr ptr ptr) +@ stub PdhCloseLog +@ stdcall PdhCloseQuery(ptr) +@ stdcall PdhCollectQueryData(ptr) +@ stdcall PdhCollectQueryDataWithTime(ptr ptr) +@ stdcall PdhCollectQueryDataEx(ptr long ptr) +@ stub PdhComputeCounterStatistics +@ stub PdhConnectMachineA +@ stub PdhConnectMachineW +@ stub PdhCreateSQLTablesA +@ stub PdhCreateSQLTablesW +@ stub PdhEnumLogSetNamesA +@ stub PdhEnumLogSetNamesW +@ stub PdhEnumMachinesA +@ stub PdhEnumMachinesHA +@ stub PdhEnumMachinesHW +@ stub PdhEnumMachinesW +@ stub PdhEnumObjectItemsA +@ stub PdhEnumObjectItemsHA +@ stub PdhEnumObjectItemsHW +@ stub PdhEnumObjectItemsW +@ stub PdhEnumObjectsA +@ stub PdhEnumObjectsHA +@ stub PdhEnumObjectsHW +@ stub PdhEnumObjectsW +@ stub PdhExpandCounterPathA +@ stub PdhExpandCounterPathW +@ stub PdhExpandWildCardPathA +@ stub PdhExpandWildCardPathHA +@ stub PdhExpandWildCardPathHW +@ stub PdhExpandWildCardPathW +@ stub PdhFormatFromRawValue +@ stdcall PdhGetCounterInfoA(ptr long ptr ptr) +@ stdcall PdhGetCounterInfoW(ptr long ptr ptr) +@ stdcall PdhGetCounterTimeBase(ptr ptr) +@ stub PdhGetDataSourceTimeRangeA +@ stub PdhGetDataSourceTimeRangeH +@ stub PdhGetDataSourceTimeRangeW +@ stub PdhGetDefaultPerfCounterA +@ stub PdhGetDefaultPerfCounterHA +@ stub PdhGetDefaultPerfCounterHW +@ stub PdhGetDefaultPerfCounterW +@ stub PdhGetDefaultPerfObjectA +@ stub PdhGetDefaultPerfObjectHA +@ stub PdhGetDefaultPerfObjectHW +@ stub PdhGetDefaultPerfObjectW +@ stub PdhGetDllVersion +@ stub PdhGetFormattedCounterArrayA +@ stub PdhGetFormattedCounterArrayW +@ stdcall PdhGetFormattedCounterValue(ptr long ptr ptr) +@ stub PdhGetLogFileSize +@ stub PdhGetLogFileTypeA +@ stub PdhGetLogFileTypeW +@ stub PdhGetLogSetGUID +@ stub PdhGetRawCounterArrayA +@ stub PdhGetRawCounterArrayW +@ stdcall PdhGetRawCounterValue(ptr ptr ptr) +@ stub PdhIsRealTimeQuery +@ stub PdhListLogFileHeaderA +@ stub PdhListLogFileHeaderW +@ stub PdhLogServiceCommandA +@ stub PdhLogServiceCommandW +@ stub PdhLogServiceControlA +@ stub PdhLogServiceControlW +@ stdcall PdhLookupPerfIndexByNameA(str str ptr) +@ stdcall PdhLookupPerfIndexByNameW(wstr wstr ptr) +@ stdcall PdhLookupPerfNameByIndexA(str long ptr ptr) +@ stdcall PdhLookupPerfNameByIndexW(wstr long ptr ptr) +@ stub PdhMakeCounterPathA +@ stub PdhMakeCounterPathW +@ stub PdhOpenLogA +@ stub PdhOpenLogW +@ stdcall PdhOpenQuery(wstr long ptr) PdhOpenQueryW +@ stdcall PdhOpenQueryA(str long ptr) +@ stub PdhOpenQueryH +@ stdcall PdhOpenQueryW(wstr long ptr) +@ stub PdhParseCounterPathA +@ stub PdhParseCounterPathW +@ stub PdhParseInstanceNameA +@ stub PdhParseInstanceNameW +@ stub PdhPlaAddItemA +@ stub PdhPlaAddItemW +@ stub PdhPlaCreateA +@ stub PdhPlaCreateW +@ stub PdhPlaDeleteA +@ stub PdhPlaDeleteW +@ stub PdhPlaEnumCollectionsA +@ stub PdhPlaEnumCollectionsW +@ stub PdhPlaGetInfoA +@ stub PdhPlaGetInfoW +@ stub PdhPlaGetLogFileNameW +@ stub PdhPlaGetScheduleA +@ stub PdhPlaGetScheduleW +@ stub PdhPlaRemoveAllItemsA +@ stub PdhPlaRemoveAllItemsW +@ stub PdhPlaScheduleA +@ stub PdhPlaScheduleW +@ stub PdhPlaSetInfoA +@ stub PdhPlaSetInfoW +@ stub PdhPlaSetItemListA +@ stub PdhPlaSetItemListW +@ stub PdhPlaSetRunAsA +@ stub PdhPlaSetRunAsW +@ stub PdhPlaStartA +@ stub PdhPlaStartW +@ stub PdhPlaStopA +@ stub PdhPlaStopW +@ stub PdhPlaValidateInfoA +@ stub PdhPlaValidateInfoW +@ stub PdhReadRawLogRecord +@ stub PdhRelogA +@ stub PdhRelogW +@ stdcall PdhRemoveCounter(ptr) +@ stub PdhSelectDataSourceA +@ stub PdhSelectDataSourceW +@ stdcall PdhSetCounterScaleFactor(ptr long) +@ stub PdhSetDefaultRealTimeDataSource +@ stub PdhSetLogSetRunID +@ stub PdhSetQueryTimeRange +@ stub PdhTranslate009CounterA +@ stub PdhTranslate009CounterW +@ stub PdhTranslateLocaleCounterA +@ stub PdhTranslateLocaleCounterW +@ stub PdhUpdateLogA +@ stub PdhUpdateLogFileCatalog +@ stub PdhUpdateLogW +@ stdcall PdhValidatePathA(str) +@ stdcall PdhValidatePathExA(ptr str) +@ stdcall PdhValidatePathExW(ptr wstr) +@ stdcall PdhValidatePathW(wstr) +@ stub PdhVbAddCounter +@ stub PdhVbCreateCounterPathList +@ stub PdhVbGetCounterPathElements +@ stub PdhVbGetCounterPathFromList +@ stub PdhVbGetDoubleCounterValue +@ stub PdhVbGetLogFileSize +@ stub PdhVbGetOneCounterPath +@ stub PdhVbIsGoodStatus +@ stub PdhVbOpenLog +@ stub PdhVbOpenQuery +@ stub PdhVbUpdateLog +@ stub PdhVerifySQLDBA +@ stub PdhVerifySQLDBW +@ stub PdhiPla2003SP1Installed +@ stub PdhiPlaFormatBlanksA +@ stub PdhiPlaFormatBlanksW +@ stub PdhiPlaGetVersion +@ stub PdhiPlaRunAs +@ stub PdhiPlaSetRunAs +@ stub PlaTimeInfoToMilliSeconds Propchange: trunk/reactos/dll/win32/pdh/pdh.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/pdh/pdh_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/pdh_main.c?r… ============================================================================== --- trunk/reactos/dll/win32/pdh/pdh_main.c (added) +++ trunk/reactos/dll/win32/pdh/pdh_main.c [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -1,0 +1,1061 @@ +/* + * Performance Data Helper (pdh.dll) + * + * Copyright 2007 Andrey Turkin + * Copyright 2007 Hans Leidekker + * + * 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 + */ + +#include <stdarg.h> +#include <math.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT +#include "windef.h" +#include "winbase.h" + +#include "pdh.h" +#include "pdhmsg.h" +#include "winperf.h" + +#include "wine/debug.h" +#include "wine/list.h" +#include "wine/unicode.h" + +WINE_DEFAULT_DEBUG_CHANNEL(pdh); + +static CRITICAL_SECTION pdh_handle_cs; +static CRITICAL_SECTION_DEBUG pdh_handle_cs_debug = +{ + 0, 0, &pdh_handle_cs, + { &pdh_handle_cs_debug.ProcessLocksList, + &pdh_handle_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": pdh_handle_cs") } +}; +static CRITICAL_SECTION pdh_handle_cs = { &pdh_handle_cs_debug, -1, 0, 0, 0, 0 }; + +static inline void *heap_alloc( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), 0, size ); +} + +static inline void *heap_alloc_zero( SIZE_T size ) +{ + return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, size ); +} + +static inline void heap_free( LPVOID mem ) +{ + HeapFree( GetProcessHeap(), 0, mem ); +} + +static inline WCHAR *pdh_strdup( const WCHAR *src ) +{ + WCHAR *dst; + + if (!src) return NULL; + if ((dst = heap_alloc( (strlenW( src ) + 1) * sizeof(WCHAR) ))) strcpyW( dst, src ); + return dst; +} + +static inline WCHAR *pdh_strdup_aw( const char *src ) +{ + int len; + WCHAR *dst; + + if (!src) return NULL; + len = MultiByteToWideChar( CP_ACP, 0, src, -1, NULL, 0 ); + if ((dst = heap_alloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_ACP, 0, src, -1, dst, len ); + return dst; +} + +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(0x%p, %d, %p)\n",hinstDLL,fdwReason,lpvReserved); + + if (fdwReason == DLL_WINE_PREATTACH) return FALSE; /* prefer native version */ + + if (fdwReason == DLL_PROCESS_ATTACH) + { + DisableThreadLibraryCalls( hinstDLL ); + } + + return TRUE; +} + +union value +{ + LONG longvalue; + double doublevalue; + LONGLONG largevalue; +}; + +struct counter +{ + DWORD magic; /* signature */ + struct list entry; /* list entry */ + WCHAR *path; /* identifier */ + DWORD type; /* counter type */ + DWORD status; /* update status */ + LONG scale; /* scale factor */ + LONG defaultscale; /* default scale factor */ + DWORD_PTR user; /* user data */ + DWORD_PTR queryuser; /* query user data */ + LONGLONG base; /* samples per second */ + FILETIME stamp; /* time stamp */ + void (CALLBACK *collect)( struct counter * ); /* collect callback */ + union value one; /* first value */ + union value two; /* second value */ +}; + +#define PDH_MAGIC_COUNTER 0x50444831 /* 'PDH1' */ + +static struct counter *create_counter( void ) +{ + struct counter *counter; + + if ((counter = heap_alloc_zero( sizeof(struct counter) ))) + { + counter->magic = PDH_MAGIC_COUNTER; + return counter; + } + return NULL; +} + +static void destroy_counter( struct counter *counter ) +{ + counter->magic = 0; + heap_free( counter->path ); + heap_free( counter ); +} + +#define PDH_MAGIC_QUERY 0x50444830 /* 'PDH0' */ + +struct query +{ + DWORD magic; /* signature */ + DWORD_PTR user; /* user data */ + HANDLE thread; /* collect thread */ + DWORD interval; /* collect interval */ + HANDLE wait; /* wait event */ + HANDLE stop; /* stop event */ + struct list counters; /* counter list */ +}; + +static struct query *create_query( void ) +{ + struct query *query; + + if ((query = heap_alloc_zero( sizeof(struct query) ))) + { + query->magic = PDH_MAGIC_QUERY; + list_init( &query->counters ); + return query; + } + return NULL; +} + +static void destroy_query( struct query *query ) +{ + query->magic = 0; + heap_free( query ); +} + +struct source +{ + DWORD index; /* name index */ + const WCHAR *path; /* identifier */ + void (CALLBACK *collect)( struct counter * ); /* collect callback */ + DWORD type; /* counter type */ + LONG scale; /* default scale factor */ + LONGLONG base; /* samples per second */ +}; + +static const WCHAR path_processor_time[] = + {'\\','P','r','o','c','e','s','s','o','r','(','_','T','o','t','a','l',')', + '\\','%',' ','P','r','o','c','e','s','s','o','r',' ','T','i','m','e',0}; +static const WCHAR path_uptime[] = + {'\\','S','y','s','t','e','m', '\\', 'S','y','s','t','e','m',' ','U','p',' ','T','i','m','e',0}; + +static void CALLBACK collect_processor_time( struct counter *counter ) +{ + counter->two.largevalue = 500000; /* FIXME */ + counter->status = PDH_CSTATUS_VALID_DATA; +} + +static void CALLBACK collect_uptime( struct counter *counter ) +{ + counter->two.largevalue = GetTickCount64(); + counter->status = PDH_CSTATUS_VALID_DATA; +} + +#define TYPE_PROCESSOR_TIME \ + (PERF_SIZE_LARGE | PERF_TYPE_COUNTER | PERF_COUNTER_RATE | PERF_TIMER_100NS | PERF_DELTA_COUNTER | \ + PERF_INVERSE_COUNTER | PERF_DISPLAY_PERCENT) + +#define TYPE_UPTIME \ + (PERF_SIZE_LARGE | PERF_TYPE_COUNTER | PERF_COUNTER_ELAPSED | PERF_OBJECT_TIMER | PERF_DISPLAY_SECONDS) + +/* counter source registry */ +static const struct source counter_sources[] = +{ + { 6, path_processor_time, collect_processor_time, TYPE_PROCESSOR_TIME, -5, 10000000 }, + { 674, path_uptime, collect_uptime, TYPE_UPTIME, -3, 1000 } +}; + +static BOOL pdh_match_path( LPCWSTR fullpath, LPCWSTR path ) +{ + const WCHAR *p; + + if (strchrW( path, '\\')) p = fullpath; + else p = strrchrW( fullpath, '\\' ) + 1; + if (strcmpW( p, path )) return FALSE; + return TRUE; +} + +/*********************************************************************** + * PdhAddCounterA (PDH.@) + */ +PDH_STATUS WINAPI PdhAddCounterA( PDH_HQUERY query, LPCSTR path, + DWORD_PTR userdata, PDH_HCOUNTER *counter ) +{ + PDH_STATUS ret; + WCHAR *pathW; + + TRACE("%p %s %lx %p\n", query, debugstr_a(path), userdata, counter); + + if (!path) return PDH_INVALID_ARGUMENT; + + if (!(pathW = pdh_strdup_aw( path ))) + return PDH_MEMORY_ALLOCATION_FAILURE; + + ret = PdhAddCounterW( query, pathW, userdata, counter ); + + heap_free( pathW ); + return ret; +} + +/*********************************************************************** + * PdhAddCounterW (PDH.@) + */ +PDH_STATUS WINAPI PdhAddCounterW( PDH_HQUERY hquery, LPCWSTR path, + DWORD_PTR userdata, PDH_HCOUNTER *hcounter ) +{ + struct query *query = hquery; + struct counter *counter; + unsigned int i; + + TRACE("%p %s %lx %p\n", hquery, debugstr_w(path), userdata, hcounter); + + if (!path || !hcounter) return PDH_INVALID_ARGUMENT; + + EnterCriticalSection( &pdh_handle_cs ); + if (!query || query->magic != PDH_MAGIC_QUERY) + { + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_INVALID_HANDLE; + } + + *hcounter = NULL; + for (i = 0; i < sizeof(counter_sources) / sizeof(counter_sources[0]); i++) + { + if (pdh_match_path( counter_sources[i].path, path )) + { + if ((counter = create_counter())) + { + counter->path = pdh_strdup( counter_sources[i].path ); + counter->collect = counter_sources[i].collect; + counter->type = counter_sources[i].type; + counter->defaultscale = counter_sources[i].scale; + counter->base = counter_sources[i].base; + counter->queryuser = query->user; + counter->user = userdata; + + list_add_tail( &query->counters, &counter->entry ); + *hcounter = counter; + + LeaveCriticalSection( &pdh_handle_cs ); + return ERROR_SUCCESS; + } + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_MEMORY_ALLOCATION_FAILURE; + } + } + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_CSTATUS_NO_COUNTER; +} + +/*********************************************************************** + * PdhAddEnglishCounterA (PDH.@) + */ +PDH_STATUS WINAPI PdhAddEnglishCounterA( PDH_HQUERY query, LPCSTR path, + DWORD_PTR userdata, PDH_HCOUNTER *counter ) +{ + TRACE("%p %s %lx %p\n", query, debugstr_a(path), userdata, counter); + + if (!query) return PDH_INVALID_ARGUMENT; + return PdhAddCounterA( query, path, userdata, counter ); +} + +/*********************************************************************** + * PdhAddEnglishCounterW (PDH.@) + */ +PDH_STATUS WINAPI PdhAddEnglishCounterW( PDH_HQUERY query, LPCWSTR path, + DWORD_PTR userdata, PDH_HCOUNTER *counter ) +{ + TRACE("%p %s %lx %p\n", query, debugstr_w(path), userdata, counter); + + if (!query) return PDH_INVALID_ARGUMENT; + return PdhAddCounterW( query, path, userdata, counter ); +} + +/* caller must hold counter lock */ +static PDH_STATUS format_value( struct counter *counter, DWORD format, union value *raw1, + union value *raw2, PDH_FMT_COUNTERVALUE *value ) +{ + LONG factor; + + factor = counter->scale ? counter->scale : counter->defaultscale; + if (format & PDH_FMT_LONG) + { + if (format & PDH_FMT_1000) value->u.longValue = raw2->longvalue * 1000; + else value->u.longValue = raw2->longvalue * pow( 10, factor ); + } + else if (format & PDH_FMT_LARGE) + { + if (format & PDH_FMT_1000) value->u.largeValue = raw2->largevalue * 1000; + else value->u.largeValue = raw2->largevalue * pow( 10, factor ); + } + else if (format & PDH_FMT_DOUBLE) + { + if (format & PDH_FMT_1000) value->u.doubleValue = raw2->doublevalue * 1000; + else value->u.doubleValue = raw2->doublevalue * pow( 10, factor ); + } + else + { + WARN("unknown format %x\n", format); + return PDH_INVALID_ARGUMENT; + } + return ERROR_SUCCESS; +} + +/*********************************************************************** + * PdhCalculateCounterFromRawValue (PDH.@) + */ +PDH_STATUS WINAPI PdhCalculateCounterFromRawValue( PDH_HCOUNTER handle, DWORD format, + PPDH_RAW_COUNTER raw1, PPDH_RAW_COUNTER raw2, + PPDH_FMT_COUNTERVALUE value ) +{ + PDH_STATUS ret; + struct counter *counter = handle; + + TRACE("%p 0x%08x %p %p %p\n", handle, format, raw1, raw2, value); + + if (!value) return PDH_INVALID_ARGUMENT; + + EnterCriticalSection( &pdh_handle_cs ); + if (!counter || counter->magic != PDH_MAGIC_COUNTER) + { + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_INVALID_HANDLE; + } + + ret = format_value( counter, format, (union value *)&raw1->SecondValue, + (union value *)&raw2->SecondValue, value ); + + LeaveCriticalSection( &pdh_handle_cs ); + return ret; +} + + +/*********************************************************************** + * PdhCloseQuery (PDH.@) + */ +PDH_STATUS WINAPI PdhCloseQuery( PDH_HQUERY handle ) +{ + struct query *query = handle; + struct list *item, *next; + + TRACE("%p\n", handle); + + EnterCriticalSection( &pdh_handle_cs ); + if (!query || query->magic != PDH_MAGIC_QUERY) + { + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_INVALID_HANDLE; + } + + if (query->thread) + { + HANDLE thread = query->thread; + SetEvent( query->stop ); + LeaveCriticalSection( &pdh_handle_cs ); + + WaitForSingleObject( thread, INFINITE ); + + EnterCriticalSection( &pdh_handle_cs ); + if (query->magic != PDH_MAGIC_QUERY) + { + LeaveCriticalSection( &pdh_handle_cs ); + return ERROR_SUCCESS; + } + CloseHandle( query->stop ); + CloseHandle( query->thread ); + query->thread = NULL; + } + + LIST_FOR_EACH_SAFE( item, next, &query->counters ) + { + struct counter *counter = LIST_ENTRY( item, struct counter, entry ); + + list_remove( &counter->entry ); + destroy_counter( counter ); + } + + destroy_query( query ); + + LeaveCriticalSection( &pdh_handle_cs ); + return ERROR_SUCCESS; +} + +/* caller must hold query lock */ +static void collect_query_data( struct query *query ) +{ + struct list *item; + + LIST_FOR_EACH( item, &query->counters ) + { + SYSTEMTIME time; + struct counter *counter = LIST_ENTRY( item, struct counter, entry ); + + counter->collect( counter ); + + GetLocalTime( &time ); + SystemTimeToFileTime( &time, &counter->stamp ); + } +} + +/*********************************************************************** + * PdhCollectQueryData (PDH.@) + */ +PDH_STATUS WINAPI PdhCollectQueryData( PDH_HQUERY handle ) +{ + struct query *query = handle; + + TRACE("%p\n", handle); + + EnterCriticalSection( &pdh_handle_cs ); + if (!query || query->magic != PDH_MAGIC_QUERY) + { + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_INVALID_HANDLE; + } + + if (list_empty( &query->counters )) + { + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_NO_DATA; + } + + collect_query_data( query ); + + LeaveCriticalSection( &pdh_handle_cs ); + return ERROR_SUCCESS; +} + +static DWORD CALLBACK collect_query_thread( void *arg ) +{ + struct query *query = arg; + DWORD interval = query->interval; + HANDLE stop = query->stop; + + for (;;) + { + if (WaitForSingleObject( stop, interval ) != WAIT_TIMEOUT) ExitThread( 0 ); + + EnterCriticalSection( &pdh_handle_cs ); + if (query->magic != PDH_MAGIC_QUERY) + { + LeaveCriticalSection( &pdh_handle_cs ); + ExitThread( PDH_INVALID_HANDLE ); + } + + collect_query_data( query ); + + if (!SetEvent( query->wait )) + { + LeaveCriticalSection( &pdh_handle_cs ); + ExitThread( 0 ); + } + LeaveCriticalSection( &pdh_handle_cs ); + } +} + +/*********************************************************************** + * PdhCollectQueryDataEx (PDH.@) + */ +PDH_STATUS WINAPI PdhCollectQueryDataEx( PDH_HQUERY handle, DWORD interval, HANDLE event ) +{ + PDH_STATUS ret; + struct query *query = handle; + + TRACE("%p %d %p\n", handle, interval, event); + + EnterCriticalSection( &pdh_handle_cs ); + if (!query || query->magic != PDH_MAGIC_QUERY) + { + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_INVALID_HANDLE; + } + if (list_empty( &query->counters )) + { + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_NO_DATA; + } + if (query->thread) + { + HANDLE thread = query->thread; + SetEvent( query->stop ); + LeaveCriticalSection( &pdh_handle_cs ); + + WaitForSingleObject( thread, INFINITE ); + + EnterCriticalSection( &pdh_handle_cs ); + if (query->magic != PDH_MAGIC_QUERY) + { + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_INVALID_HANDLE; + } + CloseHandle( query->thread ); + query->thread = NULL; + } + else if (!(query->stop = CreateEventW( NULL, FALSE, FALSE, NULL ))) + { + ret = GetLastError(); + LeaveCriticalSection( &pdh_handle_cs ); + return ret; + } + query->wait = event; + query->interval = interval * 1000; + if (!(query->thread = CreateThread( NULL, 0, collect_query_thread, query, 0, NULL ))) + { + ret = GetLastError(); + CloseHandle( query->stop ); + + LeaveCriticalSection( &pdh_handle_cs ); + return ret; + } + + LeaveCriticalSection( &pdh_handle_cs ); + return ERROR_SUCCESS; +} + +/*********************************************************************** + * PdhCollectQueryDataWithTime (PDH.@) + */ +PDH_STATUS WINAPI PdhCollectQueryDataWithTime( PDH_HQUERY handle, LONGLONG *timestamp ) +{ + struct query *query = handle; + struct counter *counter; + struct list *item; + + TRACE("%p %p\n", handle, timestamp); + + if (!timestamp) return PDH_INVALID_ARGUMENT; + + EnterCriticalSection( &pdh_handle_cs ); + if (!query || query->magic != PDH_MAGIC_QUERY) + { + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_INVALID_HANDLE; + } + if (list_empty( &query->counters )) + { + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_NO_DATA; + } + + collect_query_data( query ); + + item = list_head( &query->counters ); + counter = LIST_ENTRY( item, struct counter, entry ); + + *timestamp = ((LONGLONG)counter->stamp.dwHighDateTime << 32) | counter->stamp.dwLowDateTime; + + LeaveCriticalSection( &pdh_handle_cs ); + return ERROR_SUCCESS; +} + +/*********************************************************************** + * PdhGetCounterInfoA (PDH.@) + */ +PDH_STATUS WINAPI PdhGetCounterInfoA( PDH_HCOUNTER handle, BOOLEAN text, LPDWORD size, PPDH_COUNTER_INFO_A info ) +{ + struct counter *counter = handle; + + TRACE("%p %d %p %p\n", handle, text, size, info); + + EnterCriticalSection( &pdh_handle_cs ); + if (!counter || counter->magic != PDH_MAGIC_COUNTER) + { + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_INVALID_HANDLE; + } + if (!size) + { + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_INVALID_ARGUMENT; + } + if (*size < sizeof(PDH_COUNTER_INFO_A)) + { + *size = sizeof(PDH_COUNTER_INFO_A); + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_MORE_DATA; + } + + memset( info, 0, sizeof(PDH_COUNTER_INFO_A) ); + + info->dwType = counter->type; + info->CStatus = counter->status; + info->lScale = counter->scale; + info->lDefaultScale = counter->defaultscale; + info->dwUserData = counter->user; + info->dwQueryUserData = counter->queryuser; + + *size = sizeof(PDH_COUNTER_INFO_A); + + LeaveCriticalSection( &pdh_handle_cs ); + return ERROR_SUCCESS; +} + +/*********************************************************************** + * PdhGetCounterInfoW (PDH.@) + */ +PDH_STATUS WINAPI PdhGetCounterInfoW( PDH_HCOUNTER handle, BOOLEAN text, LPDWORD size, PPDH_COUNTER_INFO_W info ) +{ + struct counter *counter = handle; + + TRACE("%p %d %p %p\n", handle, text, size, info); + + EnterCriticalSection( &pdh_handle_cs ); + if (!counter || counter->magic != PDH_MAGIC_COUNTER) + { + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_INVALID_HANDLE; + } + if (!size) + { + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_INVALID_ARGUMENT; + } + if (*size < sizeof(PDH_COUNTER_INFO_W)) + { + *size = sizeof(PDH_COUNTER_INFO_W); + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_MORE_DATA; + } + + memset( info, 0, sizeof(PDH_COUNTER_INFO_W) ); + + info->dwType = counter->type; + info->CStatus = counter->status; + info->lScale = counter->scale; + info->lDefaultScale = counter->defaultscale; + info->dwUserData = counter->user; + info->dwQueryUserData = counter->queryuser; + + *size = sizeof(PDH_COUNTER_INFO_W); + + LeaveCriticalSection( &pdh_handle_cs ); + return ERROR_SUCCESS; +} + +/*********************************************************************** + * PdhGetCounterTimeBase (PDH.@) + */ +PDH_STATUS WINAPI PdhGetCounterTimeBase( PDH_HCOUNTER handle, LONGLONG *base ) +{ + struct counter *counter = handle; + + TRACE("%p %p\n", handle, base); + + if (!base) return PDH_INVALID_ARGUMENT; + + EnterCriticalSection( &pdh_handle_cs ); + if (!counter || counter->magic != PDH_MAGIC_COUNTER) + { + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_INVALID_HANDLE; + } + + *base = counter->base; + + LeaveCriticalSection( &pdh_handle_cs ); + return ERROR_SUCCESS; +} + +/*********************************************************************** + * PdhGetFormattedCounterValue (PDH.@) + */ +PDH_STATUS WINAPI PdhGetFormattedCounterValue( PDH_HCOUNTER handle, DWORD format, + LPDWORD type, PPDH_FMT_COUNTERVALUE value ) +{ + PDH_STATUS ret; + struct counter *counter = handle; + + TRACE("%p %x %p %p\n", handle, format, type, value); + + if (!value) return PDH_INVALID_ARGUMENT; + + EnterCriticalSection( &pdh_handle_cs ); + if (!counter || counter->magic != PDH_MAGIC_COUNTER) + { + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_INVALID_HANDLE; + } + if (counter->status) + { + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_INVALID_DATA; + } + if (!(ret = format_value( counter, format, &counter->one, &counter->two, value ))) + { + value->CStatus = ERROR_SUCCESS; + if (type) *type = counter->type; + } + + LeaveCriticalSection( &pdh_handle_cs ); + return ret; +} + +/*********************************************************************** + * PdhGetRawCounterValue (PDH.@) + */ +PDH_STATUS WINAPI PdhGetRawCounterValue( PDH_HCOUNTER handle, LPDWORD type, + PPDH_RAW_COUNTER value ) +{ + struct counter *counter = handle; + + TRACE("%p %p %p\n", handle, type, value); + + if (!value) return PDH_INVALID_ARGUMENT; + + EnterCriticalSection( &pdh_handle_cs ); + if (!counter || counter->magic != PDH_MAGIC_COUNTER) + { + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_INVALID_HANDLE; + } + + value->CStatus = counter->status; + value->TimeStamp.dwLowDateTime = counter->stamp.dwLowDateTime; + value->TimeStamp.dwHighDateTime = counter->stamp.dwHighDateTime; + value->FirstValue = counter->one.largevalue; + value->SecondValue = counter->two.largevalue; + value->MultiCount = 1; /* FIXME */ + + if (type) *type = counter->type; + + LeaveCriticalSection( &pdh_handle_cs ); + return ERROR_SUCCESS; +} + +/*********************************************************************** + * PdhLookupPerfIndexByNameA (PDH.@) + */ +PDH_STATUS WINAPI PdhLookupPerfIndexByNameA( LPCSTR machine, LPCSTR name, LPDWORD index ) +{ + PDH_STATUS ret; + WCHAR *machineW = NULL; + WCHAR *nameW; + + TRACE("%s %s %p\n", debugstr_a(machine), debugstr_a(name), index); + + if (!name) return PDH_INVALID_ARGUMENT; + + if (machine && !(machineW = pdh_strdup_aw( machine ))) return PDH_MEMORY_ALLOCATION_FAILURE; + + if (!(nameW = pdh_strdup_aw( name ))) + return PDH_MEMORY_ALLOCATION_FAILURE; + + ret = PdhLookupPerfIndexByNameW( machineW, nameW, index ); + + heap_free( nameW ); + heap_free( machineW ); + return ret; +} + +/*********************************************************************** + * PdhLookupPerfIndexByNameW (PDH.@) + */ +PDH_STATUS WINAPI PdhLookupPerfIndexByNameW( LPCWSTR machine, LPCWSTR name, LPDWORD index ) +{ + unsigned int i; + + TRACE("%s %s %p\n", debugstr_w(machine), debugstr_w(name), index); + + if (!name || !index) return PDH_INVALID_ARGUMENT; + + if (machine) + { + FIXME("remote machine not supported\n"); + return PDH_CSTATUS_NO_MACHINE; + } + for (i = 0; i < sizeof(counter_sources) / sizeof(counter_sources[0]); i++) + { + if (pdh_match_path( counter_sources[i].path, name )) + { + *index = counter_sources[i].index; + return ERROR_SUCCESS; + } + } + return PDH_STRING_NOT_FOUND; +} + +/*********************************************************************** + * PdhLookupPerfNameByIndexA (PDH.@) + */ +PDH_STATUS WINAPI PdhLookupPerfNameByIndexA( LPCSTR machine, DWORD index, LPSTR buffer, LPDWORD size ) +{ + PDH_STATUS ret; + WCHAR *machineW = NULL; + WCHAR bufferW[PDH_MAX_COUNTER_NAME]; + DWORD sizeW = sizeof(bufferW) / sizeof(WCHAR); + + TRACE("%s %d %p %p\n", debugstr_a(machine), index, buffer, size); + + if (!buffer || !size) return PDH_INVALID_ARGUMENT; + + if (machine && !(machineW = pdh_strdup_aw( machine ))) return PDH_MEMORY_ALLOCATION_FAILURE; + + if (!(ret = PdhLookupPerfNameByIndexW( machineW, index, bufferW, &sizeW ))) + { + int required = WideCharToMultiByte( CP_ACP, 0, bufferW, -1, NULL, 0, NULL, NULL ); + + if (size && *size < required) ret = PDH_MORE_DATA; + else WideCharToMultiByte( CP_ACP, 0, bufferW, -1, buffer, required, NULL, NULL ); + if (size) *size = required; + } + heap_free( machineW ); + return ret; +} + +/*********************************************************************** + * PdhLookupPerfNameByIndexW (PDH.@) + */ +PDH_STATUS WINAPI PdhLookupPerfNameByIndexW( LPCWSTR machine, DWORD index, LPWSTR buffer, LPDWORD size ) +{ + PDH_STATUS ret; + unsigned int i; + + TRACE("%s %d %p %p\n", debugstr_w(machine), index, buffer, size); + + if (machine) + { + FIXME("remote machine not supported\n"); + return PDH_CSTATUS_NO_MACHINE; + } + + if (!buffer || !size) return PDH_INVALID_ARGUMENT; + if (!index) return ERROR_SUCCESS; + + for (i = 0; i < sizeof(counter_sources) / sizeof(counter_sources[0]); i++) + { + if (counter_sources[i].index == index) + { + WCHAR *p = strrchrW( counter_sources[i].path, '\\' ) + 1; + unsigned int required = strlenW( p ) + 1; + + if (*size < required) ret = PDH_MORE_DATA; + else + { + strcpyW( buffer, p ); + ret = ERROR_SUCCESS; + } + *size = required; + return ret; + } + } + return PDH_INVALID_ARGUMENT; +} + +/*********************************************************************** + * PdhOpenQueryA (PDH.@) + */ +PDH_STATUS WINAPI PdhOpenQueryA( LPCSTR source, DWORD_PTR userdata, PDH_HQUERY *query ) +{ + PDH_STATUS ret; + WCHAR *sourceW = NULL; + + TRACE("%s %lx %p\n", debugstr_a(source), userdata, query); + + if (source && !(sourceW = pdh_strdup_aw( source ))) return PDH_MEMORY_ALLOCATION_FAILURE; + + ret = PdhOpenQueryW( sourceW, userdata, query ); + heap_free( sourceW ); + + return ret; +} + +/*********************************************************************** + * PdhOpenQueryW (PDH.@) + */ +PDH_STATUS WINAPI PdhOpenQueryW( LPCWSTR source, DWORD_PTR userdata, PDH_HQUERY *handle ) +{ + struct query *query; + + TRACE("%s %lx %p\n", debugstr_w(source), userdata, handle); + + if (!handle) return PDH_INVALID_ARGUMENT; + + if (source) + { + FIXME("log file data source not supported\n"); + return PDH_INVALID_ARGUMENT; + } + if ((query = create_query())) + { + query->user = userdata; + *handle = query; + + return ERROR_SUCCESS; + } + return PDH_MEMORY_ALLOCATION_FAILURE; +} + +/*********************************************************************** + * PdhRemoveCounter (PDH.@) + */ +PDH_STATUS WINAPI PdhRemoveCounter( PDH_HCOUNTER handle ) +{ + struct counter *counter = handle; + + TRACE("%p\n", handle); + + EnterCriticalSection( &pdh_handle_cs ); + if (!counter || counter->magic != PDH_MAGIC_COUNTER) + { + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_INVALID_HANDLE; + } + + list_remove( &counter->entry ); + destroy_counter( counter ); + + LeaveCriticalSection( &pdh_handle_cs ); + return ERROR_SUCCESS; +} + +/*********************************************************************** + * PdhSetCounterScaleFactor (PDH.@) + */ +PDH_STATUS WINAPI PdhSetCounterScaleFactor( PDH_HCOUNTER handle, LONG factor ) +{ + struct counter *counter = handle; + + TRACE("%p\n", handle); + + EnterCriticalSection( &pdh_handle_cs ); + if (!counter || counter->magic != PDH_MAGIC_COUNTER) + { + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_INVALID_HANDLE; + } + if (factor < PDH_MIN_SCALE || factor > PDH_MAX_SCALE) + { + LeaveCriticalSection( &pdh_handle_cs ); + return PDH_INVALID_ARGUMENT; + } + + counter->scale = factor; + + LeaveCriticalSection( &pdh_handle_cs ); + return ERROR_SUCCESS; +} + +/*********************************************************************** + * PdhValidatePathA (PDH.@) + */ +PDH_STATUS WINAPI PdhValidatePathA( LPCSTR path ) +{ + PDH_STATUS ret; + WCHAR *pathW; + + TRACE("%s\n", debugstr_a(path)); + + if (!path) return PDH_INVALID_ARGUMENT; + if (!(pathW = pdh_strdup_aw( path ))) return PDH_MEMORY_ALLOCATION_FAILURE; + + ret = PdhValidatePathW( pathW ); + + heap_free( pathW ); + return ret; +} + +static PDH_STATUS validate_path( LPCWSTR path ) +{ + if (!path || !*path) return PDH_INVALID_ARGUMENT; + if (*path++ != '\\' || !strchrW( path, '\\' )) return PDH_CSTATUS_BAD_COUNTERNAME; + return ERROR_SUCCESS; + } + +/*********************************************************************** + * PdhValidatePathW (PDH.@) + */ +PDH_STATUS WINAPI PdhValidatePathW( LPCWSTR path ) +{ + PDH_STATUS ret; + unsigned int i; + + TRACE("%s\n", debugstr_w(path)); + + if ((ret = validate_path( path ))) return ret; + + for (i = 0; i < sizeof(counter_sources) / sizeof(counter_sources[0]); i++) + if (pdh_match_path( counter_sources[i].path, path )) return ERROR_SUCCESS; + + return PDH_CSTATUS_NO_COUNTER; +} + +/*********************************************************************** + * PdhValidatePathExA (PDH.@) + */ +PDH_STATUS WINAPI PdhValidatePathExA( PDH_HLOG source, LPCSTR path ) +{ + TRACE("%p %s\n", source, debugstr_a(path)); + + if (source) + { + FIXME("log file data source not supported\n"); + return ERROR_SUCCESS; + } + return PdhValidatePathA( path ); +} + +/*********************************************************************** + * PdhValidatePathExW (PDH.@) + */ +PDH_STATUS WINAPI PdhValidatePathExW( PDH_HLOG source, LPCWSTR path ) +{ + TRACE("%p %s\n", source, debugstr_w(path)); + + if (source) + { + FIXME("log file data source not supported\n"); + return ERROR_SUCCESS; + } + return PdhValidatePathW( path ); +} Propchange: trunk/reactos/dll/win32/pdh/pdh_main.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Thu Apr 17 08:45:02 2008 @@ -214,6 +214,9 @@ <directory name="opengl32"> <xi:include href="opengl32/opengl32.rbuild" /> </directory> +<directory name="pdh"> + <xi:include href="pdh/pdh.rbuild" /> +</directory> <directory name="powrprof"> <xi:include href="powrprof/powrprof.rbuild" /> </directory>

1 0

[dchapyshev] 32998: - Add baseaddress for msdmo.dll, pdh.dll, qedit.dll, quartz.dll, ksuser.dll, ksproxy.ax
by dchapyshev＠svn.reactos.org 17 Apr '08

17 Apr '08

Author: dchapyshev Date: Thu Apr 17 08:40:56 2008 New Revision: 32998 URL: http://svn.reactos.org/svn/reactos?rev=32998&view=rev Log: - Add baseaddress for msdmo.dll, pdh.dll, qedit.dll, quartz.dll, ksuser.dll, ksproxy.ax Modified: trunk/reactos/baseaddress.rbuild Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=329… ============================================================================== --- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original) +++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Thu Apr 17 08:40:56 2008 @@ -23,6 +23,7 @@ <property name="BASEADDRESS_INPUT" value ="0x5e400000" /> <property name="BASEADDRESS_DINPUT" value="0x5f580000" /> <property name="BASEADDRESS_NETID" value="0x5f660000" /> + <property name="BASEADDRESS_QEDIT" value="0x611c0000" /> <property name="BASEADDRESS_MODEMUI" value="0x61650000" /> <property name="BASEADDRESS_MAPI32" value="0x62250000" /> <property name="BASEADDRESS_HDWWIZ" value="0x64d40000" /> @@ -41,6 +42,7 @@ <property name="BASEADDRESS_HID" value="0x688f0000" /> <property name="BASEADDRESS_PSXDLL" value="0x68eb0000" /> <property name="BASEADDRESS_PSAPI" value="0x68f70000" /> + <property name="BASEADDRESS_KSPROXY" value="0x68f90000" /> <property name="BASEADDRESS_OLEACC" value="0x69640000" /> <property name="BASEADDRESS_WINMM" value="0x697d0000" /> <property name="BASEADDRESS_MSIMG32" value="0x69cc0000" /> @@ -86,10 +88,13 @@ <property name="BASEADDRESS_WINSCARD" value="0x723d0000" /> <property name="BASEADDRESS_DEVMGR" value="0x72a90000" /> <property name="BASEADDRESS_WINSPOOL" value="0x72f50000" /> + <property name="BASEADDRESS_MSDMO" value="0x73670000" /> <property name="BASEADDRESS_AVIFIL32" value="0x73ac0000" /> <property name="BASEADDRESS_LZ32" value="0x73d80000" /> <property name="BASEADDRESS_COREDLL" value="0x73d80000" /> + <property name="BASEADDRESS_KSUSER" value="0x73ea0000" /> <property name="BASEADDRESS_ICMP" value="0x741f0000" /> + <property name="BASEADDRESS_QUARTZ" value="0x747d0000" /> <property name="BASEADDRESS_USERENV" value="0x74850000" /> <property name="BASEADDRESS_WS2_32" value="0x74aa0000" /> <property name="BASEADDRESS_SYSSETUP" value="0x74a30000" /> @@ -97,6 +102,7 @@ <property name="BASEADDRESS_MSXML3" value="0x74ae0000" /> <property name="BASEADDRESS_PRINTUI" value="0x74b40000" /> <property name="BASEADDRESS_MMDRV" value="0x74c30000" /> + <property name="BASEADDRESS_PDH" value="0x74c70000" /> <property name="BASEADDRESS_OLEDLG" value="0x74d00000" /> <property name="BASEADDRESS_SAMSRV" value="0x74f30000" /> <property name="BASEADDRESS_SAMLIB" value="0x750C0000" />

1 0

[janderwald] 32997: - unlink window object when notify hook returns an error
by janderwald＠svn.reactos.org 17 Apr '08

17 Apr '08

Author: janderwald Date: Thu Apr 17 03:34:58 2008 New Revision: 32997 URL: http://svn.reactos.org/svn/reactos?rev=32997&view=rev Log: - unlink window object when notify hook returns an error Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Thu Apr 17 03:34:58 2008 @@ -2063,6 +2063,7 @@ { /* FIXME: Cleanup. */ DPRINT1("IntCreateWindowEx(): event CREATE hook failed. No cleanup performed!\n"); + IntUnlinkWindow(Window); RETURN((HWND)0); } #endif

1 0

[jimtabor] 32996: Example way to set DCOrg with new dc object.
by jimtabor＠svn.reactos.org 17 Apr '08

17 Apr '08

Author: jimtabor Date: Thu Apr 17 00:11:28 2008 New Revision: 32996 URL: http://svn.reactos.org/svn/reactos?rev=32996&view=rev Log: Example way to set DCOrg with new dc object. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c [iso-8859-1] Thu Apr 17 00:11:28 2008 @@ -1111,6 +1111,34 @@ Point->y = dc->w.DCOrgY; return TRUE; +} + +LONG FASTCALL +IntCalcFillOrigin(PDC pdc) +{ + pdc->ptlFillOrigin.x = pdc->DcLevel.ptlBrushOrigin.x + pdc->ptlSaveFillOrig.x; + pdc->ptlFillOrigin.y = pdc->DcLevel.ptlBrushOrigin.y + pdc->ptlSaveFillOrig.y; + + return pdc->ptlFillOrigin.y; +} + +VOID +STDCALL +GdiSetDCOrg(HDC hDC, LONG Left, LONG Top, PRECTL prc) +{ + PDC pdc; + + pdc = DC_LockDc(hDC); + if (!pdc) return; + + pdc->ptlSaveFillOrig.x = Left; + pdc->ptlSaveFillOrig.y = Top; + + IntCalcFillOrigin(pdc); + + if (prc) pdc->erclWindow = *prc; + + DC_UnlockDc(pdc); } BOOL FASTCALL

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2008