December 2019 - Wine-Commits

Zebediah Figura : d3d8: Use wined3d_stateblock_get_state() in d3d8_device_GetRenderState().
by Alexandre Julliard Dec. 2, 2019

Dec. 2, 2019

Module: wine Branch: master Commit: 2b0fd0cf16db6026f17b0ade5244b3f1f01ce5aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b0fd0cf16db6026f17b0ade… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 27 23:53:40 2019 -0600 d3d8: Use wined3d_stateblock_get_state() in d3d8_device_GetRenderState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 89cdb4e14b..62c75baae0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1875,18 +1875,20 @@ static HRESULT WINAPI d3d8_device_GetRenderState(IDirect3DDevice8 *iface, D3DRENDERSTATETYPE state, DWORD *value) { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); + const struct wined3d_stateblock_state *device_state; TRACE("iface %p, state %#x, value %p.\n", iface, state, value); wined3d_mutex_lock(); + device_state = wined3d_stateblock_get_state(device->state); switch (state) { case D3DRS_ZBIAS: - *value = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS); + *value = device_state->rs[WINED3D_RS_DEPTHBIAS]; break; default: - *value = wined3d_device_get_render_state(device->wined3d_device, state); + *value = device_state->rs[state]; } wined3d_mutex_unlock();

1 0

Hans Leidekker : wusa: Add support for extracting MSU files.
by Alexandre Julliard Dec. 2, 2019

Dec. 2, 2019

Module: wine Branch: master Commit: 9934b25313e1a54ea3bd96b38c748ba86ab3fb5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9934b25313e1a54ea3bd96b3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 2 10:11:49 2019 +0100 wusa: Add support for extracting MSU files. Based on patches by Michael Müller and Sebastian Lackner. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wusa/Makefile.in | 1 + programs/wusa/main.c | 369 +++++++++++++++++++++++++++++++++++++++++++++- programs/wusa/wusa.h | 62 ++++++++ 3 files changed, 427 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9934b25313e1a54ea3bd…

1 0

Ethan Lee : wined3d: Add Intel HD 615 PCI id and device description.
by Alexandre Julliard Dec. 2, 2019

Dec. 2, 2019

Module: wine Branch: master Commit: 46556c2f8c0a94263e87af2d9d0ba20d54e0e2ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=46556c2f8c0a94263e87af2d… Author: Ethan Lee <elee(a)codeweavers.com> Date: Fri Nov 29 12:46:56 2019 -0500 wined3d: Add Intel HD 615 PCI id and device description. Signed-off-by: Ethan Lee <elee(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 902cc444ce..12b53f7577 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -565,6 +565,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IPP580_2, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_UHD617, "Intel(R) UHD Graphics 617", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_UHD620, "Intel(R) UHD Graphics 620", DRIVER_INTEL_HD4000, 3072}, + {HW_VENDOR_INTEL, CARD_INTEL_HD615, "Intel(R) HD Graphics 615", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD620, "Intel(R) HD Graphics 620", DRIVER_INTEL_HD4000, 3072}, {HW_VENDOR_INTEL, CARD_INTEL_HD630_1, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, {HW_VENDOR_INTEL, CARD_INTEL_HD630_2, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3ae7dab858..686a518e1c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2640,6 +2640,7 @@ enum wined3d_pci_device CARD_INTEL_IPP580_2 = 0x193d, CARD_INTEL_UHD617 = 0x87c0, CARD_INTEL_UHD620 = 0x3ea0, + CARD_INTEL_HD615 = 0x591e, CARD_INTEL_HD620 = 0x5916, CARD_INTEL_HD630_1 = 0x5912, CARD_INTEL_HD630_2 = 0x591b,

1 0

Jactry Zeng : sapi: Add IConnectionPointContainer stub for ISpVoice.
by Alexandre Julliard Dec. 2, 2019

Dec. 2, 2019

Module: wine Branch: master Commit: e31b56b578abbc0657a80731d03aedd7b4fa65b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e31b56b578abbc0657a80731… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Nov 18 10:18:21 2019 +0800 sapi: Add IConnectionPointContainer stub for ISpVoice. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/tests/tts.c | 8 +++++++ dlls/sapi/tts.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/dlls/sapi/tests/tts.c b/dlls/sapi/tests/tts.c index e4b4e79943..26d13ec96a 100644 --- a/dlls/sapi/tests/tts.c +++ b/dlls/sapi/tests/tts.c @@ -37,6 +37,7 @@ static void _expect_ref(IUnknown *obj, ULONG ref, int line) static void test_interfaces(void) { ISpeechVoice *speech_voice, *speech_voice2; + IConnectionPointContainer *container; ISpVoice *spvoice, *spvoice2; IDispatch *dispatch; IUnknown *unk; @@ -82,6 +83,13 @@ static void test_interfaces(void) ISpVoice_Release(spvoice2); ISpVoice_Release(spvoice); + hr = ISpeechVoice_QueryInterface(speech_voice, &IID_IConnectionPointContainer, + (void **)&container); + ok(hr == S_OK, "ISpeechVoice_QueryInterface failed: %#x.\n", hr); + EXPECT_REF(speech_voice, 2); + EXPECT_REF(container, 2); + IConnectionPointContainer_Release(container); + ISpeechVoice_Release(speech_voice); } diff --git a/dlls/sapi/tts.c b/dlls/sapi/tts.c index 8f1ecd1894..584c3d56b7 100644 --- a/dlls/sapi/tts.c +++ b/dlls/sapi/tts.c @@ -38,6 +38,7 @@ struct speech_voice { ISpeechVoice ISpeechVoice_iface; ISpVoice ISpVoice_iface; + IConnectionPointContainer IConnectionPointContainer_iface; LONG ref; }; @@ -51,6 +52,11 @@ static inline struct speech_voice *impl_from_ISpVoice(ISpVoice *iface) return CONTAINING_RECORD(iface, struct speech_voice, ISpVoice_iface); } +static inline struct speech_voice *impl_from_IConnectionPointContainer(IConnectionPointContainer *iface) +{ + return CONTAINING_RECORD(iface, struct speech_voice, IConnectionPointContainer_iface); +} + /* ISpeechVoice interface */ static HRESULT WINAPI speech_voice_QueryInterface(ISpeechVoice *iface, REFIID iid, void **obj) { @@ -64,6 +70,8 @@ static HRESULT WINAPI speech_voice_QueryInterface(ISpeechVoice *iface, REFIID ii *obj = &This->ISpeechVoice_iface; else if (IsEqualIID(iid, &IID_ISpVoice)) *obj = &This->ISpVoice_iface; + else if (IsEqualIID(iid, &IID_IConnectionPointContainer)) + *obj = &This->IConnectionPointContainer_iface; else { *obj = NULL; @@ -726,6 +734,59 @@ static const ISpVoiceVtbl spvoice_vtbl = spvoice_DisplayUI }; +/* IConnectionPointContainer interface */ +static HRESULT WINAPI container_QueryInterface(IConnectionPointContainer *iface, REFIID iid, void **obj) +{ + struct speech_voice *This = impl_from_IConnectionPointContainer(iface); + + TRACE("(%p, %s %p).\n", iface, debugstr_guid(iid), obj); + + return ISpeechVoice_QueryInterface(&This->ISpeechVoice_iface, iid, obj); +} + +static ULONG WINAPI container_AddRef(IConnectionPointContainer *iface) +{ + struct speech_voice *This = impl_from_IConnectionPointContainer(iface); + + TRACE("(%p).\n", iface); + + return ISpeechVoice_AddRef(&This->ISpeechVoice_iface); +} + +static ULONG WINAPI container_Release(IConnectionPointContainer *iface) +{ + struct speech_voice *This = impl_from_IConnectionPointContainer(iface); + + TRACE("(%p).\n", iface); + + return ISpeechVoice_Release(&This->ISpeechVoice_iface); +} + +static HRESULT WINAPI container_EnumConnectionPoints(IConnectionPointContainer *iface, + IEnumConnectionPoints **enum_cp) +{ + FIXME("(%p, %p): stub.\n", iface, enum_cp); + + return E_NOTIMPL; +} + +static HRESULT WINAPI container_FindConnectionPoint(IConnectionPointContainer *iface, REFIID riid, + IConnectionPoint **cp) +{ + FIXME("(%p, %s, %p): stub.\n", iface, debugstr_guid(riid), cp); + + return E_NOTIMPL; +} + +const static IConnectionPointContainerVtbl container_vtbl = +{ + container_QueryInterface, + container_AddRef, + container_Release, + container_EnumConnectionPoints, + container_FindConnectionPoint +}; + HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj) { struct speech_voice *This = heap_alloc(sizeof(*This)); @@ -734,6 +795,7 @@ HRESULT speech_voice_create(IUnknown *outer, REFIID iid, void **obj) if (!This) return E_OUTOFMEMORY; This->ISpeechVoice_iface.lpVtbl = &speech_voice_vtbl; This->ISpVoice_iface.lpVtbl = &spvoice_vtbl; + This->IConnectionPointContainer_iface.lpVtbl = &container_vtbl; This->ref = 1; hr = ISpeechVoice_QueryInterface(&This->ISpeechVoice_iface, iid, obj);

1 0

Zebediah Figura : d3d9: Use wined3d_stateblock_get_state() in d3d9_device_GetRenderState().
by Alexandre Julliard Dec. 2, 2019

Dec. 2, 2019

Module: wine Branch: master Commit: 9af3f8f68440e7e1b459b23ec6d3ee17655f0be4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9af3f8f68440e7e1b459b23e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 27 23:53:39 2019 -0600 d3d9: Use wined3d_stateblock_get_state() in d3d9_device_GetRenderState(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 2d66c56993..51b7f4d6f5 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2329,6 +2329,7 @@ static HRESULT WINAPI d3d9_device_GetRenderState(IDirect3DDevice9Ex *iface, D3DRENDERSTATETYPE state, DWORD *value) { struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); + const struct wined3d_stateblock_state *device_state; struct wined3d_color factor; TRACE("iface %p, state %#x, value %p.\n", iface, state, value); @@ -2344,7 +2345,8 @@ static HRESULT WINAPI d3d9_device_GetRenderState(IDirect3DDevice9Ex *iface, } wined3d_mutex_lock(); - *value = wined3d_device_get_render_state(device->wined3d_device, state); + device_state = wined3d_stateblock_get_state(device->state); + *value = device_state->rs[state]; wined3d_mutex_unlock(); return D3D_OK;

1 0

Andrey Gusev : dxgi/tests: Fix a typo in ok() message.
by Alexandre Julliard Dec. 2, 2019

Dec. 2, 2019

Module: wine Branch: master Commit: 4fbdfc604b1852eddd0bca116aedf4f738ac1306 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fbdfc604b1852eddd0bca11… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Nov 29 11:43:52 2019 +0200 dxgi/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 874c39b88e..b2b53f7a4c 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2151,7 +2151,7 @@ static void test_get_containing_output(void) { ret = SetWindowPos(swapchain_desc.OutputWindow, 0, points[i].x, points[i].y, 0, 0, SWP_NOSIZE | SWP_NOZORDER); - ok(ret, "Faled to set window position.\n"); + ok(ret, "Failed to set window position.\n"); monitor = MonitorFromWindow(swapchain_desc.OutputWindow, MONITOR_DEFAULTTONEAREST); ok(!!monitor, "Failed to get monitor from window.\n");

1 0

Hans Leidekker : wusa: Parse assembly manifests.
by Alexandre Julliard Dec. 2, 2019

Dec. 2, 2019

Module: wine Branch: master Commit: bf46a167114ce24712c56a9c050ed216dfeaf671 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf46a167114ce24712c56a9c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 2 10:11:50 2019 +0100 wusa: Parse assembly manifests. Based on patches by Michael Müller and Sebastian Lackner. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wusa/Makefile.in | 5 +- programs/wusa/main.c | 87 +++++++ programs/wusa/manifest.c | 567 ++++++++++++++++++++++++++++++++++++++++++++++ programs/wusa/wusa.h | 65 ++++++ 4 files changed, 722 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bf46a167114ce24712c5…

1 0

Hans Leidekker : wusa: Parse update descriptions.
by Alexandre Julliard Dec. 2, 2019

Dec. 2, 2019

Module: wine Branch: master Commit: 45b59c85cae39d6d658aa8aea2ba3921dcf6d55c URL: https://source.winehq.org/git/wine.git/?a=commit;h=45b59c85cae39d6d658aa8ae… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 2 10:11:51 2019 +0100 wusa: Parse update descriptions. Based on patches by Michael Müller and Sebastian Lackner. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wusa/main.c | 46 ++++++++++++++++++++ programs/wusa/manifest.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++ programs/wusa/wusa.h | 2 + 3 files changed, 154 insertions(+) diff --git a/programs/wusa/main.c b/programs/wusa/main.c index a1cdea4ee8..8df8731e2b 100644 --- a/programs/wusa/main.c +++ b/programs/wusa/main.c @@ -41,6 +41,7 @@ struct installer_state BOOL quiet; struct list tempdirs; struct list assemblies; + struct list updates; }; static void * CDECL cabinet_alloc(ULONG cb) @@ -317,6 +318,7 @@ static void installer_cleanup(struct installer_state *state) { struct installer_tempdir *tempdir, *tempdir2; struct assembly_entry *assembly, *assembly2; + struct dependency_entry *dependency, *dependency2; LIST_FOR_EACH_ENTRY_SAFE(tempdir, tempdir2, &state->tempdirs, struct installer_tempdir, entry) { @@ -330,6 +332,11 @@ static void installer_cleanup(struct installer_state *state) list_remove(&assembly->entry); free_assembly(assembly); } + LIST_FOR_EACH_ENTRY_SAFE(dependency, dependency2, &state->updates, struct dependency_entry, entry) + { + list_remove(&dependency->entry); + free_dependency(dependency); + } } static BOOL str_ends_with(const WCHAR *str, const WCHAR *suffix) @@ -397,6 +404,7 @@ static BOOL install_msu(const WCHAR *filename, struct installer_state *state) list_init(&state->tempdirs); list_init(&state->assemblies); + list_init(&state->updates); CoInitialize(NULL); TRACE("Processing msu file %s\n", debugstr_w(filename)); @@ -428,6 +436,44 @@ static BOOL install_msu(const WCHAR *filename, struct installer_state *state) FindClose(search); } + /* load all update descriptions */ + if (!(path = path_combine(temp_path, L"*.xml"))) goto done; + search = FindFirstFileW(path, &data); + heap_free(path); + + if (search != INVALID_HANDLE_VALUE) + { + do + { + if (data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) continue; + if (!(path = path_combine(temp_path, data.cFileName))) continue; + if (!load_update(path, &state->updates)) + ERR("Failed to load all updates from %s, ignoring\n", debugstr_w(path)); + heap_free(path); + } + while (FindNextFileW(search, &data)); + FindClose(search); + } + + /* dump package information (for debugging) */ + if (TRACE_ON(wusa)) + { + struct dependency_entry *dependency; + struct assembly_entry *assembly; + + TRACE("List of updates:\n"); + LIST_FOR_EACH_ENTRY(dependency, &state->updates, struct dependency_entry, entry) + TRACE(" * %s\n", debugstr_w(dependency->identity.name)); + + TRACE("List of manifests (with dependencies):\n"); + LIST_FOR_EACH_ENTRY(assembly, &state->assemblies, struct assembly_entry, entry) + { + TRACE(" * %s\n", debugstr_w(assembly->identity.name)); + LIST_FOR_EACH_ENTRY(dependency, &assembly->dependencies, struct dependency_entry, entry) + TRACE(" -> %s\n", debugstr_w(dependency->identity.name)); + } + } + ret = TRUE; done: diff --git a/programs/wusa/manifest.c b/programs/wusa/manifest.c index 44c263f6c0..e80c11998c 100644 --- a/programs/wusa/manifest.c +++ b/programs/wusa/manifest.c @@ -565,3 +565,109 @@ done: IXMLDOMElement_Release(root); return entry; } + +/* <unattend><servicing><package> */ +static BOOL read_update_package(IXMLDOMElement *child, WCHAR *tagname, void *context) +{ + struct dependency_entry *entry; + struct list *update_list = context; + + if (!wcscmp(tagname, L"source")) return TRUE; + if (wcscmp(tagname, L"assemblyIdentity")) + { + TRACE("Ignoring unexpected tag %s\n", debugstr_w(tagname)); + return TRUE; + } + + if ((entry = alloc_dependency())) + { + if (read_identity(child, &entry->identity)) + { + TRACE("Found update %s\n", debugstr_w(entry->identity.name)); + list_add_tail(update_list, &entry->entry); + return TRUE; + } + free_dependency(entry); + } + + return FALSE; +} + +static BOOL iter_update_package(IXMLDOMElement *root, struct list *update_list) +{ + return call_xml_callbacks(root, read_update_package, update_list); +} + +/* <unattend><servicing> */ +static BOOL read_servicing(IXMLDOMElement *child, WCHAR *tagname, void *context) +{ + struct list *update_list = context; + WCHAR *action; + BOOL ret = TRUE; + + if (wcscmp(tagname, L"package")) + { + FIXME("Ignoring unexpected tag %s\n", debugstr_w(tagname)); + return TRUE; + } + + if (!(action = get_xml_attribute(child, L"action"))) + { + FIXME("Servicing tag doesn't specify action\n"); + return FALSE; + } + + if (!wcscmp(action, L"install")) + ret = iter_update_package(child, update_list); + else + FIXME("action %s not supported\n", debugstr_w(action)); + + heap_free(action); + return ret; +} + +static BOOL iter_servicing(IXMLDOMElement *root, struct list *update_list) +{ + return call_xml_callbacks(root, read_servicing, update_list); +} + +/* <unattend> */ +static BOOL read_unattend(IXMLDOMElement *child, WCHAR *tagname, void *context) +{ + struct list *update_list = context; + + if (wcscmp(tagname, L"servicing")) + { + FIXME("Ignoring unexpected tag %s\n", debugstr_w(tagname)); + return TRUE; + } + + return iter_servicing(child, update_list); + +} + +static BOOL iter_unattend(IXMLDOMElement *root, struct list *update_list) +{ + return call_xml_callbacks(root, read_unattend, update_list); +} + +BOOL load_update(const WCHAR *filename, struct list *update_list) +{ + IXMLDOMElement *root = NULL; + BOOL ret = FALSE; + + TRACE("Reading update %s\n", debugstr_w(filename)); + + if (!(root = load_xml(filename))) return FALSE; + if (!check_xml_tagname(root, L"unattend")) + { + FIXME("Didn't find unattend root node?\n"); + goto done; + } + + ret = iter_unattend(root, update_list); + +done: + IXMLDOMElement_Release(root); + return ret; +} diff --git a/programs/wusa/wusa.h b/programs/wusa/wusa.h index 2c81b639b9..e717fad6e0 100644 --- a/programs/wusa/wusa.h +++ b/programs/wusa/wusa.h @@ -74,7 +74,9 @@ struct assembly_entry }; void free_assembly(struct assembly_entry *entry) DECLSPEC_HIDDEN; +void free_dependency(struct dependency_entry *entry) DECLSPEC_HIDDEN; struct assembly_entry *load_manifest(const WCHAR *filename) DECLSPEC_HIDDEN; +BOOL load_update(const WCHAR *filename, struct list *update_list) DECLSPEC_HIDDEN; static void *heap_alloc(size_t len) __WINE_ALLOC_SIZE(1); static inline void *heap_alloc(size_t len)

1 0

Hans Leidekker : wusa: Install updates.
by Alexandre Julliard Dec. 2, 2019

Dec. 2, 2019

Module: wine Branch: master Commit: dbfd99e177841bdf722a90b45a24b823912acf9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=dbfd99e177841bdf722a90b4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 2 10:11:52 2019 +0100 wusa: Install updates. Based on patches by Michael Müller and Sebastian Lackner. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wusa/Makefile.in | 2 +- programs/wusa/main.c | 562 ++++++++++++++++++++++++++++++++++++++++++++++ programs/wusa/wusa.h | 19 ++ 3 files changed, 582 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dbfd99e177841bdf722a…

1 0

Paul Gofman : wined3d: Support stretching compressed format surfaces in surface_cpu_blt().
by Alexandre Julliard Dec. 2, 2019

Dec. 2, 2019

Module: wine Branch: master Commit: cf2bd824e27caea4aebd9b060e3cd383e17eaa87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf2bd824e27caea4aebd9b06… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Dec 2 16:27:10 2019 +0300 wined3d: Support stretching compressed format surfaces in surface_cpu_blt(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 82 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 61 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 47f2e5e5f0..5ccdb506e4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1643,6 +1643,7 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int unsigned int texture_level; HRESULT hr = WINED3D_OK; BOOL same_sub_resource; + BOOL upload = FALSE; DWORD map_binding; const BYTE *sbase; const BYTE *sbuf; @@ -1663,6 +1664,11 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int if (wined3d_format_is_typeless(dst_format) && dst_format->id == src_format->typeless_id) dst_format = src_format; + src_height = src_box->bottom - src_box->top; + src_width = src_box->right - src_box->left; + dst_height = dst_box->bottom - dst_box->top; + dst_width = dst_box->right - dst_box->left; + dst_range.offset = 0; dst_range.size = dst_texture->sub_resources[dst_sub_resource_idx].size; if (src_texture == dst_texture && src_sub_resource_idx == dst_sub_resource_idx) @@ -1684,6 +1690,15 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int else { same_sub_resource = FALSE; + upload = dst_format->flags[dst_texture->resource.gl_type] & WINED3DFMT_FLAG_BLOCKS + && (dst_width != src_width || dst_height != src_height); + + if (upload) + { + dst_format = src_format->flags[dst_texture->resource.gl_type] & WINED3DFMT_FLAG_BLOCKS + ? wined3d_get_format(device->adapter, WINED3DFMT_B8G8R8A8_UNORM, 0) : src_format; + } + if (!(flags & WINED3D_BLT_RAW) && dst_format->id != src_format->id) { if (!(converted_texture = surface_convert_format(src_texture, src_sub_resource_idx, dst_format))) @@ -1707,25 +1722,31 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int src_map.data = wined3d_context_map_bo_address(context, &src_data, src_texture->sub_resources[src_sub_resource_idx].size, 0, WINED3D_MAP_READ); - map_binding = dst_texture->resource.map_binding; - texture_level = dst_sub_resource_idx % dst_texture->level_count; - if (!wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, map_binding)) - ERR("Failed to load the destination sub-resource into %s.\n", wined3d_debug_location(map_binding)); - wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~map_binding); - wined3d_texture_get_pitch(dst_texture, texture_level, &dst_map.row_pitch, &dst_map.slice_pitch); - wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &dst_data, map_binding); - dst_map.data = wined3d_context_map_bo_address(context, &dst_data, - dst_texture->sub_resources[dst_sub_resource_idx].size, 0, WINED3D_MAP_WRITE); + if (upload) + { + wined3d_format_calculate_pitch(dst_format, 1, dst_box->right, dst_box->bottom, + &dst_map.row_pitch, &dst_map.slice_pitch); + dst_map.data = heap_alloc(dst_map.slice_pitch); + } + else + { + map_binding = dst_texture->resource.map_binding; + texture_level = dst_sub_resource_idx % dst_texture->level_count; + if (!wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, map_binding)) + ERR("Failed to load the destination sub-resource into %s.\n", wined3d_debug_location(map_binding)); + + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~map_binding); + wined3d_texture_get_pitch(dst_texture, texture_level, &dst_map.row_pitch, &dst_map.slice_pitch); + wined3d_texture_get_memory(dst_texture, dst_sub_resource_idx, &dst_data, map_binding); + dst_map.data = wined3d_context_map_bo_address(context, &dst_data, + dst_texture->sub_resources[dst_sub_resource_idx].size, 0, WINED3D_MAP_WRITE); + } } src_fmt_flags = src_format->flags[src_texture->resource.gl_type]; dst_fmt_flags = dst_format->flags[dst_texture->resource.gl_type]; flags &= ~WINED3D_BLT_RAW; bpp = dst_format->byte_count; - src_height = src_box->bottom - src_box->top; - src_width = src_box->right - src_box->left; - dst_height = dst_box->bottom - dst_box->top; - dst_width = dst_box->right - dst_box->left; row_byte_count = dst_width * bpp; sbase = (BYTE *)src_map.data @@ -1746,13 +1767,6 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int goto release; } - if (src_height != dst_height || src_width != dst_width) - { - WARN("Stretching not supported on compressed surfaces.\n"); - hr = WINED3DERR_INVALIDCALL; - goto release; - } - hr = surface_cpu_blt_compressed(sbase, dbuf, src_map.row_pitch, dst_map.row_pitch, dst_width, dst_height, src_format, flags, fx); @@ -2093,7 +2107,33 @@ error: FIXME(" Unsupported flags %#x.\n", flags); release: - wined3d_context_unmap_bo_address(context, &dst_data, 0, 1, &dst_range); + if (upload && hr == WINED3D_OK) + { + struct wined3d_bo_address data; + + data.buffer_object = 0; + data.addr = dst_map.data; + + texture_level = dst_sub_resource_idx % dst_texture->level_count; + + wined3d_texture_prepare_location(dst_texture, texture_level, context, WINED3D_LOCATION_TEXTURE_RGB); + dst_texture->texture_ops->texture_upload_data(context, wined3d_const_bo_address(&data), dst_format, + dst_box, dst_map.row_pitch, dst_map.slice_pitch, dst_texture, texture_level, + WINED3D_LOCATION_TEXTURE_RGB, dst_box->left, dst_box->top, 0); + + wined3d_texture_validate_location(dst_texture, texture_level, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(dst_texture, texture_level, ~WINED3D_LOCATION_TEXTURE_RGB); + } + + if (upload) + { + heap_free(dst_map.data); + } + else + { + wined3d_context_unmap_bo_address(context, &dst_data, 0, 1, &dst_range); + } + if (!same_sub_resource) wined3d_context_unmap_bo_address(context, &src_data, 0, 0, NULL); if (SUCCEEDED(hr) && dst_texture->swapchain && dst_texture->swapchain->front_buffer == dst_texture)

1 0