October 2010 - Wine-Commits

Nikolay Sivov : msxml3: Implement ::abort().
by Alexandre Julliard Oct. 8, 2010

Oct. 8, 2010

Module: wine Branch: master Commit: e1ca5965b8341aa9f459a3e75d14523f443b63b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1ca5965b8341aa9f459a3e75… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 8 11:41:08 2010 +0400 msxml3: Implement ::abort(). --- dlls/msxml3/httprequest.c | 9 +++++++-- dlls/msxml3/tests/domdoc.c | 19 +++++++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 6ff0f96..e347096 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -731,9 +731,14 @@ static HRESULT WINAPI httprequest_abort(IXMLHTTPRequest *iface) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); - FIXME("stub (%p)\n", This); + TRACE("(%p)\n", This); - return E_NOTIMPL; + BindStatusCallback_Detach(This->bsc); + This->bsc = NULL; + + httprequest_setreadystate(This, READYSTATE_UNINITIALIZED); + + return S_OK; } static HRESULT WINAPI httprequest_get_status(IXMLHTTPRequest *iface, LONG *status) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6035d2b..62c59b7 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3225,6 +3225,9 @@ if (0) ok(hr == S_OK, "got 0x%08x\n", hr); } + hr = IXMLHttpRequest_abort(pXMLHttpRequest); + ok(hr == S_OK, "got 0x%08x\n", hr); + /* send before open */ hr = IXMLHttpRequest_send(pXMLHttpRequest, dummy); ok(hr == E_FAIL || broken(hr == E_UNEXPECTED) /* win9x, win2k */, "got 0x%08x\n", hr); @@ -3266,7 +3269,7 @@ if (0) state = -1; hr = IXMLHttpRequest_get_readyState(pXMLHttpRequest, &state); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(state == 0, "got %d, expected 0\n", state); + ok(state == READYSTATE_UNINITIALIZED, "got %d, expected READYSTATE_UNINITIALIZED\n", state); event = create_dispevent(); ref = IDispatch_AddRef(event); @@ -3297,7 +3300,19 @@ if (0) state = -1; hr = IXMLHttpRequest_get_readyState(pXMLHttpRequest, &state); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(state == 1, "got %d, expected 1\n", state); + ok(state == READYSTATE_LOADING, "got %d, expected READYSTATE_LOADING\n", state); + + hr = IXMLHttpRequest_abort(pXMLHttpRequest); + ok(hr == S_OK, "got 0x%08x\n", hr); + + state = -1; + hr = IXMLHttpRequest_get_readyState(pXMLHttpRequest, &state); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(state == READYSTATE_UNINITIALIZED || broken(state == READYSTATE_LOADING) /* win98, win2k */, + "got %d, expected READYSTATE_UNINITIALIZED\n", state); + + hr = IXMLHttpRequest_open(pXMLHttpRequest, method, url, async, dummy, dummy); + ok(hr == S_OK, "got 0x%08x\n", hr); hr = IXMLHttpRequest_setRequestHeader(pXMLHttpRequest, _bstr_("header1"), _bstr_("value1")); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Austin English : dbghelp: Fix compile on Hurd.
by Alexandre Julliard Oct. 8, 2010

Oct. 8, 2010

Module: wine Branch: master Commit: 95740b30b9a76ee3de5353983159ad4cd71df2a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95740b30b9a76ee3de5353983… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Oct 8 00:33:52 2010 -0700 dbghelp: Fix compile on Hurd. --- configure | 1 + configure.ac | 1 + dlls/dbghelp/macho_module.c | 6 +++--- include/config.h.in | 3 +++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/configure b/configure index a735091..24deb97 100755 --- a/configure +++ b/configure @@ -5798,6 +5798,7 @@ for ac_header in \ linux/types.h \ linux/ucdrom.h \ mach-o/nlist.h \ + mach-o/loader.h \ mach/mach.h \ mach/machine.h \ machine/cpu.h \ diff --git a/configure.ac b/configure.ac index 1a502db..1c0ed46 100644 --- a/configure.ac +++ b/configure.ac @@ -418,6 +418,7 @@ AC_CHECK_HEADERS(\ linux/types.h \ linux/ucdrom.h \ mach-o/nlist.h \ + mach-o/loader.h \ mach/mach.h \ mach/machine.h \ machine/cpu.h \ diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 44fa4f2..9aac3e7 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -26,7 +26,7 @@ #include "dbghelp_private.h" -#ifdef __MACH__ +#ifdef HAVE_MACH_O_LOADER_H #include <assert.h> #include <stdarg.h> @@ -1409,7 +1409,7 @@ struct module* macho_load_module(struct process* pcs, const WCHAR* name, unsign return ml.macho_info.module; } -#else /* !__MACH__ */ +#else /* HAVE_MACH_O_LOADER_H */ BOOL macho_synchronize_module_list(struct process* pcs) { @@ -1441,4 +1441,4 @@ BOOL macho_load_debug_info(struct module* module, struct macho_file_map* fmap) { return FALSE; } -#endif /* __MACH__ */ +#endif /* HAVE_MACH_O_LOADER_H */ diff --git a/include/config.h.in b/include/config.h.in index 98a951f..0bb6be2 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -466,6 +466,9 @@ /* Define to 1 if you have the <mach-o/dyld_images.h> header file. */ #undef HAVE_MACH_O_DYLD_IMAGES_H +/* Define to 1 if you have the <mach-o/loader.h> header file. */ +#undef HAVE_MACH_O_LOADER_H + /* Define to 1 if you have the <mach-o/nlist.h> header file. */ #undef HAVE_MACH_O_NLIST_H

1 0

Nikolay Sivov : msxml3: Implement ::get_responseBody().
by Alexandre Julliard Oct. 8, 2010

Oct. 8, 2010

Module: wine Branch: master Commit: f0546a1961c60b801781ccb78697f4b015eb22ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0546a1961c60b801781ccb78… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 8 11:42:36 2010 +0400 msxml3: Implement ::get_responseBody(). --- dlls/msxml3/httprequest.c | 48 +++++++++++++++++++++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 24 +++++++++++++++++++++- 2 files changed, 68 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index c09f31e..3c2c049 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -824,13 +824,55 @@ static HRESULT WINAPI httprequest_get_responseText(IXMLHTTPRequest *iface, BSTR return hr; } -static HRESULT WINAPI httprequest_get_responseBody(IXMLHTTPRequest *iface, VARIANT *pvarBody) +static HRESULT WINAPI httprequest_get_responseBody(IXMLHTTPRequest *iface, VARIANT *body) { httprequest *This = impl_from_IXMLHTTPRequest( iface ); + HGLOBAL hglobal; + HRESULT hr; - FIXME("stub %p %p\n", This, pvarBody); + TRACE("(%p)->(%p)\n", This, body); - return E_NOTIMPL; + if (!body) return E_INVALIDARG; + if (This->state != READYSTATE_COMPLETE) return E_FAIL; + + hr = GetHGlobalFromStream(This->bsc->stream, &hglobal); + if (hr == S_OK) + { + void *ptr = GlobalLock(hglobal); + DWORD size = GlobalSize(hglobal); + + SAFEARRAYBOUND bound; + SAFEARRAY *array; + + bound.lLbound = 0; + bound.cElements = size; + array = SafeArrayCreate(VT_UI1, 1, &bound); + + if (array) + { + void *dest; + + V_VT(body) = VT_ARRAY | VT_UI1; + V_ARRAY(body) = array; + + hr = SafeArrayAccessData(array, &dest); + if (hr == S_OK) + { + memcpy(dest, ptr, size); + SafeArrayUnaccessData(array); + } + else + { + VariantClear(body); + } + } + else + hr = E_FAIL; + + GlobalUnlock(hglobal); + } + + return hr; } static HRESULT WINAPI httprequest_get_responseStream(IXMLHTTPRequest *iface, VARIANT *pvarBody) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 62c59b7..d85bda9 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -3195,7 +3195,8 @@ static void test_XMLHTTP(void) VARIANT dummy; VARIANT async; VARIANT varbody; - LONG state, status, ref; + LONG state, status, ref, bound; + void *ptr; IDispatch *event; HRESULT hr = CoCreateInstance(&CLSID_XMLHTTPRequest, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLHttpRequest, @@ -3388,6 +3389,27 @@ todo_wine { SysFreeString(bstrResponse); } + hr = IXMLHttpRequest_get_responseBody(pXMLHttpRequest, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + V_VT(&varbody) = VT_EMPTY; + hr = IXMLHttpRequest_get_responseBody(pXMLHttpRequest, &varbody); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&varbody) == (VT_ARRAY|VT_UI1), "got type %d, expected %d\n", V_VT(&varbody), VT_ARRAY|VT_UI1); + ok(SafeArrayGetDim(V_ARRAY(&varbody)) == 1, "got %d, expected one dimension\n", SafeArrayGetDim(V_ARRAY(&varbody))); + + bound = -1; + hr = SafeArrayGetLBound(V_ARRAY(&varbody), 1, &bound); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(bound == 0, "got %d, expected zero bound\n", bound); + + hr = SafeArrayAccessData(V_ARRAY(&varbody), &ptr); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(memcmp(ptr, xmltestbodyA, sizeof(xmltestbodyA)-1) == 0, "got wrond body data\n"); + SafeArrayUnaccessData(V_ARRAY(&varbody)); + + VariantClear(&varbody); + SysFreeString(url); IDispatch_Release(event);

1 0

Nikolay Sivov : msxml: Register XMLHTTP objects.
by Alexandre Julliard Oct. 8, 2010

Oct. 8, 2010

Module: wine Branch: master Commit: 25dc6c7c9e3459336a8ffc102c3d2f16e2e01cca URL: http://source.winehq.org/git/wine.git/?a=commit;h=25dc6c7c9e3459336a8ffc102… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 8 02:25:46 2010 +0400 msxml: Register XMLHTTP objects. --- dlls/msxml3/httprequest.c | 4 ---- dlls/msxml3/regsvr.c | 26 ++++++++++++++++++++++++++ dlls/msxml4/regsvr.c | 13 +++++++++++++ dlls/msxml6/regsvr.c | 13 +++++++++++++ 4 files changed, 52 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index 3a3e0d6..6ff0f96 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -317,8 +317,6 @@ static HRESULT WINAPI BindStatusCallback_OnObjectAvailable(IBindStatusCallback * return E_NOTIMPL; } -#undef STATUSCLB_THIS - static const IBindStatusCallbackVtbl BindStatusCallbackVtbl = { BindStatusCallback_QueryInterface, BindStatusCallback_AddRef, @@ -402,8 +400,6 @@ static HRESULT WINAPI BSCHttpNegotiate_OnResponse(IHttpNegotiate *iface, DWORD c return S_OK; } -#undef HTTPNEG2_THIS - static const IHttpNegotiateVtbl BSCHttpNegotiateVtbl = { BSCHttpNegotiate_QueryInterface, BSCHttpNegotiate_AddRef, diff --git a/dlls/msxml3/regsvr.c b/dlls/msxml3/regsvr.c index c528ec4..ca1cc12 100644 --- a/dlls/msxml3/regsvr.c +++ b/dlls/msxml3/regsvr.c @@ -540,6 +540,22 @@ static struct regsvr_coclass const coclass_list[] = { "Microsoft.XMLHTTP", "1.0" }, + { &CLSID_XMLHTTP26, + "XML HTTP 2.6", + NULL, + "msxml3.dll", + "Apartment", + "Msxml2.XMLHTTP.2.6", + "2.6" + }, + { &CLSID_XMLHTTP30, + "XML HTTP 3.0", + NULL, + "msxml3.dll", + "Apartment", + "Msxml2.XMLHTTP.3.0", + "3.0" + }, { &CLSID_XMLDSOControl, "XML Data Source Object", NULL, @@ -701,6 +717,16 @@ static struct progid const progid_list[] = { &CLSID_XMLHTTPRequest, NULL }, + { "Msxml2.XMLHTTP.2.6", + "XML HTTP 2.6", + &CLSID_XMLHTTP26, + NULL + }, + { "Msxml2.XMLHTTP.3.0", + "XML HTTP 3.0", + &CLSID_XMLHTTP30, + NULL + }, { "Microsoft.XMLDSO", "XML Data Source Object", &CLSID_XMLDSOControl, diff --git a/dlls/msxml4/regsvr.c b/dlls/msxml4/regsvr.c index e4b1a0d..a89683f 100644 --- a/dlls/msxml4/regsvr.c +++ b/dlls/msxml4/regsvr.c @@ -385,6 +385,14 @@ static struct regsvr_coclass const coclass_list[] = { "Microsoft.FreeThreadedDOMDocument4.0", "4.0" }, + { &CLSID_XMLHTTP40, + "XML HTTP 4.0", + NULL, + "msxml4.dll", + "Apartment", + "Msxml2.XMLHTTP.4.0", + "4.0" + }, { NULL } /* list terminator */ }; @@ -397,6 +405,11 @@ static struct progid const progid_list[] = { &CLSID_DOMDocument40, NULL }, + { "Msxml2.XMLHTTP.4.0", + "XML HTTP 4.0", + &CLSID_XMLHTTP40, + NULL + }, { "Msxml2.SAXXMLReader.4.0", "SAX XML Reader 4.0", &CLSID_SAXXMLReader40, diff --git a/dlls/msxml6/regsvr.c b/dlls/msxml6/regsvr.c index 872015d..70a6fc4 100644 --- a/dlls/msxml6/regsvr.c +++ b/dlls/msxml6/regsvr.c @@ -346,6 +346,14 @@ static struct regsvr_coclass const coclass_list[] = { "Msxml2.DOMDocument", "6.0" }, + { &CLSID_XMLHTTP60, + "XML HTTP 6.0", + NULL, + "msxml6.dll", + "Apartment", + "Msxml2.XMLHTTP.6.0", + "6.0" + }, { &CLSID_XMLSchemaCache60, "XML Schema Cache 6.0", NULL, @@ -390,6 +398,11 @@ static struct progid const progid_list[] = { &CLSID_DOMDocument60, NULL }, + { "Msxml2.XMLHTTP.6.0", + "XML XMLHTTP 6.0", + &CLSID_XMLHTTP60, + NULL + }, { "Msxml2.XMLSchemaCache.6.0", "XML Schema Cache 6.0", &CLSID_XMLSchemaCache60,

1 0

Damjan Jovanovic : comdlg32: Fix a stack overflow.
by Alexandre Julliard Oct. 8, 2010

Oct. 8, 2010

Module: wine Branch: master Commit: 7ccf6c28b31ed2486600e0b23649d3fecaab0248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ccf6c28b31ed2486600e0b23… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Oct 8 07:21:23 2010 +0200 comdlg32: Fix a stack overflow. --- dlls/comdlg32/filedlg.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index a6f6023..01b068e 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -3349,6 +3349,9 @@ static int FILEDLG95_LOOKIN_InsertItemAfterParent(HWND hwnd,LPITEMIDLIST pidl) TRACE("\n"); + if (pidl == pidlParent) + return -1; + iParentPos = FILEDLG95_LOOKIN_SearchItem(hwnd,(WPARAM)pidlParent,SEARCH_PIDL); if(iParentPos < 0)

1 0

Austin English : psapi/tests: Get rid of an ugly test macro.
by Alexandre Julliard Oct. 8, 2010

Oct. 8, 2010

Module: wine Branch: master Commit: db27d9afa95a19cd263698e889e85ee7477e8467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db27d9afa95a19cd263698e88… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Oct 7 02:53:04 2010 -0700 psapi/tests: Get rid of an ugly test macro. --- dlls/psapi/tests/psapi_main.c | 117 ++++++++++++++++++++++++----------------- 1 files changed, 68 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=db27d9afa95a19cd26369…

1 0

Aric Stewart : strmbase: Move TransformFilter implementation to strmbase.
by Alexandre Julliard Oct. 8, 2010

Oct. 8, 2010

Module: wine Branch: master Commit: 34f3f7cae3828e1b719c6389d7f9edd97b4ca41d URL: http://source.winehq.org/git/wine.git/?a=commit;h=34f3f7cae3828e1b719c6389d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 7 14:48:19 2010 -0500 strmbase: Move TransformFilter implementation to strmbase. --- dlls/quartz/Makefile.in | 1 - dlls/quartz/acmwrapper.c | 138 +++++++++++++++------ dlls/quartz/avidec.c | 147 +++++++++++++++-------- dlls/quartz/transform.h | 50 -------- dlls/strmbase/Makefile.in | 3 +- dlls/{quartz => strmbase}/transform.c | 218 +++++++++++++++++++-------------- include/wine/strmbase.h | 48 +++++++ 7 files changed, 375 insertions(+), 230 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=34f3f7cae3828e1b719c6…

1 0

Andrew Nguyen : crypt32: Avoid relying on PATH_MAX in import_certs_from_dir helper.
by Alexandre Julliard Oct. 8, 2010

Oct. 8, 2010

Module: wine Branch: master Commit: 6f2513d39a2247af5acb0144094c387323cfb38c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f2513d39a2247af5acb01440… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Thu Oct 7 20:56:40 2010 -0500 crypt32: Avoid relying on PATH_MAX in import_certs_from_dir helper. PATH_MAX is not guaranteed to be available on all platforms, and it is inadequate as a hardcoded buffer size anyway. --- dlls/crypt32/rootstore.c | 50 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 40 insertions(+), 10 deletions(-) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index 70b5ef8..506497a 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -326,6 +326,32 @@ static BOOL import_certs_from_file(int fd, HCERTSTORE store) static BOOL import_certs_from_path(LPCSTR path, HCERTSTORE store, BOOL allow_dir); +static BOOL check_buffer_resize(char **ptr_buf, size_t *buf_size, size_t check_size) +{ + if (check_size > *buf_size) + { + *buf_size = check_size; + + if (*ptr_buf) + { + char *realloc_buf = CryptMemRealloc(*ptr_buf, *buf_size); + + if (!realloc_buf) + return FALSE; + + *ptr_buf = realloc_buf; + } + else + { + *ptr_buf = CryptMemAlloc(*buf_size); + if (!*ptr_buf) + return FALSE; + } + } + + return TRUE; +} + /* Opens path, which must be a directory, and imports certificates from every * file in the directory into store. * Returns TRUE if any certificates were successfully imported. @@ -341,23 +367,27 @@ static BOOL import_certs_from_dir(LPCSTR path, HCERTSTORE store) dir = opendir(path); if (dir) { - size_t bufsize = strlen(path) + 1 + PATH_MAX + 1; - char *filebuf = CryptMemAlloc(bufsize); + size_t path_len = strlen(path), bufsize = 0; + char *filebuf = NULL; - if (filebuf) + struct dirent *entry; + while ((entry = readdir(dir))) { - struct dirent *entry; - while ((entry = readdir(dir))) + if (strcmp(entry->d_name, ".") && strcmp(entry->d_name, "..")) { - if (strcmp(entry->d_name, ".") && strcmp(entry->d_name, "..")) + size_t name_len = strlen(entry->d_name); + + if (!check_buffer_resize(&filebuf, &bufsize, path_len + 1 + name_len + 1)) { - snprintf(filebuf, bufsize, "%s/%s", path, entry->d_name); - if (import_certs_from_path(filebuf, store, FALSE) && !ret) - ret = TRUE; + ERR("Path buffer (re)allocation failed with out of memory condition\n"); + break; } + snprintf(filebuf, bufsize, "%s/%s", path, entry->d_name); + if (import_certs_from_path(filebuf, store, FALSE) && !ret) + ret = TRUE; } - CryptMemFree(filebuf); } + CryptMemFree(filebuf); closedir(dir); } return ret;

1 0

Aric Stewart : strmbase: Add an implementation of BaseFilterImpl_EnumPins.
by Alexandre Julliard Oct. 8, 2010

Oct. 8, 2010

Module: wine Branch: master Commit: 791087089c5e3e61e9d5e01aa6f2d146270f4ef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=791087089c5e3e61e9d5e01aa… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 7 14:48:01 2010 -0500 strmbase: Add an implementation of BaseFilterImpl_EnumPins. --- dlls/qcap/vfwcapture.c | 49 +++++++++++-------------------- dlls/quartz/dsoundrender.c | 53 ++++++++++++--------------------- dlls/quartz/filesource.c | 68 +++++++++++++++--------------------------- dlls/quartz/nullrenderer.c | 51 +++++++++++--------------------- dlls/quartz/parser.c | 63 ++++++++++++++++------------------------ dlls/quartz/parser.h | 1 - dlls/quartz/transform.c | 55 ++++++++++++---------------------- dlls/quartz/videorenderer.c | 51 +++++++++++--------------------- dlls/strmbase/filter.c | 30 ++++++++++++++++++- include/wine/strmbase.h | 10 ++++++- 10 files changed, 179 insertions(+), 252 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=791087089c5e3e61e9d5e…

1 0

Aric Stewart : strmbase: Implement BaseFilter in strmbase.
by Alexandre Julliard Oct. 8, 2010

Oct. 8, 2010

Module: wine Branch: master Commit: 1d42659c406abd521341153a3489e0168ff73b08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d42659c406abd521341153a3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Oct 7 14:47:33 2010 -0500 strmbase: Implement BaseFilter in strmbase. --- dlls/qcap/vfwcapture.c | 141 ++++--------------------- dlls/quartz/acmwrapper.c | 20 ++-- dlls/quartz/avidec.c | 12 +- dlls/quartz/avisplit.c | 6 +- dlls/quartz/dsoundrender.c | 233 +++++++++++-------------------------------- dlls/quartz/filesource.c | 138 ++++---------------------- dlls/quartz/mpegsplit.c | 4 +- dlls/quartz/nullrenderer.c | 184 ++++++---------------------------- dlls/quartz/parser.c | 145 +++++++------------------- dlls/quartz/parser.h | 9 +-- dlls/quartz/transform.c | 196 ++++++------------------------------ dlls/quartz/transform.h | 10 +-- dlls/quartz/videorenderer.c | 236 ++++++++++++------------------------------- dlls/quartz/waveparser.c | 4 +- dlls/strmbase/Makefile.in | 1 + dlls/strmbase/filter.c | 198 ++++++++++++++++++++++++++++++++++++ include/wine/strmbase.h | 26 +++++ 17 files changed, 516 insertions(+), 1047 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d42659c406abd5213411…

1 0