March 2008 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Return full patch in res protocol's secure URL.
by Alexandre Julliard 14 Mar '08

14 Mar '08

Module: wine Branch: master Commit: 4f7748b9b577397ac874f3479874ae95c55bf62a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f7748b9b577397ac874f3479… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 14 12:40:46 2008 +0100 mshtml: Return full patch in res protocol's secure URL. --- dlls/mshtml/protocol.c | 31 +++++++++++++++++++++---------- dlls/mshtml/tests/protocol.c | 41 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 61 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 5f91087..6419d73 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -833,8 +833,9 @@ static HRESULT WINAPI ResProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPC dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved); if(ParseAction == PARSE_SECURITY_URL) { + WCHAR file_part[MAX_PATH], full_path[MAX_PATH]; WCHAR *ptr; - DWORD size; + DWORD size, len; static const WCHAR wszFile[] = {'f','i','l','e',':','/','/'}; static const WCHAR wszRes[] = {'r','e','s',':','/','/'}; @@ -846,19 +847,29 @@ static HRESULT WINAPI ResProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPC if(!ptr) return E_INVALIDARG; - size = ptr-pwzUrl + sizeof(wszFile)/sizeof(WCHAR) - sizeof(wszRes)/sizeof(WCHAR); - if(size >= cchResult) - return S_FALSE; + len = ptr - (pwzUrl + sizeof(wszRes)/sizeof(WCHAR)); + if(len > sizeof(file_part)/sizeof(WCHAR)) { + FIXME("Too long URL\n"); + return MK_E_SYNTAX; + } - /* FIXME: return full path */ - memcpy(pwzResult, wszFile, sizeof(wszFile)); - memcpy(pwzResult + sizeof(wszFile)/sizeof(WCHAR), - pwzUrl + sizeof(wszRes)/sizeof(WCHAR), - size*sizeof(WCHAR) - sizeof(wszFile)); - pwzResult[size] = 0; + memcpy(file_part, pwzUrl + sizeof(wszRes)/sizeof(WCHAR), len*sizeof(WCHAR)); + file_part[len] = 0; + + len = SearchPathW(NULL, file_part, NULL, sizeof(full_path)/sizeof(WCHAR), full_path, NULL); + if(!len) { + WARN("Could not find file %s\n", debugstr_w(file_part)); + return MK_E_SYNTAX; + } + size = sizeof(wszFile)/sizeof(WCHAR) + len + 1; if(pcchResult) *pcchResult = size; + if(size >= cchResult) + return S_FALSE; + + memcpy(pwzResult, wszFile, sizeof(wszFile)); + memcpy(pwzResult + sizeof(wszFile)/sizeof(WCHAR), full_path, (len+1)*sizeof(WCHAR)); return S_OK; } diff --git a/dlls/mshtml/tests/protocol.c b/dlls/mshtml/tests/protocol.c index 01a6a06..df3c337 100644 --- a/dlls/mshtml/tests/protocol.c +++ b/dlls/mshtml/tests/protocol.c @@ -70,6 +70,13 @@ static const WCHAR about_blank_url[] = {'a','b','o','u','t',':','b','l','a','n', static const WCHAR about_test_url[] = {'a','b','o','u','t',':','t','e','s','t',0}; static const WCHAR about_res_url[] = {'r','e','s',':','b','l','a','n','k',0}; +static const char *debugstr_w(LPCWSTR str) +{ + static char buf[1024]; + WideCharToMultiByte(CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL); + return buf; +} + static HRESULT WINAPI ProtocolSink_QueryInterface(IInternetProtocolSink *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IInternetProtocolSink, riid)) { @@ -247,6 +254,29 @@ static void protocol_start(IInternetProtocol *protocol, LPCWSTR url) CHECK_CALLED(ReportResult); } +static void res_sec_url_cmp(LPCWSTR url, DWORD size, LPCWSTR file) +{ + WCHAR buf[MAX_PATH]; + DWORD len; + + static const WCHAR fileW[] = {'f','i','l','e',':','/','/'}; + + if(size < sizeof(fileW)/sizeof(WCHAR) || memcmp(url, fileW, sizeof(fileW))) { + ok(0, "wrong URL protocol\n"); + return; + } + + len = SearchPathW(NULL, file, NULL, sizeof(buf)/sizeof(WCHAR), buf, NULL); + if(!len) { + ok(0, "SearchPath failed: %u\n", GetLastError()); + return; + } + + len += sizeof(fileW)/sizeof(WCHAR)+1; + ok(len == size, "wrong size %u, expected %u\n", size, len); + ok(!lstrcmpW(url + sizeof(fileW)/sizeof(WCHAR), buf), "wrong file part %s\n", debugstr_w(url)); +} + static void test_res_protocol(void) { IInternetProtocolInfo *protocol_info; @@ -265,7 +295,9 @@ static void test_res_protocol(void) {'r','e','s',':','/','/','m','s','h','t','m','l','.','d','l','l','/','x','x','.','h','t','m',0}; static const WCHAR wrong_url4[] = {'r','e','s',':','/','/','x','x','.','d','l','l','/','b','l','a','n','k','.','h','t','m',0}; - + static const WCHAR wrong_url5[] = + {'r','e','s',':','/','/','s','h','t','m','l','.','d','l','l','/','b','l','a','n','k','.','h','t','m',0}; + static const WCHAR mshtml_dllW[] = {'m','s','h','t','m','l','.','d','l','l',0}; hres = CoGetClassObject(&CLSID_ResProtocol, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)&unk); ok(hres == S_OK, "CoGetClassObject failed: %08x\n", hres); @@ -291,16 +323,23 @@ static void test_res_protocol(void) hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_SECURITY_URL, 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == S_OK, "ParseUrl failed: %08x\n", hres); + res_sec_url_cmp(buf, size, mshtml_dllW); + size = 0; hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_SECURITY_URL, 0, buf, 3, &size, 0); ok(hres == S_FALSE, "ParseUrl failed: %08x, expected S_FALSE\n", hres); + ok(size, "size=0\n"); hres = IInternetProtocolInfo_ParseUrl(protocol_info, wrong_url1, PARSE_SECURITY_URL, 0, buf, sizeof(buf)/sizeof(buf[0]), &size, 0); ok(hres == MK_E_SYNTAX || hres == E_INVALIDARG, "ParseUrl failed: %08x, expected MK_E_SYNTAX\n", hres); + hres = IInternetProtocolInfo_ParseUrl(protocol_info, wrong_url5, PARSE_SECURITY_URL, 0, buf, + sizeof(buf)/sizeof(buf[0]), &size, 0); + ok(hres == MK_E_SYNTAX, "ParseUrl failed: %08x, expected MK_E_SYNTAX\n", hres); + size = 0xdeadbeef; buf[0] = '?'; hres = IInternetProtocolInfo_ParseUrl(protocol_info, blank_url, PARSE_DOMAIN, 0, buf,

1 0

Jacek Caban : urlmon: Remove tests that fail on IE7 and make Wine behave like IE7.
by Alexandre Julliard 14 Mar '08

14 Mar '08

Module: wine Branch: master Commit: de1816f9e3de7dd4847f1637744b66359b3c6504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de1816f9e3de7dd4847f16377… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Mar 14 12:41:27 2008 +0100 urlmon: Remove tests that fail on IE7 and make Wine behave like IE7. --- dlls/urlmon/sec_mgr.c | 34 ++++++++++++++++++++++++++++++---- dlls/urlmon/tests/misc.c | 10 ++++++---- 2 files changed, 36 insertions(+), 8 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index 59b2448..027bec8 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -95,13 +95,39 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) /* file protocol is a special case */ if(!strcmpW(schema, fileW)) { - WCHAR path[MAX_PATH]; + WCHAR path[MAX_PATH], root[20]; + WCHAR *ptr; hres = CoInternetParseUrl(secur_url, PARSE_PATH_FROM_URL, 0, path, sizeof(path)/sizeof(WCHAR), &size, 0); - if(SUCCEEDED(hres) && strchrW(path, '\\')) - *zone = 0; + if(SUCCEEDED(hres) && (ptr = strchrW(path, '\\')) && ptr-path < sizeof(root)/sizeof(WCHAR)) { + UINT type; + + memcpy(root, path, (ptr-path)*sizeof(WCHAR)); + root[ptr-path] = 0; + + type = GetDriveTypeW(root); + + switch(type) { + case DRIVE_UNKNOWN: + case DRIVE_NO_ROOT_DIR: + break; + case DRIVE_REMOVABLE: + case DRIVE_FIXED: + case DRIVE_CDROM: + case DRIVE_RAMDISK: + *zone = 0; + hres = S_OK; + break; + case DRIVE_REMOTE: + *zone = 3; + hres = S_OK; + break; + default: + FIXME("unsupported drive type %d\n", type); + } + } } if(*zone == -1) { @@ -305,7 +331,7 @@ static HRESULT WINAPI SecManagerImpl_GetSecurityId(IInternetSecurityManager *ifa /* file protocol is a special case */ if(strlenW(pwszUrl) >= sizeof(wszFile)/sizeof(WCHAR) - && !memcmp(url, wszFile, sizeof(wszFile))) { + && !memcmp(url, wszFile, sizeof(wszFile)) && strchrW(url, '\\')) { static const BYTE secidFile[] = {'f','i','l','e',':'}; diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 01c5eaf..40701db 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -250,7 +250,7 @@ static void test_RegisterFormatEnumerator(void) static const WCHAR url1[] = {'r','e','s',':','/','/','m','s','h','t','m','l','.','d','l','l', '/','b','l','a','n','k','.','h','t','m',0}; static const WCHAR url2[] = {'i','n','d','e','x','.','h','t','m',0}; -static const WCHAR url3[] = {'f','i','l','e',':','c',':','\\','I','n','d','e','x','.','h','t','m',0}; +static const WCHAR url3[] = {'f','i','l','e',':','/','/','c',':','\\','I','n','d','e','x','.','h','t','m',0}; static const WCHAR url4[] = {'f','i','l','e',':','s','o','m','e','%','2','0','f','i','l','e', '%','2','e','j','p','g',0}; static const WCHAR url5[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q', @@ -262,7 +262,8 @@ static const WCHAR url8[] = {'t','e','s','t',':','1','2','3','a','b','c',0}; static const WCHAR url9[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g', '/','s','i','t','e','/','a','b','o','u','t',0}; - +static const WCHAR url10[] = {'f','i','l','e',':','/','/','s','o','m','e','%','2','0','f','i','l','e', + '.','j','p','g',0}; static const WCHAR url4e[] = {'f','i','l','e',':','s','o','m','e',' ','f','i','l','e', '.','j','p','g',0}; @@ -713,12 +714,13 @@ static void test_FindMimeFromData(void) } static const BYTE secid1[] = {'f','i','l','e',':',0,0,0,0}; -static const BYTE secid4[] ={'f','i','l','e',':',3,0,0,0}; static const BYTE secid5[] = {'h','t','t','p',':','w','w','w','.','w','i','n','e','h','q', '.','o','r','g',3,0,0,0}; static const BYTE secid6[] = {'a','b','o','u','t',':','b','l','a','n','k',3,0,0,0}; static const BYTE secid7[] = {'f','t','p',':','w','i','n','e','h','q','.','o','r','g', 3,0,0,0}; +static const BYTE secid10[] = + {'f','i','l','e',':','s','o','m','e','%','2','0','f','i','l','e','.','j','p','g',3,0,0,0}; static struct secmgr_test { LPCWSTR url; @@ -731,7 +733,7 @@ static struct secmgr_test { {url1, 0, S_OK, sizeof(secid1), secid1, S_OK}, {url2, 100, 0x80041001, 0, NULL, E_INVALIDARG}, {url3, 0, S_OK, sizeof(secid1), secid1, S_OK}, - {url4, 3, S_OK, sizeof(secid4), secid4, S_OK}, + {url10,3, S_OK, sizeof(secid10),secid10,S_OK}, {url5, 3, S_OK, sizeof(secid5), secid5, S_OK}, {url6, 3, S_OK, sizeof(secid6), secid6, S_OK}, {url7, 3, S_OK, sizeof(secid7), secid7, S_OK}

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

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: 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: 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: 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: 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: 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