Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 26914: adding regbag.idl compatible with ms dxsdk 2004 dec
by greatlrd＠svn.reactos.org 27 May '07

27 May '07

Author: greatlrd Date: Sun May 27 15:04:46 2007 New Revision: 26914 URL: http://svn.reactos.org/svn/reactos?rev=26914&view=rev Log: adding regbag.idl compatible with ms dxsdk 2004 dec Added: trunk/reactos/include/dxsdk/regbag.idl (with props) Removed: trunk/reactos/include/dxsdk/regbag.h Modified: trunk/reactos/include/dxsdk/dxsdk.rbuild Modified: trunk/reactos/include/dxsdk/dxsdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxsdk.rbuild… ============================================================================== --- trunk/reactos/include/dxsdk/dxsdk.rbuild (original) +++ trunk/reactos/include/dxsdk/dxsdk.rbuild Sun May 27 15:04:46 2007 @@ -1,11 +1,12 @@ <module name="dxsdk" type="idlheader"> + <file>amstream.idl</file> <file>austream.idl</file> - <file>amstream.idl</file> <file>ddstream.idl</file> <file>mixerocx.idl</file> <file>mediaobj.idl</file> <file>medparam.idl</file> <file>mmstream.idl</file> + <file>regbag.idl</file> <file>vidcap.idl</file> <file>Videoacc.idl</file> </module> Removed: 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 (original) +++ trunk/reactos/include/dxsdk/regbag.h (removed) @@ -1,109 +1,0 @@ - - -#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 Added: trunk/reactos/include/dxsdk/regbag.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/regbag.idl?r… ============================================================================== --- trunk/reactos/include/dxsdk/regbag.idl (added) +++ trunk/reactos/include/dxsdk/regbag.idl Sun May 27 15:04:46 2007 @@ -1,0 +1,20 @@ + +cpp_quote("#pragma once") + +#ifndef DO_NO_IMPORTS +import "objidl.idl"; +import "oaidl.idl"; +import "ocidl.idl"; +#endif + +[object, + hidden, restricted, + uuid(8A674B48-1F63-11d3-B64C-00C04F79498E), + pointer_default(unique), + local +] +interface ICreatePropBagOnRegKey : IUnknown +{ + HRESULT Create([in] HKEY hkey, [in] LPCOLESTR subkey, [in] DWORD ulOptions, [in] DWORD samDesired, REFIID iid, [out] LPVOID *ppBag); +}; + Propchange: trunk/reactos/include/dxsdk/regbag.idl ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 26913: adding bdatypes.h compatible with ms dxsdk 2004 dec
by greatlrd＠svn.reactos.org 27 May '07

27 May '07

Author: greatlrd Date: Sun May 27 14:56:05 2007 New Revision: 26913 URL: http://svn.reactos.org/svn/reactos?rev=26913&view=rev Log: adding bdatypes.h compatible with ms dxsdk 2004 dec Added: trunk/reactos/include/dxsdk/bdatypes.h (with props) Added: trunk/reactos/include/dxsdk/bdatypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/bdatypes.h?r… ============================================================================== --- trunk/reactos/include/dxsdk/bdatypes.h (added) +++ trunk/reactos/include/dxsdk/bdatypes.h Sun May 27 14:56:05 2007 @@ -1,0 +1,379 @@ + +#ifndef _BDATYPES_ + +#define _BDATYPES_ 1 +#define MIN_DIMENSION 1 + + +#ifdef __midl +#define V1_ENUM [v1_enum] +#else +#define V1_ENUM +#endif + +#define BDA_FREQUENCY_NOT_SET -1 +#define BDA_FREQUENCY_NOT_DEFINED 0 +#define BDA_RANGE_NOT_SET -1 +#define BDA_RANGE_NOT_DEFINED 0 +#define BDA_CHAN_BANDWITH_NOT_SET -1 +#define BDA_CHAN_BANDWITH_NOT_DEFINED 0 +#define BDA_FREQUENCY_MULTIPLIER_NOT_SET -1 +#define BDA_FREQUENCY_MULTIPLIER_NOT_DEFINED 0 + + +typedef struct _BDA_TEMPLATE_CONNECTION +{ + ULONG FromNodeType; + ULONG FromNodePinType; + ULONG ToNodeType; + ULONG ToNodePinType; +}BDA_TEMPLATE_CONNECTION, *PBDA_TEMPLATE_CONNECTION; + + +typedef struct _BDA_TEMPLATE_PIN_JOINT +{ + ULONG uliTemplateConnection; + ULONG ulcInstancesMax; +}BDA_TEMPLATE_PIN_JOINT, *PBDA_TEMPLATE_PIN_JOINT; + + +typedef struct tagKS_BDA_FRAME_INFO +{ + ULONG ExtendedHeaderSize; + DWORD dwFrameFlags; + ULONG ulEvent; + ULONG ulChannelNumber; + ULONG ulSubchannelNumber; + ULONG ulReason; +} KS_BDA_FRAME_INFO, *PKS_BDA_FRAME_INFO; + +typedef enum +{ + BDA_EVENT_SIGNAL_LOSS = 0, + BDA_EVENT_SIGNAL_LOCK, + BDA_EVENT_DATA_START, + BDA_EVENT_DATA_STOP, + BDA_EVENT_CHANNEL_ACQUIRED, + BDA_EVENT_CHANNEL_LOST, + BDA_EVENT_CHANNEL_SOURCE_CHANGED, + BDA_EVENT_CHANNEL_ACTIVATED, + BDA_EVENT_CHANNEL_DEACTIVATED, + BDA_EVENT_SUBCHANNEL_ACQUIRED, + BDA_EVENT_SUBCHANNEL_LOST, + BDA_EVENT_SUBCHANNEL_SOURCE_CHANGED, + BDA_EVENT_SUBCHANNEL_ACTIVATED, + BDA_EVENT_SUBCHANNEL_DEACTIVATED, + BDA_EVENT_ACCESS_GRANTED, + BDA_EVENT_ACCESS_DENIED, + BDA_EVENT_OFFER_EXTENDED, + BDA_EVENT_PURCHASE_COMPLETED, + BDA_EVENT_SMART_CARD_INSERTED, + BDA_EVENT_SMART_CARD_REMOVED +} BDA_EVENT_ID, *PBDA_EVENT_ID; + + + +typedef struct _BDA_ETHERNET_ADDRESS +{ + BYTE rgbAddress[6]; +} BDA_ETHERNET_ADDRESS, *PBDA_ETHERNET_ADDRESS; + +typedef struct _BDA_ETHERNET_ADDRESS_LIST { + ULONG ulcAddresses; + BDA_ETHERNET_ADDRESS rgAddressl[MIN_DIMENSION]; +} BDA_ETHERNET_ADDRESS_LIST, *PBDA_ETHERNET_ADDRESS_LIST; + +typedef enum +{ + BDA_PROMISCUOUS_MULTICAST = 0, + BDA_FILTERED_MULTICAST, + BDA_NO_MULTICAST +} BDA_MULTICAST_MODE, *PBDA_MULTICAST_MODE; + +typedef struct _BDA_IPv4_ADDRESS +{ + BYTE rgbAddress[4]; +} BDA_IPv4_ADDRESS, *PBDA_IPv4_ADDRESS; + +typedef struct _BDA_IPv4_ADDRESS_LIST +{ + ULONG ulcAddresses; + BDA_IPv4_ADDRESS rgAddressl[MIN_DIMENSION]; +} BDA_IPv4_ADDRESS_LIST, * PBDA_IPv4_ADDRESS_LIST; + + +typedef struct _BDA_IPv6_ADDRESS +{ + BYTE rgbAddress[6]; +} BDA_IPv6_ADDRESS, *PBDA_IPv6_ADDRESS; + +typedef struct _BDA_IPv6_ADDRESS_LIST +{ + ULONG ulcAddresses; + BDA_IPv6_ADDRESS rgAddressl[MIN_DIMENSION]; +} BDA_IPv6_ADDRESS_LIST, *PBDA_IPv6_ADDRESS_LIST; + + +typedef enum +{ + BDA_CHANGES_COMPLETE = 0, + BDA_CHANGES_PENDING + +} BDA_CHANGE_STATE, * PBDA_CHANGE_STATE; + +typedef enum +{ + BDA_SIGNAL_UNAVAILABLE = 0, + BDA_SIGNAL_INACTIVE, + BDA_SIGNAL_ACTIVE +} BDA_SIGNAL_STATE, * PBDA_SIGNAL_STATE; + + + + + +typedef struct _BDANODE_DESCRIPTOR +{ + ULONG ulBdaNodeType; + GUID guidFunction; + GUID guidName; +} BDANODE_DESCRIPTOR, *PBDANODE_DESCRIPTOR; + +typedef enum +{ + MEDIA_TRANSPORT_PACKET, + MEDIA_ELEMENTARY_STREAM, + MEDIA_MPEG2_PSI, + MEDIA_TRANSPORT_PAYLOAD +} MEDIA_SAMPLE_CONTENT ; + +typedef struct _BDA_TABLE_SECTION +{ + ULONG ulPrimarySectionId; + ULONG ulSecondarySectionId; + ULONG ulcbSectionLength; + ULONG argbSectionData[MIN_DIMENSION]; +} BDA_TABLE_SECTION, *PBDA_TABLE_SECTION; + + +typedef struct +{ + ULONG ulPID ; + MEDIA_SAMPLE_CONTENT MediaSampleContent ; +} PID_MAP ; + + + + + +typedef struct _BDA_PID_MAP +{ + MEDIA_SAMPLE_CONTENT MediaSampleContent; + ULONG ulcPIDs; + ULONG aulPIDs[MIN_DIMENSION]; +} BDA_PID_MAP, *PBDA_PID_MAP; + +typedef struct _BDA_PID_UNMAP +{ + ULONG ulcPIDs; + ULONG aulPIDs[MIN_DIMENSION]; +} BDA_PID_UNMAP, *PBDA_PID_UNMAP; + + +typedef enum DVBSystemType +{ + DVB_Cable, + DVB_Terrestrial, + DVB_Satellite, +} DVBSystemType; + +typedef struct _BDA_CA_MODULE_UI +{ + ULONG ulFormat; + ULONG ulbcDesc; + ULONG ulDesc[MIN_DIMENSION]; +} BDA_CA_MODULE_UI, *PBDA_CA_MODULE_UI; + +typedef struct _BDA_PROGRAM_PID_LIST +{ + ULONG ulProgramNumber; + ULONG ulcPIDs; + ULONG ulPID[MIN_DIMENSION]; +} BDA_PROGRAM_PID_LIST, *PBDA_PROGRAM_PID_LIST; + + +V1_ENUM enum +{ + BDA_UNDEFINED_CHANNEL = -1, +}; + +typedef V1_ENUM enum ComponentCategory +{ + CategoryNotSet = -1, + CategoryOther = 0, + CategoryVideo, + CategoryAudio, + CategoryText, + CategoryData, +} ComponentCategory; + +typedef enum ComponentStatus +{ + StatusActive, + StatusInactive, + StatusUnavailable, +} ComponentStatus; + +typedef enum ATSCComponentTypeFlags +{ + ATSCCT_AC3 = 0x00000001, +} ATSCComponentTypeFlags; + +typedef V1_ENUM enum MPEG2StreamType +{ + BDA_UNITIALIZED_MPEG2STREAMTYPE = -1, + Reserved1 = 0x0, + ISO_IEC_11172_2_VIDEO = Reserved1 + 1, + ISO_IEC_13818_2_VIDEO = ISO_IEC_11172_2_VIDEO + 1, + ISO_IEC_11172_3_AUDIO = ISO_IEC_13818_2_VIDEO + 1, + ISO_IEC_13818_3_AUDIO = ISO_IEC_11172_3_AUDIO + 1, + ISO_IEC_13818_1_PRIVATE_SECTION = ISO_IEC_13818_3_AUDIO + 1, + ISO_IEC_13818_1_PES = ISO_IEC_13818_1_PRIVATE_SECTION + 1, + ISO_IEC_13522_MHEG = ISO_IEC_13818_1_PES + 1, + ANNEX_A_DSM_CC = ISO_IEC_13522_MHEG + 1, + ITU_T_REC_H_222_1 = ANNEX_A_DSM_CC + 1, + ISO_IEC_13818_6_TYPE_A = ITU_T_REC_H_222_1 + 1, + ISO_IEC_13818_6_TYPE_B = ISO_IEC_13818_6_TYPE_A + 1, + ISO_IEC_13818_6_TYPE_C = ISO_IEC_13818_6_TYPE_B + 1, + ISO_IEC_13818_6_TYPE_D = ISO_IEC_13818_6_TYPE_C + 1, + ISO_IEC_13818_1_AUXILIARY = ISO_IEC_13818_6_TYPE_D + 1, + ISO_IEC_13818_1_RESERVED = ISO_IEC_13818_1_AUXILIARY + 1, + USER_PRIVATE = ISO_IEC_13818_1_RESERVED + 1 +} MPEG2StreamType; + +typedef struct _MPEG2_TRANSPORT_STRIDE +{ + DWORD dwOffset ; + DWORD dwPacketLength ; + DWORD dwStride ; +} MPEG2_TRANSPORT_STRIDE, *PMPEG2_TRANSPORT_STRIDE ; + + + + + +typedef V1_ENUM enum BinaryConvolutionCodeRate +{ + BDA_BCC_RATE_NOT_SET = -1, + BDA_BCC_RATE_NOT_DEFINED = 0, + BDA_BCC_RATE_1_2 = 1, + BDA_BCC_RATE_2_3, + BDA_BCC_RATE_3_4, + BDA_BCC_RATE_3_5, + BDA_BCC_RATE_4_5, + BDA_BCC_RATE_5_6, + BDA_BCC_RATE_5_11, + BDA_BCC_RATE_7_8, + BDA_BCC_RATE_MAX, +} BinaryConvolutionCodeRate; + +typedef V1_ENUM enum SpectralInversion +{ + BDA_SPECTRAL_INVERSION_NOT_SET = -1, + BDA_SPECTRAL_INVERSION_NOT_DEFINED = 0, + BDA_SPECTRAL_INVERSION_AUTOMATIC = 1, + BDA_SPECTRAL_INVERSION_NORMAL, + BDA_SPECTRAL_INVERSION_INVERTED, + BDA_SPECTRAL_INVERSION_MAX +} SpectralInversion; + +typedef V1_ENUM enum FECMethod +{ + BDA_FEC_METHOD_NOT_SET = -1, + BDA_FEC_METHOD_NOT_DEFINED = 0, + BDA_FEC_VITERBI = 1, + BDA_FEC_RS_204_188, + BDA_FEC_MAX, +} FECMethod; + +typedef V1_ENUM enum ModulationType +{ + BDA_MOD_NOT_SET = -1, + BDA_MOD_NOT_DEFINED = 0, + BDA_MOD_16QAM = 1, + BDA_MOD_32QAM, + BDA_MOD_64QAM, + BDA_MOD_80QAM, + BDA_MOD_96QAM, + BDA_MOD_112QAM, + BDA_MOD_128QAM, + BDA_MOD_160QAM, + BDA_MOD_192QAM, + BDA_MOD_224QAM, + BDA_MOD_256QAM, + BDA_MOD_320QAM, + BDA_MOD_384QAM, + BDA_MOD_448QAM, + BDA_MOD_512QAM, + BDA_MOD_640QAM, + BDA_MOD_768QAM, + BDA_MOD_896QAM, + BDA_MOD_1024QAM, + BDA_MOD_QPSK, + BDA_MOD_BPSK, + BDA_MOD_OQPSK, + BDA_MOD_8VSB, + BDA_MOD_16VSB, + BDA_MOD_ANALOG_AMPLITUDE, + BDA_MOD_ANALOG_FREQUENCY, + BDA_MOD_MAX, +} ModulationType; + + + +typedef V1_ENUM enum TransmissionMode +{ + BDA_XMIT_MODE_NOT_SET = -1, + BDA_XMIT_MODE_NOT_DEFINED = 0, + BDA_XMIT_MODE_2K = 1, + BDA_XMIT_MODE_8K, + BDA_XMIT_MODE_MAX, +} TransmissionMode; + + +typedef V1_ENUM enum Polarisation +{ + BDA_POLARISATION_NOT_SET = -1, + BDA_POLARISATION_NOT_DEFINED = 0, + BDA_POLARISATION_LINEAR_H = 1, + BDA_POLARISATION_LINEAR_V, + BDA_POLARISATION_CIRCULAR_L, + BDA_POLARISATION_CIRCULAR_R, + BDA_POLARISATION_MAX, +} Polarisation; + +typedef V1_ENUM enum GuardInterval +{ + BDA_GUARD_NOT_SET = -1, + BDA_GUARD_NOT_DEFINED = 0, + BDA_GUARD_1_32 = 1, + BDA_GUARD_1_16, + BDA_GUARD_1_8, + BDA_GUARD_1_4, + BDA_GUARD_MAX, +} GuardInterval; + +typedef V1_ENUM enum HierarchyAlpha +{ + BDA_HALPHA_NOT_SET = -1, + BDA_HALPHA_NOT_DEFINED = 0, + BDA_HALPHA_1 = 1, + BDA_HALPHA_2, + BDA_HALPHA_4, + BDA_HALPHA_MAX, +} HierarchyAlpha; + + + +#endif + Propchange: trunk/reactos/include/dxsdk/bdatypes.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cwittich] 26912: 64-Bit Fixes for cabman (patch from Colin Finck) See issue #2236 for more details.
by cwittich＠svn.reactos.org 27 May '07

27 May '07

Author: cwittich Date: Sun May 27 14:26:43 2007 New Revision: 26912 URL: http://svn.reactos.org/svn/reactos?rev=26912&view=rev Log: 64-Bit Fixes for cabman (patch from Colin Finck) See issue #2236 for more details. Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cabman/cabinet.h trunk/reactos/tools/cabman/cabman.h trunk/reactos/tools/cabman/dfp.cxx trunk/reactos/tools/cabman/dfp.h trunk/reactos/tools/cabman/main.cxx trunk/reactos/tools/cabman/mszip.cxx trunk/reactos/tools/cabman/mszip.h trunk/reactos/tools/cabman/raw.cxx trunk/reactos/tools/cabman/raw.h Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx (original) +++ trunk/reactos/tools/cabman/cabinet.cxx Sun May 27 14:26:43 2007 @@ -10,6 +10,7 @@ * CSH 21/03-2001 Created * CSH 15/08-2003 Made it portable * CF 04/05-2007 Reformatted the code to be more consistent and use TABs instead of spaces + * CF 04/05-2007 Made it compatible with 64-bit operating systems * TODO: * - Checksum of datablocks should be calculated * - EXTRACT.EXE complains if a disk is created manually @@ -27,31 +28,31 @@ #if defined(WIN32) #define GetSizeOfFile(handle) _GetSizeOfFile(handle) -static long _GetSizeOfFile(FILEHANDLE handle) -{ - unsigned long size = GetFileSize(handle, NULL); +static int32_t _GetSizeOfFile(FILEHANDLE handle) +{ + uint32_t size = GetFileSize(handle, NULL); if (size == INVALID_FILE_SIZE) return -1; return size; } #define ReadFileData(handle, buffer, size, bytesread) _ReadFileData(handle, buffer, size, bytesread) -static bool _ReadFileData(FILEHANDLE handle, void* buffer, unsigned long size, unsigned long* bytesread) -{ - return ReadFile(handle, buffer, size, bytesread, NULL) != 0; +static bool _ReadFileData(FILEHANDLE handle, void* buffer, uint32_t size, uint32_t* bytesread) +{ + return ReadFile(handle, buffer, size, (LPDWORD)bytesread, NULL) != 0; } #else #define GetSizeOfFile(handle) _GetSizeOfFile(handle) -static long _GetSizeOfFile(FILEHANDLE handle) -{ - long size; +static int32_t _GetSizeOfFile(FILEHANDLE handle) +{ + int32_t size; fseek(handle, 0, SEEK_END); size = ftell(handle); fseek(handle, 0, SEEK_SET); return size; } #define ReadFileData(handle, buffer, size, bytesread) _ReadFileData(handle, buffer, size, bytesread) -static bool _ReadFileData(FILEHANDLE handle, void* buffer, unsigned long size, unsigned long* bytesread) +static bool _ReadFileData(FILEHANDLE handle, void* buffer, uint32_t size, uint32_t* bytesread) { *bytesread = fread(buffer, 1, size, handle); return *bytesread == size; @@ -63,10 +64,10 @@ #if 0 #ifdef DBG -void DumpBuffer(void* Buffer, unsigned long Size) +void DumpBuffer(void* Buffer, uint32_t Size) { FILEHANDLE FileHandle; - unsigned long BytesWritten; + uint32_t BytesWritten; /* Create file, overwrite if it already exists */ FileHandle = CreateFile("dump.bin", // Create this file @@ -113,7 +114,7 @@ } -unsigned long CCFDATAStorage::Create(char* FileName) +uint32_t CCFDATAStorage::Create(char* FileName) /* * FUNCTION: Creates the file * ARGUMENTS: @@ -164,7 +165,7 @@ } -unsigned long CCFDATAStorage::Destroy() +uint32_t CCFDATAStorage::Destroy() /* * FUNCTION: Destroys the file * RETURNS: @@ -181,7 +182,7 @@ } -unsigned long CCFDATAStorage::Truncate() +uint32_t CCFDATAStorage::Truncate() /* * FUNCTION: Truncate the scratch file to zero bytes * RETURNS: @@ -206,7 +207,7 @@ } -unsigned long CCFDATAStorage::Position() +uint32_t CCFDATAStorage::Position() /* * FUNCTION: Returns current position in file * RETURNS: @@ -216,12 +217,12 @@ #if defined(WIN32) return SetFilePointer(FileHandle, 0, NULL, FILE_CURRENT); #else - return (unsigned long)ftell(FileHandle); -#endif -} - - -unsigned long CCFDATAStorage::Seek(long Position) + return (uint32_t)ftell(FileHandle); +#endif +} + + +uint32_t CCFDATAStorage::Seek(int32_t Position) /* * FUNCTION: Seeks to an absolute position * ARGUMENTS: @@ -247,7 +248,7 @@ } -unsigned long CCFDATAStorage::ReadBlock(PCFDATA Data, void* Buffer, unsigned long* BytesRead) +uint32_t CCFDATAStorage::ReadBlock(PCFDATA Data, void* Buffer, uint32_t* BytesRead) /* * FUNCTION: Reads a CFDATA block from the file * ARGUMENTS: @@ -259,7 +260,7 @@ */ { #if defined(WIN32) - if (!ReadFile(FileHandle, Buffer, Data->CompSize, BytesRead, NULL)) + if (!ReadFile(FileHandle, Buffer, Data->CompSize, (LPDWORD)BytesRead, NULL)) return CAB_STATUS_CANNOT_READ; #else @@ -271,7 +272,7 @@ } -unsigned long CCFDATAStorage::WriteBlock(PCFDATA Data, void* Buffer, unsigned long* BytesWritten) +uint32_t CCFDATAStorage::WriteBlock(PCFDATA Data, void* Buffer, uint32_t* BytesWritten) /* * FUNCTION: Writes a CFDATA block to the file * ARGUMENTS: @@ -283,7 +284,7 @@ */ { #if defined(WIN32) - if (!WriteFile(FileHandle, Buffer, Data->CompSize, BytesWritten, NULL)) + if (!WriteFile(FileHandle, Buffer, Data->CompSize, (LPDWORD)BytesWritten, NULL)) return CAB_STATUS_CANNOT_WRITE; #else *BytesWritten = fwrite(Buffer, 1, Data->CompSize, FileHandle); @@ -391,15 +392,15 @@ while (Path[i] != 0) { #if defined(WIN32) - if (Path[i] == '/') - newpath[i] = '\\'; - else + if (Path[i] == '/') + newpath[i] = '\\'; + else #else - if (Path[i] == '\\') - newpath[i] = '/'; + if (Path[i] == '\\') + newpath[i] = '/'; else #endif - newpath[i] = Path[i]; + newpath[i] = Path[i]; i++; } @@ -418,7 +419,7 @@ * Pointer to filename */ { - unsigned long i, j; + uint32_t i, j; j = i = (Path[0] ? (Path[1] == ':' ? 2 : 0) : 0); @@ -438,7 +439,7 @@ */ { char* FileName; - unsigned long i; + uint32_t i; i = (Path [0] ? (Path[1] == ':' ? 2 : 0) : 0); FileName = GetFileName(Path + i); @@ -452,7 +453,7 @@ bool CCabinet::NormalizePath(char* Path, - unsigned long Length) + uint32_t Length) /* * FUNCTION: Normalizes a path * ARGUMENTS: @@ -462,10 +463,10 @@ * true if there was enough room in Path, or false */ { - unsigned long n; + uint32_t n; bool OK = true; - if ((n = strlen(Path)) && + if ((n = (uint32_t)strlen(Path)) && (!IsSeparator(Path[n - 1])) && (OK = ((n + 1) < Length))) { @@ -531,7 +532,7 @@ */ { FILEHANDLE FileHandle; - unsigned long BytesRead; + uint32_t BytesRead; #if defined(WIN32) FileHandle = CreateFile(ConvertPath(FileName, true), // Open this file @@ -556,7 +557,7 @@ #endif CabinetReservedFileSize = GetSizeOfFile(FileHandle); - if (CabinetReservedFileSize == (unsigned long)-1) + if (CabinetReservedFileSize == (uint32_t)-1) { DPRINT(MIN_TRACE, ("Cannot read from cabinet reserved file.\n")); return false; @@ -600,7 +601,7 @@ } -unsigned long CCabinet::GetCurrentDiskNumber() +uint32_t CCabinet::GetCurrentDiskNumber() /* * FUNCTION: Returns current disk number * RETURNS: @@ -611,7 +612,7 @@ } -unsigned long CCabinet::Open() +uint32_t CCabinet::Open() /* * FUNCTION: Opens a cabinet file * RETURNS: @@ -619,13 +620,13 @@ */ { PCFFOLDER_NODE FolderNode; - unsigned long Status; - unsigned long Index; + uint32_t Status; + uint32_t Index; if (!FileOpen) { - unsigned long BytesRead; - unsigned long Size; + uint32_t BytesRead; + uint32_t Size; OutputBuffer = AllocateMemory(CAB_BLOCKSIZE + 12); // This should be enough if (!OutputBuffer) @@ -682,7 +683,7 @@ /* Read/skip any reserved bytes */ if (CABHeader.Flags & CAB_FLAG_RESERVE) { - if ((Status = ReadBlock(&Size, sizeof(unsigned long), &BytesRead)) + if ((Status = ReadBlock(&Size, sizeof(uint32_t), &BytesRead)) != CAB_STATUS_SUCCESS) { DPRINT(MIN_TRACE, ("Cannot read from file (%d).\n", (unsigned int)Status)); @@ -803,8 +804,8 @@ } -unsigned long CCabinet::FindFirst(char* FileName, - PCAB_SEARCH Search) +uint32_t CCabinet::FindFirst(char* FileName, + PCAB_SEARCH Search) /* * FUNCTION: Finds the first file in the cabinet that matches a search criteria * ARGUMENTS: @@ -821,7 +822,7 @@ } -unsigned long CCabinet::FindNext(PCAB_SEARCH Search) +uint32_t CCabinet::FindNext(PCAB_SEARCH Search) /* * FUNCTION: Finds next file in the cabinet that matches a search criteria * ARGUMENTS: @@ -830,9 +831,10 @@ * Status of operation */ { - unsigned long Status; - - if (RestartSearch) { + uint32_t Status; + + if (RestartSearch) + { Search->Next = FileListHead; /* Skip split files already extracted */ @@ -850,8 +852,10 @@ /* FIXME: Check search criteria */ - if (!Search->Next) { - if (strlen(DiskNext) > 0) { + if (!Search->Next) + { + if (strlen(DiskNext) > 0) + { CloseCabinet(); SetCabinetName(CabinetNext); @@ -865,7 +869,8 @@ Search->Next = FileListHead; if (!Search->Next) return CAB_STATUS_NOFILE; - } else + } + else return CAB_STATUS_NOFILE; } @@ -876,7 +881,7 @@ } -unsigned long CCabinet::ExtractFile(char* FileName) +uint32_t CCabinet::ExtractFile(char* FileName) /* * FUNCTION: Extracts a file from the cabinet * ARGUMENTS: @@ -885,21 +890,21 @@ * Status of operation */ { - unsigned long Size; - unsigned long Offset; - unsigned long BytesRead; - unsigned long BytesToRead; - unsigned long BytesWritten; - unsigned long BytesSkipped; - unsigned long BytesToWrite; - unsigned long TotalBytesRead; - unsigned long CurrentOffset; + uint32_t Size; + uint32_t Offset; + uint32_t BytesRead; + uint32_t BytesToRead; + uint32_t BytesWritten; + uint32_t BytesSkipped; + uint32_t BytesToWrite; + uint32_t TotalBytesRead; + uint32_t CurrentOffset; unsigned char* Buffer; unsigned char* CurrentBuffer; FILEHANDLE DestFile; PCFFILE_NODE File; CFDATA CFData; - unsigned long Status; + uint32_t Status; bool Skip; #if defined(WIN32) FILETIME FileTime; @@ -1084,7 +1089,7 @@ BytesToRead = CFData.CompSize; DPRINT(MAX_TRACE, ("Read: (0x%lX,0x%lX).\n", - (long unsigned int)CurrentBuffer, (long unsigned int)Buffer)); + (uintptr_t)CurrentBuffer, (uintptr_t)Buffer)); if (((Status = ReadBlock(CurrentBuffer, BytesToRead, &BytesRead)) != CAB_STATUS_SUCCESS) || (BytesToRead != BytesRead)) @@ -1099,7 +1104,7 @@ /* if (CFData.Checksum != 0) { - unsigned long Checksum = ComputeChecksum(CurrentBuffer, BytesRead, 0); + uint32_t Checksum = ComputeChecksum(CurrentBuffer, BytesRead, 0); if (Checksum != CFData.Checksum) { CloseFile(DestFile); @@ -1264,14 +1269,14 @@ (unsigned int)Size)); #if defined(WIN32) - if (!WriteFile(DestFile, (void*)((unsigned long)OutputBuffer + BytesSkipped), - BytesToWrite, &BytesWritten, NULL) || + if (!WriteFile(DestFile, (void*)((uintptr_t)OutputBuffer + BytesSkipped), + BytesToWrite, (LPDWORD)&BytesWritten, NULL) || (BytesToWrite != BytesWritten)) { DPRINT(MIN_TRACE, ("Status 0x%lX.\n", GetLastError())); #else BytesWritten = BytesToWrite; - if (fwrite((void*)((unsigned long)OutputBuffer + BytesSkipped), + if (fwrite((void*)((uintptr_t)OutputBuffer + BytesSkipped), BytesToWrite, 1, DestFile) < 1) { #endif @@ -1297,7 +1302,7 @@ } -void CCabinet::SelectCodec(unsigned long Id) +void CCabinet::SelectCodec(uint32_t Id) /* * FUNCTION: Selects codec engine to use * ARGUMENTS: @@ -1338,14 +1343,14 @@ /* CAB write methods */ -unsigned long CCabinet::NewCabinet() +uint32_t CCabinet::NewCabinet() /* * FUNCTION: Creates a new cabinet * RETURNS: * Status of operation */ { - unsigned long Status; + uint32_t Status; CurrentDiskNumber = 0; @@ -1409,7 +1414,7 @@ } -unsigned long CCabinet::NewDisk() +uint32_t CCabinet::NewDisk() /* * FUNCTION: Forces a new disk to be created * RETURNS: @@ -1433,7 +1438,7 @@ } -unsigned long CCabinet::NewFolder() +uint32_t CCabinet::NewFolder() /* * FUNCTION: Forces a new folder to be created * RETURNS: @@ -1478,7 +1483,7 @@ } -unsigned long CCabinet::WriteFileToScratchStorage(PCFFILE_NODE FileNode) +uint32_t CCabinet::WriteFileToScratchStorage(PCFFILE_NODE FileNode) /* * FUNCTION: Writes a file to the scratch file * ARGUMENTS: @@ -1487,10 +1492,10 @@ * Status of operation */ { - unsigned long BytesToRead; - unsigned long BytesRead; - unsigned long Status; - unsigned long Size; + uint32_t BytesToRead; + uint32_t BytesRead; + uint32_t Status; + uint32_t Size; if (!ContinueFile) { @@ -1535,11 +1540,11 @@ FileNode->File.FileOffset = CurrentFolderNode->UncompOffset; CurrentFolderNode->UncompOffset += TotalBytesLeft; - FileNode->File.FileControlID = (unsigned short)(NextFolderNumber - 1); + FileNode->File.FileControlID = (uint16_t)(NextFolderNumber - 1); CurrentFolderNode->Commit = true; PrevCabinetNumber = CurrentDiskNumber; - Size = sizeof(CFFILE) + strlen(GetFileName(FileNode->FileName)) + 1; + Size = sizeof(CFFILE) + (uint32_t)strlen(GetFileName(FileNode->FileName)) + 1; CABHeader.FileTableOffset += Size; TotalFileSize += Size; DiskSize += Size; @@ -1551,7 +1556,7 @@ { do { - if (TotalBytesLeft > (unsigned long)CAB_BLOCKSIZE - CurrentIBufferSize) + if (TotalBytesLeft > (uint32_t)CAB_BLOCKSIZE - CurrentIBufferSize) BytesToRead = CAB_BLOCKSIZE - CurrentIBufferSize; else BytesToRead = TotalBytesLeft; @@ -1565,7 +1570,7 @@ *(unsigned char**)&CurrentIBuffer += BytesRead; - CurrentIBufferSize += (unsigned short)BytesRead; + CurrentIBufferSize += (uint16_t)BytesRead; if (CurrentIBufferSize == CAB_BLOCKSIZE) { @@ -1609,7 +1614,7 @@ } -unsigned long CCabinet::WriteDisk(unsigned long MoreDisks) +uint32_t CCabinet::WriteDisk(uint32_t MoreDisks) /* * FUNCTION: Forces the current disk to be written * ARGUMENTS: @@ -1619,7 +1624,7 @@ */ { PCFFILE_NODE FileNode; - unsigned long Status; + uint32_t Status; ContinueFile = false; FileNode = FileListHead; @@ -1695,7 +1700,7 @@ } -unsigned long CCabinet::CommitDisk(unsigned long MoreDisks) +uint32_t CCabinet::CommitDisk(uint32_t MoreDisks) /* * FUNCTION: Commits the current disk * ARGUMENTS: @@ -1705,7 +1710,7 @@ */ { PCFFOLDER_NODE FolderNode; - unsigned long Status; + uint32_t Status; OnCabinetName(CurrentDiskNumber, CabinetName); @@ -1720,7 +1725,7 @@ NULL); // No attribute template if (FileHandle == INVALID_HANDLE_VALUE) { - unsigned long Status; + uint32_t Status; /* If file exists, ask to overwrite file */ if (((Status = GetLastError()) == ERROR_FILE_EXISTS) && (OnOverwrite(NULL, CabinetName))) @@ -1801,7 +1806,7 @@ } -unsigned long CCabinet::CloseDisk() +uint32_t CCabinet::CloseDisk() /* * FUNCTION: Closes the current disk * RETURNS: @@ -1819,14 +1824,14 @@ } -unsigned long CCabinet::CloseCabinet() +uint32_t CCabinet::CloseCabinet() /* * FUNCTION: Closes the current cabinet * RETURNS: * Status of operation */ { - unsigned long Status; + uint32_t Status; DestroyFileNodes(); @@ -1857,7 +1862,7 @@ } -unsigned long CCabinet::AddFile(char* FileName) +uint32_t CCabinet::AddFile(char* FileName) /* * FUNCTION: Adds a file to the current disk * ARGUMENTS: @@ -1918,7 +1923,7 @@ /* FIXME: Check for and handle large files (>= 2GB) */ FileNode->File.FileSize = GetSizeOfFile(SrcFile); - if (FileNode->File.FileSize == (unsigned long)-1) + if (FileNode->File.FileSize == (uint32_t)-1) { DPRINT(MIN_TRACE, ("Cannot read from file.\n")); FreeMemory(NewFileName); @@ -1935,7 +1940,7 @@ } -void CCabinet::SetMaxDiskSize(unsigned long Size) +void CCabinet::SetMaxDiskSize(uint32_t Size) /* * FUNCTION: Sets the maximum size of the current disk * ARGUMENTS: @@ -2003,7 +2008,7 @@ } -bool CCabinet::OnDiskLabel(unsigned long Number, char* Label) +bool CCabinet::OnDiskLabel(uint32_t Number, char* Label) /* * FUNCTION: Called when a disk needs a label * ARGUMENTS: @@ -2017,7 +2022,7 @@ } -bool CCabinet::OnCabinetName(unsigned long Number, char* Name) +bool CCabinet::OnCabinetName(uint32_t Number, char* Name) /* * FUNCTION: Called when a cabinet needs a name * ARGUMENTS: @@ -2032,7 +2037,7 @@ #endif /* CAB_READ_ONLY */ -PCFFOLDER_NODE CCabinet::LocateFolderNode(unsigned long Index) +PCFFOLDER_NODE CCabinet::LocateFolderNode(uint32_t Index) /* * FUNCTION: Locates a folder node * ARGUMENTS: @@ -2064,7 +2069,7 @@ } -unsigned long CCabinet::GetAbsoluteOffset(PCFFILE_NODE File) +uint32_t CCabinet::GetAbsoluteOffset(PCFFILE_NODE File) /* * FUNCTION: Returns the absolute offset of a file * ARGUMENTS: @@ -2105,8 +2110,8 @@ } -unsigned long CCabinet::LocateFile(char* FileName, - PCFFILE_NODE *File) +uint32_t CCabinet::LocateFile(char* FileName, + PCFFILE_NODE *File) /* * FUNCTION: Locates a file in the cabinet * ARGUMENTS: @@ -2119,7 +2124,7 @@ */ { PCFFILE_NODE Node; - unsigned long Status; + uint32_t Status; DPRINT(MAX_TRACE, ("FileName '%s'\n", FileName)); @@ -2150,7 +2155,7 @@ } -unsigned long CCabinet::ReadString(char* String, unsigned long MaxLength) +uint32_t CCabinet::ReadString(char* String, uint32_t MaxLength) /* * FUNCTION: Reads a NULL-terminated string from the cabinet * ARGUMENTS: @@ -2160,10 +2165,10 @@ * Status of operation */ { - unsigned long BytesRead; - unsigned long Offset; - unsigned long Status; - unsigned long Size; + uint32_t BytesRead; + uint32_t Offset; + uint32_t Status; + uint32_t Size; bool Found; Offset = 0; @@ -2203,7 +2208,7 @@ #if defined(WIN32) SetLastError(NO_ERROR); (unsigned int)SetFilePointer(FileHandle, - -(long)Size, + -(int32_t)Size, NULL, FILE_CURRENT); if (GetLastError() != NO_ERROR) @@ -2212,7 +2217,7 @@ return CAB_STATUS_INVALID_CAB; } #else - if (fseek(FileHandle, (off_t)(-(long)Size), SEEK_CUR) != 0) + if (fseek(FileHandle, (off_t)(-(int32_t)Size), SEEK_CUR) != 0) { DPRINT(MIN_TRACE, ("fseek() failed.\n")); return CAB_STATUS_INVALID_CAB; @@ -2222,16 +2227,16 @@ } -unsigned long CCabinet::ReadFileTable() +uint32_t CCabinet::ReadFileTable() /* * FUNCTION: Reads the file table from the cabinet file * RETURNS: * Status of operation */ { - unsigned long i; - unsigned long Status; - unsigned long BytesRead; + uint32_t i; + uint32_t Status; + uint32_t BytesRead; PCFFILE_NODE File; DPRINT(MAX_TRACE, ("Reading file table at absolute offset (0x%lX).\n", @@ -2240,7 +2245,7 @@ /* Seek to file table */ #if defined(WIN32) SetLastError(NO_ERROR); - (unsigned int)SetFilePointer(FileHandle, + SetFilePointer(FileHandle, CABHeader.FileTableOffset, NULL, FILE_BEGIN); @@ -2297,7 +2302,7 @@ } -unsigned long CCabinet::ReadDataBlocks(PCFFOLDER_NODE FolderNode) +uint32_t CCabinet::ReadDataBlocks(PCFFOLDER_NODE FolderNode) /* * FUNCTION: Reads all CFDATA blocks for a folder from the cabinet file * ARGUMENTS: @@ -2306,12 +2311,12 @@ * Status of operation */ { - unsigned long AbsoluteOffset; - unsigned long UncompOffset; + uint32_t AbsoluteOffset; + uint32_t UncompOffset; PCFDATA_NODE Node; - unsigned long BytesRead; - unsigned long Status; - unsigned long i; + uint32_t BytesRead; + uint32_t Status; + uint32_t i; DPRINT(MAX_TRACE, ("Reading data blocks for folder (%lu) at absolute offset (0x%lX).\n", FolderNode->Index, FolderNode->Folder.DataOffset)); @@ -2546,7 +2551,7 @@ DPRINT(MAX_TRACE, ("Deleting file: '%s'\n", CurNode->FileName)); - TotalFileSize -= (sizeof(CFFILE) + strlen(GetFileName(CurNode->FileName)) + 1); + TotalFileSize -= (sizeof(CFFILE) + (uint32_t)strlen(GetFileName(CurNode->FileName)) + 1); if (CurNode->FileName) FreeMemory(CurNode->FileName); @@ -2621,9 +2626,9 @@ } -unsigned long CCabinet::ComputeChecksum(void* Buffer, - unsigned int Size, - unsigned long Seed) +uint32_t CCabinet::ComputeChecksum(void* Buffer, + unsigned int Size, + uint32_t Seed) /* * FUNCTION: Computes checksum for data block * ARGUMENTS: @@ -2635,9 +2640,9 @@ */ { int UlongCount; // Number of ULONGs in block - unsigned long Checksum; // Checksum accumulator + uint32_t Checksum; // Checksum accumulator unsigned char* pb; - unsigned long ul; + uint32_t ul; /* FIXME: Doesn't seem to be correct. EXTRACT.EXE won't accept checksums computed by this routine */ @@ -2651,11 +2656,11 @@ /* Checksum integral multiple of ULONGs */ while (UlongCount-- > 0) { - /* NOTE: Build unsigned long in big/little-endian independent manner */ + /* NOTE: Build uint32_t in big/little-endian independent manner */ ul = *pb++; // Get low-order byte - ul |= (((unsigned long)(*pb++)) << 8); // Add 2nd byte - ul |= (((unsigned long)(*pb++)) << 16); // Add 3nd byte - ul |= (((unsigned long)(*pb++)) << 24); // Add 4th byte + ul |= (((uint32_t)(*pb++)) << 8); // Add 2nd byte + ul |= (((uint32_t)(*pb++)) << 16); // Add 3nd byte + ul |= (((uint32_t)(*pb++)) << 24); // Add 4th byte Checksum ^= ul; // Update checksum } @@ -2665,9 +2670,9 @@ switch (Size % 4) { case 3: - ul |= (((unsigned long)(*pb++)) << 16); // Add 3rd byte + ul |= (((uint32_t)(*pb++)) << 16); // Add 3rd byte case 2: - ul |= (((unsigned long)(*pb++)) << 8); // Add 2nd byte + ul |= (((uint32_t)(*pb++)) << 8); // Add 2nd byte case 1: ul |= *pb++; // Get low-order byte default: @@ -2680,15 +2685,15 @@ } -unsigned long CCabinet::ReadBlock(void* Buffer, - unsigned long Size, - unsigned long* BytesRead) +uint32_t CCabinet::ReadBlock(void* Buffer, + uint32_t Size, + uint32_t* BytesRead) /* * FUNCTION: Read a block of data from file * ARGUMENTS: * Buffer = Pointer to data buffer * Size = Length of data buffer - * BytesRead = Pointer to unsigned long that on return will contain + * BytesRead = Pointer to uint32_t that on return will contain * number of bytes read * RETURNS: * Status of operation @@ -2701,22 +2706,22 @@ #ifndef CAB_READ_ONLY -unsigned long CCabinet::InitCabinetHeader() +uint32_t CCabinet::InitCabinetHeader() /* * FUNCTION: Initializes cabinet header and optional fields * RETURNS: * Status of operation */ { - unsigned long TotalSize; - unsigned long Size; + uint32_t TotalSize; + uint32_t Size; CABHeader.FileTableOffset = 0; // Not known yet CABHeader.FolderCount = 0; // Not known yet CABHeader.FileCount = 0; // Not known yet CABHeader.Flags = 0; // Not known yet - CABHeader.CabinetNumber = (unsigned short)CurrentDiskNumber; + CABHeader.CabinetNumber = (uint16_t)CurrentDiskNumber; if ((CurrentDiskNumber > 0) && (OnCabinetName(PrevCabinetNumber, CabinetPrev))) { @@ -2740,10 +2745,10 @@ DPRINT(MAX_TRACE, ("CabinetPrev '%s'.\n", CabinetPrev)); /* Calculate size of name of previous cabinet */ - TotalSize += strlen(CabinetPrev) + 1; + TotalSize += (uint32_t)strlen(CabinetPrev) + 1; /* Calculate size of label of previous disk */ - TotalSize += strlen(DiskPrev) + 1; + TotalSize += (uint32_t)strlen(DiskPrev) + 1; } if ((CABHeader.Flags & CAB_FLAG_HASNEXT) > 0) @@ -2752,12 +2757,12 @@ DPRINT(MAX_TRACE, ("CabinetNext '%s'.\n", CabinetNext)); /* Calculate size of name of next cabinet */ - Size = strlen(CabinetNext) + 1; + Size = (uint32_t)strlen(CabinetNext) + 1; TotalSize += Size; NextFieldsSize = Size; /* Calculate size of label of next disk */ - Size = strlen(DiskNext) + 1; + Size = (uint32_t)strlen(DiskNext) + 1; TotalSize += Size; NextFieldsSize += Size; } @@ -2769,7 +2774,7 @@ { CABHeader.Flags |= CAB_FLAG_RESERVE; TotalSize += CabinetReservedFileSize; - TotalSize += sizeof(unsigned long); /* For CabinetResSize, FolderResSize, and FileResSize fields */ + TotalSize += sizeof(uint32_t); /* For CabinetResSize, FolderResSize, and FileResSize fields */ } DiskSize += TotalSize; @@ -2780,7 +2785,7 @@ } -unsigned long CCabinet::WriteCabinetHeader(bool MoreDisks) +uint32_t CCabinet::WriteCabinetHeader(bool MoreDisks) /* * FUNCTION: Writes the cabinet header and optional fields * ARGUMENTS: @@ -2791,8 +2796,8 @@ { PCFFOLDER_NODE FolderNode; PCFFILE_NODE FileNode; - unsigned long BytesWritten; - unsigned long Size; + uint32_t BytesWritten; + uint32_t Size; if (MoreDisks) { @@ -2836,9 +2841,9 @@ CABHeader.CabinetSize = DiskSize; - /* Write header */ -#if defined(WIN32) - if (!WriteFile(FileHandle, &CABHeader, sizeof(CFHEADER), &BytesWritten, NULL)) + /* Write header */ +#if defined(WIN32) + if (!WriteFile(FileHandle, &CABHeader, sizeof(CFHEADER), (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; @@ -2855,20 +2860,20 @@ /* Write per-cabinet reserved area if present */ if (CABHeader.Flags & CAB_FLAG_RESERVE) { - unsigned long ReservedSize; + uint32_t ReservedSize; ReservedSize = CabinetReservedFileSize & 0xffff; ReservedSize |= (0 << 16); /* Folder reserved area size */ ReservedSize |= (0 << 24); /* Folder reserved area size */ #if defined(WIN32) - if (!WriteFile(FileHandle, &ReservedSize, sizeof(unsigned long), &BytesWritten, NULL)) + if (!WriteFile(FileHandle, &ReservedSize, sizeof(uint32_t), (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; } #else - BytesWritten = sizeof(unsigned long); - if (fwrite(&ReservedSize, sizeof(unsigned long), 1, FileHandle) < 1) + BytesWritten = sizeof(uint32_t); + if (fwrite(&ReservedSize, sizeof(uint32_t), 1, FileHandle) < 1) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; @@ -2876,7 +2881,7 @@ #endif #if defined(WIN32) - if (!WriteFile(FileHandle, CabinetReservedFileBuffer, CabinetReservedFileSize, &BytesWritten, NULL)) + if (!WriteFile(FileHandle, CabinetReservedFileBuffer, CabinetReservedFileSize, (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; @@ -2896,9 +2901,9 @@ DPRINT(MAX_TRACE, ("CabinetPrev '%s'.\n", CabinetPrev)); /* Write name of previous cabinet */ - Size = strlen(CabinetPrev) + 1; -#if defined(WIN32) - if (!WriteFile(FileHandle, CabinetPrev, Size, &BytesWritten, NULL)) + Size = (uint32_t)strlen(CabinetPrev) + 1; +#if defined(WIN32) + if (!WriteFile(FileHandle, CabinetPrev, Size, (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; @@ -2915,9 +2920,9 @@ DPRINT(MAX_TRACE, ("DiskPrev '%s'.\n", DiskPrev)); /* Write label of previous disk */ - Size = strlen(DiskPrev) + 1; -#if defined(WIN32) - if (!WriteFile(FileHandle, DiskPrev, Size, &BytesWritten, NULL)) + Size = (uint32_t)strlen(DiskPrev) + 1; +#if defined(WIN32) + if (!WriteFile(FileHandle, DiskPrev, Size, (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; @@ -2937,9 +2942,9 @@ DPRINT(MAX_TRACE, ("CabinetNext '%s'.\n", CabinetNext)); /* Write name of next cabinet */ - Size = strlen(CabinetNext) + 1; -#if defined(WIN32) - if (!WriteFile(FileHandle, CabinetNext, Size, &BytesWritten, NULL)) + Size = (uint32_t)strlen(CabinetNext) + 1; +#if defined(WIN32) + if (!WriteFile(FileHandle, CabinetNext, Size, (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; @@ -2956,9 +2961,9 @@ DPRINT(MAX_TRACE, ("DiskNext '%s'.\n", DiskNext)); /* Write label of next disk */ - Size = strlen(DiskNext) + 1; -#if defined(WIN32) - if (!WriteFile(FileHandle, DiskNext, Size, &BytesWritten, NULL)) + Size = (uint32_t)strlen(DiskNext) + 1; +#if defined(WIN32) + if (!WriteFile(FileHandle, DiskNext, Size, (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; @@ -2977,7 +2982,7 @@ } -unsigned long CCabinet::WriteFolderEntries() +uint32_t CCabinet::WriteFolderEntries() /* * FUNCTION: Writes folder entries * RETURNS: @@ -2985,7 +2990,7 @@ */ { PCFFOLDER_NODE FolderNode; - unsigned long BytesWritten; + uint32_t BytesWritten; DPRINT(MAX_TRACE, ("Writing folder table.\n")); @@ -2999,10 +3004,10 @@ #if defined(WIN32) if (!WriteFile(FileHandle, - &FolderNode->Folder, - sizeof(CFFOLDER), - &BytesWritten, - NULL)) + &FolderNode->Folder, + sizeof(CFFOLDER), + (LPDWORD)&BytesWritten, + NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; @@ -3023,7 +3028,7 @@ } -unsigned long CCabinet::WriteFileEntries() +uint32_t CCabinet::WriteFileEntries() /* * FUNCTION: Writes file entries for all files * RETURNS: @@ -3031,7 +3036,7 @@ */ { PCFFILE_NODE File; - unsigned long BytesWritten; + uint32_t BytesWritten; bool SetCont = false; DPRINT(MAX_TRACE, ("Writing file table.\n")); @@ -3063,7 +3068,7 @@ if (!WriteFile(FileHandle, &File->File, sizeof(CFFILE), - &BytesWritten, + (LPDWORD)&BytesWritten, NULL)) return CAB_STATUS_CANNOT_WRITE; #else @@ -3078,7 +3083,9 @@ #if defined(WIN32) if (!WriteFile(FileHandle, GetFileName(File->FileName), - strlen(GetFileName(File->FileName)) + 1, &BytesWritten, NULL)) + (DWORD)strlen(GetFileName(File->FileName)) + 1, + (LPDWORD)&BytesWritten, + NULL)) return CAB_STATUS_CANNOT_WRITE; #else BytesWritten = strlen(GetFileName(File->FileName)) + 1; @@ -3102,7 +3109,7 @@ } -unsigned long CCabinet::CommitDataBlocks(PCFFOLDER_NODE FolderNode) +uint32_t CCabinet::CommitDataBlocks(PCFFOLDER_NODE FolderNode) /* * FUNCTION: Writes data blocks to the cabinet * ARGUMENTS: @@ -3112,9 +3119,9 @@ */ { PCFDATA_NODE DataNode; - unsigned long BytesWritten; - unsigned long BytesRead; - unsigned long Status; + uint32_t BytesWritten; + uint32_t BytesRead; + uint32_t Status; DataNode = FolderNode->DataListHead; if (DataNode != NULL) @@ -3139,7 +3146,7 @@ #if defined(WIN32) if (!WriteFile(FileHandle, &DataNode->Data, - sizeof(CFDATA), &BytesWritten, NULL)) + sizeof(CFDATA), (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; @@ -3155,7 +3162,7 @@ #if defined(WIN32) if (!WriteFile(FileHandle, InputBuffer, - DataNode->Data.CompSize, &BytesWritten, NULL)) + DataNode->Data.CompSize, (LPDWORD)&BytesWritten, NULL)) { DPRINT(MIN_TRACE, ("Cannot write to file.\n")); return CAB_STATUS_CANNOT_WRITE; @@ -3175,15 +3182,15 @@ } -unsigned long CCabinet::WriteDataBlock() +uint32_t CCabinet::WriteDataBlock() /* * FUNCTION: Writes the current data block to the scratch file * RETURNS: * Status of operation */ { - unsigned long Status; - unsigned long BytesWritten; + uint32_t Status; + uint32_t BytesWritten; PCFDATA_NODE DataNode; if (!BlockIsSplit) @@ -3217,14 +3224,14 @@ if (BlockIsSplit) { - DataNode->Data.CompSize = (unsigned short)(MaxDiskSize - DiskSize); + DataNode->Data.CompSize = (uint16_t)(MaxDiskSize - DiskSize); DataNode->Data.UncompSize = 0; CreateNewDisk = true; } else { - DataNode->Data.CompSize = (unsigned short)CurrentOBufferSize; - DataNode->Data.UncompSize = (unsigned short)CurrentIBufferSize; + DataNode->Data.CompSize = (uint16_t)CurrentOBufferSize; + DataNode->Data.UncompSize = (uint16_t)CurrentIBufferSize; } DataNode->Data.Checksum = 0; @@ -3266,8 +3273,8 @@ #if !defined(WIN32) void CCabinet::ConvertDateAndTime(time_t* Time, - unsigned short* DosDate, - unsigned short* DosTime) + uint16_t* DosDate, + uint16_t* DosTime) /* * FUNCTION: Returns file times of a file * ARGUMENTS: @@ -3297,7 +3304,7 @@ #endif // !WIN32 -unsigned long CCabinet::GetFileTimes(FILEHANDLE FileHandle, PCFFILE_NODE File) +uint32_t CCabinet::GetFileTimes(FILEHANDLE FileHandle, PCFFILE_NODE File) /* * FUNCTION: Returns file times of a file * ARGUMENTS: @@ -3337,7 +3344,7 @@ } -unsigned long CCabinet::GetAttributesOnFile(PCFFILE_NODE File) +uint32_t CCabinet::GetAttributesOnFile(PCFFILE_NODE File) /* * FUNCTION: Returns attributes on a file * ARGUMENTS: @@ -3347,7 +3354,7 @@ */ { #if defined(WIN32) - long Attributes; + int32_t Attributes; Attributes = GetFileAttributes(File->FileName); if (Attributes == -1) @@ -3400,7 +3407,7 @@ } -unsigned long CCabinet::SetAttributesOnFile(PCFFILE_NODE File) +uint32_t CCabinet::SetAttributesOnFile(PCFFILE_NODE File) /* * FUNCTION: Sets attributes on a file * ARGUMENTS: @@ -3410,7 +3417,7 @@ */ { #if defined(WIN32) - unsigned long Attributes = 0; + uint32_t Attributes = 0; if (File->File.Attributes & CAB_ATTRIB_READONLY) Attributes |= FILE_ATTRIBUTE_READONLY; Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h (original) +++ trunk/reactos/tools/cabman/cabinet.h Sun May 27 14:26:43 2007 @@ -19,6 +19,8 @@ #define MAX_PATH 260 #endif #endif + +#include <stdint.h> #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -56,7 +58,7 @@ #ifdef DBG -extern unsigned long DebugTraceLevel; +extern uint32_t DebugTraceLevel; #ifdef _MSC_VER #define __FUNCTION__ "" @@ -121,59 +123,59 @@ typedef struct _CFHEADER { - unsigned long Signature; // File signature 'MSCF' (CAB_SIGNATURE) - unsigned long Reserved1; // Reserved field - unsigned long CabinetSize; // Cabinet file size - unsigned long Reserved2; // Reserved field - unsigned long FileTableOffset; // Offset of first CFFILE - unsigned long Reserved3; // Reserved field - unsigned short Version; // Cabinet version (CAB_VERSION) - unsigned short FolderCount; // Number of folders - unsigned short FileCount; // Number of files - unsigned short Flags; // Cabinet flags (CAB_FLAG_*) - unsigned short SetID; // Cabinet set id - unsigned short CabinetNumber; // Zero-based cabinet number + uint32_t Signature; // File signature 'MSCF' (CAB_SIGNATURE) + uint32_t Reserved1; // Reserved field + uint32_t CabinetSize; // Cabinet file size + uint32_t Reserved2; // Reserved field + uint32_t FileTableOffset; // Offset of first CFFILE + uint32_t Reserved3; // Reserved field + uint16_t Version; // Cabinet version (CAB_VERSION) + uint16_t FolderCount; // Number of folders + uint16_t FileCount; // Number of files + uint16_t Flags; // Cabinet flags (CAB_FLAG_*) + uint16_t SetID; // Cabinet set id + uint16_t CabinetNumber; // Zero-based cabinet number /* Optional fields (depends on Flags) - unsigned short CabinetResSize // Per-cabinet reserved area size - char FolderResSize // Per-folder reserved area size - char FileResSize // Per-file reserved area size - char CabinetReserved[] // Per-cabinet reserved area - char CabinetPrev[] // Name of previous cabinet file - char DiskPrev[] // Name of previous disk - char CabinetNext[] // Name of next cabinet file - char DiskNext[] // Name of next disk + uint16_t CabinetResSize // Per-cabinet reserved area size + char FolderResSize // Per-folder reserved area size + char FileResSize // Per-file reserved area size + char CabinetReserved[] // Per-cabinet reserved area + char CabinetPrev[] // Name of previous cabinet file + char DiskPrev[] // Name of previous disk + char CabinetNext[] // Name of next cabinet file + char DiskNext[] // Name of next disk */ } CFHEADER, *PCFHEADER; typedef struct _CFFOLDER { - unsigned long DataOffset; // Absolute offset of first CFDATA block in this folder - unsigned short DataBlockCount; // Number of CFDATA blocks in this folder in this cabinet - unsigned short CompressionType; // Type of compression used for all CFDATA blocks in this folder + uint32_t DataOffset; // Absolute offset of first CFDATA block in this folder + uint16_t DataBlockCount; // Number of CFDATA blocks in this folder in this cabinet + uint16_t CompressionType; // Type of compression used for all CFDATA blocks in this folder /* Optional fields (depends on Flags) - char FolderReserved[] // Per-folder reserved area + char FolderReserved[] // Per-folder reserved area */ } CFFOLDER, *PCFFOLDER; typedef struct _CFFILE { - unsigned long FileSize; // Uncompressed file size in bytes - unsigned long FileOffset; // Uncompressed offset of file in the folder - unsigned short FileControlID; // File control ID (CAB_FILE_*) - unsigned short FileDate; // File date stamp, as used by DOS - unsigned short FileTime; // File time stamp, as used by DOS - unsigned short Attributes; // File attributes (CAB_ATTRIB_*) + uint32_t FileSize; // Uncompressed file size in bytes + uint32_t FileOffset; // Uncompressed offset of file in the folder + uint16_t FileControlID; // File control ID (CAB_FILE_*) + uint16_t FileDate; // File date stamp, as used by DOS + uint16_t FileTime; // File time stamp, as used by DOS + uint16_t Attributes; // File attributes (CAB_ATTRIB_*) /* After this is the NULL terminated filename */ } CFFILE, *PCFFILE; typedef struct _CFDATA { - unsigned long Checksum; // Checksum of CFDATA entry - unsigned short CompSize; // Number of compressed bytes in this block - unsigned short UncompSize; // Number of uncompressed bytes in this block + uint32_t Checksum; // Checksum of CFDATA entry + uint16_t CompSize; // Number of compressed bytes in this block + uint16_t UncompSize; // Number of uncompressed bytes in this block /* Optional fields (depends on Flags) char DataReserved[] // Per-datablock reserved area */ @@ -183,25 +185,25 @@ { struct _CFDATA_NODE *Next; struct _CFDATA_NODE *Prev; - unsigned long ScratchFilePosition; // Absolute offset in scratch file - unsigned long AbsoluteOffset; // Absolute offset in cabinet - unsigned long UncompOffset; // Uncompressed offset in folder - CFDATA Data; + uint32_t ScratchFilePosition; // Absolute offset in scratch file + uint32_t AbsoluteOffset; // Absolute offset in cabinet + uint32_t UncompOffset; // Uncompressed offset in folder + CFDATA Data; } CFDATA_NODE, *PCFDATA_NODE; typedef struct _CFFOLDER_NODE { struct _CFFOLDER_NODE *Next; struct _CFFOLDER_NODE *Prev; - unsigned long UncompOffset; // File size accumulator - unsigned long AbsoluteOffset; - unsigned long TotalFolderSize; // Total size of folder in current disk - PCFDATA_NODE DataListHead; - PCFDATA_NODE DataListTail; - unsigned long Index; - bool Commit; // true if the folder should be committed - bool Delete; // true if marked for deletion - CFFOLDER Folder; + uint32_t UncompOffset; // File size accumulator + uint32_t AbsoluteOffset; + uint32_t TotalFolderSize; // Total size of folder in current disk + PCFDATA_NODE DataListHead; + PCFDATA_NODE DataListTail; + uint32_t Index; + bool Commit; // true if the folder should be committed + bool Delete; // true if marked for deletion + CFFOLDER Folder; } CFFOLDER_NODE, *PCFFOLDER_NODE; typedef struct _CFFILE_NODE @@ -213,7 +215,7 @@ PCFDATA_NODE DataBlock; // First data block of file. NULL if not known bool Commit; // true if the file data should be committed bool Delete; // true if marked for deletion - PCFFOLDER_NODE FolderNode; // Folder this file belong to + PCFFOLDER_NODE FolderNode; // Folder this file belong to } CFFILE_NODE, *PCFFILE_NODE; @@ -252,15 +254,15 @@ /* Default destructor */ virtual ~CCABCodec() {}; /* Compresses a data block */ - virtual unsigned long Compress(void* OutputBuffer, - void* InputBuffer, - unsigned long InputLength, - unsigned long* OutputLength) = 0; + virtual uint32_t Compress(void* OutputBuffer, + void* InputBuffer, + uint32_t InputLength, + uint32_t* OutputLength) = 0; /* Uncompresses a data block */ - virtual unsigned long Uncompress(void* OutputBuffer, - void* InputBuffer, - unsigned long InputLength, - unsigned long* OutputLength) = 0; + virtual uint32_t Uncompress(void* OutputBuffer, + void* InputBuffer, + uint32_t InputLength, + uint32_t* OutputLength) = 0; }; @@ -287,13 +289,13 @@ CCFDATAStorage(); /* Default destructor */ virtual ~CCFDATAStorage(); - unsigned long Create(char* FileName); - unsigned long Destroy(); - unsigned long Truncate(); - unsigned long Position(); - unsigned long Seek(long Position); - unsigned long ReadBlock(PCFDATA Data, void* Buffer, unsigned long* BytesRead); - unsigned long WriteBlock(PCFDATA Data, void* Buffer, unsigned long* BytesWritten); + uint32_t Create(char* FileName); + uint32_t Destroy(); + uint32_t Truncate(); + uint32_t Position(); + uint32_t Seek(int32_t Position); + uint32_t ReadBlock(PCFDATA Data, void* Buffer, uint32_t* BytesRead); + uint32_t WriteBlock(PCFDATA Data, void* Buffer, uint32_t* BytesWritten); private: char FullName[MAX_PATH]; bool FileCreated; @@ -317,7 +319,7 @@ /* Removes a filename from a fully qualified filename */ void RemoveFileName(char* Path); /* Normalizes a path */ - bool NormalizePath(char* Path, unsigned long Length); + bool NormalizePath(char* Path, uint32_t Length); /* Returns name of cabinet file */ char* GetCabinetName(); /* Sets the name of the cabinet file */ @@ -331,40 +333,40 @@ /* Returns destination path */ char* GetDestinationPath(); /* Returns zero-based current disk number */ - unsigned long GetCurrentDiskNumber(); + uint32_t GetCurrentDiskNumber(); /* Opens the current cabinet file */ - unsigned long Open(); + uint32_t Open(); /* Closes the current open cabinet file */ void Close(); /* Locates the first file in the current cabinet file that matches a search criteria */ - unsigned long FindFirst(char* FileName, PCAB_SEARCH Search); + uint32_t FindFirst(char* FileName, PCAB_SEARCH Search); /* Locates the next file in the current cabinet file */ - unsigned long FindNext(PCAB_SEARCH Search); + uint32_t FindNext(PCAB_SEARCH Search); /* Extracts a file from the current cabinet file */ - unsigned long ExtractFile(char* FileName); + uint32_t ExtractFile(char* FileName); /* Select codec engine to use */ - void SelectCodec(unsigned long Id); + void SelectCodec(uint32_t Id); #ifndef CAB_READ_ONLY /* Creates a new cabinet file */ - unsigned long NewCabinet(); + uint32_t NewCabinet(); /* Forces a new disk to be created */ - unsigned long NewDisk(); + uint32_t NewDisk(); /* Forces a new folder to be created */ - unsigned long NewFolder(); + uint32_t NewFolder(); /* Writes a file to scratch storage */ - unsigned long WriteFileToScratchStorage(PCFFILE_NODE FileNode); + uint32_t WriteFileToScratchStorage(PCFFILE_NODE FileNode); /* Forces the current disk to be written */ - unsigned long WriteDisk(unsigned long MoreDisks); + uint32_t WriteDisk(uint32_t MoreDisks); /* Commits the current disk */ - unsigned long CommitDisk(unsigned long MoreDisks); + uint32_t CommitDisk(uint32_t MoreDisks); /* Closes the current disk */ - unsigned long CloseDisk(); + uint32_t CloseDisk(); /* Closes the current cabinet */ - unsigned long CloseCabinet(); + uint32_t CloseCabinet(); /* Adds a file to the current disk */ - unsigned long AddFile(char* FileName); + uint32_t AddFile(char* FileName); /* Sets the maximum size of the current disk */ - void SetMaxDiskSize(unsigned long Size); + void SetMaxDiskSize(uint32_t Size); #endif /* CAB_READ_ONLY */ /* Default event handlers */ @@ -379,17 +381,17 @@ /* Handler called when a file is about to be added */ virtual void OnAdd(PCFFILE Entry, char* FileName); /* Handler called when a cabinet need a name */ - virtual bool OnCabinetName(unsigned long Number, char* Name); + virtual bool OnCabinetName(uint32_t Number, char* Name); /* Handler called when a disk needs a label */ - virtual bool OnDiskLabel(unsigned long Number, char* Label); + virtual bool OnDiskLabel(uint32_t Number, char* Label); #endif /* CAB_READ_ONLY */ private: - PCFFOLDER_NODE LocateFolderNode(unsigned long Index); - unsigned long GetAbsoluteOffset(PCFFILE_NODE File); - unsigned long LocateFile(char* FileName, PCFFILE_NODE *File); - unsigned long ReadString(char* String, unsigned long MaxLength); - unsigned long ReadFileTable(); - unsigned long ReadDataBlocks(PCFFOLDER_NODE FolderNode); + PCFFOLDER_NODE LocateFolderNode(uint32_t Index); + uint32_t GetAbsoluteOffset(PCFFILE_NODE File); + uint32_t LocateFile(char* FileName, PCFFILE_NODE *File); + uint32_t ReadString(char* String, uint32_t MaxLength); + uint32_t ReadFileTable(); + uint32_t ReadDataBlocks(PCFFOLDER_NODE FolderNode); PCFFOLDER_NODE NewFolderNode(); PCFFILE_NODE NewFileNode(); PCFDATA_NODE NewDataNode(PCFFOLDER_NODE FolderNode); @@ -398,45 +400,45 @@ void DestroyDeletedFileNodes(); void DestroyFolderNodes(); void DestroyDeletedFolderNodes(); - unsigned long ComputeChecksum(void* Buffer, unsigned int Size, unsigned long Seed); - unsigned long ReadBlock(void* Buffer, unsigned long Size, unsigned long* BytesRead); + uint32_t ComputeChecksum(void* Buffer, unsigned int Size, uint32_t Seed); + uint32_t ReadBlock(void* Buffer, uint32_t Size, uint32_t* BytesRead); #ifndef CAB_READ_ONLY - unsigned long InitCabinetHeader(); - unsigned long WriteCabinetHeader(bool MoreDisks); - unsigned long WriteFolderEntries(); - unsigned long WriteFileEntries(); - unsigned long CommitDataBlocks(PCFFOLDER_NODE FolderNode); - unsigned long WriteDataBlock(); - unsigned long GetAttributesOnFile(PCFFILE_NODE File); - unsigned long SetAttributesOnFile(PCFFILE_NODE File); - unsigned long GetFileTimes(FILEHANDLE FileHandle, PCFFILE_NODE File); + uint32_t InitCabinetHeader(); + uint32_t WriteCabinetHeader(bool MoreDisks); + uint32_t WriteFolderEntries(); + uint32_t WriteFileEntries(); + uint32_t CommitDataBlocks(PCFFOLDER_NODE FolderNode); + uint32_t WriteDataBlock(); + uint32_t GetAttributesOnFile(PCFFILE_NODE File); + uint32_t SetAttributesOnFile(PCFFILE_NODE File); + uint32_t GetFileTimes(FILEHANDLE FileHandle, PCFFILE_NODE File); #if !defined(WIN32) - void ConvertDateAndTime(time_t* Time, unsigned short* DosDate, unsigned short* DosTime); + void ConvertDateAndTime(time_t* Time, uint16_t* DosDate, uint16_t* DosTime); #endif #endif /* CAB_READ_ONLY */ - unsigned long CurrentDiskNumber; // Zero based disk number + uint32_t CurrentDiskNumber; // Zero based disk number char CabinetName[256]; // Filename of current cabinet char CabinetPrev[256]; // Filename of previous cabinet char DiskPrev[256]; // Label of cabinet in file CabinetPrev char CabinetNext[256]; // Filename of next cabinet char DiskNext[256]; // Label of cabinet in file CabinetNext - unsigned long TotalHeaderSize; // Size of header and optional fields - unsigned long NextFieldsSize; // Size of next cabinet name and next disk label - unsigned long TotalFolderSize; // Size of all folder entries - unsigned long TotalFileSize; // Size of all file entries - unsigned long FolderUncompSize; // Uncompressed size of folder - unsigned long BytesLeftInBlock; // Number of bytes left in current block + uint32_t TotalHeaderSize; // Size of header and optional fields + uint32_t NextFieldsSize; // Size of next cabinet name and next disk label + uint32_t TotalFolderSize; // Size of all folder entries + uint32_t TotalFileSize; // Size of all file entries + uint32_t FolderUncompSize; // Uncompressed size of folder + uint32_t BytesLeftInBlock; // Number of bytes left in current block bool ReuseBlock; char DestPath[MAX_PATH]; char CabinetReservedFile[MAX_PATH]; void* CabinetReservedFileBuffer; - unsigned long CabinetReservedFileSize; + uint32_t CabinetReservedFileSize; FILEHANDLE FileHandle; bool FileOpen; CFHEADER CABHeader; - unsigned long CabinetReserved; - unsigned long FolderReserved; - unsigned long DataReserved; + uint32_t CabinetReserved; + uint32_t FolderReserved; + uint32_t DataReserved; PCFFOLDER_NODE FolderListHead; PCFFOLDER_NODE FolderListTail; PCFFOLDER_NODE CurrentFolderNode; @@ -444,32 +446,32 @@ PCFFILE_NODE FileListHead; PCFFILE_NODE FileListTail; CCABCodec *Codec; - unsigned long CodecId; + uint32_t CodecId; bool CodecSelected; void* InputBuffer; void* CurrentIBuffer; // Current offset in input buffer - unsigned long CurrentIBufferSize; // Bytes left in input buffer + uint32_t CurrentIBufferSize; // Bytes left in input buffer void* OutputBuffer; - unsigned long TotalCompSize; // Total size of current CFDATA block + uint32_t TotalCompSize; // Total size of current CFDATA block void* CurrentOBuffer; // Current offset in output buffer - unsigned long CurrentOBufferSize; // Bytes left in output buffer - unsigned long BytesLeftInCabinet; + uint32_t CurrentOBufferSize; // Bytes left in output buffer + uint32_t BytesLeftInCabinet; bool RestartSearch; - unsigned long LastFileOffset; // Uncompressed offset of last extracted file + uint32_t LastFileOffset; // Uncompressed offset of last extracted file #ifndef CAB_READ_ONLY - unsigned long LastBlockStart; // Uncompressed offset of last block in folder - unsigned long MaxDiskSize; - unsigned long DiskSize; - unsigned long PrevCabinetNumber; // Previous cabinet number (where split file starts) + uint32_t LastBlockStart; // Uncompressed offset of last block in folder + uint32_t MaxDiskSize; + uint32_t DiskSize; + uint32_t PrevCabinetNumber; // Previous cabinet number (where split file starts) bool CreateNewDisk; bool CreateNewFolder; CCFDATAStorage *ScratchFile; FILEHANDLE SourceFile; bool ContinueFile; - unsigned long TotalBytesLeft; + uint32_t TotalBytesLeft; bool BlockIsSplit; // true if current data block is split - unsigned long NextFolderNumber; // Zero based folder number + uint32_t NextFolderNumber; // Zero based folder number #endif /* CAB_READ_ONLY */ }; Modified: trunk/reactos/tools/cabman/cabman.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabman.h?rev=… ============================================================================== --- trunk/reactos/tools/cabman/cabman.h (original) +++ trunk/reactos/tools/cabman/cabman.h Sun May 27 14:26:43 2007 @@ -37,7 +37,7 @@ virtual void OnAdd(PCFFILE Entry, char* FileName); /* Configuration */ bool ProcessAll; - unsigned long Mode; + uint32_t Mode; bool PromptOnOverwrite; char Location[MAX_PATH]; char FileName[MAX_PATH]; Modified: trunk/reactos/tools/cabman/dfp.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.cxx?rev=2… ============================================================================== --- trunk/reactos/tools/cabman/dfp.cxx (original) +++ trunk/reactos/tools/cabman/dfp.cxx Sun May 27 14:26:43 2007 @@ -11,6 +11,7 @@ * CSH 21/03-2001 Created * CSH 15/08-2003 Made it portable * CF 04/05-2007 Reformatted the code to be more consistent and use TABs instead of spaces + * CF 04/05-2007 Made it compatible with 64-bit operating systems */ #include <stdlib.h> #include <stdio.h> @@ -20,31 +21,31 @@ #if defined(WIN32) #define GetSizeOfFile(handle) _GetSizeOfFile(handle) -static long _GetSizeOfFile(FILEHANDLE handle) -{ - unsigned long size = GetFileSize(handle, NULL); +static int32_t _GetSizeOfFile(FILEHANDLE handle) +{ + uint32_t size = GetFileSize(handle, NULL); if (size == INVALID_FILE_SIZE) return -1; return size; } #define ReadFileData(handle, buffer, size, bytesread) _ReadFileData(handle, buffer, size, bytesread) -static bool _ReadFileData(FILEHANDLE handle, void* buffer, unsigned long size, unsigned long* bytesread) -{ - return ReadFile(handle, buffer, size, bytesread, NULL); +static bool _ReadFileData(FILEHANDLE handle, void* buffer, uint32_t size, uint32_t* bytesread) +{ + return ReadFile(handle, buffer, size, (LPDWORD)bytesread, NULL); } #else #define GetSizeOfFile(handle) _GetSizeOfFile(handle) -static long _GetSizeOfFile(FILEHANDLE handle) -{ - long size; +static int32_t _GetSizeOfFile(FILEHANDLE handle) +{ + int32_t size; fseek(handle, 0, SEEK_END); size = ftell(handle); fseek(handle, 0, SEEK_SET); return size; } #define ReadFileData(handle, buffer, size, bytesread) _ReadFileData(handle, buffer, size, bytesread) -static bool _ReadFileData(FILEHANDLE handle, void* buffer, unsigned long size, unsigned long* bytesread) +static bool _ReadFileData(FILEHANDLE handle, void* buffer, uint32_t size, uint32_t* bytesread) { *bytesread = fread(buffer, 1, size, handle); return *bytesread == size; @@ -127,7 +128,7 @@ char eolbuf[2]; char* destpath; #if defined(WIN32) - unsigned long BytesWritten; + uint32_t BytesWritten; #endif if (DontGenerateInf) @@ -173,7 +174,7 @@ } #if defined(WIN32) - if (!WriteFile(InfFileHandle, InfLine, strlen(InfLine), &BytesWritten, NULL)) + if (!WriteFile(InfFileHandle, InfLine, (DWORD)strlen(InfLine), (LPDWORD)&BytesWritten, NULL)) { DPRINT(MID_TRACE, ("ERROR WRITING '%d'.\n", (unsigned int)GetLastError())); return; @@ -187,7 +188,7 @@ eolbuf[1] = 0x0a; #if defined(WIN32) - if (!WriteFile(InfFileHandle, eolbuf, sizeof(eolbuf), &BytesWritten, NULL)) + if (!WriteFile(InfFileHandle, eolbuf, sizeof(eolbuf), (LPDWORD)&BytesWritten, NULL)) { DPRINT(MID_TRACE, ("ERROR WRITING '%d'.\n", (unsigned int)GetLastError())); return; @@ -199,7 +200,7 @@ } -unsigned long CDFParser::Load(char* FileName) +uint32_t CDFParser::Load(char* FileName) /* * FUNCTION: Loads a directive file into memory * ARGUMENTS: @@ -208,8 +209,8 @@ * Status of operation */ { - unsigned long BytesRead; - long FileSize; + uint32_t BytesRead; + int32_t FileSize; if (FileLoaded) return CAB_STATUS_SUCCESS; @@ -238,7 +239,7 @@ return CAB_STATUS_CANNOT_OPEN; } - FileBufferSize = (unsigned long)FileSize; + FileBufferSize = (uint32_t)FileSize; FileBuffer = (char*)AllocateMemory(FileBufferSize); if (!FileBuffer) @@ -265,7 +266,7 @@ } -unsigned long CDFParser::Parse() +uint32_t CDFParser::Parse() /* * FUNCTION: Parses a loaded directive file * RETURNS: @@ -273,7 +274,7 @@ */ { bool Command; - unsigned long Status; + uint32_t Status; if (!FileLoaded) return CAB_STATUS_NOFILE; @@ -436,7 +437,7 @@ } -bool CDFParser::OnDiskLabel(unsigned long Number, char* Label) +bool CDFParser::OnDiskLabel(uint32_t Number, char* Label) /* * FUNCTION: Called when a disk needs a label * ARGUMENTS: @@ -469,7 +470,7 @@ { sprintf(Buffer, "%lu", Number); strcat(Label, Buffer); - j += strlen(Buffer); + j += (int)strlen(Buffer); } else { @@ -488,7 +489,7 @@ } -bool CDFParser::OnCabinetName(unsigned long Number, char* Name) +bool CDFParser::OnCabinetName(uint32_t Number, char* Name) /* * FUNCTION: Called when a cabinet needs a name * ARGUMENTS: @@ -517,7 +518,7 @@ if (CabinetNameTemplateSet) { strcpy(Name, GetDestinationPath()); - j = strlen(Name); + j = (int)strlen(Name); for (i = 0; i < strlen(CabinetNameTemplate); i++) { ch = CabinetNameTemplate[i]; @@ -525,7 +526,7 @@ { sprintf(Buffer, "%lu", Number); strcat(Name, Buffer); - j += strlen(Buffer); + j += (int)strlen(Buffer); } else { @@ -543,7 +544,7 @@ } -bool CDFParser::SetDiskName(PCABINET_NAME *List, unsigned long Number, char* String) +bool CDFParser::SetDiskName(PCABINET_NAME *List, uint32_t Number, char* String) /* * FUNCTION: Sets an entry in a list * ARGUMENTS: @@ -581,7 +582,7 @@ } -bool CDFParser::GetDiskName(PCABINET_NAME *List, unsigned long Number, char* String) +bool CDFParser::GetDiskName(PCABINET_NAME *List, uint32_t Number, char* String) /* * FUNCTION: Returns an entry in a list * ARGUMENTS: @@ -609,7 +610,7 @@ } -bool CDFParser::SetDiskNumber(PDISK_NUMBER *List, unsigned long Number, unsigned long Value) +bool CDFParser::SetDiskNumber(PDISK_NUMBER *List, uint32_t Number, uint32_t Value) /* * FUNCTION: Sets an entry in a list * ARGUMENTS: @@ -647,7 +648,7 @@ } -bool CDFParser::GetDiskNumber(PDISK_NUMBER *List, unsigned long Number, unsigned long* Value) +bool CDFParser::GetDiskNumber(PDISK_NUMBER *List, uint32_t Number, uint32_t* Value) /* * FUNCTION: Returns an entry in a list * ARGUMENTS: @@ -675,7 +676,7 @@ } -bool CDFParser::DoDiskLabel(unsigned long Number, char* Label) +bool CDFParser::DoDiskLabel(uint32_t Number, char* Label) /* * FUNCTION: Sets the label of a disk * ARGUMENTS: @@ -705,7 +706,7 @@ } -bool CDFParser::DoCabinetName(unsigned long Number, char* Name) +bool CDFParser::DoCabinetName(uint32_t Number, char* Name) /* * FUNCTION: Sets the name of a cabinet * ARGUMENTS: @@ -735,7 +736,7 @@ } -unsigned long CDFParser::DoMaxDiskSize(bool NumberValid, unsigned long Number) +uint32_t CDFParser::DoMaxDiskSize(bool NumberValid, uint32_t Number) /* * FUNCTION: Sets the maximum disk size * ARGUMENTS: @@ -747,7 +748,7 @@ * Standard sizes are 2.88M, 1.44M, 1.25M, 1.2M, 720K, 360K, and CDROM */ { - unsigned long A, B, Value; + uint32_t A, B, Value; if (IsNextToken(TokenInteger, true)) { @@ -852,14 +853,14 @@ InfFileNameSet = true; } -unsigned long CDFParser::SetupNewDisk() +uint32_t CDFParser::SetupNewDisk() /* * FUNCTION: Sets up parameters for a new disk * RETURNS: * Status of operation */ { - unsigned long Value; + uint32_t Value; if (!GetDiskNumber(&MaxDiskSize, GetCurrentDiskNumber(), &Value)) { @@ -874,7 +875,7 @@ } -unsigned long CDFParser::PerformSetCommand() +uint32_t CDFParser::PerformSetCommand() /* * FUNCTION: Performs a set variable command * RETURNS: @@ -883,7 +884,7 @@ { SETTYPE SetType; bool NumberValid = false; - unsigned long Number = 0; + uint32_t Number = 0; if (!IsNextToken(TokenIdentifier, true)) return CAB_STATUS_FAILURE; @@ -970,7 +971,7 @@ } -unsigned long CDFParser::PerformNewCommand() +uint32_t CDFParser::PerformNewCommand() /* * FUNCTION: Performs a new disk|cabinet|folder command * RETURNS: @@ -978,7 +979,7 @@ */ { NEWTYPE NewType; - unsigned long Status; + uint32_t Status; if (!IsNextToken(TokenIdentifier, true)) return CAB_STATUS_FAILURE; @@ -1053,7 +1054,7 @@ } -unsigned long CDFParser::PerformInfBeginCommand() +uint32_t CDFParser::PerformInfBeginCommand() /* * FUNCTION: Begins inf mode * RETURNS: @@ -1065,7 +1066,7 @@ } -unsigned long CDFParser::PerformInfEndCommand() +uint32_t CDFParser::PerformInfEndCommand() /* * FUNCTION: Begins inf mode * RETURNS: @@ -1077,7 +1078,7 @@ } -unsigned long CDFParser::PerformCommand() +uint32_t CDFParser::PerformCommand() /* * FUNCTION: Performs a command * RETURNS: @@ -1097,15 +1098,15 @@ } -unsigned long CDFParser::PerformFileCopy() +uint32_t CDFParser::PerformFileCopy() /* * FUNCTION: Performs a file copy * RETURNS: * Status of operation */ { - unsigned long Status; - unsigned long i, j; + uint32_t Status; + uint32_t i, j; char ch; char SrcName[MAX_PATH]; char DstName[MAX_PATH]; @@ -1137,7 +1138,7 @@ if (CurrentToken != TokenEnd) { - j = strlen(CurrentString); i = 0; + j = (uint32_t)strlen(CurrentString); i = 0; while ((CurrentChar + i < LineLength) && ((ch = Line[CurrentChar + i]) != ' ') && (ch != 0x09) && @@ -1157,7 +1158,7 @@ if (CurrentToken != TokenEnd) { - j = strlen(CurrentString); i = 0; + j = (uint32_t)strlen(CurrentString); i = 0; while ((CurrentChar + i < LineLength) && ((ch = Line[CurrentChar + i]) != ' ') && (ch != 0x09) && @@ -1273,7 +1274,7 @@ * true if there is a new line, false if not */ { - unsigned long i, j; + uint32_t i, j; char ch; if (CurrentOffset >= FileBufferSize) @@ -1310,7 +1311,7 @@ * FUNCTION: Reads the next token from the current line */ { - unsigned long i; + uint32_t i; char ch = ' '; if (CurrentChar >= LineLength) Modified: trunk/reactos/tools/cabman/dfp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.h?rev=269… ============================================================================== --- trunk/reactos/tools/cabman/dfp.h (original) +++ trunk/reactos/tools/cabman/dfp.h Sun May 27 14:26:43 2007 @@ -11,14 +11,14 @@ typedef struct _CABINET_NAME { struct _CABINET_NAME *Next; - unsigned long DiskNumber; + uint32_t DiskNumber; char Name[128]; } CABINET_NAME, *PCABINET_NAME; typedef struct _DISK_NUMBER { struct _DISK_NUMBER *Next; - unsigned long DiskNumber; - unsigned long Number; + uint32_t DiskNumber; + uint32_t Number; } DISK_NUMBER, *PDISK_NUMBER; typedef enum { @@ -58,35 +58,35 @@ public: CDFParser(); virtual ~CDFParser(); - unsigned long Load(char* FileName); - unsigned long Parse(); + uint32_t Load(char* FileName); + uint32_t Parse(); void SetFileRelativePath(char* Path); bool InfFileOnly; bool DontGenerateInf; char FileRelativePath[300]; private: /* Event handlers */ - virtual bool OnDiskLabel(unsigned long Number, char* Label); - virtual bool OnCabinetName(unsigned long Number, char* Name); + virtual bool OnDiskLabel(uint32_t Number, char* Label); + virtual bool OnCabinetName(uint32_t Number, char* Name); void WriteInfLine(char* InfLine); - bool SetDiskName(PCABINET_NAME *List, unsigned long Number, char* String); - bool GetDiskName(PCABINET_NAME *List, unsigned long Number, char* String); - bool SetDiskNumber(PDISK_NUMBER *List, unsigned long Number, unsigned long Value); - bool GetDiskNumber(PDISK_NUMBER *List, unsigned long Number, unsigned long* Value); - bool DoDiskLabel(unsigned long Number, char* Label); + bool SetDiskName(PCABINET_NAME *List, uint32_t Number, char* String); + bool GetDiskName(PCABINET_NAME *List, uint32_t Number, char* String); + bool SetDiskNumber(PDISK_NUMBER *List, uint32_t Number, uint32_t Value); + bool GetDiskNumber(PDISK_NUMBER *List, uint32_t Number, uint32_t* Value); + bool DoDiskLabel(uint32_t Number, char* Label); void DoDiskLabelTemplate(char* Template); - bool DoCabinetName(unsigned long Number, char* Name); + bool DoCabinetName(uint32_t Number, char* Name); void DoCabinetNameTemplate(char* Template); void DoInfFileName(char* InfFileName); - unsigned long DoMaxDiskSize(bool NumberValid, unsigned long Number); - unsigned long SetupNewDisk(); - unsigned long PerformSetCommand(); - unsigned long PerformNewCommand(); - unsigned long PerformInfBeginCommand(); - unsigned long PerformInfEndCommand(); - unsigned long PerformCommand(); - unsigned long PerformFileCopy(); + uint32_t DoMaxDiskSize(bool NumberValid, uint32_t Number); + uint32_t SetupNewDisk(); + uint32_t PerformSetCommand(); + uint32_t PerformNewCommand(); + uint32_t PerformInfBeginCommand(); + uint32_t PerformInfEndCommand(); + uint32_t PerformCommand(); + uint32_t PerformFileCopy(); void SkipSpaces(); bool IsNextToken(DFP_TOKEN Token, bool NoSpaces); bool ReadLine(); @@ -95,15 +95,15 @@ bool FileLoaded; FILEHANDLE FileHandle; char* FileBuffer; - unsigned long FileBufferSize; - unsigned long CurrentOffset; + uint32_t FileBufferSize; + uint32_t CurrentOffset; char Line[128]; - unsigned long LineLength; - unsigned long CurrentLine; - unsigned long CurrentChar; + uint32_t LineLength; + uint32_t CurrentLine; + uint32_t CurrentChar; /* Token */ DFP_TOKEN CurrentToken; - unsigned long CurrentInteger; + uint32_t CurrentInteger; char CurrentString[256]; /* State */ @@ -112,27 +112,27 @@ bool FolderCreated; /* Standard directive variable */ bool Cabinet; - unsigned long CabinetFileCountThreshold; + uint32_t CabinetFileCountThreshold; PCABINET_NAME CabinetName; bool CabinetNameTemplateSet; char CabinetNameTemplate[128]; bool InfFileNameSet; char InfFileName[256]; bool Compress; - unsigned long CompressionType; + uint32_t CompressionType; PCABINET_NAME DiskLabel; bool DiskLabelTemplateSet; char DiskLabelTemplate[128]; - unsigned long FolderFileCountThreshold; - unsigned long FolderSizeThreshold; - unsigned long MaxCabinetSize; - unsigned long MaxDiskFileCount; + uint32_t FolderFileCountThreshold; + uint32_t FolderSizeThreshold; + uint32_t MaxCabinetSize; + uint32_t MaxDiskFileCount; PDISK_NUMBER MaxDiskSize; bool MaxDiskSizeAllSet; - unsigned long MaxDiskSizeAll; - unsigned long ReservePerCabinetSize; - unsigned long ReservePerDataBlockSize; - unsigned long ReservePerFolderSize; + uint32_t MaxDiskSizeAll; + uint32_t ReservePerCabinetSize; + uint32_t ReservePerDataBlockSize; + uint32_t ReservePerFolderSize; char SourceDir[256]; FILEHANDLE InfFileHandle; bool InfModeEnabled; Modified: trunk/reactos/tools/cabman/main.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/main.cxx?rev=… ============================================================================== --- trunk/reactos/tools/cabman/main.cxx (original) +++ trunk/reactos/tools/cabman/main.cxx Sun May 27 14:26:43 2007 @@ -9,6 +9,7 @@ * CSH 21/03-2001 Created * CSH 15/08-2003 Made it portable * CF 04/05-2007 Reformatted the code to be more consistent and use TABs instead of spaces + * CF 04/05-2007 Made it compatible with 64-bit operating systems */ #include <stdlib.h> #include <stdarg.h> @@ -19,9 +20,9 @@ #ifdef DBG -unsigned long DebugTraceLevel = MIN_TRACE; -//unsigned long DebugTraceLevel = MID_TRACE; -//unsigned long DebugTraceLevel = MAX_TRACE; +uint32_t DebugTraceLevel = MIN_TRACE; +//uint32_t DebugTraceLevel = MID_TRACE; +//uint32_t DebugTraceLevel = MAX_TRACE; #endif /* DBG */ @@ -44,7 +45,7 @@ { unsigned int Len; - Len = strlen(Str); + Len = (uint32_t)strlen(Str); if (Len < Length) { @@ -55,7 +56,7 @@ } -char* Date2Str(char* Str, unsigned short Date) +char* Date2Str(char* Str, uint16_t Date) /* * FUNCTION: Converts a DOS style date to a string * ARGUMENTS: @@ -65,7 +66,7 @@ * Pointer to string */ { - unsigned long dw; + uint32_t dw; /* Month */ Str[0] = (char)('0' + ((Date & 0x01E0) >> 5) / 10); @@ -86,7 +87,7 @@ } -char* Time2Str(char* Str, unsigned short Time) +char* Time2Str(char* Str, uint16_t Time) /* * FUNCTION: Converts a DOS style time to a string * ARGUMENTS: @@ -97,8 +98,8 @@ */ { bool PM; - unsigned long Hour; - unsigned long dw; + uint32_t Hour; + uint32_t dw; Hour = ((Time & 0xF800) >> 11); PM = (Hour >= 12); @@ -126,7 +127,7 @@ } -char* Attr2Str(char* Str, unsigned short Attr) +char* Attr2Str(char* Str, uint16_t Attr) /* * FUNCTION: Converts attributes to a string * ARGUMENTS: @@ -364,7 +365,7 @@ * FUNCTION: Create cabinet */ { - unsigned long Status; + uint32_t Status; Status = Load((char*)&FileName); if (Status != CAB_STATUS_SUCCESS) @@ -384,7 +385,7 @@ * FUNCTION: Create cabinet */ { - unsigned long Status; + uint32_t Status; Status = NewCabinet(); if (Status != CAB_STATUS_SUCCESS) @@ -422,8 +423,8 @@ { CAB_SEARCH Search; char Str[20]; - unsigned long FileCount = 0; - unsigned long ByteCount = 0; + uint32_t FileCount = 0; + uint32_t ByteCount = 0; if (Open() == CAB_STATUS_SUCCESS) { @@ -485,7 +486,7 @@ */ { CAB_SEARCH Search; - unsigned long Status; + uint32_t Status; if (Open() == CAB_STATUS_SUCCESS) { Modified: trunk/reactos/tools/cabman/mszip.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/mszip.cxx?rev… ============================================================================== --- trunk/reactos/tools/cabman/mszip.cxx (original) +++ trunk/reactos/tools/cabman/mszip.cxx Sun May 27 14:26:43 2007 @@ -11,6 +11,7 @@ * CSH 21/03-2001 Created * CSH 15/08-2003 Made it portable * CF 04/05-2007 Reformatted the code to be more consistent and use TABs instead of spaces + * CF 04/05-2007 Made it compatible with 64-bit operating systems */ #include <stdio.h> #include "mszip.h" @@ -52,10 +53,10 @@ } -unsigned long CMSZipCodec::Compress(void* OutputBuffer, - void* InputBuffer, - unsigned long InputLength, - unsigned long* OutputLength) +uint32_t CMSZipCodec::Compress(void* OutputBuffer, + void* InputBuffer, + uint32_t InputLength, + uint32_t* OutputLength) /* * FUNCTION: Compresses data in a buffer * ARGUMENTS: @@ -65,16 +66,16 @@ * OutputLength = Address of buffer to place size of compressed data */ { - unsigned short* Magic; + uint16_t* Magic; DPRINT(MAX_TRACE, ("InputLength (%lu).\n", InputLength)); - Magic = (unsigned short*)OutputBuffer; + Magic = (uint16_t*)OutputBuffer; *Magic = MSZIP_MAGIC; ZStream.next_in = (unsigned char*)InputBuffer; ZStream.avail_in = InputLength; - ZStream.next_out = (unsigned char*)((unsigned long)OutputBuffer + 2); + ZStream.next_out = (unsigned char*)((uintptr_t)OutputBuffer + 2); ZStream.avail_out = CAB_BLOCKSIZE + 12; /* WindowBits is passed < 0 to tell that there is no zlib header */ @@ -112,10 +113,10 @@ } -unsigned long CMSZipCodec::Uncompress(void* OutputBuffer, - void* InputBuffer, - unsigned long InputLength, - unsigned long* OutputLength) +uint32_t CMSZipCodec::Uncompress(void* OutputBuffer, + void* InputBuffer, + uint32_t InputLength, + uint32_t* OutputLength) /* * FUNCTION: Uncompresses data in a buffer * ARGUMENTS: @@ -125,11 +126,11 @@ * OutputLength = Address of buffer to place size of uncompressed data */ { - unsigned short Magic; + uint16_t Magic; DPRINT(MAX_TRACE, ("InputLength (%lu).\n", InputLength)); - Magic = *((unsigned short*)InputBuffer); + Magic = *((uint16_t*)InputBuffer); if (Magic != MSZIP_MAGIC) { @@ -137,7 +138,7 @@ return CS_BADSTREAM; } - ZStream.next_in = (unsigned char*)((unsigned long)InputBuffer + 2); + ZStream.next_in = (unsigned char*)((uintptr_t)InputBuffer + 2); ZStream.avail_in = InputLength - 2; ZStream.next_out = (unsigned char*)OutputBuffer; ZStream.avail_out = CAB_BLOCKSIZE + 12; Modified: trunk/reactos/tools/cabman/mszip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/mszip.h?rev=2… ============================================================================== --- trunk/reactos/tools/cabman/mszip.h (original) +++ trunk/reactos/tools/cabman/mszip.h Sun May 27 14:26:43 2007 @@ -22,15 +22,15 @@ /* Default destructor */ virtual ~CMSZipCodec(); /* Compresses a data block */ - virtual unsigned long Compress(void* OutputBuffer, - void* InputBuffer, - unsigned long InputLength, - unsigned long* OutputLength); + virtual uint32_t Compress(void* OutputBuffer, + void* InputBuffer, + uint32_t InputLength, + uint32_t* OutputLength); /* Uncompresses a data block */ - virtual unsigned long Uncompress(void* OutputBuffer, - void* InputBuffer, - unsigned long InputLength, - unsigned long* OutputLength); + virtual uint32_t Uncompress(void* OutputBuffer, + void* InputBuffer, + uint32_t InputLength, + uint32_t* OutputLength); private: int Status; z_stream ZStream; /* Zlib stream */ Modified: trunk/reactos/tools/cabman/raw.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/raw.cxx?rev=2… ============================================================================== --- trunk/reactos/tools/cabman/raw.cxx (original) +++ trunk/reactos/tools/cabman/raw.cxx Sun May 27 14:26:43 2007 @@ -9,6 +9,7 @@ * CSH 21/03-2001 Created * CSH 15/08-2003 Made it portable * CF 04/05-2007 Reformatted the code to be more consistent and use TABs instead of spaces + * CF 04/05-2007 Made it compatible with 64-bit operating systems */ #include "raw.h" @@ -31,10 +32,10 @@ } -unsigned long CRawCodec::Compress(void* OutputBuffer, - void* InputBuffer, - unsigned long InputLength, - unsigned long* OutputLength) +uint32_t CRawCodec::Compress(void* OutputBuffer, + void* InputBuffer, + uint32_t InputLength, + uint32_t* OutputLength) /* * FUNCTION: Compresses data in a buffer * ARGUMENTS: @@ -49,10 +50,10 @@ return CS_SUCCESS; } -unsigned long CRawCodec::Uncompress(void* OutputBuffer, - void* InputBuffer, - unsigned long InputLength, - unsigned long* OutputLength) +uint32_t CRawCodec::Uncompress(void* OutputBuffer, + void* InputBuffer, + uint32_t InputLength, + uint32_t* OutputLength) /* * FUNCTION: Uncompresses data in a buffer * ARGUMENTS: Modified: trunk/reactos/tools/cabman/raw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/raw.h?rev=269… ============================================================================== --- trunk/reactos/tools/cabman/raw.h (original) +++ trunk/reactos/tools/cabman/raw.h Sun May 27 14:26:43 2007 @@ -19,15 +19,15 @@ /* Default destructor */ virtual ~CRawCodec(); /* Compresses a data block */ - virtual unsigned long Compress(void* OutputBuffer, - void* InputBuffer, - unsigned long InputLength, - unsigned long* OutputLength); + virtual uint32_t Compress(void* OutputBuffer, + void* InputBuffer, + uint32_t InputLength, + uint32_t* OutputLength); /* Uncompresses a data block */ - virtual unsigned long Uncompress(void* OutputBuffer, - void* InputBuffer, - unsigned long InputLength, - unsigned long* OutputLength); + virtual uint32_t Uncompress(void* OutputBuffer, + void* InputBuffer, + uint32_t InputLength, + uint32_t* OutputLength); }; #endif /* __RAW_H */

1 0

[cwittich] 26911: added an empty intrin_x86_64.h
by cwittich＠svn.reactos.org 27 May '07

27 May '07

Author: cwittich Date: Sun May 27 14:12:19 2007 New Revision: 26911 URL: http://svn.reactos.org/svn/reactos?rev=26911&view=rev Log: added an empty intrin_x86_64.h Added: trunk/reactos/include/psdk/intrin_x86_64.h Modified: trunk/reactos/include/psdk/intrin.h Modified: trunk/reactos/include/psdk/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/intrin.h (original) +++ trunk/reactos/include/psdk/intrin.h Sun May 27 14:12:19 2007 @@ -75,8 +75,10 @@ #include "intrin_ppc.h" #elif defined(_MIPS_) #include "intrin_mips.h" +#elif defined(__x86_64__) +/* TODO: the x64 architecture shares most of the i386 intrinsics. It should be easy to support */ +#include "intrin_x86_64.h" #else -/* TODO: the x64 architecture shares most of the i386 intrinsics. It should be easy to support */ #error Unsupported architecture #endif Added: trunk/reactos/include/psdk/intrin_x86_64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_x86_64… ============================================================================== --- trunk/reactos/include/psdk/intrin_x86_64.h (added) +++ trunk/reactos/include/psdk/intrin_x86_64.h Sun May 27 14:12:19 2007 @@ -1,0 +1,1 @@ +

1 0

[frik85] 26910: ReactOS Translation Service: I had worked on the ReactOS Translation Service (codename "ROST") in winter 2006/2007. It is almost ready, only one important part is missing, the user interface. I decided to improve RosCMS to version 3, which comes now with an new user interface that speed up the whole work-flow a lot. The plan is to use RosCMS v3 as flexible base for the translation service user interface. As RosCMS v3 is very flexible, both the interface and the database layout, i
by frik85＠svn.reactos.org 27 May '07

27 May '07

1 0

[frik85] 26909: RosCMS update (RosCMS v2 and v3): I have been a bit lazy with commits to svn repo. A lot of things have happened, in the last few months. First of all, this commit brings RosCMS to a new level. It contains the latest RosCMS v2 version (stable) plus the latest RosCMS v3 code (testing). RosCMS v2 and v3 share several base scripts and can be used side-by-side. Although, version 3 introduces a new database layout. There are database convert script(s) from v2 to v3, but not the other
by frik85＠svn.reactos.org 27 May '07

27 May '07

1 0

[greatlrd] 26908: add correct mediaoobj.idl compatible with ms dxsdk 2004 dec add medoaram.idl compatible with ms dxsdk 2004 dec
by greatlrd＠svn.reactos.org 27 May '07

27 May '07

Author: greatlrd Date: Sun May 27 13:34:59 2007 New Revision: 26908 URL: http://svn.reactos.org/svn/reactos?rev=26908&view=rev Log: add correct mediaoobj.idl compatible with ms dxsdk 2004 dec add medoaram.idl compatible with ms dxsdk 2004 dec Added: trunk/reactos/include/dxsdk/mediaobj.idl (with props) trunk/reactos/include/dxsdk/medparam.idl (with props) Removed: trunk/reactos/include/psdk/mediaobj.h trunk/reactos/include/psdk/mediaobj.idl Modified: trunk/reactos/include/dxsdk/ (props changed) trunk/reactos/include/dxsdk/dxsdk.rbuild Propchange: trunk/reactos/include/dxsdk/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun May 27 13:34:59 2007 @@ -5,3 +5,5 @@ mixerocx.h vidcap.h Videoacc.h +mediaobj.h +medparam.h Modified: trunk/reactos/include/dxsdk/dxsdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxsdk.rbuild… ============================================================================== --- trunk/reactos/include/dxsdk/dxsdk.rbuild (original) +++ trunk/reactos/include/dxsdk/dxsdk.rbuild Sun May 27 13:34:59 2007 @@ -3,6 +3,8 @@ <file>amstream.idl</file> <file>ddstream.idl</file> <file>mixerocx.idl</file> + <file>mediaobj.idl</file> + <file>medparam.idl</file> <file>mmstream.idl</file> <file>vidcap.idl</file> <file>Videoacc.idl</file> Added: trunk/reactos/include/dxsdk/mediaobj.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/mediaobj.idl… ============================================================================== --- trunk/reactos/include/dxsdk/mediaobj.idl (added) +++ trunk/reactos/include/dxsdk/mediaobj.idl Sun May 27 13:34:59 2007 @@ -1,0 +1,189 @@ + +import "unknwn.idl"; +import "objidl.idl"; + + +cpp_quote("#ifdef __strmif_h__") +cpp_quote("typedef AM_MEDIA_TYPE DMO_MEDIA_TYPE;") +cpp_quote("#else") +typedef struct _DMOMediaType +{ + GUID majortype; + GUID subtype; + BOOL bFixedSizeSamples; + BOOL bTemporalCompression; + ULONG lSampleSize; + GUID formattype; + IUnknown *pUnk; + ULONG cbFormat; + [size_is(cbFormat)] BYTE * pbFormat; +} DMO_MEDIA_TYPE; +typedef LONGLONG REFERENCE_TIME; +cpp_quote("#endif") + + + +enum _DMO_INPUT_DATA_BUFFER_FLAGS +{ + DMO_INPUT_DATA_BUFFERF_SYNCPOINT = 0x00000001, + DMO_INPUT_DATA_BUFFERF_TIME = 0x00000002, + DMO_INPUT_DATA_BUFFERF_TIMELENGTH = 0x00000004 +}; + +enum _DMO_OUTPUT_DATA_BUFFER_FLAGS +{ + DMO_OUTPUT_DATA_BUFFERF_SYNCPOINT = 0x00000001, + DMO_OUTPUT_DATA_BUFFERF_TIME = 0x00000002, + DMO_OUTPUT_DATA_BUFFERF_TIMELENGTH = 0x00000004, + DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE = 0x01000000 +}; + +enum _DMO_INPUT_STATUS_FLAGS +{ + DMO_INPUT_STATUSF_ACCEPT_DATA = 0x00000001 +}; + +enum _DMO_INPUT_STREAM_INFO_FLAGS +{ + DMO_INPUT_STREAMF_WHOLE_SAMPLES = 0x00000001, + DMO_INPUT_STREAMF_SINGLE_SAMPLE_PER_BUFFER = 0x00000002, + DMO_INPUT_STREAMF_FIXED_SAMPLE_SIZE = 0x00000004, + DMO_INPUT_STREAMF_HOLDS_BUFFERS = 0x00000008 +}; + +enum _DMO_OUTPUT_STREAM_INFO_FLAGS +{ + DMO_OUTPUT_STREAMF_WHOLE_SAMPLES = 0x00000001, + DMO_OUTPUT_STREAMF_SINGLE_SAMPLE_PER_BUFFER = 0x00000002, + DMO_OUTPUT_STREAMF_FIXED_SAMPLE_SIZE = 0x00000004, + DMO_OUTPUT_STREAMF_DISCARDABLE = 0x00000008, + DMO_OUTPUT_STREAMF_OPTIONAL = 0x00000010 +}; + +enum _DMO_SET_TYPE_FLAGS +{ + DMO_SET_TYPEF_TEST_ONLY = 0x00000001, + DMO_SET_TYPEF_CLEAR = 0x00000002 +}; + +enum _DMO_PROCESS_OUTPUT_FLAGS +{ + DMO_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER = 0x00000001 +}; + +enum _DMO_INPLACE_PROCESS_FLAGS +{ + DMO_INPLACE_NORMAL = 0x00000000, + DMO_INPLACE_ZERO = 0x00000001 +}; + +enum _DMO_QUALITY_STATUS_FLAGS +{ + DMO_QUALITY_STATUS_ENABLED = 0x00000001 +}; + +enum _DMO_VIDEO_OUTPUT_STREAM_FLAGS +{ + DMO_VOSF_NEEDS_PREVIOUS_SAMPLE = 0x00000001 +}; + + +[ + object, + uuid(59eff8b9-938c-4a26-82f2-95cb84cdc837) +] +interface IMediaBuffer : IUnknown +{ + HRESULT SetLength(DWORD cbLength); + HRESULT GetMaxLength([out] DWORD *pcbMaxLength); + HRESULT GetBufferAndLength([out] BYTE **ppBuffer, [out] DWORD *pcbLength); +} + + +typedef struct _DMO_OUTPUT_DATA_BUFFER +{ + IMediaBuffer *pBuffer; + DWORD dwStatus; + REFERENCE_TIME rtTimestamp; + REFERENCE_TIME rtTimelength; +} DMO_OUTPUT_DATA_BUFFER, *PDMO_OUTPUT_DATA_BUFFER; + + +[ + object, + uuid(d8ad0f58-5494-4102-97c5-ec798e59bcf4) +] +interface IMediaObject : IUnknown +{ + HRESULT GetStreamCount([out] DWORD *pcInputStreams, [out] DWORD *pcOutputStreams); + HRESULT GetInputStreamInfo(DWORD dwInputStreamIndex, [out] DWORD *pdwFlags); + HRESULT GetOutputStreamInfo(DWORD dwOutputStreamIndex, [out] DWORD *pdwFlags); + HRESULT GetInputType(DWORD dwInputStreamIndex, DWORD dwTypeIndex, [out] DMO_MEDIA_TYPE *pmt); + HRESULT GetOutputType(DWORD dwOutputStreamIndex, DWORD dwTypeIndex, [out] DMO_MEDIA_TYPE *pmt); + HRESULT SetInputType(DWORD dwInputStreamIndex, [in] const DMO_MEDIA_TYPE *pmt, DWORD dwFlags); + HRESULT SetOutputType(DWORD dwOutputStreamIndex, [in] const DMO_MEDIA_TYPE *pmt, DWORD dwFlags); + HRESULT GetInputCurrentType(DWORD dwInputStreamIndex, [out] DMO_MEDIA_TYPE *pmt); + HRESULT GetOutputCurrentType(DWORD dwOutputStreamIndex, [out] DMO_MEDIA_TYPE *pmt); + HRESULT GetInputSizeInfo(DWORD dwInputStreamIndex, [out] DWORD *pcbSize, [out] DWORD *pcbMaxLookahead, [out] DWORD *pcbAlignment); + HRESULT GetOutputSizeInfo(DWORD dwOutputStreamIndex, [out] DWORD *pcbSize, [out] DWORD *pcbAlignment); + HRESULT GetInputMaxLatency(DWORD dwInputStreamIndex, [out] REFERENCE_TIME *prtMaxLatency); + HRESULT SetInputMaxLatency(DWORD dwInputStreamIndex, REFERENCE_TIME rtMaxLatency); + HRESULT Flush(); + HRESULT Discontinuity(DWORD dwInputStreamIndex); + HRESULT AllocateStreamingResources(); + HRESULT FreeStreamingResources(); + HRESULT GetInputStatus(DWORD dwInputStreamIndex, [out] DWORD *dwFlags); + HRESULT ProcessInput(DWORD dwInputStreamIndex, IMediaBuffer *pBuffer, DWORD dwFlags, REFERENCE_TIME rtTimestamp, REFERENCE_TIME rtTimelength); + HRESULT ProcessOutput(DWORD dwFlags,DWORD cOutputBufferCount, [in,out,size_is(cOutputBufferCount)] + DMO_OUTPUT_DATA_BUFFER *pOutputBuffers, [out] DWORD *pdwStatus); + HRESULT Lock(LONG bLock); +}; + + +[ +object, +uuid(2c3cd98a-2bfa-4a53-9c27-5249ba64ba0f) +] +interface IEnumDMO : IUnknown +{ + HRESULT Next(DWORD cItemsToFetch, [out, size_is(cItemsToFetch), length_is(*pcItemsFetched)] CLSID *pCLSID, [out, size_is(cItemsToFetch), length_is(*pcItemsFetched), string] WCHAR **Names, [out] DWORD *pcItemsFetched); + HRESULT Skip(DWORD cItemsToSkip); + HRESULT Reset(void); + HRESULT Clone([out] IEnumDMO **ppEnum); +} + +[ +object, +uuid(651b9ad0-0fc7-4aa9-9538-d89931010741) +] +interface IMediaObjectInPlace : IUnknown +{ + HRESULT Process([in] ULONG ulSize, [in,out,size_is(ulSize)] BYTE* pData, [in] REFERENCE_TIME refTimeStart, [in] DWORD dwFlags); + HRESULT Clone([out] IMediaObjectInPlace **ppMediaObject); + HRESULT GetLatency([out] REFERENCE_TIME *pLatencyTime); +} + +[ +object, +uuid(65abea96-cf36-453f-af8a-705e98f16260) +] +interface IDMOQualityControl : IUnknown +{ + HRESULT SetNow([in] REFERENCE_TIME rtNow); + HRESULT SetStatus([in] DWORD dwFlags); + HRESULT GetStatus([out] DWORD *pdwFlags); +} + +[ +object, +uuid(be8f4f4e-5b16-4d29-b350-7f6b5d9298ac) +] +interface IDMOVideoOutputOptimizations : IUnknown +{ + HRESULT QueryOperationModePreferences (ULONG ulOutputStreamIndex, DWORD *pdwRequestedCapabilities); + HRESULT SetOperationMode (ULONG ulOutputStreamIndex, DWORD dwEnabledFeatures); + HRESULT GetCurrentOperationMode (ULONG ulOutputStreamIndex, DWORD *pdwEnabledFeatures); + HRESULT GetCurrentSampleRequirements (ULONG ulOutputStreamIndex, DWORD *pdwRequestedFeatures + ); +} + Propchange: trunk/reactos/include/dxsdk/mediaobj.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/medparam.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/medparam.idl… ============================================================================== --- trunk/reactos/include/dxsdk/medparam.idl (added) +++ trunk/reactos/include/dxsdk/medparam.idl Sun May 27 13:34:59 2007 @@ -1,0 +1,107 @@ + + +import "oaidl.idl"; +import "ocidl.idl"; +import "strmif.idl"; + + +typedef float MP_DATA; + +typedef enum _MP_Type +{ + MPT_INT, + MPT_FLOAT, + MPT_BOOL, + MPT_ENUM, + MPT_MAX, +} MP_TYPE; + +cpp_quote("const MP_DATA MPBOOL_TRUE = 1.0;") +cpp_quote("const MP_DATA MPBOOL_FALSE = 0.0;") + + +typedef enum _MP_CURVE_TYPE +{ + MP_CURVE_JUMP = 0x0001, + MP_CURVE_LINEAR = 0x0002, + MP_CURVE_SQUARE = 0x0004, + MP_CURVE_INVSQUARE = 0x0008, + MP_CURVE_SINE = 0x0010, +} MP_CURVE_TYPE; + + +typedef DWORD MP_CAPS; +const MP_CAPS MP_CAPS_CURVE_JUMP = MP_CURVE_JUMP; +const MP_CAPS MP_CAPS_CURVE_LINEAR = MP_CURVE_LINEAR; +const MP_CAPS MP_CAPS_CURVE_SQUARE = MP_CURVE_SQUARE; +const MP_CAPS MP_CAPS_CURVE_INVSQUARE = MP_CURVE_INVSQUARE; +const MP_CAPS MP_CAPS_CURVE_SINE = MP_CURVE_SINE; + +typedef struct _MP_PARAMINFO +{ + MP_TYPE mpType; + MP_CAPS mopCaps; + MP_DATA mpdMinValue; + MP_DATA mpdMaxValue; + MP_DATA mpdNeutralValue; + WCHAR szUnitText[32]; + WCHAR szLabel[32]; +} MP_PARAMINFO; + +typedef DWORD DWORD; +const DWORD DWORD_ALLPARAMS = -1; +typedef DWORD MP_TIMEDATA; + +cpp_quote("DEFINE_GUID(GUID_TIME_REFERENCE, 0x93ad712b, 0xdaa0, 0x4ffe, 0xbc, 0x81, 0xb0, 0xce, 0x50, 0x0f, 0xcd, 0xd9);") +cpp_quote("DEFINE_GUID(GUID_TIME_MUSIC, 0x0574c49d, 0x5b04, 0x4b15, 0xa5, 0x42, 0xae, 0x28, 0x20, 0x30, 0x11, 0x7b);") +cpp_quote("DEFINE_GUID(GUID_TIME_SAMPLES, 0xa8593d05, 0x0c43, 0x4984, 0x9a, 0x63, 0x97, 0xaf, 0x9e, 0x02, 0xc4, 0xc0);") + +typedef DWORD MP_FLAGS; +const MP_FLAGS MPF_ENVLP_STANDARD = 0x0000; +const MP_FLAGS MPF_ENVLP_BEGIN_CURRENTVAL = 0x0001; +const MP_FLAGS MPF_ENVLP_BEGIN_NEUTRALVAL = 0x0002; + +typedef struct _MP_ENVELOPE_SEGMENT +{ + REFERENCE_TIME rtStart; + REFERENCE_TIME rtEnd; + MP_DATA valStart; + MP_DATA valEnd; + MP_CURVE_TYPE iCurve; + MP_FLAGS flags; +} MP_ENVELOPE_SEGMENT; + + +const MP_FLAGS MPF_PUNCHIN_REFTIME = 0; +const MP_FLAGS MPF_PUNCHIN_NOW = 0x0001; +const MP_FLAGS MPF_PUNCHIN_STOPPED = 0x0002; + +[ +object, +uuid(6d6cbb60-a223-44aa-842f-a2f06750be6d), +version(1.0) +] +interface IMediaParamInfo : IUnknown +{ + HRESULT GetParamCount ([out] DWORD * pdwParams); + HRESULT GetParamInfo ([in] DWORD dwParamIndex, [out] MP_PARAMINFO * pInfo); + HRESULT GetParamText ([in] DWORD dwParamIndex, [out] WCHAR **ppwchText); + HRESULT GetNumTimeFormats ([out] DWORD * pdwNumTimeFormats); + HRESULT GetSupportedTimeFormat([in] DWORD dwFormatIndex, [out] GUID *pguidTimeFormat); + HRESULT GetCurrentTimeFormat ([out] GUID *pguidTimeFormat, [out] MP_TIMEDATA *pTimeData); +} + +[ +object, +uuid(6d6cbb61-a223-44aa-842f-a2f06750be6e), +version(1.0) +] +interface IMediaParams : IUnknown +{ + HRESULT GetParam ([in] DWORD dwParamIndex, [out] MP_DATA *pValue); + HRESULT SetParam ([in] DWORD dwParamIndex, [in] MP_DATA value); + HRESULT AddEnvelope ([in] DWORD dwParamIndex, [in] DWORD cSegments, [in] MP_ENVELOPE_SEGMENT * pEnvelopeSegments); + HRESULT FlushEnvelope ([in] DWORD dwParamIndex, [in] REFERENCE_TIME refTimeStart, [in] REFERENCE_TIME refTimeEnd); + HRESULT SetTimeFormat ([in] GUID guidTimeFormat, [in] MP_TIMEDATA mpTimeData); +} + Propchange: trunk/reactos/include/dxsdk/medparam.idl ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/reactos/include/psdk/mediaobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mediaobj.h?re… ============================================================================== --- trunk/reactos/include/psdk/mediaobj.h (original) +++ trunk/reactos/include/psdk/mediaobj.h (removed) @@ -1,172 +1,0 @@ -/*** Autogenerated by WIDL 0.3.0 from include\psdk\mediaobj.idl - Do not edit ***/ -#include <rpc.h> -#include <rpcndr.h> - -#ifndef __WIDL_INCLUDE_PSDK_MEDIAOBJ_H -#define __WIDL_INCLUDE_PSDK_MEDIAOBJ_H -#ifdef __cplusplus -extern "C" { -#endif -#if !defined(COM_NO_WINDOWS_H) && !defined(__WINESRC__) -#include <windows.h> -#include <ole2.h> -#endif -#include <unknwn.h> -#include <objidl.h> -#ifndef __IDMOQualityControl_FWD_DEFINED__ -#define __IDMOQualityControl_FWD_DEFINED__ -typedef interface IDMOQualityControl IDMOQualityControl; -#endif - -#ifndef __IDMOVideoOutputOptimizations_FWD_DEFINED__ -#define __IDMOVideoOutputOptimizations_FWD_DEFINED__ -typedef interface IDMOVideoOutputOptimizations IDMOVideoOutputOptimizations; -#endif - -#ifndef __IMediaBuffer_FWD_DEFINED__ -#define __IMediaBuffer_FWD_DEFINED__ -typedef interface IMediaBuffer IMediaBuffer; -#endif - -#ifndef __IMediaObject_FWD_DEFINED__ -#define __IMediaObject_FWD_DEFINED__ -typedef interface IMediaObject IMediaObject; -#endif - -#ifndef __IMediaObjectInPlace_FWD_DEFINED__ -#define __IMediaObjectInPlace_FWD_DEFINED__ -typedef interface IMediaObjectInPlace IMediaObjectInPlace; -#endif - -typedef struct _DMOMediaType { - GUID majortype; - GUID subtype; - BOOL bFixedSizeSamples; - BOOL bTemporalCompression; - ULONG lSampleSize; - GUID formattype; - IUnknown *pUnk; - ULONG cbFormat; - BYTE *pbFormat; -} DMO_MEDIA_TYPE; -#ifndef __IEnumDMO_FWD_DEFINED__ -#define __IEnumDMO_FWD_DEFINED__ -typedef interface IEnumDMO IEnumDMO; -#endif - -/***************************************************************************** - * IEnumDMO interface - */ -#ifndef __IEnumDMO_INTERFACE_DEFINED__ -#define __IEnumDMO_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IEnumDMO, 0x2c3cd98a, 0x2bfa, 0x4a53, 0x9c,0x27, 0x52,0x49,0xba,0x64,0xba,0x0f); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IEnumDMO : public IUnknown -{ - virtual HRESULT STDMETHODCALLTYPE Next( - DWORD cItemsToFetch, - CLSID* pCLSID, - WCHAR** Names, - DWORD* pcItemsFetched) = 0; - - virtual HRESULT STDMETHODCALLTYPE Skip( - DWORD cItemsToSkip) = 0; - - virtual HRESULT STDMETHODCALLTYPE Reset( - ) = 0; - - virtual HRESULT STDMETHODCALLTYPE Clone( - IEnumDMO** ppEnum) = 0; - -}; -#else -typedef struct IEnumDMOVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IEnumDMO* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IEnumDMO* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IEnumDMO* This); - - /*** IEnumDMO methods ***/ - HRESULT (STDMETHODCALLTYPE *Next)( - IEnumDMO* This, - DWORD cItemsToFetch, - CLSID* pCLSID, - WCHAR** Names, - DWORD* pcItemsFetched); - - HRESULT (STDMETHODCALLTYPE *Skip)( - IEnumDMO* This, - DWORD cItemsToSkip); - - HRESULT (STDMETHODCALLTYPE *Reset)( - IEnumDMO* This); - - HRESULT (STDMETHODCALLTYPE *Clone)( - IEnumDMO* This, - IEnumDMO** ppEnum); - - END_INTERFACE -} IEnumDMOVtbl; -interface IEnumDMO { - const IEnumDMOVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IEnumDMO_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IEnumDMO_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IEnumDMO_Release(p) (p)->lpVtbl->Release(p) -/*** IEnumDMO methods ***/ -#define IEnumDMO_Next(p,a,b,c,d) (p)->lpVtbl->Next(p,a,b,c,d) -#define IEnumDMO_Skip(p,a) (p)->lpVtbl->Skip(p,a) -#define IEnumDMO_Reset(p) (p)->lpVtbl->Reset(p) -#define IEnumDMO_Clone(p,a) (p)->lpVtbl->Clone(p,a) -#endif - -#endif - -HRESULT CALLBACK IEnumDMO_Skip_Proxy( - IEnumDMO* This, - DWORD cItemsToSkip); -void __RPC_STUB IEnumDMO_Skip_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IEnumDMO_Reset_Proxy( - IEnumDMO* This); -void __RPC_STUB IEnumDMO_Reset_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IEnumDMO_Clone_Proxy( - IEnumDMO* This, - IEnumDMO** ppEnum); -void __RPC_STUB IEnumDMO_Clone_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IEnumDMO_INTERFACE_DEFINED__ */ - -/* Begin additional prototypes for all interfaces */ - - -/* End additional prototypes */ - -#ifdef __cplusplus -} -#endif -#endif /* __WIDL_INCLUDE_PSDK_MEDIAOBJ_H */ Removed: trunk/reactos/include/psdk/mediaobj.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mediaobj.idl?… ============================================================================== --- trunk/reactos/include/psdk/mediaobj.idl (original) +++ trunk/reactos/include/psdk/mediaobj.idl (removed) @@ -1,74 +1,0 @@ -/* - * Copyright (C) 2002 Alexandre Julliard - * Copyright (C) 2004 Vincent Béron - * - * 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 - */ - -cpp_quote("#if !defined(COM_NO_WINDOWS_H) && !defined(__WINESRC__)") -cpp_quote("#include <windows.h>") -cpp_quote("#include <ole2.h>") -cpp_quote("#endif") - -import "unknwn.idl"; -import "objidl.idl"; - -interface IDMOQualityControl; -interface IDMOVideoOutputOptimizations; -interface IMediaBuffer; -interface IMediaObject; -interface IMediaObjectInPlace; - -typedef struct _DMOMediaType -{ - GUID majortype; - GUID subtype; - BOOL bFixedSizeSamples; - BOOL bTemporalCompression; - ULONG lSampleSize; - GUID formattype; - IUnknown *pUnk; - ULONG cbFormat; - BYTE *pbFormat; -} DMO_MEDIA_TYPE; - -/***************************************************************************** - * IEnumDMO interface - */ -[ - object, - uuid(2C3CD98A-2BFA-4A53-9C27-5249BA64BA0F), - pointer_default(unique) -] -interface IEnumDMO : IUnknown -{ - [local] - HRESULT Next( - [in] DWORD cItemsToFetch, - [out] CLSID *pCLSID, - [out] WCHAR **Names, - [out] DWORD *pcItemsFetched - ); - - HRESULT Skip( - [in] DWORD cItemsToSkip - ); - - HRESULT Reset(); - - HRESULT Clone( - [out] IEnumDMO **ppEnum - ); -}

1 0

[ekohl] 26907: Calculate L2 cache size for AMD CPUs.
by ekohl＠svn.reactos.org 26 May '07

26 May '07

Author: ekohl Date: Sat May 26 20:37:11 2007 New Revision: 26907 URL: http://svn.reactos.org/svn/reactos?rev=26907&view=rev Log: Calculate L2 cache size for AMD CPUs. Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c Sat May 26 20:37:11 2007 @@ -510,13 +510,21 @@ } } while (--CacheRequests); } - break; - - case CPU_AMD: - - /* FIXME */ - DPRINT1("Not handling AMD caches yet\n"); - break; + break; + + case CPU_AMD: + + /* Check if we support CPUID 0x80000006 */ + CPUID(Data, 0x80000000); + if (Data[0] >= 6) + { + /* Get 2nd level cache and tlb size */ + CPUID(Data, 0x80000006); + + /* Set the L2 Cache Size */ + Pcr->SecondLevelCacheSize = (Data[2] & 0xFFFF0000) >> 6; + } + break; } }

1 0

[greatlrd] 26906: adding mixerocx.idl, vidcap.idl, videoacc.idl compatible with ms dxsdk 2004 dec
by greatlrd＠svn.reactos.org 26 May '07

26 May '07

Author: greatlrd Date: Sat May 26 20:16:01 2007 New Revision: 26906 URL: http://svn.reactos.org/svn/reactos?rev=26906&view=rev Log: adding mixerocx.idl, vidcap.idl, videoacc.idl compatible with ms dxsdk 2004 dec Added: trunk/reactos/include/dxsdk/Videoacc.idl (with props) trunk/reactos/include/dxsdk/mixerocx.idl (with props) trunk/reactos/include/dxsdk/vidcap.idl (with props) Modified: trunk/reactos/include/dxsdk/ (props changed) trunk/reactos/include/dxsdk/dxsdk.rbuild Propchange: trunk/reactos/include/dxsdk/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sat May 26 20:16:01 2007 @@ -2,3 +2,6 @@ mmstream.h ddstream.h amstream.h +mixerocx.h +vidcap.h +Videoacc.h Added: trunk/reactos/include/dxsdk/Videoacc.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/Videoacc.idl… ============================================================================== --- trunk/reactos/include/dxsdk/Videoacc.idl (added) +++ trunk/reactos/include/dxsdk/Videoacc.idl Sat May 26 20:16:01 2007 @@ -1,0 +1,58 @@ +import "unknwn.idl"; + +cpp_quote("#if 0") + +typedef void* LPVOID; +typedef void* LPGUID; +typedef void* LPDIRECTDRAWSURFACE; +typedef void* LPDDPIXELFORMAT; +typedef void* LPAMVAInternalMemInfo; +typedef void AMVAUncompDataInfo; +typedef void* LPAMVACompBufferInfo; +typedef void AMVABUFFERINFO; +typedef void AMVAEndFrameInfo; +typedef void* LPAMVAUncompBufferInfo; +typedef void AMVABeginFrameInfo; +typedef IUnknown* IMediaSample; +cpp_quote("#endif") + +cpp_quote("#include <ddraw.h>") +cpp_quote("#include <amva.h>") + + +[ + local, + object, + uuid(256A6A22-FBAD-11d1-82BF-00A0C9696C8F), + pointer_default(unique) +] + +interface IAMVideoAccelerator : IUnknown +{ + HRESULT GetVideoAcceleratorGUIDs([in] [out] LPDWORD pdwNumGuidsSupported, [in] [out] LPGUID pGuidsSupported); + HRESULT GetUncompFormatsSupported( [in] const GUID *pGuid, [in] [out] LPDWORD pdwNumFormatsSupported, [in] [out] LPDDPIXELFORMAT pFormatsSupported); + HRESULT GetInternalMemInfo([in] const GUID *pGuid, [in] const AMVAUncompDataInfo *pamvaUncompDataInfo, [in] [out] LPAMVAInternalMemInfo pamvaInternalMemInfo); + HRESULT GetCompBufferInfo([in] const GUID *pGuid, [in] const AMVAUncompDataInfo *pamvaUncompDataInfo, [in] [out] LPDWORD pdwNumTypesCompBuffers, [out] LPAMVACompBufferInfo pamvaCompBufferInfo); + HRESULT GetInternalCompBufferInfo([in] [out] LPDWORD pdwNumTypesCompBuffers, [out] LPAMVACompBufferInfo pamvaCompBufferInfo); + HRESULT BeginFrame([in] const AMVABeginFrameInfo *amvaBeginFrameInfo); + HRESULT EndFrame([in] const AMVAEndFrameInfo *pEndFrameInfo); + HRESULT GetBuffer([in] DWORD dwTypeIndex, [in] DWORD dwBufferIndex, [in] BOOL bReadOnly, [out] LPVOID *ppBuffer, [out] LONG *lpStride); + HRESULT ReleaseBuffer([in] DWORD dwTypeIndex, [in] DWORD dwBufferIndex); + HRESULT Execute([in] DWORD dwFunction, [in] LPVOID lpPrivateInputData, [in] DWORD cbPrivateInputData, [in] LPVOID lpPrivateOutputDat, [in] DWORD cbPrivateOutputData, [in] DWORD dwNumBuffers, [in] const AMVABUFFERINFO *pamvaBufferInfo); + HRESULT QueryRenderStatus([in] DWORD dwTypeIndex, [in] DWORD dwBufferIndex, [in] DWORD dwFlags); + HRESULT DisplayFrame([in] DWORD dwFlipToIndex, [in] IMediaSample *pMediaSample); +}; + +[ + local, + object, + uuid(256A6A21-FBAD-11d1-82BF-00A0C9696C8F), + pointer_default(unique) +] + +interface IAMVideoAcceleratorNotify : IUnknown +{ + HRESULT GetUncompSurfacesInfo([in] const GUID *pGuid, [in] [out] LPAMVAUncompBufferInfo pUncompBufferInfo); + HRESULT SetUncompSurfacesInfo([in] DWORD dwActualUncompSurfacesAllocated); + HRESULT GetCreateVideoAcceleratorData([in] const GUID *pGuid, [out] LPDWORD pdwSizeMiscData, [out] LPVOID *ppMiscData); +}; Propchange: trunk/reactos/include/dxsdk/Videoacc.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/dxsdk/dxsdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxsdk.rbuild… ============================================================================== --- trunk/reactos/include/dxsdk/dxsdk.rbuild (original) +++ trunk/reactos/include/dxsdk/dxsdk.rbuild Sat May 26 20:16:01 2007 @@ -1,6 +1,9 @@ <module name="dxsdk" type="idlheader"> <file>austream.idl</file> <file>amstream.idl</file> - <file>ddstream.idl</file> - <file>mmstream.idl</file> + <file>ddstream.idl</file> + <file>mixerocx.idl</file> + <file>mmstream.idl</file> + <file>vidcap.idl</file> + <file>Videoacc.idl</file> </module> Added: trunk/reactos/include/dxsdk/mixerocx.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/mixerocx.idl… ============================================================================== --- trunk/reactos/include/dxsdk/mixerocx.idl (added) +++ trunk/reactos/include/dxsdk/mixerocx.idl Sat May 26 20:16:01 2007 @@ -1,0 +1,42 @@ +import "unknwn.idl"; + +#define MIXER_DATA_ASPECT_RATIO 0x00000001 +#define MIXER_DATA_NATIVE_SIZE 0x00000002 +#define MIXER_DATA_PALETTE 0x00000004 +#define MIXER_STATE_MASK 0x00000003 +#define MIXER_STATE_UNCONNECTED 0x00000000 +#define MIXER_STATE_CONNECTED_STOPPED 0x00000001 +#define MIXER_STATE_CONNECTED_PAUSED 0x00000002 +#define MIXER_STATE_CONNECTED_PLAYING 0x00000003 + +interface IMixerOCXNotify; +interface IMixerOCX; + +[ + object, + uuid(81A3BD31-DEE1-11d1-8508-00A0C91F9CA0), + pointer_default(unique) +] +interface IMixerOCXNotify : IUnknown +{ + HRESULT OnInvalidateRect([in] LPCRECT lpcRect); + HRESULT OnStatusChange([in] ULONG ulStatusFlags); + HRESULT OnDataChange([in] ULONG ulDataFlags); +}; + +[ + object, + uuid(81A3BD32-DEE1-11d1-8508-00A0C91F9CA0), + pointer_default(unique) +] +interface IMixerOCX : IUnknown +{ + HRESULT OnDisplayChange([in] ULONG ulBitsPerPixel, [in] ULONG ulScreenWidth, [in] ULONG ulScreenHeight); + HRESULT GetAspectRatio([out] LPDWORD pdwPictAspectRatioX, [out] LPDWORD pdwPictAspectRatioY); + HRESULT GetVideoSize([out] LPDWORD pdwVideoWidth, [out] LPDWORD pdwVideoHeight); + HRESULT GetStatus([out] LPDWORD *pdwStatus); + HRESULT OnDraw([in] HDC hdcDraw, [in] LPCRECT prcDraw); + HRESULT SetDrawRegion([in] LPPOINT lpptTopLeftSC, [in] LPCRECT prcDrawCC, [in] LPCRECT lprcClip); + HRESULT Advise([in] IMixerOCXNotify *pmdns); + HRESULT UnAdvise(); +}; Propchange: trunk/reactos/include/dxsdk/mixerocx.idl ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/include/dxsdk/vidcap.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/vidcap.idl?r… ============================================================================== --- trunk/reactos/include/dxsdk/vidcap.idl (added) +++ trunk/reactos/include/dxsdk/vidcap.idl Sat May 26 20:16:01 2007 @@ -1,0 +1,60 @@ + +import "unknwn.idl"; +import "strmif.idl"; + +cpp_quote("#include \"ks.h\"") +cpp_quote("#ifndef _KS_") +typedef struct { + ULONG FromNode; + ULONG FromNodePin; + ULONG ToNode; + ULONG ToNodePin; +} KSTOPOLOGY_CONNECTION, *PKSTOPOLOGY_CONNECTION; +cpp_quote("#endif") + + +[ + object, + local, + uuid(720D4AC0-7533-11D0-A5D6-28DB04C10000), + pointer_default(unique) +] +interface IKsTopologyInfo : IUnknown +{ + HRESULT get_NumCategories([out] DWORD *pdwNumCategories); + HRESULT get_Category([in] DWORD dwIndex, [out] GUID *pCategory); + HRESULT get_NumConnections([out] DWORD *pdwNumConnections); + HRESULT get_ConnectionInfo([in] DWORD dwIndex, [out] KSTOPOLOGY_CONNECTION *pConnectionInfo); + HRESULT get_NodeName([in] DWORD dwNodeId, [out] WCHAR *pwchNodeName, [in] DWORD dwBufSize, [out] DWORD *pdwNameLen); + HRESULT get_NumNodes([out] DWORD *pdwNumNodes); + HRESULT get_NodeType([in] DWORD dwNodeId, [out] GUID *pNodeType); + HRESULT CreateNodeInstance([in] DWORD dwNodeId, [in] REFIID iid, [out] void **ppvObject); +} + +[ + object, + local, + uuid(11737C14-24A7-4bb5-81A0-0D003813B0C4), + pointer_default(unique) +] +interface IKsNodeControl :IUnknown +{ + HRESULT put_NodeId([in] DWORD dwNodeId); + HRESULT put_KsControl([in] PVOID pKsControl); +} + +[ + object, + local, + uuid(1ABDAECA-68B6-4F83-9371-B413907C7B9F), + pointer_default(unique) +] +interface ISelector : IUnknown +{ + HRESULT get_NumSources([out] DWORD *pdwNumSources); + HRESULT get_SourceNodeId([out] DWORD *pdwPinId); + HRESULT put_SourceNodeId([in] DWORD dwPinId); +} + + + Propchange: trunk/reactos/include/dxsdk/vidcap.idl ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 26905: adding correct amstream.idl , compatible with ms dxsdk 2004 dec remove amvideo.idl this idl does not exists as idl in ms dxsdk only as amvideo.h
by greatlrd＠svn.reactos.org 26 May '07

26 May '07

Author: greatlrd Date: Sat May 26 19:41:51 2007 New Revision: 26905 URL: http://svn.reactos.org/svn/reactos?rev=26905&view=rev Log: adding correct amstream.idl , compatible with ms dxsdk 2004 dec remove amvideo.idl this idl does not exists as idl in ms dxsdk only as amvideo.h Added: trunk/reactos/include/dxsdk/amstream.idl (with props) Removed: trunk/reactos/include/psdk/amstream.h trunk/reactos/include/psdk/amstream.idl trunk/reactos/include/psdk/amvideo.idl Modified: trunk/reactos/include/dxsdk/ (props changed) trunk/reactos/include/dxsdk/dxsdk.rbuild Propchange: trunk/reactos/include/dxsdk/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sat May 26 19:41:51 2007 @@ -1,3 +1,4 @@ austream.h mmstream.h ddstream.h +amstream.h Added: trunk/reactos/include/dxsdk/amstream.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/amstream.idl… ============================================================================== --- trunk/reactos/include/dxsdk/amstream.idl (added) +++ trunk/reactos/include/dxsdk/amstream.idl Sat May 26 19:41:51 2007 @@ -1,0 +1,212 @@ + +import "unknwn.idl"; +import "mmstream.idl"; +import "strmif.idl"; + +cpp_quote("#include <ddraw.h>") +cpp_quote("#include <mmsystem.h>") +cpp_quote("#include <mmstream.h>") +cpp_quote("#include <ddstream.h>") +cpp_quote("#include <austream.h>") + +interface IAMMultiMediaStream; +interface IAMMediaStream; +interface IMediaStreamFilter; +interface IDirectDraw; +interface IDirectDrawSurface; +interface IAMMediaTypeStream; +interface IAMMediaTypeSample; + +enum +{ + AMMSF_NOGRAPHTHREAD = 0x00000001 +}; + +enum +{ + AMMSF_ADDDEFAULTRENDERER = 0x00000001, + AMMSF_CREATEPEER = 0x00000002, + AMMSF_STOPIFNOSAMPLES = 0x00000004, + AMMSF_NOSTALL = 0x00000008 +}; + +enum +{ + AMMSF_RENDERTYPEMASK = 0x00000003, + AMMSF_RENDERTOEXISTING = 0x00000000, + AMMSF_RENDERALLSTREAMS = 0x00000001, + AMMSF_NORENDER = 0x00000002, + + AMMSF_NOCLOCK = 0x00000004, + AMMSF_RUN = 0x00000008 +}; + +typedef [v1_enum] enum +{ + Disabled = 0, + ReadData = 1, + RenderData = 2 +} OUTPUT_STATE; + + +[ +object, +uuid(7DB01C96-C0C3-11d0-8FF1-00C04FD9189D), +dual, +pointer_default(unique) +] +interface IDirectShowStream : IDispatch +{ + [propget, id(1)] HRESULT FileName([out, retval] BSTR *pVal); + [propput, id(1)] HRESULT FileName([in] BSTR newVal); + [propget, id(2)] HRESULT Video([out, retval] OUTPUT_STATE *pVal); + [propput, id(2)] HRESULT Video([in] OUTPUT_STATE newVal); + [propget, id(3)] HRESULT Audio([out, retval] OUTPUT_STATE *pVal); + [propput, id(3)] HRESULT Audio([in] OUTPUT_STATE newVal); +}; + +[ +object, +uuid(BEBE595C-9A6F-11d0-8FDE-00C04FD9189D), +pointer_default(unique) +] +interface IAMMultiMediaStream : IMultiMediaStream +{ + HRESULT Initialize([in] STREAM_TYPE StreamType, [in] DWORD dwFlags, [in] IGraphBuilder *pFilterGraph); + HRESULT GetFilterGraph([out] IGraphBuilder **ppGraphBuilder); + HRESULT GetFilter([out] IMediaStreamFilter **ppFilter); + HRESULT AddMediaStream([in] IUnknown *pStreamObject, [in] const MSPID *PurposeId, [in] DWORD dwFlags, [out] IMediaStream **ppNewStream); + HRESULT OpenFile([in] LPCWSTR pszFileName, [in] DWORD dwFlags); + HRESULT OpenMoniker([in] IBindCtx *pCtx, [in] IMoniker *pMoniker, [in] DWORD dwFlags); + HRESULT Render([in] DWORD dwFlags); +} + +[ +object, +uuid(BEBE595D-9A6F-11d0-8FDE-00C04FD9189D), +pointer_default(unique) +] +interface IAMMediaStream : IMediaStream +{ + HRESULT Initialize([in] IUnknown *pSourceObject, [in] DWORD dwFlags, [in] REFMSPID PurposeId, [in] const STREAM_TYPE StreamType); + HRESULT SetState([in] FILTER_STATE State); + HRESULT JoinAMMultiMediaStream([in] IAMMultiMediaStream *pAMMultiMediaStream); + HRESULT JoinFilter([in] IMediaStreamFilter *pMediaStreamFilter); + HRESULT JoinFilterGraph([in] IFilterGraph *pFilterGraph); +}; + +[ +object, +local, +uuid(BEBE595E-9A6F-11d0-8FDE-00C04FD9189D), +pointer_default(unique) +] +interface IMediaStreamFilter : IBaseFilter +{ + HRESULT AddMediaStream([in] IAMMediaStream *pAMMediaStream); + HRESULT GetMediaStream([in] REFMSPID idPurpose, [out] IMediaStream **ppMediaStream); + HRESULT EnumMediaStreams([in] long Index, [out] IMediaStream **ppMediaStream); + HRESULT SupportSeeking([in] BOOL bRenderer); + HRESULT ReferenceTimeToStreamTime([in] [out] REFERENCE_TIME *pTime); + HRESULT GetCurrentStreamTime([out] REFERENCE_TIME *pCurrentStreamTime); + HRESULT WaitUntil([in] REFERENCE_TIME WaitStreamTime); + HRESULT Flush([in] BOOL bCancelEOS); + HRESULT EndOfStream(); +}; + +[ +object, +local, +uuid(AB6B4AFC-F6E4-11d0-900D-00C04FD9189D), +pointer_default(unique) +] +interface IDirectDrawMediaSampleAllocator : IUnknown +{ + HRESULT GetDirectDraw(IDirectDraw **ppDirectDraw); +}; + +[ +object, +local, +uuid(AB6B4AFE-F6E4-11d0-900D-00C04FD9189D), +pointer_default(unique) +] +interface IDirectDrawMediaSample : IUnknown +{ + HRESULT GetSurfaceAndReleaseLock([out] IDirectDrawSurface **ppDirectDrawSurface, [out] RECT * pRect); + HRESULT LockMediaSamplePointer(void); +}; + +[ +object, +local, +uuid(AB6B4AFA-F6E4-11d0-900D-00C04FD9189D), +pointer_default(unique) +] + +interface IAMMediaTypeStream : IMediaStream +{ + HRESULT GetFormat([out] AM_MEDIA_TYPE * pMediaType, [in] DWORD dwFlags); + HRESULT SetFormat([in] AM_MEDIA_TYPE * pMediaType, [in] DWORD dwFlags); + HRESULT CreateSample([in] long lSampleSize, [in] BYTE * pbBuffer, [in] DWORD dwFlags, [in] IUnknown *pUnkOuter, [out] IAMMediaTypeSample ** ppAMMediaTypeSample); + HRESULT GetStreamAllocatorRequirements([out] ALLOCATOR_PROPERTIES *pProps); + HRESULT SetStreamAllocatorRequirements([in] ALLOCATOR_PROPERTIES *pProps); +}; + + + + + + + [ +object, +local, +uuid(AB6B4AFB-F6E4-11d0-900D-00C04FD9189D), +pointer_default(unique) +] +interface IAMMediaTypeSample : IStreamSample +{ + HRESULT SetPointer([in] BYTE *pBuffer, [in] long lSize); + HRESULT GetPointer([out] BYTE ** ppBuffer); + long GetSize(void); + HRESULT GetTime([out] REFERENCE_TIME * pTimeStart, [out] REFERENCE_TIME * pTimeEnd); + HRESULT SetTime([in] REFERENCE_TIME * pTimeStart, [in] REFERENCE_TIME * pTimeEnd); + HRESULT IsSyncPoint(void); + HRESULT SetSyncPoint(BOOL bIsSyncPoint); + HRESULT IsPreroll(void); + HRESULT SetPreroll(BOOL bIsPreroll); + long GetActualDataLength(void); + HRESULT SetActualDataLength(long Len); + HRESULT GetMediaType(AM_MEDIA_TYPE **ppMediaType); + HRESULT SetMediaType(AM_MEDIA_TYPE *pMediaType); + HRESULT IsDiscontinuity(void); + HRESULT SetDiscontinuity(BOOL bDiscontinuity); + HRESULT GetMediaTime([out] LONGLONG * pTimeStart, [out] LONGLONG * pTimeEnd); + HRESULT SetMediaTime([in] LONGLONG * pTimeStart, [in] LONGLONG * pTimeEnd); +}; + +[ + uuid(4E6CDE29-C0C4-11d0-8FF1-00C04FD9189D) +] + +library DirectShowStreamLib +{ + importlib("stdole2.tlb"); + [ + uuid(49c47ce5-9ba4-11d0-8212-00c04fc32c45) + ] + coclass AMMultiMediaStream + { + [default] dispinterface IDirectShowStream; + }; +}; + +cpp_quote("#ifndef __cplusplus") +cpp_quote("EXTERN_C const CLSID CLSID_AMMultiMediaStream;") +cpp_quote("#endif") + +cpp_quote("DEFINE_GUID(CLSID_AMDirectDrawStream, 0x49c47ce4, 0x9ba4, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45);") +cpp_quote("DEFINE_GUID(CLSID_AMAudioStream, 0x8496e040, 0xaf4c, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45);") +cpp_quote("DEFINE_GUID(CLSID_AMAudioData, 0xf2468580, 0xaf8a, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45);") +cpp_quote("DEFINE_GUID(CLSID_AMMediaTypeStream, 0xcf0f2f7c, 0xf7bf, 0x11d0, 0x90, 0xd, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0x9d);") + Propchange: trunk/reactos/include/dxsdk/amstream.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/dxsdk/dxsdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxsdk.rbuild… ============================================================================== --- trunk/reactos/include/dxsdk/dxsdk.rbuild (original) +++ trunk/reactos/include/dxsdk/dxsdk.rbuild Sat May 26 19:41:51 2007 @@ -1,5 +1,6 @@ <module name="dxsdk" type="idlheader"> <file>austream.idl</file> + <file>amstream.idl</file> <file>ddstream.idl</file> <file>mmstream.idl</file> </module> Removed: trunk/reactos/include/psdk/amstream.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/amstream.h?re… ============================================================================== --- trunk/reactos/include/psdk/amstream.h (original) +++ trunk/reactos/include/psdk/amstream.h (removed) @@ -1,1464 +1,0 @@ -/*** Autogenerated by WIDL 0.3.0 from include\psdk\amstream.idl - Do not edit ***/ -#include <rpc.h> -#include <rpcndr.h> - -#ifndef __WIDL_INCLUDE_PSDK_AMSTREAM_H -#define __WIDL_INCLUDE_PSDK_AMSTREAM_H -#ifdef __cplusplus -extern "C" { -#endif -#include <unknwn.h> -#include <mmstream.h> -#include <strmif.h> -#include <ddraw.h> -#include <mmsystem.h> -#include <mmstream.h> -#include <ddstream.h> -#include <austream.h> -#if 0 -#ifndef __IDirectDraw_FWD_DEFINED__ -#define __IDirectDraw_FWD_DEFINED__ -typedef interface IDirectDraw IDirectDraw; -#endif - -#ifndef __IDirectDrawSurface_FWD_DEFINED__ -#define __IDirectDrawSurface_FWD_DEFINED__ -typedef interface IDirectDrawSurface IDirectDrawSurface; -#endif - -#endif -#ifndef __IAMMultiMediaStream_FWD_DEFINED__ -#define __IAMMultiMediaStream_FWD_DEFINED__ -typedef interface IAMMultiMediaStream IAMMultiMediaStream; -#endif - -#ifndef __IAMMediaStream_FWD_DEFINED__ -#define __IAMMediaStream_FWD_DEFINED__ -typedef interface IAMMediaStream IAMMediaStream; -#endif - -#ifndef __IMediaStreamFilter_FWD_DEFINED__ -#define __IMediaStreamFilter_FWD_DEFINED__ -typedef interface IMediaStreamFilter IMediaStreamFilter; -#endif - -#ifndef __IAMMediaTypeStream_FWD_DEFINED__ -#define __IAMMediaTypeStream_FWD_DEFINED__ -typedef interface IAMMediaTypeStream IAMMediaTypeStream; -#endif - -#ifndef __IAMMediaTypeSample_FWD_DEFINED__ -#define __IAMMediaTypeSample_FWD_DEFINED__ -typedef interface IAMMediaTypeSample IAMMediaTypeSample; -#endif - -enum { - AMMSF_NOGRAPHTHREAD = 0x1 -}; - -enum { - AMMSF_ADDDEFAULTRENDERER = 0x1, - AMMSF_CREATEPEER = 0x2, - AMMSF_STOPIFNOSAMPLES = 0x4, - AMMSF_NOSTALL = 0x8 -}; - -enum { - AMMSF_RENDERTYPEMASK = 0x3, - AMMSF_RENDERTOEXISTING = 0x0, - AMMSF_RENDERALLSTREAMS = 0x1, - AMMSF_NORENDER = 0x2, - AMMSF_NOCLOCK = 0x4, - AMMSF_RUN = 0x8 -}; - -typedef enum { - Disabled = 0, - ReadData = 1, - RenderData = 2 -} OUTPUT_STATE; -/***************************************************************************** - * IAMMultiMediaStream interface - */ -#ifndef __IAMMultiMediaStream_INTERFACE_DEFINED__ -#define __IAMMultiMediaStream_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IAMMultiMediaStream, 0xbebe595c, 0x9a6f, 0x11d0, 0x8f,0xde, 0x00,0xc0,0x4f,0xd9,0x18,0x9d); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IAMMultiMediaStream : public IMultiMediaStream -{ - virtual HRESULT STDMETHODCALLTYPE Initialize( - STREAM_TYPE StreamType, - DWORD dwFlags, - IGraphBuilder* pFilterGraph) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetFilterGraph( - IGraphBuilder** ppGraphBuilder) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetFilter( - IMediaStreamFilter** ppFilter) = 0; - - virtual HRESULT STDMETHODCALLTYPE AddMediaStream( - IUnknown* pStreamObject, - const MSPID* PurposeId, - DWORD dwFlags, - IMediaStream** ppNewStream) = 0; - - virtual HRESULT STDMETHODCALLTYPE OpenFile( - LPCWSTR pszFileName, - DWORD dwFlags) = 0; - - virtual HRESULT STDMETHODCALLTYPE OpenMoniker( - IBindCtx* pCtx, - IMoniker* pMoniker, - DWORD dwFlags) = 0; - - virtual HRESULT STDMETHODCALLTYPE Render( - DWORD dwFlags) = 0; - -}; -#else -typedef struct IAMMultiMediaStreamVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAMMultiMediaStream* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IAMMultiMediaStream* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IAMMultiMediaStream* This); - - /*** IMultiMediaStream methods ***/ - HRESULT (STDMETHODCALLTYPE *GetInformation)( - IAMMultiMediaStream* This, - DWORD* pdwFlags, - STREAM_TYPE* pStreamType); - - HRESULT (STDMETHODCALLTYPE *GetMediaStream)( - IAMMultiMediaStream* This, - REFMSPID idPurpose, - IMediaStream** ppMediaStream); - - HRESULT (STDMETHODCALLTYPE *EnumMediaStreams)( - IAMMultiMediaStream* This, - long Index, - IMediaStream** ppMediaStream); - - HRESULT (STDMETHODCALLTYPE *GetState)( - IAMMultiMediaStream* This, - STREAM_STATE* pCurrentState); - - HRESULT (STDMETHODCALLTYPE *SetState)( - IAMMultiMediaStream* This, - STREAM_STATE NewState); - - HRESULT (STDMETHODCALLTYPE *GetTime)( - IAMMultiMediaStream* This, - STREAM_TIME* pCurrentTime); - - HRESULT (STDMETHODCALLTYPE *GetDuration)( - IAMMultiMediaStream* This, - STREAM_TIME* pDuration); - - HRESULT (STDMETHODCALLTYPE *Seek)( - IAMMultiMediaStream* This, - STREAM_TIME SeekTime); - - HRESULT (STDMETHODCALLTYPE *GetEndOfStreamEventHandle)( - IAMMultiMediaStream* This, - HANDLE* phEOS); - - /*** IAMMultiMediaStream methods ***/ - HRESULT (STDMETHODCALLTYPE *Initialize)( - IAMMultiMediaStream* This, - STREAM_TYPE StreamType, - DWORD dwFlags, - IGraphBuilder* pFilterGraph); - - HRESULT (STDMETHODCALLTYPE *GetFilterGraph)( - IAMMultiMediaStream* This, - IGraphBuilder** ppGraphBuilder); - - HRESULT (STDMETHODCALLTYPE *GetFilter)( - IAMMultiMediaStream* This, - IMediaStreamFilter** ppFilter); - - HRESULT (STDMETHODCALLTYPE *AddMediaStream)( - IAMMultiMediaStream* This, - IUnknown* pStreamObject, - const MSPID* PurposeId, - DWORD dwFlags, - IMediaStream** ppNewStream); - - HRESULT (STDMETHODCALLTYPE *OpenFile)( - IAMMultiMediaStream* This, - LPCWSTR pszFileName, - DWORD dwFlags); - - HRESULT (STDMETHODCALLTYPE *OpenMoniker)( - IAMMultiMediaStream* This, - IBindCtx* pCtx, - IMoniker* pMoniker, - DWORD dwFlags); - - HRESULT (STDMETHODCALLTYPE *Render)( - IAMMultiMediaStream* This, - DWORD dwFlags); - - END_INTERFACE -} IAMMultiMediaStreamVtbl; -interface IAMMultiMediaStream { - const IAMMultiMediaStreamVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IAMMultiMediaStream_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IAMMultiMediaStream_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IAMMultiMediaStream_Release(p) (p)->lpVtbl->Release(p) -/*** IMultiMediaStream methods ***/ -#define IAMMultiMediaStream_GetInformation(p,a,b) (p)->lpVtbl->GetInformation(p,a,b) -#define IAMMultiMediaStream_GetMediaStream(p,a,b) (p)->lpVtbl->GetMediaStream(p,a,b) -#define IAMMultiMediaStream_EnumMediaStreams(p,a,b) (p)->lpVtbl->EnumMediaStreams(p,a,b) -#define IAMMultiMediaStream_GetState(p,a) (p)->lpVtbl->GetState(p,a) -#define IAMMultiMediaStream_SetState(p,a) (p)->lpVtbl->SetState(p,a) -#define IAMMultiMediaStream_GetTime(p,a) (p)->lpVtbl->GetTime(p,a) -#define IAMMultiMediaStream_GetDuration(p,a) (p)->lpVtbl->GetDuration(p,a) -#define IAMMultiMediaStream_Seek(p,a) (p)->lpVtbl->Seek(p,a) -#define IAMMultiMediaStream_GetEndOfStreamEventHandle(p,a) (p)->lpVtbl->GetEndOfStreamEventHandle(p,a) -/*** IAMMultiMediaStream methods ***/ -#define IAMMultiMediaStream_Initialize(p,a,b,c) (p)->lpVtbl->Initialize(p,a,b,c) -#define IAMMultiMediaStream_GetFilterGraph(p,a) (p)->lpVtbl->GetFilterGraph(p,a) -#define IAMMultiMediaStream_GetFilter(p,a) (p)->lpVtbl->GetFilter(p,a) -#define IAMMultiMediaStream_AddMediaStream(p,a,b,c,d) (p)->lpVtbl->AddMediaStream(p,a,b,c,d) -#define IAMMultiMediaStream_OpenFile(p,a,b) (p)->lpVtbl->OpenFile(p,a,b) -#define IAMMultiMediaStream_OpenMoniker(p,a,b,c) (p)->lpVtbl->OpenMoniker(p,a,b,c) -#define IAMMultiMediaStream_Render(p,a) (p)->lpVtbl->Render(p,a) -#endif - -#endif - -HRESULT CALLBACK IAMMultiMediaStream_Initialize_Proxy( - IAMMultiMediaStream* This, - STREAM_TYPE StreamType, - DWORD dwFlags, - IGraphBuilder* pFilterGraph); -void __RPC_STUB IAMMultiMediaStream_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMultiMediaStream_GetFilterGraph_Proxy( - IAMMultiMediaStream* This, - IGraphBuilder** ppGraphBuilder); -void __RPC_STUB IAMMultiMediaStream_GetFilterGraph_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMultiMediaStream_GetFilter_Proxy( - IAMMultiMediaStream* This, - IMediaStreamFilter** ppFilter); -void __RPC_STUB IAMMultiMediaStream_GetFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMultiMediaStream_AddMediaStream_Proxy( - IAMMultiMediaStream* This, - IUnknown* pStreamObject, - const MSPID* PurposeId, - DWORD dwFlags, - IMediaStream** ppNewStream); -void __RPC_STUB IAMMultiMediaStream_AddMediaStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMultiMediaStream_OpenFile_Proxy( - IAMMultiMediaStream* This, - LPCWSTR pszFileName, - DWORD dwFlags); -void __RPC_STUB IAMMultiMediaStream_OpenFile_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMultiMediaStream_OpenMoniker_Proxy( - IAMMultiMediaStream* This, - IBindCtx* pCtx, - IMoniker* pMoniker, - DWORD dwFlags); -void __RPC_STUB IAMMultiMediaStream_OpenMoniker_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMultiMediaStream_Render_Proxy( - IAMMultiMediaStream* This, - DWORD dwFlags); -void __RPC_STUB IAMMultiMediaStream_Render_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IAMMultiMediaStream_INTERFACE_DEFINED__ */ - -/***************************************************************************** - * IAMMediaStream interface - */ -#ifndef __IAMMediaStream_INTERFACE_DEFINED__ -#define __IAMMediaStream_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IAMMediaStream, 0xbebe595d, 0x9a6f, 0x11d0, 0x8f,0xde, 0x00,0xc0,0x4f,0xd9,0x18,0x9d); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IAMMediaStream : public IMediaStream -{ - virtual HRESULT STDMETHODCALLTYPE Initialize( - IUnknown* pSourceObject, - DWORD dwFlags, - REFMSPID PurposeId, - const STREAM_TYPE StreamType) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetState( - FILTER_STATE State) = 0; - - virtual HRESULT STDMETHODCALLTYPE JoinAMMultiMediaStream( - IAMMultiMediaStream* pAMMultiMediaStream) = 0; - - virtual HRESULT STDMETHODCALLTYPE JoinFilter( - IMediaStreamFilter* pMediaStreamFilter) = 0; - - virtual HRESULT STDMETHODCALLTYPE JoinFilterGraph( - IFilterGraph* pFilterGraph) = 0; - -}; -#else -typedef struct IAMMediaStreamVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAMMediaStream* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IAMMediaStream* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IAMMediaStream* This); - - /*** IMediaStream methods ***/ - HRESULT (STDMETHODCALLTYPE *GetMultiMediaStream)( - IAMMediaStream* This, - IMultiMediaStream** ppMultiMediaStream); - - HRESULT (STDMETHODCALLTYPE *GetInformation)( - IAMMediaStream* This, - MSPID* pPurposeId, - STREAM_TYPE* pType); - - HRESULT (STDMETHODCALLTYPE *SetSameFormat)( - IAMMediaStream* This, - IMediaStream* pStreamThatHasDesiredFormat, - DWORD dwFlags); - - HRESULT (STDMETHODCALLTYPE *AllocateSample)( - IAMMediaStream* This, - DWORD dwFlags, - IStreamSample** ppSample); - - HRESULT (STDMETHODCALLTYPE *CreateSharedSample)( - IAMMediaStream* This, - IStreamSample* pExistingSample, - DWORD dwFlags, - IStreamSample** ppNewSample); - - HRESULT (STDMETHODCALLTYPE *SendEndOfStream)( - IAMMediaStream* This, - DWORD dwFlags); - - /*** IAMMediaStream methods ***/ - HRESULT (STDMETHODCALLTYPE *Initialize)( - IAMMediaStream* This, - IUnknown* pSourceObject, - DWORD dwFlags, - REFMSPID PurposeId, - const STREAM_TYPE StreamType); - - HRESULT (STDMETHODCALLTYPE *SetState)( - IAMMediaStream* This, - FILTER_STATE State); - - HRESULT (STDMETHODCALLTYPE *JoinAMMultiMediaStream)( - IAMMediaStream* This, - IAMMultiMediaStream* pAMMultiMediaStream); - - HRESULT (STDMETHODCALLTYPE *JoinFilter)( - IAMMediaStream* This, - IMediaStreamFilter* pMediaStreamFilter); - - HRESULT (STDMETHODCALLTYPE *JoinFilterGraph)( - IAMMediaStream* This, - IFilterGraph* pFilterGraph); - - END_INTERFACE -} IAMMediaStreamVtbl; -interface IAMMediaStream { - const IAMMediaStreamVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IAMMediaStream_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IAMMediaStream_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IAMMediaStream_Release(p) (p)->lpVtbl->Release(p) -/*** IMediaStream methods ***/ -#define IAMMediaStream_GetMultiMediaStream(p,a) (p)->lpVtbl->GetMultiMediaStream(p,a) -#define IAMMediaStream_GetInformation(p,a,b) (p)->lpVtbl->GetInformation(p,a,b) -#define IAMMediaStream_SetSameFormat(p,a,b) (p)->lpVtbl->SetSameFormat(p,a,b) -#define IAMMediaStream_AllocateSample(p,a,b) (p)->lpVtbl->AllocateSample(p,a,b) -#define IAMMediaStream_CreateSharedSample(p,a,b,c) (p)->lpVtbl->CreateSharedSample(p,a,b,c) -#define IAMMediaStream_SendEndOfStream(p,a) (p)->lpVtbl->SendEndOfStream(p,a) -/*** IAMMediaStream methods ***/ -#define IAMMediaStream_Initialize(p,a,b,c,d) (p)->lpVtbl->Initialize(p,a,b,c,d) -#define IAMMediaStream_SetState(p,a) (p)->lpVtbl->SetState(p,a) -#define IAMMediaStream_JoinAMMultiMediaStream(p,a) (p)->lpVtbl->JoinAMMultiMediaStream(p,a) -#define IAMMediaStream_JoinFilter(p,a) (p)->lpVtbl->JoinFilter(p,a) -#define IAMMediaStream_JoinFilterGraph(p,a) (p)->lpVtbl->JoinFilterGraph(p,a) -#endif - -#endif - -HRESULT CALLBACK IAMMediaStream_Initialize_Proxy( - IAMMediaStream* This, - IUnknown* pSourceObject, - DWORD dwFlags, - REFMSPID PurposeId, - const STREAM_TYPE StreamType); -void __RPC_STUB IAMMediaStream_Initialize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaStream_SetState_Proxy( - IAMMediaStream* This, - FILTER_STATE State); -void __RPC_STUB IAMMediaStream_SetState_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaStream_JoinAMMultiMediaStream_Proxy( - IAMMediaStream* This, - IAMMultiMediaStream* pAMMultiMediaStream); -void __RPC_STUB IAMMediaStream_JoinAMMultiMediaStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaStream_JoinFilter_Proxy( - IAMMediaStream* This, - IMediaStreamFilter* pMediaStreamFilter); -void __RPC_STUB IAMMediaStream_JoinFilter_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaStream_JoinFilterGraph_Proxy( - IAMMediaStream* This, - IFilterGraph* pFilterGraph); -void __RPC_STUB IAMMediaStream_JoinFilterGraph_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IAMMediaStream_INTERFACE_DEFINED__ */ - -/***************************************************************************** - * IMediaStreamFilter interface - */ -#ifndef __IMediaStreamFilter_INTERFACE_DEFINED__ -#define __IMediaStreamFilter_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IMediaStreamFilter, 0xbebe595e, 0x9a6f, 0x11d0, 0x8f,0xde, 0x00,0xc0,0x4f,0xd9,0x18,0x9d); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IMediaStreamFilter : public IBaseFilter -{ - virtual HRESULT STDMETHODCALLTYPE AddMediaStream( - IAMMediaStream* pAMMediaStream) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetMediaStream( - REFMSPID idPurpose, - IMediaStream** ppMediaStream) = 0; - - virtual HRESULT STDMETHODCALLTYPE EnumMediaStreams( - long Index, - IMediaStream** ppMediaStream) = 0; - - virtual HRESULT STDMETHODCALLTYPE SupportSeeking( - BOOL bRenderer) = 0; - - virtual HRESULT STDMETHODCALLTYPE ReferenceTimeToStreamTime( - REFERENCE_TIME* pTime) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetCurrentStreamTime( - REFERENCE_TIME* pCurrentStreamTime) = 0; - - virtual HRESULT STDMETHODCALLTYPE WaitUntil( - REFERENCE_TIME WaitStreamTime) = 0; - - virtual HRESULT STDMETHODCALLTYPE Flush( - BOOL bCancelEOS) = 0; - - virtual HRESULT STDMETHODCALLTYPE EndOfStream( - ) = 0; - -}; -#else -typedef struct IMediaStreamFilterVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IMediaStreamFilter* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IMediaStreamFilter* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IMediaStreamFilter* This); - - /*** IPersist methods ***/ - HRESULT (STDMETHODCALLTYPE *GetClassID)( - IMediaStreamFilter* This, - CLSID* pClassID); - - /*** IMediaFilter methods ***/ - HRESULT (STDMETHODCALLTYPE *Stop)( - IMediaStreamFilter* This); - - HRESULT (STDMETHODCALLTYPE *Pause)( - IMediaStreamFilter* This); - - HRESULT (STDMETHODCALLTYPE *Run)( - IMediaStreamFilter* This, - REFERENCE_TIME tStart); - - HRESULT (STDMETHODCALLTYPE *GetState)( - IMediaStreamFilter* This, - DWORD dwMilliSecsTimeout, - FILTER_STATE* State); - - HRESULT (STDMETHODCALLTYPE *SetSyncSource)( - IMediaStreamFilter* This, - IReferenceClock* pClock); - - HRESULT (STDMETHODCALLTYPE *GetSyncSource)( - IMediaStreamFilter* This, - IReferenceClock** pClock); - - /*** IBaseFilter methods ***/ - HRESULT (STDMETHODCALLTYPE *EnumPins)( - IMediaStreamFilter* This, - IEnumPins** ppEnum); - - HRESULT (STDMETHODCALLTYPE *FindPin)( - IMediaStreamFilter* This, - LPCWSTR Id, - IPin** ppPin); - - HRESULT (STDMETHODCALLTYPE *QueryFilterInfo)( - IMediaStreamFilter* This, - FILTER_INFO* pInfo); - - HRESULT (STDMETHODCALLTYPE *JoinFilterGraph)( - IMediaStreamFilter* This, - IFilterGraph* pGraph, - LPCWSTR pName); - - HRESULT (STDMETHODCALLTYPE *QueryVendorInfo)( - IMediaStreamFilter* This, - LPWSTR* pVendorInfo); - - /*** IMediaStreamFilter methods ***/ - HRESULT (STDMETHODCALLTYPE *AddMediaStream)( - IMediaStreamFilter* This, - IAMMediaStream* pAMMediaStream); - - HRESULT (STDMETHODCALLTYPE *GetMediaStream)( - IMediaStreamFilter* This, - REFMSPID idPurpose, - IMediaStream** ppMediaStream); - - HRESULT (STDMETHODCALLTYPE *EnumMediaStreams)( - IMediaStreamFilter* This, - long Index, - IMediaStream** ppMediaStream); - - HRESULT (STDMETHODCALLTYPE *SupportSeeking)( - IMediaStreamFilter* This, - BOOL bRenderer); - - HRESULT (STDMETHODCALLTYPE *ReferenceTimeToStreamTime)( - IMediaStreamFilter* This, - REFERENCE_TIME* pTime); - - HRESULT (STDMETHODCALLTYPE *GetCurrentStreamTime)( - IMediaStreamFilter* This, - REFERENCE_TIME* pCurrentStreamTime); - - HRESULT (STDMETHODCALLTYPE *WaitUntil)( - IMediaStreamFilter* This, - REFERENCE_TIME WaitStreamTime); - - HRESULT (STDMETHODCALLTYPE *Flush)( - IMediaStreamFilter* This, - BOOL bCancelEOS); - - HRESULT (STDMETHODCALLTYPE *EndOfStream)( - IMediaStreamFilter* This); - - END_INTERFACE -} IMediaStreamFilterVtbl; -interface IMediaStreamFilter { - const IMediaStreamFilterVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IMediaStreamFilter_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IMediaStreamFilter_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IMediaStreamFilter_Release(p) (p)->lpVtbl->Release(p) -/*** IPersist methods ***/ -#define IMediaStreamFilter_GetClassID(p,a) (p)->lpVtbl->GetClassID(p,a) -/*** IMediaFilter methods ***/ -#define IMediaStreamFilter_Stop(p) (p)->lpVtbl->Stop(p) -#define IMediaStreamFilter_Pause(p) (p)->lpVtbl->Pause(p) -#define IMediaStreamFilter_Run(p,a) (p)->lpVtbl->Run(p,a) -#define IMediaStreamFilter_GetState(p,a,b) (p)->lpVtbl->GetState(p,a,b) -#define IMediaStreamFilter_SetSyncSource(p,a) (p)->lpVtbl->SetSyncSource(p,a) -#define IMediaStreamFilter_GetSyncSource(p,a) (p)->lpVtbl->GetSyncSource(p,a) -/*** IBaseFilter methods ***/ -#define IMediaStreamFilter_EnumPins(p,a) (p)->lpVtbl->EnumPins(p,a) -#define IMediaStreamFilter_FindPin(p,a,b) (p)->lpVtbl->FindPin(p,a,b) -#define IMediaStreamFilter_QueryFilterInfo(p,a) (p)->lpVtbl->QueryFilterInfo(p,a) -#define IMediaStreamFilter_JoinFilterGraph(p,a,b) (p)->lpVtbl->JoinFilterGraph(p,a,b) -#define IMediaStreamFilter_QueryVendorInfo(p,a) (p)->lpVtbl->QueryVendorInfo(p,a) -/*** IMediaStreamFilter methods ***/ -#define IMediaStreamFilter_AddMediaStream(p,a) (p)->lpVtbl->AddMediaStream(p,a) -#define IMediaStreamFilter_GetMediaStream(p,a,b) (p)->lpVtbl->GetMediaStream(p,a,b) -#define IMediaStreamFilter_EnumMediaStreams(p,a,b) (p)->lpVtbl->EnumMediaStreams(p,a,b) -#define IMediaStreamFilter_SupportSeeking(p,a) (p)->lpVtbl->SupportSeeking(p,a) -#define IMediaStreamFilter_ReferenceTimeToStreamTime(p,a) (p)->lpVtbl->ReferenceTimeToStreamTime(p,a) -#define IMediaStreamFilter_GetCurrentStreamTime(p,a) (p)->lpVtbl->GetCurrentStreamTime(p,a) -#define IMediaStreamFilter_WaitUntil(p,a) (p)->lpVtbl->WaitUntil(p,a) -#define IMediaStreamFilter_Flush(p,a) (p)->lpVtbl->Flush(p,a) -#define IMediaStreamFilter_EndOfStream(p) (p)->lpVtbl->EndOfStream(p) -#endif - -#endif - -HRESULT CALLBACK IMediaStreamFilter_AddMediaStream_Proxy( - IMediaStreamFilter* This, - IAMMediaStream* pAMMediaStream); -void __RPC_STUB IMediaStreamFilter_AddMediaStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMediaStreamFilter_GetMediaStream_Proxy( - IMediaStreamFilter* This, - REFMSPID idPurpose, - IMediaStream** ppMediaStream); -void __RPC_STUB IMediaStreamFilter_GetMediaStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMediaStreamFilter_EnumMediaStreams_Proxy( - IMediaStreamFilter* This, - long Index, - IMediaStream** ppMediaStream); -void __RPC_STUB IMediaStreamFilter_EnumMediaStreams_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMediaStreamFilter_SupportSeeking_Proxy( - IMediaStreamFilter* This, - BOOL bRenderer); -void __RPC_STUB IMediaStreamFilter_SupportSeeking_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMediaStreamFilter_ReferenceTimeToStreamTime_Proxy( - IMediaStreamFilter* This, - REFERENCE_TIME* pTime); -void __RPC_STUB IMediaStreamFilter_ReferenceTimeToStreamTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMediaStreamFilter_GetCurrentStreamTime_Proxy( - IMediaStreamFilter* This, - REFERENCE_TIME* pCurrentStreamTime); -void __RPC_STUB IMediaStreamFilter_GetCurrentStreamTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMediaStreamFilter_WaitUntil_Proxy( - IMediaStreamFilter* This, - REFERENCE_TIME WaitStreamTime); -void __RPC_STUB IMediaStreamFilter_WaitUntil_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMediaStreamFilter_Flush_Proxy( - IMediaStreamFilter* This, - BOOL bCancelEOS); -void __RPC_STUB IMediaStreamFilter_Flush_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IMediaStreamFilter_EndOfStream_Proxy( - IMediaStreamFilter* This); -void __RPC_STUB IMediaStreamFilter_EndOfStream_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IMediaStreamFilter_INTERFACE_DEFINED__ */ - -#ifndef __IDirectDrawMediaSampleAllocator_FWD_DEFINED__ -#define __IDirectDrawMediaSampleAllocator_FWD_DEFINED__ -typedef interface IDirectDrawMediaSampleAllocator IDirectDrawMediaSampleAllocator; -#endif - -/***************************************************************************** - * IDirectDrawMediaSampleAllocator interface - */ -#ifndef __IDirectDrawMediaSampleAllocator_INTERFACE_DEFINED__ -#define __IDirectDrawMediaSampleAllocator_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IDirectDrawMediaSampleAllocator, 0xab6b4afc, 0xf6e4, 0x11d0, 0x90,0x0d, 0x00,0xc0,0x4f,0xd9,0x18,0x9d); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IDirectDrawMediaSampleAllocator : public IUnknown -{ - virtual HRESULT STDMETHODCALLTYPE GetDirectDraw( - IDirectDraw** ppDirectDraw) = 0; - -}; -#else -typedef struct IDirectDrawMediaSampleAllocatorVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDirectDrawMediaSampleAllocator* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IDirectDrawMediaSampleAllocator* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IDirectDrawMediaSampleAllocator* This); - - /*** IDirectDrawMediaSampleAllocator methods ***/ - HRESULT (STDMETHODCALLTYPE *GetDirectDraw)( - IDirectDrawMediaSampleAllocator* This, - IDirectDraw** ppDirectDraw); - - END_INTERFACE -} IDirectDrawMediaSampleAllocatorVtbl; -interface IDirectDrawMediaSampleAllocator { - const IDirectDrawMediaSampleAllocatorVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IDirectDrawMediaSampleAllocator_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IDirectDrawMediaSampleAllocator_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IDirectDrawMediaSampleAllocator_Release(p) (p)->lpVtbl->Release(p) -/*** IDirectDrawMediaSampleAllocator methods ***/ -#define IDirectDrawMediaSampleAllocator_GetDirectDraw(p,a) (p)->lpVtbl->GetDirectDraw(p,a) -#endif - -#endif - -HRESULT CALLBACK IDirectDrawMediaSampleAllocator_GetDirectDraw_Proxy( - IDirectDrawMediaSampleAllocator* This, - IDirectDraw** ppDirectDraw); -void __RPC_STUB IDirectDrawMediaSampleAllocator_GetDirectDraw_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IDirectDrawMediaSampleAllocator_INTERFACE_DEFINED__ */ - -#ifndef __IDirectDrawMediaSample_FWD_DEFINED__ -#define __IDirectDrawMediaSample_FWD_DEFINED__ -typedef interface IDirectDrawMediaSample IDirectDrawMediaSample; -#endif - -/***************************************************************************** - * IDirectDrawMediaSample interface - */ -#ifndef __IDirectDrawMediaSample_INTERFACE_DEFINED__ -#define __IDirectDrawMediaSample_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IDirectDrawMediaSample, 0xab6b4afe, 0xf6e4, 0x11d0, 0x90,0x0d, 0x00,0xc0,0x4f,0xd9,0x18,0x9d); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IDirectDrawMediaSample : public IUnknown -{ - virtual HRESULT STDMETHODCALLTYPE GetSurfaceAndReleaseLock( - IDirectDrawSurface** ppDirectDrawSurface, - RECT* pRect) = 0; - - virtual HRESULT STDMETHODCALLTYPE LockMediaSamplePointer( - ) = 0; - -}; -#else -typedef struct IDirectDrawMediaSampleVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IDirectDrawMediaSample* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IDirectDrawMediaSample* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IDirectDrawMediaSample* This); - - /*** IDirectDrawMediaSample methods ***/ - HRESULT (STDMETHODCALLTYPE *GetSurfaceAndReleaseLock)( - IDirectDrawMediaSample* This, - IDirectDrawSurface** ppDirectDrawSurface, - RECT* pRect); - - HRESULT (STDMETHODCALLTYPE *LockMediaSamplePointer)( - IDirectDrawMediaSample* This); - - END_INTERFACE -} IDirectDrawMediaSampleVtbl; -interface IDirectDrawMediaSample { - const IDirectDrawMediaSampleVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IDirectDrawMediaSample_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IDirectDrawMediaSample_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IDirectDrawMediaSample_Release(p) (p)->lpVtbl->Release(p) -/*** IDirectDrawMediaSample methods ***/ -#define IDirectDrawMediaSample_GetSurfaceAndReleaseLock(p,a,b) (p)->lpVtbl->GetSurfaceAndReleaseLock(p,a,b) -#define IDirectDrawMediaSample_LockMediaSamplePointer(p) (p)->lpVtbl->LockMediaSamplePointer(p) -#endif - -#endif - -HRESULT CALLBACK IDirectDrawMediaSample_GetSurfaceAndReleaseLock_Proxy( - IDirectDrawMediaSample* This, - IDirectDrawSurface** ppDirectDrawSurface, - RECT* pRect); -void __RPC_STUB IDirectDrawMediaSample_GetSurfaceAndReleaseLock_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IDirectDrawMediaSample_LockMediaSamplePointer_Proxy( - IDirectDrawMediaSample* This); -void __RPC_STUB IDirectDrawMediaSample_LockMediaSamplePointer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IDirectDrawMediaSample_INTERFACE_DEFINED__ */ - -/***************************************************************************** - * IAMMediaTypeStream interface - */ -#ifndef __IAMMediaTypeStream_INTERFACE_DEFINED__ -#define __IAMMediaTypeStream_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IAMMediaTypeStream, 0xab6b4afa, 0xf6e4, 0x11d0, 0x90,0x0d, 0x00,0xc0,0x4f,0xd9,0x18,0x9d); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IAMMediaTypeStream : public IMediaStream -{ - virtual HRESULT STDMETHODCALLTYPE GetFormat( - AM_MEDIA_TYPE* pMediaType, - DWORD dwFlags) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetFormat( - AM_MEDIA_TYPE* pMediaType, - DWORD dwFlags) = 0; - - virtual HRESULT STDMETHODCALLTYPE CreateSample( - long lSampleSize, - BYTE* pbBuffer, - DWORD dwFlags, - IUnknown* pUnkOuter, - IAMMediaTypeSample** ppAMMediaTypeSample) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetStreamAllocatorRequirements( - ALLOCATOR_PROPERTIES* pProps) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetStreamAllocatorRequirements( - ALLOCATOR_PROPERTIES* pProps) = 0; - -}; -#else -typedef struct IAMMediaTypeStreamVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAMMediaTypeStream* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IAMMediaTypeStream* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IAMMediaTypeStream* This); - - /*** IMediaStream methods ***/ - HRESULT (STDMETHODCALLTYPE *GetMultiMediaStream)( - IAMMediaTypeStream* This, - IMultiMediaStream** ppMultiMediaStream); - - HRESULT (STDMETHODCALLTYPE *GetInformation)( - IAMMediaTypeStream* This, - MSPID* pPurposeId, - STREAM_TYPE* pType); - - HRESULT (STDMETHODCALLTYPE *SetSameFormat)( - IAMMediaTypeStream* This, - IMediaStream* pStreamThatHasDesiredFormat, - DWORD dwFlags); - - HRESULT (STDMETHODCALLTYPE *AllocateSample)( - IAMMediaTypeStream* This, - DWORD dwFlags, - IStreamSample** ppSample); - - HRESULT (STDMETHODCALLTYPE *CreateSharedSample)( - IAMMediaTypeStream* This, - IStreamSample* pExistingSample, - DWORD dwFlags, - IStreamSample** ppNewSample); - - HRESULT (STDMETHODCALLTYPE *SendEndOfStream)( - IAMMediaTypeStream* This, - DWORD dwFlags); - - /*** IAMMediaTypeStream methods ***/ - HRESULT (STDMETHODCALLTYPE *GetFormat)( - IAMMediaTypeStream* This, - AM_MEDIA_TYPE* pMediaType, - DWORD dwFlags); - - HRESULT (STDMETHODCALLTYPE *SetFormat)( - IAMMediaTypeStream* This, - AM_MEDIA_TYPE* pMediaType, - DWORD dwFlags); - - HRESULT (STDMETHODCALLTYPE *CreateSample)( - IAMMediaTypeStream* This, - long lSampleSize, - BYTE* pbBuffer, - DWORD dwFlags, - IUnknown* pUnkOuter, - IAMMediaTypeSample** ppAMMediaTypeSample); - - HRESULT (STDMETHODCALLTYPE *GetStreamAllocatorRequirements)( - IAMMediaTypeStream* This, - ALLOCATOR_PROPERTIES* pProps); - - HRESULT (STDMETHODCALLTYPE *SetStreamAllocatorRequirements)( - IAMMediaTypeStream* This, - ALLOCATOR_PROPERTIES* pProps); - - END_INTERFACE -} IAMMediaTypeStreamVtbl; -interface IAMMediaTypeStream { - const IAMMediaTypeStreamVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IAMMediaTypeStream_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IAMMediaTypeStream_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IAMMediaTypeStream_Release(p) (p)->lpVtbl->Release(p) -/*** IMediaStream methods ***/ -#define IAMMediaTypeStream_GetMultiMediaStream(p,a) (p)->lpVtbl->GetMultiMediaStream(p,a) -#define IAMMediaTypeStream_GetInformation(p,a,b) (p)->lpVtbl->GetInformation(p,a,b) -#define IAMMediaTypeStream_SetSameFormat(p,a,b) (p)->lpVtbl->SetSameFormat(p,a,b) -#define IAMMediaTypeStream_AllocateSample(p,a,b) (p)->lpVtbl->AllocateSample(p,a,b) -#define IAMMediaTypeStream_CreateSharedSample(p,a,b,c) (p)->lpVtbl->CreateSharedSample(p,a,b,c) -#define IAMMediaTypeStream_SendEndOfStream(p,a) (p)->lpVtbl->SendEndOfStream(p,a) -/*** IAMMediaTypeStream methods ***/ -#define IAMMediaTypeStream_GetFormat(p,a,b) (p)->lpVtbl->GetFormat(p,a,b) -#define IAMMediaTypeStream_SetFormat(p,a,b) (p)->lpVtbl->SetFormat(p,a,b) -#define IAMMediaTypeStream_CreateSample(p,a,b,c,d,e) (p)->lpVtbl->CreateSample(p,a,b,c,d,e) -#define IAMMediaTypeStream_GetStreamAllocatorRequirements(p,a) (p)->lpVtbl->GetStreamAllocatorRequirements(p,a) -#define IAMMediaTypeStream_SetStreamAllocatorRequirements(p,a) (p)->lpVtbl->SetStreamAllocatorRequirements(p,a) -#endif - -#endif - -HRESULT CALLBACK IAMMediaTypeStream_GetFormat_Proxy( - IAMMediaTypeStream* This, - AM_MEDIA_TYPE* pMediaType, - DWORD dwFlags); -void __RPC_STUB IAMMediaTypeStream_GetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeStream_SetFormat_Proxy( - IAMMediaTypeStream* This, - AM_MEDIA_TYPE* pMediaType, - DWORD dwFlags); -void __RPC_STUB IAMMediaTypeStream_SetFormat_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeStream_CreateSample_Proxy( - IAMMediaTypeStream* This, - long lSampleSize, - BYTE* pbBuffer, - DWORD dwFlags, - IUnknown* pUnkOuter, - IAMMediaTypeSample** ppAMMediaTypeSample); -void __RPC_STUB IAMMediaTypeStream_CreateSample_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeStream_GetStreamAllocatorRequirements_Proxy( - IAMMediaTypeStream* This, - ALLOCATOR_PROPERTIES* pProps); -void __RPC_STUB IAMMediaTypeStream_GetStreamAllocatorRequirements_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeStream_SetStreamAllocatorRequirements_Proxy( - IAMMediaTypeStream* This, - ALLOCATOR_PROPERTIES* pProps); -void __RPC_STUB IAMMediaTypeStream_SetStreamAllocatorRequirements_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IAMMediaTypeStream_INTERFACE_DEFINED__ */ - -/***************************************************************************** - * IAMMediaTypeSample interface - */ -#ifndef __IAMMediaTypeSample_INTERFACE_DEFINED__ -#define __IAMMediaTypeSample_INTERFACE_DEFINED__ - -DEFINE_GUID(IID_IAMMediaTypeSample, 0xab6b4afb, 0xf6e4, 0x11d0, 0x90,0x0d, 0x00,0xc0,0x4f,0xd9,0x18,0x9d); -#if defined(__cplusplus) && !defined(CINTERFACE) -interface IAMMediaTypeSample : public IStreamSample -{ - virtual HRESULT STDMETHODCALLTYPE SetPointer( - BYTE* pBuffer, - long lSize) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetPointer( - BYTE** ppBuffer) = 0; - - virtual long STDMETHODCALLTYPE GetSize( - ) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetTime( - REFERENCE_TIME* pTimeStart, - REFERENCE_TIME* pTimeEnd) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetTime( - REFERENCE_TIME* pTimeStart, - REFERENCE_TIME* pTimeEnd) = 0; - - virtual HRESULT STDMETHODCALLTYPE IsSyncPoint( - ) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetSyncPoint( - BOOL bIsSyncPoint) = 0; - - virtual HRESULT STDMETHODCALLTYPE IsPreroll( - ) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetPreroll( - BOOL bIsPreroll) = 0; - - virtual long STDMETHODCALLTYPE GetActualDataLength( - ) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetActualDataLength( - long Len) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetMediaType( - AM_MEDIA_TYPE** ppMediaType) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetMediaType( - AM_MEDIA_TYPE* pMediaType) = 0; - - virtual HRESULT STDMETHODCALLTYPE IsDiscontinuity( - ) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetDiscontinuity( - BOOL bDiscontinuity) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetMediaTime( - LONGLONG* pTimeStart, - LONGLONG* pTimeEnd) = 0; - - virtual HRESULT STDMETHODCALLTYPE SetMediaTime( - LONGLONG* pTimeStart, - LONGLONG* pTimeEnd) = 0; - -}; -#else -typedef struct IAMMediaTypeSampleVtbl { - BEGIN_INTERFACE - - /*** IUnknown methods ***/ - HRESULT (STDMETHODCALLTYPE *QueryInterface)( - IAMMediaTypeSample* This, - REFIID riid, - void** ppvObject); - - ULONG (STDMETHODCALLTYPE *AddRef)( - IAMMediaTypeSample* This); - - ULONG (STDMETHODCALLTYPE *Release)( - IAMMediaTypeSample* This); - - /*** IStreamSample methods ***/ - HRESULT (STDMETHODCALLTYPE *GetMediaStream)( - IAMMediaTypeSample* This, - IMediaStream** ppMediaStream); - - HRESULT (STDMETHODCALLTYPE *GetSampleTimes)( - IAMMediaTypeSample* This, - STREAM_TIME* pStartTime, - STREAM_TIME* pEndTime, - STREAM_TIME* pCurrentTime); - - HRESULT (STDMETHODCALLTYPE *SetSampleTimes)( - IAMMediaTypeSample* This, - const STREAM_TIME* pStartTime, - const STREAM_TIME* pEndTime); - - HRESULT (STDMETHODCALLTYPE *Update)( - IAMMediaTypeSample* This, - DWORD dwFlags, - HANDLE hEvent, - PAPCFUNC pfnAPC, - DWORD dwAPCData); - - HRESULT (STDMETHODCALLTYPE *CompletionStatus)( - IAMMediaTypeSample* This, - DWORD dwFlags, - DWORD dwMilliseconds); - - /*** IAMMediaTypeSample methods ***/ - HRESULT (STDMETHODCALLTYPE *SetPointer)( - IAMMediaTypeSample* This, - BYTE* pBuffer, - long lSize); - - HRESULT (STDMETHODCALLTYPE *GetPointer)( - IAMMediaTypeSample* This, - BYTE** ppBuffer); - - long (STDMETHODCALLTYPE *GetSize)( - IAMMediaTypeSample* This); - - HRESULT (STDMETHODCALLTYPE *GetTime)( - IAMMediaTypeSample* This, - REFERENCE_TIME* pTimeStart, - REFERENCE_TIME* pTimeEnd); - - HRESULT (STDMETHODCALLTYPE *SetTime)( - IAMMediaTypeSample* This, - REFERENCE_TIME* pTimeStart, - REFERENCE_TIME* pTimeEnd); - - HRESULT (STDMETHODCALLTYPE *IsSyncPoint)( - IAMMediaTypeSample* This); - - HRESULT (STDMETHODCALLTYPE *SetSyncPoint)( - IAMMediaTypeSample* This, - BOOL bIsSyncPoint); - - HRESULT (STDMETHODCALLTYPE *IsPreroll)( - IAMMediaTypeSample* This); - - HRESULT (STDMETHODCALLTYPE *SetPreroll)( - IAMMediaTypeSample* This, - BOOL bIsPreroll); - - long (STDMETHODCALLTYPE *GetActualDataLength)( - IAMMediaTypeSample* This); - - HRESULT (STDMETHODCALLTYPE *SetActualDataLength)( - IAMMediaTypeSample* This, - long Len); - - HRESULT (STDMETHODCALLTYPE *GetMediaType)( - IAMMediaTypeSample* This, - AM_MEDIA_TYPE** ppMediaType); - - HRESULT (STDMETHODCALLTYPE *SetMediaType)( - IAMMediaTypeSample* This, - AM_MEDIA_TYPE* pMediaType); - - HRESULT (STDMETHODCALLTYPE *IsDiscontinuity)( - IAMMediaTypeSample* This); - - HRESULT (STDMETHODCALLTYPE *SetDiscontinuity)( - IAMMediaTypeSample* This, - BOOL bDiscontinuity); - - HRESULT (STDMETHODCALLTYPE *GetMediaTime)( - IAMMediaTypeSample* This, - LONGLONG* pTimeStart, - LONGLONG* pTimeEnd); - - HRESULT (STDMETHODCALLTYPE *SetMediaTime)( - IAMMediaTypeSample* This, - LONGLONG* pTimeStart, - LONGLONG* pTimeEnd); - - END_INTERFACE -} IAMMediaTypeSampleVtbl; -interface IAMMediaTypeSample { - const IAMMediaTypeSampleVtbl* lpVtbl; -}; - -#ifdef COBJMACROS -/*** IUnknown methods ***/ -#define IAMMediaTypeSample_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) -#define IAMMediaTypeSample_AddRef(p) (p)->lpVtbl->AddRef(p) -#define IAMMediaTypeSample_Release(p) (p)->lpVtbl->Release(p) -/*** IStreamSample methods ***/ -#define IAMMediaTypeSample_GetMediaStream(p,a) (p)->lpVtbl->GetMediaStream(p,a) -#define IAMMediaTypeSample_GetSampleTimes(p,a,b,c) (p)->lpVtbl->GetSampleTimes(p,a,b,c) -#define IAMMediaTypeSample_SetSampleTimes(p,a,b) (p)->lpVtbl->SetSampleTimes(p,a,b) -#define IAMMediaTypeSample_Update(p,a,b,c,d) (p)->lpVtbl->Update(p,a,b,c,d) -#define IAMMediaTypeSample_CompletionStatus(p,a,b) (p)->lpVtbl->CompletionStatus(p,a,b) -/*** IAMMediaTypeSample methods ***/ -#define IAMMediaTypeSample_SetPointer(p,a,b) (p)->lpVtbl->SetPointer(p,a,b) -#define IAMMediaTypeSample_GetPointer(p,a) (p)->lpVtbl->GetPointer(p,a) -#define IAMMediaTypeSample_GetSize(p) (p)->lpVtbl->GetSize(p) -#define IAMMediaTypeSample_GetTime(p,a,b) (p)->lpVtbl->GetTime(p,a,b) -#define IAMMediaTypeSample_SetTime(p,a,b) (p)->lpVtbl->SetTime(p,a,b) -#define IAMMediaTypeSample_IsSyncPoint(p) (p)->lpVtbl->IsSyncPoint(p) -#define IAMMediaTypeSample_SetSyncPoint(p,a) (p)->lpVtbl->SetSyncPoint(p,a) -#define IAMMediaTypeSample_IsPreroll(p) (p)->lpVtbl->IsPreroll(p) -#define IAMMediaTypeSample_SetPreroll(p,a) (p)->lpVtbl->SetPreroll(p,a) -#define IAMMediaTypeSample_GetActualDataLength(p) (p)->lpVtbl->GetActualDataLength(p) -#define IAMMediaTypeSample_SetActualDataLength(p,a) (p)->lpVtbl->SetActualDataLength(p,a) -#define IAMMediaTypeSample_GetMediaType(p,a) (p)->lpVtbl->GetMediaType(p,a) -#define IAMMediaTypeSample_SetMediaType(p,a) (p)->lpVtbl->SetMediaType(p,a) -#define IAMMediaTypeSample_IsDiscontinuity(p) (p)->lpVtbl->IsDiscontinuity(p) -#define IAMMediaTypeSample_SetDiscontinuity(p,a) (p)->lpVtbl->SetDiscontinuity(p,a) -#define IAMMediaTypeSample_GetMediaTime(p,a,b) (p)->lpVtbl->GetMediaTime(p,a,b) -#define IAMMediaTypeSample_SetMediaTime(p,a,b) (p)->lpVtbl->SetMediaTime(p,a,b) -#endif - -#endif - -HRESULT CALLBACK IAMMediaTypeSample_SetPointer_Proxy( - IAMMediaTypeSample* This, - BYTE* pBuffer, - long lSize); -void __RPC_STUB IAMMediaTypeSample_SetPointer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_GetPointer_Proxy( - IAMMediaTypeSample* This, - BYTE** ppBuffer); -void __RPC_STUB IAMMediaTypeSample_GetPointer_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -long CALLBACK IAMMediaTypeSample_GetSize_Proxy( - IAMMediaTypeSample* This); -void __RPC_STUB IAMMediaTypeSample_GetSize_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_GetTime_Proxy( - IAMMediaTypeSample* This, - REFERENCE_TIME* pTimeStart, - REFERENCE_TIME* pTimeEnd); -void __RPC_STUB IAMMediaTypeSample_GetTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_SetTime_Proxy( - IAMMediaTypeSample* This, - REFERENCE_TIME* pTimeStart, - REFERENCE_TIME* pTimeEnd); -void __RPC_STUB IAMMediaTypeSample_SetTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_IsSyncPoint_Proxy( - IAMMediaTypeSample* This); -void __RPC_STUB IAMMediaTypeSample_IsSyncPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_SetSyncPoint_Proxy( - IAMMediaTypeSample* This, - BOOL bIsSyncPoint); -void __RPC_STUB IAMMediaTypeSample_SetSyncPoint_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_IsPreroll_Proxy( - IAMMediaTypeSample* This); -void __RPC_STUB IAMMediaTypeSample_IsPreroll_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_SetPreroll_Proxy( - IAMMediaTypeSample* This, - BOOL bIsPreroll); -void __RPC_STUB IAMMediaTypeSample_SetPreroll_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -long CALLBACK IAMMediaTypeSample_GetActualDataLength_Proxy( - IAMMediaTypeSample* This); -void __RPC_STUB IAMMediaTypeSample_GetActualDataLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_SetActualDataLength_Proxy( - IAMMediaTypeSample* This, - long Len); -void __RPC_STUB IAMMediaTypeSample_SetActualDataLength_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_GetMediaType_Proxy( - IAMMediaTypeSample* This, - AM_MEDIA_TYPE** ppMediaType); -void __RPC_STUB IAMMediaTypeSample_GetMediaType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_SetMediaType_Proxy( - IAMMediaTypeSample* This, - AM_MEDIA_TYPE* pMediaType); -void __RPC_STUB IAMMediaTypeSample_SetMediaType_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_IsDiscontinuity_Proxy( - IAMMediaTypeSample* This); -void __RPC_STUB IAMMediaTypeSample_IsDiscontinuity_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_SetDiscontinuity_Proxy( - IAMMediaTypeSample* This, - BOOL bDiscontinuity); -void __RPC_STUB IAMMediaTypeSample_SetDiscontinuity_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_GetMediaTime_Proxy( - IAMMediaTypeSample* This, - LONGLONG* pTimeStart, - LONGLONG* pTimeEnd); -void __RPC_STUB IAMMediaTypeSample_GetMediaTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); -HRESULT CALLBACK IAMMediaTypeSample_SetMediaTime_Proxy( - IAMMediaTypeSample* This, - LONGLONG* pTimeStart, - LONGLONG* pTimeEnd); -void __RPC_STUB IAMMediaTypeSample_SetMediaTime_Stub( - IRpcStubBuffer* This, - IRpcChannelBuffer* pRpcChannelBuffer, - PRPC_MESSAGE pRpcMessage, - DWORD* pdwStubPhase); - -#endif /* __IAMMediaTypeSample_INTERFACE_DEFINED__ */ - -/***************************************************************************** - * AMMultiMediaStream coclass - */ - -DEFINE_GUID(CLSID_AMMultiMediaStream, 0x49c47ce5, 0x9ba4, 0x11d0, 0x82,0x12, 0x00,0xc0,0x4f,0xc3,0x2c,0x45); - -#ifndef __IDirectShowStream_FWD_DEFINED__ -#define __IDirectShowStream_FWD_DEFINED__ -typedef interface IDirectShowStream IDirectShowStream; -#endif - -DEFINE_GUID(CLSID_AMDirectDrawStream, 0x49c47ce4, 0x9ba4, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45); -DEFINE_GUID(CLSID_AMAudioStream, 0x8496e040, 0xaf4c, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45); -DEFINE_GUID(CLSID_AMAudioData, 0xf2468580, 0xaf8a, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45); -DEFINE_GUID(CLSID_AMMediaTypeStream, 0xcf0f2f7c, 0xf7bf, 0x11d0, 0x90, 0x0d, 0x00, 0xc0, 0x4f, 0xd9, 0x18, 0x9d); -/* Begin additional prototypes for all interfaces */ - - -/* End additional prototypes */ - -#ifdef __cplusplus -} -#endif -#endif /* __WIDL_INCLUDE_PSDK_AMSTREAM_H */ Removed: trunk/reactos/include/psdk/amstream.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/amstream.idl?… ============================================================================== --- trunk/reactos/include/psdk/amstream.idl (original) +++ trunk/reactos/include/psdk/amstream.idl (removed) @@ -1,319 +1,0 @@ -/* - * Copyright 2004 Christian Costa - * - * 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 - */ - -import "unknwn.idl"; -import "mmstream.idl"; -import "strmif.idl"; - -cpp_quote("#include <ddraw.h>") -cpp_quote("#include <mmsystem.h>") -cpp_quote("#include <mmstream.h>") -cpp_quote("#include <ddstream.h>") -cpp_quote("#include <austream.h>") - -cpp_quote("#if 0") -interface IDirectDraw; -interface IDirectDrawSurface; -cpp_quote("#endif") - -interface IAMMultiMediaStream; -interface IAMMediaStream; -interface IMediaStreamFilter; -interface IAMMediaTypeStream; -interface IAMMediaTypeSample; - -enum { - AMMSF_NOGRAPHTHREAD = 0x00000001 -}; - -enum { - AMMSF_ADDDEFAULTRENDERER = 0x00000001, - AMMSF_CREATEPEER = 0x00000002, - AMMSF_STOPIFNOSAMPLES = 0x00000004, - AMMSF_NOSTALL = 0x00000008 -}; - -enum { - AMMSF_RENDERTYPEMASK = 0x00000003, - AMMSF_RENDERTOEXISTING = 0x00000000, - AMMSF_RENDERALLSTREAMS = 0x00000001, - AMMSF_NORENDER = 0x00000002, - AMMSF_NOCLOCK = 0x00000004, - AMMSF_RUN = 0x00000008 -}; - - -typedef [v1_enum] enum { - Disabled = 0, - ReadData = 1, - RenderData = 2 -} OUTPUT_STATE; - -/* -[ -object, -uuid(7DB01C96-C0C3-11d0-8FF1-00C04FD9189D), -dual, -helpstring("IDirectShowStream Interface"), -pointer_default(unique) -] -interface IDirectShowStream : IDispatch -{ - [propget, id(1), helpstring("property FileName")] HRESULT FileName([out, retval] BSTR *pVal); - [propput, id(1), helpstring("property FileName")] HRESULT FileName([in] BSTR newVal); - [propget, id(2), helpstring("property Video")] HRESULT Video([out, retval] OUTPUT_STATE *pVal); - [propput, id(2), helpstring("propetry Video")] HRESULT Video([in] OUTPUT_STATE newVal); - [propget, id(3), helpstring("property Audio")] HRESULT Audio([out, retval] OUTPUT_STATE *pVal); - [propput, id(3), helpstring("propetry Audio")] HRESULT Audio([in] OUTPUT_STATE newVal); -}; -*/ - -[ -object, -uuid(BEBE595C-9A6F-11d0-8FDE-00C04FD9189D), -pointer_default(unique) -] -interface IAMMultiMediaStream : IMultiMediaStream -{ - HRESULT Initialize( - [in] STREAM_TYPE StreamType, - [in] DWORD dwFlags, - [in, optional] IGraphBuilder *pFilterGraph); - - HRESULT GetFilterGraph( - [out] IGraphBuilder **ppGraphBuilder); - - HRESULT GetFilter( - [out] IMediaStreamFilter **ppFilter); - - HRESULT AddMediaStream( - [in, optional] IUnknown *pStreamObject, - [in, optional] const MSPID *PurposeId, - [in] DWORD dwFlags, - [out, optional] IMediaStream **ppNewStream); - - HRESULT OpenFile( - [in] LPCWSTR pszFileName, - [in] DWORD dwFlags); - - HRESULT OpenMoniker( - [in] IBindCtx *pCtx, - [in] IMoniker *pMoniker, - [in] DWORD dwFlags); - - HRESULT Render( - [in] DWORD dwFlags); -} - - -[ -object, -uuid(BEBE595D-9A6F-11d0-8FDE-00C04FD9189D), -pointer_default(unique) -] -interface IAMMediaStream : IMediaStream -{ - HRESULT Initialize( - [in, optional] IUnknown *pSourceObject, - [in] DWORD dwFlags, - [in] REFMSPID PurposeId, - [in] const STREAM_TYPE StreamType); - - HRESULT SetState( - [in] FILTER_STATE State); - - HRESULT JoinAMMultiMediaStream( - [in] IAMMultiMediaStream *pAMMultiMediaStream); - - HRESULT JoinFilter( - [in] IMediaStreamFilter *pMediaStreamFilter); - - HRESULT JoinFilterGraph( - [in] IFilterGraph *pFilterGraph); -} - - -[ -object, -local, -uuid(BEBE595E-9A6F-11d0-8FDE-00C04FD9189D), -pointer_default(unique) -] -interface IMediaStreamFilter : IBaseFilter -{ - HRESULT AddMediaStream( - [in] IAMMediaStream *pAMMediaStream); - - HRESULT GetMediaStream( - [in] REFMSPID idPurpose, - [out] IMediaStream **ppMediaStream); - - HRESULT EnumMediaStreams( - [in] long Index, - [out] IMediaStream **ppMediaStream); - - HRESULT SupportSeeking( - [in] BOOL bRenderer); - - HRESULT ReferenceTimeToStreamTime( - [in] [out] REFERENCE_TIME *pTime); - - HRESULT GetCurrentStreamTime( - [out] REFERENCE_TIME *pCurrentStreamTime); - - HRESULT WaitUntil( - [in] REFERENCE_TIME WaitStreamTime); - - HRESULT Flush( - [in] BOOL bCancelEOS); - - HRESULT EndOfStream(); -} - - -[ -object, -local, -uuid(AB6B4AFC-F6E4-11d0-900D-00C04FD9189D), -pointer_default(unique) -] -interface IDirectDrawMediaSampleAllocator : IUnknown -{ - HRESULT GetDirectDraw(IDirectDraw **ppDirectDraw); -} - - -[ -object, -local, -uuid(AB6B4AFE-F6E4-11d0-900D-00C04FD9189D), -pointer_default(unique) -] -interface IDirectDrawMediaSample : IUnknown -{ - HRESULT GetSurfaceAndReleaseLock( - [out] IDirectDrawSurface **ppDirectDrawSurface, - [out] RECT * pRect); - - HRESULT LockMediaSamplePointer(void); -} - - -[ -object, -local, -uuid(AB6B4AFA-F6E4-11d0-900D-00C04FD9189D), -pointer_default(unique) -] - -interface IAMMediaTypeStream : IMediaStream -{ - HRESULT GetFormat( - [out] AM_MEDIA_TYPE * pMediaType, - [in] DWORD dwFlags); - - HRESULT SetFormat( - [in] AM_MEDIA_TYPE * pMediaType, - [in] DWORD dwFlags); - - HRESULT CreateSample( - [in] long lSampleSize, - [in, optional] BYTE * pbBuffer, - [in] DWORD dwFlags, - [in, optional] IUnknown *pUnkOuter, - [out] IAMMediaTypeSample ** ppAMMediaTypeSample); - - HRESULT GetStreamAllocatorRequirements( - [out] ALLOCATOR_PROPERTIES *pProps); - - HRESULT SetStreamAllocatorRequirements( - [in] ALLOCATOR_PROPERTIES *pProps); -} - - -[ -object, -local, -uuid(AB6B4AFB-F6E4-11d0-900D-00C04FD9189D), -pointer_default(unique) -] -interface IAMMediaTypeSample : IStreamSample -{ - HRESULT SetPointer( - [in] BYTE *pBuffer, - [in] long lSize); - - HRESULT GetPointer( - [out] BYTE ** ppBuffer); - - long GetSize(void); - - HRESULT GetTime( - [out] REFERENCE_TIME * pTimeStart, - [out] REFERENCE_TIME * pTimeEnd); - - HRESULT SetTime( - [in] REFERENCE_TIME * pTimeStart, - [in] REFERENCE_TIME * pTimeEnd); - - HRESULT IsSyncPoint(void); - - HRESULT SetSyncPoint( - BOOL bIsSyncPoint); - - HRESULT IsPreroll(void); - - HRESULT SetPreroll( - BOOL bIsPreroll); - - long GetActualDataLength(void); - - HRESULT SetActualDataLength(long Len); - - HRESULT GetMediaType( - AM_MEDIA_TYPE **ppMediaType); - - HRESULT SetMediaType( - AM_MEDIA_TYPE *pMediaType); - - HRESULT IsDiscontinuity(void); - - HRESULT SetDiscontinuity( - BOOL bDiscontinuity); - - HRESULT GetMediaTime( - [out] LONGLONG * pTimeStart, - [out] LONGLONG * pTimeEnd); - - HRESULT SetMediaTime( - [in] LONGLONG * pTimeStart, - [in] LONGLONG * pTimeEnd); -} - -[ - uuid(49C47CE5-9BA4-11d0-8212-00C04FC32C45) -] -coclass AMMultiMediaStream -{ - [default] dispinterface IDirectShowStream; -} - -cpp_quote("DEFINE_GUID(CLSID_AMDirectDrawStream, 0x49c47ce4, 0x9ba4, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45);") -cpp_quote("DEFINE_GUID(CLSID_AMAudioStream, 0x8496e040, 0xaf4c, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45);") -cpp_quote("DEFINE_GUID(CLSID_AMAudioData, 0xf2468580, 0xaf8a, 0x11d0, 0x82, 0x12, 0x00, 0xc0, 0x4f, 0xc3, 0x2c, 0x45);") -cpp_quote("DEFINE_GUID(CLSID_AMMediaTypeStream, 0xcf0f2f7c, 0xf7bf, 0x11d0, 0x90, 0x0d, 0x00, 0xc0, 0x4f, 0xd9, 0x18, 0x9d);") Removed: trunk/reactos/include/psdk/amvideo.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/amvideo.idl?r… ============================================================================== --- trunk/reactos/include/psdk/amvideo.idl (original) +++ trunk/reactos/include/psdk/amvideo.idl (removed) @@ -1,232 +1,0 @@ -/* - * Copyright (C) 2003 Robert Shearman - * - * 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 - */ - -import "objidl.idl"; - -/* trick widl into thinking that it knows the DirectDraw types - * as there is no IDL file for them (yet) */ -cpp_quote("#if 0") -typedef void * LPDIRECTDRAW; -typedef void DDSURFACEDESC,DDCAPS; -typedef DWORD RGBQUAD; -typedef LONGLONG REFERENCE_TIME; -typedef struct -{ - DWORD biSize; - LONG biWidth; - LONG biHeight; - WORD biPlanes; - WORD biBitCount; - DWORD biCompression; - DWORD biSizeImage; - LONG biXPelsPerMeter; - LONG biYPelsPerMeter; - DWORD biClrUsed; - DWORD biClrImportant; -} BITMAPINFOHEADER, *PBITMAPINFOHEADER, *LPBITMAPINFOHEADER; -cpp_quote("#endif") - -cpp_quote("#include <ddraw.h>") - -cpp_quote("#define AMDDS_NONE 0x00") -cpp_quote("#define AMDDS_DCIPS 0x01") -cpp_quote("#define AMDDS_PS 0x02") -cpp_quote("#define AMDDS_RGBOVR 0x04") -cpp_quote("#define AMDDS_YUVOVR 0x08") -cpp_quote("#define AMDDS_RGBOFF 0x10") -cpp_quote("#define AMDDS_YUVOFF 0x20") -cpp_quote("#define AMDDS_RGBFLP 0x40") -cpp_quote("#define AMDDS_YUVFLP 0x80") -cpp_quote("#define AMDDS_ALL 0xFF") -cpp_quote("#define AMDDS_DEFAULT AMDDS_ALL") - -cpp_quote("#define AMDDS_YUV (AMDDS_YUVOFF | AMDDS_YUVOVR | AMDDS_YUVFLP)") -cpp_quote("#define AMDDS_RGB (AMDDS_RGBOFF | AMDDS_RGBOVR | AMDDS_RGBFLP)") -cpp_quote("#define AMDSS_PRIMARY (AMDDS_DCIPS | AMDDS_PS)") - -[ - object, - pointer_default(unique) -] -interface IDirectDrawVideo : IUnknown -{ - HRESULT GetSwitches([out] DWORD * pSwitches); - HRESULT SetSwitches([in] DWORD Switches); - HRESULT GetCaps([out] DDCAPS * pCaps); - HRESULT GetEmulatedCaps([out] DDCAPS *pCaps); - HRESULT GetSurfaceDesc([out] DDSURFACEDESC * pSurfaceDesc); - HRESULT GetFourCCCodes([out] DWORD * pCount, [out] DWORD * pCodes); - HRESULT SetDirectDraw([in] LPDIRECTDRAW pDirectDraw); - HRESULT GetDirectDraw([out] LPDIRECTDRAW * ppDirectDraw); - HRESULT GetSurfaceType([out] DWORD * pSurfaceType); - HRESULT SetDefault(); - HRESULT UseScanLine([in] long UseScanLine); - HRESULT CanUseScanLine([out] long * UseScanLine); - HRESULT UseOverlayStretch([in] long UseOverlayStretch); - HRESULT CanUseOverlayStretch([out] long * UseOverlayStretch); - HRESULT UseWhenFullScreen([in] long UseWhenFullScreen); - HRESULT WillUseFullScreen([out] long * UseWhenFullScreen); -} - -[ - object, - pointer_default(unique) -] -interface IQualProp : IUnknown -{ - [propget] HRESULT FramesDroppedInRenderer([out] int * pcFrames); - [propget] HRESULT FramesDrawn([out] int * pcFramesDrawn); - [propget] HRESULT AvgFrameRate([out] int * piAvgFrameRate); - [propget] HRESULT Jitter([out] int * iJitter); - [propget] HRESULT AvgSyncOffset([out] int * piAvg); - [propget] HRESULT DevSyncOffset([out] int * piDev); -} - -[ - object, - pointer_default(unique) -] -interface IFullScreenVideo : IUnknown -{ - HRESULT CountModes([out] long * pModes); - HRESULT GetModeInfo([in] long Mode, [out] long * pWidth, [out] long * pHeight, [out] long * pDepth); - HRESULT GetCurrentMode([out] long * pMode); - HRESULT IsModeAvailable([in] long Mode); - HRESULT IsModeEnabled([in] long Mode); - HRESULT SetEnabled([in] long Mode, [in] long bEnabled); - HRESULT GetClipFactor([out] long * pClipFactor); - HRESULT SetClipFactor([in] long ClipFactor); - HRESULT SetMessageDrain([in] HWND hwnd); - HRESULT GetMessageDrain([out] HWND * hwnd); - HRESULT SetMonitor([in] long Monitor); - HRESULT GetMonitor([out] long * Monitor); - HRESULT HideOnDeactivate([in] long Hide); - HRESULT IsHideOnDeactivate(); - HRESULT SetCaption([in] BSTR strCaption); - HRESULT GetCaption([out] BSTR * pstrCaption); - HRESULT SetDefault(); -} - -[ - object, - pointer_default(unique) -] -interface IFullScreenVideoEx : IFullScreenVideo -{ - HRESULT SetAcceleratorTable([in] HWND hwnd, [in] HACCEL hAccel); - HRESULT GetAcceleratorTable([out] HWND * phwnd, [out] HACCEL * phAccel); - HRESULT KeepPixelAspectRatio([in] long KeepAspect); - /* FIXME: not sure is this next method is an [out] */ - HRESULT IsKeepPixelAspectRatio([out] long * pKeepAspect); -} - -[ - object, - pointer_default(unique) -] -interface IBaseVideoMixer : IUnknown -{ - HRESULT SetLeadPin([in] int iPin); - HRESULT GetLeadPin([out] int * piPin); - HRESULT GetInputPinCount([out] int * piPinCount); - HRESULT IsUsingClock([out] int * pbValue); - HRESULT SetUsingClock([in] int bValue); - HRESULT GetClockPeriod([out] int * pbValue); - HRESULT SetClockPeriod([in] int bValue); -} - -#define iPALETTE_COLORS 256 -#define iMASK_COLORS 3 - -cpp_quote("#define iPALETTE_COLORS 256") -cpp_quote("#define iEGA_COLORS 16") -cpp_quote("#define iMASK_COLORS 3") -cpp_quote("#define iTRUECOLOR 16") -cpp_quote("#define iRED 0") -cpp_quote("#define iGREEN 1") -cpp_quote("#define iBLUE 2") -cpp_quote("#define iPALETTE 8") -cpp_quote("#define iMAXBITS 8") - -typedef struct tag_TRUECOLORINFO -{ - DWORD dwBitMasks[iMASK_COLORS]; - RGBQUAD bmiColors[iPALETTE_COLORS]; -} TRUECOLORINFO; - -typedef struct tagVIDEOINFOHEADER -{ - RECT rcSource; - RECT rcTarget; - DWORD dwBitRate; - DWORD dwBitErrorRate; - REFERENCE_TIME AvgTimePerFrame; - - BITMAPINFOHEADER bmiHeader; -} VIDEOINFOHEADER; - -typedef struct tagVIDEOINFO -{ - RECT rcSource; - RECT rcTarget; - DWORD dwBitRate; - DWORD dwBitErrorRate; - REFERENCE_TIME AvgTimePerFrame; - - BITMAPINFOHEADER bmiHeader; - - union - { - RGBQUAD bmiColors[iPALETTE_COLORS]; - DWORD dwBitMasks[iMASK_COLORS]; - TRUECOLORINFO TrueColorInfo; - }; -} VIDEOINFO; - -typedef struct tagMPEG1VIDEOINFO -{ - VIDEOINFOHEADER hdr; - DWORD dwStartTimeCode; - DWORD cbSequenceHeader; - BYTE bSequenceHeader[1]; -} MPEG1VIDEOINFO; - -cpp_quote("#define MAX_SIZE_MPEG1_SEQUENCE_INFO 140") -cpp_quote("#define MPEG1_SEQUENCE_INFO(pv) ((const BYTE *)(pv)->bSequenceHeader)") - -typedef struct tagAnalogVideoInfo -{ - RECT rcSource; - RECT rcTarget; - DWORD dwActiveWidth; - DWORD dwActiveHeight; - REFERENCE_TIME AvgTimePerFrame; -} ANALOGVIDEOINFO; - -typedef enum -{ - AM_PROPERTY_FRAMESTEP_STEP = 0x01, - AM_PROPERTY_FRAMESTEP_CANCEL = 0x02, - AM_PROPERTY_FRAMESTEP_CANSTEP = 0x03, - AM_PROPERTY_FRAMESTEP_CANSTEPMULTIPLE = 0x04 -} AM_PROPERTY_FRAMESTEP; - -typedef struct _AM_FRAMESTEP_STEP -{ - DWORD dwFramesToStep; -} AM_FRAMESTEP_STEP;

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