wine-commits March 2008

wine-commits@winehq.org

4 participants
1001 discussions

Jacek Caban : urlmon: Move InternetParseUrl(PARSE_SECURITY_URL) call to map_url_to_zone and fix buffer size.
by Alexandre Julliard 14 Mar '08

14 Mar '08

Module: wine Branch: master Commit: cc159d832deea4e0a4a5d28b9c8152d4be848637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc159d832deea4e0a4a5d28b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 14 12:40:22 2008 +0100 urlmon: Move InternetParseUrl(PARSE_SECURITY_URL) call to map_url_to_zone and fix buffer size. --- dlls/urlmon/sec_mgr.c | 161 ++++++++++++++++++++++++------------------------- 1 files changed, 80 insertions(+), 81 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 6ed72dc..59b2448 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -23,65 +23,27 @@ #include "urlmon_main.h" #include "winreg.h" +#include "wininet.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(urlmon); -/*********************************************************************** - * InternetSecurityManager implementation - * - */ -typedef struct { - const IInternetSecurityManagerVtbl* lpInternetSecurityManagerVtbl; +static const WCHAR fileW[] = {'f','i','l','e',0}; - LONG ref; - - IInternetSecurityMgrSite *mgrsite; - IInternetSecurityManager *custom_manager; -} SecManagerImpl; - -#define SECMGR_THIS(iface) DEFINE_THIS(SecManagerImpl, InternetSecurityManager, iface) - -static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone) +static HRESULT get_zone_from_reg(LPCWSTR schema, DWORD *zone) { - WCHAR schema[64]; - DWORD res, size=0; + DWORD res, size; HKEY hkey; - HRESULT hres; static const WCHAR wszZoneMapProtocolKey[] = {'S','o','f','t','w','a','r','e','\\', - 'M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', - 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s','\\', - 'Z','o','n','e','M','a','p','\\', - 'P','r','o','t','o','c','o','l','D','e','f','a','u','l','t','s',0}; - static const WCHAR wszFile[] = {'f','i','l','e',0}; - - *zone = -1; - - hres = CoInternetParseUrl(url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(WCHAR), &size, 0); - if(FAILED(hres)) - return hres; - if(!*schema) - return E_INVALIDARG; - - /* file protocol is a special case */ - if(!strcmpW(schema, wszFile)) { - WCHAR path[MAX_PATH]; - - hres = CoInternetParseUrl(url, PARSE_PATH_FROM_URL, 0, path, - sizeof(path)/sizeof(WCHAR), &size, 0); - - if(SUCCEEDED(hres) && strchrW(path, '\\')) { - *zone = 0; - return S_OK; - } - } - - WARN("domains are not yet implemented\n"); + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s','\\', + 'Z','o','n','e','M','a','p','\\', + 'P','r','o','t','o','c','o','l','D','e','f','a','u','l','t','s',0}; res = RegOpenKeyW(HKEY_CURRENT_USER, wszZoneMapProtocolKey, &hkey); if(res != ERROR_SUCCESS) { @@ -111,6 +73,65 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone) return S_OK; } +static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) +{ + LPWSTR secur_url; + WCHAR schema[64]; + DWORD size=0; + HRESULT hres; + + secur_url = heap_alloc(INTERNET_MAX_URL_LENGTH*sizeof(WCHAR)); + *zone = -1; + + hres = CoInternetParseUrl(url, PARSE_SECURITY_URL, 0, secur_url, INTERNET_MAX_URL_LENGTH, &size, 0); + if(hres != S_OK) + strcpyW(secur_url, url); + + hres = CoInternetParseUrl(secur_url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(WCHAR), &size, 0); + if(FAILED(hres) || !*schema) { + heap_free(secur_url); + return E_INVALIDARG; + } + + /* file protocol is a special case */ + if(!strcmpW(schema, fileW)) { + WCHAR path[MAX_PATH]; + + hres = CoInternetParseUrl(secur_url, PARSE_PATH_FROM_URL, 0, path, + sizeof(path)/sizeof(WCHAR), &size, 0); + + if(SUCCEEDED(hres) && strchrW(path, '\\')) + *zone = 0; + } + + if(*zone == -1) { + WARN("domains are not yet implemented\n"); + hres = get_zone_from_reg(schema, zone); + } + + if(FAILED(hres) || !ret_url) + heap_free(secur_url); + else + *ret_url = secur_url; + + return hres; +} + +/*********************************************************************** + * InternetSecurityManager implementation + * + */ +typedef struct { + const IInternetSecurityManagerVtbl* lpInternetSecurityManagerVtbl; + + LONG ref; + + IInternetSecurityMgrSite *mgrsite; + IInternetSecurityManager *custom_manager; +} SecManagerImpl; + +#define SECMGR_THIS(iface) DEFINE_THIS(SecManagerImpl, InternetSecurityManager, iface) + static HRESULT WINAPI SecManagerImpl_QueryInterface(IInternetSecurityManager* iface,REFIID riid,void** ppvObject) { SecManagerImpl *This = SECMGR_THIS(iface); @@ -230,8 +251,6 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZone(IInternetSecurityManager *ifac DWORD dwFlags) { SecManagerImpl *This = SECMGR_THIS(iface); - LPWSTR url; - DWORD size; HRESULT hres; TRACE("(%p)->(%s %p %08x)\n", iface, debugstr_w(pwszUrl), pdwZone, dwFlags); @@ -251,26 +270,15 @@ static HRESULT WINAPI SecManagerImpl_MapUrlToZone(IInternetSecurityManager *ifac if(dwFlags) FIXME("not supported flags: %08x\n", dwFlags); - size = (strlenW(pwszUrl)+16) * sizeof(WCHAR); - url = heap_alloc(size); - - hres = CoInternetParseUrl(pwszUrl, PARSE_SECURITY_URL, 0, url, size/sizeof(WCHAR), &size, 0); - if(FAILED(hres)) - memcpy(url, pwszUrl, size); - - hres = map_url_to_zone(url, pdwZone); - - heap_free(url); - - return hres; + return map_url_to_zone(pwszUrl, pdwZone, NULL); } static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManager *iface, LPCWSTR pwszUrl, BYTE *pbSecurityId, DWORD *pcbSecurityId, DWORD_PTR dwReserved) { SecManagerImpl *This = SECMGR_THIS(iface); - LPWSTR buf, ptr, ptr2; - DWORD size, zone, len; + LPWSTR url, ptr, ptr2; + DWORD zone, len; HRESULT hres; static const WCHAR wszFile[] = {'f','i','l','e',':'}; @@ -291,26 +299,17 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManager *ifa if(dwReserved) FIXME("dwReserved is not supported\n"); - len = strlenW(pwszUrl)+1; - buf = heap_alloc((len+16)*sizeof(WCHAR)); - - hres = CoInternetParseUrl(pwszUrl, PARSE_SECURITY_URL, 0, buf, len, &size, 0); + hres = map_url_to_zone(pwszUrl, &zone, &url); if(FAILED(hres)) - memcpy(buf, pwszUrl, len*sizeof(WCHAR)); - - hres = map_url_to_zone(buf, &zone); - if(FAILED(hres)) { - heap_free(buf); return hres == 0x80041001 ? E_INVALIDARG : hres; - } /* file protocol is a special case */ if(strlenW(pwszUrl) >= sizeof(wszFile)/sizeof(WCHAR) - && !memcmp(buf, wszFile, sizeof(wszFile))) { + && !memcmp(url, wszFile, sizeof(wszFile))) { static const BYTE secidFile[] = {'f','i','l','e',':'}; - heap_free(buf); + heap_free(url); if(*pcbSecurityId < sizeof(secidFile)+sizeof(zone)) return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); @@ -322,7 +321,7 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManager *ifa return S_OK; } - ptr = strchrW(buf, ':'); + ptr = strchrW(url, ':'); ptr2 = ++ptr; while(*ptr2 == '/') ptr2++; @@ -333,15 +332,15 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManager *ifa if(ptr) *ptr = 0; - len = WideCharToMultiByte(CP_ACP, 0, buf, -1, NULL, 0, NULL, NULL)-1; + len = WideCharToMultiByte(CP_ACP, 0, url, -1, NULL, 0, NULL, NULL)-1; if(len+sizeof(DWORD) > *pcbSecurityId) { - heap_free(buf); + heap_free(url); return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); } - WideCharToMultiByte(CP_ACP, 0, buf, -1, (LPSTR)pbSecurityId, -1, NULL, NULL); - heap_free(buf); + WideCharToMultiByte(CP_ACP, 0, url, -1, (LPSTR)pbSecurityId, -1, NULL, NULL); + heap_free(url); *(DWORD*)(pbSecurityId+len) = zone;

1 0

Aric Stewart : dsound: Set the status from STATE_STARTING to STATE_PLAYING before mixing our next buffer so that we do not potentially skip early event when starting .
by Alexandre Julliard 14 Mar '08

14 Mar '08

Module: wine Branch: master Commit: 6e8c8c28ebbdc15292612b7b6657e44ce8c5040f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e8c8c28ebbdc15292612b7b6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Mar 14 19:54:35 2008 +0900 dsound: Set the status from STATE_STARTING to STATE_PLAYING before mixing our next buffer so that we do not potentially skip early event when starting. --- dlls/dsound/mixer.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 0e76adf..384709a 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -669,13 +669,13 @@ static DWORD DSOUND_MixToPrimary(const DirectSoundDevice *device, DWORD writepos dsb->primary_mixpos = writepos; } - /* mix next buffer into the main buffer */ - len = DSOUND_MixOne(dsb, writepos, mixlen); - /* if the buffer was starting, it must be playing now */ if (dsb->state == STATE_STARTING) dsb->state = STATE_PLAYING; + /* mix next buffer into the main buffer */ + len = DSOUND_MixOne(dsb, writepos, mixlen); + if (!minlen) minlen = len; /* record the minimum length mixed from all buffers */

1 0

Alistair Leslie-Hughes : mscoree: Added stub CorBindToRuntimeEx.
by Alexandre Julliard 14 Mar '08

14 Mar '08

Module: wine Branch: master Commit: 69272d1f5204c106da8a480709bc392ec70b71ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=69272d1f5204c106da8a48070… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 14 21:27:42 2008 +1100 mscoree: Added stub CorBindToRuntimeEx. --- dlls/mscoree/mscoree.spec | 2 +- dlls/mscoree/mscoree_main.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 1d110a8..8a1e1f8 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -19,7 +19,7 @@ @ stub CorBindToRuntimeByCfg @ stub CorBindToRuntimeByPath @ stub CorBindToRuntimeByPathEx -@ stub CorBindToRuntimeEx +@ stdcall CorBindToRuntimeEx(wstr wstr long ptr ptr ptr) @ stdcall CorBindToRuntimeHost(wstr wstr wstr ptr long ptr ptr ptr) @ stub CorDllMainWorker @ stdcall CorExitProcess(long) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index b60d4d3..7093590 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -295,6 +295,17 @@ HRESULT WINAPI LoadStringRC(UINT resId, LPWSTR pBuffer, int iBufLen, int bQuiet) return LoadStringRCEx(-1, resId, pBuffer, iBufLen, bQuiet, NULL); } +HRESULT WINAPI CorBindToRuntimeEx(LPWSTR szVersion, LPWSTR szBuildFlavor, DWORD nflags, REFCLSID rslsid, + REFIID riid, LPVOID *ppv) +{ + FIXME("%s %s %d %s %s %p\n", debugstr_w(szVersion), debugstr_w(szBuildFlavor), nflags, debugstr_guid( rslsid ), + debugstr_guid( riid ), ppv); + + *ppv = NULL; + + return E_NOTIMPL; +} + HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv) { FIXME("(%p, %p, %p): stub\n", rclsid, riid, ppv);

1 0

Maarten Lankhorst : quartz: Add directsound renderer to filter list.
by Alexandre Julliard 14 Mar '08

14 Mar '08

Module: wine Branch: master Commit: 4c09284c9193e74aaa6a047ca651f366351fdf99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c09284c9193e74aaa6a047ca… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Mar 13 20:29:40 2008 -0700 quartz: Add directsound renderer to filter list. --- dlls/quartz/regsvr.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/quartz/regsvr.c b/dlls/quartz/regsvr.c index b4a304e..2a2b45d 100644 --- a/dlls/quartz/regsvr.c +++ b/dlls/quartz/regsvr.c @@ -1111,6 +1111,19 @@ static struct regsvr_filter const filter_list[] = { { 0xFFFFFFFF }, } }, + { &CLSID_DSoundRender, + &CLSID_LegacyAmFilterCategory, + {'A','u','d','i','o',' ','R','e','n','d','e','r','e','r',0}, + 0x800000, + { { REG_PINFLAG_B_RENDERER, + { { &MEDIATYPE_Audio, &MEDIASUBTYPE_PCM }, +/* { &MEDIATYPE_Audio, &MEDIASUBTYPE_IEEE_FLOAT }, */ + { NULL } + }, + }, + { 0xFFFFFFFF }, + } + }, { &CLSID_AVIDec, &CLSID_LegacyAmFilterCategory, {'A','V','I',' ','D','e','c','o','m','p','r','e','s','s','o','r',0},

1 0

Maarten Lankhorst : quartz: Implement detection on file extension in filesource.
by Alexandre Julliard 14 Mar '08

14 Mar '08

Module: wine Branch: master Commit: 25f9d3c17366b6454dba49b2897304c2248137fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=25f9d3c17366b6454dba49b28… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Mar 13 20:28:09 2008 -0700 quartz: Implement detection on file extension in filesource. --- dlls/quartz/Makefile.in | 2 +- dlls/quartz/filesource.c | 46 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in index 207ea1e..ca47a41 100644 --- a/dlls/quartz/Makefile.in +++ b/dlls/quartz/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = quartz.dll IMPORTLIB = quartz -IMPORTS = dsound msacm32 msvfw32 ole32 oleaut32 user32 gdi32 advapi32 kernel32 +IMPORTS = dsound msacm32 msvfw32 ole32 oleaut32 shlwapi user32 gdi32 advapi32 kernel32 EXTRALIBS = -lstrmiids -luuid C_SRCS = \ diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 1200802..f30a3ad 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -30,6 +30,7 @@ #include "vfwmsgs.h" #include "winbase.h" #include "winreg.h" +#include "shlwapi.h" #include <assert.h> WINE_DEFAULT_DEBUG_CHANNEL(quartz); @@ -62,10 +63,47 @@ static inline AsyncReader *impl_from_IFileSourceFilter( IFileSourceFilter *iface return (AsyncReader *)((char*)iface - FIELD_OFFSET(AsyncReader, lpVtblFSF)); } +static WCHAR const mediatype_name[11] = { + 'M', 'e', 'd', 'i', 'a', ' ', 'T', 'y', 'p', 'e', 0 }; +static WCHAR const subtype_name[8] = { + 'S', 'u', 'b', 't', 'y', 'p', 'e', 0 }; + static HRESULT process_extensions(HKEY hkeyExtensions, LPCOLESTR pszFileName, GUID * majorType, GUID * minorType) { - /* FIXME: implement */ - return E_NOTIMPL; + WCHAR *extension; + LONG l; + HKEY hsub; + WCHAR keying[39]; + DWORD size; + + if (!pszFileName) + return E_POINTER; + + /* Get the part of the name that matters */ + extension = PathFindExtensionW(pszFileName); + if (*extension != '.') + return E_FAIL; + + l = RegOpenKeyExW(hkeyExtensions, extension, 0, KEY_READ, &hsub); + if (l) + return E_FAIL; + + size = sizeof(keying); + l = RegQueryValueExW(hsub, mediatype_name, NULL, NULL, (LPBYTE)keying, &size); + if (!l) + CLSIDFromString(keying, majorType); + + size = sizeof(keying); + if (!l) + l = RegQueryValueExW(hsub, subtype_name, NULL, NULL, (LPBYTE)keying, &size); + if (!l) + CLSIDFromString(keying, minorType); + + RegCloseKey(hsub); + + if (!l) + return S_OK; + return E_FAIL; } static unsigned char byte_from_hex_char(WCHAR wHex) @@ -197,6 +235,8 @@ static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, BOOL bFound = FALSE; static const WCHAR wszMediaType[] = {'M','e','d','i','a',' ','T','y','p','e',0}; + TRACE("(%p, %s, %p, %p)\n", pReader, debugstr_w(pszFileName), majorType, minorType); + CopyMemory(majorType, &GUID_NULL, sizeof(*majorType)); CopyMemory(minorType, &GUID_NULL, sizeof(*minorType)); @@ -213,7 +253,7 @@ static HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, WCHAR wszMajorKeyName[CHARS_IN_GUID]; DWORD dwKeyNameLength = sizeof(wszMajorKeyName) / sizeof(wszMajorKeyName[0]); static const WCHAR wszExtensions[] = {'E','x','t','e','n','s','i','o','n','s',0}; - + if (RegEnumKeyExW(hkeyMediaType, indexMajor, wszMajorKeyName, &dwKeyNameLength, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) break; if (RegOpenKeyExW(hkeyMediaType, wszMajorKeyName, 0, KEY_READ, &hkeyMajor) != ERROR_SUCCESS)

1 0

Maarten Lankhorst : quartz: Uncomment a trace.
by Alexandre Julliard 14 Mar '08

14 Mar '08

Module: wine Branch: master Commit: 83efc64dd505ffb91aeaad39ec90850ef0c322fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=83efc64dd505ffb91aeaad39e… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Mar 13 20:25:58 2008 -0700 quartz: Uncomment a trace. --- dlls/quartz/pin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index 1cb379f..c895185 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -279,7 +279,7 @@ HRESULT WINAPI IPinImpl_ConnectedTo(IPin * iface, IPin ** ppPin) HRESULT hr; IPinImpl *This = (IPinImpl *)iface; -/* TRACE("(%p)\n", ppPin);*/ + TRACE("(%p)\n", ppPin); EnterCriticalSection(This->pCritSec); {

1 0

Maarten Lankhorst : quartz: Fix typo.
by Alexandre Julliard 14 Mar '08

14 Mar '08

Module: wine Branch: master Commit: b5a8df58cba34730cf475d5bd988fff6e116423b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5a8df58cba34730cf475d5bd… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Mar 13 20:25:36 2008 -0700 quartz: Fix typo. --- dlls/quartz/dsoundrender.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 947bb98..af9fb37 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -1011,7 +1011,7 @@ static HRESULT WINAPI ReferenceClock_GetTime(IReferenceClock *iface, if (This->dsbuffer) hr = DSoundRender_GetPos(This, &play_pos, NULL, pTime); if (FAILED(hr)) - ERR("Could not get refreence time (%x)!\n", hr); + ERR("Could not get reference time (%x)!\n", hr); return hr; }

1 0

Maarten Lankhorst : quartz: Detect and skip id3v2 header in mpeg splitter.
by Alexandre Julliard 14 Mar '08

14 Mar '08

Module: wine Branch: master Commit: 6c1d089a44c8a31037566b56979bca5ec3daaba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c1d089a44c8a31037566b569… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Mar 13 20:24:58 2008 -0700 quartz: Detect and skip id3v2 header in mpeg splitter. --- dlls/quartz/mpegsplit.c | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index edf39b3..e721eef 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -337,7 +337,6 @@ static HRESULT MPEGSplitter_init_audio(MPEGSplitterImpl *This, const BYTE *heade mode_ext = ((header[3]>>4)&0x3); emphasis = ((header[3]>>0)&0x3); - pamt->cbFormat = ((layer==3)? sizeof(MPEGLAYER3WAVEFORMAT) : sizeof(MPEG1WAVEFORMAT)); pamt->pbFormat = CoTaskMemAlloc(pamt->cbFormat); @@ -431,7 +430,7 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin) ALLOCATOR_PROPERTIES props; HRESULT hr; LONGLONG pos = 0; /* in bytes */ - BYTE header[4]; + BYTE header[10]; int streamtype = 0; LONGLONG total, avail; AM_MEDIA_TYPE amt; @@ -440,15 +439,39 @@ static HRESULT MPEGSplitter_pre_connect(IPin *iface, IPin *pConnectPin) IAsyncReader_Length(pPin->pReader, &total, &avail); This->EndOfFile = total; - hr = IAsyncReader_SyncRead(pPin->pReader, pos, 4, (LPVOID)&header[0]); + hr = IAsyncReader_SyncRead(pPin->pReader, pos, 4, header); if (SUCCEEDED(hr)) pos += 4; + /* Skip ID3 v2 tag, if any */ + if (SUCCEEDED(hr) && !strncmp("ID3", (char*)header, 3)) + do { + UINT length; + hr = IAsyncReader_SyncRead(pPin->pReader, pos, 6, header + 4); + if (FAILED(hr)) + break; + pos += 6; + TRACE("Found ID3 v2.%d.%d\n", header[3], header[4]); + length = (header[6] & 0x7F) << 21; + length += (header[7] & 0x7F) << 14; + length += (header[8] & 0x7F) << 7; + length += (header[9] & 0x7F); + TRACE("Length: %u\n", length); + pos += length; + + /* Read the real header for the mpeg splitter */ + hr = IAsyncReader_SyncRead(pPin->pReader, pos, 4, header); + if (SUCCEEDED(hr)) + pos += 4; + TRACE("%x:%x:%x:%x\n", header[0], header[1], header[2], header[3]); + } while (0); + while(SUCCEEDED(hr) && !(streamtype=MPEGSplitter_head_check(header))) { + TRACE("%x:%x:%x:%x\n", header[0], header[1], header[2], header[3]); /* No valid header yet; shift by a byte and check again */ memcpy(header, header+1, 3); - hr = IAsyncReader_SyncRead(pPin->pReader, pos++, 1, (LPVOID)&header[3]); + hr = IAsyncReader_SyncRead(pPin->pReader, pos++, 1, header + 3); } if (FAILED(hr)) return hr;

1 0

Maarten Lankhorst : quartz: Implement a dummy null renderer for directshow.
by Alexandre Julliard 14 Mar '08

14 Mar '08

Module: wine Branch: master Commit: e1867dac0d82cd3fcede46f3bb08e5d8875865f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1867dac0d82cd3fcede46f3b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Mar 12 10:12:18 2008 -0700 quartz: Implement a dummy null renderer for directshow. --- dlls/quartz/Makefile.in | 1 + dlls/quartz/main.c | 1 + dlls/quartz/nullrenderer.c | 564 ++++++++++++++++++++++++++++++++++++++++++ dlls/quartz/quartz_private.h | 1 + dlls/quartz/regsvr.c | 18 ++ include/uuids.h | 1 + 6 files changed, 586 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1867dac0d82cd3fcede4…

1 0

Maarten Lankhorst : quartz: Don' t add MERIT_DO_NOT_USE filters automatically to create a connection.
by Alexandre Julliard 14 Mar '08

14 Mar '08

Module: wine Branch: master Commit: 07b12032d2e9bd24bdf952df875e82449898857a URL: http://source.winehq.org/git/wine.git/?a=commit;h=07b12032d2e9bd24bdf952df8… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Thu Mar 13 21:42:22 2008 -0700 quartz: Don't add MERIT_DO_NOT_USE filters automatically to create a connection. NullRenderer might accidentally be rendered otherwise. --- dlls/quartz/filtergraph.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index c6e2c22..747f88d 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -778,7 +778,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, /* Try to find a suitable filter that can connect to the pin to render */ tab[0] = mt->majortype; tab[1] = mt->subtype; - hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, 0, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); + hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); if (FAILED(hr)) { ERR("Unable to enum filters (%x)\n", hr); return hr; @@ -931,7 +931,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, /* Try to find a suitable renderer with the same media type */ tab[0] = mt->majortype; tab[1] = GUID_NULL; - hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, 0, TRUE, 1, tab, NULL, NULL, TRUE, FALSE, 0, NULL, NULL, NULL); + hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, TRUE, FALSE, 0, NULL, NULL, NULL); if (FAILED(hr)) { ERR("Unable to enum filters (%x)\n", hr); return hr; @@ -1057,7 +1057,7 @@ static HRESULT WINAPI FilterGraph2_RenderFile(IFilterGraph2 *iface, if (SUCCEEDED(hr)) { tab[0] = mt.majortype; tab[1] = mt.subtype; - hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, 0, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); + hr = IFilterMapper2_EnumMatchingFilters(This->pFilterMapper2, &pEnumMoniker, 0, FALSE, MERIT_UNLIKELY, TRUE, 1, tab, NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL); } if (FAILED(hr))

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2008