Parent Directory
| 
Revision Log
Revision 1521 - (view) (download)
| 1 : | suxen_drol | 1521 | diff -rubN /c/DX90SDK-orig/Include/strmif.h ./Include/strmif.h |
| 2 : | --- /c/DX90SDK-orig/Include/strmif.h Mon Aug 18 21:22:54 2003 | ||
| 3 : | +++ ./Include/strmif.h Wed Jul 21 21:45:28 2004 | ||
| 4 : | @@ -5604,7 +5604,7 @@ | ||
| 5 : | { | ||
| 6 : | DWORD dwVersion; | ||
| 7 : | DWORD dwMerit; | ||
| 8 : | - /* [switch_type][switch_is] */ union | ||
| 9 : | + /* [switch_type][switch_is] */ struct | ||
| 10 : | { | ||
| 11 : | /* [case()] */ struct | ||
| 12 : | { | ||
| 13 : | @@ -28732,8 +28732,8 @@ | ||
| 14 : | |||
| 15 : | typedef struct tagVMRGUID | ||
| 16 : | { | ||
| 17 : | - GUID *pGUID; | ||
| 18 : | - GUID GUID; | ||
| 19 : | + ::GUID *pGUID; | ||
| 20 : | + ::GUID GUID; | ||
| 21 : | } VMRGUID; | ||
| 22 : | |||
| 23 : | typedef struct tagVMRMONITORINFO | ||
| 24 : | diff -rubN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/Makefile ./Samples/C++/DirectShow/BaseClasses/Makefile | ||
| 25 : | --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/Makefile Thu Jan 1 10:00:00 1970 | ||
| 26 : | +++ ./Samples/C++/DirectShow/BaseClasses/Makefile Wed Jul 21 21:19:30 2004 | ||
| 27 : | @@ -0,0 +1,25 @@ | ||
| 28 : | +SRC=amextra.cpp amfilter.cpp amvideo.cpp combase.cpp cprop.cpp ctlutil.cpp ddmm.cpp dllentry.cpp dllsetup.cpp mtype.cpp outputq.cpp pstream.cpp pullpin.cpp refclock.cpp renbase.cpp schedule.cpp seekpt.cpp source.cpp strmctl.cpp sysclock.cpp transfrm.cpp transip.cpp videoctl.cpp vtrans.cpp winctrl.cpp winutil.cpp wxdebug.cpp wxlist.cpp wxutil.cpp | ||
| 29 : | + | ||
| 30 : | +DXTREE=../../../.. | ||
| 31 : | +DXBASECLASSES=$(DXTREE)/Samples/C++/DirectShow/BaseClasses | ||
| 32 : | +OBJ=$(SRC:.cpp=.o) | ||
| 33 : | +LIB=strmbase.lib | ||
| 34 : | + | ||
| 35 : | +CXX=g++ | ||
| 36 : | +CXXFLAGS=-O2 -fno-for-scope -mthreads | ||
| 37 : | + | ||
| 38 : | +all: $(LIB) | ||
| 39 : | + | ||
| 40 : | +$(LIB): $(OBJ) | ||
| 41 : | + $(AR) $(ARFLAGS) $@ $^ | ||
| 42 : | + | ||
| 43 : | +.cpp.o: | ||
| 44 : | + $(CXX) $(CXXFLAGS) \ | ||
| 45 : | + -DRELEASE \ | ||
| 46 : | + -I$(DXTREE)/Include \ | ||
| 47 : | + -I$(DXBASECLASSES) \ | ||
| 48 : | + -include $(DXTREE)/mingw_dshow_port.h \ | ||
| 49 : | + -c $(CXXFLAGS) $< -o $@ | ||
| 50 : | + | ||
| 51 : | +clean: | ||
| 52 : | + rm $(OBJ) | ||
| 53 : | diff -rubN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/amfilter.cpp ./Samples/C++/DirectShow/BaseClasses/amfilter.cpp | ||
| 54 : | --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/amfilter.cpp Mon Aug 18 16:03:32 2003 | ||
| 55 : | +++ ./Samples/C++/DirectShow/BaseClasses/amfilter.cpp Sun Jul 25 13:06:01 2004 | ||
| 56 : | @@ -1363,7 +1363,7 @@ | ||
| 57 : | |||
| 58 : | /* Make sure the destructor doesn't free these */ | ||
| 59 : | cmt.pbFormat = NULL; | ||
| 60 : | - cmt.cbFormat = NULL; | ||
| 61 : | + cmt.cbFormat = 0; | ||
| 62 : | cmt.pUnk = NULL; | ||
| 63 : | |||
| 64 : | |||
| 65 : | diff -rubN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/ctlutil.cpp ./Samples/C++/DirectShow/BaseClasses/ctlutil.cpp | ||
| 66 : | --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/ctlutil.cpp Mon Aug 18 16:03:32 2003 | ||
| 67 : | +++ ./Samples/C++/DirectShow/BaseClasses/ctlutil.cpp Sun Jul 25 13:03:03 2004 | ||
| 68 : | @@ -709,7 +709,7 @@ | ||
| 69 : | |||
| 70 : | HRESULT | ||
| 71 : | CPosPassThru::GetSeekingLongLong | ||
| 72 : | -( HRESULT (__stdcall IMediaSeeking::*pMethod)( LONGLONG * ) | ||
| 73 : | +( HRESULT ( GETSEEKINGLONGLONG_CALL IMediaSeeking::*pMethod)( LONGLONG * ) | ||
| 74 : | , LONGLONG * pll | ||
| 75 : | ) | ||
| 76 : | { | ||
| 77 : | diff -rubN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/ctlutil.h ./Samples/C++/DirectShow/BaseClasses/ctlutil.h | ||
| 78 : | --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/ctlutil.h Mon Aug 18 16:03:32 2003 | ||
| 79 : | +++ ./Samples/C++/DirectShow/BaseClasses/ctlutil.h Sun Jul 25 13:02:59 2004 | ||
| 80 : | @@ -275,7 +275,7 @@ | ||
| 81 : | // Prevent bugs from constructing from LONG (which gets | ||
| 82 : | // converted to double and then multiplied by 10000000 | ||
| 83 : | COARefTime(LONG); | ||
| 84 : | - operator=(LONG); | ||
| 85 : | + COARefTime& operator=(LONG); | ||
| 86 : | }; | ||
| 87 : | |||
| 88 : | |||
| 89 : | @@ -355,7 +355,12 @@ | ||
| 90 : | STDMETHODIMP CanSeekBackward(LONG *pCanSeekBackward); | ||
| 91 : | |||
| 92 : | private: | ||
| 93 : | - HRESULT GetSeekingLongLong( HRESULT (__stdcall IMediaSeeking::*pMethod)( LONGLONG * ), | ||
| 94 : | +#if !defined(__GNUC__) | ||
| 95 : | +#define GETSEEKINGLONGLONG_CALL __stdcall | ||
| 96 : | +#else | ||
| 97 : | +#define GETSEEKINGLONGLONG_CALL | ||
| 98 : | +#endif | ||
| 99 : | + HRESULT GetSeekingLongLong( HRESULT ( GETSEEKINGLONGLONG_CALL IMediaSeeking::*pMethod)( LONGLONG * ), | ||
| 100 : | LONGLONG * pll ); | ||
| 101 : | }; | ||
| 102 : | |||
| 103 : | diff -rubN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/ddmm.cpp ./Samples/C++/DirectShow/BaseClasses/ddmm.cpp | ||
| 104 : | --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/ddmm.cpp Mon Aug 18 16:03:32 2003 | ||
| 105 : | +++ ./Samples/C++/DirectShow/BaseClasses/ddmm.cpp Wed Jul 21 21:19:30 2004 | ||
| 106 : | @@ -17,8 +17,8 @@ | ||
| 107 : | */ | ||
| 108 : | typedef struct { | ||
| 109 : | LPSTR szDevice; | ||
| 110 : | - GUID* lpGUID; | ||
| 111 : | - GUID GUID; | ||
| 112 : | + ::GUID* lpGUID; | ||
| 113 : | + ::GUID GUID; | ||
| 114 : | BOOL fFound; | ||
| 115 : | } FindDeviceData; | ||
| 116 : | |||
| 117 : | diff -rubN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/mtype.cpp ./Samples/C++/DirectShow/BaseClasses/mtype.cpp | ||
| 118 : | --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/mtype.cpp Mon Aug 18 16:03:32 2003 | ||
| 119 : | +++ ./Samples/C++/DirectShow/BaseClasses/mtype.cpp Wed Jul 21 21:19:30 2004 | ||
| 120 : | @@ -13,7 +13,6 @@ | ||
| 121 : | // in the streams IDL file, but also has (non-virtual) functions | ||
| 122 : | |||
| 123 : | #include <streams.h> | ||
| 124 : | -#include <mmreg.h> | ||
| 125 : | |||
| 126 : | CMediaType::~CMediaType(){ | ||
| 127 : | FreeMediaType(*this); | ||
| 128 : | diff -rubN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/refclock.h ./Samples/C++/DirectShow/BaseClasses/refclock.h | ||
| 129 : | --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/refclock.h Mon Aug 18 16:03:32 2003 | ||
| 130 : | +++ ./Samples/C++/DirectShow/BaseClasses/refclock.h Sun Jul 25 12:36:21 2004 | ||
| 131 : | @@ -14,7 +14,11 @@ | ||
| 132 : | |||
| 133 : | const UINT RESOLUTION = 1; /* High resolution timer */ | ||
| 134 : | const INT ADVISE_CACHE = 4; /* Default cache size */ | ||
| 135 : | +#if !defined(__GNUC__) | ||
| 136 : | const LONGLONG MAX_TIME = 0x7FFFFFFFFFFFFFFF; /* Maximum LONGLONG value */ | ||
| 137 : | +#else | ||
| 138 : | +const LONGLONG MAX_TIME = 0x7FFFFFFFFFFFFFFFLL; /* Maximum LONGLONG value */ | ||
| 139 : | +#endif | ||
| 140 : | |||
| 141 : | inline LONGLONG WINAPI ConvertToMilliseconds(const REFERENCE_TIME& RT) | ||
| 142 : | { | ||
| 143 : | diff -rubN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/wxdebug.cpp ./Samples/C++/DirectShow/BaseClasses/wxdebug.cpp | ||
| 144 : | --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/wxdebug.cpp Mon Aug 18 16:03:32 2003 | ||
| 145 : | +++ ./Samples/C++/DirectShow/BaseClasses/wxdebug.cpp Wed Jul 21 21:19:30 2004 | ||
| 146 : | @@ -564,7 +564,7 @@ | ||
| 147 : | { | ||
| 148 : | // re-read the registry every second. We cannot use RegNotify() to | ||
| 149 : | // notice registry changes because it's not available on win9x. | ||
| 150 : | - static g_dwLastRefresh = 0; | ||
| 151 : | + static DWORD g_dwLastRefresh = 0; | ||
| 152 : | DWORD dwTime = timeGetTime(); | ||
| 153 : | if(dwTime - g_dwLastRefresh > 1000) { | ||
| 154 : | g_dwLastRefresh = dwTime; | ||
| 155 : | @@ -1143,7 +1143,33 @@ | ||
| 156 : | hr = pUnk->QueryInterface(IID_IPin, (void **)&pp); | ||
| 157 : | if(SUCCEEDED(hr)) | ||
| 158 : | { | ||
| 159 : | - CDisp::CDisp(pp); | ||
| 160 : | +/* --- copy from CDisp::CDisp(IPin*) --- */ | ||
| 161 : | + PIN_INFO pi; | ||
| 162 : | + TCHAR str[MAX_PIN_NAME]; | ||
| 163 : | + CLSID clsid; | ||
| 164 : | + | ||
| 165 : | + if (pp) { | ||
| 166 : | + pp->QueryPinInfo(&pi); | ||
| 167 : | + pi.pFilter->GetClassID(&clsid); | ||
| 168 : | + QueryPinInfoReleaseFilter(pi); | ||
| 169 : | + #ifndef UNICODE | ||
| 170 : | + WideCharToMultiByte(GetACP(), 0, pi.achName, lstrlenW(pi.achName) + 1, | ||
| 171 : | + str, MAX_PIN_NAME, NULL, NULL); | ||
| 172 : | + #else | ||
| 173 : | + lstrcpy(str, pi.achName); | ||
| 174 : | + #endif | ||
| 175 : | + } else { | ||
| 176 : | + lstrcpy(str, TEXT("NULL IPin")); | ||
| 177 : | + } | ||
| 178 : | + | ||
| 179 : | + m_pString = (PTCHAR) new TCHAR[lstrlen(str)+64]; | ||
| 180 : | + if (!m_pString) { | ||
| 181 : | + pp->Release(); | ||
| 182 : | + return; | ||
| 183 : | + } | ||
| 184 : | + | ||
| 185 : | + wsprintf(m_pString, TEXT("%hs(%s)"), GuidNames[clsid], str); | ||
| 186 : | +/* --- copy from CDisp::CDisp(IPin*) --- */ | ||
| 187 : | pp->Release(); | ||
| 188 : | return; | ||
| 189 : | } | ||
| 190 : | diff -rubN /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/wxutil.cpp ./Samples/C++/DirectShow/BaseClasses/wxutil.cpp | ||
| 191 : | --- /c/DX90SDK-orig/Samples/C++/DirectShow/BaseClasses/wxutil.cpp Mon Aug 18 16:03:32 2003 | ||
| 192 : | +++ ./Samples/C++/DirectShow/BaseClasses/wxutil.cpp Sun Jul 25 12:56:29 2004 | ||
| 193 : | @@ -742,8 +742,13 @@ | ||
| 194 : | |||
| 195 : | /* This will catch c == 0 and overflow */ | ||
| 196 : | if (uc <= p[1].QuadPart) { | ||
| 197 : | +#if !defined(__GNUC__) | ||
| 198 : | return bSign ? (LONGLONG)0x8000000000000000 : | ||
| 199 : | (LONGLONG)0x7FFFFFFFFFFFFFFF; | ||
| 200 : | +#else | ||
| 201 : | + return bSign ? (LONGLONG)0x8000000000000000LL : | ||
| 202 : | + (LONGLONG)0x7FFFFFFFFFFFFFFFLL; | ||
| 203 : | +#endif | ||
| 204 : | } | ||
| 205 : | |||
| 206 : | DWORDLONG ullResult; | ||
| 207 : | @@ -903,8 +908,13 @@ | ||
| 208 : | |||
| 209 : | /* This will catch c == 0 and overflow */ | ||
| 210 : | if (uc <= p1) { | ||
| 211 : | +#if !defined(__GNUC__) | ||
| 212 : | return bSign ? (LONGLONG)0x8000000000000000 : | ||
| 213 : | (LONGLONG)0x7FFFFFFFFFFFFFFF; | ||
| 214 : | +#else | ||
| 215 : | + return bSign ? (LONGLONG)0x8000000000000000LL : | ||
| 216 : | + (LONGLONG)0x7FFFFFFFFFFFFFFFLL; | ||
| 217 : | +#endif | ||
| 218 : | } | ||
| 219 : | |||
| 220 : | /* Do the division */ | ||
| 221 : | diff -rubN /c/DX90SDK-orig/mingw_dshow_port.h ./mingw_dshow_port.h | ||
| 222 : | --- /c/DX90SDK-orig/mingw_dshow_port.h Thu Jan 1 10:00:00 1970 | ||
| 223 : | +++ ./mingw_dshow_port.h Wed Jul 21 21:19:30 2004 | ||
| 224 : | @@ -0,0 +1,12 @@ | ||
| 225 : | +#include <wtypes.h> | ||
| 226 : | +#include <unknwn.h> | ||
| 227 : | +#include <ole2.h> | ||
| 228 : | +#include <limits.h> | ||
| 229 : | + | ||
| 230 : | +#define _WINGDI_ 1 | ||
| 231 : | +#define AM_NOVTABLE | ||
| 232 : | +#define _OBJBASE_H_ | ||
| 233 : | +#undef _X86_ | ||
| 234 : | +#define _I64_MAX LONG_LONG_MAX | ||
| 235 : | +#define EXTERN_GUID(itf,l1,s1,s2,c1,c2,c3,c4,c5,c6,c7,c8) \ | ||
| 236 : | + EXTERN_C static const IID itf = {l1,s1,s2,{c1,c2,c3,c4,c5,c6,c7,c8} } |
| No admin address has been configured | ViewVC Help |
| Powered by ViewVC 1.0.4 |