- Wine-Commits - list.winehq.org

Esme Povirk : user32/tests: Ignore other messages in test_broadcast.
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: b61ff6df21c27ba58393e19dcb9d8940787288cd URL: https://gitlab.winehq.org/wine/wine/-/commit/b61ff6df21c27ba58393e19dcb9d89… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Sep 15 12:44:54 2023 -0500 user32/tests: Ignore other messages in test_broadcast. If the SendMessageTimeout call takes a long time, we can get other messages which also set the observed wparam value. Apparently, this is especially likely on Windows 7. This also removes the (wParam == 0xbaadbeef) check which may have been intended to serve the same goal but doesn't work because the observed wParam value is still assigned. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54194 --- dlls/user32/tests/msg.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index c931ca6a983..b5c4de23bc1 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -17847,14 +17847,13 @@ static void test_PostMessage(void) } static WPARAM g_broadcast_wparam; +static UINT g_broadcast_msg; static LRESULT WINAPI broadcast_test_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { WNDPROC oldproc = (WNDPROC)GetWindowLongPtrA(hwnd, GWLP_USERDATA); - if (wParam == 0xbaadbeef) + if (message == g_broadcast_msg) g_broadcast_wparam = wParam; - else - g_broadcast_wparam = 0; return CallWindowProcA(oldproc, hwnd, message, wParam, lParam); } @@ -17864,7 +17863,8 @@ static LRESULT WINAPI broadcast_test_sub_proc(HWND hwnd, UINT message, WPARAM wP { int sub_index = GetWindowLongPtrA(hwnd, GWLP_USERDATA); - g_broadcast_sub_wparam[sub_index] = (wParam == 0xbaadbeef) ? wParam : 0; + if (message == g_broadcast_msg) + g_broadcast_sub_wparam[sub_index] = wParam; return CallWindowProcA(g_oldproc_sub[sub_index], hwnd, message, wParam, lParam); } @@ -17966,6 +17966,7 @@ static void test_broadcast(void) g_broadcast_wparam = 0xdead; for (j = 0; j < ARRAY_SIZE(bcast_expect); j++) g_broadcast_sub_wparam[j] = 0xdead; + g_broadcast_msg = messages[i]; ret = SendMessageTimeoutA(HWND_BROADCAST, messages[i], 0xbaadbeef, 0, SMTO_NORMAL, 2000, NULL); if (!ret && GetLastError() == ERROR_TIMEOUT) win_skip("broadcasting test %d, timeout\n", i);

1 0

Alex Henrie : http: Use CRT allocation functions.
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: f081205b92aaeb7dba25bda33649b88e226b592b URL: https://gitlab.winehq.org/wine/wine/-/commit/f081205b92aaeb7dba25bda33649b8… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 16 21:23:35 2023 -0600 http: Use CRT allocation functions. --- dlls/http.sys/http.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index c2234aa14ad..5c075908f63 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -25,7 +25,6 @@ #include "winternl.h" #include "ddk/wdm.h" #include "wine/debug.h" -#include "wine/heap.h" #include "wine/list.h" static HANDLE directory_obj; @@ -118,17 +117,17 @@ static void accept_connection(SOCKET socket) if ((peer = accept(socket, NULL, NULL)) == INVALID_SOCKET) return; - if (!(conn = heap_alloc_zero(sizeof(*conn)))) + if (!(conn = calloc(1, sizeof(*conn)))) { ERR("Failed to allocate memory.\n"); shutdown(peer, SD_BOTH); closesocket(peer); return; } - if (!(conn->buffer = heap_alloc(8192))) + if (!(conn->buffer = malloc(8192))) { ERR("Failed to allocate buffer memory.\n"); - heap_free(conn); + free(conn); shutdown(peer, SD_BOTH); closesocket(peer); return; @@ -142,11 +141,11 @@ static void accept_connection(SOCKET socket) static void close_connection(struct connection *conn) { - heap_free(conn->buffer); + free(conn->buffer); shutdown(conn->socket, SD_BOTH); closesocket(conn->socket); list_remove(&conn->entry); - heap_free(conn); + free(conn); } static HTTP_VERB parse_verb(const char *verb, int len) @@ -629,7 +628,7 @@ static void receive_data(struct connection *conn) if (available) { TRACE("%lu more bytes of data available, trying with larger buffer.\n", available); - if (!(conn->buffer = heap_realloc(conn->buffer, conn->len + available))) + if (!(conn->buffer = realloc(conn->buffer, conn->len + available))) { ERR("Failed to allocate %lu bytes of memory.\n", conn->len + available); close_connection(conn);

1 0

Gabriel Ivăncescu : mshtml: Traverse and unlink TextAreaElements using the dispex.
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: 71f0ea7e1fb48b567a116a82e3c8ef960798318f URL: https://gitlab.winehq.org/wine/wine/-/commit/71f0ea7e1fb48b567a116a82e3c8ef… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Sep 15 16:54:17 2023 +0300 mshtml: Traverse and unlink TextAreaElements using the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmltextarea.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmltextarea.c b/dlls/mshtml/htmltextarea.c index bde78211773..7aa3f9dbb67 100644 --- a/dlls/mshtml/htmltextarea.c +++ b/dlls/mshtml/htmltextarea.c @@ -421,17 +421,24 @@ static BOOL HTMLTextAreaElement_is_text_edit(HTMLDOMNode *iface) return TRUE; } -static void HTMLTextAreaElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +static inline HTMLTextAreaElement *impl_from_DispatchEx(DispatchEx *iface) { - HTMLTextAreaElement *This = impl_from_HTMLDOMNode(iface); + return CONTAINING_RECORD(iface, HTMLTextAreaElement, element.node.event_target.dispex); +} + +static void HTMLTextAreaElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLTextAreaElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); if(This->nstextarea) - note_cc_edge((nsISupports*)This->nstextarea, "This->nstextarea", cb); + note_cc_edge((nsISupports*)This->nstextarea, "nstextarea", cb); } -static void HTMLTextAreaElement_unlink(HTMLDOMNode *iface) +static void HTMLTextAreaElement_unlink(DispatchEx *dispex) { - HTMLTextAreaElement *This = impl_from_HTMLDOMNode(iface); + HTMLTextAreaElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); unlink_ref(&This->nstextarea); } @@ -445,11 +452,18 @@ static const NodeImplVtbl HTMLTextAreaElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, .put_disabled = HTMLTextAreaElementImpl_put_disabled, .get_disabled = HTMLTextAreaElementImpl_get_disabled, - .traverse = HTMLTextAreaElement_traverse, - .unlink = HTMLTextAreaElement_unlink, .is_text_edit = HTMLTextAreaElement_is_text_edit }; +static const event_target_vtbl_t HTMLTextAreaElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLTextAreaElement_traverse, + .unlink = HTMLTextAreaElement_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, +}; + static const tid_t HTMLTextAreaElement_iface_tids[] = { HTMLELEMENT_TIDS, IHTMLTextAreaElement_tid, @@ -458,7 +472,7 @@ static const tid_t HTMLTextAreaElement_iface_tids[] = { static dispex_static_data_t HTMLTextAreaElement_dispex = { "HTMLTextAreaElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLTextAreaElement_event_target_vtbl.dispex_vtbl, DispHTMLTextAreaElement_tid, HTMLTextAreaElement_iface_tids, HTMLElement_init_dispex_info

1 0

Gabriel Ivăncescu : mshtml: Unlink document nodes and fragments using the dispex.
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: 75f2ae345325adca4c5035516ed5bd2bb8c115c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/75f2ae345325adca4c5035516ed5bd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Sep 15 16:54:17 2023 +0300 mshtml: Unlink document nodes and fragments using the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 40 ++++++++++++++++------------------------ dlls/mshtml/htmlnode.c | 5 ----- dlls/mshtml/mshtml_private.h | 2 -- 3 files changed, 16 insertions(+), 31 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index bff2452f4cd..f5c9bf8ed1a 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5843,26 +5843,12 @@ static HRESULT HTMLDocumentNode_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HT return E_NOTIMPL; } -static void HTMLDocumentNode_unlink(HTMLDOMNode *iface) -{ - HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); - - if(This->dom_document) { - release_document_mutation(This); - detach_document_node(This); - This->dom_document = NULL; - This->html_document = NULL; - This->window = NULL; - } -} - static const NodeImplVtbl HTMLDocumentNodeImplVtbl = { .clsid = &CLSID_HTMLDocument, .qi = HTMLDocumentNode_QI, .destructor = HTMLDocumentNode_destructor, .cpc_entries = HTMLDocumentNode_cpc, .clone = HTMLDocumentNode_clone, - .unlink = HTMLDocumentNode_unlink }; static HRESULT HTMLDocumentFragment_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode, HTMLDOMNode **ret) @@ -5879,11 +5865,23 @@ static HRESULT HTMLDocumentFragment_clone(HTMLDOMNode *iface, nsIDOMNode *nsnode return S_OK; } -static void HTMLDocumentFragment_unlink(HTMLDOMNode *iface) +static inline HTMLDocumentNode *impl_from_DispatchEx(DispatchEx *iface) { - HTMLDocumentNode *This = impl_from_HTMLDOMNode(iface); + return CONTAINING_RECORD(iface, HTMLDocumentNode, node.event_target.dispex); +} - if(This->window) { +static void HTMLDocumentNode_unlink(DispatchEx *dispex) +{ + HTMLDocumentNode *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); + + if(This->dom_document) { + release_document_mutation(This); + detach_document_node(This); + This->dom_document = NULL; + This->html_document = NULL; + This->window = NULL; + }else if(This->window) { detach_document_node(This); /* document fragments own reference to inner window */ @@ -5892,11 +5890,6 @@ static void HTMLDocumentFragment_unlink(HTMLDOMNode *iface) } } -static inline HTMLDocumentNode *impl_from_DispatchEx(DispatchEx *iface) -{ - return CONTAINING_RECORD(iface, HTMLDocumentNode, node.event_target.dispex); -} - static HRESULT HTMLDocumentNode_get_name(DispatchEx *dispex, DISPID id, BSTR *name) { HTMLDocumentNode *This = impl_from_DispatchEx(dispex); @@ -6071,7 +6064,7 @@ static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { .query_interface = HTMLDOMNode_query_interface, .destructor = HTMLDOMNode_destructor, .traverse = HTMLDOMNode_traverse, - .unlink = HTMLDOMNode_unlink, + .unlink = HTMLDocumentNode_unlink, .get_name = HTMLDocumentNode_get_name, .invoke = HTMLDocumentNode_invoke, .next_dispid = HTMLDocumentNode_next_dispid, @@ -6090,7 +6083,6 @@ static const NodeImplVtbl HTMLDocumentFragmentImplVtbl = { .destructor = HTMLDocumentNode_destructor, .cpc_entries = HTMLDocumentNode_cpc, .clone = HTMLDocumentFragment_clone, - .unlink = HTMLDocumentFragment_unlink }; static const tid_t HTMLDocumentNode_iface_tids[] = { diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 407142f828c..a2bec6126ba 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1414,8 +1414,6 @@ void HTMLDOMNode_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback { HTMLDOMNode *This = HTMLDOMNode_from_DispatchEx(dispex); - if(This->vtbl->traverse) - This->vtbl->traverse(This, cb); if(This->nsnode) note_cc_edge((nsISupports*)This->nsnode, "nsnode", cb); if(This->doc && &This->doc->node != This) @@ -1426,9 +1424,6 @@ void HTMLDOMNode_unlink(DispatchEx *dispex) { HTMLDOMNode *This = HTMLDOMNode_from_DispatchEx(dispex); - if(This->vtbl->unlink) - This->vtbl->unlink(This); - release_event_target(&This->event_target); unlink_ref(&This->nsnode); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index d185961acf6..41034f42636 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -828,8 +828,6 @@ typedef struct { HRESULT (*get_name)(HTMLDOMNode*,DISPID,BSTR*); HRESULT (*invoke)(HTMLDOMNode*,DISPID,LCID,WORD,DISPPARAMS*,VARIANT*,EXCEPINFO*,IServiceProvider*); HRESULT (*bind_to_tree)(HTMLDOMNode*); - void (*traverse)(HTMLDOMNode*,nsCycleCollectionTraversalCallback*); - void (*unlink)(HTMLDOMNode*); BOOL (*is_text_edit)(HTMLDOMNode*); BOOL (*is_settable)(HTMLDOMNode*,DISPID); } NodeImplVtbl;

1 0

Eric Pouech : dbghelp: Don't insert dwz file map into module's file maps' chain.
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: 776ba1304ee7712e4ced0cac84df0489962800c0 URL: https://gitlab.winehq.org/wine/wine/-/commit/776ba1304ee7712e4ced0cac84df04… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Sep 15 18:44:28 2023 +0200 dbghelp: Don't insert dwz file map into module's file maps' chain. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/module.c | 55 +++++++++++++++++++++------------------------------ 1 file changed, 22 insertions(+), 33 deletions(-) diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 1493d3006cc..22b58950b43 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -570,7 +570,7 @@ static BOOL image_check_debug_link_gnu_id(const WCHAR* file, struct image_file_m * is the global debug file directory, and execdir has been turned * into a relative path)." (from GDB manual) */ -static BOOL image_locate_debug_link(const struct module* module, struct image_file_map* fmap, const char* filename, DWORD crc) +static struct image_file_map* image_locate_debug_link(const struct module* module, const char* filename, DWORD crc) { static const WCHAR globalDebugDirW[] = {'/','u','s','r','/','l','i','b','/','d','e','b','u','g','/'}; static const WCHAR dotDebugW[] = {'.','d','e','b','u','g','/'}; @@ -582,7 +582,7 @@ static BOOL image_locate_debug_link(const struct module* module, struct image_fi struct image_file_map* fmap_link = NULL; fmap_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*fmap_link)); - if (!fmap_link) return FALSE; + if (!fmap_link) return NULL; filename_len = MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, NULL, 0); path_len = lstrlenW(module->module.LoadedImageName); @@ -630,13 +630,12 @@ static BOOL image_locate_debug_link(const struct module* module, struct image_fi WARN("Couldn't locate or map %s\n", filename); HeapFree(GetProcessHeap(), 0, p); HeapFree(GetProcessHeap(), 0, fmap_link); - return FALSE; + return NULL; found: TRACE("Located debug information file %s at %s\n", filename, debugstr_w(p)); HeapFree(GetProcessHeap(), 0, p); - fmap->alternate = fmap_link; - return TRUE; + return fmap_link; } static WCHAR* append_hex(WCHAR* dst, const BYTE* id, const BYTE* end) @@ -655,7 +654,7 @@ static WCHAR* append_hex(WCHAR* dst, const BYTE* id, const BYTE* end) * * Try to find the .so file containing the debug info out of the build-id note information */ -static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE* id, unsigned idlen) +static struct image_file_map* image_locate_build_id_target(const BYTE* id, unsigned idlen) { struct image_file_map* fmap_link = NULL; DWORD sz; @@ -663,7 +662,7 @@ static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE WCHAR* z; fmap_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*fmap_link)); - if (!fmap_link) return FALSE; + if (!fmap_link) return NULL; p = malloc(sizeof(L"/usr/lib/debug/.build-id/") + (idlen * 2 + 1) * sizeof(WCHAR) + sizeof(L".debug")); @@ -685,8 +684,7 @@ static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE if (image_check_debug_link_gnu_id(p, fmap_link, id, idlen)) { free(p); - fmap->alternate = fmap_link; - return TRUE; + return fmap_link; } sz = GetEnvironmentVariableW(L"WINEHOMEDIR", NULL, 0); @@ -707,8 +705,7 @@ static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE if (image_check_debug_link_gnu_id(p, fmap_link, id, idlen)) { free(p); - fmap->alternate = fmap_link; - return TRUE; + return fmap_link; } } @@ -716,7 +713,7 @@ static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE fail: free(p); HeapFree(GetProcessHeap(), 0, fmap_link); - return FALSE; + return NULL; } /****************************************************************** @@ -734,11 +731,7 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru struct image_file_map* fmap_link = NULL; BOOL ret = FALSE; - for (; fmap; fmap = fmap->alternate) - { - if (image_find_section(fmap, ".gnu_debugaltlink", &debugaltlink_sect)) break; - } - if (!fmap) + if (!image_find_section(fmap, ".gnu_debugaltlink", &debugaltlink_sect)) { TRACE("No .gnu_debugaltlink section found for %s\n", debugstr_w(module->modulename)); return NULL; @@ -806,12 +799,8 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru { HeapFree(GetProcessHeap(), 0, fmap_link); /* didn't work out with filename, try file lookup based on build-id */ - ret = image_locate_build_id_target(fmap, id, idlen); - if (!ret) - { + if (!(fmap_link = image_locate_build_id_target(id, idlen))) WARN("Couldn't find a match for .gnu_debugaltlink section %s for %s\n", data, debugstr_w(module->modulename)); - fmap_link = NULL; - } } } } @@ -829,33 +818,30 @@ struct image_file_map* image_load_debugaltlink(struct image_file_map* fmap, stru */ BOOL image_check_alternate(struct image_file_map* fmap, const struct module* module) { - BOOL ret = FALSE; - BOOL found = FALSE; struct image_section_map buildid_sect, debuglink_sect; + struct image_file_map* fmap_link = NULL; /* if present, add the .gnu_debuglink file as an alternate to current one */ if (image_find_section(fmap, ".note.gnu.build-id", &buildid_sect)) { const UINT32* note; - found = TRUE; note = (const UINT32*)image_map_section(&buildid_sect); if (note != IMAGE_NO_MAP) { /* the usual ELF note structure: name-size desc-size type <name> <desc> */ if (note[2] == NOTE_GNU_BUILD_ID) { - ret = image_locate_build_id_target(fmap, (const BYTE*)(note + 3 + ((note[0] + 3) >> 2)), note[1]); + fmap_link = image_locate_build_id_target((const BYTE*)(note + 3 + ((note[0] + 3) >> 2)), note[1]); } } image_unmap_section(&buildid_sect); } /* if present, add the .gnu_debuglink file as an alternate to current one */ - if (!ret && image_find_section(fmap, ".gnu_debuglink", &debuglink_sect)) + if (!fmap_link && image_find_section(fmap, ".gnu_debuglink", &debuglink_sect)) { const char* dbg_link; - found = TRUE; dbg_link = image_map_section(&debuglink_sect); if (dbg_link != IMAGE_NO_MAP) { @@ -866,14 +852,17 @@ BOOL image_check_alternate(struct image_file_map* fmap, const struct module* mod * 3/ CRC of the linked file */ DWORD crc = *(const DWORD*)(dbg_link + ((DWORD_PTR)(strlen(dbg_link) + 4) & ~3)); - ret = image_locate_debug_link(module, fmap, dbg_link, crc); - if (!ret) - WARN("Couldn't load linked debug file for %s\n", - debugstr_w(module->modulename)); + if (!(fmap_link = image_locate_debug_link(module, dbg_link, crc))) + WARN("Couldn't load linked debug file for %s\n", debugstr_w(module->modulename)); } image_unmap_section(&debuglink_sect); } - return found ? ret : TRUE; + if (fmap_link) + { + fmap->alternate = fmap_link; + return TRUE; + } + return FALSE; } /***********************************************************************

1 0

Alex Henrie : newdev: Use CRT allocation functions.
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: b47a3305ad3c377c871c647281bd6c25b345927c URL: https://gitlab.winehq.org/wine/wine/-/commit/b47a3305ad3c377c871c647281bd6c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Aug 16 21:47:16 2023 -0600 newdev: Use CRT allocation functions. --- dlls/newdev/main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/newdev/main.c b/dlls/newdev/main.c index 54f572c3d08..dcf7e391d4d 100644 --- a/dlls/newdev/main.c +++ b/dlls/newdev/main.c @@ -30,7 +30,6 @@ #include "newdev.h" #include "wine/debug.h" -#include "wine/heap.h" WINE_DEFAULT_DEBUG_CHANNEL(setupapi); @@ -118,7 +117,7 @@ BOOL WINAPI UpdateDriverForPlugAndPlayDevicesW(HWND parent, const WCHAR *hardwar { if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) continue; - device_ids = heap_realloc(device_ids, size); + device_ids = realloc(device_ids, size); SetupDiGetDeviceRegistryPropertyW(set, &device, SPDRP_HARDWAREID, NULL, (BYTE *)device_ids, size, NULL); } @@ -144,7 +143,7 @@ BOOL WINAPI UpdateDriverForPlugAndPlayDevicesW(HWND parent, const WCHAR *hardwar } SetupDiDestroyDeviceInfoList(set); - heap_free(device_ids); + free(device_ids); return TRUE; }

1 0

Gabriel Ivăncescu : mshtml: Traverse and unlink TableElements using the dispex.
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: cbe7bf2c9b276f6e7a681da4e24e89e0b4a6df22 URL: https://gitlab.winehq.org/wine/wine/-/commit/cbe7bf2c9b276f6e7a681da4e24e89… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Sep 15 16:54:17 2023 +0300 mshtml: Traverse and unlink TableElements using the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmltable.c | 90 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 66 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/htmltable.c b/dlls/mshtml/htmltable.c index 90fb255203b..c1df64198d6 100644 --- a/dlls/mshtml/htmltable.c +++ b/dlls/mshtml/htmltable.c @@ -467,17 +467,24 @@ static void HTMLTableCell_destructor(HTMLDOMNode *iface) HTMLElement_destructor(&This->element.node); } -static void HTMLTableCell_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +static inline HTMLTableCell *HTMLTableCell_from_DispatchEx(DispatchEx *iface) { - HTMLTableCell *This = HTMLTableCell_from_HTMLDOMNode(iface); + return CONTAINING_RECORD(iface, HTMLTableCell, element.node.event_target.dispex); +} + +static void HTMLTableCell_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLTableCell *This = HTMLTableCell_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); if(This->nscell) - note_cc_edge((nsISupports*)This->nscell, "This->nstablecell", cb); + note_cc_edge((nsISupports*)This->nscell, "nstablecell", cb); } -static void HTMLTableCell_unlink(HTMLDOMNode *iface) +static void HTMLTableCell_unlink(DispatchEx *dispex) { - HTMLTableCell *This = HTMLTableCell_from_HTMLDOMNode(iface); + HTMLTableCell *This = HTMLTableCell_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); unlink_ref(&This->nscell); } @@ -489,8 +496,15 @@ static const NodeImplVtbl HTMLTableCellImplVtbl = { .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event, .get_attr_col = HTMLElement_get_attr_col, - .traverse = HTMLTableCell_traverse, - .unlink = HTMLTableCell_unlink +}; + +static const event_target_vtbl_t HTMLTableCell_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLTableCell_traverse, + .unlink = HTMLTableCell_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; static const tid_t HTMLTableCell_iface_tids[] = { @@ -501,7 +515,7 @@ static const tid_t HTMLTableCell_iface_tids[] = { static dispex_static_data_t HTMLTableCell_dispex = { "HTMLTableDataCellElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLTableCell_event_target_vtbl.dispex_vtbl, DispHTMLTableCell_tid, HTMLTableCell_iface_tids, HTMLElement_init_dispex_info @@ -887,17 +901,24 @@ static void *HTMLTableRow_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); } -static void HTMLTableRow_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +static inline HTMLTableRow *HTMLTableRow_from_DispatchEx(DispatchEx *iface) { - HTMLTableRow *This = HTMLTableRow_from_HTMLDOMNode(iface); + return CONTAINING_RECORD(iface, HTMLTableRow, element.node.event_target.dispex); +} + +static void HTMLTableRow_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLTableRow *This = HTMLTableRow_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); if(This->nsrow) - note_cc_edge((nsISupports*)This->nsrow, "This->nstablerow", cb); + note_cc_edge((nsISupports*)This->nsrow, "nstablerow", cb); } -static void HTMLTableRow_unlink(HTMLDOMNode *iface) +static void HTMLTableRow_unlink(DispatchEx *dispex) { - HTMLTableRow *This = HTMLTableRow_from_HTMLDOMNode(iface); + HTMLTableRow *This = HTMLTableRow_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); unlink_ref(&This->nsrow); } @@ -909,8 +930,15 @@ static const NodeImplVtbl HTMLTableRowImplVtbl = { .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event, .get_attr_col = HTMLElement_get_attr_col, - .traverse = HTMLTableRow_traverse, - .unlink = HTMLTableRow_unlink +}; + +static const event_target_vtbl_t HTMLTableRow_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLTableRow_traverse, + .unlink = HTMLTableRow_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; static const tid_t HTMLTableRow_iface_tids[] = { @@ -921,7 +949,7 @@ static const tid_t HTMLTableRow_iface_tids[] = { static dispex_static_data_t HTMLTableRow_dispex = { "HTMLTableRowElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLTableRow_event_target_vtbl.dispex_vtbl, DispHTMLTableRow_tid, HTMLTableRow_iface_tids, HTMLElement_init_dispex_info @@ -1885,17 +1913,24 @@ static void *HTMLTable_QI(HTMLDOMNode *iface, REFIID riid) return HTMLElement_QI(&This->element.node, riid); } -static void HTMLTable_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +static inline HTMLTable *impl_from_DispatchEx(DispatchEx *iface) { - HTMLTable *This = impl_from_HTMLDOMNode(iface); + return CONTAINING_RECORD(iface, HTMLTable, element.node.event_target.dispex); +} + +static void HTMLTable_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLTable *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); if(This->nstable) - note_cc_edge((nsISupports*)This->nstable, "This->nstable", cb); + note_cc_edge((nsISupports*)This->nstable, "nstable", cb); } -static void HTMLTable_unlink(HTMLDOMNode *iface) +static void HTMLTable_unlink(DispatchEx *dispex) { - HTMLTable *This = impl_from_HTMLDOMNode(iface); + HTMLTable *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); unlink_ref(&This->nstable); } @@ -1913,8 +1948,15 @@ static const NodeImplVtbl HTMLTableImplVtbl = { .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event, .get_attr_col = HTMLElement_get_attr_col, - .traverse = HTMLTable_traverse, - .unlink = HTMLTable_unlink +}; + +static const event_target_vtbl_t HTMLTable_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLTable_traverse, + .unlink = HTMLTable_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; static const tid_t HTMLTable_iface_tids[] = { @@ -1927,7 +1969,7 @@ static const tid_t HTMLTable_iface_tids[] = { static dispex_static_data_t HTMLTable_dispex = { "HTMLTableElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLTable_event_target_vtbl.dispex_vtbl, DispHTMLTable_tid, HTMLTable_iface_tids, HTMLElement_init_dispex_info

1 0

Gabriel Ivăncescu : mshtml: Traverse and unlink StyleElements using the dispex.
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: ec2461f7796c17e4ec1fe15fbde480fe2256c08e URL: https://gitlab.winehq.org/wine/wine/-/commit/ec2461f7796c17e4ec1fe15fbde480… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Sep 15 16:54:17 2023 +0300 mshtml: Traverse and unlink StyleElements using the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstyleelem.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index d030a81042d..6c7005f097e 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -389,17 +389,24 @@ static void HTMLStyleElement_destructor(HTMLDOMNode *iface) HTMLElement_destructor(iface); } -static void HTMLStyleElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +static inline HTMLStyleElement *impl_from_DispatchEx(DispatchEx *iface) { - HTMLStyleElement *This = impl_from_HTMLDOMNode(iface); + return CONTAINING_RECORD(iface, HTMLStyleElement, element.node.event_target.dispex); +} + +static void HTMLStyleElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLStyleElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); if(This->nsstyle) - note_cc_edge((nsISupports*)This->nsstyle, "This->nsstyle", cb); + note_cc_edge((nsISupports*)This->nsstyle, "nsstyle", cb); } -static void HTMLStyleElement_unlink(HTMLDOMNode *iface) +static void HTMLStyleElement_unlink(DispatchEx *dispex) { - HTMLStyleElement *This = impl_from_HTMLDOMNode(iface); + HTMLStyleElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); unlink_ref(&This->nsstyle); } @@ -428,8 +435,15 @@ static const NodeImplVtbl HTMLStyleElementImplVtbl = { .clone = HTMLElement_clone, .handle_event = HTMLElement_handle_event, .get_attr_col = HTMLElement_get_attr_col, - .traverse = HTMLStyleElement_traverse, - .unlink = HTMLStyleElement_unlink +}; + +static const event_target_vtbl_t HTMLStyleElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLStyleElement_traverse, + .unlink = HTMLStyleElement_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; static const tid_t HTMLStyleElement_iface_tids[] = { @@ -438,7 +452,7 @@ static const tid_t HTMLStyleElement_iface_tids[] = { }; static dispex_static_data_t HTMLStyleElement_dispex = { "HTMLStyleElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLStyleElement_event_target_vtbl.dispex_vtbl, DispHTMLStyleElement_tid, HTMLStyleElement_iface_tids, HTMLStyleElement_init_dispex_info

1 0

Gabriel Ivăncescu : mshtml: Traverse and unlink ObjectElements using the dispex.
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: 44e5d7d09df428cec2d981f4373a4e55c0f5fccd URL: https://gitlab.winehq.org/wine/wine/-/commit/44e5d7d09df428cec2d981f4373a4e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Sep 15 16:54:16 2023 +0300 mshtml: Traverse and unlink ObjectElements using the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlobject.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 9ded29ffc83..fbaa7d4c7d1 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -722,17 +722,24 @@ static HRESULT HTMLObjectElement_invoke(HTMLDOMNode *iface, DISPID id, LCID lcid return invoke_plugin_prop(&This->plugin_container, id, lcid, flags, params, res, ei); } -static void HTMLObjectElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +static inline HTMLObjectElement *impl_from_DispatchEx(DispatchEx *iface) { - HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); + return CONTAINING_RECORD(iface, HTMLObjectElement, plugin_container.element.node.event_target.dispex); +} + +static void HTMLObjectElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLObjectElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); if(This->nsobject) - note_cc_edge((nsISupports*)This->nsobject, "This->nsobject", cb); + note_cc_edge((nsISupports*)This->nsobject, "nsobject", cb); } -static void HTMLObjectElement_unlink(HTMLDOMNode *iface) +static void HTMLObjectElement_unlink(DispatchEx *dispex) { - HTMLObjectElement *This = impl_from_HTMLDOMNode(iface); + HTMLObjectElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); unlink_ref(&This->nsobject); } @@ -748,8 +755,15 @@ static const NodeImplVtbl HTMLObjectElementImplVtbl = { .get_dispid = HTMLObjectElement_get_dispid, .get_name = HTMLObjectElement_dispex_get_name, .invoke = HTMLObjectElement_invoke, - .traverse = HTMLObjectElement_traverse, - .unlink = HTMLObjectElement_unlink +}; + +static const event_target_vtbl_t HTMLObjectElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLObjectElement_traverse, + .unlink = HTMLObjectElement_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; static const tid_t HTMLObjectElement_iface_tids[] = { @@ -760,7 +774,7 @@ static const tid_t HTMLObjectElement_iface_tids[] = { }; static dispex_static_data_t HTMLObjectElement_dispex = { "HTMLObjectElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLObjectElement_event_target_vtbl.dispex_vtbl, DispHTMLObjectElement_tid, HTMLObjectElement_iface_tids, HTMLElement_init_dispex_info

1 0

Gabriel Ivăncescu : mshtml: Traverse and unlink ScriptElements using the dispex.
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: e5c40735ca05043e971faf8630933fc18ae09a20 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5c40735ca05043e971faf8630933f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Sep 15 16:54:17 2023 +0300 mshtml: Traverse and unlink ScriptElements using the dispex. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlscript.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlscript.c b/dlls/mshtml/htmlscript.c index 84dd77dc13d..7bedf3682c7 100644 --- a/dlls/mshtml/htmlscript.c +++ b/dlls/mshtml/htmlscript.c @@ -401,17 +401,24 @@ static HRESULT HTMLScriptElement_bind_to_tree(HTMLDOMNode *iface) return S_OK; } -static void HTMLScriptElement_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb) +static inline HTMLScriptElement *impl_from_DispatchEx(DispatchEx *iface) { - HTMLScriptElement *This = impl_from_HTMLDOMNode(iface); + return CONTAINING_RECORD(iface, HTMLScriptElement, element.node.event_target.dispex); +} + +static void HTMLScriptElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLScriptElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_traverse(dispex, cb); if(This->nsscript) - note_cc_edge((nsISupports*)This->nsscript, "This->nsscript", cb); + note_cc_edge((nsISupports*)This->nsscript, "nsscript", cb); } -static void HTMLScriptElement_unlink(HTMLDOMNode *iface) +static void HTMLScriptElement_unlink(DispatchEx *dispex) { - HTMLScriptElement *This = impl_from_HTMLDOMNode(iface); + HTMLScriptElement *This = impl_from_DispatchEx(dispex); + HTMLDOMNode_unlink(dispex); unlink_ref(&This->nsscript); } @@ -425,8 +432,15 @@ static const NodeImplVtbl HTMLScriptElementImplVtbl = { .get_attr_col = HTMLElement_get_attr_col, .get_readystate = HTMLScriptElement_get_readystate, .bind_to_tree = HTMLScriptElement_bind_to_tree, - .traverse = HTMLScriptElement_traverse, - .unlink = HTMLScriptElement_unlink +}; + +static const event_target_vtbl_t HTMLScriptElement_event_target_vtbl = { + { + HTMLELEMENT_DISPEX_VTBL_ENTRIES, + .traverse = HTMLScriptElement_traverse, + .unlink = HTMLScriptElement_unlink + }, + HTMLELEMENT_EVENT_TARGET_VTBL_ENTRIES, }; HRESULT script_elem_from_nsscript(nsIDOMHTMLScriptElement *nsscript, HTMLScriptElement **ret) @@ -457,7 +471,7 @@ static const tid_t HTMLScriptElement_iface_tids[] = { static dispex_static_data_t HTMLScriptElement_dispex = { "HTMLScriptElement", - &HTMLElement_event_target_vtbl.dispex_vtbl, + &HTMLScriptElement_event_target_vtbl.dispex_vtbl, DispHTMLScriptElement_tid, HTMLScriptElement_iface_tids, HTMLElement_init_dispex_info

1 0