May 2024 - Wine-commits - list.winehq.org

Eric Pouech : cmd: Introduce CMD_NODE structure.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: 7e70824ed5c967be706983e329bdb73b57a6373f URL: https://gitlab.winehq.org/wine/wine/-/commit/7e70824ed5c967be706983e329bdb7… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Apr 11 15:08:30 2024 +0200 cmd: Introduce CMD_NODE structure. This will allow to separate better the individual command to be executed (CMD_COMMAND) from the chaining and I/O handling of several commands (CMD_NODE). This also renames CMD_LIST into CMD_COMMAND to fit in above scheme. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/batch.c | 2 +- programs/cmd/builtins.c | 72 ++++++++++----------- programs/cmd/wcmd.h | 30 +++++---- programs/cmd/wcmdmain.c | 163 ++++++++++++++++++++++++++---------------------- 4 files changed, 144 insertions(+), 123 deletions(-)

1 0

Eric Pouech : cmd: Add helpers to handle list in degenerated binary tree.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: 603e81a37a937be6da578eeea85886f801fc20ba URL: https://gitlab.winehq.org/wine/wine/-/commit/603e81a37a937be6da578eeea85886… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Apr 16 10:57:16 2024 +0200 cmd: Add helpers to handle list in degenerated binary tree. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 72 ++++++++++++++++++++++++------------------------- programs/cmd/wcmd.h | 18 ++++++++++++- programs/cmd/wcmdmain.c | 52 +++++++++++++++++------------------ 3 files changed, 79 insertions(+), 63 deletions(-)

1 0

Eric Pouech : cmd: Move operator from CMD_COMMAND to CMD_NODE.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: e6e1bbb4109699ab6f11f58e82ade600c89adb79 URL: https://gitlab.winehq.org/wine/wine/-/commit/e6e1bbb4109699ab6f11f58e82ade6… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Apr 15 10:18:45 2024 +0200 cmd: Move operator from CMD_COMMAND to CMD_NODE. For now, the tree is degenerated into a list (as it was before). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 33 ++++++++---- programs/cmd/wcmd.h | 37 ++++++++----- programs/cmd/wcmdmain.c | 136 +++++++++++++++++++++++++++++++----------------- 3 files changed, 136 insertions(+), 70 deletions(-)

1 0

Jacek Caban : d3dx9/tests: Remove xfile dumping functionality.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: 7b15890fe8edd99d4345697fdb8f0303f8fb9261 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b15890fe8edd99d4345697fdb8f03… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Dec 9 11:30:26 2023 +0100 d3dx9/tests: Remove xfile dumping functionality. --- dlls/d3dx9_36/tests/xfile.c | 138 -------------------------------------------- 1 file changed, 138 deletions(-) diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c index 0a40e4fbb60..0a04544a4bf 100644 --- a/dlls/d3dx9_36/tests/xfile.c +++ b/dlls/d3dx9_36/tests/xfile.c @@ -16,8 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdio.h> - #include "wine/test.h" #include "d3dx9.h" #include "d3dx9xof.h" @@ -244,146 +242,10 @@ static void test_type_index_color(void) d3dxfile->lpVtbl->Release(d3dxfile); } -static void process_data(ID3DXFileData *xfile_data, int level) -{ - HRESULT ret; - char name[100]; - GUID clsid; - GUID clsid_type; - SIZE_T len = sizeof(name); - int i; - const BYTE *data; - SIZE_T size; - SIZE_T children; - - ret = xfile_data->lpVtbl->GetId(xfile_data, &clsid); - ok(ret == S_OK, "ID3DXFileData_GetId failed with %#lx\n", ret); - ret = xfile_data->lpVtbl->GetName(xfile_data, name, &len); - ok(ret == S_OK, "ID3DXFileData_GetName failed with %#lx\n", ret); - ret = xfile_data->lpVtbl->GetType(xfile_data, &clsid_type); - ok(ret == S_OK, "IDirectXFileData_GetType failed with %#lx\n", ret); - ret = xfile_data->lpVtbl->Lock(xfile_data, &size, (const void**)&data); - ok(ret == S_OK, "IDirectXFileData_Lock failed with %#lx\n", ret); - - for (i = 0; i < level; i++) - printf(" "); - - printf("Found object '%s' - %s - %s - %Iu\n", - len ? name : "", wine_dbgstr_guid(&clsid), wine_dbgstr_guid(&clsid_type), size); - - if (size) - { - int j; - for (j = 0; j < size; j++) - { - if (j && !(j%16)) - printf("\n"); - printf("%02x ", data[j]); - } - printf("\n"); - } - - ret = xfile_data->lpVtbl->Unlock(xfile_data); - ok(ret == S_OK, "ID3DXFileData_Unlock failed with %#lx\n", ret); - - ret = xfile_data->lpVtbl->GetChildren(xfile_data, &children); - ok(ret == S_OK, "ID3DXFileData_GetChildren failed with %#lx\n", ret); - - level++; - - for (i = 0; i < children; i++) - { - ID3DXFileData *child; - int j; - - ret = xfile_data->lpVtbl->GetChild(xfile_data, i, &child); - ok(ret == S_OK, "ID3DXFileData_GetChild failed with %#lx\n", ret); - for (j = 0; j < level; j++) - printf(" "); - if (child->lpVtbl->IsReference(child)) - printf("Found Data Reference (%d)\n", i + 1); - else - printf("Found Data (%d)\n", i + 1); - - process_data(child, level); - - child->lpVtbl->Release(child); - } -} - -/* Dump an X file 'objects.x' and its related templates file 'templates.x' if they are both presents - * Useful for debug by comparing outputs from native and builtin dlls */ -static void test_dump(void) -{ - HRESULT ret; - ULONG ref; - ID3DXFile *xfile = NULL; - ID3DXFileEnumObject *xfile_enum_object = NULL; - HANDLE file; - void *data; - DWORD size; - SIZE_T children; - int i; - - /* Dump data only if there is an object and a template */ - file = CreateFileA("objects.x", GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - if (file == INVALID_HANDLE_VALUE) - return; - CloseHandle(file); - - file = CreateFileA("templates.x", GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); - if (file == INVALID_HANDLE_VALUE) - return; - - data = calloc(1, 10000); - - if (!ReadFile(file, data, 10000, &size, NULL)) - { - skip("Templates file is too big\n"); - goto exit; - } - - printf("Load templates file (%lu bytes)\n", size); - - ret = D3DXFileCreate(&xfile); - ok(ret == S_OK, "D3DXCreateFile failed with %#lx\n", ret); - - ret = xfile->lpVtbl->RegisterTemplates(xfile, data, size); - ok(ret == S_OK, "ID3DXFileImpl_RegisterTemplates failed with %#lx\n", ret); - - ret = xfile->lpVtbl->CreateEnumObject(xfile, (void*)"objects.x", D3DXF_FILELOAD_FROMFILE, &xfile_enum_object); - ok(ret == S_OK, "ID3DXFile_CreateEnumObject failed with %#lx\n", ret); - - ret = xfile_enum_object->lpVtbl->GetChildren(xfile_enum_object, &children); - ok(ret == S_OK, "ID3DXFileEnumObject_GetChildren failed with %#lx\n", ret); - - for (i = 0; i < children; i++) - { - ID3DXFileData *child; - ret = xfile_enum_object->lpVtbl->GetChild(xfile_enum_object, i, &child); - ok(ret == S_OK, "ID3DXFileEnumObject_GetChild failed with %#lx\n", ret); - printf("\n"); - process_data(child, 0); - child->lpVtbl->Release(child); - } - - ref = xfile_enum_object->lpVtbl->Release(xfile_enum_object); - ok(ref == 0, "Got refcount %lu, expected 0\n", ref); - - ref = xfile->lpVtbl->Release(xfile); - ok(ref == 0, "Got refcount %lu, expected 0\n", ref); - - -exit: - CloseHandle(file); - free(data); -} - START_TEST(xfile) { test_templates(); test_lock_unlock(); test_getname(); test_type_index_color(); - test_dump(); }

1 0

Jacek Caban : mshtml: Introduce DISPEX_IDISPATCH_IMPL.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: 27fea2eefcf5dd99a8f26d0179d630e63bd29670 URL: https://gitlab.winehq.org/wine/wine/-/commit/27fea2eefcf5dd99a8f26d0179d630… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 13 13:52:06 2024 +0200 mshtml: Introduce DISPEX_IDISPATCH_IMPL. And use it for HTMLRect object implementation. --- dlls/mshtml/htmlelem.c | 100 +------------------------------------------ dlls/mshtml/mshtml_private.h | 35 +++++++++++++++ 2 files changed, 37 insertions(+), 98 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index aa635200f7f..b2d1c544d0a 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -537,57 +537,7 @@ static inline HTMLRect *impl_from_IHTMLRect(IHTMLRect *iface) return CONTAINING_RECORD(iface, HTMLRect, IHTMLRect_iface); } -static HRESULT WINAPI HTMLRect_QueryInterface(IHTMLRect *iface, REFIID riid, void **ppv) -{ - HTMLRect *This = impl_from_IHTMLRect(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI HTMLRect_AddRef(IHTMLRect *iface) -{ - HTMLRect *This = impl_from_IHTMLRect(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI HTMLRect_Release(IHTMLRect *iface) -{ - HTMLRect *This = impl_from_IHTMLRect(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI HTMLRect_GetTypeInfoCount(IHTMLRect *iface, UINT *pctinfo) -{ - HTMLRect *This = impl_from_IHTMLRect(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; -} - -static HRESULT WINAPI HTMLRect_GetTypeInfo(IHTMLRect *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLRect *This = impl_from_IHTMLRect(iface); - - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLRect_GetIDsOfNames(IHTMLRect *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLRect *This = impl_from_IHTMLRect(iface); - - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLRect_Invoke(IHTMLRect *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLRect *This = impl_from_IHTMLRect(iface); - - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLRect, IHTMLRect, impl_from_IHTMLRect(iface)->dispex) static HRESULT WINAPI HTMLRect_put_left(IHTMLRect *iface, LONG v) { @@ -694,53 +644,7 @@ static inline HTMLRect *impl_from_IHTMLRect2(IHTMLRect2 *iface) return CONTAINING_RECORD(iface, HTMLRect, IHTMLRect2_iface); } -static HRESULT WINAPI HTMLRect2_QueryInterface(IHTMLRect2 *iface, REFIID riid, void **ppv) -{ - HTMLRect *This = impl_from_IHTMLRect2(iface); - return IHTMLRect_QueryInterface(&This->IHTMLRect_iface, riid, ppv); -} - -static ULONG WINAPI HTMLRect2_AddRef(IHTMLRect2 *iface) -{ - HTMLRect *This = impl_from_IHTMLRect2(iface); - return IHTMLRect_AddRef(&This->IHTMLRect_iface); -} - -static ULONG WINAPI HTMLRect2_Release(IHTMLRect2 *iface) -{ - HTMLRect *This = impl_from_IHTMLRect2(iface); - return IHTMLRect_Release(&This->IHTMLRect_iface); -} - -static HRESULT WINAPI HTMLRect2_GetTypeInfoCount(IHTMLRect2 *iface, UINT *pctinfo) -{ - HTMLRect *This = impl_from_IHTMLRect2(iface); - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLRect2_GetTypeInfo(IHTMLRect2 *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLRect *This = impl_from_IHTMLRect2(iface); - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLRect2_GetIDsOfNames(IHTMLRect2 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLRect *This = impl_from_IHTMLRect2(iface); - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, - lcid, rgDispId); -} - -static HRESULT WINAPI HTMLRect2_Invoke(IHTMLRect2 *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLRect *This = impl_from_IHTMLRect2(iface); - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLRect2, IHTMLRect2, impl_from_IHTMLRect2(iface)->dispex) static HRESULT WINAPI HTMLRect2_get_width(IHTMLRect2 *iface, FLOAT *p) { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 36d6dfd646a..1d4f005ba11 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -412,6 +412,41 @@ struct DispatchEx { dispex_dynamic_data_t *dynamic_data; }; +#define DISPEX_IDISPATCH_IMPL(prefix, iface_name, dispex) \ + static HRESULT WINAPI prefix##_QueryInterface(iface_name *iface, REFIID riid, void **ppv) \ + { \ + return IDispatchEx_QueryInterface(&(dispex).IDispatchEx_iface, riid, ppv); \ + } \ + static ULONG WINAPI prefix##_AddRef(iface_name *iface) \ + { \ + return IDispatchEx_AddRef(&(dispex).IDispatchEx_iface); \ + } \ + static ULONG WINAPI prefix##_Release(iface_name *iface) \ + { \ + return IDispatchEx_Release(&(dispex).IDispatchEx_iface); \ + } \ + static HRESULT WINAPI prefix##_GetTypeInfoCount(iface_name *iface, UINT *count) \ + { \ + return IDispatchEx_GetTypeInfoCount(&(dispex).IDispatchEx_iface, count); \ + } \ + static HRESULT WINAPI prefix##_GetTypeInfo(iface_name *iface, \ + UINT index, LCID lcid, ITypeInfo **ret) \ + { \ + return IDispatchEx_GetTypeInfo(&(dispex).IDispatchEx_iface, index, lcid, ret); \ + } \ + static HRESULT WINAPI prefix##_GetIDsOfNames(iface_name *iface, REFIID riid, \ + LPOLESTR *names, UINT count, LCID lcid, DISPID *dispid) \ + { \ + return IDispatchEx_GetIDsOfNames(&(dispex).IDispatchEx_iface, \ + riid, names, count, lcid, dispid); \ + } \ + static HRESULT WINAPI prefix##_Invoke(iface_name *iface, DISPID dispid, REFIID riid, \ + LCID lcid, WORD flags, DISPPARAMS *params, VARIANT *res, EXCEPINFO *ei, UINT *err) \ + { \ + return IDispatchEx_Invoke(&(dispex).IDispatchEx_iface, dispid, \ + riid, lcid, flags, params, res, ei, err); \ + } + typedef struct { void *vtbl; int ref_flags;

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlnode.c.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: 4819828683906501d7cd76515c4cab78f32c6440 URL: https://gitlab.winehq.org/wine/wine/-/commit/4819828683906501d7cd76515c4cab… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 13 14:37:39 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlnode.c. --- dlls/mshtml/htmlnode.c | 203 ++----------------------------------------------- 1 file changed, 5 insertions(+), 198 deletions(-)

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlbody.c.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: 87215839b0a1233f55a06d872b6735f398c561ca URL: https://gitlab.winehq.org/wine/wine/-/commit/87215839b0a1233f55a06d872b6735… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 13 14:39:51 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in htmlbody.c. --- dlls/mshtml/htmlbody.c | 108 ++----------------------------------------------- 1 file changed, 4 insertions(+), 104 deletions(-) diff --git a/dlls/mshtml/htmlbody.c b/dlls/mshtml/htmlbody.c index fa4284da8cc..135712afcd2 100644 --- a/dlls/mshtml/htmlbody.c +++ b/dlls/mshtml/htmlbody.c @@ -195,60 +195,8 @@ static inline HTMLBodyElement *impl_from_IHTMLBodyElement(IHTMLBodyElement *ifac return CONTAINING_RECORD(iface, HTMLBodyElement, IHTMLBodyElement_iface); } -static HRESULT WINAPI HTMLBodyElement_QueryInterface(IHTMLBodyElement *iface, - REFIID riid, void **ppv) -{ - HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - - return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); -} - -static ULONG WINAPI HTMLBodyElement_AddRef(IHTMLBodyElement *iface) -{ - HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - - return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); -} - -static ULONG WINAPI HTMLBodyElement_Release(IHTMLBodyElement *iface) -{ - HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - - return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); -} - -static HRESULT WINAPI HTMLBodyElement_GetTypeInfoCount(IHTMLBodyElement *iface, UINT *pctinfo) -{ - HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, - pctinfo); -} - -static HRESULT WINAPI HTMLBodyElement_GetTypeInfo(IHTMLBodyElement *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, - lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLBodyElement_GetIDsOfNames(IHTMLBodyElement *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, - rgszNames, cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLBodyElement_Invoke(IHTMLBodyElement *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLBodyElement *This = impl_from_IHTMLBodyElement(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, - riid, lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLBodyElement, IHTMLBodyElement, + impl_from_IHTMLBodyElement(iface)->element.node.event_target.dispex) static HRESULT WINAPI HTMLBodyElement_put_background(IHTMLBodyElement *iface, BSTR v) { @@ -739,56 +687,8 @@ static inline HTMLBodyElement *impl_from_IHTMLTextContainer(IHTMLTextContainer * return CONTAINING_RECORD(iface, HTMLBodyElement, IHTMLTextContainer_iface); } -static HRESULT WINAPI HTMLTextContainer_QueryInterface(IHTMLTextContainer *iface, - REFIID riid, void **ppv) -{ - HTMLBodyElement *This = impl_from_IHTMLTextContainer(iface); - return IHTMLElement_QueryInterface(&This->element.IHTMLElement_iface, riid, ppv); -} - -static ULONG WINAPI HTMLTextContainer_AddRef(IHTMLTextContainer *iface) -{ - HTMLBodyElement *This = impl_from_IHTMLTextContainer(iface); - return IHTMLElement_AddRef(&This->element.IHTMLElement_iface); -} - -static ULONG WINAPI HTMLTextContainer_Release(IHTMLTextContainer *iface) -{ - HTMLBodyElement *This = impl_from_IHTMLTextContainer(iface); - return IHTMLElement_Release(&This->element.IHTMLElement_iface); -} - -static HRESULT WINAPI HTMLTextContainer_GetTypeInfoCount(IHTMLTextContainer *iface, UINT *pctinfo) -{ - HTMLBodyElement *This = impl_from_IHTMLTextContainer(iface); - return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLTextContainer_GetTypeInfo(IHTMLTextContainer *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLBodyElement *This = impl_from_IHTMLTextContainer(iface); - return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, - ppTInfo); -} - -static HRESULT WINAPI HTMLTextContainer_GetIDsOfNames(IHTMLTextContainer *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLBodyElement *This = impl_from_IHTMLTextContainer(iface); - return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLTextContainer_Invoke(IHTMLTextContainer *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLBodyElement *This = impl_from_IHTMLTextContainer(iface); - return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLTextContainer, IHTMLTextContainer, + impl_from_IHTMLTextContainer(iface)->element.node.event_target.dispex) static HRESULT WINAPI HTMLTextContainer_createControlRange(IHTMLTextContainer *iface, IDispatch **range)

1 0

Tim Clem : mountmgr.sys: Do not create drive letters or volumes for unbrowsable macOS volumes.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: e4b78284a9728037425bd1a9324bb0b108c5ddbb URL: https://gitlab.winehq.org/wine/wine/-/commit/e4b78284a9728037425bd1a9324bb0… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri May 10 12:29:09 2024 -0700 mountmgr.sys: Do not create drive letters or volumes for unbrowsable macOS volumes. Volumes with kCFURLVolumeIsBrowsableKey set to false are invisible to users. These are generally system volumes or temporary ones (like Chrome update disk images) that we should ignore. --- dlls/mountmgr.sys/diskarb.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 4817cfc61d6..63986c3df93 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -65,6 +65,7 @@ static void appeared_callback( DADiskRef disk, void *context ) CFDictionaryRef dict = DADiskCopyDescription( disk ); const void *ref; char device[64]; + CFURLRef volume_url; char mount_point[PATH_MAX]; size_t model_len = 0; GUID guid, *guid_ptr = NULL; @@ -87,11 +88,23 @@ static void appeared_callback( DADiskRef disk, void *context ) strcpy( device, "/dev/r" ); CFStringGetCString( ref, device + 6, sizeof(device) - 6, kCFStringEncodingASCII ); - if ((ref = CFDictionaryGetValue( dict, CFSTR("DAVolumePath") ))) - CFURLGetFileSystemRepresentation( ref, true, (UInt8 *)mount_point, sizeof(mount_point) ); + if ((volume_url = CFDictionaryGetValue( dict, CFSTR("DAVolumePath") ))) + CFURLGetFileSystemRepresentation( volume_url, true, (UInt8 *)mount_point, sizeof(mount_point) ); else mount_point[0] = 0; + if (volume_url && CFURLCopyResourcePropertyForKey( volume_url, kCFURLVolumeIsBrowsableKey, &ref, NULL )) + { + Boolean is_browsable = CFBooleanGetValue( ref ); + CFRelease( ref ); + + if (!is_browsable) + { + TRACE( "ignoring volume %s, uuid %s: not browsable\n", device, wine_dbgstr_guid(guid_ptr) ); + goto done; + } + } + if ((ref = CFDictionaryGetValue( dict, CFSTR("DAMediaKind") ))) { if (!CFStringCompare( ref, CFSTR("IOCDMedia"), 0 ))

1 0

Tim Clem : mountmgr.sys: Do not add drive letters or volumes for macOS volumes without mount paths.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: 89481f43a547291bf060fdf0d3468a6673fd4ca3 URL: https://gitlab.winehq.org/wine/wine/-/commit/89481f43a547291bf060fdf0d3468a… Author: Tim Clem <tclem(a)codeweavers.com> Date: Fri May 10 12:29:27 2024 -0700 mountmgr.sys: Do not add drive letters or volumes for macOS volumes without mount paths. Mounted volumes that are not represented in the filesystem are system volumes that we should ignore (e.g. recovery and preboot). --- dlls/mountmgr.sys/diskarb.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mountmgr.sys/diskarb.c b/dlls/mountmgr.sys/diskarb.c index 63986c3df93..d33f6c60afb 100644 --- a/dlls/mountmgr.sys/diskarb.c +++ b/dlls/mountmgr.sys/diskarb.c @@ -91,9 +91,12 @@ static void appeared_callback( DADiskRef disk, void *context ) if ((volume_url = CFDictionaryGetValue( dict, CFSTR("DAVolumePath") ))) CFURLGetFileSystemRepresentation( volume_url, true, (UInt8 *)mount_point, sizeof(mount_point) ); else - mount_point[0] = 0; + { + TRACE( "ignoring volume %s, uuid %s: no macOS volume path\n", device, wine_dbgstr_guid(guid_ptr) ); + goto done; + } - if (volume_url && CFURLCopyResourcePropertyForKey( volume_url, kCFURLVolumeIsBrowsableKey, &ref, NULL )) + if (CFURLCopyResourcePropertyForKey( volume_url, kCFURLVolumeIsBrowsableKey, &ref, NULL )) { Boolean is_browsable = CFBooleanGetValue( ref ); CFRelease( ref );

1 0

Brendan McGrath : winegstreamer: Pass filename to wg_parser when available.
by Alexandre Julliard 13 May '24

13 May '24

Module: wine Branch: master Commit: a48d34300229176c3687b0a29bc386208059f5a2 URL: https://gitlab.winehq.org/wine/wine/-/commit/a48d34300229176c3687b0a29bc386… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Fri May 10 15:49:19 2024 +1000 winegstreamer: Pass filename to wg_parser when available. --- dlls/winegstreamer/wm_reader.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 1eb9d2a245f..fbbb55201a7 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -54,6 +54,7 @@ struct wm_reader QWORD start_time; QWORD file_size; + WCHAR *filename; IStream *source_stream; HANDLE file; HANDLE read_thread; @@ -1464,7 +1465,7 @@ static HRESULT init_stream(struct wm_reader *reader) goto out_destroy_parser; } - if (FAILED(hr = wg_parser_connect(reader->wg_parser, reader->file_size, NULL))) + if (FAILED(hr = wg_parser_connect(reader->wg_parser, reader->file_size, reader->filename))) { ERR("Failed to connect parser, hr %#lx.\n", hr); goto out_shutdown_thread; @@ -1569,7 +1570,7 @@ static HRESULT reinit_stream(struct wm_reader *reader, bool read_compressed) goto out_destroy_parser; } - if (FAILED(hr = wg_parser_connect(reader->wg_parser, reader->file_size, NULL))) + if (FAILED(hr = wg_parser_connect(reader->wg_parser, reader->file_size, reader->filename))) { ERR("Failed to connect parser, hr %#lx.\n", hr); goto out_shutdown_thread; @@ -1888,6 +1889,8 @@ static HRESULT WINAPI reader_Close(IWMSyncReader2 *iface) if (reader->file) CloseHandle(reader->file); reader->file = NULL; + free(reader->filename); + reader->filename = NULL; LeaveCriticalSection(&reader->cs); return S_OK; @@ -2212,11 +2215,17 @@ static HRESULT WINAPI reader_Open(IWMSyncReader2 *iface, const WCHAR *filename) return E_UNEXPECTED; } + reader->filename = wcsdup(filename); reader->file = file; reader->file_size = size.QuadPart; if (FAILED(hr = init_stream(reader))) + { + CloseHandle(reader->file); reader->file = NULL; + free(reader->filename); + reader->filename = NULL; + } LeaveCriticalSection(&reader->cs); return hr;

1 0