September 2023 - Wine-Commits

Gabriel Ivăncescu : mshtml: Use query_interface in the dispex vtbl for Navigator.
by Alexandre Julliard Sept. 12, 2023

Sept. 12, 2023

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 MediaQueryList.
by Alexandre Julliard Sept. 12, 2023

Sept. 12, 2023

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

Gabriel Ivăncescu : mshtml: Use query_interface in the dispex vtbl for Console.
by Alexandre Julliard Sept. 12, 2023

Sept. 12, 2023

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 History.
by Alexandre Julliard Sept. 12, 2023

Sept. 12, 2023

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

Dmitry Timoshkov : d2d1: Scale stroke width for D2D1_STROKE_TRANSFORM_TYPE_FIXED in DrawGeometry::ID2D1DeviceContext1().
by Alexandre Julliard Sept. 12, 2023

Sept. 12, 2023

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 Sept. 12, 2023

Sept. 12, 2023

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

Ryan Hendrickson : regedit: Export hex(4) instead of dword if size isn't 4 bytes.
by Alexandre Julliard Sept. 12, 2023

Sept. 12, 2023

Module: wine Branch: master Commit: cd3ebad1ae926d72dec239f120a6f8ffa8ba35e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/cd3ebad1ae926d72dec239f120a6f8… Author: Ryan Hendrickson <ryan.hendrickson(a)alum.mit.edu> Date: Tue Sep 12 03:14:07 2023 -0400 regedit: Export hex(4) instead of dword if size isn't 4 bytes. --- programs/regedit/regproc.c | 2 +- programs/regedit/tests/regedit.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index 30106380241..199cd3b6d80 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -1282,7 +1282,7 @@ static void export_data(FILE *fp, WCHAR *value_name, DWORD value_len, DWORD type export_string_data(&buf, data, size); break; case REG_DWORD: - if (size) + if (size == sizeof(DWORD)) { export_dword_data(&buf, data); break; diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index bc0c9870464..7dde63b449e 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -3466,6 +3466,7 @@ static void test_export(void) { HKEY hkey, subkey; DWORD dword; + DWORD64 dword64; BYTE hex[4]; const char *empty_key_test = @@ -3540,7 +3541,8 @@ static void test_export(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" "\"Wine3a\"=\"Value\"\r\n" "\"Wine3b\"=hex:12,34,56,78\r\n" - "\"Wine3c\"=dword:10203040\r\n\r\n"; + "\"Wine3c\"=dword:10203040\r\n" + "\"Wine3d\"=hex(4):80,70,60,50,40,30,20,10\r\n\r\n"; const char *embedded_null_test = "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" @@ -3680,18 +3682,21 @@ static void test_export(void) ok(compare_export("file.reg", empty_hex_test2, 0), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); - /* Test registry export with embedded null characters */ + /* Test registry export with embedded null characters, improperly-sized DWORD */ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine3a\"=hex(1):56,00,61,00,6c,00,75,00,65,00,00,00\n" "\"Wine3b\"=hex(3):12,34,56,78\n" - "\"Wine3c\"=hex(4):40,30,20,10\n\n"); + "\"Wine3c\"=hex(4):40,30,20,10\n" + "\"Wine3d\"=hex(4):80,70,60,50,40,30,20,10\n\n"); open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); verify_reg(hkey, "Wine3a", REG_SZ, "Value", 6, 0); memcpy(hex, "\x12\x34\x56\x78", 4); verify_reg(hkey, "Wine3b", REG_BINARY, hex, 4, 0); dword = 0x10203040; verify_reg(hkey, "Wine3c", REG_DWORD, &dword, sizeof(dword), 0); + dword64 = 0x1020304050607080; + verify_reg(hkey, "Wine3d", REG_DWORD, &dword64, sizeof(dword64), 0); close_key(hkey); run_regedit_exe("regedit.exe /e file.reg HKEY_CURRENT_USER\\" KEY_BASE);

1 0

Hans Leidekker : iphlpapi/tests: Call GetAdaptersAddresses() in a loop.
by Alexandre Julliard Sept. 12, 2023

Sept. 12, 2023

Module: wine Branch: master Commit: ad0f483d8be2f66cc4c3db05ab85a891fe9ca5b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad0f483d8be2f66cc4c3db05ab85a8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 5 12:05:14 2023 +0200 iphlpapi/tests: Call GetAdaptersAddresses() in a loop. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54588 --- dlls/iphlpapi/tests/iphlpapi.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 372ec01a56a..090cd2c9ff9 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -2080,16 +2080,32 @@ static void test_CreateSortedAddressPairs(void) FreeMibTable( pair ); } +static IP_ADAPTER_ADDRESSES *get_adapters( ULONG flags ) +{ + ULONG err, size = 4096; + IP_ADAPTER_ADDRESSES *tmp, *ret; + + if (!(ret = malloc( size ))) return NULL; + err = GetAdaptersAddresses( AF_UNSPEC, flags, NULL, ret, &size ); + while (err == ERROR_BUFFER_OVERFLOW) + { + if (!(tmp = realloc( ret, size ))) break; + ret = tmp; + err = GetAdaptersAddresses( AF_UNSPEC, flags, NULL, ret, &size ); + } + if (err == ERROR_SUCCESS) return ret; + free( ret ); + return NULL; +} + static DWORD get_interface_index(void) { - DWORD size = 0, ret = 0; + DWORD ret = 0; IP_ADAPTER_ADDRESSES *buf, *aa; - if (GetAdaptersAddresses( AF_UNSPEC, 0, NULL, NULL, &size ) != ERROR_BUFFER_OVERFLOW) - return 0; + buf = get_adapters( 0 ); + if (!buf) return 0; - buf = malloc( size ); - GetAdaptersAddresses( AF_UNSPEC, 0, NULL, buf, &size ); for (aa = buf; aa; aa = aa->Next) { if (aa->IfType == IF_TYPE_ETHERNET_CSMACD) @@ -2455,7 +2471,7 @@ static void test_GetUnicastIpAddressEntry(void) { IP_ADAPTER_ADDRESSES *aa, *ptr; MIB_UNICASTIPADDRESS_ROW row; - DWORD ret, size; + DWORD ret; if (!pGetUnicastIpAddressEntry) { @@ -2498,13 +2514,8 @@ static void test_GetUnicastIpAddressEntry(void) ret = pGetUnicastIpAddressEntry( &row ); ok( ret == ERROR_FILE_NOT_FOUND, "got %lu\n", ret ); - ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES, NULL, NULL, &size); - ok(ret == ERROR_BUFFER_OVERFLOW, "expected ERROR_BUFFER_OVERFLOW, got %lu\n", ret); - if (ret != ERROR_BUFFER_OVERFLOW) return; - - ptr = malloc(size); - ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_INTERFACES, NULL, ptr, &size); - ok(!ret, "expected ERROR_SUCCESS got %lu\n", ret); + ptr = get_adapters( GAA_FLAG_INCLUDE_ALL_INTERFACES ); + ok(ptr != NULL, "can't get adapters\n"); for (aa = ptr; !ret && aa; aa = aa->Next) {

1 0

Hans Leidekker : iphlpapi/tests: Use CRT allocation functions.
by Alexandre Julliard Sept. 12, 2023

Sept. 12, 2023

Module: wine Branch: master Commit: 5f7016d3f018a42065a475a2f40002a5085e5429 URL: https://gitlab.winehq.org/wine/wine/-/commit/5f7016d3f018a42065a475a2f40002… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 5 11:50:45 2023 +0200 iphlpapi/tests: Use CRT allocation functions. --- dlls/iphlpapi/tests/iphlpapi.c | 92 +++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 46 deletions(-)

1 0

Rémi Bernon : dmstyle: Use CRT allocation functions.
by Alexandre Julliard Sept. 12, 2023

Sept. 12, 2023

Module: wine Branch: master Commit: d18ec193de842e80b4ca1ab01cb217f782329675 URL: https://gitlab.winehq.org/wine/wine/-/commit/d18ec193de842e80b4ca1ab01cb217… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 9 09:27:19 2023 +0200 dmstyle: Use CRT allocation functions. --- dlls/dmstyle/auditiontrack.c | 11 +++-------- dlls/dmstyle/chordtrack.c | 11 +++-------- dlls/dmstyle/commandtrack.c | 13 ++++--------- dlls/dmstyle/dmobject.c | 7 +++---- dlls/dmstyle/motiftrack.c | 11 +++-------- dlls/dmstyle/mutetrack.c | 11 +++-------- dlls/dmstyle/style.c | 34 +++++++++------------------------- dlls/dmstyle/styletrack.c | 11 +++-------- 8 files changed, 31 insertions(+), 78 deletions(-)

1 0