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

Huw Davies : ole32: Implement IOleCache_EnumCache().
by Alexandre Julliard May 23, 2017

May 23, 2017

Module: wine Branch: master Commit: 20a8f1adf4d2f9a43632670ff9368cf42432e157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20a8f1adf4d2f9a43632670ff… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 23 13:11:40 2017 +0100 ole32: Implement IOleCache_EnumCache(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj_private.h | 3 +++ dlls/ole32/datacache.c | 36 ++++++++++++++++++++++++++++++----- dlls/ole32/oleobj.c | 45 +++++++++++++++++++++++++------------------- 3 files changed, 60 insertions(+), 24 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index 8bab819..64b6782 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -346,4 +346,7 @@ static inline HRESULT copy_formatetc(FORMATETC *dst, const FORMATETC *src) return S_OK; } +extern HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD array_len, STATDATA *data, + BOOL copy, IEnumSTATDATA **ppenum) DECLSPEC_HIDDEN; + #endif /* __WINE_OLE_COMPOBJ_H */ diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index a50c4fe..5055c3f 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2129,12 +2129,38 @@ static HRESULT WINAPI DataCache_Uncache( return OLE_E_NOCONNECTION; } -static HRESULT WINAPI DataCache_EnumCache( - IOleCache2* iface, - IEnumSTATDATA** ppenumSTATDATA) +static HRESULT WINAPI DataCache_EnumCache(IOleCache2 *iface, + IEnumSTATDATA **enum_stat) { - FIXME("stub\n"); - return E_NOTIMPL; + DataCache *This = impl_from_IOleCache2( iface ); + DataCacheEntry *cache_entry; + int i = 0, count = list_count( &This->cache_list ); + STATDATA *data; + HRESULT hr; + + TRACE( "(%p, %p)\n", This, enum_stat ); + + data = CoTaskMemAlloc( count * sizeof(*data) ); + if (!data) return E_OUTOFMEMORY; + + LIST_FOR_EACH_ENTRY( cache_entry, &This->cache_list, DataCacheEntry, entry ) + { + if (i == count) break; + hr = copy_formatetc( &data[i].formatetc, &cache_entry->fmtetc ); + if (FAILED(hr)) goto fail; + data[i].advf = cache_entry->advise_flags; + data[i].pAdvSink = NULL; + data[i].dwConnection = cache_entry->id; + i++; + } + + hr = EnumSTATDATA_Construct( NULL, 0, i, data, FALSE, enum_stat ); + if (SUCCEEDED(hr)) return hr; + +fail: + while (i--) CoTaskMemFree( data[i].formatetc.ptd ); + CoTaskMemFree( data ); + return hr; } static HRESULT WINAPI DataCache_InitCache( diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index 17ab8d0..44e15e5 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -71,8 +71,6 @@ static HRESULT copy_statdata(STATDATA *dst, const STATDATA *src) * EnumSTATDATA Implementation */ -static HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD array_len, STATDATA *data, IEnumSTATDATA **ppenum); - typedef struct { IEnumSTATDATA IEnumSTATDATA_iface; @@ -120,7 +118,7 @@ static ULONG WINAPI EnumSTATDATA_Release(IEnumSTATDATA *iface) for(i = 0; i < This->num_of_elems; i++) release_statdata(This->statdata + i); HeapFree(GetProcessHeap(), 0, This->statdata); - IUnknown_Release(This->holder); + if (This->holder) IUnknown_Release(This->holder); HeapFree(GetProcessHeap(), 0, This); } return refs; @@ -184,7 +182,8 @@ static HRESULT WINAPI EnumSTATDATA_Clone(IEnumSTATDATA *iface, IEnumSTATDATA **p { EnumSTATDATA *This = impl_from_IEnumSTATDATA(iface); - return EnumSTATDATA_Construct(This->holder, This->index, This->num_of_elems, This->statdata, ppenum); + return EnumSTATDATA_Construct(This->holder, This->index, This->num_of_elems, This->statdata, + TRUE, ppenum); } static const IEnumSTATDATAVtbl EnumSTATDATA_VTable = @@ -198,8 +197,8 @@ static const IEnumSTATDATAVtbl EnumSTATDATA_VTable = EnumSTATDATA_Clone }; -static HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD array_len, STATDATA *data, - IEnumSTATDATA **ppenum) +HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD array_len, STATDATA *data, + BOOL copy, IEnumSTATDATA **ppenum) { EnumSTATDATA *This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); DWORD i, count; @@ -210,25 +209,33 @@ static HRESULT EnumSTATDATA_Construct(IUnknown *holder, ULONG index, DWORD array This->ref = 1; This->index = index; - This->statdata = HeapAlloc(GetProcessHeap(), 0, array_len * sizeof(*This->statdata)); - if(!This->statdata) + if (copy) { - HeapFree(GetProcessHeap(), 0, This); - return E_OUTOFMEMORY; - } + This->statdata = HeapAlloc(GetProcessHeap(), 0, array_len * sizeof(*This->statdata)); + if(!This->statdata) + { + HeapFree(GetProcessHeap(), 0, This); + return E_OUTOFMEMORY; + } - for(i = 0, count = 0; i < array_len; i++) - { - if(data[i].pAdvSink) + for(i = 0, count = 0; i < array_len; i++) { - copy_statdata(This->statdata + count, data + i); - count++; + if(data[i].pAdvSink) + { + copy_statdata(This->statdata + count, data + i); + count++; + } } } + else + { + This->statdata = data; + count = array_len; + } This->num_of_elems = count; This->holder = holder; - IUnknown_AddRef(holder); + if (holder) IUnknown_AddRef(holder); *ppenum = &This->IEnumSTATDATA_iface; return S_OK; } @@ -403,7 +410,7 @@ static HRESULT WINAPI OleAdviseHolderImpl_EnumAdvise(IOleAdviseHolder *iface, IE TRACE("(%p)->(%p)\n", This, enum_advise); IOleAdviseHolder_QueryInterface(iface, &IID_IUnknown, (void**)&unk); - hr = EnumSTATDATA_Construct(unk, 0, This->max_cons, This->connections, enum_advise); + hr = EnumSTATDATA_Construct(unk, 0, This->max_cons, This->connections, TRUE, enum_advise); IUnknown_Release(unk); return hr; } @@ -737,7 +744,7 @@ static HRESULT WINAPI DataAdviseHolder_EnumAdvise(IDataAdviseHolder *iface, TRACE("(%p)->(%p)\n", This, enum_advise); IDataAdviseHolder_QueryInterface(iface, &IID_IUnknown, (void**)&unk); - hr = EnumSTATDATA_Construct(unk, 0, This->maxCons, This->connections, enum_advise); + hr = EnumSTATDATA_Construct(unk, 0, This->maxCons, This->connections, TRUE, enum_advise); IUnknown_Release(unk); return hr; }

1 0

Huw Davies : ole32: Check the cache entry' s stgmedium for the unloaded state.
by Alexandre Julliard May 23, 2017

May 23, 2017

Module: wine Branch: master Commit: f9b0f60ae3c3d9f7c498ac22a079da85a13a29a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9b0f60ae3c3d9f7c498ac22a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 23 13:11:39 2017 +0100 ole32: Check the cache entry's stgmedium for the unloaded state. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 40d4ab8..a50c4fe 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -929,7 +929,7 @@ static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, static HRESULT DataCacheEntry_GetData(DataCacheEntry *cache_entry, STGMEDIUM *stgmedium) { - if (stgmedium->tymed == TYMED_NULL && cache_entry->stream) + if (cache_entry->stgmedium.tymed == TYMED_NULL && cache_entry->stream) { HRESULT hr = DataCacheEntry_LoadData(cache_entry); if (FAILED(hr))

1 0

Józef Kucia : d3d9/tests: Add test for invalid query types.
by Alexandre Julliard May 23, 2017

May 23, 2017

Module: wine Branch: master Commit: 42951f3e1014a3a165c3abffd55a1885ad3679f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42951f3e1014a3a165c3abffd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 23 13:11:44 2017 +0200 d3d9/tests: Add test for invalid query types. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 8ace42f..89ea772 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5539,6 +5539,20 @@ static void test_query_support(void) } } + for (i = 0; i < 40; ++i) + { + if (D3DQUERYTYPE_VCACHE <= i && i <= D3DQUERYTYPE_MEMORYPRESSURE) + continue; + + hr = IDirect3DDevice9_CreateQuery(device, i, NULL); + ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x for query %#x.\n", hr, i); + + query = (IDirect3DQuery9 *)0xdeadbeef; + hr = IDirect3DDevice9_CreateQuery(device, i, &query); + ok(hr == D3DERR_NOTAVAILABLE, "Got unexpected hr %#x for query %#x.\n", hr, i); + ok(query == (IDirect3DQuery9 *)0xdeadbeef, "Got unexpected query %p.\n", query); + } + refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d9);

1 0

Józef Kucia : include/d3d9: Update D3DQUERYTYPE enum.
by Alexandre Julliard May 23, 2017

May 23, 2017

Module: wine Branch: master Commit: 678f6bbdb45bf4a5f3f5608232abb3ee875b11f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=678f6bbdb45bf4a5f3f560823… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue May 23 13:11:42 2017 +0200 include/d3d9: Update D3DQUERYTYPE enum. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9types.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/d3d9types.h b/include/d3d9types.h index 82e5112..ed14e9b 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -307,7 +307,8 @@ typedef enum _D3DQUERYTYPE { D3DQUERYTYPE_VERTEXTIMINGS = 15, D3DQUERYTYPE_PIXELTIMINGS = 16, D3DQUERYTYPE_BANDWIDTHTIMINGS = 17, - D3DQUERYTYPE_CACHEUTILIZATION = 18 + D3DQUERYTYPE_CACHEUTILIZATION = 18, + D3DQUERYTYPE_MEMORYPRESSURE = 19, } D3DQUERYTYPE; #define D3DISSUE_BEGIN (1 << 1)

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard May 23, 2017

May 23, 2017

Module: wine Branch: master Commit: 75087023417f5e64e63e4d5fbd563f7a264c6f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=75087023417f5e64e63e4d5fb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 23 12:03:49 2017 +0200 include: Add missing Web Services declarations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/include/webservices.h b/include/webservices.h index c5aa3ec..fc259c1 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -211,16 +211,46 @@ typedef enum { WS_CHARSET_UTF16BE } WS_CHARSET; +typedef struct _WS_XML_DICTIONARY { + GUID guid; + struct _WS_XML_STRING *strings; + ULONG stringCount; + BOOL isConst; +} WS_XML_DICTIONARY; + +typedef struct _WS_XML_STRING { + ULONG length; + BYTE *bytes; + WS_XML_DICTIONARY *dictionary; + ULONG id; +} WS_XML_STRING; + typedef struct _WS_XML_READER_TEXT_ENCODING { WS_XML_READER_ENCODING encoding; WS_CHARSET charSet; } WS_XML_READER_TEXT_ENCODING; +typedef struct _WS_XML_READER_BINARY_ENCODING { + WS_XML_READER_ENCODING encoding; + WS_XML_DICTIONARY *staticDictionary; + WS_XML_DICTIONARY *dynamicDictionary; +} WS_XML_READER_BINARY_ENCODING; + typedef struct _WS_XML_WRITER_TEXT_ENCODING { WS_XML_WRITER_ENCODING encoding; WS_CHARSET charSet; } WS_XML_WRITER_TEXT_ENCODING; +typedef HRESULT (CALLBACK *WS_DYNAMIC_STRING_CALLBACK) + (void*, const WS_XML_STRING*, BOOL*, ULONG*, WS_ERROR*); + +typedef struct _WS_XML_WRITER_BINARY_ENCODING { + WS_XML_WRITER_ENCODING encoding; + WS_XML_DICTIONARY *staticDictionary; + WS_DYNAMIC_STRING_CALLBACK dynamicStringCallback; + void *dynamicStringCallbackState; +} WS_XML_WRITER_BINARY_ENCODING; + typedef enum { WS_XML_READER_INPUT_TYPE_BUFFER = 1, WS_XML_READER_INPUT_TYPE_STREAM = 2 @@ -274,20 +304,6 @@ typedef struct _WS_XML_READER_STREAM_INPUT { void *readCallbackState; } WS_XML_READER_STREAM_INPUT; -typedef struct _WS_XML_DICTIONARY { - GUID guid; - struct _WS_XML_STRING *strings; - ULONG stringCount; - BOOL isConst; -} WS_XML_DICTIONARY; - -typedef struct _WS_XML_STRING { - ULONG length; - BYTE *bytes; - WS_XML_DICTIONARY *dictionary; - ULONG id; -} WS_XML_STRING; - typedef enum { WS_ELEMENT_TYPE_MAPPING = 1, WS_ATTRIBUTE_TYPE_MAPPING = 2, @@ -1568,6 +1584,7 @@ void WINAPI WsFreeReader(WS_XML_READER*); void WINAPI WsFreeServiceProxy(WS_SERVICE_PROXY*); void WINAPI WsFreeWriter(WS_XML_WRITER*); HRESULT WINAPI WsGetChannelProperty(WS_CHANNEL*, WS_CHANNEL_PROPERTY_ID, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsGetDictionary(WS_ENCODING, WS_XML_DICTIONARY**, WS_ERROR*); HRESULT WINAPI WsGetErrorProperty(WS_ERROR*, WS_ERROR_PROPERTY_ID, void*, ULONG); HRESULT WINAPI WsGetErrorString(WS_ERROR*, ULONG, WS_STRING*); HRESULT WINAPI WsGetHeapProperty(WS_HEAP*, WS_HEAP_PROPERTY_ID, void*, ULONG, WS_ERROR*);

1 0

Huw Davies : ole32: OleUninitialize() does not release the reference to the clipboard's source dataobject.
by Alexandre Julliard May 23, 2017

May 23, 2017

Module: wine Branch: master Commit: 8fc1a4cd863aad02761f015bf5a5f67f94934aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc1a4cd863aad02761f015bf… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 23 09:33:02 2017 +0100 ole32: OleUninitialize() does not release the reference to the clipboard's source dataobject. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/clipboard.c | 64 ++++++++++++++++++++++++-------------------- dlls/ole32/tests/clipboard.c | 14 +++++++++- 2 files changed, 48 insertions(+), 30 deletions(-) diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index b3c7665..919d9e3 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -1786,35 +1786,6 @@ void OLEClipbrd_Initialize(void) } } -/*********************************************************************** - * OLEClipbrd_UnInitialize() - * Un-Initializes the OLE clipboard - */ -void OLEClipbrd_UnInitialize(void) -{ - ole_clipbrd *clipbrd = theOleClipboard; - - TRACE("()\n"); - - if ( clipbrd ) - { - static const WCHAR ole32W[] = {'o','l','e','3','2',0}; - HINSTANCE hinst = GetModuleHandleW(ole32W); - - if ( clipbrd->window ) - { - DestroyWindow(clipbrd->window); - UnregisterClassW( clipbrd_wndclass, hinst ); - } - - IStream_Release(clipbrd->marshal_data); - if (clipbrd->src_data) IDataObject_Release(clipbrd->src_data); - HeapFree(GetProcessHeap(), 0, clipbrd->cached_enum); - HeapFree(GetProcessHeap(), 0, clipbrd); - theOleClipboard = NULL; - } -} - /********************************************************************* * set_clipboard_formats * @@ -2015,6 +1986,41 @@ static HRESULT set_src_dataobject(ole_clipbrd *clipbrd, IDataObject *data) } /*********************************************************************** + * OLEClipbrd_UnInitialize() + * Un-Initializes the OLE clipboard + */ +void OLEClipbrd_UnInitialize(void) +{ + ole_clipbrd *clipbrd = theOleClipboard; + + TRACE("()\n"); + + if ( clipbrd ) + { + static const WCHAR ole32W[] = {'o','l','e','3','2',0}; + HINSTANCE hinst = GetModuleHandleW(ole32W); + + /* OleUninitialize() does not release the reference to the dataobject, so + take an additional reference here. This reference is then leaked. */ + if (clipbrd->src_data) + { + IDataObject_AddRef(clipbrd->src_data); + set_src_dataobject(clipbrd, NULL); + } + + if ( clipbrd->window ) + { + DestroyWindow(clipbrd->window); + UnregisterClassW( clipbrd_wndclass, hinst ); + } + + IStream_Release(clipbrd->marshal_data); + HeapFree(GetProcessHeap(), 0, clipbrd); + theOleClipboard = NULL; + } +} + +/*********************************************************************** * clipbrd_wndproc */ static LRESULT CALLBACK clipbrd_wndproc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 1c8923e..4890782 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -1187,9 +1187,21 @@ static void test_consumer_refs(void) IDataObject_Release(get1); IDataObject_Release(src2); - IDataObject_Release(src); + + /* Show that OleUninitialize() doesn't release the + dataobject's ref, and thus the object is leaked. */ + old_refs = count_refs(src); + ok(old_refs == 1, "%d\n", old_refs); + + OleSetClipboard(src); + refs = count_refs(src); + ok(refs > old_refs, "%d %d\n", refs, old_refs); OleUninitialize(); + refs = count_refs(src); + ok(refs == 2, "%d\n", refs); + + IDataObject_Release(src); } static void test_flushed_getdata(void)

1 0

Sven Hesse : wined3d: Implement SM5 gather4_po_c opcode.
by Alexandre Julliard May 23, 2017

May 23, 2017

Module: wine Branch: master Commit: 4b376ba7d2748b3959b38b8c948b1c7549895930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b376ba7d2748b3959b38b8c9… Author: Sven Hesse <drmccoy(a)drmccoy.de> Date: Mon May 22 19:15:02 2017 +0200 wined3d: Implement SM5 gather4_po_c opcode. A combination of gather4_c and gather4_po. Signed-off-by: Sven Hesse <drmccoy(a)drmccoy.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 11 +++++++---- dlls/wined3d/shader.c | 4 +++- dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1a49aa6..c9e5880 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5128,6 +5128,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_GATHER4 */ NULL, /* WINED3DSIH_GATHER4_C */ NULL, /* WINED3DSIH_GATHER4_PO */ NULL, + /* WINED3DSIH_GATHER4_PO_C */ NULL, /* WINED3DSIH_GE */ NULL, /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ NULL, /* WINED3DSIH_HS_DECLS */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2ace2b4..7a9007e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5877,9 +5877,11 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) } has_offset = ins->handler_idx == WINED3DSIH_GATHER4_PO + || ins->handler_idx == WINED3DSIH_GATHER4_PO_C || wined3d_shader_instruction_has_texel_offset(ins); - resource_param_idx = ins->handler_idx == WINED3DSIH_GATHER4_PO ? 2 : 1; + resource_param_idx = + (ins->handler_idx == WINED3DSIH_GATHER4_PO || ins->handler_idx == WINED3DSIH_GATHER4_PO_C) ? 2 : 1; resource_idx = ins->src[resource_param_idx].reg.idx[0].offset; sampler_idx = ins->src[resource_param_idx + 1].reg.idx[0].offset; component_idx = shader_glsl_swizzle_get_component(ins->src[resource_param_idx + 1].swizzle, 0); @@ -5902,12 +5904,12 @@ static void shader_glsl_gather4(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "textureGather%s(%s_sampler%u, %s", has_offset ? "Offset" : "", prefix, sampler_bind_idx, coord_param.param_str); - if (ins->handler_idx == WINED3DSIH_GATHER4_C) + if (ins->handler_idx == WINED3DSIH_GATHER4_C || ins->handler_idx == WINED3DSIH_GATHER4_PO_C) { - shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &compare_param); + shader_glsl_add_src_param(ins, &ins->src[resource_param_idx + 2], WINED3DSP_WRITEMASK_0, &compare_param); shader_addline(buffer, ", %s", compare_param.param_str); } - if (ins->handler_idx == WINED3DSIH_GATHER4_PO) + if (ins->handler_idx == WINED3DSIH_GATHER4_PO || ins->handler_idx == WINED3DSIH_GATHER4_PO_C) { shader_glsl_add_src_param(ins, &ins->src[1], (1u << offset_size) - 1, &offset_param); shader_addline(buffer, ", %s", offset_param.param_str); @@ -10681,6 +10683,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_GATHER4 */ shader_glsl_gather4, /* WINED3DSIH_GATHER4_C */ shader_glsl_gather4, /* WINED3DSIH_GATHER4_PO */ shader_glsl_gather4, + /* WINED3DSIH_GATHER4_PO_C */ shader_glsl_gather4, /* WINED3DSIH_GE */ shader_glsl_relop, /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ shader_glsl_nop, /* WINED3DSIH_HS_DECLS */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 177ca1b..144dbff 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -148,6 +148,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_GATHER4 */ "gather4", /* WINED3DSIH_GATHER4_C */ "gather4_c", /* WINED3DSIH_GATHER4_PO */ "gather4_po", + /* WINED3DSIH_GATHER4_PO_C */ "gather4_po_c", /* WINED3DSIH_GE */ "ge", /* WINED3DSIH_HS_CONTROL_POINT_PHASE */ "hs_control_point_phase", /* WINED3DSIH_HS_DECLS */ "hs_decls", @@ -1586,7 +1587,8 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st shader_record_sample(reg_maps, ins.src[1].reg.idx[0].offset, ins.src[2].reg.idx[0].offset, reg_maps->sampler_map.count); } - else if (ins.handler_idx == WINED3DSIH_GATHER4_PO) + else if (ins.handler_idx == WINED3DSIH_GATHER4_PO + || ins.handler_idx == WINED3DSIH_GATHER4_PO_C) { shader_record_sample(reg_maps, ins.src[2].reg.idx[0].offset, ins.src[3].reg.idx[0].offset, reg_maps->sampler_map.count); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 384a744..a9fedbc 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -235,6 +235,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, WINED3D_SM5_OP_GATHER4_C = 0x7e, WINED3D_SM5_OP_GATHER4_PO = 0x7f, + WINED3D_SM5_OP_GATHER4_PO_C = 0x80, WINED3D_SM5_OP_RCP = 0x81, WINED3D_SM5_OP_F32TOF16 = 0x82, WINED3D_SM5_OP_F16TOF32 = 0x83, @@ -1014,6 +1015,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, {WINED3D_SM5_OP_GATHER4_C, WINED3DSIH_GATHER4_C, "f", "fRSf"}, {WINED3D_SM5_OP_GATHER4_PO, WINED3DSIH_GATHER4_PO, "f", "fiRS"}, + {WINED3D_SM5_OP_GATHER4_PO_C, WINED3DSIH_GATHER4_PO_C, "f", "fiRSf"}, {WINED3D_SM5_OP_RCP, WINED3DSIH_RCP, "f", "f"}, {WINED3D_SM5_OP_F32TOF16, WINED3DSIH_F32TOF16, "u", "f"}, {WINED3D_SM5_OP_F16TOF32, WINED3DSIH_F16TOF32, "f", "u"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4f2916b..321f4d5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -773,6 +773,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_GATHER4, WINED3DSIH_GATHER4_C, WINED3DSIH_GATHER4_PO, + WINED3DSIH_GATHER4_PO_C, WINED3DSIH_GE, WINED3DSIH_HS_CONTROL_POINT_PHASE, WINED3DSIH_HS_DECLS,

1 0

Hans Leidekker : webservices: Set namespace attributes for prefixes introduced by attributes.
by Alexandre Julliard May 23, 2017

May 23, 2017

Module: wine Branch: master Commit: e091c1ec1afa2323919eabd1324e4bcbbf49a3e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e091c1ec1afa2323919eabd13… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 23 12:03:53 2017 +0200 webservices: Set namespace attributes for prefixes introduced by attributes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 27 ++++++++++++++++++++++ dlls/webservices/writer.c | 51 ++++++++++++++++++++++++----------------- 2 files changed, 57 insertions(+), 21 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 7fd2d44..7ee0325 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -3470,6 +3470,32 @@ static void test_binary_encoding(void) WsFreeWriter( writer ); } +static void test_namespaces(void) +{ + WS_XML_STRING prefix = {1, (BYTE *)"p"}, prefix2 = {1, (BYTE *)"q"}; + WS_XML_STRING localname = {1, (BYTE *)"t"}, localname2 = {1, (BYTE *)"a"}; + WS_XML_STRING ns = {1, (BYTE *)"n"}, ns2 = {1, (BYTE *)"o"}; + WS_XML_WRITER *writer; + HRESULT hr; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartAttribute( writer, &prefix2, &localname2, &ns2, FALSE, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndAttribute( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:t q:a=\"\" xmlns:p=\"n\" xmlns:q=\"o\"/>", __LINE__ ); + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -3508,4 +3534,5 @@ START_TEST(writer) test_WsWriteChars(); test_WsWriteCharsUtf8(); test_binary_encoding(); + test_namespaces(); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index a2b0763..e1b8c9e 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -615,15 +615,6 @@ HRESULT WINAPI WsGetPrefixFromNamespace( WS_XML_WRITER *handle, const WS_XML_STR return hr; } -static HRESULT set_current_namespace( struct writer *writer, const WS_XML_STRING *ns ) -{ - WS_XML_STRING *str; - if (!(str = alloc_xml_string( ns->bytes, ns->length ))) return E_OUTOFMEMORY; - heap_free( writer->current_ns ); - writer->current_ns = str; - return S_OK; -} - static HRESULT write_namespace_attribute_text( struct writer *writer, const WS_XML_ATTRIBUTE *attr ) { unsigned char quote = attr->singleQuote ? '\'' : '"'; @@ -747,8 +738,8 @@ static HRESULT write_namespace_attribute( struct writer *writer, const WS_XML_AT } } -static HRESULT write_add_namespace_attribute( struct writer *writer, const WS_XML_STRING *prefix, - const WS_XML_STRING *ns, BOOL single ) +static HRESULT add_namespace_attribute( struct writer *writer, const WS_XML_STRING *prefix, + const WS_XML_STRING *ns, BOOL single ) { WS_XML_ATTRIBUTE *attr; WS_XML_ELEMENT_NODE *elem = &writer->current->hdr; @@ -803,17 +794,35 @@ static BOOL namespace_in_scope( const WS_XML_ELEMENT_NODE *elem, const WS_XML_ST return FALSE; } -static HRESULT write_set_element_namespace( struct writer *writer ) +static HRESULT set_current_namespace( struct writer *writer, const WS_XML_STRING *ns ) +{ + WS_XML_STRING *str; + if (!(str = alloc_xml_string( ns->bytes, ns->length ))) return E_OUTOFMEMORY; + heap_free( writer->current_ns ); + writer->current_ns = str; + return S_OK; +} + +static HRESULT set_namespaces( struct writer *writer ) { WS_XML_ELEMENT_NODE *elem = &writer->current->hdr; HRESULT hr; + ULONG i; - if (!elem->ns->length || namespace_in_scope( elem, elem->prefix, elem->ns )) return S_OK; + if (elem->ns->length && !namespace_in_scope( elem, elem->prefix, elem->ns )) + { + if ((hr = add_namespace_attribute( writer, elem->prefix, elem->ns, FALSE )) != S_OK) return hr; + if ((hr = set_current_namespace( writer, elem->ns )) != S_OK) return hr; + } - if ((hr = write_add_namespace_attribute( writer, elem->prefix, elem->ns, FALSE )) != S_OK) - return hr; + for (i = 0; i < elem->attributeCount; i++) + { + const WS_XML_ATTRIBUTE *attr = elem->attributes[i]; + if (!attr->ns->length || namespace_in_scope( elem, attr->prefix, attr->ns )) continue; + if ((hr = add_namespace_attribute( writer, attr->prefix, attr->ns, FALSE )) != S_OK) return hr; + } - return set_current_namespace( writer, elem->ns ); + return S_OK; } /************************************************************************** @@ -1026,7 +1035,7 @@ static HRESULT write_endelement_node( struct writer *writer ) if (!(node = write_find_startelement( writer ))) return WS_E_INVALID_FORMAT; if (writer->state == WRITER_STATE_STARTELEMENT) { - if ((hr = write_set_element_namespace( writer )) != S_OK) return hr; + if ((hr = set_namespaces( writer )) != S_OK) return hr; if ((hr = write_startelement( writer )) != S_OK) return hr; } if ((hr = write_close_element( writer, node )) != S_OK) return hr; @@ -1109,7 +1118,7 @@ HRESULT WINAPI WsWriteEndStartElement( WS_XML_WRITER *handle, WS_ERROR *error ) return WS_E_INVALID_OPERATION; } - if ((hr = write_set_element_namespace( writer )) != S_OK) goto done; + if ((hr = set_namespaces( writer )) != S_OK) goto done; if ((hr = write_startelement( writer )) != S_OK) goto done; if ((hr = write_endstartelement( writer )) != S_OK) goto done; writer->state = WRITER_STATE_ENDSTARTELEMENT; @@ -1198,7 +1207,7 @@ static HRESULT write_flush( struct writer *writer ) if (writer->state == WRITER_STATE_STARTELEMENT) { HRESULT hr; - if ((hr = write_set_element_namespace( writer )) != S_OK) return hr; + if ((hr = set_namespaces( writer )) != S_OK) return hr; if ((hr = write_startelement( writer )) != S_OK) return hr; if ((hr = write_endstartelement( writer )) != S_OK) return hr; writer->state = WRITER_STATE_ENDSTARTELEMENT; @@ -2086,7 +2095,7 @@ static HRESULT write_add_nil_attribute( struct writer *writer ) if ((hr = write_add_attribute( writer, &prefix, &localname, &ns, FALSE )) != S_OK) return hr; if ((hr = write_set_attribute_value( writer, &value.text )) != S_OK) return hr; - return write_add_namespace_attribute( writer, &prefix, &ns, FALSE ); + return add_namespace_attribute( writer, &prefix, &ns, FALSE ); } static HRESULT get_value_ptr( WS_WRITE_OPTION option, const void *value, ULONG size, ULONG expected_size, @@ -3124,7 +3133,7 @@ HRESULT WINAPI WsWriteXmlnsAttribute( WS_XML_WRITER *handle, const WS_XML_STRING } if (!namespace_in_scope( &writer->current->hdr, prefix, ns )) - hr = write_add_namespace_attribute( writer, prefix, ns, single ); + hr = add_namespace_attribute( writer, prefix, ns, single ); LeaveCriticalSection( &writer->cs ); return hr;

1 0

Hans Leidekker : webservices: Add support for writing namespace attributes in binary mode.
by Alexandre Julliard May 23, 2017

May 23, 2017

Module: wine Branch: master Commit: 4331bb7861af20580698736139a8af816daa0b78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4331bb7861af2058069873613… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 23 12:03:52 2017 +0200 webservices: Add support for writing namespace attributes in binary mode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 7 +- dlls/webservices/writer.c | 214 +++++++++++++++++++++++++--------------- 2 files changed, 139 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4331bb7861af205806987…

1 0

Hans Leidekker : webservices: Add initial support for binary XML in the writer.
by Alexandre Julliard May 23, 2017

May 23, 2017

Module: wine Branch: master Commit: 24d39bc3c4b511c398b5b8b2c047ded299d12c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24d39bc3c4b511c398b5b8b2c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 23 12:03:51 2017 +0200 webservices: Add initial support for binary XML in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 46 ++++++++ dlls/webservices/webservices_private.h | 188 +++++++++++++++++++++++++++++++++ dlls/webservices/writer.c | 182 ++++++++++++++++++++++++++++--- 3 files changed, 399 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24d39bc3c4b511c398b5b…

1 0