- Wine-Devel - list.winehq.org

[PATCH] po: Fix Dutch spelling errors
by Floris Renaud Jan. 30, 2021

Jan. 30, 2021

Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> --- po/nl.po | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/po/nl.po b/po/nl.po index c4012a6cb0b..27ef0b5aaba 100644 --- a/po/nl.po +++ b/po/nl.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-01-26 12:00+0100\n" +"PO-Revision-Date: 2021-01-30 22:00+0100\n" "Last-Translator: Floris Renaud <jkfloris(a)dds.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" @@ -37,7 +37,7 @@ msgid "" msgstr "" "De volgende software kan automatisch verwijderd worden. Om een programma te " "verwijderen of de geïnstalleerde onderdelen te wijzigen, selecteer het in de " -"lijst en druk op Wijzigen/Verwijderen." +"lijst en druk op Wijzigen of Verwijderen." #: dlls/appwiz.cpl/appwiz.rc:67 msgid "&Support Information" @@ -7018,7 +7018,7 @@ msgstr "De sink is niet voltooid.\n" #: dlls/mferror/mferror.mc:732 msgid "Clock was stopped\n" -msgstr "Klok is gestopt.\n" +msgstr "Klok is gestopt\n" #: dlls/mferror/mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7844,7 +7844,7 @@ msgstr "Dienst: [1]" #: dlls/msi/msi.rc:167 dlls/msi/msi.rc:170 dlls/msi/msi.rc:174 msgid "File: [1], Directory: [9], Size: [6]" -msgstr "Bestand: [1], Map: [9], Grootte: [6]" +msgstr "Bestand: [1], Map: [9], Grootte: [6]" #: dlls/msi/msi.rc:168 msgid "Found application: [1]" @@ -7860,7 +7860,7 @@ msgstr "Dienst: [2]" #: dlls/msi/msi.rc:172 msgid "File: [1], Dependencies: [2]" -msgstr "Bestand: [1], Afhankelijkheden: [2]" +msgstr "Bestand: [1], Afhankelijkheden: [2]" #: dlls/msi/msi.rc:173 msgid "Application: [1]" @@ -7872,7 +7872,7 @@ msgstr "Toepassingscontext:[1], Assemblynaam:[2]" #: dlls/msi/msi.rc:177 msgid "File: [1], Directory: [2], Size: [3]" -msgstr "Bestand: [1], Map: [2], Grootte: [3]" +msgstr "Bestand: [1], Map: [2], Grootte: [3]" #: dlls/msi/msi.rc:178 dlls/msi/msi.rc:199 msgid "Component ID: [1], Qualifier: [2]" @@ -7924,7 +7924,7 @@ msgstr "Programma: [1], Opdrachtregel: [2]" #: dlls/msi/msi.rc:192 dlls/msi/msi.rc:209 msgid "File: [1], Section: [2], Key: [3], Value: [4]" -msgstr "Bestand: [1], Selectie: [2], Sleutel: [3], Waarde; [4]" +msgstr "Bestand: [1], Selectie: [2], Sleutel: [3], Waarde; [4]" #: dlls/msi/msi.rc:193 msgid "Key: [1], Name: [2]" @@ -9336,7 +9336,7 @@ msgstr "Ja op &alles" #: dlls/shell32/shell32.rc:319 msgid "About %s" -msgstr "Info %s" +msgstr "Over %s" #: dlls/shell32/shell32.rc:323 msgid "Wine &license" @@ -9794,6 +9794,7 @@ msgstr "" "binnen de voorwaarden van de GNU Lesser General Public License zoals " "gepubliceerd door de Free Software Foundation; versie 2.1 van de licentie, " "of (naar keuze) een latere versie.\n" +"\n" "Wine is gemaakt in de hoop dat het nuttig is, maar komt met GEEN ENKELE " "GARANTIE; zelfs zonder de impliciete garantie van VERKOOPBAARHEID of " "GESCHIKTHEID VOOR EEN BEPAALD DOEL. Lees de GNU Lesser General Public " @@ -12307,8 +12308,7 @@ msgid "" "It is mainly useful in batch files to allow the user to read the output of\n" "a previous command before it scrolls off the screen.\n" msgstr "" -"PAUSE toont een bericht op het scherm waarin de gebruiker word gevraagd een\n" -"toets in te drukken.\n" +"PAUSE toont een bericht waarin wordt gevraagd een toets in te drukken.\n" "\n" "Dit is vooral handig in batchbestanden om de gebruiker in staat te stellen\n" "om de uitvoer van een voorafgaande opdracht te bekijken, voordat het van\n" @@ -15040,7 +15040,8 @@ msgid "" msgstr "" "Wine DLL Registratie Hulpprogramma\n" "\n" -"Biedt DLL-registratiediensten\n" +"Biedt DLL-registratiediensten.\n" +"\n" #: programs/regsvr32/regsvr32.rc:40 msgid "" @@ -16778,7 +16779,7 @@ msgstr "&Naam wijzigen..." #: programs/winefile/winefile.rc:34 msgid "Propert&ies\tAlt+Enter" -msgstr "&Eigenschappent\tAlt+Enter" +msgstr "&Eigenschappen\tAlt+Enter" #: programs/winefile/winefile.rc:38 msgid "Cr&eate Directory..." -- 2.30.0

1 0

[PATCH 1/4] include: Fix the definition of NOTIFYICON_VERSION[_4].
by Zebediah Figura Jan. 30, 2021

Jan. 30, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winemac.drv/systray.c | 2 +- dlls/winex11.drv/systray.c | 2 +- include/shellapi.h | 4 ++-- programs/explorer/systray.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/systray.c b/dlls/winemac.drv/systray.c index 75bca5e3d51..90d2430869d 100644 --- a/dlls/winemac.drv/systray.c +++ b/dlls/winemac.drv/systray.c @@ -283,7 +283,7 @@ static BOOL notify_owner(struct tray_icon *icon, UINT msg, int x, int y) WPARAM wp = icon->id; LPARAM lp = msg; - if (icon->version >= NOTIFY_VERSION_4) + if (icon->version >= NOTIFYICON_VERSION_4) { wp = MAKEWPARAM(x, y); lp = MAKELPARAM(msg, icon->id); diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 3be4bd65347..952bc1ef266 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -441,7 +441,7 @@ static BOOL notify_owner( struct tray_icon *icon, UINT msg, LPARAM lparam ) WPARAM wp = icon->id; LPARAM lp = msg; - if (icon->version >= NOTIFY_VERSION_4) + if (icon->version >= NOTIFYICON_VERSION_4) { POINT pt = { (short)LOWORD(lparam), (short)HIWORD(lparam) }; diff --git a/include/shellapi.h b/include/shellapi.h index 0f10690f7e0..e02869f14e8 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -378,8 +378,8 @@ void WINAPI WinExecErrorW(HWND hwnd,INT error, LPCWSTR lpstrFileName, LPCWSTR lp #define NIM_SETFOCUS 0x00000003 #define NIM_SETVERSION 0x00000004 -#define NOTIFY_VERSION 3 /* supported by Windows 2000 and later */ -#define NOTIFY_VERSION_4 4 /* supported by Windows Vista */ +#define NOTIFYICON_VERSION 3 +#define NOTIFYICON_VERSION_4 4 /* callback message lParam values */ #define NIN_SELECT (WM_USER+0) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index dcd75f4e763..5f4fc60dbf3 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -723,7 +723,7 @@ static BOOL notify_owner( struct icon *icon, UINT msg, POINT pt ) WPARAM wp = icon->id; LPARAM lp = msg; - if (icon->version >= NOTIFY_VERSION_4) + if (icon->version >= NOTIFYICON_VERSION_4) { ClientToScreen( tray_window, &pt ); wp = MAKEWPARAM( pt.x, pt.y ); -- 2.30.0

1 3

[PATCH] uiautomationcore: Add stub UiaNodeFromFocus function.
by Vijay Kiran Kamuju Jan. 30, 2021

Jan. 30, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50576 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 1/2] gdi32: Fail in ExtTextOut if count is -1.
by Gabriel Ivăncescu Jan. 30, 2021

Jan. 30, 2021

Some applications pass this and crash when BIDI_Reorder can't allocate the memory. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/gdi32/font.c | 1 + dlls/gdi32/tests/font.c | 2 ++ dlls/gdi32/tests/metafile.c | 8 +++++++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 74ca482..c0517f5 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5932,6 +5932,7 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, static int quietfixme = 0; if (!dc) return FALSE; + if (count == -1) return FALSE; align = dc->textAlign; breakRem = dc->breakRem; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 461eecf..3e1f1e9 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6916,6 +6916,8 @@ static void test_bitmap_font_glyph_index(void) hBmpPrev = SelectObject(hdc, hBmp[j]); switch (j) { case 0: + ret = ExtTextOutW(hdc, 0, 0, 0, NULL, text, -1, NULL); + ok(!ret, "ExtTextOutW succeeded\n"); ret = ExtTextOutW(hdc, 0, 0, 0, NULL, text, lstrlenW(text), NULL); break; case 1: diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 8dae908..15af24a 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -222,7 +222,13 @@ static void test_ExtTextOut(void) ret = ExtTextOutA(hdcMetafile, 0, 40, 0, NULL, text, lstrlenA(text), NULL); ok( ret, "ExtTextOutA error %d\n", GetLastError()); - /* 4. test with unmatched BeginPath/EndPath calls */ + /* 4. pass -1 to length */ + SetLastError(0xdeadbeef); + ret = ExtTextOutA(hdcMetafile, 0, 0, 0, &rc, text, -1, NULL); + ok( !ret, "ExtTextOutA succeeded\n"); + ok( GetLastError() == 0xdeadbeef, "ExtTextOutA error %d\n", GetLastError()); + + /* 5. test with unmatched BeginPath/EndPath calls */ ret = BeginPath(hdcMetafile); ok( ret, "BeginPath error %d\n", GetLastError()); ret = BeginPath(hdcMetafile); -- 2.29.2

2 4

[PATCH 1/5] winegstreamer: Move the "bus" field of struct parser to a new "wg_parser" object.
by Zebediah Figura Jan. 30, 2021

Jan. 30, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 70 ++++++++++++++++++++++++++++++----- 1 file changed, 60 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index ea6808ec113..f2b015d99db 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -46,6 +46,11 @@ GST_DEBUG_CATEGORY_STATIC(wine); static const GUID MEDIASUBTYPE_CVID = {mmioFOURCC('c','v','i','d'), 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; +struct wg_parser +{ + GstBus *bus; +}; + struct parser { struct strmbase_filter filter; @@ -60,6 +65,8 @@ struct parser LONGLONG filesize; + struct wg_parser *wg_parser; + /* FIXME: It would be nice to avoid duplicating these with strmbase. * However, synchronization is tricky; we need access to be protected by a * separate lock. */ @@ -67,7 +74,6 @@ struct parser GstElement *container; GstPad *my_src, *their_sink; - GstBus *bus; guint64 start, nextofs, nextpullofs, stop; pthread_mutex_t mutex; @@ -1556,6 +1562,7 @@ static LONGLONG query_duration(GstPad *pad) static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) { + struct wg_parser *parser = This->wg_parser; unsigned int i; LONGLONG avail; GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE( @@ -1570,13 +1577,14 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) This->read_thread = CreateThread(NULL, 0, read_thread, This, 0, NULL); - if (!This->bus) { - This->bus = gst_bus_new(); - gst_bus_set_sync_handler(This->bus, watch_bus, This, NULL); + if (!parser->bus) + { + parser->bus = gst_bus_new(); + gst_bus_set_sync_handler(parser->bus, watch_bus, This, NULL); } This->container = gst_bin_new(NULL); - gst_element_set_bus(This->container, This->bus); + gst_element_set_bus(This->container, parser->bus); This->my_src = gst_pad_new_from_static_template(&src_template, "quartz-src"); gst_pad_set_getrange_function(This->my_src, request_buffer_src); @@ -1639,6 +1647,17 @@ static struct strmbase_pin *parser_get_pin(struct strmbase_filter *base, unsigne return NULL; } +static void wg_parser_destroy(struct wg_parser *parser) +{ + if (parser->bus) + { + gst_bus_set_sync_handler(parser->bus, NULL, NULL, NULL); + gst_object_unref(parser->bus); + } + + free(parser); +} + static void parser_destroy(struct strmbase_filter *iface) { struct parser *filter = impl_from_strmbase_filter(iface); @@ -1657,11 +1676,7 @@ static void parser_destroy(struct strmbase_filter *iface) IAsyncReader_Release(filter->reader); filter->reader = NULL; - if (filter->bus) - { - gst_bus_set_sync_handler(filter->bus, NULL, NULL, NULL); - gst_object_unref(filter->bus); - } + wg_parser_destroy(filter->wg_parser); pthread_cond_destroy(&filter->read_cond); pthread_cond_destroy(&filter->read_done_cond); @@ -1966,6 +1981,17 @@ static void parser_init_common(struct parser *object) object->flushing = true; } +static struct wg_parser *wg_parser_create(void) +{ + struct wg_parser *parser; + + if (!(parser = calloc(1, sizeof(*parser)))) + return NULL; + + TRACE("Created winegstreamer parser %p.\n", parser); + return parser; +} + HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) { struct parser *object; @@ -1978,6 +2004,12 @@ HRESULT decodebin_parser_create(IUnknown *outer, IUnknown **out) if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; + if (!(object->wg_parser = wg_parser_create())) + { + heap_free(object); + return E_OUTOFMEMORY; + } + parser_init_common(object); strmbase_filter_init(&object->filter, outer, &CLSID_decodebin_parser, &filter_ops); @@ -2632,6 +2664,12 @@ HRESULT wave_parser_create(IUnknown *outer, IUnknown **out) if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; + if (!(object->wg_parser = wg_parser_create())) + { + heap_free(object); + return E_OUTOFMEMORY; + } + parser_init_common(object); strmbase_filter_init(&object->filter, outer, &CLSID_WAVEParser, &filter_ops); @@ -2745,6 +2783,12 @@ HRESULT avi_splitter_create(IUnknown *outer, IUnknown **out) if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; + if (!(object->wg_parser = wg_parser_create())) + { + heap_free(object); + return E_OUTOFMEMORY; + } + parser_init_common(object); strmbase_filter_init(&object->filter, outer, &CLSID_AviSplitter, &filter_ops); @@ -2889,6 +2933,12 @@ HRESULT mpeg_splitter_create(IUnknown *outer, IUnknown **out) if (!(object = heap_alloc_zero(sizeof(*object)))) return E_OUTOFMEMORY; + if (!(object->wg_parser = wg_parser_create())) + { + heap_free(object); + return E_OUTOFMEMORY; + } + parser_init_common(object); strmbase_filter_init(&object->filter, outer, &CLSID_MPEG1Splitter, &mpeg_splitter_ops); -- 2.30.0

1 4

[PATCH 1/4] widl: Support WinRT flags attribute parsing.
by Rémi Bernon Jan. 29, 2021

Jan. 29, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/widl/parser.l | 1 + tools/widl/parser.y | 3 +++ tools/widl/widltypes.h | 1 + 3 files changed, 5 insertions(+) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 6bbfed5e80b..450d92f5926 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -362,6 +362,7 @@ static const struct keyword attr_keywords[] = {"exclusiveto", tEXCLUSIVETO, 1}, {"explicit_handle", tEXPLICITHANDLE, 0}, {"fault_status", tFAULTSTATUS, 0}, + {"flags", tFLAGS, 1}, {"force_allocate", tFORCEALLOCATE, 0}, {"free", tFREE, 0}, {"handle", tHANDLE, 0}, diff --git a/tools/widl/parser.y b/tools/widl/parser.y index d12caa06b63..ef54bf13ded 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -201,6 +201,7 @@ static typelib_t *current_typelib; %token tEXPLICITHANDLE tEXTERN %token tFALSE %token tFASTCALL tFAULTSTATUS +%token tFLAGS %token tFLOAT tFORCEALLOCATE %token tHANDLE %token tHANDLET @@ -576,6 +577,7 @@ attribute: { $$ = NULL; } $$ = make_attrp(ATTR_EXCLUSIVETO, $3->type); } | tEXPLICITHANDLE { $$ = make_attr(ATTR_EXPLICIT_HANDLE); } | tFAULTSTATUS { $$ = make_attr(ATTR_FAULTSTATUS); } + | tFLAGS { $$ = make_attr(ATTR_FLAGS); } | tFORCEALLOCATE { $$ = make_attr(ATTR_FORCEALLOCATE); } | tHANDLE { $$ = make_attr(ATTR_HANDLE); } | tHELPCONTEXT '(' expr_int_const ')' { $$ = make_attrp(ATTR_HELPCONTEXT, $3); } @@ -2259,6 +2261,7 @@ struct allowed_attr allowed_attr[] = /* ATTR_EXCLUSIVETO */ { 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "exclusive_to" }, /* ATTR_EXPLICIT_HANDLE */ { 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "explicit_handle" }, /* ATTR_FAULTSTATUS */ { 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "fault_status" }, + /* ATTR_FLAGS */ { 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "flags" }, /* ATTR_FORCEALLOCATE */ { 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "force_allocate" }, /* ATTR_HANDLE */ { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "handle" }, /* ATTR_HELPCONTEXT */ { 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 0, 0, "helpcontext" }, diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 46a44dac039..7b634c82242 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -106,6 +106,7 @@ enum attr_type ATTR_EXCLUSIVETO, ATTR_EXPLICIT_HANDLE, ATTR_FAULTSTATUS, + ATTR_FLAGS, ATTR_FORCEALLOCATE, ATTR_HANDLE, ATTR_HELPCONTEXT, -- 2.30.0

3 9

[PATCH 1/4] d3d11/tests: Add more SwapDeviceContextState tests.
by Rémi Bernon Jan. 29, 2021

Jan. 29, 2021

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- This basically shows that the initial plan is a dead-end, and that I'll have to implement device context swap through wined3d_state swapping instead. So, just sending the tests for now. dlls/d3d11/tests/d3d11.c | 79 +++++++++++++++++++++++++++++++++++----- 1 file changed, 69 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 7220be73ac7..20bf62b792e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6673,19 +6673,19 @@ static void test_device_context_state(void) 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, }; - ID3DDeviceContextState *context_state, *previous_context_state; + ID3DDeviceContextState *context_state, *previous_context_state, *tmp_context_state, *context_state2; ID3D11SamplerState *sampler, *tmp_sampler; D3D11_SHADER_RESOURCE_VIEW_DESC srv_desc; ID3D11ShaderResourceView *tmp_srv, *srv; D3D11_DEVICE_CONTEXT_TYPE context_type; - ID3D11DeviceContext1 *context = NULL; + ID3D11DeviceContext1 *context = NULL, *context2; D3D11_SAMPLER_DESC sampler_desc; D3D_FEATURE_LEVEL feature_level; ID3D11GeometryShader *tmp_gs, *gs; - ID3D11VertexShader *tmp_vs, *vs; + ID3D11VertexShader *tmp_vs, *vs, *vs2; ID3D11PixelShader *tmp_ps, *ps; - ID3D11Device *d3d11_device; - ID3D11Device1 *device; + ID3D11Device *d3d11_device, *d3d11_device2; + ID3D11Device1 *device, *device2; struct vec4 constant; ID3D11Buffer *cb, *srvb, *tmp_cb; ULONG refcount; @@ -6809,6 +6809,8 @@ static void test_device_context_state(void) ID3D11DeviceContext1_VSSetSamplers(context, 0, 1, &sampler); ID3D11DeviceContext1_VSSetShader(context, vs, NULL, 0); ID3D11DeviceContext1_VSSetShaderResources(context, 0, 1, &srv); + refcount = get_refcount(vs); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); ID3D11DeviceContext1_GSSetConstantBuffers(context, 0, 1, &cb); ID3D11DeviceContext1_GSSetSamplers(context, 0, 1, &sampler); @@ -6820,11 +6822,15 @@ static void test_device_context_state(void) ID3D11DeviceContext1_PSSetShader(context, ps, NULL, 0); ID3D11DeviceContext1_PSSetShaderResources(context, 0, 1, &srv); + previous_context_state = (ID3DDeviceContextState *)0xdeadbeef; + ID3D11DeviceContext1_SwapDeviceContextState(context, NULL, &previous_context_state); + todo_wine ok(previous_context_state == NULL, "Got unexpected state pointer.\n"); + if (previous_context_state) ID3DDeviceContextState_Release(previous_context_state); previous_context_state = NULL; ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, &previous_context_state); - refcount = ID3DDeviceContextState_Release(context_state); - ok(!refcount, "Got refcount %u, expected 0.\n", refcount); ok(previous_context_state != NULL, "Failed to get previous context state\n"); + refcount = get_refcount(vs); + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); context_type = ID3D11DeviceContext1_GetType(context); ok(context_type == D3D11_DEVICE_CONTEXT_IMMEDIATE, "Unexpected context type %u.\n", context_type); @@ -6868,11 +6874,64 @@ static void test_device_context_state(void) ID3D11DeviceContext1_PSGetShaderResources(context, 0, 1, &tmp_srv); ok(!tmp_srv, "Got unexpected srv %p.\n", tmp_srv); - ID3D11DeviceContext1_SwapDeviceContextState(context, previous_context_state, &context_state); - refcount = ID3DDeviceContextState_Release(context_state); - ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + /* updating the device context should also update the device context state */ + hr = ID3D11Device1_CreateVertexShader(device, simple_vs, sizeof(simple_vs), NULL, &vs2); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + ID3D11DeviceContext1_VSSetShader(context, vs2, NULL, 0); + ID3D11DeviceContext1_SwapDeviceContextState(context, context_state, &tmp_context_state); + refcount = ID3DDeviceContextState_Release(tmp_context_state); + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + todo_wine ok(tmp_context_state == context_state, "Got unexpected state pointer.\n"); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); + todo_wine ok(tmp_vs == vs2, "Got shader %p, expected %p.\n", tmp_vs, vs2); + if (tmp_vs) refcount = ID3D11VertexShader_Release(tmp_vs); + else refcount = 0; + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + + /* context states may be used with other devices instances too */ + d3d11_device2 = create_device(NULL); + ok(!!d3d11_device2, "Failed to create device.\n"); + hr = ID3D11Device_QueryInterface(d3d11_device2, &IID_ID3D11Device1, (void **)&device2); + ok(SUCCEEDED(hr), "Failed to query device interface, hr %#x.\n", hr); + ID3D11Device_Release(d3d11_device2); + ID3D11Device1_GetImmediateContext1(device2, &context2); + ok(!!context2, "Failed to get immediate context.\n"); + + ID3D11DeviceContext1_SwapDeviceContextState(context2, context_state, &tmp_context_state); + ok(!!tmp_context_state, "Failed to get context state.\n"); + tmp_vs = (ID3D11VertexShader *)0xdeadbeef; + ID3D11DeviceContext1_VSGetShader(context, &tmp_vs, NULL, NULL); + todo_wine ok(tmp_vs == vs2, "Got shader %p, expected %p.\n", tmp_vs, vs2); + if (tmp_vs) refcount = ID3D11VertexShader_Release(tmp_vs); + else refcount = 0; + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + ID3D11DeviceContext1_SwapDeviceContextState(context2, tmp_context_state, &context_state2); + refcount = ID3DDeviceContextState_Release(tmp_context_state); + ok(refcount == 0, "Got refcount %u, expected 1.\n", refcount); + refcount = ID3DDeviceContextState_Release(context_state2); + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + todo_wine ok(context_state2 == context_state, "Got unexpected state pointer.\n"); + + refcount = ID3D11DeviceContext1_Release(context2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + refcount = ID3D11Device1_Release(device2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + + ID3D11DeviceContext1_VSSetShader(context, NULL, NULL, 0); + refcount = ID3D11VertexShader_Release(vs2); + ok(refcount == 0, "Got refcount %u, expected 0.\n", refcount); + + ID3D11DeviceContext1_SwapDeviceContextState(context, previous_context_state, &tmp_context_state); refcount = ID3DDeviceContextState_Release(previous_context_state); ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + refcount = ID3DDeviceContextState_Release(tmp_context_state); + todo_wine ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); + refcount = ID3DDeviceContextState_Release(context_state); + ok(!refcount, "Got refcount %u, expected 0.\n", refcount); + todo_wine ok(tmp_context_state == context_state, "Got unexpected state pointer.\n"); + refcount = get_refcount(vs); + ok(refcount == 1, "Got refcount %u, expected 1.\n", refcount); /* ID3DDeviceContextState retains the previous state. */ -- 2.30.0

4 12

[PATCH] d2d1/tests: Remove superfluous cast to self
by Michael Stefaniuc Jan. 29, 2021

Jan. 29, 2021

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3e7df715dda..7c1ff9dc197 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -412,7 +412,7 @@ static void get_d3d11_surface_readback(IDXGISurface *surface, struct resource_re ID3D11Resource_Release(src_resource); ID3D11Device_Release(device); - hr = ID3D11DeviceContext_Map(context, (ID3D11Resource *)rb->u.d3d11_resource, 0, D3D11_MAP_READ, 0, &map_desc); + hr = ID3D11DeviceContext_Map(context, rb->u.d3d11_resource, 0, D3D11_MAP_READ, 0, &map_desc); ok(SUCCEEDED(hr), "Failed to map texture, hr %#x.\n", hr); ID3D11DeviceContext_Release(context); -- 2.26.2

2 1

[PATCH] ddraw: Remove superfluous cast to self
by Michael Stefaniuc Jan. 29, 2021

Jan. 29, 2021

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 3f1fe08c11e..4d24c22650e 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3179,8 +3179,7 @@ static HRESULT WINAPI d3d_device3_SetTransform(IDirect3DDevice3 *iface, wined3d_mutex_lock(); multiply_matrix(&projection, &device->legacy_clipspace, (struct wined3d_matrix *)matrix); - wined3d_stateblock_set_transform(device->state, - WINED3D_TS_PROJECTION, (struct wined3d_matrix *)&projection); + wined3d_stateblock_set_transform(device->state, WINED3D_TS_PROJECTION, &projection); memcpy(&device->legacy_projection, matrix, sizeof(*matrix)); wined3d_mutex_unlock(); -- 2.26.2

3 2

[PATCH] wined3d: Implement global resource memory barriers.
by Zebediah Figura Jan. 29, 2021

Jan. 29, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Used by "Atelier Lydie & Suelle ~The Alchemists and the Mysterious Paintings~". dlls/wined3d/glsl_shader.c | 6 ++++++ dlls/wined3d/shader.c | 5 +++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 12 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c68bb2e9b06..605dc130e0c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5744,6 +5744,12 @@ static void shader_glsl_sync(const struct wined3d_shader_instruction *ins) sync_flags &= ~WINED3DSSF_GROUP_SHARED_MEMORY; } + if (sync_flags & WINED3DSSF_GLOBAL_UAV) + { + shader_addline(buffer, "memoryBarrier();\n"); + sync_flags &= ~WINED3DSSF_GLOBAL_UAV; + } + if (sync_flags) FIXME("Unhandled sync flags %#x.\n", sync_flags); } diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 8843e6883fc..9052d217148 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1910,6 +1910,11 @@ static void shader_dump_global_flags(struct wined3d_string_buffer *buffer, DWORD static void shader_dump_sync_flags(struct wined3d_string_buffer *buffer, DWORD sync_flags) { + if (sync_flags & WINED3DSSF_GLOBAL_UAV) + { + shader_addline(buffer, "_uglobal"); + sync_flags &= ~WINED3DSSF_GLOBAL_UAV; + } if (sync_flags & WINED3DSSF_GROUP_SHARED_MEMORY) { shader_addline(buffer, "_g"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b3934f0d8e4..4fcfd2fb7c7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -656,6 +656,7 @@ enum wined3d_shader_sync_flags { WINED3DSSF_THREAD_GROUP = 0x1, WINED3DSSF_GROUP_SHARED_MEMORY = 0x2, + WINED3DSSF_GLOBAL_UAV = 0x8, }; enum wined3d_shader_uav_flags -- 2.29.2

2 1