May 2012 - Wine-Commits - list.winehq.org

Christian Costa : amstream: Add the corresponding pin to every media stream added to the media stream filter + add tests .
by Alexandre Julliard May 4, 2012

May 4, 2012

Module: wine Branch: master Commit: dec3d502901d56839ee5240c1ee68158efdcfac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dec3d502901d56839ee5240c1… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue May 1 10:21:28 2012 +0200 amstream: Add the corresponding pin to every media stream added to the media stream filter + add tests. --- dlls/amstream/mediastreamfilter.c | 96 +++++++++++++++++++++++++++++++++++-- dlls/amstream/tests/amstream.c | 48 ++++++++++++++++++ 2 files changed, 140 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c index cd08490..ee9d970 100644 --- a/dlls/amstream/mediastreamfilter.c +++ b/dlls/amstream/mediastreamfilter.c @@ -1,7 +1,7 @@ /* * Implementation of MediaStream Filter * - * Copyright 2008 Christian Costa + * Copyright 2008, 2012 Christian Costa * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -35,10 +35,38 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); +typedef struct MediaStreamFilter_InputPin +{ + BaseInputPin pin; +} MediaStreamFilter_InputPin; + +static const IPinVtbl MediaStreamFilter_InputPin_Vtbl = +{ + BaseInputPinImpl_QueryInterface, + BasePinImpl_AddRef, + BaseInputPinImpl_Release, + BaseInputPinImpl_Connect, + BaseInputPinImpl_ReceiveConnection, + BasePinImpl_Disconnect, + BasePinImpl_ConnectedTo, + BasePinImpl_ConnectionMediaType, + BasePinImpl_QueryPinInfo, + BasePinImpl_QueryDirection, + BasePinImpl_QueryId, + BasePinImpl_QueryAccept, + BasePinImpl_EnumMediaTypes, + BasePinImpl_QueryInternalConnections, + BaseInputPinImpl_EndOfStream, + BaseInputPinImpl_BeginFlush, + BaseInputPinImpl_EndFlush, + BasePinImpl_NewSegment +}; + typedef struct { BaseFilter filter; ULONG nb_streams; IMediaStream** streams; + IPin** pins; } IMediaStreamFilterImpl; static inline IMediaStreamFilterImpl *impl_from_IMediaStreamFilter(IMediaStreamFilter *iface) @@ -46,6 +74,32 @@ static inline IMediaStreamFilterImpl *impl_from_IMediaStreamFilter(IMediaStreamF return CONTAINING_RECORD(iface, IMediaStreamFilterImpl, filter); } +static HRESULT WINAPI BasePinImpl_CheckMediaType(BasePin *This, const AM_MEDIA_TYPE *pmt) +{ + return S_FALSE; +} + +static LONG WINAPI BasePinImp_GetMediaTypeVersion(BasePin *This) +{ + return 0; +} + +static HRESULT WINAPI BasePinImp_GetMediaType(BasePin *This, int iPosition, AM_MEDIA_TYPE *amt) +{ + return S_FALSE; +} + +static const BasePinFuncTable input_BaseFuncTable = { + BasePinImpl_CheckMediaType, + NULL, + BasePinImp_GetMediaTypeVersion, + BasePinImp_GetMediaType +}; + +static const BaseInputPinFuncTable input_BaseInputFuncTable = { + NULL +}; + /*** IUnknown methods ***/ static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter *iface, REFIID riid, @@ -93,7 +147,10 @@ static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) { int i; for (i = 0; i < This->nb_streams; i++) + { IMediaStream_Release(This->streams[i]); + IPin_Release(This->pins[i]); + } HeapFree(GetProcessHeap(), 0, This); } @@ -178,6 +235,11 @@ static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* i { IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); IMediaStream** streams; + IPin** pins; + MediaStreamFilter_InputPin* pin; + HRESULT hr; + PIN_INFO info; + MSPID purpose_id; TRACE("(%p)->(%p)\n", iface, pAMMediaStream); @@ -185,6 +247,24 @@ static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* i if (!streams) return E_OUTOFMEMORY; This->streams = streams; + pins = CoTaskMemRealloc(This->pins, (This->nb_streams + 1) * sizeof(IPin*)); + if (!pins) + return E_OUTOFMEMORY; + This->pins = pins; + info.pFilter = (IBaseFilter*)&This->filter; + info.dir = PINDIR_INPUT; + hr = IAMMediaStream_GetInformation(pAMMediaStream, &purpose_id, NULL); + if (FAILED(hr)) + return hr; + /* Pin name is "I{guid MSPID_PrimaryVideo or MSPID_PrimaryAudio}" */ + info.achName[0] = 'I'; + StringFromGUID2(&purpose_id, info.achName + 1, 40); + hr = BaseInputPin_Construct(&MediaStreamFilter_InputPin_Vtbl, &info, &input_BaseFuncTable, &input_BaseInputFuncTable, &This->filter.csFilter, NULL, &This->pins[This->nb_streams]); + if (FAILED(hr)) + return hr; + + pin = (MediaStreamFilter_InputPin*)This->pins[This->nb_streams]; + pin->pin.pin.pinInfo.pFilter = (LPVOID)This; This->streams[This->nb_streams] = (IMediaStream*)pAMMediaStream; This->nb_streams++; @@ -294,14 +374,22 @@ static const IMediaStreamFilterVtbl MediaStreamFilter_Vtbl = static IPin* WINAPI MediaStreamFilterImpl_GetPin(BaseFilter *iface, int pos) { - /* No pins */ + IMediaStreamFilterImpl* This = (IMediaStreamFilterImpl*)iface; + + if (pos < This->nb_streams) + { + IPin_AddRef(This->pins[pos]); + return This->pins[pos]; + } + return NULL; } static LONG WINAPI MediaStreamFilterImpl_GetPinCount(BaseFilter *iface) { - /* No pins */ - return 0; + IMediaStreamFilterImpl* This = (IMediaStreamFilterImpl*)iface; + + return This->nb_streams; } static const BaseFilterFuncTable BaseFuncTable = { diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index c62e83d..36c97b9 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -364,6 +364,54 @@ static void test_media_streams(void) } } + if (media_stream_filter) + { + IEnumPins *enum_pins; + + hr = IMediaStreamFilter_EnumPins(media_stream_filter, &enum_pins); + ok(hr == S_OK, "IBaseFilter_EnumPins returned: %x\n", hr); + if (hr == S_OK) + { + IPin* pins[3] = { NULL, NULL, NULL }; + ULONG nb_pins; + ULONG expected_nb_pins = audio_stream ? 2 : 1; + int i; + + hr = IEnumPins_Next(enum_pins, 3, pins, &nb_pins); + ok(SUCCEEDED(hr), "IEnumPins_Next returned: %x\n", hr); + ok(nb_pins == expected_nb_pins, "Number of pins is %u instead of %u\n", nb_pins, expected_nb_pins); + for (i = 0; i < min(nb_pins, expected_nb_pins); i++) + { + IEnumMediaTypes* enum_media_types; + AM_MEDIA_TYPE* media_types[10]; + ULONG nb_media_types; + IPin* pin; + PIN_INFO info; + WCHAR id[40]; + + /* Pin name is "I{guid MSPID_PrimaryVideo or MSPID_PrimaryAudio}" */ + id[0] = 'I'; + StringFromGUID2(i ? &MSPID_PrimaryAudio : &MSPID_PrimaryVideo, id + 1, 40); + + hr = IPin_ConnectedTo(pins[i], &pin); + ok(hr == VFW_E_NOT_CONNECTED, "IPin_ConnectedTo returned: %x\n", hr); + hr = IPin_QueryPinInfo(pins[i], &info); + ok(hr == S_OK, "IPin_QueryPinInfo returned: %x\n", hr); + IBaseFilter_Release(info.pFilter); + ok(info.dir == PINDIR_INPUT, "Pin direction is %u instead of %u\n", info.dir, PINDIR_INPUT); + ok(!lstrcmpW(info.achName, id), "Pin name is %s instead of %s\n", wine_dbgstr_w(info.achName), wine_dbgstr_w(id)); + hr = IPin_EnumMediaTypes(pins[i], &enum_media_types); + ok(hr == S_OK, "IPin_EnumMediaTypes returned: %x\n", hr); + hr = IEnumMediaTypes_Next(enum_media_types, sizeof(media_types) / sizeof(AM_MEDIA_TYPE), media_types, &nb_media_types); + ok(SUCCEEDED(hr), "IEnumMediaTypes_Next returned: %x\n", hr); + ok(nb_media_types == 0, "nb_media_types should be 0 instead of %u\n", nb_media_types); + IEnumMediaTypes_Release(enum_media_types); + IPin_Release(pins[i]); + } + IEnumPins_Release(enum_pins); + } + } + if (video_stream) IMediaStream_Release(video_stream); if (audio_stream)

1 0

Jacek Caban : jscript: Added support for VT_INT.
by Alexandre Julliard May 4, 2012

May 4, 2012

Module: wine Branch: master Commit: c8a28a9671986be9d1ee5345461c11379bc0ed39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a28a9671986be9d1ee53454… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 4 15:59:43 2012 +0200 jscript: Added support for VT_INT. --- dlls/jscript/dispex.c | 14 ++++++++++++-- dlls/jscript/jsutils.c | 2 ++ dlls/jscript/tests/run.c | 33 ++++++++++++++++++++++++++++----- 3 files changed, 42 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 96c17c8..dd4b081 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -342,8 +342,10 @@ static HRESULT convert_params(const DISPPARAMS *dp, VARIANT *buf, DISPPARAMS *re *ret = *dp; - for(i = 0; i < ret->cArgs; i++) { - if(V_VT(get_arg(dp, i)) == VT_I2) { + for(i = 0; i < ret->cArgs && !need_conversion; i++) { + switch(V_VT(get_arg(dp, i))) { + case VT_I2: + case VT_INT: need_conversion = TRUE; break; } @@ -368,6 +370,10 @@ static HRESULT convert_params(const DISPPARAMS *dp, VARIANT *buf, DISPPARAMS *re V_VT(d) = VT_I4; V_I4(d) = V_I2(s); break; + case VT_INT: + V_VT(d) = VT_I4; + V_I4(d) = V_INT(s); + break; default: *d = *s; } @@ -1015,6 +1021,10 @@ static void ensure_retval_type(VARIANT *v) case VT_I2: V_VT(v) = VT_I4; V_I4(v) = V_I2(v); + break; + case VT_INT: + V_VT(v) = VT_I4; + V_I4(v) = V_INT(v); } } diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index c3924b7..d19d71b 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -263,6 +263,7 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret return throw_type_error(ctx, ei, JS_E_TO_PRIMITIVE, NULL); } case VT_I2: + case VT_INT: assert(0); default: FIXME("Unimplemented for vt %d\n", V_VT(v)); @@ -447,6 +448,7 @@ HRESULT to_number(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, double *ret) *ret = V_BOOL(v) ? 1 : 0; break; case VT_I2: + case VT_INT: assert(0); default: FIXME("unimplemented for vt %d\n", V_VT(v)); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 332b125..f9de734 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -97,12 +97,14 @@ DEFINE_EXPECT(DeleteMemberByDispID); #define DISPID_GLOBAL_OBJECT_FLAG 0x100e #define DISPID_GLOBAL_ISWIN64 0x100f #define DISPID_GLOBAL_PUREDISP 0x1010 -#define DISPID_GLOBAL_TESTPROPDELETE 0x1010 #define DISPID_GLOBAL_ISNULLBSTR 0x1011 #define DISPID_GLOBAL_PROPARGPUT 0x1012 #define DISPID_GLOBAL_SHORTPROP 0x1013 #define DISPID_GLOBAL_GETSHORT 0x1014 #define DISPID_GLOBAL_TESTARGTYPES 0x1015 +#define DISPID_GLOBAL_INTPROP 0x1016 + +#define DISPID_GLOBAL_TESTPROPDELETE 0x2000 #define DISPID_TESTOBJ_PROP 0x2000 #define DISPID_TESTOBJ_ONLYDISPID 0x2001 @@ -538,6 +540,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD return S_OK; } + if(!strcmp_wa(bstrName, "intProp")) { + *pid = DISPID_GLOBAL_INTPROP; + return S_OK; + } + if(strict_dispid_check && strcmp_wa(bstrName, "t")) ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; @@ -928,16 +935,21 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_I2(pvarRes) = 10; return S_OK; + case DISPID_GLOBAL_INTPROP: + V_VT(pvarRes) = VT_INT; + V_INT(pvarRes) = 22; + return S_OK; + case DISPID_GLOBAL_TESTARGTYPES: { - VARIANT args[1]; - DISPPARAMS dp = {args, NULL, 1, 0}; + VARIANT args[2]; + DISPPARAMS dp = {args, NULL, sizeof(args)/sizeof(*args), 0}; HRESULT hres; CHECK_EXPECT(global_testargtypes_i); ok(wFlags == DISPATCH_METHOD, "wFlags = %x\n", wFlags); ok(pdp != NULL, "pdp == NULL\n"); ok(pdp->rgvarg != NULL, "rgvarg != NULL\n"); - ok(pdp->cArgs == 3, "cArgs = %d\n", pdp->cArgs); + ok(pdp->cArgs == 5, "cArgs = %d\n", pdp->cArgs); ok(!pvarRes, "pvarRes != NULL\n"); ok(V_VT(pdp->rgvarg+1) == VT_I4, "V_VT(psp->rgvargs+1) = %d\n", V_VT(pdp->rgvarg)); @@ -946,10 +958,18 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(V_VT(pdp->rgvarg+2) == VT_I4, "V_VT(psp->rgvargs+2) = %d\n", V_VT(pdp->rgvarg+1)); ok(V_I4(pdp->rgvarg+2) == 10, "V_I4(psp->rgvargs+2) = %d\n", V_I4(pdp->rgvarg+1)); + ok(V_VT(pdp->rgvarg+3) == VT_I4, "V_VT(psp->rgvargs+3) = %d\n", V_VT(pdp->rgvarg+3)); + ok(V_I4(pdp->rgvarg+3) == 22, "V_I4(psp->rgvargs+3) = %d\n", V_I4(pdp->rgvarg+3)); + + ok(V_VT(pdp->rgvarg+4) == VT_I4, "V_VT(psp->rgvargs+4) = %d\n", V_VT(pdp->rgvarg+4)); + ok(V_I4(pdp->rgvarg+4) == 22, "V_I4(psp->rgvargs+4) = %d\n", V_I4(pdp->rgvarg+4)); + ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); V_VT(args) = VT_I2; V_I2(args) = 2; + V_VT(args+1) = VT_INT; + V_INT(args+1) = 22; hres = IDispatch_Invoke(V_DISPATCH(pdp->rgvarg), DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dp, NULL, NULL, NULL); ok(hres == S_OK, "Invoke failed: %08x\n", hres); @@ -1712,7 +1732,10 @@ static BOOL run_tests(void) CHECK_CALLED(global_propargput_i); SET_EXPECT(global_testargtypes_i); - parse_script_a("testArgTypes(getShort(), shortProp, function(s) {ok(getVT(s) === 'VT_I4', 'not VT_I4');});"); + parse_script_a("testArgTypes(intProp(), intProp, getShort(), shortProp, function(i,s) {" + " ok(getVT(i) === 'VT_I4', 'getVT(i) = ' + getVT(i));" + " ok(getVT(s) === 'VT_I4', 'getVT(s) = ' + getVT(s));" + "});"); CHECK_CALLED(global_testargtypes_i); run_from_res("lang.js");

1 0

Francois Gouget : regedit: An English (United States) spelling fix.
by Alexandre Julliard May 4, 2012

May 4, 2012

1 0

Jacek Caban : mshtml: Fixed tests on old IEs.
by Alexandre Julliard May 4, 2012

May 4, 2012

Module: wine Branch: master Commit: 1767fafa009d49dbb4bdb6eb58b04699032d8efc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1767fafa009d49dbb4bdb6eb5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 4 17:24:46 2012 +0200 mshtml: Fixed tests on old IEs. --- dlls/mshtml/tests/dom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f095cc2..14d91cc 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4487,7 +4487,7 @@ static void test_history(IHTMLWindow2 *window) ok(hres == S_OK, "get_history failed: %08x\n", hres); ok(history != NULL, "history = NULL\n"); - test_disp((IUnknown*)history, &DIID_DispHTMLHistory, "[object]"); + test_disp2((IUnknown*)history, &DIID_DispHTMLHistory, &IID_IOmHistory, "[object]"); history2 = NULL; hres = IHTMLWindow2_get_history(window, &history2);

1 0

Jacek Caban : jscript: Skip failing tests on old jscript versions.
by Alexandre Julliard May 4, 2012

May 4, 2012

Module: wine Branch: master Commit: c61af66c5bd0d3beea713af6ef3f458caa1100cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=c61af66c5bd0d3beea713af6e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 4 15:59:30 2012 +0200 jscript: Skip failing tests on old jscript versions. --- dlls/jscript/tests/api.js | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index b25f0ae..4366aa1 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1016,15 +1016,17 @@ tmp = arr.splice(-bigInt); ok(tmp.toString() == "", "arr.splice(-bigInt) returned " + tmp.toString()); ok(arr.toString() == "1,2,3,4,5", "arr.splice(-bigInt) is " + arr.toString()); -arr = [1,2,3,4,5]; -tmp = arr.splice(2, bigInt); -ok(tmp.toString() == "3,4,5", "arr.splice(2, bigInt) returned " + tmp.toString()); -ok(arr.toString() == "1,2", "arr.splice(2, bigInt) is " + arr.toString()); +if(invokeVersion >= 2) { + arr = [1,2,3,4,5]; + tmp = arr.splice(2, bigInt); + ok(tmp.toString() == "3,4,5", "arr.splice(2, bigInt) returned " + tmp.toString()); + ok(arr.toString() == "1,2", "arr.splice(2, bigInt) is " + arr.toString()); +} arr = [1,2,3,4,5]; tmp = arr.splice(2, -bigInt); -ok(tmp.toString() == "", "arr.splice(2, bigInt) returned " + tmp.toString()); -ok(arr.toString() == "1,2,3,4,5", "arr.splice(2, bigInt) is " + arr.toString()); +ok(tmp.toString() == "", "arr.splice(2, -bigInt) returned " + tmp.toString()); +ok(arr.toString() == "1,2,3,4,5", "arr.splice(2, -bigInt) is " + arr.toString()); obj = new Object(); obj.length = 3;

1 0

Francois Gouget : d3dx9_36/tests: Add a trailing '\n' to an ok() call.
by Alexandre Julliard May 4, 2012

May 4, 2012

Module: wine Branch: master Commit: 8036abe4da7f760517b230e8b7500e9242971acf URL: http://source.winehq.org/git/wine.git/?a=commit;h=8036abe4da7f760517b230e8b… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 4 16:25:41 2012 +0200 d3dx9_36/tests: Add a trailing '\n' to an ok() call. --- dlls/d3dx9_36/tests/mesh.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index b8123ab..563c759 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -10173,7 +10173,7 @@ static void test_optimize_faces(void) tc[i].num_vertices, tc[i].indices_are_32bit, face_remap); ok(hr == D3D_OK, "D3DXOptimizeFaces test case %d failed. " - "Got %x\n, expected D3D_OK", i, hr); + "Got %x\n, expected D3D_OK\n", i, hr); /* Compare face remap with expected face remap */ for (j = 0; j < tc[i].num_faces; j++)

1 0

Francois Gouget : strmbase: The strmbase debug channel is unused in a couple of files so remove it.
by Alexandre Julliard May 4, 2012

May 4, 2012

Module: wine Branch: master Commit: fcda2bd929831ccf244301178b4af435d3f8ea6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcda2bd929831ccf244301178… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 4 16:25:50 2012 +0200 strmbase: The strmbase debug channel is unused in a couple of files so remove it. --- dlls/strmbase/audio.c | 2 -- dlls/strmbase/dispatch.c | 3 --- 2 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/strmbase/audio.c b/dlls/strmbase/audio.c index be99583..e167a79 100644 --- a/dlls/strmbase/audio.c +++ b/dlls/strmbase/audio.c @@ -24,11 +24,9 @@ #include "dshow.h" #include "uuids.h" #include "vfwmsgs.h" -#include "wine/debug.h" #include "wine/unicode.h" #include "wine/strmbase.h" -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); static inline BasicAudio *impl_from_IBasicAudio(IBasicAudio *iface) { diff --git a/dlls/strmbase/dispatch.c b/dlls/strmbase/dispatch.c index 59ac99d3..8f7aa05 100644 --- a/dlls/strmbase/dispatch.c +++ b/dlls/strmbase/dispatch.c @@ -21,15 +21,12 @@ #define COBJMACROS #include "dshow.h" -#include "wine/debug.h" #include "wine/unicode.h" #include "wine/strmbase.h" #include "uuids.h" #include "vfwmsgs.h" #include <assert.h> -WINE_DEFAULT_DEBUG_CHANNEL(strmbase); - HRESULT WINAPI BaseDispatch_Init(BaseDispatch *This, REFIID riid) { HRESULT hr = E_FAIL;

1 0

Francois Gouget : comdlg32: An English (United States) spelling fix.
by Alexandre Julliard May 4, 2012

May 4, 2012

1 0

Francois Gouget : wldap32: An English (United States) spelling fix.
by Alexandre Julliard May 4, 2012

May 4, 2012

1 0

Alexandre Julliard : urlmon/tests: Allow more COOKIE_SENT notifications.
by Alexandre Julliard May 4, 2012

May 4, 2012

Module: wine Branch: master Commit: 7f1b26a0a93f7f198f9bba63389c137088cd408f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f1b26a0a93f7f198f9bba633… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 23:44:35 2012 +0200 urlmon/tests: Allow more COOKIE_SENT notifications. --- dlls/urlmon/tests/protocol.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 9c864e2..a39b8ed 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -583,8 +583,6 @@ static void call_continue(PROTOCOLDATA *protocol_data) CHECK_CALLED(ReportProgress_REDIRECTING); state = test_async_req ? STATE_SENDINGREQUEST : STATE_STARTDOWNLOADING; } - else if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) - CLEAR_CALLED(ReportProgress_COOKIE_SENT); switch(state) { case STATE_SENDINGREQUEST: @@ -2998,6 +2996,9 @@ static void test_http_protocol_url(LPCWSTR url, int prot, DWORD flags, DWORD tym if(prot == HTTPS_TEST) CLEAR_CALLED(ReportProgress_SENDINGREQUEST); + if (prot == HTTP_TEST || prot == HTTPS_TEST) + CLEAR_CALLED(ReportProgress_COOKIE_SENT); + hres = IInternetProtocol_Abort(async_protocol, E_ABORT, 0); ok(hres == INET_E_RESULT_DISPATCHED, "Abort failed: %08x\n", hres);

1 0