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

Jacek Caban : jscript: Return double instead of VARIANT from date_utc.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 0d287ff0b103037470a6064e5248643e9f4f0eef URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d287ff0b103037470a6064e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 27 11:29:21 2012 +0200 jscript: Return double instead of VARIANT from date_utc. --- dlls/jscript/date.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 4ca6e81..d9c0d39 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2431,7 +2431,7 @@ static HRESULT DateConstr_parse(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return S_OK; } -static HRESULT date_utc(script_ctx_t *ctx, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) +static HRESULT date_utc(script_ctx_t *ctx, DISPPARAMS *dp, double *ret, jsexcept_t *ei) { double year, month, vdate, hours, minutes, seconds, ms; int arg_no = arg_cnt(dp); @@ -2497,22 +2497,23 @@ static HRESULT date_utc(script_ctx_t *ctx, DISPPARAMS *dp, VARIANT *retv, jsexce ms = 0; } - if(retv) { - V_VT(retv) = VT_R8; - V_R8(retv) = time_clip(make_date( - make_day(year, month, vdate), - make_time(hours, minutes,seconds, ms))); - } - + *ret = time_clip(make_date(make_day(year, month, vdate), + make_time(hours, minutes,seconds, ms))); return S_OK; } static HRESULT DateConstr_UTC(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) { + double n; + HRESULT hres; + TRACE("\n"); - return date_utc(ctx, dp, retv, ei); + hres = date_utc(ctx, dp, &n, ei); + if(SUCCEEDED(hres) && retv) + num_set_val(retv, n); + return hres; } static HRESULT DateConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, @@ -2567,14 +2568,14 @@ static HRESULT DateConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, /* ECMA-262 3rd Edition 15.9.3.1 */ default: { - VARIANT ret_date; + double ret_date; DateInstance *di; hres = date_utc(ctx, dp, &ret_date, ei); if(FAILED(hres)) return hres; - hres = create_date(ctx, NULL, num_val(&ret_date), &date); + hres = create_date(ctx, NULL, ret_date, &date); if(FAILED(hres)) return hres;

1 0

Jacek Caban : jscript: Return double instead of VARIANT from stack_pop_number.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 0bf61fb64026afb956e765dbc01e899c9a4aa94a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bf61fb64026afb956e765dbc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 27 11:30:03 2012 +0200 jscript: Return double instead of VARIANT from stack_pop_number. --- dlls/jscript/engine.c | 31 +++++++++++++------------------ 1 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index c4259b9..955ba71 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -145,20 +145,15 @@ static void stack_popn(exec_ctx_t *ctx, unsigned n) VariantClear(stack_pop(ctx)); } -static HRESULT stack_pop_number(exec_ctx_t *ctx, VARIANT *r) +static HRESULT stack_pop_number(exec_ctx_t *ctx, double *r) { VARIANT *v; - double n; HRESULT hres; v = stack_pop(ctx); - hres = to_number(ctx->script, v, ctx->ei, &n); + hres = to_number(ctx->script, v, ctx->ei, r); VariantClear(v); - if(FAILED(hres)) - return hres; - - num_set_val(r, n); - return S_OK; + return hres; } static HRESULT stack_pop_object(exec_ctx_t *ctx, IDispatch **r) @@ -1569,7 +1564,7 @@ static HRESULT interp_add(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.6.2 */ static HRESULT interp_sub(exec_ctx_t *ctx) { - VARIANT l, r; + double l, r; HRESULT hres; TRACE("\n"); @@ -1582,13 +1577,13 @@ static HRESULT interp_sub(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - return stack_push_number(ctx, num_val(&l)-num_val(&r)); + return stack_push_number(ctx, l-r); } /* ECMA-262 3rd Edition 11.5.1 */ static HRESULT interp_mul(exec_ctx_t *ctx) { - VARIANT l, r; + double l, r; HRESULT hres; TRACE("\n"); @@ -1601,13 +1596,13 @@ static HRESULT interp_mul(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - return stack_push_number(ctx, num_val(&l)*num_val(&r)); + return stack_push_number(ctx, l*r); } /* ECMA-262 3rd Edition 11.5.2 */ static HRESULT interp_div(exec_ctx_t *ctx) { - VARIANT l, r; + double l, r; HRESULT hres; TRACE("\n"); @@ -1620,13 +1615,13 @@ static HRESULT interp_div(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - return stack_push_number(ctx, num_val(&l)/num_val(&r)); + return stack_push_number(ctx, l/r); } /* ECMA-262 3rd Edition 11.5.3 */ static HRESULT interp_mod(exec_ctx_t *ctx) { - VARIANT l, r; + double l, r; HRESULT hres; TRACE("\n"); @@ -1639,7 +1634,7 @@ static HRESULT interp_mod(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - return stack_push_number(ctx, fmod(num_val(&l), num_val(&r))); + return stack_push_number(ctx, fmod(l, r)); } /* ECMA-262 3rd Edition 11.4.2 */ @@ -1862,7 +1857,7 @@ static HRESULT interp_typeof(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.4.7 */ static HRESULT interp_minus(exec_ctx_t *ctx) { - VARIANT n; + double n; HRESULT hres; TRACE("\n"); @@ -1871,7 +1866,7 @@ static HRESULT interp_minus(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - return stack_push_number(ctx, -num_val(&n)); + return stack_push_number(ctx, -n); } /* ECMA-262 3rd Edition 11.4.6 */

1 0

Jacek Caban : jscript: Store value as double in NumberInstance object.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 7bb41e75b63a2bd2362555d74317b2923aca90c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bb41e75b63a2bd2362555d74… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 27 11:30:51 2012 +0200 jscript: Store value as double in NumberInstance object. --- dlls/jscript/jscript.h | 2 +- dlls/jscript/jsutils.c | 2 +- dlls/jscript/number.c | 33 ++++++++++++++------------------- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index fbe3142..3948a9c 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -242,7 +242,7 @@ HRESULT create_regexp(script_ctx_t*,const WCHAR *,int,DWORD,jsdisp_t**) DECLSPEC HRESULT create_regexp_var(script_ctx_t*,VARIANT*,VARIANT*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_string(script_ctx_t*,const WCHAR*,DWORD,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_bool(script_ctx_t*,VARIANT_BOOL,jsdisp_t**) DECLSPEC_HIDDEN; -HRESULT create_number(script_ctx_t*,VARIANT*,jsdisp_t**) DECLSPEC_HIDDEN; +HRESULT create_number(script_ctx_t*,double,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_vbarray(script_ctx_t*,SAFEARRAY*,jsdisp_t**) DECLSPEC_HIDDEN; typedef enum { diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 564dba6..31c471f 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -623,7 +623,7 @@ HRESULT to_object(script_ctx_t *ctx, VARIANT *v, IDispatch **disp) break; case VT_I4: case VT_R8: - hres = create_number(ctx, v, &dispex); + hres = create_number(ctx, num_val(v), &dispex); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 7a3d8b0..de0ff63 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -30,7 +30,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { jsdisp_t dispex; - VARIANT num; + double value; } NumberInstance; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; @@ -76,17 +76,16 @@ static HRESULT Number_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, D return throw_type_error(ctx, ei, JS_E_INVALIDARG, NULL); } - if(V_VT(&number->num) == VT_I4) - val = V_I4(&number->num); - else - val = V_R8(&number->num); + val = number->value; if(radix==10 || isnan(val) || isinf(val)) { - hres = to_string(ctx, &number->num, ei, &str); + VARIANT v; + + num_set_val(&v, val); + hres = to_string(ctx, &v, ei, &str); if(FAILED(hres)) return hres; - } - else { + }else { INT idx = 0; DOUBLE integ, frac, log_radix = 0; WCHAR buf[NUMBER_TOSTRING_BUF_SIZE+16]; @@ -218,7 +217,7 @@ static HRESULT Number_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI return throw_type_error(ctx, ei, JS_E_NUMBER_EXPECTED, NULL); if(retv) - *retv = number->num; + num_set_val(retv, number->value); return S_OK; } @@ -231,7 +230,7 @@ static HRESULT Number_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP case INVOKE_FUNC: return throw_type_error(ctx, ei, JS_E_FUNCTION_EXPECTED, NULL); case DISPATCH_PROPERTYGET: - *retv = number->num; + num_set_val(retv, number->value); break; default: @@ -288,20 +287,16 @@ static HRESULT NumberConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags case DISPATCH_CONSTRUCT: { jsdisp_t *obj; - VARIANT v; if(arg_cnt(dp)) { hres = to_number(ctx, get_arg(dp, 0), ei, &n); if(FAILED(hres)) return hres; - - num_set_val(&v, n); }else { - V_VT(&v) = VT_I4; - V_I4(&v) = 0; + n = 0; } - hres = create_number(ctx, &v, &obj); + hres = create_number(ctx, n, &obj); if(FAILED(hres)) return hres; @@ -347,7 +342,7 @@ HRESULT create_number_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdi if(FAILED(hres)) return hres; - V_VT(&number->num) = VT_I4; + number->value = 0; hres = create_builtin_function(ctx, NumberConstr_value, NumberW, NULL, PROPF_CONSTR|1, &number->dispex, ret); @@ -355,7 +350,7 @@ HRESULT create_number_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdi return hres; } -HRESULT create_number(script_ctx_t *ctx, VARIANT *num, jsdisp_t **ret) +HRESULT create_number(script_ctx_t *ctx, double value, jsdisp_t **ret) { NumberInstance *number; HRESULT hres; @@ -364,7 +359,7 @@ HRESULT create_number(script_ctx_t *ctx, VARIANT *num, jsdisp_t **ret) if(FAILED(hres)) return hres; - number->num = *num; + number->value = value; *ret = &number->dispex; return S_OK;

1 0

André Hentschel : wevtapi: Add stub for EvtOpenChannelConfig.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 35c272caa33f692d085c627fafdc77f559d0cae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35c272caa33f692d085c627fa… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 18 19:20:08 2012 +0100 wevtapi: Add stub for EvtOpenChannelConfig. --- dlls/wevtapi/main.c | 8 +++ dlls/wevtapi/wevtapi.spec | 2 +- include/Makefile.in | 1 + include/winevt.h | 132 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 142 insertions(+), 1 deletions(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index 583ddba..a39c7c9 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -1,5 +1,6 @@ /* * Copyright 2012 Austin English + * Copyright 2012 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,6 +23,7 @@ #include "windef.h" #include "winbase.h" +#include "winevt.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(wevtapi); @@ -43,3 +45,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +EVT_HANDLE WINAPI EvtOpenChannelConfig(EVT_HANDLE Session, LPCWSTR ChannelPath, DWORD Flags) +{ + FIXME("(%p %s %u) stub\n", Session, debugstr_w(ChannelPath), Flags); + return NULL; +} diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index f6a5786..adc3706 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -29,7 +29,7 @@ @ stub EvtNextChannelPath @ stub EvtNextEventMetadata @ stub EvtNextPublisherId -@ stub EvtOpenChannelConfig +@ stdcall EvtOpenChannelConfig(ptr wstr long) @ stub EvtOpenChannelEnum @ stub EvtOpenEventMetadataEnum @ stub EvtOpenLog diff --git a/include/Makefile.in b/include/Makefile.in index fa6f837..a83e56d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -539,6 +539,7 @@ SRCDIR_INCLUDES = \ wine/library.h \ wine/unicode.h \ winerror.h \ + winevt.h \ wingdi.h \ winhttp.h \ wininet.h \ diff --git a/include/winevt.h b/include/winevt.h new file mode 100644 index 0000000..53ffe44 --- /dev/null +++ b/include/winevt.h @@ -0,0 +1,132 @@ +/* Definitions for the Windows Event Log (wevtapi.dll) + * + * Copyright 2012 André Hentschel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WINEVT_H +#define __WINE_WINEVT_H + +#include <wtypes.h> + +#ifdef __cplusplus +extern "C" { +#endif /* defined(__cplusplus) */ + +typedef HANDLE EVT_HANDLE, *PEVT_HANDLE; + +typedef enum _EVT_CHANNEL_CONFIG_PROPERTY_ID { + EvtChannelConfigEnabled = 0, + EvtChannelConfigIsolation, + EvtChannelConfigType, + EvtChannelConfigOwningPublisher, + EvtChannelConfigClassicEventlog, + EvtChannelConfigAccess, + EvtChannelLoggingConfigRetention, + EvtChannelLoggingConfigAutoBackup, + EvtChannelLoggingConfigMaxSize, + EvtChannelLoggingConfigLogFilePath, + EvtChannelPublishingConfigLevel, + EvtChannelPublishingConfigKeywords, + EvtChannelPublishingConfigControlGuid, + EvtChannelPublishingConfigBufferSize, + EvtChannelPublishingConfigMinBuffers, + EvtChannelPublishingConfigMaxBuffers, + EvtChannelPublishingConfigLatency, + EvtChannelPublishingConfigClockType, + EvtChannelPublishingConfigSidType, + EvtChannelPublisherList, + EvtChannelPublishingConfigFileMax, + EvtChannelConfigPropertyIdEND +} EVT_CHANNEL_CONFIG_PROPERTY_ID; + +typedef enum _EVT_SUBSCRIBE_NOTIFY_ACTION { + EvtSubscribeActionError = 0, + EvtSubscribeActionDeliver +} EVT_SUBSCRIBE_NOTIFY_ACTION; + +typedef struct _EVT_VARIANT { + union { + BOOL BooleanVal; + INT8 SByteVal; + INT16 Int16Val; + INT32 Int32Val; + INT64 Int64Val; + UINT8 ByteVal; + UINT16 UInt16Val; + UINT32 UInt32Val; + UINT64 UInt64Val; + FLOAT SingleVal; + DOUBLE DoubleVal; + ULONGLONG FileTimeVal; + SYSTEMTIME* SysTimeVal; + GUID* GuidVal; + LPCWSTR StringVal; + LPCSTR AnsiStringVal; + PBYTE BinaryVal; + PSID SidVal; + SIZE_T SizeTVal; + + BOOL* BooleanArr; + INT8* SByteArr; + INT16* Int16Arr; + INT32* Int32Arr; + INT64* Int64Arr; + UINT8* ByteArr; + UINT16* UInt16Arr; + UINT32* UInt32Arr; + UINT64* UInt64Arr; + FLOAT* SingleArr; + DOUBLE* DoubleArr; + FILETIME* FileTimeArr; + SYSTEMTIME* SysTimeArr; + GUID* GuidArr; + LPWSTR* StringArr; + LPSTR* AnsiStringArr; + PSID* SidArr; + SIZE_T* SizeTArr; + + EVT_HANDLE EvtHandleVal; + LPCWSTR XmlVal; + LPCWSTR* XmlValArr; + } DUMMYUNIONNAME; + + DWORD Count; + DWORD Type; +} EVT_VARIANT, *PEVT_VARIANT; + +typedef DWORD (WINAPI *EVT_SUBSCRIBE_CALLBACK)(EVT_SUBSCRIBE_NOTIFY_ACTION Action, + PVOID UserContext, EVT_HANDLE Event); + +BOOL WINAPI EvtGetChannelConfigProperty(EVT_HANDLE ChannelConfig, + EVT_CHANNEL_CONFIG_PROPERTY_ID PropertyId, + DWORD Flags, DWORD PropertyValueBufferSize, + PEVT_VARIANT PropertyValueBuffer, + PDWORD PropertyValueBufferUsed); +BOOL WINAPI EvtSetChannelConfigProperty(EVT_HANDLE ChannelConfig, + EVT_CHANNEL_CONFIG_PROPERTY_ID PropertyId, + DWORD Flags, PEVT_VARIANT PropertyValue); +EVT_HANDLE WINAPI EvtSubscribe(EVT_HANDLE Session, HANDLE SignalEvent, LPCWSTR ChannelPath, + LPCWSTR Query, EVT_HANDLE Bookmark, PVOID context, + EVT_SUBSCRIBE_CALLBACK Callback, DWORD Flags); +EVT_HANDLE WINAPI EvtOpenChannelConfig(EVT_HANDLE Session, LPCWSTR ChannelPath, DWORD Flags); + + +#ifdef __cplusplus +} /* extern "C" */ +#endif /* defined(__cplusplus) */ + +#endif /* __WINE_WINEVT_H */

1 0

Aric Stewart : strmbase: COM cleanup for BaseFilter.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 29d3c754424ccda2f6f07be0d4e6c0596c6234d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29d3c754424ccda2f6f07be0d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Mar 24 11:42:27 2012 -0500 strmbase: COM cleanup for BaseFilter. --- dlls/qcap/vfwcapture.c | 2 +- dlls/quartz/filesource.c | 10 +++++----- dlls/quartz/nullrenderer.c | 1 - dlls/quartz/videorenderer.c | 1 - dlls/strmbase/enumpins.c | 4 ++-- dlls/strmbase/filter.c | 29 +++++++++++++++++------------ dlls/strmbase/transform.c | 2 +- include/wine/strmbase.h | 2 +- 8 files changed, 27 insertions(+), 24 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 1138a64..68341ae 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -139,7 +139,7 @@ IUnknown * WINAPI QCAP_createVFWCaptureFilter(IUnknown *pUnkOuter, HRESULT *phr) pVfwCapture->IPersistPropertyBag_iface.lpVtbl = &IPersistPropertyBag_VTable; pVfwCapture->init = FALSE; - hr = VfwPin_Construct((IBaseFilter *)&pVfwCapture->filter.lpVtbl, + hr = VfwPin_Construct(&pVfwCapture->filter.IBaseFilter_iface, &pVfwCapture->filter.csFilter, &pVfwCapture->pOutputPin); if (FAILED(hr)) { diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 79c70a4..2adb940 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -529,21 +529,21 @@ static HRESULT WINAPI FileSource_QueryInterface(IFileSourceFilter * iface, REFII { AsyncReader *This = impl_from_IFileSourceFilter(iface); - return IBaseFilter_QueryInterface((IFileSourceFilter*)&This->filter.lpVtbl, riid, ppv); + return IBaseFilter_QueryInterface(&This->filter.IBaseFilter_iface, riid, ppv); } static ULONG WINAPI FileSource_AddRef(IFileSourceFilter * iface) { AsyncReader *This = impl_from_IFileSourceFilter(iface); - return IBaseFilter_AddRef((IFileSourceFilter*)&This->filter.lpVtbl); + return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); } static ULONG WINAPI FileSource_Release(IFileSourceFilter * iface) { AsyncReader *This = impl_from_IFileSourceFilter(iface); - return IBaseFilter_Release((IFileSourceFilter*)&This->filter.lpVtbl); + return IBaseFilter_Release(&This->filter.IBaseFilter_iface); } static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFileName, const AM_MEDIA_TYPE * pmt) @@ -565,8 +565,8 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi } /* create pin */ - hr = FileAsyncReader_Construct(hFile, (IBaseFilter *)&This->filter.lpVtbl, &This->filter.csFilter, &This->pOutputPin); - BaseFilterImpl_IncrementPinVersion((BaseFilter *)&This->filter.lpVtbl); + hr = FileAsyncReader_Construct(hFile, &This->filter.IBaseFilter_iface, &This->filter.csFilter, &This->pOutputPin); + BaseFilterImpl_IncrementPinVersion(&This->filter); if (SUCCEEDED(hr)) hr = IPin_QueryInterface(This->pOutputPin, &IID_IAsyncReader, (LPVOID *)&pReader); diff --git a/dlls/quartz/nullrenderer.c b/dlls/quartz/nullrenderer.c index 9fc1b44..f850b40 100644 --- a/dlls/quartz/nullrenderer.c +++ b/dlls/quartz/nullrenderer.c @@ -227,7 +227,6 @@ static ULONG WINAPI NullRendererInner_Release(IUnknown * iface) IPin_Disconnect((IPin *)This->pInputPin); IPin_Release((IPin *)This->pInputPin); - This->filter.lpVtbl = NULL; if (This->seekthru_unk) IUnknown_Release(This->seekthru_unk); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 3e1004e..c21164f 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -694,7 +694,6 @@ static ULONG WINAPI VideoRendererInner_Release(IUnknown * iface) IPin_Release((IPin *)This->pInputPin); - This->filter.lpVtbl = NULL; IUnknown_Release(This->seekthru_unk); This->filter.csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->filter.csFilter); diff --git a/dlls/strmbase/enumpins.c b/dlls/strmbase/enumpins.c index 13c7c6e..eab4d5b 100644 --- a/dlls/strmbase/enumpins.c +++ b/dlls/strmbase/enumpins.c @@ -66,7 +66,7 @@ HRESULT WINAPI EnumPins_Construct(BaseFilter *base, BaseFilter_GetPin receive_p pEnumPins->receive_pincount = receive_pincount; pEnumPins->receive_version = receive_version; pEnumPins->base = base; - IBaseFilter_AddRef((IBaseFilter*)base); + IBaseFilter_AddRef(&base->IBaseFilter_iface); *ppEnum = &pEnumPins->IEnumPins_iface; pEnumPins->Version = receive_version(base); @@ -115,7 +115,7 @@ static ULONG WINAPI IEnumPinsImpl_Release(IEnumPins * iface) if (!refCount) { - IBaseFilter_Release((IBaseFilter*)This->base); + IBaseFilter_Release(&This->base->IBaseFilter_iface); CoTaskMemFree(This); return 0; } diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index 6656cfa..67f7c9f 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -29,9 +29,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +static inline BaseFilter *impl_from_IBaseFilter(IBaseFilter *iface) +{ + return CONTAINING_RECORD(iface, BaseFilter, IBaseFilter_iface); +} + HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { - BaseFilter *This = (BaseFilter *)iface; + BaseFilter *This = impl_from_IBaseFilter(iface); TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); *ppv = NULL; @@ -56,7 +61,7 @@ HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, L ULONG WINAPI BaseFilterImpl_AddRef(IBaseFilter * iface) { - BaseFilter *This = (BaseFilter*)iface; + BaseFilter *This = impl_from_IBaseFilter(iface); ULONG refCount = InterlockedIncrement(&This->refCount); TRACE("(%p)->() AddRef from %d\n", This, refCount - 1); @@ -66,7 +71,7 @@ ULONG WINAPI BaseFilterImpl_AddRef(IBaseFilter * iface) ULONG WINAPI BaseFilterImpl_Release(IBaseFilter * iface) { - BaseFilter *This = (BaseFilter *)iface; + BaseFilter *This = impl_from_IBaseFilter(iface); ULONG refCount = InterlockedDecrement(&This->refCount); TRACE("(%p)->() Release from %d\n", This, refCount + 1); @@ -76,7 +81,7 @@ ULONG WINAPI BaseFilterImpl_Release(IBaseFilter * iface) if (This->pClock) IReferenceClock_Release(This->pClock); - This->lpVtbl = NULL; + This->IBaseFilter_iface.lpVtbl = NULL; This->csFilter.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->csFilter); } @@ -86,7 +91,7 @@ ULONG WINAPI BaseFilterImpl_Release(IBaseFilter * iface) HRESULT WINAPI BaseFilterImpl_GetClassID(IBaseFilter * iface, CLSID * pClsid) { - BaseFilter *This = (BaseFilter*)iface; + BaseFilter *This = impl_from_IBaseFilter(iface); TRACE("(%p)->(%p)\n", This, pClsid); *pClsid = This->clsid; @@ -96,7 +101,7 @@ HRESULT WINAPI BaseFilterImpl_GetClassID(IBaseFilter * iface, CLSID * pClsid) HRESULT WINAPI BaseFilterImpl_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState ) { - BaseFilter *This = (BaseFilter*)iface; + BaseFilter *This = impl_from_IBaseFilter(iface); TRACE("(%p)->(%d, %p)\n", This, dwMilliSecsTimeout, pState); EnterCriticalSection(&This->csFilter); @@ -110,7 +115,7 @@ HRESULT WINAPI BaseFilterImpl_GetState(IBaseFilter * iface, DWORD dwMilliSecsTim HRESULT WINAPI BaseFilterImpl_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock) { - BaseFilter *This = (BaseFilter*)iface; + BaseFilter *This = impl_from_IBaseFilter(iface); TRACE("(%p)->(%p)\n", This, pClock); EnterCriticalSection(&This->csFilter); @@ -128,7 +133,7 @@ HRESULT WINAPI BaseFilterImpl_SetSyncSource(IBaseFilter * iface, IReferenceClock HRESULT WINAPI BaseFilterImpl_GetSyncSource(IBaseFilter * iface, IReferenceClock **ppClock) { - BaseFilter *This = (BaseFilter*)iface; + BaseFilter *This = impl_from_IBaseFilter(iface); TRACE("(%p)->(%p)\n", This, ppClock); EnterCriticalSection(&This->csFilter); @@ -144,7 +149,7 @@ HRESULT WINAPI BaseFilterImpl_GetSyncSource(IBaseFilter * iface, IReferenceClock HRESULT WINAPI BaseFilterImpl_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum) { - BaseFilter *This = (BaseFilter*)iface; + BaseFilter *This = impl_from_IBaseFilter(iface); TRACE("(%p)->(%p)\n", iface, ppEnum); @@ -154,7 +159,7 @@ HRESULT WINAPI BaseFilterImpl_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum) HRESULT WINAPI BaseFilterImpl_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo) { - BaseFilter *This = (BaseFilter*)iface; + BaseFilter *This = impl_from_IBaseFilter(iface); TRACE("(%p)->(%p)\n", This, pInfo); strcpyW(pInfo->achName, This->filterInfo.achName); @@ -169,7 +174,7 @@ HRESULT WINAPI BaseFilterImpl_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO * HRESULT WINAPI BaseFilterImpl_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName ) { HRESULT hr = S_OK; - BaseFilter *This = (BaseFilter*)iface; + BaseFilter *This = impl_from_IBaseFilter(iface); TRACE("(%p)->(%p, %s)\n", This, pGraph, debugstr_w(pName)); @@ -206,7 +211,7 @@ VOID WINAPI BaseFilterImpl_IncrementPinVersion(BaseFilter * This) HRESULT WINAPI BaseFilter_Init(BaseFilter * This, const IBaseFilterVtbl *Vtbl, const CLSID *pClsid, DWORD_PTR DebugInfo, const BaseFilterFuncTable* pBaseFuncsTable) { - This->lpVtbl = Vtbl; + This->IBaseFilter_iface.lpVtbl = Vtbl; This->refCount = 1; InitializeCriticalSection(&This->csFilter); This->state = State_Stopped; diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 012f68a..b74eaae 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -233,7 +233,7 @@ HRESULT TransformFilter_Construct(const IBaseFilterVtbl *pVtbl, LONG filter_size if (SUCCEEDED(TransformFilter_Init(pVtbl, pClsid, pFuncsTable, pTf))) { - *ppTransformFilter = (IBaseFilter*)(&pTf->filter.lpVtbl); + *ppTransformFilter = &pTf->filter.IBaseFilter_iface; return S_OK; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 89b1898..4c1f3fd 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -148,7 +148,7 @@ HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * p typedef struct BaseFilter { - const struct IBaseFilterVtbl *lpVtbl; + IBaseFilter IBaseFilter_iface; LONG refCount; CRITICAL_SECTION csFilter;

1 0

Aric Stewart : strmbase: COM cleanup for BasePin, BaseInputPin, and BaseOutputPin.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: eb5d8b969f906d6a420289704b0a1a664af5b349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb5d8b969f906d6a420289704… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Mar 24 11:42:32 2012 -0500 strmbase: COM cleanup for BasePin, BaseInputPin, and BaseOutputPin. --- dlls/quartz/pin.c | 4 +- dlls/strmbase/mediatype.c | 4 +- dlls/strmbase/outputqueue.c | 8 ++-- dlls/strmbase/pin.c | 105 ++++++++++++++++++++++++--------------- dlls/winegstreamer/gstdemux.c | 4 +- dlls/wineqtdecoder/qtsplitter.c | 4 +- include/wine/strmbase.h | 4 +- 7 files changed, 79 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eb5d8b969f906d6a42028…

1 0

Aric Stewart : strmbase: COM cleanup for cleanup SourceSeeking.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: d3c5b2c4f16cfa33343115846e9344de1fb62d97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c5b2c4f16cfa33343115846… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Mar 24 11:43:09 2012 -0500 strmbase: COM cleanup for cleanup SourceSeeking. --- dlls/quartz/avisplit.c | 2 +- dlls/quartz/mpegsplit.c | 2 +- dlls/quartz/parser.c | 2 +- dlls/quartz/waveparser.c | 2 +- dlls/strmbase/seeking.c | 35 ++++++++++++++++++++--------------- dlls/winegstreamer/gstdemux.c | 2 +- dlls/wineqtdecoder/qtsplitter.c | 2 +- include/wine/strmbase.h | 2 +- 8 files changed, 27 insertions(+), 22 deletions(-) diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c index 3a50de5..bcfdeb1 100644 --- a/dlls/quartz/avisplit.c +++ b/dlls/quartz/avisplit.c @@ -102,7 +102,7 @@ struct thread_args { static inline AVISplitterImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) { - return (AVISplitterImpl *)((char*)iface - FIELD_OFFSET(AVISplitterImpl, Parser.sourceSeeking.lpVtbl)); + return CONTAINING_RECORD(iface, AVISplitterImpl, Parser.sourceSeeking.IMediaSeeking_iface); } /* The threading stuff cries for an explanation diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c index acb72ed..f2e1138 100644 --- a/dlls/quartz/mpegsplit.c +++ b/dlls/quartz/mpegsplit.c @@ -78,7 +78,7 @@ typedef struct MPEGSplitterImpl static inline MPEGSplitterImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) { - return (MPEGSplitterImpl *)((char*)iface - FIELD_OFFSET(MPEGSplitterImpl, Parser.sourceSeeking.lpVtbl)); + return CONTAINING_RECORD(iface, MPEGSplitterImpl, Parser.sourceSeeking.IMediaSeeking_iface); } static int MPEGSplitter_head_check(const BYTE *header) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 784c528..c1d041a 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -50,7 +50,7 @@ static HRESULT WINAPI Parser_OutputPin_BreakConnect(BaseOutputPin *This); static inline ParserImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) { - return (ParserImpl *)((char*)iface - FIELD_OFFSET(ParserImpl, sourceSeeking.lpVtbl)); + return CONTAINING_RECORD(iface, ParserImpl, sourceSeeking.IMediaSeeking_iface); } /* FIXME: WRONG */ diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c index a1b58e5..bc0615e 100644 --- a/dlls/quartz/waveparser.c +++ b/dlls/quartz/waveparser.c @@ -50,7 +50,7 @@ typedef struct WAVEParserImpl static inline WAVEParserImpl *impl_from_IMediaSeeking( IMediaSeeking *iface ) { - return (WAVEParserImpl*)((char*)iface - FIELD_OFFSET(WAVEParserImpl, Parser.sourceSeeking.lpVtbl)); + return CONTAINING_RECORD(iface, WAVEParserImpl, Parser.sourceSeeking.IMediaSeeking_iface); } static LONGLONG bytepos_to_duration(WAVEParserImpl *This, LONGLONG bytepos) diff --git a/dlls/strmbase/seeking.c b/dlls/strmbase/seeking.c index f03dde6..c31699c 100644 --- a/dlls/strmbase/seeking.c +++ b/dlls/strmbase/seeking.c @@ -32,11 +32,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(strmbase); +static inline SourceSeeking *impl_from_IMediaSeeking(IMediaSeeking *iface) +{ + return CONTAINING_RECORD(iface, SourceSeeking, IMediaSeeking_iface); +} + HRESULT SourceSeeking_Init(SourceSeeking *pSeeking, const IMediaSeekingVtbl *Vtbl, SourceSeeking_ChangeStop fnChangeStop, SourceSeeking_ChangeStart fnChangeStart, SourceSeeking_ChangeRate fnChangeRate, PCRITICAL_SECTION crit_sect) { assert(fnChangeStop && fnChangeStart && fnChangeRate); - pSeeking->lpVtbl = Vtbl; + pSeeking->IMediaSeeking_iface.lpVtbl = Vtbl; pSeeking->refCount = 1; pSeeking->fnChangeRate = fnChangeRate; pSeeking->fnChangeStop = fnChangeStop; @@ -57,7 +62,7 @@ HRESULT SourceSeeking_Init(SourceSeeking *pSeeking, const IMediaSeekingVtbl *Vtb HRESULT WINAPI SourceSeekingImpl_GetCapabilities(IMediaSeeking * iface, DWORD * pCapabilities) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); TRACE("(%p)\n", pCapabilities); @@ -68,7 +73,7 @@ HRESULT WINAPI SourceSeekingImpl_GetCapabilities(IMediaSeeking * iface, DWORD * HRESULT WINAPI SourceSeekingImpl_CheckCapabilities(IMediaSeeking * iface, DWORD * pCapabilities) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); HRESULT hr; DWORD dwCommonCaps; @@ -104,7 +109,7 @@ HRESULT WINAPI SourceSeekingImpl_QueryPreferredFormat(IMediaSeeking * iface, GUI HRESULT WINAPI SourceSeekingImpl_GetTimeFormat(IMediaSeeking * iface, GUID * pFormat) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); TRACE("(%s)\n", debugstr_guid(pFormat)); EnterCriticalSection(This->crst); @@ -116,7 +121,7 @@ HRESULT WINAPI SourceSeekingImpl_GetTimeFormat(IMediaSeeking * iface, GUID * pFo HRESULT WINAPI SourceSeekingImpl_IsUsingTimeFormat(IMediaSeeking * iface, const GUID * pFormat) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); HRESULT hr = S_OK; TRACE("(%s)\n", debugstr_guid(pFormat)); @@ -131,7 +136,7 @@ HRESULT WINAPI SourceSeekingImpl_IsUsingTimeFormat(IMediaSeeking * iface, const HRESULT WINAPI SourceSeekingImpl_SetTimeFormat(IMediaSeeking * iface, const GUID * pFormat) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); TRACE("%p %s\n", This, debugstr_guid(pFormat)); return (IsEqualIID(pFormat, &TIME_FORMAT_MEDIA_TIME) ? S_OK : E_INVALIDARG); } @@ -139,7 +144,7 @@ HRESULT WINAPI SourceSeekingImpl_SetTimeFormat(IMediaSeeking * iface, const GUID HRESULT WINAPI SourceSeekingImpl_GetDuration(IMediaSeeking * iface, LONGLONG * pDuration) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); TRACE("(%p)\n", pDuration); @@ -152,7 +157,7 @@ HRESULT WINAPI SourceSeekingImpl_GetDuration(IMediaSeeking * iface, LONGLONG * p HRESULT WINAPI SourceSeekingImpl_GetStopPosition(IMediaSeeking * iface, LONGLONG * pStop) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); TRACE("(%p)\n", pStop); @@ -166,7 +171,7 @@ HRESULT WINAPI SourceSeekingImpl_GetStopPosition(IMediaSeeking * iface, LONGLONG /* FIXME: Make use of the info the filter should expose */ HRESULT WINAPI SourceSeekingImpl_GetCurrentPosition(IMediaSeeking * iface, LONGLONG * pCurrent) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); TRACE("(%p)\n", pCurrent); @@ -179,7 +184,7 @@ HRESULT WINAPI SourceSeekingImpl_GetCurrentPosition(IMediaSeeking * iface, LONGL HRESULT WINAPI SourceSeekingImpl_ConvertTimeFormat(IMediaSeeking * iface, LONGLONG * pTarget, const GUID * pTargetFormat, LONGLONG Source, const GUID * pSourceFormat) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); if (!pTargetFormat) pTargetFormat = &This->timeformat; if (!pSourceFormat) @@ -212,7 +217,7 @@ static inline LONGLONG Adjust(LONGLONG value, const LONGLONG * pModifier, DWORD HRESULT WINAPI SourceSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * pCurrent, DWORD dwCurrentFlags, LONGLONG * pStop, DWORD dwStopFlags) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); BOOL bChangeCurrent = FALSE, bChangeStop = FALSE; LONGLONG llNewCurrent, llNewStop; @@ -248,7 +253,7 @@ HRESULT WINAPI SourceSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * HRESULT WINAPI SourceSeekingImpl_GetPositions(IMediaSeeking * iface, LONGLONG * pCurrent, LONGLONG * pStop) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); TRACE("(%p, %p)\n", pCurrent, pStop); @@ -262,7 +267,7 @@ HRESULT WINAPI SourceSeekingImpl_GetPositions(IMediaSeeking * iface, LONGLONG * HRESULT WINAPI SourceSeekingImpl_GetAvailable(IMediaSeeking * iface, LONGLONG * pEarliest, LONGLONG * pLatest) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); TRACE("(%p, %p)\n", pEarliest, pLatest); @@ -276,7 +281,7 @@ HRESULT WINAPI SourceSeekingImpl_GetAvailable(IMediaSeeking * iface, LONGLONG * HRESULT WINAPI SourceSeekingImpl_SetRate(IMediaSeeking * iface, double dRate) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); BOOL bChangeRate = (dRate != This->dRate); HRESULT hr = S_OK; @@ -299,7 +304,7 @@ HRESULT WINAPI SourceSeekingImpl_SetRate(IMediaSeeking * iface, double dRate) HRESULT WINAPI SourceSeekingImpl_GetRate(IMediaSeeking * iface, double * dRate) { - SourceSeeking *This = (SourceSeeking *)iface; + SourceSeeking *This = impl_from_IMediaSeeking(iface); TRACE("(%p)\n", dRate); diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e42ad04..730634d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -998,7 +998,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI } static inline GSTOutPin *impl_from_IMediaSeeking( IMediaSeeking *iface ) { - return (GSTOutPin *)((char*)iface - FIELD_OFFSET(GSTOutPin, seek.lpVtbl)); + return CONTAINING_RECORD(iface, GSTOutPin, seek.IMediaSeeking_iface); } static IPin* WINAPI GST_GetPin(BaseFilter *iface, int pos) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 78b8bf2..bacf2af 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -185,7 +185,7 @@ static HRESULT WINAPI QTSplitter_ChangeRate(IMediaSeeking *iface); static inline QTSplitter *impl_from_IMediaSeeking( IMediaSeeking *iface ) { - return (QTSplitter *)((char*)iface - FIELD_OFFSET(QTSplitter, sourceSeeking.lpVtbl)); + return CONTAINING_RECORD(iface, QTSplitter, sourceSeeking.IMediaSeeking_iface); } /* diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 72686ac..4944e34 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -287,7 +287,7 @@ typedef HRESULT (WINAPI *SourceSeeking_ChangeStop)(IMediaSeeking *iface); typedef struct SourceSeeking { - const IMediaSeekingVtbl * lpVtbl; + IMediaSeeking IMediaSeeking_iface; ULONG refCount; SourceSeeking_ChangeStop fnChangeStop;

1 0

Nikolay Sivov : msxml3: Support processing instructions in writer.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 80728841367bececd850cd8cf2ebe551aeb9ed09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80728841367bececd850cd8cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 17 10:33:04 2012 +0300 msxml3: Support processing instructions in writer. --- dlls/msxml3/mxwriter.c | 23 ++++++++++++++- dlls/msxml3/tests/saxreader.c | 61 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 281031a..2534555 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1143,8 +1143,27 @@ static HRESULT WINAPI SAXContentHandler_processingInstruction( int ndata) { mxwriter *This = impl_from_ISAXContentHandler( iface ); - FIXME("(%p)->(%s %s)\n", This, debugstr_wn(target, ntarget), debugstr_wn(data, ndata)); - return E_NOTIMPL; + static const WCHAR openpiW[] = {'<','?'}; + static const WCHAR closepiW[] = {'?','>','\r','\n'}; + + TRACE("(%p)->(%s %s)\n", This, debugstr_wn(target, ntarget), debugstr_wn(data, ndata)); + + if (!target) return E_INVALIDARG; + + write_output_buffer(This->buffer, openpiW, sizeof(openpiW)/sizeof(WCHAR)); + + if (*target) + write_output_buffer(This->buffer, target, ntarget); + + if (data && *data && ndata) + { + write_output_buffer(This->buffer, spaceW, 1); + write_output_buffer(This->buffer, data, ndata); + } + + write_output_buffer(This->buffer, closepiW, sizeof(closepiW)/sizeof(WCHAR)); + + return S_OK; } static HRESULT WINAPI SAXContentHandler_skippedEntity( diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index ff790a0..c1a3260 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3126,6 +3126,66 @@ static void test_mxwriter_cdata(void) free_bstrs(); } +static void test_mxwriter_pi(void) +{ + static const WCHAR targetW[] = {'t','a','r','g','e','t',0}; + static const WCHAR dataW[] = {'d','a','t','a',0}; + ISAXContentHandler *content; + IMXWriter *writer; + VARIANT dest; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_processingInstruction(content, NULL, 0, NULL, 0); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXContentHandler_processingInstruction(content, targetW, 0, NULL, 0); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_processingInstruction(content, targetW, 6, NULL, 0); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<?\?>\r\n<?target?>\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + hr = ISAXContentHandler_processingInstruction(content, targetW, 4, dataW, 4); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<?\?>\r\n<?target?>\r\n<?targ data?>\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_put_output(writer, dest); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_processingInstruction(content, targetW, 6, dataW, 0); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("<?target?>\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); +} + static void test_mxwriter_dtd(void) { static const WCHAR contentW[] = {'c','o','n','t','e','n','t'}; @@ -3656,6 +3716,7 @@ START_TEST(saxreader) test_mxwriter_characters(); test_mxwriter_comment(); test_mxwriter_cdata(); + test_mxwriter_pi(); test_mxwriter_dtd(); test_mxwriter_properties(); test_mxwriter_flush();

1 0

Nikolay Sivov : msxml3: Support ignorable whitespaces output in writer.
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: 1478648b9f8d43f87a9f0abe7d62f7e4eb2202e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1478648b9f8d43f87a9f0abe7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Mar 17 10:41:43 2012 +0300 msxml3: Support ignorable whitespaces output in writer. --- dlls/msxml3/mxwriter.c | 10 ++++++++-- dlls/msxml3/tests/saxreader.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 2534555..41979e6 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1131,8 +1131,14 @@ static HRESULT WINAPI SAXContentHandler_ignorableWhitespace( int nchars) { mxwriter *This = impl_from_ISAXContentHandler( iface ); - FIXME("(%p)->(%s)\n", This, debugstr_wn(chars, nchars)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_wn(chars, nchars)); + + if (!chars) return E_INVALIDARG; + + write_output_buffer(This->buffer, chars, nchars); + + return S_OK; } static HRESULT WINAPI SAXContentHandler_processingInstruction( diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index c1a3260..72aed37 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3182,6 +3182,45 @@ static void test_mxwriter_pi(void) ok(!lstrcmpW(_bstr_("<?target?>\r\n"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); + + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); +} + +static void test_mxwriter_ignorablespaces(void) +{ + static const WCHAR dataW[] = {'d','a','t','a',0}; + ISAXContentHandler *content; + IMXWriter *writer; + VARIANT dest; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_ignorableWhitespace(content, NULL, 0); + EXPECT_HR(hr, E_INVALIDARG); + + hr = ISAXContentHandler_ignorableWhitespace(content, dataW, 0); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_ignorableWhitespace(content, dataW, 4); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_ignorableWhitespace(content, dataW, 1); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("datad"), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + ISAXContentHandler_Release(content); IMXWriter_Release(writer); } @@ -3717,6 +3756,7 @@ START_TEST(saxreader) test_mxwriter_comment(); test_mxwriter_cdata(); test_mxwriter_pi(); + test_mxwriter_ignorablespaces(); test_mxwriter_dtd(); test_mxwriter_properties(); test_mxwriter_flush();

1 0

Nikolay Sivov : comctl32: Use single notification message for setting all item state with LVM_SETITEMSTATE (LVS_OWNERDATA case only).
by Alexandre Julliard 26 Mar '12

26 Mar '12

Module: wine Branch: master Commit: b326426fec40193fc0af3dfdb80cd983ff64eccb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b326426fec40193fc0af3dfdb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 20 10:17:47 2012 +0300 comctl32: Use single notification message for setting all item state with LVM_SETITEMSTATE (LVS_OWNERDATA case only). --- dlls/comctl32/listview.c | 50 +++++++++++++--- dlls/comctl32/tests/listview.c | 121 +++++++++++++++++++++++++++++++--------- 2 files changed, 134 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b326426fec40193fc0af3…

1 0