December 2019 - Wine-commits

Jactry Zeng : sapi: Implement ISpStream stub.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: b276bd58a7b03e5328cbbd4d4a88c3c89b583f69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b276bd58a7b03e5328cbbd4d… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Nov 18 10:19:00 2019 +0800 sapi: Implement ISpStream stub. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sapi/automation.c | 180 +++++++++++++++++++++++++++++++++++++++++++ dlls/sapi/tests/automation.c | 6 ++ 2 files changed, 186 insertions(+) diff --git a/dlls/sapi/automation.c b/dlls/sapi/automation.c index 429f2ed3a6..7a9fa17f8f 100644 --- a/dlls/sapi/automation.c +++ b/dlls/sapi/automation.c @@ -37,6 +37,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(sapi); struct file_stream { ISpeechFileStream ISpeechFileStream_iface; + ISpStream ISpStream_iface; LONG ref; }; @@ -45,6 +46,11 @@ static inline struct file_stream *impl_from_ISpeechFileStream(ISpeechFileStream return CONTAINING_RECORD(iface, struct file_stream, ISpeechFileStream_iface); } +static inline struct file_stream *impl_from_ISpStream(ISpStream *iface) +{ + return CONTAINING_RECORD(iface, struct file_stream, ISpStream_iface); +} + /* ISpeechFileStream interface */ static HRESULT WINAPI file_stream_QueryInterface(ISpeechFileStream *iface, REFIID iid, void **obj) { @@ -57,6 +63,8 @@ static HRESULT WINAPI file_stream_QueryInterface(ISpeechFileStream *iface, REFII IsEqualIID(iid, &IID_ISpeechBaseStream) || IsEqualIID(iid, &IID_ISpeechFileStream)) *obj = &This->ISpeechFileStream_iface; + else if (IsEqualIID(iid, &IID_ISpStream)) + *obj = &This->ISpStream_iface; else { *obj = NULL; @@ -194,6 +202,177 @@ const static ISpeechFileStreamVtbl file_stream_vtbl = file_stream_Close }; +/* ISpStream interface */ +static HRESULT WINAPI spstream_QueryInterface(ISpStream *iface, REFIID iid, void **obj) +{ + struct file_stream *This = impl_from_ISpStream(iface); + + TRACE("(%p, %s, %p).\n", iface, debugstr_guid(iid), obj); + + return ISpeechFileStream_QueryInterface(&This->ISpeechFileStream_iface, iid, obj); +} + +static ULONG WINAPI spstream_AddRef(ISpStream *iface) +{ + struct file_stream *This = impl_from_ISpStream(iface); + + TRACE("(%p).\n", iface); + + return ISpeechFileStream_AddRef(&This->ISpeechFileStream_iface); +} + +static ULONG WINAPI spstream_Release(ISpStream *iface) +{ + struct file_stream *This = impl_from_ISpStream(iface); + + TRACE("(%p).\n", iface); + + return ISpeechFileStream_Release(&This->ISpeechFileStream_iface); +} + +static HRESULT WINAPI spstream_Read(ISpStream *iface, void *pv, ULONG cb, ULONG *read) +{ + FIXME("(%p, %p, %d, %p): stub.\n", iface, pv, cb, read); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Write(ISpStream *iface, const void *pv, ULONG cb, ULONG *written) +{ + FIXME("(%p, %p, %d, %p): stub.\n", iface, pv, cb, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Seek(ISpStream *iface, LARGE_INTEGER mode, DWORD origin, ULARGE_INTEGER *position) +{ + FIXME("(%p, %s, %d, %p): stub.\n", iface, wine_dbgstr_longlong(mode.QuadPart), origin, position); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_SetSize(ISpStream *iface, ULARGE_INTEGER size) +{ + FIXME("(%p, %s): stub.\n", iface, wine_dbgstr_longlong(size.QuadPart)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_CopyTo(ISpStream *iface, IStream *stream, ULARGE_INTEGER cb, + ULARGE_INTEGER *read, ULARGE_INTEGER *written) +{ + FIXME("(%p, %p, %s, %p, %p): stub.\n", iface, stream, wine_dbgstr_longlong(cb.QuadPart), + read, written); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Commit(ISpStream *iface, DWORD flag) +{ + FIXME("(%p, %d): stub.\n", iface, flag); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Revert(ISpStream *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_LockRegion(ISpStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER cb, DWORD type) +{ + FIXME("(%p, %s, %s, %d): stub.\n", iface, wine_dbgstr_longlong(offset.QuadPart), + wine_dbgstr_longlong(cb.QuadPart), type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_UnlockRegion(ISpStream *iface, ULARGE_INTEGER offset, ULARGE_INTEGER cb, DWORD type) +{ + FIXME("(%p, %s, %s, %d): stub.\n", iface, wine_dbgstr_longlong(offset.QuadPart), + wine_dbgstr_longlong(cb.QuadPart), type); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Stat(ISpStream *iface, STATSTG *statstg, DWORD flag) +{ + FIXME("(%p, %p, %d): stub.\n", iface, statstg, flag); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Clone(ISpStream *iface, IStream **stream) +{ + FIXME("(%p, %p): stub.\n", iface, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_GetFormat(ISpStream *iface, GUID *format, WAVEFORMATEX **wave) +{ + FIXME("(%p, %p, %p): stub.\n", iface, format, wave); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_SetBaseStream(ISpStream *iface, IStream *stream, REFGUID format, + const WAVEFORMATEX *wave) +{ + FIXME("(%p, %p, %s, %p): stub.\n", iface, stream, debugstr_guid(format), wave); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_GetBaseStream(ISpStream *iface, IStream **stream) +{ + FIXME("(%p, %p): stub.\n", iface, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_BindToFile(ISpStream *iface, LPCWSTR filename, SPFILEMODE mode, + const GUID *format, const WAVEFORMATEX* wave, + ULONGLONG interest) +{ + FIXME("(%p, %s, %d, %s, %p, %s): stub.\n", iface, debugstr_w(filename), mode, debugstr_guid(format), + wave, wine_dbgstr_longlong(interest)); + + return E_NOTIMPL; +} + +static HRESULT WINAPI spstream_Close(ISpStream *iface) +{ + FIXME("(%p): stub.\n", iface); + + return E_NOTIMPL; +} + +const static ISpStreamVtbl spstream_vtbl = +{ + spstream_QueryInterface, + spstream_AddRef, + spstream_Release, + spstream_Read, + spstream_Write, + spstream_Seek, + spstream_SetSize, + spstream_CopyTo, + spstream_Commit, + spstream_Revert, + spstream_LockRegion, + spstream_UnlockRegion, + spstream_Stat, + spstream_Clone, + spstream_GetFormat, + spstream_SetBaseStream, + spstream_GetBaseStream, + spstream_BindToFile, + spstream_Close +}; + HRESULT file_stream_create(IUnknown *outer, REFIID iid, void **obj) { struct file_stream *This = heap_alloc(sizeof(*This)); @@ -201,6 +380,7 @@ HRESULT file_stream_create(IUnknown *outer, REFIID iid, void **obj) if (!This) return E_OUTOFMEMORY; This->ISpeechFileStream_iface.lpVtbl = &file_stream_vtbl; + This->ISpStream_iface.lpVtbl = &spstream_vtbl; This->ref = 1; hr = ISpeechFileStream_QueryInterface(&This->ISpeechFileStream_iface, iid, obj); diff --git a/dlls/sapi/tests/automation.c b/dlls/sapi/tests/automation.c index 57b6c7a375..c584b4ac2c 100644 --- a/dlls/sapi/tests/automation.c +++ b/dlls/sapi/tests/automation.c @@ -30,6 +30,7 @@ static void test_interfaces(void) ISpeechFileStream *filestream; ISpeechBaseStream *basestream; IDispatch *dispatch; + ISpStream *spstrem; IUnknown *unk; HRESULT hr; @@ -52,6 +53,11 @@ static void test_interfaces(void) ok(hr == S_OK, "Failed to create ISpeechBaseStream interface: %#x.\n", hr); ISpeechBaseStream_Release(basestream); + hr = CoCreateInstance(&CLSID_SpFileStream, NULL, CLSCTX_INPROC_SERVER, + &IID_ISpStream, (void **)&spstrem); + ok(hr == S_OK, "Failed to create ISpStream interface: %#x.\n", hr); + + ISpStream_Release(spstrem); ISpeechFileStream_Release(filestream); }

1 0

Hans Leidekker : wusa: Add support for extracting MSU files.
by Alexandre Julliard 02 Dec '19

02 Dec '19

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

Hans Leidekker : wusa: Parse assembly manifests.
by Alexandre Julliard 02 Dec '19

02 Dec '19

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 02 Dec '19

02 Dec '19

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 02 Dec '19

02 Dec '19

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

Zebediah Figura : d3d9: Use wined3d_stateblock_get_state() in d3d9_device_GetRenderState().
by Alexandre Julliard 02 Dec '19

02 Dec '19

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

Zebediah Figura : d3d8: Use wined3d_stateblock_get_state() in d3d8_device_GetRenderState().
by Alexandre Julliard 02 Dec '19

02 Dec '19

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

Zebediah Figura : ddraw: Retrieve render state from the primary stateblock.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: 9512fee2e02620248c8c9ba2ee8b5415b625f6b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9512fee2e02620248c8c9ba2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 27 23:53:41 2019 -0600 ddraw: Retrieve render state from the primary stateblock. 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/ddraw/device.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index def3e7c2a4..d4dd74f8ae 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2289,6 +2289,7 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, D3DRENDERSTATETYPE state, DWORD *value) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + const struct wined3d_stateblock_state *device_state; HRESULT hr = D3D_OK; TRACE("iface %p, state %#x, value %p.\n", iface, state, value); @@ -2297,6 +2298,7 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, return DDERR_INVALIDPARAMS; wined3d_mutex_lock(); + device_state = wined3d_stateblock_get_state(device->state); switch (state) { case D3DRENDERSTATE_TEXTUREMAG: @@ -2392,7 +2394,7 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, break; case D3DRENDERSTATE_ZBIAS: - *value = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_DEPTHBIAS); + *value = device_state->rs[WINED3D_RS_DEPTHBIAS]; break; default: @@ -2403,7 +2405,7 @@ static HRESULT d3d_device7_GetRenderState(IDirect3DDevice7 *iface, hr = E_NOTIMPL; break; } - *value = wined3d_device_get_render_state(device->wined3d_device, state); + *value = device_state->rs[state]; } wined3d_mutex_unlock();

1 0

Andrey Gusev : dxgi/tests: Fix a typo in ok() message.
by Alexandre Julliard 02 Dec '19

02 Dec '19

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

Paul Gofman : ddraw/tests: Skip test_colorkey_precision() test on WARP.
by Alexandre Julliard 02 Dec '19

02 Dec '19

Module: wine Branch: master Commit: ac819d411d1a125a4532e8f88c6d13afc42ece99 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac819d411d1a125a4532e8f8… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Nov 29 20:31:11 2019 +0300 ddraw/tests: Skip test_colorkey_precision() test on WARP. Fixes ddraw7 test crashes in Testbow(w10). 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/ddraw/tests/ddraw7.c | 111 +++++++++++++++++++++++----------------------- 1 file changed, 56 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ac819d411d1a125a4532…

1 0