Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 26351: Copied remotely, this header is compatible with ms dxsdk 2004 dec
by greatlrd＠svn.reactos.org 14 Apr '07

14 Apr '07

Author: greatlrd Date: Sun Apr 15 02:32:01 2007 New Revision: 26351 URL: http://svn.reactos.org/svn/reactos?rev=26351&view=rev Log: Copied remotely, this header is compatible with ms dxsdk 2004 dec Added: trunk/reactos/include/dxsdk/ksuuids.h - copied unchanged from r26350, trunk/reactos/include/psdk/ksuuids.h

1 0

[greatlrd] 26350: Copied remotely, compatible with dxsdk 2004 dec
by greatlrd＠svn.reactos.org 14 Apr '07

14 Apr '07

Author: greatlrd Date: Sun Apr 15 01:45:40 2007 New Revision: 26350 URL: http://svn.reactos.org/svn/reactos?rev=26350&view=rev Log: Copied remotely, compatible with dxsdk 2004 dec Added: trunk/reactos/include/dxsdk/amvideo.h - copied unchanged from r26349, trunk/reactos/include/psdk/amvideo.h

1 0

[greatlrd] 26349: Find some older works, dxsdk header compatible with dxsdk 2004 dec release. I will clean up sdk so dx thuse dx header belong to dxsdk will be here. later. In this folder will contain all header that is compatible with dxsdk 2004 dec. later I will upgrade this folder file to more resent dxsdk headers.
by greatlrd＠svn.reactos.org 14 Apr '07

14 Apr '07

Author: greatlrd Date: Sun Apr 15 01:36:02 2007 New Revision: 26349 URL: http://svn.reactos.org/svn/reactos?rev=26349&view=rev Log: Find some older works, dxsdk header compatible with dxsdk 2004 dec release. I will clean up sdk so dx thuse dx header belong to dxsdk will be here. later. In this folder will contain all header that is compatible with dxsdk 2004 dec. later I will upgrade this folder file to more resent dxsdk headers. Added: trunk/reactos/include/dxsdk/regbag.h (with props) Added: trunk/reactos/include/dxsdk/regbag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/regbag.h?rev… ============================================================================== --- trunk/reactos/include/dxsdk/regbag.h (added) +++ trunk/reactos/include/dxsdk/regbag.h Sun Apr 15 01:36:02 2007 @@ -1,0 +1,109 @@ + + +#ifndef __REQUIRED_RPCNDR_H_VERSION__ +#define __REQUIRED_RPCNDR_H_VERSION__ 475 +#endif + +#include "rpc.h" +#include "rpcndr.h" + +#ifndef __RPCNDR_H_VERSION__ +#error this stub requires never version of <rpcndr.h> +#endif + +#ifndef COM_NO_WINDOWS_H + #include "windows.h" + #include "ole2.h" +#endif + +#ifndef __regbag_h__ +#define __regbag_h__ + +#if defined(_MSC_VER) && (_MSC_VER >= 1020) + #pragma once +#endif + +#ifndef __ICreatePropBagOnRegKey_FWD_DEFINED__ + #define __ICreatePropBagOnRegKey_FWD_DEFINED__ + typedef interface ICreatePropBagOnRegKey ICreatePropBagOnRegKey; +#endif + +#include "objidl.h" +#include "oaidl.h" +#include "ocidl.h" + +#ifdef __cplusplus +extern "C"{ +#endif + +void * __RPC_USER MIDL_user_allocate(size_t); +void __RPC_USER MIDL_user_free( void * ); + + +#pragma once + + +extern RPC_IF_HANDLE __MIDL_itf_regbag_0000_v0_0_c_ifspec; +extern RPC_IF_HANDLE __MIDL_itf_regbag_0000_v0_0_s_ifspec; + +#ifndef __ICreatePropBagOnRegKey_INTERFACE_DEFINED__ + #define __ICreatePropBagOnRegKey_INTERFACE_DEFINED__ + EXTERN_C const IID IID_ICreatePropBagOnRegKey; + #if defined(__cplusplus) && !defined(CINTERFACE) + MIDL_INTERFACE("8A674B48-1F63-11D3-B64C-00C04F79498E") + ICreatePropBagOnRegKey : public IUnknown + { + public: + virtual HRESULT STDMETHODCALLTYPE Create(HKEY hkey, LPCOLESTR subkey, DWORD ulOptions, DWORD samDesired, + REFIID iid, LPVOID *ppBag) = 0; + }; +#else + + typedef struct ICreatePropBagOnRegKeyVtbl + { + BEGIN_INTERFACE + HRESULT ( STDMETHODCALLTYPE *QueryInterface )(ICreatePropBagOnRegKey * This, REFIID riid, void **ppvObject); + ULONG ( STDMETHODCALLTYPE *AddRef )(ICreatePropBagOnRegKey * This); + ULONG ( STDMETHODCALLTYPE *Release )(ICreatePropBagOnRegKey * This); + HRESULT ( STDMETHODCALLTYPE *Create )(ICreatePropBagOnRegKey * This, HKEY hkey, LPCOLESTR subkey, + DWORD ulOptions, DWORD samDesired, REFIID iid, LPVOID *ppBag); + END_INTERFACE + } ICreatePropBagOnRegKeyVtbl; + + interface ICreatePropBagOnRegKey + { + CONST_VTBL struct ICreatePropBagOnRegKeyVtbl *lpVtbl; + }; + + #ifdef COBJMACROS + #define ICreatePropBagOnRegKey_QueryInterface(This,riid,ppvObject) (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) + #define ICreatePropBagOnRegKey_AddRef(This) (This)->lpVtbl -> AddRef(This) + #define ICreatePropBagOnRegKey_Release(This) (This)->lpVtbl -> Release(This) + #define ICreatePropBagOnRegKey_Create(This,hkey,subkey,ulOptions,samDesired,iid,ppBag) (This)->lpVtbl -> Create(This,hkey,subkey,ulOptions,samDesired,iid,ppBag) + #endif +#endif + + +void __RPC_STUB +ICreatePropBagOnRegKey_Create_Stub( + IRpcStubBuffer *This, + IRpcChannelBuffer *_pRpcChannelBuffer, + PRPC_MESSAGE _pRpcMessage, + DWORD *_pdwStubPhase); + +HRESULT STDMETHODCALLTYPE +ICreatePropBagOnRegKey_Create_Proxy( + ICreatePropBagOnRegKey * This, + HKEY hkey, + LPCOLESTR subkey, + DWORD ulOptions, + DWORD samDesired, + REFIID iid, + LPVOID *ppBag); + +#endif +#ifdef __cplusplus +} +#endif + +#endif Propchange: trunk/reactos/include/dxsdk/regbag.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 26348: Find some older works, dxsdk header compatible with dxsdk 2004 dec release. I will clean up sdk so dx thuse dx header belong to dxsdk will be here. later. In this folder will contain all header that is compatible with dxsdk 2004 dec. later I will upgrade this folder file to more resent dxsdk headers.
by greatlrd＠svn.reactos.org 14 Apr '07

14 Apr '07

Author: greatlrd Date: Sun Apr 15 00:36:46 2007 New Revision: 26348 URL: http://svn.reactos.org/svn/reactos?rev=26348&view=rev Log: Find some older works, dxsdk header compatible with dxsdk 2004 dec release. I will clean up sdk so dx thuse dx header belong to dxsdk will be here. later. In this folder will contain all header that is compatible with dxsdk 2004 dec. later I will upgrade this folder file to more resent dxsdk headers. Added: trunk/reactos/include/dxsdk/dls2.h (with props) trunk/reactos/include/dxsdk/vpconfig.h (with props) Added: trunk/reactos/include/dxsdk/dls2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dls2.h?rev=2… ============================================================================== --- trunk/reactos/include/dxsdk/dls2.h (added) +++ trunk/reactos/include/dxsdk/dls2.h Sun Apr 15 00:36:46 2007 @@ -1,0 +1,73 @@ +#ifndef _INC_DLS2 +#define _INC_DLS2 + +DEFINE_GUID(DLSID_GMInHardware, 0x178F2F24, 0xC364, 0x11D1, 0xA7, 0x60, 0x00, 0x00, 0xF8, 0x75, 0xAC, 0x12); +DEFINE_GUID(DLSID_GSInHardware, 0x178F2F25, 0xC364, 0x11D1, 0xA7, 0x60, 0x00, 0x00, 0xF8, 0x75, 0xAC, 0x12); +DEFINE_GUID(DLSID_XGInHardware, 0x178F2F26, 0xC364, 0x11D1, 0xA7, 0x60, 0x00, 0x00, 0xF8, 0x75, 0xAC, 0x12); +DEFINE_GUID(DLSID_SupportsDLS1, 0x178F2F27, 0xC364, 0x11D1, 0xA7, 0x60, 0x00, 0x00, 0xF8, 0x75, 0xAC, 0x12); +DEFINE_GUID(DLSID_SupportsDLS2, 0xF14599E5, 0x4689, 0x11D2, 0xAF, 0xA6, 0x00, 0xAA, 0x00, 0x24, 0xd8, 0xB6); +DEFINE_GUID(DLSID_SampleMemorySize, 0x178F2F28, 0xC364, 0x11D1, 0xA7, 0x60, 0x00, 0x00, 0xF8, 0x75, 0xAC, 0x12); +DEFINE_GUID(DLSID_ManufacturersID, 0xB03E1181, 0x8095, 0x11D2, 0xA1, 0xEF, 0x00, 0x60, 0x08, 0x33, 0xDB, 0xD8); +DEFINE_GUID(DLSID_ProductID, 0xB03E1182, 0x8095, 0x11D2, 0xA1, 0xEF, 0x00, 0x60, 0x08, 0x33, 0xDB, 0xD8); +DEFINE_GUID(DLSID_SamplePlaybackRate, 0x2A91F713, 0xA4BF, 0x11D2, 0xBB, 0xDF, 0x00, 0x60, 0x08, 0x33, 0xDB, 0xD8); + +#define CONN_SRC_POLYPRESSURE 0x0007 +#define CONN_SRC_CHANNELPRESSURE 0x0008 +#define CONN_SRC_VIBRATO 0x0009 +#define CONN_SRC_MONOPRESSURE 0x000A +#define CONN_SRC_CC91 0x00DB +#define CONN_SRC_CC93 0x00DD + +#define CONN_DST_GAIN 0x0001 +#define CONN_DST_KEYNUMBER 0x0005 +#define CONN_DST_LEFT 0x0010 +#define CONN_DST_RIGHT 0x0011 +#define CONN_DST_CENTER 0x0012 +#define CONN_DST_LEFTREAR 0x0013 +#define CONN_DST_RIGHTREAR 0x0014 +#define CONN_DST_LFE_CHANNEL 0x0015 +#define CONN_DST_CHORUS 0x0080 +#define CONN_DST_REVERB 0x0081 +#define CONN_DST_VIB_FREQUENCY 0x0114 +#define CONN_DST_VIB_STARTDELAY 0x0115 +#define CONN_DST_EG1_DELAYTIME 0x020B +#define CONN_DST_EG1_HOLDTIME 0x020C +#define CONN_DST_EG1_SHUTDOWNTIME 0x020D +#define CONN_DST_EG2_DELAYTIME 0x030F +#define CONN_DST_EG2_HOLDTIME 0x0310 +#define CONN_DST_FILTER_CUTOFF 0x0500 +#define CONN_DST_FILTER_Q 0x0501 + +#define DLS_CDL_AND 0x0001 +#define DLS_CDL_OR 0x0002 +#define DLS_CDL_XOR 0x0003 +#define DLS_CDL_ADD 0x0004 +#define DLS_CDL_SUBTRACT 0x0005 +#define DLS_CDL_MULTIPLY 0x0006 +#define DLS_CDL_DIVIDE 0x0007 +#define DLS_CDL_LOGICAL_AND 0x0008 +#define DLS_CDL_LOGICAL_OR 0x0009 +#define DLS_CDL_LT 0x000A +#define DLS_CDL_LE 0x000B +#define DLS_CDL_GT 0x000C +#define DLS_CDL_GE 0x000D +#define DLS_CDL_EQ 0x000E +#define DLS_CDL_NOT 0x000F +#define DLS_CDL_CONST 0x0010 +#define DLS_CDL_QUERY 0x0011 +#define DLS_CDL_QUERYSUPPORTED 0x0012 + +#define CONN_TRN_CONVEX 0x0002 +#define CONN_TRN_SWITCH 0x0003 + +#define FOURCC_RGN2 mmioFOURCC('r','g','n','2') +#define FOURCC_LAR2 mmioFOURCC('l','a','r','2') +#define FOURCC_ART2 mmioFOURCC('a','r','t','2') +#define FOURCC_CDL mmioFOURCC('c','d','l',' ') +#define FOURCC_DLID mmioFOURCC('d','l','i','d') + +#define F_WAVELINK_MULTICHANNEL 0x0002 +#define WLOOP_TYPE_RELEASE 1 + +#endif + Propchange: trunk/reactos/include/dxsdk/dls2.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/vpconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/vpconfig.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/vpconfig.h (added) +++ trunk/reactos/include/dxsdk/vpconfig.h Sun Apr 15 00:36:46 2007 @@ -1,0 +1,58 @@ + +#ifndef __IVPConfig__ +#define __IVPConfig__ + +#ifdef __cplusplus +extern "C" { +#endif + + +DECLARE_INTERFACE_(IVPBaseConfig, IUnknown) +{ + public: + STDMETHOD (GetConnectInfo)(THIS_ IN OUT LPDWORD pdwNumConnectInfo, + IN OUT LPDDVIDEOPORTCONNECT pddVPConnectInfo) PURE; + + STDMETHOD (SetConnectInfo)(THIS_ IN DWORD dwChosenEntry) PURE; + STDMETHOD (GetVPDataInfo)(THIS_ IN OUT LPAMVPDATAINFO pamvpDataInfo) PURE; + STDMETHOD (GetMaxPixelRate)(THIS_ IN OUT LPAMVPSIZE pamvpSize, + OUT LPDWORD pdwMaxPixelsPerSecond) PURE; + + STDMETHOD (InformVPInputFormats)(THIS_ IN DWORD dwNumFormats, + IN LPDDPIXELFORMAT pDDPixelFormats) PURE; + + STDMETHOD (GetVideoFormats)(THIS_ IN OUT LPDWORD pdwNumFormats, + IN OUT LPDDPIXELFORMAT pddPixelFormats) PURE; + + STDMETHOD (SetVideoFormat)(THIS_ IN DWORD dwChosenEntry) PURE; + STDMETHOD (SetInvertPolarity)(THIS_ ) PURE; + STDMETHOD (GetOverlaySurface)(THIS_ OUT LPDIRECTDRAWSURFACE* ppddOverlaySurface) PURE; + STDMETHOD (SetDirectDrawKernelHandle)(THIS_ IN ULONG_PTR dwDDKernelHandle) PURE; + STDMETHOD (SetVideoPortID)(THIS_ IN DWORD dwVideoPortID) PURE; + + STDMETHOD (SetDDSurfaceKernelHandles)(THIS_ IN DWORD cHandles, + IN ULONG_PTR *rgDDKernelHandles) PURE; + + STDMETHOD (SetSurfaceParameters)(THIS_ IN DWORD dwPitch, IN DWORD dwXOrigin, + IN DWORD dwYOrigin) PURE; +}; + +DECLARE_INTERFACE_(IVPConfig, IVPBaseConfig) +{ + public: + STDMETHOD (IsVPDecimationAllowed)(THIS_ OUT LPBOOL pbIsDecimationAllowed) PURE; + STDMETHOD (SetScalingFactors)(THIS_ IN LPAMVPSIZE pamvpSize) PURE; +}; + +DECLARE_INTERFACE_(IVPVBIConfig, IVPBaseConfig) +{ + public: +}; + +#ifdef __cplusplus +} +#endif + + +#endif + Propchange: trunk/reactos/include/dxsdk/vpconfig.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 26347: Find some older works, dxsdk header compatible with dxsdk 2004 dec release. I will clean up sdk so dx thuse dx header belong to dxsdk will be here. later. In this folder will contain all header that is compatible with dxsdk 2004 dec. later I will upgrade this folder file to more resent dxsdk headers.
by greatlrd＠svn.reactos.org 14 Apr '07

14 Apr '07

Author: greatlrd Date: Sun Apr 15 00:07:28 2007 New Revision: 26347 URL: http://svn.reactos.org/svn/reactos?rev=26347&view=rev Log: Find some older works, dxsdk header compatible with dxsdk 2004 dec release. I will clean up sdk so dx thuse dx header belong to dxsdk will be here. later. In this folder will contain all header that is compatible with dxsdk 2004 dec. later I will upgrade this folder file to more resent dxsdk headers. Added: trunk/reactos/include/dxsdk/DShow.h (with props) trunk/reactos/include/dxsdk/Iwstdec.h (with props) trunk/reactos/include/dxsdk/Mpeg2Error.h (with props) trunk/reactos/include/dxsdk/amva.h (with props) trunk/reactos/include/dxsdk/dmodshow.h (with props) trunk/reactos/include/dxsdk/dmoreg.h (with props) trunk/reactos/include/dxsdk/il21dec.h (with props) trunk/reactos/include/dxsdk/mpegtype.h (with props) Added: trunk/reactos/include/dxsdk/DShow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/DShow.h?rev=… ============================================================================== --- trunk/reactos/include/dxsdk/DShow.h (added) +++ trunk/reactos/include/dxsdk/DShow.h Sun Apr 15 00:07:28 2007 @@ -1,0 +1,57 @@ + +#ifndef __DSHOW_INCLUDED__ +#define __DSHOW_INCLUDED__ + +#ifdef _MSC_VER + #pragma warning(disable:4100) + #pragma warning(disable:4201) + #pragma warning(disable:4511) + #pragma warning(disable:4512) + #pragma warning(disable:4514) + #if _MSC_VER>=1100 + #define AM_NOVTABLE __declspec(novtable) + #else + #define AM_NOVTABLE + #endif +#endif + +#include <windows.h> +#include <windowsx.h> +#include <olectl.h> +#include <ddraw.h> +#include <mmsystem.h> + +#ifndef NO_DSHOW_STRSAFE + #define NO_SHLWAPI_STRFCNS +#include <strsafe.h> +#endif + +#ifndef NUMELMS + #define NUMELMS(aa) (sizeof(aa)/sizeof((aa)[0])) +#endif + +#include <strmif.h> +#include <amvideo.h> +#include <amaudio.h> +#include <control.h> +#include <evcode.h> +#include <uuids.h> +#include <errors.h> +#include <edevdefs.h> +#include <audevcod.h> +#include <dvdevcod.h> + +#ifndef InterlockedExchangePointer + #define InterlockedExchangePointer(Target, Value) (PVOID)InterlockedExchange((PLONG)(Target), (LONG)(Value)) +#endif + +#ifndef OATRUE + #define OATRUE (-1) +#endif + +#ifndef OAFALSE + #define OAFALSE (0) +#endif + +#endif + Propchange: trunk/reactos/include/dxsdk/DShow.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/Iwstdec.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/Iwstdec.h?re… ============================================================================== --- trunk/reactos/include/dxsdk/Iwstdec.h (added) +++ trunk/reactos/include/dxsdk/Iwstdec.h Sun Apr 15 00:07:28 2007 @@ -1,0 +1,75 @@ + + +#ifndef __IWSTDEC__ +#define __IWSTDEC__ + +typedef enum _AM_WST_DRAWBGMODE +{ + AM_WST_DRAWBGMODE_Opaque, + AM_WST_DRAWBGMODE_Transparent +} AM_WST_DRAWBGMODE, *PAM_WST_DRAWBGMODE; + +typedef struct _AM_WST_PAGE +{ + DWORD dwPageNr ; + DWORD dwSubPageNr ; + BYTE *pucPageData; +} AM_WST_PAGE, *PAM_WST_PAGE; + +typedef enum _AM_WST_STATE +{ + AM_WST_STATE_Off = 0, + AM_WST_STATE_On +} AM_WST_STATE, *PAM_WST_STATE; + +typedef enum _AM_WST_SERVICE +{ + AM_WST_SERVICE_None = 0, + AM_WST_SERVICE_Text, + AM_WST_SERVICE_IDS, + AM_WST_SERVICE_Invalid +} AM_WST_SERVICE, *PAM_WST_SERVICE; + +typedef enum _AM_WST_STYLE +{ + AM_WST_STYLE_None = 0, + AM_WST_STYLE_Invers +} AM_WST_STYLE, *PAM_WST_STYLE; + +typedef enum _AM_WST_LEVEL +{ + AM_WST_LEVEL_1_5 = 0 +} AM_WST_LEVEL, *PAM_WST_LEVEL; + +#ifdef __cplusplus +extern "C" { +#endif + +DECLARE_INTERFACE_(IAMWstDecoder, IUnknown) +{ + public: + STDMETHOD(GetDecoderLevel)(THIS_ AM_WST_LEVEL *lpLevel) PURE; + STDMETHOD(GetCurrentService)(THIS_ AM_WST_SERVICE *lpService) PURE; + STDMETHOD(GetServiceState)(THIS_ AM_WST_STATE *lpState) PURE; + STDMETHOD(SetServiceState)(THIS_ AM_WST_STATE State) PURE ; + STDMETHOD(GetOutputFormat)(THIS_ LPBITMAPINFOHEADER lpbmih) PURE; + STDMETHOD(SetOutputFormat)(THIS_ LPBITMAPINFO lpbmi) PURE; + STDMETHOD(GetBackgroundColor)(THIS_ DWORD *pdwPhysColor) PURE; + STDMETHOD(SetBackgroundColor)(THIS_ DWORD dwPhysColor) PURE; + STDMETHOD(GetRedrawAlways)(THIS_ LPBOOL lpbOption) PURE; + STDMETHOD(SetRedrawAlways)(THIS_ BOOL bOption) PURE; + STDMETHOD(GetDrawBackgroundMode)(THIS_ AM_WST_DRAWBGMODE *lpMode) PURE; + STDMETHOD(SetDrawBackgroundMode)(THIS_ AM_WST_DRAWBGMODE Mode) PURE; + STDMETHOD(SetAnswerMode)(THIS_ BOOL bAnswer) PURE; + STDMETHOD(GetAnswerMode)(THIS_ BOOL* pbAnswer) PURE; + STDMETHOD(SetHoldPage)(THIS_ BOOL bHoldPage) PURE; + STDMETHOD(GetHoldPage)(THIS_ BOOL* pbHoldPage) PURE; + STDMETHOD(GetCurrentPage)(THIS_ PAM_WST_PAGE pWstPage) PURE; + STDMETHOD(SetCurrentPage)(THIS_ AM_WST_PAGE WstPage) PURE; +} ; + +#ifdef __cplusplus +} +#endif +#endif + Propchange: trunk/reactos/include/dxsdk/Iwstdec.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/Mpeg2Error.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/Mpeg2Error.h… ============================================================================== --- trunk/reactos/include/dxsdk/Mpeg2Error.h (added) +++ trunk/reactos/include/dxsdk/Mpeg2Error.h Sun Apr 15 00:07:28 2007 @@ -1,0 +1,45 @@ +#pragma once + + +#define MAKE_S_ITF_HRESULT(x) MAKE_HRESULT(SEVERITY_SUCCESS, FACILITY_ITF, (x)) +#define MAKE_E_ITF_HRESULT(x) MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, (x)) +const unsigned int MPEG2_BASE = 0x200; + +const HRESULT MPEG2_E_UNINITIALIZED = MAKE_E_ITF_HRESULT(MPEG2_BASE + 0); +const HRESULT MPEG2_E_ALREADY_INITIALIZED = MAKE_E_ITF_HRESULT(MPEG2_BASE + 1); +const HRESULT MPEG2_E_OUT_OF_BOUNDS = MAKE_E_ITF_HRESULT(MPEG2_BASE + 2); +const HRESULT MPEG2_E_MALFORMED_TABLE = MAKE_E_ITF_HRESULT(MPEG2_BASE + 3); +const HRESULT MPEG2_E_UNDEFINED = MAKE_E_ITF_HRESULT(MPEG2_BASE + 4); +const HRESULT MPEG2_E_NOT_PRESENT = MAKE_E_ITF_HRESULT(MPEG2_BASE + 5); +const HRESULT MPEG2_E_SECTION_NOT_FOUND = MAKE_E_ITF_HRESULT(MPEG2_BASE + 6); +const HRESULT MPEG2_E_TX_STREAM_UNAVAILABLE = MAKE_E_ITF_HRESULT(MPEG2_BASE + 7); +const HRESULT MPEG2_E_SERVICE_ID_NOT_FOUND = MAKE_E_ITF_HRESULT(MPEG2_BASE + 8); +const HRESULT MPEG2_E_SERVICE_PMT_NOT_FOUND = MAKE_E_ITF_HRESULT(MPEG2_BASE + 9); +const HRESULT MPEG2_E_DSI_NOT_FOUND = MAKE_E_ITF_HRESULT(MPEG2_BASE + 10); +const HRESULT MPEG2_E_SERVER_UNAVAILABLE = MAKE_E_ITF_HRESULT(MPEG2_BASE + 11); +const HRESULT MPEG2_E_INVALID_CAROUSEL_ID = MAKE_E_ITF_HRESULT(MPEG2_BASE + 12); +const HRESULT MPEG2_E_MALFORMED_DSMCC_MESSAGE = MAKE_E_ITF_HRESULT(MPEG2_BASE + 13); +const HRESULT MPEG2_E_INVALID_SG_OBJECT_KIND = MAKE_E_ITF_HRESULT(MPEG2_BASE + 14); +const HRESULT MPEG2_E_OBJECT_NOT_FOUND = MAKE_E_ITF_HRESULT(MPEG2_BASE + 15); +const HRESULT MPEG2_E_OBJECT_KIND_NOT_A_DIRECTORY = MAKE_E_ITF_HRESULT(MPEG2_BASE + 16); +const HRESULT MPEG2_E_OBJECT_KIND_NOT_A_FILE = MAKE_E_ITF_HRESULT(MPEG2_BASE + 17); +const HRESULT MPEG2_E_FILE_OFFSET_TOO_BIG = MAKE_E_ITF_HRESULT(MPEG2_BASE + 18); +const HRESULT MPEG2_E_STREAM_STOPPED = MAKE_E_ITF_HRESULT(MPEG2_BASE + 19); +const HRESULT MPEG2_E_REGISTRY_ACCESS_FAILED = MAKE_E_ITF_HRESULT(MPEG2_BASE + 20); +const HRESULT MPEG2_E_INVALID_UDP_PORT = MAKE_E_ITF_HRESULT(MPEG2_BASE + 21); +const HRESULT MPEG2_E_DATA_SOURCE_FAILED = MAKE_E_ITF_HRESULT(MPEG2_BASE + 22); +const HRESULT MPEG2_E_DII_NOT_FOUND = MAKE_E_ITF_HRESULT(MPEG2_BASE + 23); +const HRESULT MPEG2_E_DSHOW_PIN_NOT_FOUND = MAKE_E_ITF_HRESULT(MPEG2_BASE + 24); +const HRESULT MPEG2_E_BUFFER_TOO_SMALL = MAKE_E_ITF_HRESULT(MPEG2_BASE + 25); +const HRESULT MPEG2_E_MISSING_SECTIONS = MAKE_E_ITF_HRESULT(MPEG2_BASE + 26); +const HRESULT MPEG2_E_TOO_MANY_SECTIONS = MAKE_E_ITF_HRESULT(MPEG2_BASE + 27); +const HRESULT MPEG2_E_NEXT_TABLE_OPS_NOT_AVAILABLE = MAKE_E_ITF_HRESULT(MPEG2_BASE + 28); + +const HRESULT MPEG2_S_MORE_DATA_AVAILABLE = MAKE_S_ITF_HRESULT(MPEG2_BASE + 0); +const HRESULT MPEG2_S_NO_MORE_DATA_AVAILABLE = MAKE_S_ITF_HRESULT(MPEG2_BASE + 1); +const HRESULT MPEG2_S_SG_INFO_FOUND = MAKE_S_ITF_HRESULT(MPEG2_BASE + 2); +const HRESULT MPEG2_S_SG_INFO_NOT_FOUND = MAKE_S_ITF_HRESULT(MPEG2_BASE + 3); +const HRESULT MPEG2_S_MPE_INFO_FOUND = MAKE_S_ITF_HRESULT(MPEG2_BASE + 4); +const HRESULT MPEG2_S_MPE_INFO_NOT_FOUND = MAKE_S_ITF_HRESULT(MPEG2_BASE + 5); +const HRESULT MPEG2_S_NEW_MODULE_VERSION = MAKE_S_ITF_HRESULT(MPEG2_BASE + 6); + Propchange: trunk/reactos/include/dxsdk/Mpeg2Error.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/amva.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/amva.h?rev=2… ============================================================================== --- trunk/reactos/include/dxsdk/amva.h (added) +++ trunk/reactos/include/dxsdk/amva.h Sun Apr 15 00:07:28 2007 @@ -1,0 +1,69 @@ +#ifndef __AMVA_INCLUDED__ +#define __AMVA_INCLUDED__ + +#ifdef __cplusplus +extern "C" { +#endif + +#define AMVA_QUERYRENDERSTATUSF_READ 0x00000001 +#define AMVA_TYPEINDEX_OUTPUTFRAME 0xFFFFFFFF + + +typedef struct _tag_AMVABUFFERINFO +{ + DWORD dwTypeIndex; + DWORD dwBufferIndex; + DWORD dwDataOffset; + DWORD dwDataSize; +} AMVABUFFERINFO, *LPAMVABUFFERINFO; + +typedef struct _tag_AMVAInternalMemInfo +{ + DWORD dwScratchMemAlloc; +} AMVAInternalMemInfo, *LPAMVAInternalMemInfo; + +typedef struct _tag_AMVAUncompDataInfo +{ + DWORD dwUncompWidth; + DWORD dwUncompHeight; + DDPIXELFORMAT ddUncompPixelFormat; +} AMVAUncompDataInfo, *LPAMVAUncompDataInfo; + +typedef struct _tag_AMVAUncompBufferInfo +{ + DWORD dwMinNumSurfaces; + DWORD dwMaxNumSurfaces; + DDPIXELFORMAT ddUncompPixelFormat; +} AMVAUncompBufferInfo, *LPAMVAUncompBufferInfo; + +typedef struct _tag_AMVABeginFrameInfo +{ + DWORD dwDestSurfaceIndex; + LPVOID pInputData; + DWORD dwSizeInputData; + LPVOID pOutputData; + DWORD dwSizeOutputData; +} AMVABeginFrameInfo, *LPAMVABeginFrameInfo; + +typedef struct _tag_AMVACompBufferInfo +{ + DWORD dwNumCompBuffers; + DWORD dwWidthToCreate; + DWORD dwHeightToCreate; + DWORD dwBytesToAllocate; + DDSCAPS2 ddCompCaps; + DDPIXELFORMAT ddPixelFormat; +} AMVACompBufferInfo, *LPAMVACompBufferInfo; + +typedef struct _tag_AMVAEndFrameInfo +{ + DWORD dwSizeMiscData; + LPVOID pMiscData; +} AMVAEndFrameInfo, *LPAMVAEndFrameInfo; + + +#ifdef __cplusplus +}; +#endif + +#endif Propchange: trunk/reactos/include/dxsdk/amva.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/dmodshow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmodshow.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/dmodshow.h (added) +++ trunk/reactos/include/dxsdk/dmodshow.h Sun Apr 15 00:07:28 2007 @@ -1,0 +1,100 @@ + + +#ifndef __REQUIRED_RPCNDR_H_VERSION__ + #define __REQUIRED_RPCNDR_H_VERSION__ 475 +#endif + +#include "rpc.h" +#include "rpcndr.h" + +#ifndef __RPCNDR_H_VERSION__ + #error this stub requires an updated version of <rpcndr.h> +#endif + +#ifndef COM_NO_WINDOWS_H + #include "windows.h" + #include "ole2.h" +#endif + +#ifndef __dmodshow_h__ + #define __dmodshow_h__ + +#if defined(_MSC_VER) && (_MSC_VER >= 1020) + #pragma once +#endif + +#ifndef __IDMOWrapperFilter_FWD_DEFINED__ + #define __IDMOWrapperFilter_FWD_DEFINED__ + typedef interface IDMOWrapperFilter IDMOWrapperFilter; +#endif + +#include "unknwn.h" +#include "objidl.h" +#include "mediaobj.h" + +#ifdef __cplusplus +extern "C"{ +#endif + +DEFINE_GUID(CLSID_DMOWrapperFilter, 0x94297043,0xBD82,0x4DFD,0xB0,0xDE,0x81,0x77,0x73,0x9C,0x6D,0x20); +DEFINE_GUID(CLSID_DMOFilterCategory,0xBCD5796C,0xBD52,0x4D30,0xAB,0x76,0x70,0xF9,0x75,0xB8,0x91,0x99); + +extern RPC_IF_HANDLE __MIDL_itf_dmodshow_0000_v0_0_c_ifspec; +extern RPC_IF_HANDLE __MIDL_itf_dmodshow_0000_v0_0_s_ifspec; + +void * __RPC_USER MIDL_user_allocate(size_t); +void __RPC_USER MIDL_user_free( void * ); + +#ifndef __IDMOWrapperFilter_INTERFACE_DEFINED__ + #define __IDMOWrapperFilter_INTERFACE_DEFINED__ + EXTERN_C const IID IID_IDMOWrapperFilter; + #if defined(__cplusplus) && !defined(CINTERFACE) + MIDL_INTERFACE("52D6F586-9F0F-4824-8FC8-E32CA04930C2") + IDMOWrapperFilter : public IUnknown + { + public: + virtual HRESULT STDMETHODCALLTYPE Init(REFCLSID clsidDMO, REFCLSID catDMO) = 0; + }; + #else + typedef struct IDMOWrapperFilterVtbl + { + BEGIN_INTERFACE + HRESULT ( STDMETHODCALLTYPE *QueryInterface )(IDMOWrapperFilter * This, REFIID riid, void **ppvObject); + ULONG ( STDMETHODCALLTYPE *AddRef )(IDMOWrapperFilter * This); + ULONG ( STDMETHODCALLTYPE *Release )(IDMOWrapperFilter * This); + HRESULT ( STDMETHODCALLTYPE *Init )(IDMOWrapperFilter * This, REFCLSID clsidDMO, REFCLSID catDMO); + END_INTERFACE + } IDMOWrapperFilterVtbl; + + interface IDMOWrapperFilter + { + CONST_VTBL struct IDMOWrapperFilterVtbl *lpVtbl; + }; + + #ifdef COBJMACROS + #define IDMOWrapperFilter_QueryInterface(This,riid,ppvObject) (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) + #define IDMOWrapperFilter_AddRef(This) (This)->lpVtbl -> AddRef(This) + #define IDMOWrapperFilter_Release(This) (This)->lpVtbl -> Release(This) + #define IDMOWrapperFilter_Init(This,clsidDMO,catDMO) (This)->lpVtbl -> Init(This,clsidDMO,catDMO) + #endif + #endif + +HRESULT STDMETHODCALLTYPE +IDMOWrapperFilter_Init_Proxy( + IDMOWrapperFilter * This, + REFCLSID clsidDMO, + REFCLSID catDMO); + + +void __RPC_STUB + IDMOWrapperFilter_Init_Stub( + IRpcStubBuffer *This, + IRpcChannelBuffer *_pRpcChannelBuffer, + PRPC_MESSAGE _pRpcMessage, + DWORD *_pdwStubPhase); +#endif + +#ifdef __cplusplus +} +#endif +#endif Propchange: trunk/reactos/include/dxsdk/dmodshow.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/dmoreg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmoreg.h?rev… ============================================================================== --- trunk/reactos/include/dxsdk/dmoreg.h (added) +++ trunk/reactos/include/dxsdk/dmoreg.h Sun Apr 15 00:07:28 2007 @@ -1,0 +1,75 @@ +#ifndef __DMOREG_H__ +#define __DMOREG_H__ + +#include "mediaobj.h" + +DEFINE_GUID(DMOCATEGORY_ACOUSTIC_ECHO_CANCEL, 0xBF963D80, 0xC559, 0x11D0, 0x8A, 0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1); +DEFINE_GUID(DMOCATEGORY_AGC, 0xE88C9BA0, 0xC557, 0x11D0, 0x8A, 0x2B,0x00,0xA0,0xC9,0x25,0x5A,0xC1); +DEFINE_GUID(DMOCATEGORY_AUDIO_CAPTURE_EFFECT, 0xF665AAba, 0x3E09, 0x4920, 0xAA, 0x5F,0x21,0x98,0x11,0x14,0x8F,0x09); +DEFINE_GUID(DMOCATEGORY_AUDIO_DECODER, 0x57F2db8b, 0xE6BB, 0x4513, 0x9D, 0x43,0xDC,0xD2,0xA6,0x59,0x31,0x25); +DEFINE_GUID(DMOCATEGORY_AUDIO_EFFECT, 0xF3602b3f, 0x0592, 0x48DF, 0xA4, 0xCD,0x67,0x47,0x21,0xE7,0xEB,0xEB); +DEFINE_GUID(DMOCATEGORY_AUDIO_ENCODER, 0x33D9A761, 0x90C8, 0x11D0, 0xBD, 0x43,0x00,0xA0,0xC9,0x11,0xCE,0x86); +DEFINE_GUID(DMOCATEGORY_AUDIO_NOISE_SUPPRESS, 0xE07f903f, 0x62FD, 0x4e60, 0x8C, 0xDD,0xDE,0xA7,0x23,0x66,0x65,0xB5); +DEFINE_GUID(DMOCATEGORY_VIDEO_DECODER, 0x4A69b442, 0x28BE, 0x4991, 0x96, 0x9C,0xB5,0x00,0xAD,0xF5,0xd8,0xA8); +DEFINE_GUID(DMOCATEGORY_VIDEO_EFFECT, 0xd990eE14, 0x776C, 0x4723, 0xBE, 0x46,0x3D,0xA2,0xF5,0x6F,0x10,0xB9); +DEFINE_GUID(DMOCATEGORY_VIDEO_ENCODER, 0x33D9A760, 0x90C8, 0x11D0, 0xBD, 0x43,0x00,0xA0,0xC9,0x11,0xCE,0x86); + +typedef struct _DMO_PARTIAL_MEDIATYPE +{ + GUID type; + GUID subtype; +} DMO_PARTIAL_MEDIATYPE, *PDMO_PARTIAL_MEDIATYPE; + +enum DMO_REGISTER_FLAGS +{ + DMO_REGISTERF_IS_KEYED = 0x00000001 +}; + +enum DMO_ENUM_FLAGS +{ + DMO_ENUMF_INCLUDE_KEYED = 0x00000001 +}; + +STDAPI +DMOEnum( + REFGUID guidCategory, + DWORD dwFlags, + DWORD cInTypes, + const DMO_PARTIAL_MEDIATYPE *pInTypes, + DWORD cOutTypes, + const DMO_PARTIAL_MEDIATYPE *pOutTypes, + IEnumDMO **ppEnum); + +STDAPI +DMOGetName( + REFCLSID clsidDMO, + WCHAR szName[80]); + +STDAPI DMOGetTypes( + REFCLSID clsidDMO, + unsigned long ulInputTypesRequested, + unsigned long *pulInputTypesSupplied, + DMO_PARTIAL_MEDIATYPE *pInputTypes, + unsigned long ulOutputTypesRequested, + unsigned long *pulOutputTypesSupplied, + DMO_PARTIAL_MEDIATYPE *pOutputTypes +); + +STDAPI +DMORegister( + LPCWSTR szName, + REFCLSID clsidDMO, + REFGUID guidCategory, + DWORD dwFlags, + DWORD cInTypes, + const DMO_PARTIAL_MEDIATYPE *pInTypes, + DWORD cOutTypes, + const DMO_PARTIAL_MEDIATYPE *pOutTypes); + +STDAPI +DMOUnregister( + REFCLSID clsidDMO, + REFGUID guidCategory); + +#endif + Propchange: trunk/reactos/include/dxsdk/dmoreg.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/il21dec.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/il21dec.h?re… ============================================================================== --- trunk/reactos/include/dxsdk/il21dec.h (added) +++ trunk/reactos/include/dxsdk/il21dec.h Sun Apr 15 00:07:28 2007 @@ -1,0 +1,68 @@ + + +#ifndef __IL21DEC__ +#define __IL21DEC__ + +typedef enum _AM_LINE21_CCSTYLE +{ + AM_L21_CCSTYLE_None = 0, + AM_L21_CCSTYLE_PopOn, + AM_L21_CCSTYLE_PaintOn, + AM_L21_CCSTYLE_RollUp +} AM_LINE21_CCSTYLE, *PAM_LINE21_CCSTYLE; + +typedef enum _AM_LINE21_CCSERVICE +{ + AM_L21_CCSERVICE_None = 0, + AM_L21_CCSERVICE_Caption1, + AM_L21_CCSERVICE_Caption2, + AM_L21_CCSERVICE_Text1, + AM_L21_CCSERVICE_Text2, + AM_L21_CCSERVICE_XDS, + AM_L21_CCSERVICE_DefChannel = 10, + AM_L21_CCSERVICE_Invalid +} AM_LINE21_CCSERVICE, *PAM_LINE21_CCSERVICE; + +typedef enum _AM_LINE21_DRAWBGMODE +{ + AM_L21_DRAWBGMODE_Opaque, + AM_L21_DRAWBGMODE_Transparent +} AM_LINE21_DRAWBGMODE, *PAM_LINE21_DRAWBGMODE; + +typedef enum _AM_LINE21_CCSTATE +{ + AM_L21_CCSTATE_Off = 0, + AM_L21_CCSTATE_On +} AM_LINE21_CCSTATE, *PAM_LINE21_CCSTATE; + +typedef enum _AM_LINE21_CCLEVEL +{ + AM_L21_CCLEVEL_TC2 = 0 +} AM_LINE21_CCLEVEL, *PAM_LINE21_CCLEVEL; + +#ifdef __cplusplus +extern "C" { +#endif + +DECLARE_INTERFACE_(IAMLine21Decoder, IUnknown) +{ + public: + STDMETHOD(GetDecoderLevel)(THIS_ AM_LINE21_CCLEVEL *lpLevel) PURE; + STDMETHOD(GetCurrentService)(THIS_ AM_LINE21_CCSERVICE *lpService) PURE; + STDMETHOD(SetCurrentService)(THIS_ AM_LINE21_CCSERVICE Service) PURE; + STDMETHOD(GetServiceState)(THIS_ AM_LINE21_CCSTATE *lpState) PURE; + STDMETHOD(SetServiceState)(THIS_ AM_LINE21_CCSTATE State) PURE; + STDMETHOD(GetOutputFormat)(THIS_ LPBITMAPINFOHEADER lpbmih) PURE; + STDMETHOD(SetOutputFormat)(THIS_ LPBITMAPINFO lpbmi) PURE; + STDMETHOD(GetBackgroundColor)(THIS_ DWORD *pdwPhysColor) PURE; + STDMETHOD(SetBackgroundColor)(THIS_ DWORD dwPhysColor) PURE; + STDMETHOD(GetRedrawAlways)(THIS_ LPBOOL lpbOption) PURE; + STDMETHOD(SetRedrawAlways)(THIS_ BOOL bOption) PURE; + STDMETHOD(GetDrawBackgroundMode)(THIS_ AM_LINE21_DRAWBGMODE *lpMode) PURE; + STDMETHOD(SetDrawBackgroundMode)(THIS_ AM_LINE21_DRAWBGMODE Mode) PURE; +} ; + +#ifdef __cplusplus +} +#endif +#endif Propchange: trunk/reactos/include/dxsdk/il21dec.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/mpegtype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/mpegtype.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/mpegtype.h (added) +++ trunk/reactos/include/dxsdk/mpegtype.h Sun Apr 15 00:07:28 2007 @@ -1,0 +1,53 @@ + +#ifndef __MPEGTYPE__ +#define __MPEGTYPE__ + +#ifdef __cplusplus +extern "C" { +#endif + + + +typedef struct tagAM_MPEGSTREAMTYPE +{ + DWORD dwStreamId; + DWORD dwReserved; + AM_MEDIA_TYPE mt; + BYTE bFormat[1]; +} AM_MPEGSTREAMTYPE; + +typedef struct tagAM_MPEGSYSTEMTYPE +{ + DWORD dwBitRate; + DWORD cStreams; + AM_MPEGSTREAMTYPE Streams[1]; +} AM_MPEGSYSTEMTYPE; + +DECLARE_INTERFACE_(IMpegAudioDecoder, IUnknown) +{ + STDMETHOD(get_FrequencyDivider) (THIS_ unsigned long *pDivider) PURE; + STDMETHOD(put_FrequencyDivider) (THIS_ unsigned long Divider) PURE; + STDMETHOD(get_DecoderAccuracy) (THIS_ unsigned long *pAccuracy) PURE; + STDMETHOD(put_DecoderAccuracy) (THIS_ unsigned long Accuracy) PURE; + STDMETHOD(get_Stereo) (THIS_ unsigned long *pStereo ) PURE; + STDMETHOD(put_Stereo) (THIS_ unsigned long Stereo) PURE; + STDMETHOD(get_DecoderWordSize) (THIS_ unsigned long *pWordSize) PURE; + STDMETHOD(put_DecoderWordSize) (THIS_ unsigned long WordSize) PURE; + STDMETHOD(get_IntegerDecode) (THIS_ unsigned long *pIntDecode) PURE; + STDMETHOD(put_IntegerDecode) (THIS_ unsigned long IntDecode) PURE; + STDMETHOD(get_DualMode) (THIS_ unsigned long *pIntDecode) PURE; + STDMETHOD(put_DualMode) (THIS_ unsigned long IntDecode) PURE; + STDMETHOD(get_AudioFormat) (THIS_ MPEG1WAVEFORMAT *lpFmt) PURE; +}; + +#ifdef +} +#endif +#endif + +#define AM_MPEGSTREAMTYPE_ELEMENTLENGTH(pStreamType) FIELD_OFFSET(AM_MPEGSTREAMTYPE, bFormat[(pStreamType)->mt.cbFormat]) +#define AM_MPEGSTREAMTYPE_NEXT(pStreamType) ((AM_MPEGSTREAMTYPE *)((PBYTE)(pStreamType) + ((AM_MPEGSTREAMTYPE_ELEMENTLENGTH(pStreamType) + 7) & ~7))) +#define AM_MPEG_AUDIO_DUAL_MERGE 0 +#define AM_MPEG_AUDIO_DUAL_LEFT 1 +#define AM_MPEG_AUDIO_DUAL_RIGHT 2 + Propchange: trunk/reactos/include/dxsdk/mpegtype.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 26346: - Set mouse speed an mouse trail on-the-fly. - Get rid of more global variables.
by ekohl＠svn.reactos.org 14 Apr '07

14 Apr '07

Author: ekohl Date: Sun Apr 15 00:07:16 2007 New Revision: 26346 URL: http://svn.reactos.org/svn/reactos?rev=26346&view=rev Log: - Set mouse speed an mouse trail on-the-fly. - Get rid of more global variables. Modified: trunk/reactos/dll/cpl/main/mouse.c Modified: trunk/reactos/dll/cpl/main/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/mouse.c?rev=2… ============================================================================== --- trunk/reactos/dll/cpl/main/mouse.c (original) +++ trunk/reactos/dll/cpl/main/mouse.c Sun Apr 15 00:07:16 2007 @@ -75,6 +75,25 @@ } BUTTON_DATA, *PBUTTON_DATA; +typedef struct _OPTION_DATA +{ + ULONG ulMouseSensitivity; + ULONG ulOrigMouseSensitivity; + + ULONG ulMouseSpeed; // = 1; + ULONG ulMouseThreshold1; // = DEFAULT_MOUSE_THRESHOLD1; + ULONG ulMouseThreshold2; // = DEFAULT_MOUSE_THRESHOLD2; + + ULONG ulSnapToDefaultButton; // = 0; + + UINT uMouseTrails; + + ULONG ulShowPointer; // = 0; + ULONG ulHidePointer; // = 0; + +} OPTION_DATA, *POPTION_DATA; + + typedef struct _WHEEL_DATA { UINT uWheelScrollLines; @@ -85,14 +104,6 @@ BOOL g_DropShadow = 0; -ULONG g_MouseSensitivity = DEFAULT_MOUSE_SENSITIVITY; -ULONG g_MouseSpeed = 1; -ULONG g_MouseThreshold1 = DEFAULT_MOUSE_THRESHOLD1; -ULONG g_MouseThreshold2 = DEFAULT_MOUSE_THRESHOLD2; -ULONG g_SnapToDefaultButton = 0; -ULONG g_MouseTrails = 0; -ULONG g_ShowPointer = 0; -ULONG g_HidePointer = 0; ULONG g_ApplyCount = 0; @@ -141,33 +152,6 @@ } return FALSE; -} - - -static BOOL -InitializeMouse(VOID) -{ - /* mouse trails */ - SystemParametersInfo(SPI_GETMOUSETRAILS, 0, &g_MouseTrails, 0); - - /* snap to default button */ - SystemParametersInfo(SPI_GETSNAPTODEFBUTTON, 0, &g_SnapToDefaultButton, 0); - - //FIXME - //pointer precision - // SPI_GETMOUSE? - - /* mouse sensitivity */ - SystemParametersInfo(SPI_GETMOUSESPEED, 0, &g_MouseSensitivity, 0); - - /* hide pointer while typing */ - SystemParametersInfo(SPI_GETMOUSEVANISH, 0, &g_HidePointer, 0); - - - - /* show pointer with Ctrl-Key */ - SystemParametersInfo(SPI_GETMOUSESONAR, 0, &g_ShowPointer, 0); - return TRUE; } @@ -1029,6 +1013,42 @@ } +static BOOL +InitializeMouse(POPTION_DATA pOptionData) +{ + //FIXME + //pointer precision + // SPI_GETMOUSE? + + /* Get mouse sensitivity */ + if (!SystemParametersInfo(SPI_GETMOUSESPEED, 0, &pOptionData->ulMouseSensitivity, 0)) + pOptionData->ulMouseSensitivity = DEFAULT_MOUSE_SENSITIVITY; + pOptionData->ulOrigMouseSensitivity = pOptionData->ulMouseSensitivity; + + pOptionData->ulMouseSpeed = 1; + pOptionData->ulMouseThreshold1 = DEFAULT_MOUSE_THRESHOLD1; + pOptionData->ulMouseThreshold2 = DEFAULT_MOUSE_THRESHOLD2; + + /* snap to default button */ + if (SystemParametersInfo(SPI_GETSNAPTODEFBUTTON, 0, &pOptionData->ulSnapToDefaultButton, 0)) + pOptionData->ulSnapToDefaultButton = 0; + + /* mouse trails */ + if (!SystemParametersInfo(SPI_GETMOUSETRAILS, 0, &pOptionData->uMouseTrails, 0)) + pOptionData->uMouseTrails = 0; + + /* hide pointer while typing */ + if (!SystemParametersInfo(SPI_GETMOUSEVANISH, 0, &pOptionData->ulHidePointer, 0)) + pOptionData->ulHidePointer = 0; + + /* show pointer with Ctrl-Key */ + if (!SystemParametersInfo(SPI_GETMOUSESONAR, 0, &pOptionData->ulShowPointer, 0)) + pOptionData->ulShowPointer = 0; + + return TRUE; +} + + static INT_PTR CALLBACK OptionProc(IN HWND hwndDlg, IN UINT uMsg, @@ -1038,49 +1058,58 @@ HWND hDlgCtrl; LPPSHNOTIFY lppsn; LRESULT lResult; + POPTION_DATA pOptionData; + + pOptionData = (POPTION_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); switch(uMsg) { case WM_INITDIALOG: - if (InitializeMouse()) - { - /* set mouse sensitivity */ - hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_MOUSE_SENSITIVITY); - SendMessage(hDlgCtrl, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 19)); - SendMessage(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)g_MouseSensitivity-1); - - if (g_MouseSpeed) - { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_POINTER_PRECISION); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - } - - if (g_SnapToDefaultButton) - { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_SNAP_TO); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - } - - /* set mouse trail */ - hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_POINTER_TRAIL); - SendMessage(hDlgCtrl, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 5)); - if (!g_MouseTrails) - EnableWindow(hDlgCtrl, FALSE); - else - SendMessage(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)g_MouseTrails-2); - - if (g_ShowPointer) - { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_SHOW_POINTER); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - } - - if (g_HidePointer) - { - hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_HIDE_POINTER); - SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); - } - } + pOptionData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(OPTION_DATA)); + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)pOptionData); + + InitializeMouse(pOptionData); + + /* set mouse sensitivity */ + hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_MOUSE_SENSITIVITY); + SendMessage(hDlgCtrl, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 19)); + SendMessage(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pOptionData->ulMouseSensitivity - 1); + + if (pOptionData->ulMouseSpeed) + { + hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_POINTER_PRECISION); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + } + + if (pOptionData->ulSnapToDefaultButton) + { + hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_SNAP_TO); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + } + + /* set mouse trail */ + hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_POINTER_TRAIL); + SendMessage(hDlgCtrl, TBM_SETRANGE, (WPARAM)TRUE, (LPARAM)MAKELONG(0, 5)); + if (pOptionData->uMouseTrails < 2) + EnableWindow(hDlgCtrl, FALSE); + else + SendMessage(hDlgCtrl, TBM_SETPOS, (WPARAM)TRUE, (LPARAM)pOptionData->uMouseTrails - 2); + + if (pOptionData->ulShowPointer) + { + hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_SHOW_POINTER); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + } + + if (pOptionData->ulHidePointer) + { + hDlgCtrl = GetDlgItem(hwndDlg, IDC_CHECK_HIDE_POINTER); + SendMessage(hDlgCtrl, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); + } + break; + + case WM_DESTROY: + HeapFree(GetProcessHeap(), 0, pOptionData); break; case WM_COMMAND: @@ -1089,16 +1118,16 @@ case IDC_CHECK_POINTER_PRECISION: if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_POINTER_PRECISION)) { - g_MouseSpeed = 0; - g_MouseThreshold1 = 0; - g_MouseThreshold2 = 0; + pOptionData->ulMouseSpeed = 0; + pOptionData->ulMouseThreshold1 = 0; + pOptionData->ulMouseThreshold2 = 0; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); } else { - g_MouseSpeed = 1; - g_MouseThreshold1 = 6; - g_MouseThreshold2 = 10; + pOptionData->ulMouseSpeed = 1; + pOptionData->ulMouseThreshold1 = 6; + pOptionData->ulMouseThreshold2 = 10; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } break; @@ -1106,12 +1135,12 @@ case IDC_CHECK_SNAP_TO: if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_SNAP_TO)) { - g_SnapToDefaultButton = 0; + pOptionData->ulSnapToDefaultButton = 0; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); } else { - g_SnapToDefaultButton = 1; + pOptionData->ulSnapToDefaultButton = 1; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } break; @@ -1120,7 +1149,7 @@ hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_POINTER_TRAIL); if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_POINTER_TRAIL)) { - g_MouseTrails = 0; + pOptionData->uMouseTrails = 0; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); EnableWindow(hDlgCtrl, FALSE); } @@ -1128,19 +1157,19 @@ { SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); EnableWindow(hDlgCtrl, TRUE); - g_MouseTrails = (ULONG) SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) + 2; + pOptionData->uMouseTrails = (ULONG)SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) + 2; } break; case IDC_CHECK_SHOW_POINTER: if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_SHOW_POINTER)) { - g_ShowPointer = 0; + pOptionData->ulShowPointer = 0; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); } else { - g_ShowPointer = 1; + pOptionData->ulShowPointer = 1; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } break; @@ -1148,12 +1177,12 @@ case IDC_CHECK_HIDE_POINTER: if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_HIDE_POINTER)) { - g_HidePointer = 0; + pOptionData->ulHidePointer = 0; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_UNCHECKED, (LPARAM)0); } else { - g_HidePointer = 1; + pOptionData->ulHidePointer = 1; SendMessage((HWND)lParam, BM_SETCHECK, (WPARAM)BST_CHECKED, (LPARAM)0); } break; @@ -1162,24 +1191,26 @@ break; case WM_NOTIFY: - lppsn = (LPPSHNOTIFY) lParam; + lppsn = (LPPSHNOTIFY)lParam; if (lppsn->hdr.code == PSN_APPLY) { /* set snap to default button */ - SystemParametersInfo(SPI_SETSNAPTODEFBUTTON, g_SnapToDefaultButton, 0, SPIF_SENDCHANGE); - + SystemParametersInfo(SPI_SETSNAPTODEFBUTTON, pOptionData->ulSnapToDefaultButton, 0, SPIF_SENDCHANGE); + +#if 0 /* set mouse trails */ if(IsDlgButtonChecked(hwndDlg, IDC_CHECK_POINTER_TRAIL)) { hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_POINTER_TRAIL); - lResult = SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0); + lResult = SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) + 2; } else { lResult = 0; } - SystemParametersInfo(SPI_SETMOUSETRAILS, (UINT) lResult, 0, SPIF_SENDCHANGE); + SystemParametersInfo(SPI_SETMOUSETRAILS, (UINT) lResult, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); +#endif //FIXME //pointer precision @@ -1188,20 +1219,72 @@ /* calc pos and set mouse sensitivity */ hDlgCtrl = GetDlgItem(hwndDlg, IDC_SLIDER_MOUSE_SENSITIVITY); lResult = SendMessage(hDlgCtrl, TBM_GETPOS, 0, 0) + 1; - SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)g_MouseSensitivity, SPIF_SENDCHANGE); + SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)pOptionData->ulMouseSensitivity, SPIF_SENDCHANGE); /* hide pointer while typing */ - SystemParametersInfo(SPI_SETMOUSEVANISH, 0, (PVOID)g_HidePointer, SPIF_SENDCHANGE); + SystemParametersInfo(SPI_SETMOUSEVANISH, 0, (PVOID)pOptionData->ulHidePointer, SPIF_SENDCHANGE); /* show pointer with Ctrl-Key */ - SystemParametersInfo(SPI_SETMOUSESONAR, 0, (PVOID)g_ShowPointer, SPIF_SENDCHANGE); + SystemParametersInfo(SPI_SETMOUSESONAR, 0, (PVOID)pOptionData->ulShowPointer, SPIF_SENDCHANGE); + SetWindowLong(hwndDlg, DWL_MSGRESULT, PSNRET_NOERROR); return TRUE; } + else if (lppsn->hdr.code == PSN_RESET) + { + /* Set the original mouse speed */ + SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)pOptionData->ulOrigMouseSensitivity, SPIF_SENDCHANGE); + } break; case WM_HSCROLL: - PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + if ((HWND)lParam == GetDlgItem(hwndDlg, IDC_SLIDER_MOUSE_SENSITIVITY)) + { + switch (LOWORD(wParam)) + { + case TB_LINEUP: + case TB_LINEDOWN: + case TB_PAGEUP: + case TB_PAGEDOWN: + case TB_TOP: + case TB_BOTTOM: + case TB_ENDTRACK: + pOptionData->ulMouseSensitivity = (ULONG)SendDlgItemMessage(hwndDlg, IDC_SLIDER_MOUSE_SENSITIVITY, TBM_GETPOS, 0, 0) + 1; + SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)pOptionData->ulMouseSensitivity, SPIF_SENDCHANGE); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; +#if 0 + case TB_THUMBTRACK: + pOptionData->ulMouseSensitivity = (ULONG)HIWORD(wParam) + 1; + SystemParametersInfo(SPI_SETMOUSESPEED, 0, (PVOID)pOptionData->ulMouseSensitivity, SPIF_SENDCHANGE); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; +#endif + } + } + else if ((HWND)lParam == GetDlgItem(hwndDlg, IDC_SLIDER_POINTER_TRAIL)) + { + switch (LOWORD(wParam)) + { + case TB_LINEUP: + case TB_LINEDOWN: + case TB_PAGEUP: + case TB_PAGEDOWN: + case TB_TOP: + case TB_BOTTOM: + case TB_ENDTRACK: + pOptionData->uMouseTrails = (ULONG)SendDlgItemMessage(hwndDlg, IDC_SLIDER_POINTER_TRAIL, TBM_GETPOS, 0, 0) + 2; + SystemParametersInfo(SPI_SETMOUSETRAILS, pOptionData->uMouseTrails, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + + case TB_THUMBTRACK: + pOptionData->uMouseTrails = (ULONG)HIWORD(wParam) + 2; + SystemParametersInfo(SPI_SETMOUSETRAILS, pOptionData->uMouseTrails, 0, SPIF_SENDCHANGE | SPIF_UPDATEINIFILE); + PropSheet_Changed(GetParent(hwndDlg), hwndDlg); + break; + } + } break; }

1 0

[greatlrd] 26345: Find some older works, dxsdk header compatible with dxsdk 2004 dec release. I will clean up sdk so dx thuse dx header belong to dxsdk will be here. later. In this folder will contain all header that is compatible with dxsdk 2004 dec. later I will upgrade this folder file to more resent dxsdk headers.
by greatlrd＠svn.reactos.org 14 Apr '07

14 Apr '07

Author: greatlrd Date: Sat Apr 14 23:08:13 2007 New Revision: 26345 URL: http://svn.reactos.org/svn/reactos?rev=26345&view=rev Log: Find some older works, dxsdk header compatible with dxsdk 2004 dec release. I will clean up sdk so dx thuse dx header belong to dxsdk will be here. later. In this folder will contain all header that is compatible with dxsdk 2004 dec. later I will upgrade this folder file to more resent dxsdk headers. Added: trunk/reactos/include/dxsdk/dxerr9.h (with props) trunk/reactos/include/dxsdk/vptype.h (with props) Added: trunk/reactos/include/dxsdk/dxerr9.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxerr9.h?rev… ============================================================================== --- trunk/reactos/include/dxsdk/dxerr9.h (added) +++ trunk/reactos/include/dxsdk/dxerr9.h Sat Apr 14 23:08:13 2007 @@ -1,0 +1,44 @@ + #ifndef _DXERR9_H_ +#define _DXERR9_H_ + +#ifdef __cplusplus +extern "C" { +#endif + + +const char* WINAPI DXGetErrorString9A(HRESULT hr); +const char* WINAPI DXGetErrorDescription9A(HRESULT hr); +HRESULT WINAPI DXTraceA( const char* strFile, DWORD dwLine, HRESULT hr, const char* strMsg, BOOL bPopMsgBox ); + +const WCHAR* WINAPI DXGetErrorString9W(HRESULT hr); +const WCHAR* WINAPI DXGetErrorDescription9W(HRESULT hr); +HRESULT WINAPI DXTraceW( const char* strFile, DWORD dwLine, HRESULT hr, const WCHAR* strMsg, BOOL bPopMsgBox ); + +#ifdef UNICODE + #define DXGetErrorString9 DXGetErrorString9W + #define DXGetErrorDescription9 DXGetErrorDescription9W + #define DXTrace DXTraceW +#else + #define DXGetErrorString9 DXGetErrorString9A + #define DXGetErrorDescription9 DXGetErrorDescription9A + #define DXTrace DXTraceA +#endif + + +#if defined(DEBUG) | defined(_DEBUG) + #define DXTRACE_MSG(str) DXTrace( __FILE__, (DWORD)__LINE__, 0, str, FALSE ) + #define DXTRACE_ERR(str,hr) DXTrace( __FILE__, (DWORD)__LINE__, hr, str, FALSE ) + #define DXTRACE_ERR_MSGBOX(str,hr) DXTrace( __FILE__, (DWORD)__LINE__, hr, str, TRUE ) +#else + #define DXTRACE_MSG(str) (0L) + #define DXTRACE_ERR(str,hr) (hr) + #define DXTRACE_ERR_MSGBOX(str,hr) (hr) +#endif + + +#ifdef __cplusplus +} +#endif + +#endif + Propchange: trunk/reactos/include/dxsdk/dxerr9.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/vptype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/vptype.h?rev… ============================================================================== --- trunk/reactos/include/dxsdk/vptype.h (added) +++ trunk/reactos/include/dxsdk/vptype.h Sat Apr 14 23:08:13 2007 @@ -1,0 +1,62 @@ + +#ifndef __IVPType__ +#define __IVPType__ + +#ifdef __cplusplus +extern "C" { +#endif + + typedef enum _AMVP_MODE +{ + AMVP_MODE_WEAVE, + AMVP_MODE_BOBINTERLEAVED, + AMVP_MODE_BOBNONINTERLEAVED, + AMVP_MODE_SKIPEVEN, + AMVP_MODE_SKIPODD +} AMVP_MODE; + +typedef enum _AMVP_SELECT_FORMAT_BY +{ + AMVP_DO_NOT_CARE, + AMVP_BEST_BANDWIDTH, + AMVP_INPUT_SAME_AS_OUTPUT +} AMVP_SELECT_FORMAT_BY; + +typedef struct _AMVPSIZE +{ + DWORD dwWidth; + DWORD dwHeight; +} AMVPSIZE, *LPAMVPSIZE; + +typedef struct _AMVPDIMINFO +{ + DWORD dwFieldWidth; + DWORD dwFieldHeight; + DWORD dwVBIWidth; + DWORD dwVBIHeight; + RECT rcValidRegion; +} AMVPDIMINFO, *LPAMVPDIMINFO; + +typedef struct _AMVPDATAINFO +{ + DWORD dwSize; + DWORD dwMicrosecondsPerField; + AMVPDIMINFO amvpDimInfo; + DWORD dwPictAspectRatioX; + DWORD dwPictAspectRatioY; + BOOL bEnableDoubleClock; + BOOL bEnableVACT; + BOOL bDataIsInterlaced; + LONG lHalfLinesOdd; + BOOL bFieldPolarityInverted; + DWORD dwNumLinesInVREF; + LONG lHalfLinesEven; + DWORD dwReserved1; +} AMVPDATAINFO, *LPAMVPDATAINFO; + +#ifdef __cplusplus +} +#endif + +#endif + Propchange: trunk/reactos/include/dxsdk/vptype.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 26344: Find some older works, dxsdk header compatible with dxsdk 2004 dec release. I will clean up sdk so dx thuse dx header belong to dxsdk will be here. later. In this folder will contain all header that is compatible with dxsdk 2004 dec. later I will upgrade this folder file to more resent dxsdk headers.
by greatlrd＠svn.reactos.org 14 Apr '07

14 Apr '07

Author: greatlrd Date: Sat Apr 14 22:54:57 2007 New Revision: 26344 URL: http://svn.reactos.org/svn/reactos?rev=26344&view=rev Log: Find some older works, dxsdk header compatible with dxsdk 2004 dec release. I will clean up sdk so dx thuse dx header belong to dxsdk will be here. later. In this folder will contain all header that is compatible with dxsdk 2004 dec. later I will upgrade this folder file to more resent dxsdk headers. Added: trunk/reactos/include/dxsdk/Mpeg2Bits.h (with props) trunk/reactos/include/dxsdk/audevcod.h (with props) trunk/reactos/include/dxsdk/d3dx9.h (with props) trunk/reactos/include/dxsdk/dmort.h (with props) trunk/reactos/include/dxsdk/dmusbuff.h (with props) trunk/reactos/include/dxsdk/dxerr8.h (with props) trunk/reactos/include/dxsdk/vpnotify.h (with props) Added: trunk/reactos/include/dxsdk/Mpeg2Bits.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/Mpeg2Bits.h?… ============================================================================== --- trunk/reactos/include/dxsdk/Mpeg2Bits.h (added) +++ trunk/reactos/include/dxsdk/Mpeg2Bits.h Sat Apr 14 22:54:57 2007 @@ -1,0 +1,45 @@ + +#pragma once +#pragma pack(push) + +#ifdef __midl + typedef struct + { + WORD Bits; + } PID_BITS_MIDL; + + typedef struct + { + WORD Bits; + } MPEG_HEADER_BITS_MIDL; + + typedef struct + { + BYTE Bits; + } MPEG_HEADER_VERSION_BITS_MIDL; + +#else + + typedef struct + { + WORD Reserved : 3; + WORD ProgramId : 13; + } PID_BITS, *PPID_BITS; + typedef struct + { + WORD SectionLength : 12; + WORD Reserved : 2; + WORD PrivateIndicator : 1; + WORD SectionSyntaxIndicator : 1; + } MPEG_HEADER_BITS, *PMPEG_HEADER_BITS; + + typedef struct + { + BYTE CurrentNextIndicator : 1; + BYTE VersionNumber : 5; + BYTE Reserved : 2; + } MPEG_HEADER_VERSION_BITS, *PMPEG_HEADER_VERSION_BITS; +#endif + +#pragma pack(pop) + Propchange: trunk/reactos/include/dxsdk/Mpeg2Bits.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/audevcod.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/audevcod.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/audevcod.h (added) +++ trunk/reactos/include/dxsdk/audevcod.h Sat Apr 14 22:54:57 2007 @@ -1,0 +1,28 @@ + +#ifndef __AUDEVCOD__ +#define __AUDEVCOD__ + +#define EC_SND_DEVICE_ERROR_BASE 0x0200 +#define EC_SNDDEV_IN_ERROR (EC_SND_DEVICE_ERROR_BASE + 0x00) +#define EC_SNDDEV_OUT_ERROR (EC_SND_DEVICE_ERROR_BASE + 0x01) + +typedef enum _tagSND_DEVICE_ERROR +{ + SNDDEV_ERROR_Open=1, + SNDDEV_ERROR_Close=2, + SNDDEV_ERROR_GetCaps=3, + SNDDEV_ERROR_PrepareHeader=4, + SNDDEV_ERROR_UnprepareHeader=5, + SNDDEV_ERROR_Reset=6, + SNDDEV_ERROR_Restart=7, + SNDDEV_ERROR_GetPosition=8, + SNDDEV_ERROR_Write=9, + SNDDEV_ERROR_Pause=10, + SNDDEV_ERROR_Stop=11, + SNDDEV_ERROR_Start=12, + SNDDEV_ERROR_AddBuffer=13, + SNDDEV_ERROR_Query=14, +} SNDDEV_ERR; + +#endif + Propchange: trunk/reactos/include/dxsdk/audevcod.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/d3dx9.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dx9.h?rev=… ============================================================================== --- trunk/reactos/include/dxsdk/d3dx9.h (added) +++ trunk/reactos/include/dxsdk/d3dx9.h Sat Apr 14 22:54:57 2007 @@ -1,0 +1,64 @@ + +#ifdef __D3DX_INTERNAL__ +#error Incorrect D3DX header used +#endif + +#ifndef __D3DX9_H__ +#define __D3DX9_H__ + +#include <limits.h> + +#define D3DFMT_FROM_FILE ((D3DFORMAT) -3) +#define D3DX_DEFAULT ((UINT) -1) +#define D3DX_DEFAULT_FLOAT FLT_MAX +#define D3DX_DEFAULT_NONPOW2 ((UINT) -2) +#define D3DX_FROM_FILE ((UINT) -3) + +#ifndef D3DXINLINE + #ifdef _MSC_VER + #if (_MSC_VER >= 1200) + #define D3DXINLINE __forceinline + #else + #define D3DXINLINE __inline + #endif + #elif __GNUC__ + #define D3DXINLINE __inline + #else + #ifdef __cplusplus + #define D3DXINLINE inline + #else + #define D3DXINLINE + #endif + #endif +#endif + +#include "d3d9.h" +#include "d3dx9math.h" +#include "d3dx9core.h" +#include "d3dx9xof.h" +#include "d3dx9mesh.h" +#include "d3dx9shader.h" +#include "d3dx9effect.h" +#include "d3dx9tex.h" +#include "d3dx9shape.h" +#include "d3dx9anim.h" + +#define _FACDD 0x876 +#define MAKE_DDHRESULT( code ) MAKE_HRESULT( 1, _FACDD, code ) + +enum _D3DXERR +{ + D3DXERR_CANNOTMODIFYINDEXBUFFER = MAKE_DDHRESULT(2900), + D3DXERR_INVALIDMESH = MAKE_DDHRESULT(2901), + D3DXERR_CANNOTATTRSORT = MAKE_DDHRESULT(2902), + D3DXERR_SKINNINGNOTSUPPORTED = MAKE_DDHRESULT(2903), + D3DXERR_TOOMANYINFLUENCES = MAKE_DDHRESULT(2904), + D3DXERR_INVALIDDATA = MAKE_DDHRESULT(2905), + D3DXERR_LOADEDMESHASNODATA = MAKE_DDHRESULT(2906), + D3DXERR_DUPLICATENAMEDFRAGMENT = MAKE_DDHRESULT(2907), + D3DXERR_CANNOTREMOVELASTITEM = MAKE_DDHRESULT(2908), +}; + + +#endif + Propchange: trunk/reactos/include/dxsdk/d3dx9.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/dmort.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmort.h?rev=… ============================================================================== --- trunk/reactos/include/dxsdk/dmort.h (added) +++ trunk/reactos/include/dxsdk/dmort.h Sat Apr 14 22:54:57 2007 @@ -1,0 +1,13 @@ + +#ifndef __DMORT_H__ +#define __DMORT_H__ + +STDAPI MoCopyMediaType(DMO_MEDIA_TYPE *pmtDest, const DMO_MEDIA_TYPE *pmtSrc); +STDAPI MoCreateMediaType(DMO_MEDIA_TYPE **ppmt, DWORD cbFormat); +STDAPI MoDeleteMediaType(DMO_MEDIA_TYPE *pmt); +STDAPI MoDuplicateMediaType(DMO_MEDIA_TYPE **ppmtDest, const DMO_MEDIA_TYPE *pmtSrc); +STDAPI MoFreeMediaType(DMO_MEDIA_TYPE *pmt); +STDAPI MoInitMediaType(DMO_MEDIA_TYPE *pmt, DWORD cbFormat); + +#endif + Propchange: trunk/reactos/include/dxsdk/dmort.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/dmusbuff.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmusbuff.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/dmusbuff.h (added) +++ trunk/reactos/include/dxsdk/dmusbuff.h Sat Apr 14 22:54:57 2007 @@ -1,0 +1,19 @@ +#ifndef _DMusBuff_ +#define _DMusBuff_ + +#define DMUS_EVENT_STRUCTURED 0x00000001 +#define QWORD_ALIGN(x) (((x) + 7) & ~7) +#define DMUS_EVENT_SIZE(cb) QWORD_ALIGN(sizeof(DMUS_EVENTHEADER) + cb) + +#include <pshpack4.h> +typedef struct _DMUS_EVENTHEADER +{ + DWORD cbEvent; + DWORD dwChannelGroup; + REFERENCE_TIME rtDelta; + DWORD dwFlags; +} DMUS_EVENTHEADER, *LPDMUS_EVENTHEADER; +#include <poppack.h> + +#endif + Propchange: trunk/reactos/include/dxsdk/dmusbuff.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/dxerr8.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxerr8.h?rev… ============================================================================== --- trunk/reactos/include/dxsdk/dxerr8.h (added) +++ trunk/reactos/include/dxsdk/dxerr8.h Sat Apr 14 22:54:57 2007 @@ -1,0 +1,45 @@ + + +#ifndef _DXERR8_H_ +#define _DXERR8_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +const char* WINAPI DXGetErrorString8A(HRESULT hr); +const char* WINAPI DXGetErrorDescription8A(HRESULT hr); +HRESULT WINAPI DXTraceA( const char* strFile, DWORD dwLine, HRESULT hr, const char* strMsg, BOOL bPopMsgBox ); + +const WCHAR* WINAPI DXGetErrorString8W(HRESULT hr); +const WCHAR* WINAPI DXGetErrorDescription8W(HRESULT hr); +HRESULT WINAPI DXTraceW( const char* strFile, DWORD dwLine, HRESULT hr, const WCHAR* strMsg, BOOL bPopMsgBox ); + + +#ifdef UNICODE + #define DXGetErrorString8 DXGetErrorString8W + #define DXGetErrorDescription8 DXGetErrorDescription8W + #define DXTrace DXTraceW +#else + #define DXGetErrorString8 DXGetErrorString8A + #define DXGetErrorDescription8 DXGetErrorDescription8A + #define DXTrace DXTraceA +#endif + +#if defined(DEBUG) | defined(_DEBUG) + #define DXTRACE_MSG(str) DXTrace( __FILE__, (DWORD)__LINE__, 0, str, FALSE ) + #define DXTRACE_ERR(str,hr) DXTrace( __FILE__, (DWORD)__LINE__, hr, str, TRUE ) + #define DXTRACE_ERR_NOMSGBOX(str,hr) DXTrace( __FILE__, (DWORD)__LINE__, hr, str, FALSE ) +#else + #define DXTRACE_MSG(str) (0L) + #define DXTRACE_ERR(str,hr) (hr) + #define DXTRACE_ERR_NOMSGBOX(str,hr) (hr) +#endif + + +#ifdef __cplusplus +} +#endif + +#endif + Propchange: trunk/reactos/include/dxsdk/dxerr8.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/vpnotify.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/vpnotify.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/vpnotify.h (added) +++ trunk/reactos/include/dxsdk/vpnotify.h Sat Apr 14 22:54:57 2007 @@ -1,0 +1,38 @@ +#ifndef __IVPNotify__ +#define __IVPNotify__ + +#ifdef __cplusplus +extern "C" { +#endif + +DECLARE_INTERFACE_(IVPBaseNotify, IUnknown) +{ + public: + STDMETHOD (RenegotiateVPParameters)(THIS_) PURE; +}; + +DECLARE_INTERFACE_(IVPNotify, IVPBaseNotify) +{ + public: + STDMETHOD (SetDeinterlaceMode)(THIS_ IN AMVP_MODE mode) PURE; + STDMETHOD (GetDeinterlaceMode)(THIS_ OUT AMVP_MODE *pMode) PURE; +}; + +DECLARE_INTERFACE_(IVPNotify2, IVPNotify) +{ + public: + STDMETHOD (SetVPSyncMaster)(THIS_ IN BOOL bVPSyncMaster) PURE; + STDMETHOD (GetVPSyncMaster)(THIS_ OUT BOOL *pbVPSyncMaster) PURE; +}; + +DECLARE_INTERFACE_(IVPVBINotify, IVPBaseNotify) +{ + public: +}; + +#ifdef __cplusplus +} +#endif + +#endif + Propchange: trunk/reactos/include/dxsdk/vpnotify.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 26343: Find some older works, dxsdk header compatible with dxsdk 2004 dec release. I will clean up sdk so dx thuse dx header belong to dxsdk will be here. later. In this folder will contain all header that is compatible with dxsdk 2004 dec. later I will upgrade this folder file to more resent dxsdk headers.
by greatlrd＠svn.reactos.org 14 Apr '07

14 Apr '07

Author: greatlrd Date: Sat Apr 14 22:18:31 2007 New Revision: 26343 URL: http://svn.reactos.org/svn/reactos?rev=26343&view=rev Log: Find some older works, dxsdk header compatible with dxsdk 2004 dec release. I will clean up sdk so dx thuse dx header belong to dxsdk will be here. later. In this folder will contain all header that is compatible with dxsdk 2004 dec. later I will upgrade this folder file to more resent dxsdk headers. Added: trunk/reactos/include/dxsdk/ trunk/reactos/include/dxsdk/ActiveCf.h (with props) trunk/reactos/include/dxsdk/amaudio.h (with props) trunk/reactos/include/dxsdk/amparse.h (with props) trunk/reactos/include/dxsdk/atsmedia.h (with props) trunk/reactos/include/dxsdk/comlite.h (with props) trunk/reactos/include/dxsdk/d3drmwin.h (with props) trunk/reactos/include/dxsdk/dmo.h (with props) trunk/reactos/include/dxsdk/dv.h (with props) trunk/reactos/include/dxsdk/dxsdkver.h (with props) trunk/reactos/include/dxsdk/errors.h (with props) trunk/reactos/include/dxsdk/ksguid.h (with props) trunk/reactos/include/dxsdk/mediaerr.h (with props) Added: trunk/reactos/include/dxsdk/ActiveCf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ActiveCf.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/ActiveCf.h (added) +++ trunk/reactos/include/dxsdk/ActiveCf.h Sat Apr 14 22:18:31 2007 @@ -1,0 +1,8 @@ + +typedef struct tagVFW_FILTERLIST +{ + UINT cFilters; + CLSID aClsId[1]; +} VFW_FILTERLIST; + +#define CFSTR_VFW_FILTERLIST "Video for Windows 4 Filters" Propchange: trunk/reactos/include/dxsdk/ActiveCf.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/amaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/amaudio.h?re… ============================================================================== --- trunk/reactos/include/dxsdk/amaudio.h (added) +++ trunk/reactos/include/dxsdk/amaudio.h Sat Apr 14 22:18:31 2007 @@ -1,0 +1,33 @@ + +#ifndef __AMAUDIO__ +#define __AMAUDIO__ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <mmsystem.h> +#include <dsound.h> + +#undef INTERFACE +#define INTERFACE IAMDirectSound + +DECLARE_INTERFACE_(IAMDirectSound,IUnknown) +{ + STDMETHOD(QueryInterface)(THIS_ REFIID riid, LPVOID *ppvObj) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + STDMETHOD(GetDirectSoundInterface)(THIS_ LPDIRECTSOUND *lplpds) PURE; + STDMETHOD(GetPrimaryBufferInterface)(THIS_ LPDIRECTSOUNDBUFFER *lplpdsb) PURE; + STDMETHOD(GetSecondaryBufferInterface)(THIS_ LPDIRECTSOUNDBUFFER *lplpdsb) PURE; + STDMETHOD(ReleaseDirectSoundInterface)(THIS_ LPDIRECTSOUND lpds) PURE; + STDMETHOD(ReleasePrimaryBufferInterface)(THIS_ LPDIRECTSOUNDBUFFER lpdsb) PURE; + STDMETHOD(ReleaseSecondaryBufferInterface)(THIS_ LPDIRECTSOUNDBUFFER lpdsb) PURE; + STDMETHOD(SetFocusWindow)(THIS_ HWND, BOOL) PURE ; + STDMETHOD(GetFocusWindow)(THIS_ HWND *, BOOL*) PURE ; +}; + +#ifdef __cplusplus +} +#endif +#endif Propchange: trunk/reactos/include/dxsdk/amaudio.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/amparse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/amparse.h?re… ============================================================================== --- trunk/reactos/include/dxsdk/amparse.h (added) +++ trunk/reactos/include/dxsdk/amparse.h Sat Apr 14 22:18:31 2007 @@ -1,0 +1,22 @@ + +#ifndef __AMPARSE__ +#define __AMPARSE__ + +#ifdef __cplusplus +extern "C" { +#endif + +DEFINE_GUID(IID_IAMParse, 0xC47A3420, 0x005C, 0x11D2, 0x90, 0x38, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x98); + +DECLARE_INTERFACE_(IAMParse, IUnknown) +{ + STDMETHOD(GetParseTime) (THIS_ REFERENCE_TIME *prtCurrent) PURE; + STDMETHOD(SetParseTime) (THIS_ REFERENCE_TIME rtCurrent) PURE; + STDMETHOD(Flush) (THIS) PURE; +}; + +#ifdef __cplusplus +} +#endif +#endif + Propchange: trunk/reactos/include/dxsdk/amparse.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/atsmedia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/atsmedia.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/atsmedia.h (added) +++ trunk/reactos/include/dxsdk/atsmedia.h Sat Apr 14 22:18:31 2007 @@ -1,0 +1,17 @@ + +#if !defined(_BDAMEDIA_) + #error BDAMEDIA.H must be included before ATSCMEDIA.H +#endif + +#if !defined(_KSMEDIA_) + #error KSMEDIA.H must be included before BDAMEDIA.H +#endif + +#if !defined(_ATSCMEDIA_) +#define _ATSCMEDIA_ + +#define BDANETWORKTYPE_ATSC DEFINE_GUIDNAMED(BDANETWORKTYPE_ATSC) +#define STATIC_BDANETWORKTYPE_ATSC 0x71985F51, 0x1CA1, 0x11D3, 0x9C, 0xC8, 0x0, 0xC0, 0x4F, 0x79, 0x71, 0xE0 +DEFINE_GUIDSTRUCT("71985F51-1CA1-11D3-9CC8-00C04F7971E0", BDANETWORKTYPE_ATSC); +#endif + Propchange: trunk/reactos/include/dxsdk/atsmedia.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/comlite.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/comlite.h?re… ============================================================================== --- trunk/reactos/include/dxsdk/comlite.h (added) +++ trunk/reactos/include/dxsdk/comlite.h Sat Apr 14 22:18:31 2007 @@ -1,0 +1,15 @@ + +#ifndef _INC_COMLITE_ +#define _INC_COMLITE_ +#define QzCLSIDFromString CLSIDFromString +#define QzCreateFilterObject CoCreateInstance +#define QzFreeUnusedLibraries CoFreeUnusedLibraries +#define QzGetMalloc CoGetMalloc +#define QzInitialize CoInitialize +#define QzTaskMemAlloc CoTaskMemAlloc +#define QzTaskMemRealloc CoTaskMemRealloc +#define QzTaskMemFree CoTaskMemFree +#define QzUninitialize CoUninitialize +#define QzStringFromGUID2 StringFromGUID2 + +#endif Propchange: trunk/reactos/include/dxsdk/comlite.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/d3drmwin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3drmwin.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/d3drmwin.h (added) +++ trunk/reactos/include/dxsdk/d3drmwin.h Sat Apr 14 22:18:31 2007 @@ -1,0 +1,28 @@ + +#ifndef __D3DRMWIN_H__ +#define __D3DRMWIN_H__ + +#ifndef WIN32 +#define WIN32 +#endif + +#include "d3drm.h" +#include "ddraw.h" +#include "d3d.h" + +#undef INTERFACE +#define INTERFACE IDirect3DRMWinDevice + +DECLARE_INTERFACE_(IDirect3DRMWinDevice, IDirect3DRMObject) +{ + IUNKNOWN_METHODS(PURE); + IDIRECT3DRMOBJECT_METHODS(PURE); + STDMETHOD(HandlePaint) (THIS_ HDC hdc) PURE; + STDMETHOD(HandleActivate) (THIS_ WORD wparam) PURE; +}; + +DEFINE_GUID(IID_IDirect3DRMWinDevice, 0xC5016CC0, 0xD273, 0x11CE, 0xAC, 0x48, 0x0, 0x0, 0xC0, 0x38, 0x25, 0xA1); +WIN_TYPES(IDirect3DRMWinDevice, DIRECT3DRMWINDEVICE); + +#endif + Propchange: trunk/reactos/include/dxsdk/d3drmwin.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/dmo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dmo.h?rev=26… ============================================================================== --- trunk/reactos/include/dxsdk/dmo.h (added) +++ trunk/reactos/include/dxsdk/dmo.h Sat Apr 14 22:18:31 2007 @@ -1,0 +1,19 @@ + +#ifndef __DMO_H__ +#define __DMO_H__ + +#include "mediaerr.h" + +#ifdef FIX_LOCK_NAME + #define Lock DMOLock +#endif + +#include "mediaobj.h" + +#ifdef FIX_LOCK_NAME + #undef Lock +#endif + +#include "dmoreg.h" +#include "dmort.h" + Propchange: trunk/reactos/include/dxsdk/dmo.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/dv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dv.h?rev=263… ============================================================================== --- trunk/reactos/include/dxsdk/dv.h (added) +++ trunk/reactos/include/dxsdk/dv.h Sat Apr 14 22:18:31 2007 @@ -1,0 +1,35 @@ + +#ifndef _DV_H_ +#define _DV_H_ + +typedef struct Tag_DVAudInfo +{ + BYTE bAudStyle[2]; + BYTE bAudQu[2]; + BYTE bNumAudPin; + WORD wAvgSamplesPerPinPerFrm[2]; + WORD wBlkMode; + WORD wDIFMode; + WORD wBlkDiv; + +} DVAudInfo; + +#define DV_AUDIOMODE 0x00000f00 +#define DV_AUDIOQU 0x07000000 +#define DV_AUDIOSMP 0x38000000 +#define DV_CAP_AUD16Bits 0x00 +#define DV_CAP_AUD12Bits 0x01 +#define DV_HD 0x01 +#define DV_DVSD_NTSC_FRAMESIZE 120000 +#define DV_DVSD_PAL_FRAMESIZE 144000 +#define DV_NTSC 0 +#define DV_NTSCPAL 0x00200000 +#define DV_PAL 1 +#define DV_SMCHN 0x0000e000 +#define DV_SD 0x00 +#define DV_SL 0x02 +#define DV_STYPE 0x001f0000 + +#define SIZE_DVINFO 0x20 + +#endif Propchange: trunk/reactos/include/dxsdk/dv.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/dxsdkver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxsdkver.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/dxsdkver.h (added) +++ trunk/reactos/include/dxsdk/dxsdkver.h Sat Apr 14 22:18:31 2007 @@ -1,0 +1,10 @@ +#ifndef _DXSDKVER_H_ + +#define _DXSDKVER_H_ + +#define _DXSDK_PRODUCT_MAJOR 9 +#define _DXSDK_PRODUCT_MINOR 04 +#define _DXSDK_BUILD_MAJOR 91 +#define _DXSDK_BUILD_MINOR 0000 + +#endif Propchange: trunk/reactos/include/dxsdk/dxsdkver.h ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/reactos/include/dxsdk/errors.h Sat Apr 14 22:18:31 2007 @@ -1,0 +1,38 @@ + +#ifndef __ERRORS__ +#define __ERRORS__ + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef _AMOVIE_ + #define AMOVIEAPI DECLSPEC_IMPORT +#else + #define AMOVIEAPI +#endif + +#define VFW_FIRST_CODE 0x200 +#define MAX_ERROR_TEXT_LEN 160 + +#include <VFWMSGS.H> + +typedef BOOL (WINAPI* AMGETERRORTEXTPROCA)(HRESULT, char *, DWORD); +typedef BOOL (WINAPI* AMGETERRORTEXTPROCW)(HRESULT, WCHAR *, DWORD); + +AMOVIEAPI DWORD WINAPI AMGetErrorTextA( HRESULT hr , char *pbuffer , DWORD MaxLen); +AMOVIEAPI DWORD WINAPI AMGetErrorTextW( HRESULT hr , WCHAR *pbuffer , DWORD MaxLen); + +#ifdef UNICODE + #define AMGetErrorText AMGetErrorTextW + typedef AMGETERRORTEXTPROCW AMGETERRORTEXTPROC; +#else + #define AMGetErrorText AMGetErrorTextA + typedef AMGETERRORTEXTPROCA AMGETERRORTEXTPROC; +#endif + +#ifdef __cplusplus +} +#endif +#endif + Propchange: trunk/reactos/include/dxsdk/errors.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/ksguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/ksguid.h?rev… ============================================================================== --- trunk/reactos/include/dxsdk/ksguid.h (added) +++ trunk/reactos/include/dxsdk/ksguid.h Sat Apr 14 22:18:31 2007 @@ -1,0 +1,18 @@ +#define INITGUID +#include <guiddef.h> + +#ifndef STATICGUIDOF + #define STATICGUIDOF(guid) STATIC_##guid +#endif + +#if !defined( DEFINE_WAVEFORMATEX_GUID ) + #define DEFINE_WAVEFORMATEX_GUID(x) (USHORT)(x), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 +#endif + +#if defined( DEFINE_GUIDEX ) + #undef DEFINE_GUIDEX + #define DEFINE_GUIDEX(name) EXTERN_C const CDECL GUID __declspec(selectany) name = { STATICGUIDOF(name) } +#else + #define DEFINE_GUIDEX(name) EXTERN_C const CDECL GUID __declspec(selectany) name = { STATICGUIDOF(name) } +#endif + Propchange: trunk/reactos/include/dxsdk/ksguid.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/mediaerr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/mediaerr.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/mediaerr.h (added) +++ trunk/reactos/include/dxsdk/mediaerr.h Sat Apr 14 22:18:31 2007 @@ -1,0 +1,11 @@ + +#ifndef _MEDIAERR_H_ +#define _MEDIAERR_H_ +#define DMO_E_INVALIDSTREAMINDEX 0x80040201 +#define DMO_E_INVALIDTYPE 0x80040202 +#define DMO_E_TYPE_NOT_SET 0x80040203 +#define DMO_E_NOTACCEPTING 0x80040204 +#define DMO_E_TYPE_NOT_ACCEPTED 0x80040205 +#define DMO_E_NO_MORE_ITEMS 0x80040206 +#endif _MEDIAERR_H_ + Propchange: trunk/reactos/include/dxsdk/mediaerr.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dgorbachev] 26342: Fix a bug.
by dgorbachev＠svn.reactos.org 14 Apr '07

14 Apr '07

Author: dgorbachev Date: Sat Apr 14 22:07:08 2007 New Revision: 26342 URL: http://svn.reactos.org/svn/reactos?rev=26342&view=rev Log: Fix a bug. Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=26… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Sat Apr 14 22:07:08 2007 @@ -267,7 +267,7 @@ VmCounters->PeakPagefileUsage = Process->QuotaPeak[2]; /* Set the return length */ - *ReturnLength = sizeof(VM_COUNTERS); + Length = sizeof(VM_COUNTERS); } _SEH_HANDLE {

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