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

Michael Stefaniuc : amstream: COM cleanup for the IClassFactory iface.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: 84efd5985512c3c9c0bae5784ba788afc01b57ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=84efd5985512c3c9c0bae5784… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 20 12:01:24 2012 +0200 amstream: COM cleanup for the IClassFactory iface. --- dlls/amstream/main.c | 41 +++++++++++++++++++++-------------------- 1 files changed, 21 insertions(+), 20 deletions(-) diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index 79142e5..9c2d8b2 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -59,12 +59,16 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) * Multimedia Streams ClassFactory */ typedef struct { - IClassFactory ITF_IClassFactory; - + IClassFactory IClassFactory_iface; LONG ref; HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + struct object_creation_info { const CLSID *clsid; @@ -79,33 +83,30 @@ static const struct object_creation_info object_creation[] = { &CLSID_MediaStreamFilter, MediaStreamFilter_create } }; -static HRESULT WINAPI -AMCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) +static HRESULT WINAPI AMCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + *ppobj = NULL; + WARN("(%p)->(%s,%p), not found\n", iface, debugstr_guid(riid), ppobj); return E_NOINTERFACE; } -static ULONG WINAPI AMCF_AddRef(LPCLASSFACTORY iface) +static ULONG WINAPI AMCF_AddRef(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI AMCF_Release(LPCLASSFACTORY iface) +static ULONG WINAPI AMCF_Release(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - + IClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) @@ -115,10 +116,10 @@ static ULONG WINAPI AMCF_Release(LPCLASSFACTORY iface) } -static HRESULT WINAPI AMCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, - REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI AMCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, + REFIID riid, void **ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hres; LPUNKNOWN punk; @@ -133,9 +134,9 @@ static HRESULT WINAPI AMCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter return hres; } -static HRESULT WINAPI AMCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) +static HRESULT WINAPI AMCF_LockServer(IClassFactory *iface, BOOL dolock) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("(%p)->(%d),stub!\n",This,dolock); return S_OK; } @@ -192,12 +193,12 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) factory = HeapAlloc(GetProcessHeap(), 0, sizeof(*factory)); if (factory == NULL) return E_OUTOFMEMORY; - factory->ITF_IClassFactory.lpVtbl = &DSCF_Vtbl; + factory->IClassFactory_iface.lpVtbl = &DSCF_Vtbl; factory->ref = 1; factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; - *ppv = &(factory->ITF_IClassFactory); + *ppv = &factory->IClassFactory_iface; return S_OK; }

1 0

Michael Stefaniuc : qedit: COM cleanup for the IClassFactory iface.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: e59cc20f93ca904a4d232e047c466e752f366de9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e59cc20f93ca904a4d232e047… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 20 11:55:43 2012 +0200 qedit: COM cleanup for the IClassFactory iface. --- dlls/qedit/main.c | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c index 6b0375e..40514d5 100644 --- a/dlls/qedit/main.c +++ b/dlls/qedit/main.c @@ -42,12 +42,16 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) * DirectShow ClassFactory */ typedef struct { - IClassFactory ITF_IClassFactory; - + IClassFactory IClassFactory_iface; LONG ref; HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); } IClassFactoryImpl; +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} + struct object_creation_info { const CLSID *clsid; @@ -60,34 +64,30 @@ static const struct object_creation_info object_creation[] = { &CLSID_SampleGrabber, SampleGrabber_create }, }; -static HRESULT WINAPI -DSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) +static HRESULT WINAPI DSCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } *ppobj = NULL; - WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppobj); + WARN("(%p)->(%s,%p), not found\n", iface, debugstr_guid(riid), ppobj); return E_NOINTERFACE; } -static ULONG WINAPI DSCF_AddRef(LPCLASSFACTORY iface) +static ULONG WINAPI DSCF_AddRef(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface) +static ULONG WINAPI DSCF_Release(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - + IClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) @@ -96,9 +96,10 @@ static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface) return ref; } -static HRESULT WINAPI DSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI DSCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, REFIID riid, + void **ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hres; LPUNKNOWN punk; @@ -116,9 +117,9 @@ static HRESULT WINAPI DSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter return hres; } -static HRESULT WINAPI DSCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) +static HRESULT WINAPI DSCF_LockServer(IClassFactory *iface, BOOL dolock) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); FIXME("(%p)->(%d),stub!\n",This,dolock); return S_OK; } @@ -182,12 +183,12 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) factory = CoTaskMemAlloc(sizeof(*factory)); if (factory == NULL) return E_OUTOFMEMORY; - factory->ITF_IClassFactory.lpVtbl = &DSCF_Vtbl; + factory->IClassFactory_iface.lpVtbl = &DSCF_Vtbl; factory->ref = 1; factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; - *ppv = &(factory->ITF_IClassFactory); + *ppv = &factory->IClassFactory_iface; return S_OK; }

1 0

Michael Stefaniuc : strmbase: COM cleanup for the IClassFactory iface.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: c4cdc50739f4d9d8456c87e6ded2883a58e56ef3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4cdc50739f4d9d8456c87e6d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 20 11:57:31 2012 +0200 strmbase: COM cleanup for the IClassFactory iface. --- dlls/strmbase/dllfunc.c | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c index 202cd81..d36c919 100644 --- a/dlls/strmbase/dllfunc.c +++ b/dlls/strmbase/dllfunc.c @@ -235,39 +235,40 @@ BOOL WINAPI STRMBASE_DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) * DLL ClassFactory */ typedef struct { - IClassFactory ITF_IClassFactory; - + IClassFactory IClassFactory_iface; LONG ref; LPFNNewCOMObject pfnCreateInstance; } IClassFactoryImpl; -static HRESULT WINAPI -DSCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) +static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + return CONTAINING_RECORD(iface, IClassFactoryImpl, IClassFactory_iface); +} +static HRESULT WINAPI DSCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj) +{ if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IClassFactory)) { IClassFactory_AddRef(iface); - *ppobj = This; + *ppobj = iface; return S_OK; } - WARN("(%p)->(%s,%p), not found\n", This, debugstr_guid(riid), ppobj); + *ppobj = NULL; + WARN("(%p)->(%s,%p), not found\n", iface, debugstr_guid(riid), ppobj); return E_NOINTERFACE; } -static ULONG WINAPI DSCF_AddRef(LPCLASSFACTORY iface) +static ULONG WINAPI DSCF_AddRef(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); return InterlockedIncrement(&This->ref); } -static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface) +static ULONG WINAPI DSCF_Release(IClassFactory *iface) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - + IClassFactoryImpl *This = impl_from_IClassFactory(iface); ULONG ref = InterlockedDecrement(&This->ref); if (ref == 0) @@ -276,10 +277,10 @@ static ULONG WINAPI DSCF_Release(LPCLASSFACTORY iface) return ref; } -static HRESULT WINAPI DSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter, - REFIID riid, LPVOID *ppobj) +static HRESULT WINAPI DSCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter, + REFIID riid, void **ppobj) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); HRESULT hres = ERROR_SUCCESS; LPUNKNOWN punk; @@ -313,9 +314,9 @@ static HRESULT WINAPI DSCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pOuter return hres; } -static HRESULT WINAPI DSCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) +static HRESULT WINAPI DSCF_LockServer(IClassFactory *iface, BOOL dolock) { - IClassFactoryImpl *This = (IClassFactoryImpl *)iface; + IClassFactoryImpl *This = impl_from_IClassFactory(iface); TRACE("(%p)->(%d)\n",This, dolock); if (dolock) @@ -378,12 +379,12 @@ HRESULT WINAPI STRMBASE_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID * if (!factory) return E_OUTOFMEMORY; - factory->ITF_IClassFactory.lpVtbl = &DSCF_Vtbl; + factory->IClassFactory_iface.lpVtbl = &DSCF_Vtbl; factory->ref = 1; factory->pfnCreateInstance = pList->m_lpfnNew; - *ppv = &(factory->ITF_IClassFactory); + *ppv = &factory->IClassFactory_iface; return S_OK; }

1 0

Dmitry Timoshkov : gdiplus: Add a test for measuring string that doesn' t fit into layout rectangle.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: 003333e6cbd54ae5c230381b570a712fc44811a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=003333e6cbd54ae5c230381b5… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 20 12:07:47 2012 +0900 gdiplus: Add a test for measuring string that doesn't fit into layout rectangle. --- dlls/gdiplus/tests/graphics.c | 126 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 126 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index ded80be..881f697 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -36,6 +36,14 @@ static const REAL mm_per_inch = 25.4; static const REAL point_per_inch = 72.0; static HWND hwnd; +static void set_rect_empty(RectF *rc) +{ + rc->X = 0.0; + rc->Y = 0.0; + rc->Width = 0.0; + rc->Height = 0.0; +} + /* converts a given unit to its value in pixels */ static REAL units_to_pixels(REAL units, GpUnit unit, REAL dpi) { @@ -3769,6 +3777,123 @@ static void test_font_height_scaling(void) status = GdipDeleteGraphics(graphics); expect(Ok, status); DeleteDC(hdc); + + GdipDeleteFontFamily(family); + GdipDeleteStringFormat(format); +} + +static void test_measure_string(void) +{ + static const WCHAR tahomaW[] = { 'T','a','h','o','m','a',0 }; + static const WCHAR string[] = { 'A','0','1',0 }; + HDC hdc; + GpStringFormat *format; + GpGraphics *graphics; + GpFontFamily *family; + GpFont *font; + GpStatus status; + RectF bounds, rect; + REAL width, height, width_1, width_2; + int lines, glyphs; + + status = GdipCreateStringFormat(StringFormatFlagsNoWrap, LANG_NEUTRAL, &format); + expect(Ok, status); + + status = GdipCreateFontFamilyFromName(tahomaW, NULL, &family); + expect(Ok, status); + + hdc = CreateCompatibleDC(0); + status = GdipCreateFromHDC(hdc, &graphics); + + status = GdipCreateFont(family, 20, FontStyleRegular, UnitPixel, &font); + expect(Ok, status); + + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); + width = bounds.Width; + height = bounds.Height; + + set_rect_empty(&rect); + rect.Height = height / 2.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); + expectf(width, bounds.Width); +todo_wine + expectf(height / 2.0, bounds.Height); + + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, 1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(1, glyphs); + expect(1, lines); + ok(bounds.Width < width / 2.0, "width of 1 glyph is wrong\n"); + expectf(height, bounds.Height); + width_1 = bounds.Width; + + set_rect_empty(&rect); + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, 2, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(2, glyphs); + expect(1, lines); + ok(bounds.Width < width, "width of 2 glyphs is wrong\n"); + ok(bounds.Width > width_1, "width of 2 glyphs is wrong\n"); + expectf(height, bounds.Height); + width_2 = bounds.Width; + + set_rect_empty(&rect); + rect.Width = width / 2.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(1, glyphs); + expect(1, lines); + expectf_(width_1, bounds.Width, 0.01); + expectf(height, bounds.Height); + + set_rect_empty(&rect); + rect.Height = height; + rect.Width = width - 0.05; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); +todo_wine + expect(2, glyphs); + expect(1, lines); +todo_wine + expectf_(width_2, bounds.Width, 0.01); + expectf(height, bounds.Height); + + set_rect_empty(&rect); + rect.Height = height; + rect.Width = width_2 - 0.05; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); +todo_wine + expect(1, glyphs); + expect(1, lines); +todo_wine + expectf_(width_1, bounds.Width, 0.01); + expectf(height, bounds.Height); + + status = GdipDeleteFont(font); + expect(Ok, status); + + status = GdipDeleteGraphics(graphics); + expect(Ok, status); + DeleteDC(hdc); + + GdipDeleteFontFamily(family); + GdipDeleteStringFormat(format); } START_TEST(graphics) @@ -3797,6 +3922,7 @@ START_TEST(graphics) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_measure_string(); test_font_height_scaling(); test_transform(); test_GdipMeasureString();

1 0

Dmitry Timoshkov : gdiplus: StringFormatFlagsLineLimit doesn' t allow line wrapping.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: 6e63a478b3523ad154ad37bfd1d686c1ba1129d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e63a478b3523ad154ad37bfd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 20 12:08:34 2012 +0900 gdiplus: StringFormatFlagsLineLimit doesn't allow line wrapping. --- dlls/gdiplus/graphics.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index e46cf48..7068534 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4864,7 +4864,8 @@ GpStatus gdip_format_string(HDC hdc, break; /* Stop if this was a linewrap (but not if it was a linebreak). */ - if((lret == fitcpy) && format && (format->attr & StringFormatFlagsNoWrap)) + if ((lret == fitcpy) && format && + (format->attr & (StringFormatFlagsNoWrap | StringFormatFlagsLineLimit))) break; }

1 0

Rico Schüller : d3dx9: Make annotation handling more generic for techniques and passes.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: 24ee16de099823e496b4bd1638855316e998ea8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ee16de099823e496b4bd163… Author: Rico Schüller <kgbricola(a)web.de> Date: Sat Aug 18 14:59:01 2012 +0200 d3dx9: Make annotation handling more generic for techniques and passes. --- dlls/d3dx9_36/effect.c | 29 +++++++++++++---------------- 1 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index dec2f77..f4a3b86 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -190,7 +190,7 @@ struct ID3DXEffectCompilerImpl static struct d3dx_parameter *get_parameter_by_name(struct ID3DXBaseEffectImpl *base, struct d3dx_parameter *parameter, LPCSTR name); -static struct d3dx_parameter *get_parameter_annotation_by_name(struct d3dx_parameter *parameter, LPCSTR name); +static struct d3dx_parameter *get_annotation_by_name(UINT handlecount, D3DXHANDLE *handles, LPCSTR name); static HRESULT d3dx9_parse_state(struct d3dx_state *state, const char *data, const char **ptr, D3DXHANDLE *objects); static void free_parameter_state(D3DXHANDLE handle, BOOL element, BOOL child, enum STATE_TYPE st); @@ -986,7 +986,7 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_paramete return get_parameter_by_name(NULL, temp_parameter, part); case '@': - return get_parameter_annotation_by_name(temp_parameter, part); + return get_annotation_by_name(temp_parameter->annotation_count, temp_parameter->annotation_handles, part); case '\0': TRACE("Returning parameter %p\n", temp_parameter); @@ -1002,22 +1002,22 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_paramete return NULL; } -static struct d3dx_parameter *get_parameter_annotation_by_name(struct d3dx_parameter *parameter, LPCSTR name) +static struct d3dx_parameter *get_annotation_by_name(UINT handlecount, D3DXHANDLE *handles, LPCSTR name) { UINT i, length; struct d3dx_parameter *temp_parameter; LPCSTR part; - TRACE("parameter %p, name %s\n", parameter, debugstr_a(name)); + TRACE("handlecount %u, handles %p, name %s\n", handlecount, handles, debugstr_a(name)); if (!name || !*name) return NULL; length = strcspn( name, "[.@" ); part = name + length; - for (i = 0; i < parameter->annotation_count; ++i) + for (i = 0; i < handlecount; ++i) { - temp_parameter = get_parameter_struct(parameter->annotation_handles[i]); + temp_parameter = get_parameter_struct(handles[i]); if (!strcmp(temp_parameter->name, name)) { @@ -1088,7 +1088,7 @@ static struct d3dx_parameter *get_parameter_by_name(struct ID3DXBaseEffectImpl * return get_parameter_by_name(NULL, temp_parameter, part); case '@': - return get_parameter_annotation_by_name(temp_parameter, part); + return get_annotation_by_name(temp_parameter->annotation_count, temp_parameter->annotation_handles, part); case '[': return get_parameter_element_by_name(temp_parameter, part); @@ -1558,7 +1558,8 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotationByName(ID3DXBaseEffect struct d3dx_parameter *param = get_valid_parameter(This, object); struct d3dx_pass *pass = is_valid_pass(This, object); struct d3dx_technique *technique = is_valid_technique(This, object); - UINT annotation_count = 0, i; + struct d3dx_parameter *anno = NULL; + UINT annotation_count = 0; D3DXHANDLE *annotation_handles = NULL; FIXME("iface %p, object %p, name %s partial stub\n", This, object, debugstr_a(name)); @@ -1586,15 +1587,11 @@ static D3DXHANDLE WINAPI ID3DXBaseEffectImpl_GetAnnotationByName(ID3DXBaseEffect } /* Todo: add funcs */ - for (i = 0; i < annotation_count; i++) + anno = get_annotation_by_name(annotation_count, annotation_handles, name); + if (anno) { - struct d3dx_parameter *anno = get_parameter_struct(annotation_handles[i]); - - if (!strcmp(anno->name, name)) - { - TRACE("Returning parameter %p\n", anno); - return get_parameter_handle(anno); - } + TRACE("Returning parameter %p\n", anno); + return get_parameter_handle(anno); } WARN("Invalid argument specified\n");

1 0

Marek Chmiel : dssenh/tests: Fixed failing block cipher mode tests on the DSSENH cryptographic service provider .
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: 0dab059797840d1ae4121a1d355d556c6ea691c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dab059797840d1ae4121a1d3… Author: Marek Chmiel <kcmark(a)gmail.com> Date: Fri Aug 17 16:44:22 2012 -0500 dssenh/tests: Fixed failing block cipher mode tests on the DSSENH cryptographic service provider. --- dlls/dssenh/tests/dssenh.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index c3bea3b..1553ed1 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -649,15 +649,15 @@ struct ciphermode_test { static const BYTE encryptedCFB[] = { 0x51,0x15,0x77,0xab,0x62,0x1f,0x7d,0xcb, 0x35,0x1e,0xd8,0xd3,0x2a,0x00,0xf0,0x94, -0x7c,0xa5,0x28,0xda,0xb8,0x81,0x15,0x99, 0xd1,0xd5,0x06,0x18,0xb8,0x85,0xfc,0xc9 +0x7c,0xa5,0x28,0xda,0xb8,0x81,0x15,0x99, 0xd1,0xd5,0x06,0x1d,0xd3,0x46,0x7e,0xca }; static const BYTE encryptedCBC[] = { 0x8f,0x7b,0x56,0xeb,0xad,0x4d,0x76,0xc2, 0xd5,0x1d,0xf0,0x60,0x9d,0xde,0x96,0xe8, -0xb7,0x7b,0xeb,0x4b,0xee,0x3f,0xae,0x05, 0xdd,0x3b,0x62,0x47,0x7f,0x6f,0x79,0x6c +0xb7,0x7b,0xeb,0x4b,0xee,0x3f,0xae,0x05, 0x20,0xf5,0xe0,0x75,0xa0,0x1d,0xf9,0x39 }; static const BYTE encryptedECB[] = { 0x8f,0x7b,0x56,0xeb,0xad,0x4d,0x76,0xc2, 0x8b,0xe0,0x4e,0xe4,0x98,0x4f,0xb8,0x3b, -0xf3,0xeb,0x6f,0x0a,0x57,0x91,0xdd,0xc7, 0x64,0x8b,0xb9,0x50,0xe6,0x5e,0x76,0x72 +0xf3,0xeb,0x6f,0x0a,0x57,0x91,0xdd,0xc7, 0x34,0x5d,0x4c,0xa3,0x7e,0x97,0xbf,0xee }; static const struct ciphermode_test ciphermode_data[] = { @@ -742,7 +742,6 @@ static void test_cipher_modes(const struct ciphermode_test *tests, int testLen) ok(result, "Expected release of the provider.\n"); } - START_TEST(dssenh) { test_acquire_context();

1 0

Henri Verbeet : wined3d: Also issue any queries for index buffers in drawPrimitive().
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: e35f773b0bbeb12e4af88c35fcacd25221f44505 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35f773b0bbeb12e4af88c35f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 20 08:12:09 2012 +0200 wined3d: Also issue any queries for index buffers in drawPrimitive(). --- dlls/wined3d/drawprim.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 8df04a3..2aea660 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -580,6 +580,7 @@ static void remove_vbos(const struct wined3d_gl_info *gl_info, void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartIdx, BOOL indexed, const void *idxData) { const struct wined3d_state *state = &device->stateBlock->state; + struct wined3d_event_query *ib_query = NULL; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; unsigned int i; @@ -683,7 +684,10 @@ void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartId if (!index_buffer->buffer_object || !stream_info->all_vbo) idxData = index_buffer->resource.allocatedMemory; else + { + ib_query = index_buffer->query; idxData = NULL; + } } if (state->index_format == WINED3DFMT_R16_UINT) @@ -764,7 +768,9 @@ void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartId /* Finished updating the screen, restore lock */ LEAVE_GL(); - for(i = 0; i < device->num_buffer_queries; ++i) + if (ib_query) + wined3d_event_query_issue(ib_query, device); + for (i = 0; i < device->num_buffer_queries; ++i) { wined3d_event_query_issue(device->buffer_queries[i], device); }

1 0

Nikolay Sivov : mstask: Call interface methods properly.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: b92ea61e71716d6f7facadf328b049fdf9ea4b68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b92ea61e71716d6f7facadf32… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 19 22:11:15 2012 +0400 mstask: Call interface methods properly. --- dlls/mstask/factory.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/mstask/factory.c b/dlls/mstask/factory.c index 9dc1e29..f85a5f9 100644 --- a/dlls/mstask/factory.c +++ b/dlls/mstask/factory.c @@ -56,14 +56,14 @@ static HRESULT WINAPI MSTASK_IClassFactory_QueryInterface( return E_NOINTERFACE; } -static ULONG WINAPI MSTASK_IClassFactory_AddRef(LPCLASSFACTORY iface) +static ULONG WINAPI MSTASK_IClassFactory_AddRef(IClassFactory *face) { TRACE("\n"); InterlockedIncrement(&dll_ref); return 2; } -static ULONG WINAPI MSTASK_IClassFactory_Release(LPCLASSFACTORY iface) +static ULONG WINAPI MSTASK_IClassFactory_Release(IClassFactory *iface) { TRACE("\n"); InterlockedDecrement(&dll_ref); @@ -71,8 +71,8 @@ static ULONG WINAPI MSTASK_IClassFactory_Release(LPCLASSFACTORY iface) } static HRESULT WINAPI MSTASK_IClassFactory_CreateInstance( - LPCLASSFACTORY iface, - LPUNKNOWN pUnkOuter, + IClassFactory *iface, + IUnknown *pUnkOuter, REFIID riid, LPVOID *ppvObj) { @@ -89,21 +89,21 @@ static HRESULT WINAPI MSTASK_IClassFactory_CreateInstance( if (FAILED(res)) return res; - res = ITaskScheduler_QueryInterface(punk, riid, ppvObj); - ITaskScheduler_Release(punk); + res = IUnknown_QueryInterface(punk, riid, ppvObj); + IUnknown_Release(punk); return res; } static HRESULT WINAPI MSTASK_IClassFactory_LockServer( - LPCLASSFACTORY iface, + IClassFactory *iface, BOOL fLock) { TRACE("\n"); - if (fLock != FALSE) - MSTASK_IClassFactory_AddRef(iface); + if (fLock) + IClassFactory_AddRef(iface); else - MSTASK_IClassFactory_Release(iface); + IClassFactory_Release(iface); return S_OK; }

1 0

Nikolay Sivov : qcap: Call interface methods properly.
by Alexandre Julliard Aug. 20, 2012

Aug. 20, 2012

Module: wine Branch: master Commit: 1bd91a4fd2f4a12e6c8ba5bbe48bdfbd72a1a3b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd91a4fd2f4a12e6c8ba5bbe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 19 22:21:46 2012 +0400 qcap: Call interface methods properly. --- dlls/qcap/capturegraph.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index aa5c0a4..fd619aa 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -184,7 +184,7 @@ fnCaptureGraphBuilder2_SetFilterGraph(ICaptureGraphBuilder2 * iface, This->mygraph = pfg; IGraphBuilder_AddRef(This->mygraph); - if (SUCCEEDED(IUnknown_QueryInterface(This->mygraph, + if (SUCCEEDED(IGraphBuilder_QueryInterface(This->mygraph, &IID_IMediaEvent, (LPVOID *)&pmev))) { IMediaEvent_CancelDefaultHandling(pmev, EC_REPAINT); @@ -290,7 +290,7 @@ fnCaptureGraphBuilder2_RenderStream(ICaptureGraphBuilder2 * iface, } /* Uses 'Intelligent Connect', so Connect, not ConnectDirect here */ - hr = IFilterGraph2_Connect(This->mygraph, pin_in, pin_out); + hr = IGraphBuilder_Connect(This->mygraph, pin_in, pin_out); IPin_Release(pin_in); IPin_Release(pin_out); return hr; @@ -474,7 +474,7 @@ fnCaptureGraphBuilder_QueryInterface(ICaptureGraphBuilder * iface, { CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder(iface); TRACE("%p --> Forwarding to v2 (%p)\n", iface, This); - return IUnknown_QueryInterface(&This->ICaptureGraphBuilder2_iface, riid, ppv); + return ICaptureGraphBuilder2_QueryInterface(&This->ICaptureGraphBuilder2_iface, riid, ppv); } static ULONG WINAPI @@ -482,7 +482,7 @@ fnCaptureGraphBuilder_AddRef(ICaptureGraphBuilder * iface) { CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder(iface); TRACE("%p --> Forwarding to v2 (%p)\n", iface, This); - return IUnknown_AddRef(&This->ICaptureGraphBuilder2_iface); + return ICaptureGraphBuilder2_AddRef(&This->ICaptureGraphBuilder2_iface); } static ULONG WINAPI @@ -490,7 +490,7 @@ fnCaptureGraphBuilder_Release(ICaptureGraphBuilder * iface) { CaptureGraphImpl *This = impl_from_ICaptureGraphBuilder(iface); TRACE("%p --> Forwarding to v2 (%p)\n", iface, This); - return IUnknown_Release(&This->ICaptureGraphBuilder2_iface); + return ICaptureGraphBuilder2_Release(&This->ICaptureGraphBuilder2_iface); } static HRESULT WINAPI

1 0