September 2023 - Wine-commits

Gabriel Ivăncescu : mshtml: Use query_interface in the dispex vtbl for History.
by Alexandre Julliard 12 Sep '23

12 Sep '23

Module: wine Branch: master Commit: b225b4280035707ff7324a3370aee70ac9c5042b URL: https://gitlab.winehq.org/wine/wine/-/commit/b225b4280035707ff7324a3370aee7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 12 18:50:32 2023 +0300 mshtml: Use query_interface in the dispex vtbl for History. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/omnavigator.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 342416e240f..5d221d700d6 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -619,22 +619,12 @@ static HRESULT WINAPI OmHistory_QueryInterface(IOmHistory *iface, REFIID riid, v { OmHistory *This = impl_from_IOmHistory(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IOmHistory_iface; - }else if(IsEqualGUID(&IID_IOmHistory, riid)) { - *ppv = &This->IOmHistory_iface; - }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + if(dispex_query_interface(&This->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; - }else { - WARN("Unsupported interface %s\n", debugstr_mshtml_guid(riid)); - *ppv = NULL; - return E_NOINTERFACE; - } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } static ULONG WINAPI OmHistory_AddRef(IOmHistory *iface) @@ -746,6 +736,16 @@ static inline OmHistory *OmHistory_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, OmHistory, dispex); } +static void *OmHistory_query_interface(DispatchEx *dispex, REFIID riid) +{ + OmHistory *This = OmHistory_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IOmHistory, riid)) + return &This->IOmHistory_iface; + + return NULL; +} + static void OmHistory_destructor(DispatchEx *dispex) { OmHistory *This = OmHistory_from_DispatchEx(dispex); @@ -753,6 +753,7 @@ static void OmHistory_destructor(DispatchEx *dispex) } static const dispex_static_data_vtbl_t OmHistory_dispex_vtbl = { + .query_interface = OmHistory_query_interface, .destructor = OmHistory_destructor, };

1 0

Gabriel Ivăncescu : mshtml: Use query_interface in the dispex vtbl for Navigator.
by Alexandre Julliard 12 Sep '23

12 Sep '23

Module: wine Branch: master Commit: b17f77c8d669af1a24fea32be5abd6485680c66f URL: https://gitlab.winehq.org/wine/wine/-/commit/b17f77c8d669af1a24fea32be5abd6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 12 18:50:32 2023 +0300 mshtml: Use query_interface in the dispex vtbl for Navigator. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/omnavigator.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 5d221d700d6..aa57ba4f447 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -1129,22 +1129,12 @@ static HRESULT WINAPI OmNavigator_QueryInterface(IOmNavigator *iface, REFIID rii { OmNavigator *This = impl_from_IOmNavigator(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &This->IOmNavigator_iface; - }else if(IsEqualGUID(&IID_IOmNavigator, riid)) { - *ppv = &This->IOmNavigator_iface; - }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + if(dispex_query_interface(&This->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; - }else { - WARN("Unsupported interface %s\n", debugstr_mshtml_guid(riid)); - *ppv = NULL; - return E_NOINTERFACE; - } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + *ppv = NULL; + WARN("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } static ULONG WINAPI OmNavigator_AddRef(IOmNavigator *iface) @@ -1514,6 +1504,16 @@ static inline OmNavigator *OmNavigator_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, OmNavigator, dispex); } +static void *OmNavigator_query_interface(DispatchEx *dispex, REFIID riid) +{ + OmNavigator *This = OmNavigator_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IOmNavigator, riid)) + return &This->IOmNavigator_iface; + + return NULL; +} + static void OmNavigator_unlink(DispatchEx *dispex) { OmNavigator *This = OmNavigator_from_DispatchEx(dispex); @@ -1534,6 +1534,7 @@ static void OmNavigator_destructor(DispatchEx *dispex) } static const dispex_static_data_vtbl_t OmNavigator_dispex_vtbl = { + .query_interface = OmNavigator_query_interface, .destructor = OmNavigator_destructor, .unlink = OmNavigator_unlink };

1 0

Gabriel Ivăncescu : mshtml: Use query_interface in the dispex vtbl for Console.
by Alexandre Julliard 12 Sep '23

12 Sep '23

Module: wine Branch: master Commit: 431b89eab0820f568eb67e5147d21e529a5b8808 URL: https://gitlab.winehq.org/wine/wine/-/commit/431b89eab0820f568eb67e5147d21e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 12 18:50:32 2023 +0300 mshtml: Use query_interface in the dispex vtbl for Console. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/omnavigator.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index aa57ba4f447..ca78787a46a 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -2595,22 +2595,12 @@ static HRESULT WINAPI console_QueryInterface(IWineMSHTMLConsole *iface, REFIID r { struct console *console = impl_from_IWineMSHTMLConsole(iface); - TRACE("(%p)->(%s %p)\n", console, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid)) { - *ppv = &console->IWineMSHTMLConsole_iface; - }else if(IsEqualGUID(&IID_IWineMSHTMLConsole, riid)) { - *ppv = &console->IWineMSHTMLConsole_iface; - }else if(dispex_query_interface(&console->dispex, riid, ppv)) { + if(dispex_query_interface(&console->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; - }else { - WARN("(%p)->(%s %p)\n", console, debugstr_mshtml_guid(riid), ppv); - *ppv = NULL; - return E_NOINTERFACE; - } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + *ppv = NULL; + WARN("(%p)->(%s %p)\n", console, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } static ULONG WINAPI console_AddRef(IWineMSHTMLConsole *iface) @@ -2810,6 +2800,16 @@ static inline struct console *console_from_DispatchEx(DispatchEx *iface) return CONTAINING_RECORD(iface, struct console, dispex); } +static void *console_query_interface(DispatchEx *dispex, REFIID riid) +{ + struct console *console = console_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IWineMSHTMLConsole, riid)) + return &console->IWineMSHTMLConsole_iface; + + return NULL; +} + static void console_destructor(DispatchEx *dispex) { struct console *console = console_from_DispatchEx(dispex); @@ -2817,6 +2817,7 @@ static void console_destructor(DispatchEx *dispex) } static const dispex_static_data_vtbl_t console_dispex_vtbl = { + .query_interface = console_query_interface, .destructor = console_destructor, };

1 0

Gabriel Ivăncescu : mshtml: Use query_interface in the dispex vtbl for MediaQueryList.
by Alexandre Julliard 12 Sep '23

12 Sep '23

Module: wine Branch: master Commit: 0e6370bd3335ed8f461c76b7b0b0c916b502d7d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/0e6370bd3335ed8f461c76b7b0b0c9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Sep 12 18:50:32 2023 +0300 mshtml: Use query_interface in the dispex vtbl for MediaQueryList. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/omnavigator.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index ca78787a46a..01c6b99f355 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -2878,19 +2878,12 @@ static HRESULT WINAPI media_query_list_QueryInterface(IWineMSHTMLMediaQueryList { struct media_query_list *media_query_list = impl_from_IWineMSHTMLMediaQueryList(iface); - TRACE("(%p)->(%s %p)\n", media_query_list, debugstr_mshtml_guid(riid), ppv); - - if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IWineMSHTMLMediaQueryList, riid)) { - *ppv = &media_query_list->IWineMSHTMLMediaQueryList_iface; - }else if(dispex_query_interface(&media_query_list->dispex, riid, ppv)) { + if(dispex_query_interface(&media_query_list->dispex, riid, ppv)) return *ppv ? S_OK : E_NOINTERFACE; - }else { - *ppv = NULL; - return E_NOINTERFACE; - } - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; + *ppv = NULL; + WARN("(%p)->(%s %p)\n", media_query_list, debugstr_mshtml_guid(riid), ppv); + return E_NOINTERFACE; } static ULONG WINAPI media_query_list_AddRef(IWineMSHTMLMediaQueryList *iface) @@ -3134,6 +3127,16 @@ static inline struct media_query_list *media_query_list_from_DispatchEx(Dispatch return CONTAINING_RECORD(iface, struct media_query_list, dispex); } +static void *media_query_list_query_interface(DispatchEx *dispex, REFIID riid) +{ + struct media_query_list *media_query_list = media_query_list_from_DispatchEx(dispex); + + if(IsEqualGUID(&IID_IWineMSHTMLMediaQueryList, riid)) + return &media_query_list->IWineMSHTMLMediaQueryList_iface; + + return NULL; +} + static void media_query_list_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) { struct media_query_list *media_query_list = media_query_list_from_DispatchEx(dispex); @@ -3167,6 +3170,7 @@ static void media_query_list_destructor(DispatchEx *dispex) } static const dispex_static_data_vtbl_t media_query_list_dispex_vtbl = { + .query_interface = media_query_list_query_interface, .destructor = media_query_list_destructor, .traverse = media_query_list_traverse, .unlink = media_query_list_unlink

1 0

Dmitry Timoshkov : d2d1: Scale stroke width for D2D1_STROKE_TRANSFORM_TYPE_FIXED in DrawGeometry::ID2D1DeviceContext1().
by Alexandre Julliard 12 Sep '23

12 Sep '23

Module: wine Branch: master Commit: 6dd11426e0a1083366760e3834a7098ffc0b1b1b URL: https://gitlab.winehq.org/wine/wine/-/commit/6dd11426e0a1083366760e3834a709… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 24 19:19:16 2023 +0300 d2d1: Scale stroke width for D2D1_STROKE_TRANSFORM_TYPE_FIXED in DrawGeometry::ID2D1DeviceContext1(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/device.c | 7 +++++++ dlls/d2d1/stroke.c | 8 ++++++++ 3 files changed, 16 insertions(+) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index f3029bab0f2..1dd5cdb0a39 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -383,6 +383,7 @@ struct d2d_stroke_style HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory, const D2D1_STROKE_STYLE_PROPERTIES1 *desc, const float *dashes, UINT32 dash_count); +struct d2d_stroke_style *unsafe_impl_from_ID2D1StrokeStyle(ID2D1StrokeStyle *iface); struct d2d_layer { diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 33cf943010c..a8993e79d4d 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -942,6 +942,7 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawGeometry(ID2D1DeviceContext const struct d2d_geometry *geometry_impl = unsafe_impl_from_ID2D1Geometry(geometry); struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface); struct d2d_brush *brush_impl = unsafe_impl_from_ID2D1Brush(brush); + struct d2d_stroke_style *stroke_style_impl = unsafe_impl_from_ID2D1StrokeStyle(stroke_style); TRACE("iface %p, geometry %p, brush %p, stroke_width %.8e, stroke_style %p.\n", iface, geometry, brush, stroke_width, stroke_style); @@ -956,6 +957,12 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawGeometry(ID2D1DeviceContext if (stroke_style) FIXME("Ignoring stroke style %p.\n", stroke_style); + if (stroke_style_impl) + { + if (stroke_style_impl->desc.transformType == D2D1_STROKE_TRANSFORM_TYPE_FIXED) + stroke_width /= context->drawing_state.transform.m11; + } + d2d_device_context_draw_geometry(context, geometry_impl, brush_impl, stroke_width); } diff --git a/dlls/d2d1/stroke.c b/dlls/d2d1/stroke.c index 16fa1f60771..fc12d4eb972 100644 --- a/dlls/d2d1/stroke.c +++ b/dlls/d2d1/stroke.c @@ -191,6 +191,14 @@ static const struct ID2D1StrokeStyle1Vtbl d2d_stroke_style_vtbl = d2d_stroke_style_GetStrokeTransformType }; +struct d2d_stroke_style *unsafe_impl_from_ID2D1StrokeStyle(ID2D1StrokeStyle *iface) +{ + if (!iface) + return NULL; + assert((const struct ID2D1StrokeStyle1Vtbl *)iface->lpVtbl == &d2d_stroke_style_vtbl); + return CONTAINING_RECORD(iface, struct d2d_stroke_style, ID2D1StrokeStyle1_iface); +} + HRESULT d2d_stroke_style_init(struct d2d_stroke_style *style, ID2D1Factory *factory, const D2D1_STROKE_STYLE_PROPERTIES1 *desc, const float *dashes, UINT32 dash_count) {

1 0

Biswapriyo Nath : include: Add missing error codes in msctf.idl.
by Alexandre Julliard 12 Sep '23

12 Sep '23

Module: wine Branch: master Commit: 8f3cd46687fb2494fa12f2901c0557d2321ea0ba URL: https://gitlab.winehq.org/wine/wine/-/commit/8f3cd46687fb2494fa12f2901c0557… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Sep 12 16:21:16 2023 +0000 include: Add missing error codes in msctf.idl. --- include/msctf.idl | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/include/msctf.idl b/include/msctf.idl index dd9997211a4..c2f171997ff 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -23,10 +23,28 @@ import "textstor.idl"; import "ctfutb.idl"; #endif -cpp_quote("#define TF_E_STACKFULL MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0501)") -cpp_quote("#define TF_E_DISCONNECTED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0504)") -cpp_quote("#define TF_E_ALREADY_EXISTS MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0506)") -cpp_quote("#define TF_E_NOLOCK MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0201)") +cpp_quote("#define TF_E_LOCKED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0500)") +cpp_quote("#define TF_E_STACKFULL MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0501)") +cpp_quote("#define TF_E_NOTOWNEDRANGE MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0502)") +cpp_quote("#define TF_E_NOPROVIDER MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0503)") +cpp_quote("#define TF_E_DISCONNECTED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0504)") +cpp_quote("#define TF_E_INVALIDVIEW MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0505)") +cpp_quote("#define TF_E_ALREADY_EXISTS MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0506)") +cpp_quote("#define TF_E_RANGE_NOT_COVERED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0507)") +cpp_quote("#define TF_E_COMPOSITION_REJECTED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0508)") +cpp_quote("#define TF_E_EMPTYCONTEXT MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0509)") +cpp_quote("#define TF_E_INVALIDPOS MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0200)") +cpp_quote("#define TF_E_NOLOCK MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0201)") +cpp_quote("#define TF_E_NOOBJECT MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0202)") +cpp_quote("#define TF_E_NOSERVICE MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0203)") +cpp_quote("#define TF_E_NOINTERFACE MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0204)") +cpp_quote("#define TF_E_NOSELECTION MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0205)") +cpp_quote("#define TF_E_NOLAYOUT MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0206)") +cpp_quote("#define TF_E_INVALIDPOINT MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0207)") +cpp_quote("#define TF_E_SYNCHRONOUS MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0208)") +cpp_quote("#define TF_E_READONLY MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0209)") +cpp_quote("#define TF_E_FORMAT MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x020a)") +cpp_quote("#define TF_S_ASYNC MAKE_HRESULT(SEVERITY_SUCCESS, FACILITY_ITF, 0x0300)") cpp_quote("HRESULT WINAPI TF_CreateThreadMgr(ITfThreadMgr **pptim);") cpp_quote("HRESULT WINAPI TF_GetThreadMgr(ITfThreadMgr **pptim);")

1 0

Rémi Bernon : dmband: Always return S_FALSE from DllCanUnloadNow.
by Alexandre Julliard 12 Sep '23

12 Sep '23

Module: wine Branch: master Commit: c3ebc387f38815748bbc1b01199baa9ea44eb04a URL: https://gitlab.winehq.org/wine/wine/-/commit/c3ebc387f38815748bbc1b01199baa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 22 17:51:00 2023 +0200 dmband: Always return S_FALSE from DllCanUnloadNow. --- dlls/dmband/band.c | 2 -- dlls/dmband/bandtrack.c | 2 -- dlls/dmband/dmband_main.c | 22 ---------------------- dlls/dmband/dmband_private.h | 8 -------- 4 files changed, 34 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index d71863a1f9d..907377ebed5 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -83,7 +83,6 @@ static ULONG WINAPI IDirectMusicBandImpl_Release(IDirectMusicBand *iface) if (!ref) { HeapFree(GetProcessHeap(), 0, This); - DMBAND_UnlockModule(); } return ref; @@ -527,7 +526,6 @@ HRESULT create_dmband(REFIID lpcGUID, void **ppobj) obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; list_init (&obj->Instruments); - DMBAND_LockModule(); hr = IDirectMusicBand_QueryInterface(&obj->IDirectMusicBand_iface, lpcGUID, ppobj); IDirectMusicBand_Release(&obj->IDirectMusicBand_iface); diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 0142b5b5188..25aca207612 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -82,7 +82,6 @@ static ULONG WINAPI band_track_Release(IDirectMusicTrack8 *iface) if (!ref) { HeapFree(GetProcessHeap(), 0, This); - DMBAND_UnlockModule(); } return ref; @@ -650,7 +649,6 @@ HRESULT create_dmbandtrack(REFIID lpcGUID, void **ppobj) track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; list_init (&track->Bands); - DMBAND_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); diff --git a/dlls/dmband/dmband_main.c b/dlls/dmband/dmband_main.c index c08f8b0a087..c032a931f31 100644 --- a/dlls/dmband/dmband_main.c +++ b/dlls/dmband/dmband_main.c @@ -23,8 +23,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmband); -LONG DMBAND_refCount = 0; - typedef struct { IClassFactory IClassFactory_iface; HRESULT (*fnCreateInstance)(REFIID riid, void **ret_iface); @@ -60,15 +58,11 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) { - DMBAND_LockModule(); - return 2; /* non-heap based object */ } static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) { - DMBAND_UnlockModule(); - return 1; /* non-heap based object */ } @@ -90,12 +84,6 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) { TRACE("(%d)\n", dolock); - - if (dolock) - DMBAND_LockModule(); - else - DMBAND_UnlockModule(); - return S_OK; } @@ -110,16 +98,6 @@ static const IClassFactoryVtbl classfactory_vtbl = { static IClassFactoryImpl Band_CF = {{&classfactory_vtbl}, create_dmband}; static IClassFactoryImpl BandTrack_CF = {{&classfactory_vtbl}, create_dmbandtrack}; -/****************************************************************** - * DllCanUnloadNow (DMBAND.@) - * - * - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return DMBAND_refCount != 0 ? S_FALSE : S_OK; -} - /****************************************************************** * DllGetClassObject (DMBAND.@) diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h index b89dd08dd83..0b1807eaf93 100644 --- a/dlls/dmband/dmband_private.h +++ b/dlls/dmband/dmband_private.h @@ -73,14 +73,6 @@ typedef struct _DMUS_PRIVATE_BAND { IDirectMusicBand *band; } DMUS_PRIVATE_BAND, *LPDMUS_PRIVATE_BAND; - -/********************************************************************** - * Dll lifetime tracking declaration for dmband.dll - */ -extern LONG DMBAND_refCount; -static inline void DMBAND_LockModule(void) { InterlockedIncrement( &DMBAND_refCount ); } -static inline void DMBAND_UnlockModule(void) { InterlockedDecrement( &DMBAND_refCount ); } - /***************************************************************************** * Misc. */

1 0

Rémi Bernon : dmband: Use CRT allocation functions.
by Alexandre Julliard 12 Sep '23

12 Sep '23

Module: wine Branch: master Commit: b60ee21fb2d657d2bf848925dfb8464bca6f0d9f URL: https://gitlab.winehq.org/wine/wine/-/commit/b60ee21fb2d657d2bf848925dfb846… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 9 09:16:50 2023 +0200 dmband: Use CRT allocation functions. --- dlls/dmband/band.c | 20 +++++--------------- dlls/dmband/bandtrack.c | 18 +++++------------- dlls/dmband/dmobject.c | 7 +++---- 3 files changed, 13 insertions(+), 32 deletions(-) diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index 907377ebed5..02e3573bab9 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -81,9 +81,7 @@ static ULONG WINAPI IDirectMusicBandImpl_Release(IDirectMusicBand *iface) TRACE("(%p) ref=%ld\n", This, ref); - if (!ref) { - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) free(This); return ref; } @@ -277,11 +275,7 @@ static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK * /* * @TODO insert pNewInstrument into This */ - pNewInstrument = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_INSTRUMENT)); - if (NULL == pNewInstrument) { - ERR(": no more memory\n"); - return E_OUTOFMEMORY; - } + if (!(pNewInstrument = calloc(1, sizeof(*pNewInstrument)))) return E_OUTOFMEMORY; memcpy(&pNewInstrument->pInstrument, &inst, sizeof(DMUS_IO_INSTRUMENT)); pNewInstrument->ppReferenceCollection = NULL; if (NULL != pObject) { @@ -289,8 +283,7 @@ static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK * hr = IDirectMusicObject_QueryInterface (pObject, &IID_IDirectMusicCollection, (void**) &pCol); if (FAILED(hr)) { ERR(": failed to get IDirectMusicCollection Interface from DMObject\n"); - HeapFree(GetProcessHeap(), 0, pNewInstrument); - + free(pNewInstrument); return hr; } pNewInstrument->ppReferenceCollection = pCol; @@ -514,11 +507,8 @@ HRESULT create_dmband(REFIID lpcGUID, void **ppobj) IDirectMusicBandImpl* obj; HRESULT hr; - obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicBandImpl)); - if (NULL == obj) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } + *ppobj = NULL; + if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY; obj->IDirectMusicBand_iface.lpVtbl = &dmband_vtbl; obj->ref = 1; dmobject_init(&obj->dmobj, &CLSID_DirectMusicBand, (IUnknown *)&obj->IDirectMusicBand_iface); diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 25aca207612..bdb9344b064 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -80,9 +80,7 @@ static ULONG WINAPI band_track_Release(IDirectMusicTrack8 *iface) TRACE("(%p) ref=%ld\n", This, ref); - if (!ref) { - HeapFree(GetProcessHeap(), 0, This); - } + if (!ref) free(This); return ref; } @@ -344,11 +342,8 @@ static HRESULT load_band(IDirectMusicBandTrack *This, IStream *pClonedStream, * @TODO insert pBand into This */ if (SUCCEEDED(hr)) { - LPDMUS_PRIVATE_BAND pNewBand = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_BAND)); - if (NULL == pNewBand) { - ERR(": no more memory\n"); - return E_OUTOFMEMORY; - } + LPDMUS_PRIVATE_BAND pNewBand; + if (!(pNewBand = calloc(1, sizeof(*pNewBand)))) return E_OUTOFMEMORY; pNewBand->BandHeader = *pHeader; pNewBand->band = *ppBand; IDirectMusicBand_AddRef(*ppBand); @@ -637,11 +632,8 @@ HRESULT create_dmbandtrack(REFIID lpcGUID, void **ppobj) IDirectMusicBandTrack *track; HRESULT hr; - track = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*track)); - if (!track) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } + *ppobj = NULL; + if (!(track = calloc(1, sizeof(*track)))) return E_OUTOFMEMORY; track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; track->ref = 1; dmobject_init(&track->dmobj, &CLSID_DirectMusicBandTrack, diff --git a/dlls/dmband/dmobject.c b/dlls/dmband/dmobject.c index b526b23d031..07d887a376c 100644 --- a/dlls/dmband/dmobject.c +++ b/dlls/dmband/dmobject.c @@ -28,7 +28,6 @@ #include "dmusics.h" #include "dmobject.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(dmobj); WINE_DECLARE_DEBUG_CHANNEL(dmfile); @@ -375,7 +374,7 @@ HRESULT stream_next_chunk(IStream *stream, struct chunk_entry *chunk) /* Reads chunk data of the form: DWORD - size of array element element[] - Array of elements - The caller needs to heap_free() the array. + The caller needs to free() the array. */ HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk, void **array, unsigned int *count, DWORD elem_size) @@ -400,10 +399,10 @@ HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk, *count = (chunk->size - sizeof(DWORD)) / elem_size; size = *count * elem_size; - if (!(*array = heap_alloc(size))) + if (!(*array = malloc(size))) return E_OUTOFMEMORY; if (FAILED(hr = stream_read(stream, *array, size))) { - heap_free(*array); + free(*array); *array = NULL; return hr; }

1 0

Rémi Bernon : dmband: Use PARENTSRC with dmusic.
by Alexandre Julliard 12 Sep '23

12 Sep '23

Module: wine Branch: master Commit: 649de392194c83841b2e6f0c03a34c3b370ebf2a URL: https://gitlab.winehq.org/wine/wine/-/commit/649de392194c83841b2e6f0c03a34c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Aug 30 19:57:16 2023 +0200 dmband: Use PARENTSRC with dmusic. --- dlls/dmband/Makefile.in | 1 + dlls/dmband/dmobject.c | 732 ------------------------------------------------ dlls/dmband/dmobject.h | 124 -------- 3 files changed, 1 insertion(+), 856 deletions(-)

1 0

Rémi Bernon : dswave: Always return S_FALSE from DllCanUnloadNow.
by Alexandre Julliard 12 Sep '23

12 Sep '23

Module: wine Branch: master Commit: 65f25a150fe19eb883cae89327960d63a22afab5 URL: https://gitlab.winehq.org/wine/wine/-/commit/65f25a150fe19eb883cae89327960d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 22 17:36:49 2023 +0200 dswave: Always return S_FALSE from DllCanUnloadNow. --- dlls/dswave/dswave.c | 2 -- dlls/dswave/dswave_main.c | 23 ----------------------- dlls/dswave/dswave_private.h | 7 ------- 3 files changed, 32 deletions(-) diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c index e6d85d738fe..8e06fc8d13d 100644 --- a/dlls/dswave/dswave.c +++ b/dlls/dswave/dswave.c @@ -86,7 +86,6 @@ static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface) if (!ref) { HeapFree(GetProcessHeap(), 0, This); - DSWAVE_UnlockModule(); } return ref; @@ -191,7 +190,6 @@ HRESULT create_dswave(REFIID lpcGUID, void **ppobj) obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - DSWAVE_LockModule(); hr = IUnknown_QueryInterface(&obj->IUnknown_iface, lpcGUID, ppobj); IUnknown_Release(&obj->IUnknown_iface); return hr; diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index 81dcc73de85..f2ce7bb950f 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -39,8 +39,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dswave); -LONG DSWAVE_refCount = 0; - typedef struct { IClassFactory IClassFactory_iface; } IClassFactoryImpl; @@ -70,15 +68,11 @@ static HRESULT WINAPI WaveCF_QueryInterface(IClassFactory * iface, REFIID riid, static ULONG WINAPI WaveCF_AddRef(IClassFactory * iface) { - DSWAVE_LockModule(); - return 2; /* non-heap based object */ } static ULONG WINAPI WaveCF_Release(IClassFactory * iface) { - DSWAVE_UnlockModule(); - return 1; /* non-heap based object */ } @@ -98,12 +92,6 @@ static HRESULT WINAPI WaveCF_CreateInstance(IClassFactory * iface, IUnknown *out static HRESULT WINAPI WaveCF_LockServer(IClassFactory * iface, BOOL dolock) { TRACE("(%d)\n", dolock); - - if (dolock) - DSWAVE_LockModule(); - else - DSWAVE_UnlockModule(); - return S_OK; } @@ -117,17 +105,6 @@ static const IClassFactoryVtbl WaveCF_Vtbl = { static IClassFactoryImpl Wave_CF = {{&WaveCF_Vtbl}}; -/****************************************************************** - * DllCanUnloadNow (DSWAVE.@) - * - * - */ -HRESULT WINAPI DllCanUnloadNow(void) -{ - return DSWAVE_refCount != 0 ? S_FALSE : S_OK; -} - - /****************************************************************** * DllGetClassObject (DSWAVE.@) * diff --git a/dlls/dswave/dswave_private.h b/dlls/dswave/dswave_private.h index a7758a970bc..50406c676c1 100644 --- a/dlls/dswave/dswave_private.h +++ b/dlls/dswave/dswave_private.h @@ -44,11 +44,4 @@ */ extern HRESULT create_dswave(REFIID lpcGUID, void **ret_iface); -/********************************************************************** - * Dll lifetime tracking declaration for dswave.dll - */ -extern LONG DSWAVE_refCount; -static inline void DSWAVE_LockModule(void) { InterlockedIncrement( &DSWAVE_refCount ); } -static inline void DSWAVE_UnlockModule(void) { InterlockedDecrement( &DSWAVE_refCount ); } - #endif /* __WINE_DSWAVE_PRIVATE_H */

1 0