wine-commits May 2017

wine-commits@winehq.org

2 participants
640 discussions

Huw Davies : ole32: Create CF_DIB and CF_BITMAP entries when either is cached.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: e27708f2fd5213cc181e8b40bb331c9a852a9c24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e27708f2fd5213cc181e8b40b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 23 13:11:41 2017 +0100 ole32: Create CF_DIB and CF_BITMAP entries when either is cached. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 36 ++++++++++++-- dlls/ole32/tests/ole2.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 5055c3f..d850a34 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -2079,6 +2079,7 @@ static HRESULT WINAPI DataCache_Cache( DataCache *This = impl_from_IOleCache2(iface); DataCacheEntry *cache_entry; HRESULT hr; + FORMATETC fmt_cpy; TRACE("(%p, 0x%x, %p)\n", pformatetc, advf, pdwConnection); @@ -2087,9 +2088,16 @@ static HRESULT WINAPI DataCache_Cache( TRACE("pformatetc = %s\n", debugstr_formatetc(pformatetc)); + fmt_cpy = *pformatetc; /* No need for a deep copy */ + if (fmt_cpy.cfFormat == CF_BITMAP && fmt_cpy.tymed == TYMED_GDI) + { + fmt_cpy.cfFormat = CF_DIB; + fmt_cpy.tymed = TYMED_HGLOBAL; + } + *pdwConnection = 0; - cache_entry = DataCache_GetEntryForFormatEtc(This, pformatetc); + cache_entry = DataCache_GetEntryForFormatEtc(This, &fmt_cpy); if (cache_entry) { TRACE("found an existing cache entry\n"); @@ -2097,7 +2105,7 @@ static HRESULT WINAPI DataCache_Cache( return CACHE_S_SAMECACHE; } - hr = DataCache_CreateEntry(This, pformatetc, advf, &cache_entry, FALSE); + hr = DataCache_CreateEntry(This, &fmt_cpy, advf, &cache_entry, FALSE); if (SUCCEEDED(hr)) { @@ -2134,24 +2142,44 @@ static HRESULT WINAPI DataCache_EnumCache(IOleCache2 *iface, { DataCache *This = impl_from_IOleCache2( iface ); DataCacheEntry *cache_entry; - int i = 0, count = list_count( &This->cache_list ); + int i = 0, count = 0; STATDATA *data; HRESULT hr; TRACE( "(%p, %p)\n", This, enum_stat ); + LIST_FOR_EACH_ENTRY( cache_entry, &This->cache_list, DataCacheEntry, entry ) + { + count++; + if (cache_entry->fmtetc.cfFormat == CF_DIB) + count++; + } + 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; + if (i == count) goto fail; 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++; + + if (cache_entry->fmtetc.cfFormat == CF_DIB) + { + if (i == count) goto fail; + hr = copy_formatetc( &data[i].formatetc, &cache_entry->fmtetc ); + if (FAILED(hr)) goto fail; + data[i].formatetc.cfFormat = CF_BITMAP; + data[i].formatetc.tymed = TYMED_GDI; + 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 ); diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 65abb3e..0102ca0 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1522,6 +1522,39 @@ static const IUnknownVtbl UnknownVtbl = static IUnknown unknown = { &UnknownVtbl }; +static void check_enum_cache(IOleCache2 *cache, STATDATA *expect, int num) +{ + IEnumSTATDATA *enum_stat; + STATDATA stat; + HRESULT hr; + + hr = IOleCache2_EnumCache( cache, &enum_stat ); + ok( hr == S_OK, "got %08x\n", hr ); + + while (IEnumSTATDATA_Next(enum_stat, 1, &stat, NULL) == S_OK) + { + ok( stat.formatetc.cfFormat == expect->formatetc.cfFormat, "got %d expect %d\n", + stat.formatetc.cfFormat, expect->formatetc.cfFormat ); + ok( !stat.formatetc.ptd == !expect->formatetc.ptd, "got %p expect %p\n", + stat.formatetc.ptd, expect->formatetc.ptd ); + ok( stat.formatetc.dwAspect == expect->formatetc.dwAspect, "got %d expect %d\n", + stat.formatetc.dwAspect, expect->formatetc.dwAspect ); + ok( stat.formatetc.lindex == expect->formatetc.lindex, "got %d expect %d\n", + stat.formatetc.lindex, expect->formatetc.lindex ); + ok( stat.formatetc.tymed == expect->formatetc.tymed, "got %d expect %d\n", + stat.formatetc.tymed, expect->formatetc.tymed ); + ok( stat.advf == expect->advf, "got %d expect %d\n", stat.advf, expect->advf ); + ok( stat.pAdvSink == 0, "got %p\n", stat.pAdvSink ); + ok( stat.dwConnection == expect->dwConnection, "got %d expect %d\n", stat.dwConnection, expect->dwConnection ); + num--; + expect++; + } + + ok( num == 0, "incorrect number. num %d\n", num ); + + IEnumSTATDATA_Release( enum_stat ); +} + static void test_data_cache(void) { HRESULT hr; @@ -1968,12 +2001,18 @@ static void test_data_cache_dib_contents_stream(int num) IDataObject *data; IViewObject2 *view; IStorage *stg; + IOleCache2 *cache; FORMATETC fmt = {CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; STGMEDIUM med; CLSID cls; SIZEL sz; BYTE *ptr; BITMAPINFOHEADER expect_info; + STATDATA enum_expect[] = + { + {{ CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, 0, NULL, 1 }, + {{ CF_BITMAP, 0, DVASPECT_CONTENT, -1, TYMED_GDI }, 0, NULL, 1 }, + }; hr = CreateDataCache( NULL, &CLSID_Picture_Metafile, &IID_IUnknown, (void **)&unk ); ok( SUCCEEDED(hr), "got %08x\n", hr ); @@ -1983,6 +2022,8 @@ static void test_data_cache_dib_contents_stream(int num) ok( SUCCEEDED(hr), "got %08x\n", hr ); hr = IUnknown_QueryInterface( unk, &IID_IViewObject2, (void **)&view ); ok( SUCCEEDED(hr), "got %08x\n", hr ); + hr = IUnknown_QueryInterface( unk, &IID_IOleCache2, (void **)&cache ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); stg = create_storage( num ); @@ -2015,6 +2056,8 @@ static void test_data_cache_dib_contents_stream(int num) GlobalUnlock( U(med).hGlobal ); ReleaseStgMedium( &med ); + check_enum_cache( cache, enum_expect, 2 ); + hr = IViewObject2_GetExtent( view, DVASPECT_CONTENT, -1, NULL, &sz ); ok( SUCCEEDED(hr), "got %08x\n", hr ); if (num == 0) @@ -2033,12 +2076,98 @@ static void test_data_cache_dib_contents_stream(int num) ReleaseDC( 0, hdc ); } + IOleCache2_Release( cache ); IViewObject2_Release( view ); IDataObject_Release( data ); IPersistStorage_Release( persist ); IUnknown_Release( unk ); } +static void test_data_cache_bitmap(void) +{ + HRESULT hr; + IOleCache2 *cache; + FORMATETC fmt; + DWORD conn; + STATDATA expect[] = + { + {{ CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, 0, NULL, 0 }, + {{ CF_BITMAP, 0, DVASPECT_CONTENT, -1, TYMED_GDI }, 0, NULL, 0 }, + {{ CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, 0, NULL, 0 }, + {{ CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, 0, NULL, 0 } + }; + + hr = CreateDataCache( NULL, &CLSID_NULL, &IID_IOleCache2, (void **)&cache ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* create a dib entry which will also create a bitmap entry too */ + fmt.cfFormat = CF_DIB; + fmt.ptd = NULL; + fmt.dwAspect = DVASPECT_CONTENT; + fmt.lindex = -1; + fmt.tymed = TYMED_HGLOBAL; + + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == S_OK, "got %08x\n", hr ); + expect[0].dwConnection = conn; + expect[1].dwConnection = conn; + + check_enum_cache( cache, expect, 2 ); + + /* now try to add a bitmap */ + fmt.cfFormat = CF_BITMAP; + fmt.tymed = TYMED_GDI; + + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == CACHE_S_SAMECACHE, "got %08x\n", hr ); + + /* metafile */ + fmt.cfFormat = CF_METAFILEPICT; + fmt.tymed = TYMED_MFPICT; + + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == S_OK, "got %08x\n", hr ); + expect[2].dwConnection = conn; + + check_enum_cache( cache, expect, 3); + + /* enhmetafile */ + fmt.cfFormat = CF_ENHMETAFILE; + fmt.tymed = TYMED_ENHMF; + + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == S_OK, "got %08x\n", hr ); + expect[3].dwConnection = conn; + + check_enum_cache( cache, expect, 4 ); + + /* uncache everything */ + hr = IOleCache2_Uncache( cache, expect[3].dwConnection ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IOleCache2_Uncache( cache, expect[2].dwConnection ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IOleCache2_Uncache( cache, expect[0].dwConnection ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IOleCache2_Uncache( cache, expect[0].dwConnection ); + ok( hr == OLE_E_NOCONNECTION, "got %08x\n", hr ); + + check_enum_cache( cache, expect, 0 ); + + /* just create a bitmap entry which again adds both dib and bitmap */ + fmt.cfFormat = CF_BITMAP; + fmt.tymed = TYMED_GDI; + + hr = IOleCache2_Cache( cache, &fmt, 0, &conn ); + ok( hr == S_OK, "got %08x\n", hr ); + + expect[0].dwConnection = conn; + expect[1].dwConnection = conn; + + check_enum_cache( cache, expect, 2 ); + + IOleCache2_Release( cache ); +} + static void test_default_handler(void) { HRESULT hr; @@ -2791,6 +2920,7 @@ START_TEST(ole2) test_data_cache(); test_data_cache_dib_contents_stream( 0 ); test_data_cache_dib_contents_stream( 1 ); + test_data_cache_bitmap(); test_default_handler(); test_runnable(); test_OleRun();

1 0

Huw Davies : ole32: Implement IOleCache_EnumCache().
by Alexandre Julliard 23 May '17

23 May '17

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 23 May '17

23 May '17

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

Sven Hesse : d3d11/tests: Add tests for SM5 instructions gather4_c/ gather4_po_c.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: 6bfbbb6bcf90b44a4be1792dad688b6477f3deaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bfbbb6bcf90b44a4be1792da… Author: Sven Hesse <drmccoy(a)drmccoy.de> Date: Mon May 22 19:15:03 2017 +0200 d3d11/tests: Add tests for SM5 instructions gather4_c/gather4_po_c. 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/d3d11/tests/d3d11.c | 221 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 221 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6bfbbb6bcf90b44a4be17…

1 0

Sven Hesse : wined3d: Implement SM5 gather4_po_c opcode.
by Alexandre Julliard 23 May '17

23 May '17

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

Alistair Leslie-Hughes : wined3d: Allow passing NULL to context_reacquire( ).
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: c9ea06e7a8fef557bd781c2b56cd81a3629ec839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9ea06e7a8fef557bd781c2b5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat May 20 14:12:31 2017 +0200 wined3d: Allow passing NULL to context_reacquire(). A context associated with a query may be destroyed together with a swapchain. 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/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 89731e5..6d09c22 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3970,7 +3970,7 @@ struct wined3d_context *context_reacquire(const struct wined3d_device *device, { struct wined3d_context *current_context; - if (context->tid != GetCurrentThreadId()) + if (!context || context->tid != GetCurrentThreadId()) return NULL; current_context = context_acquire(device, context->current_rt.texture,

1 0

Hans Leidekker : webservices: Add support for writing attributes and text in binary mode.
by Alexandre Julliard 23 May '17

23 May '17

Module: wine Branch: master Commit: e6b9f9a63483dba5de8dc33690c0f42e9c1e903e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6b9f9a63483dba5de8dc3369… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 23 12:03:54 2017 +0200 webservices: Add support for writing attributes and text 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 | 100 ++++++++++++-- dlls/webservices/writer.c | 284 +++++++++++++++++++++++++++++----------- 2 files changed, 302 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6b9f9a63483dba5de8dc…

1 0

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

23 May '17

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 23 May '17

23 May '17

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 23 May '17

23 May '17

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

← Newer
1
...
17
18
19
20
21
22
23
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2017