June 2011 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Make the device parameter to device_invalidate_state() const.
by Alexandre Julliard June 21, 2011

June 21, 2011

Module: wine Branch: master Commit: 4582a0bcb39bb8984c1877c476f350f5aaa490cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4582a0bcb39bb8984c1877c47… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 20 23:21:13 2011 +0200 wined3d: Make the device parameter to device_invalidate_state() const. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8a2058c..20e9508 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6175,7 +6175,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, } -void device_invalidate_state(struct wined3d_device *device, DWORD state) +void device_invalidate_state(const struct wined3d_device *device, DWORD state) { DWORD rep = device->StateTable[state].representative; struct wined3d_context *context; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9a2a383..e6e4aac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1803,7 +1803,7 @@ void device_switch_onscreen_ds(struct wined3d_device *device, struct wined3d_con struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; void device_update_stream_info(struct wined3d_device *device, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; void device_update_tex_unit_map(struct wined3d_device *device) DECLSPEC_HIDDEN; -void device_invalidate_state(struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; +void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; static inline BOOL isStateDirty(struct wined3d_context *context, DWORD state) {

1 0

Henri Verbeet : wined3d: Validate STATE_BASEVERTEXINDEX in validate_state_table().
by Alexandre Julliard June 21, 2011

June 21, 2011

Module: wine Branch: master Commit: 265e62378fc7e57710b7d5bc6184ef906803590a URL: http://source.winehq.org/git/wine.git/?a=commit;h=265e62378fc7e57710b7d5bc6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 20 23:21:11 2011 +0200 wined3d: Validate STATE_BASEVERTEXINDEX in validate_state_table(). --- dlls/wined3d/state.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 568ae87..75c2da6 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5726,6 +5726,7 @@ static void validate_state_table(struct StateEntry *state_table) STATE_SCISSORRECT, STATE_FRONTFACE, STATE_POINTSPRITECOORDORIGIN, + STATE_BASEVERTEXINDEX, }; unsigned int i, current;

1 0

Henri Verbeet : wined3d: Only bother checking block alignment for compressed surfaces in wined3d_device_update_surface ().
by Alexandre Julliard June 21, 2011

June 21, 2011

Module: wine Branch: master Commit: 430bac5fadc2fa6a02827f69ff04d2feef24a047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=430bac5fadc2fa6a02827f69f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 20 23:21:10 2011 +0200 wined3d: Only bother checking block alignment for compressed surfaces in wined3d_device_update_surface(). --- dlls/wined3d/device.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 03f57ff..8a2058c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4810,8 +4810,9 @@ HRESULT CDECL wined3d_device_update_surface(struct wined3d_device *device, } /* NPOT block sizes would be silly. */ - if ((update_w & (src_format->block_width - 1) || update_h & (src_format->block_height - 1)) - && (src_w != update_w || dst_w != update_w || src_h != update_h || dst_h != update_h)) + if ((src_format->flags & WINED3DFMT_FLAG_COMPRESSED) + && ((update_w & (src_format->block_width - 1) || update_h & (src_format->block_height - 1)) + && (src_w != update_w || dst_w != update_w || src_h != update_h || dst_h != update_h))) { WARN("Update rect not block-aligned.\n"); return WINED3DERR_INVALIDCALL;

1 0

Vincent Povirk : server: Implement RegisterHotKey/UnregisterHotKey.
by Alexandre Julliard June 21, 2011

June 21, 2011

Module: wine Branch: master Commit: 4c83138f7243f0e0f5de917a1368f4c8b53f6961 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c83138f7243f0e0f5de917a1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu May 26 15:52:17 2011 -0500 server: Implement RegisterHotKey/UnregisterHotKey. --- dlls/user32/input.c | 40 +++++++++-- dlls/user32/tests/msg.c | 16 ++-- include/wine/server_protocol.h | 44 +++++++++++- server/protocol.def | 23 ++++++ server/queue.c | 152 ++++++++++++++++++++++++++++++++++++++++ server/request.h | 19 +++++ server/trace.c | 36 ++++++++++ server/user.h | 2 + server/window.c | 1 + server/winstation.c | 2 + 10 files changed, 320 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c83138f7243f0e0f5de9…

1 0

Adam Martinson : msxml3: Add support for VT_BSTR|VT_BYREF in domdoc_save().
by Alexandre Julliard June 21, 2011

June 21, 2011

Module: wine Branch: master Commit: 4f58e11601a98415099389c723aaa9014d53738d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f58e11601a98415099389c72… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Jun 20 00:26:12 2011 -0500 msxml3: Add support for VT_BSTR|VT_BYREF in domdoc_save(). --- dlls/msxml3/domdoc.c | 98 +++++++++++++++++++++++--------------------- dlls/msxml3/tests/domdoc.c | 21 +++++++++- 2 files changed, 71 insertions(+), 48 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 122d62f..6fb923f 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -2423,70 +2423,74 @@ static HRESULT WINAPI domdoc_save( xmlNodePtr xmldecl; HRESULT ret = S_OK; - TRACE("(%p)->(var(vt %d, %s))\n", This, V_VT(&destination), - V_VT(&destination) == VT_BSTR ? debugstr_w(V_BSTR(&destination)) : NULL); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&destination)); - if(V_VT(&destination) != VT_BSTR && V_VT(&destination) != VT_UNKNOWN) + switch (V_VT(&destination)) { - FIXME("Unhandled vt %d\n", V_VT(&destination)); - return S_FALSE; - } - - if(V_VT(&destination) == VT_UNKNOWN) - { - IUnknown *pUnk = V_UNKNOWN(&destination); - IXMLDOMDocument2 *document; - IStream *stream; - - ret = IUnknown_QueryInterface(pUnk, &IID_IXMLDOMDocument3, (void**)&document); - if(ret == S_OK) + case VT_UNKNOWN: { - VARIANT_BOOL success; - BSTR xml; + IUnknown *pUnk = V_UNKNOWN(&destination); + IXMLDOMDocument2 *document; + IStream *stream; - ret = IXMLDOMDocument3_get_xml(iface, &xml); + ret = IUnknown_QueryInterface(pUnk, &IID_IXMLDOMDocument3, (void**)&document); if(ret == S_OK) { - ret = IXMLDOMDocument3_loadXML(document, xml, &success); - SysFreeString(xml); + VARIANT_BOOL success; + BSTR xml; + + ret = IXMLDOMDocument3_get_xml(iface, &xml); + if(ret == S_OK) + { + ret = IXMLDOMDocument3_loadXML(document, xml, &success); + SysFreeString(xml); + } + + IXMLDOMDocument3_Release(document); + return ret; } - IXMLDOMDocument3_Release(document); - return ret; + ret = IUnknown_QueryInterface(pUnk, &IID_IStream, (void**)&stream); + if(ret == S_OK) + { + ctx = xmlSaveToIO(domdoc_stream_save_writecallback, + domdoc_stream_save_closecallback, stream, NULL, XML_SAVE_NO_DECL); + + if(!ctx) + { + IStream_Release(stream); + return E_FAIL; + } + } } + break; - ret = IUnknown_QueryInterface(pUnk, &IID_IStream, (void**)&stream); - if(ret == S_OK) + case VT_BSTR: + case VT_BSTR | VT_BYREF: { - ctx = xmlSaveToIO(domdoc_stream_save_writecallback, - domdoc_stream_save_closecallback, stream, NULL, XML_SAVE_NO_DECL); + /* save with file path */ + HANDLE handle = CreateFileW( (V_VT(&destination) & VT_BYREF)? *V_BSTRREF(&destination) : V_BSTR(&destination), + GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); + if( handle == INVALID_HANDLE_VALUE ) + { + WARN("failed to create file\n"); + return E_FAIL; + } - if(!ctx) + /* disable top XML declaration */ + ctx = xmlSaveToIO(domdoc_save_writecallback, domdoc_save_closecallback, + handle, NULL, XML_SAVE_NO_DECL); + if (!ctx) { - IStream_Release(stream); + CloseHandle(handle); return E_FAIL; } } - } - else - { - /* save with file path */ - HANDLE handle = CreateFileW( V_BSTR(&destination), GENERIC_WRITE, 0, - NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL ); - if( handle == INVALID_HANDLE_VALUE ) - { - WARN("failed to create file\n"); - return E_FAIL; - } + break; - /* disable top XML declaration */ - ctx = xmlSaveToIO(domdoc_save_writecallback, domdoc_save_closecallback, - handle, NULL, XML_SAVE_NO_DECL); - if (!ctx) - { - CloseHandle(handle); - return E_FAIL; - } + default: + FIXME("Unhandled VARIANT: %s\n", debugstr_variant(&destination)); + return S_FALSE; } xmldecl = xmldoc_unlink_xmldecl(get_doc(This)); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index abb282a..22bf385 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -6859,7 +6859,7 @@ static void test_save(void) IXMLDOMDocument *doc, *doc2; IXMLDOMElement *root; VARIANT file, vDoc; - BSTR sOrig, sNew; + BSTR sOrig, sNew, filename; char buffer[100]; DWORD read = 0; HANDLE hfile; @@ -6909,6 +6909,25 @@ static void test_save(void) hr = IXMLDOMDocument_save(doc, file); EXPECT_HR(hr, S_OK); + hfile = CreateFileA("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); + ok(hfile != INVALID_HANDLE_VALUE, "Could not open file: %u\n", GetLastError()); + if(hfile == INVALID_HANDLE_VALUE) return; + + ReadFile(hfile, buffer, sizeof(buffer), &read, NULL); + ok(read != 0, "could not read file\n"); + ok(buffer[0] != '<' || buffer[1] != '?', "File contains processing instruction\n"); + + CloseHandle(hfile); + DeleteFile("test.xml"); + + /* save to path VT_BSTR | VT_BYREF */ + filename = _bstr_("test.xml"); + V_VT(&file) = VT_BSTR | VT_BYREF; + V_BSTRREF(&file) = &filename; + + hr = IXMLDOMDocument_save(doc, file); + EXPECT_HR(hr, S_OK); + IXMLDOMDocument_Release(doc); hfile = CreateFileA("test.xml", GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL );

1 0

Adam Martinson : msxml3: Fix a couple incorrect uses of VariantChangeType() .
by Alexandre Julliard June 21, 2011

June 21, 2011

Module: wine Branch: master Commit: 5ab513bd9e8aa8532986e08c336095445c3e5f14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ab513bd9e8aa8532986e08c3… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Mon Jun 20 00:25:12 2011 -0500 msxml3: Fix a couple incorrect uses of VariantChangeType(). --- dlls/msxml3/element.c | 16 +++++++++------- dlls/msxml3/httprequest.c | 7 ++++--- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 5071244..f84dcb5 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -761,21 +761,24 @@ static HRESULT WINAPI domelem_put_nodeTypedValue( VARIANT value) { domelem *This = impl_from_IXMLDOMElement( iface ); - VARIANT type; + XDR_DT dt; HRESULT hr; TRACE("(%p)->(%s)\n", This, debugstr_variant(&value)); + dt = element_get_dt(get_element(This)); /* for untyped node coerce to BSTR and set */ - if (IXMLDOMElement_get_dataType(iface, &type) == S_FALSE) + if (dt == DT_INVALID) { if (V_VT(&value) != VT_BSTR) { - hr = VariantChangeType(&value, &value, 0, VT_BSTR); + VARIANT content; + VariantInit(&content); + hr = VariantChangeType(&content, &value, 0, VT_BSTR); if (hr == S_OK) { - hr = node_set_content(&This->node, V_BSTR(&value)); - VariantClear(&value); + hr = node_set_content(&This->node, V_BSTR(&content)); + VariantClear(&content); } } else @@ -783,8 +786,7 @@ static HRESULT WINAPI domelem_put_nodeTypedValue( } else { - FIXME("not implemented for typed nodes. type %s\n", debugstr_w(V_BSTR(&value))); - VariantClear(&type); + FIXME("not implemented for dt:%s\n", dt_to_str(dt)); return E_NOTIMPL; } diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c index d49840f..4435951 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -666,7 +666,7 @@ static HRESULT WINAPI httprequest_open(IXMLHTTPRequest *iface, BSTR method, BSTR { httprequest *This = impl_from_IXMLHTTPRequest( iface ); HRESULT hr; - VARIANT str; + VARIANT str, is_async; TRACE("(%p)->(%s %s %s)\n", This, debugstr_w(method), debugstr_w(url), debugstr_variant(&async)); @@ -700,8 +700,9 @@ static HRESULT WINAPI httprequest_open(IXMLHTTPRequest *iface, BSTR method, BSTR This->url = SysAllocString(url); - hr = VariantChangeType(&async, &async, 0, VT_BOOL); - This->async = hr == S_OK && V_BOOL(&async) == VARIANT_TRUE; + VariantInit(&is_async); + hr = VariantChangeType(&is_async, &async, 0, VT_BOOL); + This->async = hr == S_OK && V_BOOL(&is_async) == VARIANT_TRUE; VariantInit(&str); hr = VariantChangeType(&str, &user, 0, VT_BSTR);

1 0

Huw Davies : gdi32/tests: Skip the tests if the pen type is not supported.
by Alexandre Julliard June 21, 2011

June 21, 2011

Module: wine Branch: master Commit: 404b820289163374a2980cc0a2d1e0699d0c9874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=404b820289163374a2980cc0a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 21 10:04:26 2011 +0100 gdi32/tests: Skip the tests if the pen type is not supported. --- dlls/gdi32/tests/pen.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index db0b60b..d7819a5 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -81,7 +81,11 @@ static void test_logpen(void) lp.lopnColor = pen[i].color; SetLastError(0xdeadbeef); hpen = CreatePenIndirect(&lp); - ok(hpen != 0, "CreatePen error %d\n", GetLastError()); + if(hpen == 0 && GetLastError() == ERROR_INVALID_PARAMETER) + { + win_skip("No support for pen style %u (%d)\n", pen[i].style, i); + continue; + } obj_type = GetObjectType(hpen); ok(obj_type == OBJ_PEN, "wrong object type %u\n", obj_type);

1 0

Huw Davies : gdi32: Add more broken behaviour on nt4 sp3.
by Alexandre Julliard June 21, 2011

June 21, 2011

Module: wine Branch: master Commit: b5ad5d3510629a8f78973fce44275dd1531d26ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5ad5d3510629a8f78973fce4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 21 10:04:00 2011 +0100 gdi32: Add more broken behaviour on nt4 sp3. --- dlls/gdi32/tests/bitmap.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 619c761..ca53fc7 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -1874,7 +1874,8 @@ static void test_GetDIBits_BI_BITFIELDS(void) ok(ret == 1, "GetDIBits failed\n"); ok( dibinfo->bmiHeader.biBitCount == 32, "wrong bit count %u\n", dibinfo->bmiHeader.biBitCount ); - ok( dibinfo->bmiHeader.biCompression == BI_BITFIELDS, + ok( dibinfo->bmiHeader.biCompression == BI_BITFIELDS || + broken( dibinfo->bmiHeader.biCompression == BI_RGB ), /* nt4 sp3 */ "compression is %u\n", dibinfo->bmiHeader.biCompression ); ok( !bitmasks[0], "red mask is set\n" ); ok( !bitmasks[1], "green mask is set\n" ); @@ -1884,9 +1885,15 @@ static void test_GetDIBits_BI_BITFIELDS(void) ret = GetDIBits(hdc, hbm, 0, 1, bits, dibinfo, DIB_RGB_COLORS); ok(ret == 1, "GetDIBits failed\n"); ok( dibinfo->bmiHeader.biBitCount == 32, "wrong bit count %u\n", dibinfo->bmiHeader.biBitCount ); - ok( bitmasks[0] == 0xff0000, "wrong red mask %08x\n", bitmasks[0] ); - ok( bitmasks[1] == 0x00ff00, "wrong green mask %08x\n", bitmasks[1] ); - ok( bitmasks[2] == 0x0000ff, "wrong blue mask %08x\n", bitmasks[2] ); + ok( dibinfo->bmiHeader.biCompression == BI_BITFIELDS || + broken( dibinfo->bmiHeader.biCompression == BI_RGB ), /* nt4 sp3 */ + "compression is %u\n", dibinfo->bmiHeader.biCompression ); + if (dibinfo->bmiHeader.biCompression == BI_BITFIELDS) + { + ok( bitmasks[0] == 0xff0000, "wrong red mask %08x\n", bitmasks[0] ); + ok( bitmasks[1] == 0x00ff00, "wrong green mask %08x\n", bitmasks[1] ); + ok( bitmasks[2] == 0x0000ff, "wrong blue mask %08x\n", bitmasks[2] ); + } ok( dibinfo->bmiHeader.biSizeImage != 0xdeadbeef, "size image not set\n" ); DeleteObject(hbm);

1 0

Michael Stefaniuc : quartz: COM cleanup for the ifaces of FilterMapper3Impl .
by Alexandre Julliard June 21, 2011

June 21, 2011

Module: wine Branch: master Commit: 2672b0ae940b2ebbbb477729c6ede405824f74c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2672b0ae940b2ebbbb477729c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 21 10:38:43 2011 +0200 quartz: COM cleanup for the ifaces of FilterMapper3Impl. --- dlls/quartz/filtermapper.c | 64 +++++++++++++++++++------------------------ 1 files changed, 28 insertions(+), 36 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 30434db..78b6699 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -88,9 +88,9 @@ static const GUID IID_IAMFilterData = { typedef struct FilterMapper3Impl { - const IFilterMapper3Vtbl *lpVtbl; - const IFilterMapperVtbl *lpVtblFilterMapper; - const IAMFilterDataVtbl *lpVtblAMFilterData; + IFilterMapper3 IFilterMapper3_iface; + IFilterMapper IFilterMapper_iface; + IAMFilterData IAMFilterData_iface; const IUnknownVtbl *IInner_vtbl; LONG refCount; IUnknown * pUnkOuter; @@ -103,14 +103,19 @@ static const IFilterMapper3Vtbl fm3vtbl; static const IFilterMapperVtbl fmvtbl; static const IAMFilterDataVtbl AMFilterDataVtbl; +static inline FilterMapper3Impl *impl_from_IFilterMapper3( IFilterMapper3 *iface ) +{ + return CONTAINING_RECORD(iface, FilterMapper3Impl, IFilterMapper3_iface); +} + static inline FilterMapper3Impl *impl_from_IFilterMapper( IFilterMapper *iface ) { - return (FilterMapper3Impl *)((char*)iface - FIELD_OFFSET(FilterMapper3Impl, lpVtblFilterMapper)); + return CONTAINING_RECORD(iface, FilterMapper3Impl, IFilterMapper_iface); } static inline FilterMapper3Impl *impl_from_IAMFilterData( IAMFilterData *iface ) { - return (FilterMapper3Impl *)((char*)iface - FIELD_OFFSET(FilterMapper3Impl, lpVtblAMFilterData)); + return CONTAINING_RECORD(iface, FilterMapper3Impl, IAMFilterData_iface); } static inline FilterMapper3Impl *impl_from_inner_IUnknown( IUnknown *iface ) @@ -232,9 +237,9 @@ HRESULT FilterMapper2_create(IUnknown *pUnkOuter, LPVOID *ppObj) pFM2impl->bUnkOuterValid = FALSE; pFM2impl->bAggregatable = FALSE; pFM2impl->IInner_vtbl = &IInner_VTable; - pFM2impl->lpVtbl = &fm3vtbl; - pFM2impl->lpVtblFilterMapper = &fmvtbl; - pFM2impl->lpVtblAMFilterData = &AMFilterDataVtbl; + pFM2impl->IFilterMapper3_iface.lpVtbl = &fm3vtbl; + pFM2impl->IFilterMapper_iface.lpVtbl = &fmvtbl; + pFM2impl->IAMFilterData_iface.lpVtbl = &AMFilterDataVtbl; pFM2impl->refCount = 1; *ppObj = pFM2impl; @@ -255,7 +260,7 @@ HRESULT FilterMapper_create(IUnknown *pUnkOuter, LPVOID *ppObj) if (FAILED(hr)) return hr; - *ppObj = &pFM2impl->lpVtblFilterMapper; + *ppObj = &pFM2impl->IFilterMapper_iface; return hr; } @@ -278,9 +283,9 @@ static HRESULT WINAPI Inner_QueryInterface(IUnknown * iface, REFIID riid, LPVOID IsEqualIID(riid, &IID_IFilterMapper3)) *ppv = This; else if (IsEqualIID(riid, &IID_IFilterMapper)) - *ppv = &This->lpVtblFilterMapper; + *ppv = &This->IFilterMapper_iface; else if (IsEqualIID(riid, &IID_IAMFilterData)) - *ppv = &This->lpVtblAMFilterData; + *ppv = &This->IAMFilterData_iface; if (*ppv != NULL) { @@ -326,7 +331,7 @@ static const IUnknownVtbl IInner_VTable = static HRESULT WINAPI FilterMapper3_QueryInterface(IFilterMapper3 * iface, REFIID riid, LPVOID *ppv) { - FilterMapper3Impl *This = (FilterMapper3Impl *)iface; + FilterMapper3Impl *This = impl_from_IFilterMapper3(iface); if (This->bAggregatable) This->bUnkOuterValid = TRUE; @@ -356,7 +361,7 @@ static HRESULT WINAPI FilterMapper3_QueryInterface(IFilterMapper3 * iface, REFII static ULONG WINAPI FilterMapper3_AddRef(IFilterMapper3 * iface) { - FilterMapper3Impl *This = (FilterMapper3Impl *)iface; + FilterMapper3Impl *This = impl_from_IFilterMapper3(iface); if (This->pUnkOuter && This->bUnkOuterValid) return IUnknown_AddRef(This->pUnkOuter); @@ -365,7 +370,7 @@ static ULONG WINAPI FilterMapper3_AddRef(IFilterMapper3 * iface) static ULONG WINAPI FilterMapper3_Release(IFilterMapper3 * iface) { - FilterMapper3Impl *This = (FilterMapper3Impl *)iface; + FilterMapper3Impl *This = impl_from_IFilterMapper3(iface); if (This->pUnkOuter && This->bUnkOuterValid) return IUnknown_Release(This->pUnkOuter); @@ -1235,21 +1240,21 @@ static HRESULT WINAPI FilterMapper_QueryInterface(IFilterMapper * iface, REFIID TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); - return FilterMapper3_QueryInterface((IFilterMapper3*)&This->lpVtbl, riid, ppv); + return FilterMapper3_QueryInterface(&This->IFilterMapper3_iface, riid, ppv); } static ULONG WINAPI FilterMapper_AddRef(IFilterMapper * iface) { FilterMapper3Impl *This = impl_from_IFilterMapper(iface); - return FilterMapper3_AddRef((IFilterMapper3*)This); + return FilterMapper3_AddRef(&This->IFilterMapper3_iface); } static ULONG WINAPI FilterMapper_Release(IFilterMapper * iface) { FilterMapper3Impl *This = impl_from_IFilterMapper(iface); - return FilterMapper3_Release((IFilterMapper3*)This); + return FilterMapper3_Release(&This->IFilterMapper3_iface); } /*** IFilterMapper methods ***/ @@ -1295,22 +1300,9 @@ static HRESULT WINAPI FilterMapper_EnumMatchingFilters( *ppEnum = NULL; - hr = IFilterMapper3_EnumMatchingFilters((IFilterMapper3*)This, - &ppEnumMoniker, - 0, - TRUE, - dwMerit, - bInputNeeded, - 1, - InputType, - NULL, - &GUID_NULL, - bRender, - bOutputNeeded, - 1, - OutputType, - NULL, - &GUID_NULL); + hr = IFilterMapper3_EnumMatchingFilters(&This->IFilterMapper3_iface, &ppEnumMoniker, 0, TRUE, + dwMerit, bInputNeeded, 1, InputType, NULL, &GUID_NULL, bRender, bOutputNeeded, 1, + OutputType, NULL, &GUID_NULL); if (FAILED(hr)) return hr; @@ -1757,21 +1749,21 @@ static HRESULT WINAPI AMFilterData_QueryInterface(IAMFilterData * iface, REFIID { FilterMapper3Impl *This = impl_from_IAMFilterData(iface); - return FilterMapper3_QueryInterface((IFilterMapper3*)This, riid, ppv); + return FilterMapper3_QueryInterface(&This->IFilterMapper3_iface, riid, ppv); } static ULONG WINAPI AMFilterData_AddRef(IAMFilterData * iface) { FilterMapper3Impl *This = impl_from_IAMFilterData(iface); - return FilterMapper3_AddRef((IFilterMapper3*)This); + return FilterMapper3_AddRef(&This->IFilterMapper3_iface); } static ULONG WINAPI AMFilterData_Release(IAMFilterData * iface) { FilterMapper3Impl *This = impl_from_IAMFilterData(iface); - return FilterMapper3_Release((IFilterMapper3*)This); + return FilterMapper3_Release(&This->IFilterMapper3_iface); } /*** IAMFilterData methods ***/

1 0

Henri Verbeet : wined3d: Fix the STATE_BASEVERTEXINDEX state entry.
by Alexandre Julliard June 21, 2011

June 21, 2011

Module: wine Branch: master Commit: 233b8e1cf89a284de142f0407a2ef79490d5ef49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=233b8e1cf89a284de142f0407… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 20 23:21:12 2011 +0200 wined3d: Fix the STATE_BASEVERTEXINDEX state entry. --- dlls/wined3d/state.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 75c2da6..77dd1dd 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5062,7 +5062,7 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_SAMPLER(17), /* Vertex sampler 1 */ { STATE_SAMPLER(17), sampler }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(18), /* Vertex sampler 2 */ { STATE_SAMPLER(18), sampler }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(19), /* Vertex sampler 3 */ { STATE_SAMPLER(19), sampler }, WINED3D_GL_EXT_NONE }, - { STATE_BASEVERTEXINDEX, { 0, NULL, }, ARB_DRAW_ELEMENTS_BASE_VERTEX }, + { STATE_BASEVERTEXINDEX, { STATE_BASEVERTEXINDEX, state_nop, }, ARB_DRAW_ELEMENTS_BASE_VERTEX }, { STATE_BASEVERTEXINDEX, { STATE_VDECL, NULL, }, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, };

1 0