November 2023 - Wine-Commits

Alex Henrie : adsldp: Remove unused heap.h include.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 4782d0e06196530ac4a9d90a60d4949d0e6da11e URL: https://gitlab.winehq.org/wine/wine/-/commit/4782d0e06196530ac4a9d90a60d494… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:13:52 2023 -0600 adsldp: Remove unused heap.h include. --- dlls/adsldp/schema.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/adsldp/schema.c b/dlls/adsldp/schema.c index d8d0d7e9cde..94b1000ec32 100644 --- a/dlls/adsldp/schema.c +++ b/dlls/adsldp/schema.c @@ -25,7 +25,6 @@ #include "adsldp_private.h" -#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(adsldp);

1 0

Alex Henrie : avrt: Use CRT allocation functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 7c05d3902372fd965f17a3e139e5a51a8f5e6e33 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c05d3902372fd965f17a3e139e5a5… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:15:20 2023 -0600 avrt: Use CRT allocation functions. --- dlls/avrt/main.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/avrt/main.c b/dlls/avrt/main.c index abcf0ab68ab..68af35c891a 100644 --- a/dlls/avrt/main.c +++ b/dlls/avrt/main.c @@ -23,18 +23,17 @@ #include "winbase.h" #include "winnls.h" #include "wine/debug.h" -#include "wine/heap.h" #include "avrt.h" WINE_DEFAULT_DEBUG_CHANNEL(avrt); -static inline WCHAR *heap_strdupAW(const char *src) +static inline WCHAR *strdupAW(const char *src) { int len; WCHAR *dst; if (!src) return NULL; len = MultiByteToWideChar(CP_ACP, 0, src, -1, NULL, 0); - if ((dst = heap_alloc(len * sizeof(*dst)))) MultiByteToWideChar(CP_ACP, 0, src, -1, dst, len); + if ((dst = malloc(len * sizeof(*dst)))) MultiByteToWideChar(CP_ACP, 0, src, -1, dst, len); return dst; } @@ -43,7 +42,7 @@ HANDLE WINAPI AvSetMmThreadCharacteristicsA(const char *name, DWORD *index) WCHAR *nameW = NULL; HANDLE ret; - if (name && !(nameW = heap_strdupAW(name))) + if (name && !(nameW = strdupAW(name))) { SetLastError(ERROR_OUTOFMEMORY); return NULL; @@ -51,7 +50,7 @@ HANDLE WINAPI AvSetMmThreadCharacteristicsA(const char *name, DWORD *index) ret = AvSetMmThreadCharacteristicsW(nameW, index); - heap_free(nameW); + free(nameW); return ret; } @@ -97,13 +96,13 @@ HANDLE WINAPI AvSetMmMaxThreadCharacteristicsA(const char *task1, const char *ta WCHAR *task1W = NULL, *task2W = NULL; HANDLE ret; - if (task1 && !(task1W = heap_strdupAW(task1))) + if (task1 && !(task1W = strdupAW(task1))) { SetLastError(ERROR_OUTOFMEMORY); return NULL; } - if (task2 && !(task2W = heap_strdupAW(task2))) + if (task2 && !(task2W = strdupAW(task2))) { SetLastError(ERROR_OUTOFMEMORY); return NULL; @@ -111,8 +110,8 @@ HANDLE WINAPI AvSetMmMaxThreadCharacteristicsA(const char *task1, const char *ta ret = AvSetMmMaxThreadCharacteristicsW(task1W, task2W, index); - heap_free(task2W); - heap_free(task1W); + free(task2W); + free(task1W); return ret; }

1 0

Alex Henrie : quartz: Use debugstr_fourcc instead of debugstr_an.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: f73a8396124d237dee5d012bace3610f81bc3c48 URL: https://gitlab.winehq.org/wine/wine/-/commit/f73a8396124d237dee5d012bace361… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Nov 2 21:04:45 2023 -0600 quartz: Use debugstr_fourcc instead of debugstr_an. --- dlls/quartz/filtermapper.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 69755c3648e..87d7c4bb5d5 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -373,7 +373,7 @@ struct REG_RF struct REG_RFP { - BYTE signature[4]; /* e.g. "0pi3" */ + DWORD signature; /* e.g. '0pi3' */ DWORD dwFlags; DWORD dwInstances; DWORD dwMediaTypes; @@ -384,7 +384,7 @@ struct REG_RFP struct REG_TYPE { - BYTE signature[4]; /* e.g. "0ty3" */ + DWORD signature; /* e.g. '0ty3' */ DWORD dwUnused; DWORD dwOffsetMajor; DWORD dwOffsetMinor; @@ -613,11 +613,7 @@ static HRESULT FM2_WriteFilterData(const REGFILTER2 * prf2, BYTE **ppData, ULONG REGFILTERPINS2 rgPin2 = prf2->rgPins2[i]; unsigned int j; - rrfp.signature[0] = '0'; - rrfp.signature[1] = 'p'; - rrfp.signature[2] = 'i'; - rrfp.signature[3] = '3'; - rrfp.signature[0] += i; + rrfp.signature = MAKEFOURCC('0'+i,'p','i','3'); rrfp.dwFlags = rgPin2.dwFlags; rrfp.dwInstances = rgPin2.cInstances; rrfp.dwMediaTypes = rgPin2.nMediaTypes; @@ -639,11 +635,7 @@ static HRESULT FM2_WriteFilterData(const REGFILTER2 * prf2, BYTE **ppData, ULONG { struct REG_TYPE rt; const CLSID * clsMinorType = rgPin2.lpMediaType[j].clsMinorType ? rgPin2.lpMediaType[j].clsMinorType : &MEDIASUBTYPE_NULL; - rt.signature[0] = '0'; - rt.signature[1] = 't'; - rt.signature[2] = 'y'; - rt.signature[3] = '3'; - rt.signature[0] += j; + rt.signature = MAKEFOURCC('0'+j,'t','y','3'); rt.dwUnused = 0; rt.dwOffsetMajor = find_data(&clsidStore, rgPin2.lpMediaType[j].clsMajorType, sizeof(CLSID)); if (rt.dwOffsetMajor == -1) @@ -726,7 +718,7 @@ static HRESULT FM2_ReadFilterData(BYTE *pData, REGFILTER2 * prf2) /* FIXME: check signature */ - TRACE("\tsignature = %s\n", debugstr_an((const char*)prrfp->signature, 4)); + TRACE("\tsignature = %s\n", debugstr_fourcc(prrfp->signature)); TRACE("\tPin %lu: dwFlags %#lx, dwInstances %lu, dwMediaTypes %lu, dwMediums %lu.\n", i, prrfp->dwFlags, prrfp->dwInstances, prrfp->dwMediaTypes, prrfp->dwMediums); @@ -760,7 +752,7 @@ static HRESULT FM2_ReadFilterData(BYTE *pData, REGFILTER2 * prf2) CLSID * clsMinor = CoTaskMemAlloc(sizeof(CLSID)); /* FIXME: check signature */ - TRACE("\t\tsignature = %s\n", debugstr_an((const char*)prt->signature, 4)); + TRACE("\t\tsignature = %s\n", debugstr_fourcc(prt->signature)); memcpy(clsMajor, pData + prt->dwOffsetMajor, sizeof(CLSID)); memcpy(clsMinor, pData + prt->dwOffsetMinor, sizeof(CLSID));

1 0

Zhiyi Zhang : ddraw: Restore WS_EX_TOPMOST in exclusive fullscreen mode if it got removed.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: wine Branch: master Commit: 9092a4ccca9d9da93a5fb0d611c05c3aae4882c8 URL: https://gitlab.winehq.org/wine/wine/-/commit/9092a4ccca9d9da93a5fb0d611c05c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Sep 19 17:30:23 2023 +0800 ddraw: Restore WS_EX_TOPMOST in exclusive fullscreen mode if it got removed. Tests show that there is a ~1.5s timer that checks for the presence of WS_EX_TOPMOST and restore it if it got removed when the timer times out. Manual tests that skip WM_TIMER handling show there is a 1.5s timer of ID 0x4242 keeps firing. The timer stops when its WM_TIMER message gets handled. Fix Deus Ex: Game of the Year Edition missing WS_EX_TOPMOST after changing resolutions in fullscreen mode. The application removes WS_EX_TOPMOST from its game window after entering fullscreen. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 3 +++ dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 2 +- dlls/ddraw/tests/ddraw4.c | 2 +- dlls/ddraw/tests/ddraw7.c | 2 +- dlls/wined3d/swapchain.c | 28 ++++++++++++++++++++++++++++ include/wine/wined3d.h | 1 + 8 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 94b38258acd..5887854556b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -587,7 +587,7 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw, HWND window, swapchain_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; swapchain_desc.device_window = window; swapchain_desc.windowed = !(cooplevel & DDSCL_FULLSCREEN); - swapchain_desc.flags = WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH | WINED3D_SWAPCHAIN_IMPLICIT; + swapchain_desc.flags = DDRAW_WINED3D_SWAPCHAIN_FLAGS; if ((cooplevel & DDSCL_NOWINDOWCHANGES) || window != GetForegroundWindow()) swapchain_desc.flags |= WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index d8bd335f615..f40188f75ef 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -64,6 +64,9 @@ struct FvfToDecl | WINED3D_FOCUS_MESSAGES | WINED3D_PIXEL_CENTER_INTEGER | WINED3D_LEGACY_UNBOUND_RESOURCE_COLOR \ | WINED3D_NO_PRIMITIVE_RESTART | WINED3D_LEGACY_CUBEMAP_FILTERING | WINED3D_NO_DRAW_INDIRECT) +#define DDRAW_WINED3D_SWAPCHAIN_FLAGS (WINED3D_SWAPCHAIN_ALLOW_MODE_SWITCH \ + | WINED3D_SWAPCHAIN_IMPLICIT | WINED3D_SWAPCHAIN_REGISTER_TOPMOST_TIMER) + #define DDRAW_MAX_ACTIVE_LIGHTS 32 #define DDRAW_MAX_TEXTURES 8 diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index e7483c30863..02d6adbb433 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2807,7 +2807,7 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_STYLE); ok(!(tmp & WS_VISIBLE), "Got unexpected WS_VISIBLE.\n"); tmp = GetWindowLongA(window, GWL_EXSTYLE); - todo_wine ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); + ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); ref = IDirectDraw_Release(ddraw); ok(!ref, "Unexpected refcount %lu.\n", ref); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index b51ebff0006..f4cc5df0558 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2893,7 +2893,7 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_STYLE); ok(!(tmp & WS_VISIBLE), "Got unexpected WS_VISIBLE.\n"); tmp = GetWindowLongA(window, GWL_EXSTYLE); - todo_wine ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); + ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); ref = IDirectDraw2_Release(ddraw); ok(!ref, "Unexpected refcount %lu.\n", ref); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 0b1eb1e197b..4811053a231 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3131,7 +3131,7 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_STYLE); ok(!(tmp & WS_VISIBLE), "Got unexpected WS_VISIBLE.\n"); tmp = GetWindowLongA(window, GWL_EXSTYLE); - todo_wine ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); + ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); ref = IDirectDraw4_Release(ddraw); ok(!ref, "Unexpected refcount %lu.\n", ref); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 68b96ff6e7c..ab43c1bbb2d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2850,7 +2850,7 @@ static void test_window_style(void) tmp = GetWindowLongA(window, GWL_STYLE); ok(!(tmp & WS_VISIBLE), "Got unexpected WS_VISIBLE.\n"); tmp = GetWindowLongA(window, GWL_EXSTYLE); - todo_wine ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); + ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); ref = IDirectDraw7_Release(ddraw); ok(!ref, "Unexpected refcount %lu.\n", ref); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 99d717641e1..c30c43734c0 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -2151,8 +2151,20 @@ struct wined3d_window_state int x, y, width, height; uint32_t flags; bool set_style; + bool register_topmost_timer; + bool set_topmost_timer; }; +#define WINED3D_WINDOW_TOPMOST_TIMER_ID 0x4242 + +static void CALLBACK topmost_timer_proc(HWND hwnd, UINT msg, UINT_PTR id, DWORD time) +{ + if (!(GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST)) + SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); + + KillTimer(hwnd, WINED3D_WINDOW_TOPMOST_TIMER_ID); +} + static DWORD WINAPI set_window_state_thread(void *ctx) { struct wined3d_window_state *s = ctx; @@ -2176,6 +2188,7 @@ static DWORD WINAPI set_window_state_thread(void *ctx) static void set_window_state(struct wined3d_window_state *s) { + static const UINT timeout = 1500; DWORD window_tid = GetWindowThreadProcessId(s->window, NULL); DWORD tid = GetCurrentThreadId(); HANDLE thread; @@ -2187,6 +2200,17 @@ static void set_window_state(struct wined3d_window_state *s) if (window_tid == tid) { set_window_state_thread(s); + + /* Deus Ex: Game of the Year Edition removes WS_EX_TOPMOST after changing resolutions in + * exclusive fullscreen mode. Tests show that WS_EX_TOPMOST will be restored when a ~1.5s + * timer times out */ + if (s->register_topmost_timer) + { + if (s->set_topmost_timer) + SetTimer(s->window, WINED3D_WINDOW_TOPMOST_TIMER_ID, timeout, topmost_timer_proc); + else + KillTimer(s->window, WINED3D_WINDOW_TOPMOST_TIMER_ID); + } } else if ((thread = CreateThread(NULL, 0, set_window_state_thread, s, 0, NULL))) { @@ -2239,6 +2263,8 @@ HRESULT wined3d_swapchain_state_setup_fullscreen(struct wined3d_swapchain_state s->style = fullscreen_style(state->style); s->exstyle = fullscreen_exstyle(state->exstyle); s->set_style = true; + s->register_topmost_timer = !!(state->desc.flags & WINED3D_SWAPCHAIN_REGISTER_TOPMOST_TIMER); + s->set_topmost_timer = true; TRACE("Old style was %08lx, %08lx, setting to %08lx, %08lx.\n", state->style, state->exstyle, s->style, s->exstyle); @@ -2293,6 +2319,8 @@ void wined3d_swapchain_state_restore_from_fullscreen(struct wined3d_swapchain_st * when switching between windowed and fullscreen modes (HL2), some * depend on the original style (Eve Online). */ s->set_style = style == fullscreen_style(state->style) && exstyle == fullscreen_exstyle(state->exstyle); + s->register_topmost_timer = !!(state->desc.flags & WINED3D_SWAPCHAIN_REGISTER_TOPMOST_TIMER); + s->set_topmost_timer = false; if (window_rect) { diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ad90c0d6b36..7c51c9cfef9 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -902,6 +902,7 @@ enum wined3d_memory_segment_group #define WINED3D_SWAPCHAIN_REGISTER_STATE 0x00020000u #define WINED3D_SWAPCHAIN_NO_WINDOW_CHANGES 0x00040000u #define WINED3D_SWAPCHAIN_RESTORE_WINDOW_STATE 0x00080000u +#define WINED3D_SWAPCHAIN_REGISTER_TOPMOST_TIMER 0x00100000u #define WINED3DDP_MAXTEXCOORD 8

1 0

Zhiyi Zhang : ddraw/tests: Test WS_EX_TOPMOST restoration.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: wine Branch: master Commit: a87c1d251ed0b67a409806df9e5175bd3b5aa23e URL: https://gitlab.winehq.org/wine/wine/-/commit/a87c1d251ed0b67a409806df9e5175… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Sep 19 12:14:02 2023 +0800 ddraw/tests: Test WS_EX_TOPMOST restoration. Test that there is a ~1.5s timer after entering fullscreen mode and restores WS_EX_TOPMOST if it's missing when the timer times out. --- dlls/ddraw/tests/ddraw1.c | 30 ++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 30 ++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 30 ++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 30 ++++++++++++++++++++++++++++++ 4 files changed, 120 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 453425ac2f9..e7483c30863 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2779,6 +2779,36 @@ static void test_window_style(void) expected_style = exstyle | WS_EX_TOPMOST; todo_wine ok(tmp == expected_style, "Expected window extended style %#lx, got %#lx.\n", expected_style, tmp); + /* Test that there is a ~1.5s timer that checks and restores WS_EX_TOPMOST if it's missing */ + ret = ShowWindow(window, SW_RESTORE); + ok(ret, "ShowWindow failed, error %#lx.\n", GetLastError()); + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#lx.\n", hr); + flush_events(); + + /* Remove WS_VISIBLE and WS_EX_TOPMOST */ + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp & WS_VISIBLE, "Expected WS_VISIBLE.\n"); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); + ret = ShowWindow(window, SW_HIDE); + ok(ret, "ShowWindow failed, error %#lx.\n", GetLastError()); + ret = SetWindowPos(window, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); + ok(ret, "SetWindowPos failed, error %#lx.\n", GetLastError()); + tmp = GetWindowLongA(window, GWL_STYLE); + ok(!(tmp & WS_VISIBLE), "Got unexpected WS_VISIBLE.\n"); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + ok(!(tmp & WS_EX_TOPMOST), "Got unexpected WS_EX_TOPMOST.\n"); + + Sleep(2000); + flush_events(); + + /* WS_VISIBLE is not restored but WS_EX_TOPMOST is */ + tmp = GetWindowLongA(window, GWL_STYLE); + ok(!(tmp & WS_VISIBLE), "Got unexpected WS_VISIBLE.\n"); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); + ref = IDirectDraw_Release(ddraw); ok(!ref, "Unexpected refcount %lu.\n", ref); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 22a4033500c..b51ebff0006 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2865,6 +2865,36 @@ static void test_window_style(void) expected_style = exstyle | WS_EX_TOPMOST; todo_wine ok(tmp == expected_style, "Expected window extended style %#lx, got %#lx.\n", expected_style, tmp); + /* Test that there is a ~1.5s timer that checks and restores WS_EX_TOPMOST if it's missing */ + ret = ShowWindow(window, SW_RESTORE); + ok(ret, "ShowWindow failed, error %#lx.\n", GetLastError()); + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#lx.\n", hr); + flush_events(); + + /* Remove WS_VISIBLE and WS_EX_TOPMOST */ + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp & WS_VISIBLE, "Expected WS_VISIBLE.\n"); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); + ret = ShowWindow(window, SW_HIDE); + ok(ret, "ShowWindow failed, error %#lx.\n", GetLastError()); + ret = SetWindowPos(window, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); + ok(ret, "SetWindowPos failed, error %#lx.\n", GetLastError()); + tmp = GetWindowLongA(window, GWL_STYLE); + ok(!(tmp & WS_VISIBLE), "Got unexpected WS_VISIBLE.\n"); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + ok(!(tmp & WS_EX_TOPMOST), "Got unexpected WS_EX_TOPMOST.\n"); + + Sleep(2000); + flush_events(); + + /* WS_VISIBLE is not restored but WS_EX_TOPMOST is */ + tmp = GetWindowLongA(window, GWL_STYLE); + ok(!(tmp & WS_VISIBLE), "Got unexpected WS_VISIBLE.\n"); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); + ref = IDirectDraw2_Release(ddraw); ok(!ref, "Unexpected refcount %lu.\n", ref); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 3e951480bbe..0b1eb1e197b 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3103,6 +3103,36 @@ static void test_window_style(void) expected_style = exstyle | WS_EX_TOPMOST; todo_wine ok(tmp == expected_style, "Expected window extended style %#lx, got %#lx.\n", expected_style, tmp); + /* Test that there is a ~1.5s timer that checks and restores WS_EX_TOPMOST if it's missing */ + ret = ShowWindow(window, SW_RESTORE); + ok(ret, "ShowWindow failed, error %#lx.\n", GetLastError()); + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#lx.\n", hr); + flush_events(); + + /* Remove WS_VISIBLE and WS_EX_TOPMOST */ + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp & WS_VISIBLE, "Expected WS_VISIBLE.\n"); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); + ret = ShowWindow(window, SW_HIDE); + ok(ret, "ShowWindow failed, error %#lx.\n", GetLastError()); + ret = SetWindowPos(window, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); + ok(ret, "SetWindowPos failed, error %#lx.\n", GetLastError()); + tmp = GetWindowLongA(window, GWL_STYLE); + ok(!(tmp & WS_VISIBLE), "Got unexpected WS_VISIBLE.\n"); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + ok(!(tmp & WS_EX_TOPMOST), "Got unexpected WS_EX_TOPMOST.\n"); + + Sleep(2000); + flush_events(); + + /* WS_VISIBLE is not restored but WS_EX_TOPMOST is */ + tmp = GetWindowLongA(window, GWL_STYLE); + ok(!(tmp & WS_VISIBLE), "Got unexpected WS_VISIBLE.\n"); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); + ref = IDirectDraw4_Release(ddraw); ok(!ref, "Unexpected refcount %lu.\n", ref); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 91da029cc42..68b96ff6e7c 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2822,6 +2822,36 @@ static void test_window_style(void) expected_style = exstyle | WS_EX_TOPMOST; todo_wine ok(tmp == expected_style, "Expected window extended style %#lx, got %#lx.\n", expected_style, tmp); + /* Test that there is a ~1.5s timer that checks and restores WS_EX_TOPMOST if it's missing */ + ret = ShowWindow(window, SW_RESTORE); + ok(ret, "ShowWindow failed, error %#lx.\n", GetLastError()); + hr = IDirectDraw7_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#lx.\n", hr); + flush_events(); + + /* Remove WS_VISIBLE and WS_EX_TOPMOST */ + tmp = GetWindowLongA(window, GWL_STYLE); + ok(tmp & WS_VISIBLE, "Expected WS_VISIBLE.\n"); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); + ret = ShowWindow(window, SW_HIDE); + ok(ret, "ShowWindow failed, error %#lx.\n", GetLastError()); + ret = SetWindowPos(window, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE); + ok(ret, "SetWindowPos failed, error %#lx.\n", GetLastError()); + tmp = GetWindowLongA(window, GWL_STYLE); + ok(!(tmp & WS_VISIBLE), "Got unexpected WS_VISIBLE.\n"); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + ok(!(tmp & WS_EX_TOPMOST), "Got unexpected WS_EX_TOPMOST.\n"); + + Sleep(2000); + flush_events(); + + /* WS_VISIBLE is not restored but WS_EX_TOPMOST is */ + tmp = GetWindowLongA(window, GWL_STYLE); + ok(!(tmp & WS_VISIBLE), "Got unexpected WS_VISIBLE.\n"); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp & WS_EX_TOPMOST, "Expected WS_EX_TOPMOST.\n"); + ref = IDirectDraw7_Release(ddraw); ok(!ref, "Unexpected refcount %lu.\n", ref);

1 0

Gabriel Ivăncescu : mshtml: Traverse and unlink the Element referenced from the CurrentStyle.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: wine Branch: master Commit: 213786efe2f745dfc79b97177da66a3194ddc1bb URL: https://gitlab.winehq.org/wine/wine/-/commit/213786efe2f745dfc79b97177da66a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 2 16:11:20 2023 +0200 mshtml: Traverse and unlink the Element referenced from the CurrentStyle. This was actually leaking even before the Cycle Collection was implemented. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlcurstyle.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 07f67d5cbf6..29543eb4a18 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -1278,9 +1278,14 @@ static const IHTMLCurrentStyle4Vtbl HTMLCurrentStyle4Vtbl = { HTMLCurrentStyle4_get_maxWidth }; +static inline HTMLCurrentStyle *impl_from_DispatchEx(DispatchEx *dispex) +{ + return CONTAINING_RECORD(dispex, HTMLCurrentStyle, css_style.dispex); +} + static void *HTMLCurrentStyle_query_interface(DispatchEx *dispex, REFIID riid) { - HTMLCurrentStyle *This = CONTAINING_RECORD(dispex, HTMLCurrentStyle, css_style.dispex); + HTMLCurrentStyle *This = impl_from_DispatchEx(dispex); if(IsEqualGUID(&IID_IHTMLCurrentStyle, riid)) return &This->IHTMLCurrentStyle_iface; @@ -1293,11 +1298,32 @@ static void *HTMLCurrentStyle_query_interface(DispatchEx *dispex, REFIID riid) return CSSStyle_query_interface(&This->css_style.dispex, riid); } +static void HTMLCurrentStyle_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLCurrentStyle *This = impl_from_DispatchEx(dispex); + CSSStyle_traverse(&This->css_style.dispex, cb); + + if(This->elem) + note_cc_edge((nsISupports*)&This->elem->node.IHTMLDOMNode_iface, "elem", cb); +} + +static void HTMLCurrentStyle_unlink(DispatchEx *dispex) +{ + HTMLCurrentStyle *This = impl_from_DispatchEx(dispex); + CSSStyle_unlink(&This->css_style.dispex); + + if(This->elem) { + HTMLElement *elem = This->elem; + This->elem = NULL; + IHTMLDOMNode_Release(&elem->node.IHTMLDOMNode_iface); + } +} + static const dispex_static_data_vtbl_t HTMLCurrentStyle_dispex_vtbl = { CSSSTYLE_DISPEX_VTBL_ENTRIES, .query_interface = HTMLCurrentStyle_query_interface, - .traverse = CSSStyle_traverse, - .unlink = CSSStyle_unlink + .traverse = HTMLCurrentStyle_traverse, + .unlink = HTMLCurrentStyle_unlink }; static const tid_t HTMLCurrentStyle_iface_tids[] = {

1 0

Gabriel Ivăncescu : mshtml: Traverse and unlink the style_sheet referenced from the StyleElement.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: wine Branch: master Commit: dbf0e43ff84f30789f89249e3ef7e65c727ce66c URL: https://gitlab.winehq.org/wine/wine/-/commit/dbf0e43ff84f30789f89249e3ef7e6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 2 16:11:20 2023 +0200 mshtml: Traverse and unlink the style_sheet referenced from the StyleElement. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlstyleelem.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index c69b0df505d..5b3d9165964 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -382,6 +382,8 @@ static void HTMLStyleElement_traverse(DispatchEx *dispex, nsCycleCollectionTrave HTMLStyleElement *This = impl_from_DispatchEx(dispex); HTMLElement_traverse(dispex, cb); + if(This->style_sheet) + note_cc_edge((nsISupports*)This->style_sheet, "style_sheet", cb); if(This->nsstyle) note_cc_edge((nsISupports*)This->nsstyle, "nsstyle", cb); } @@ -390,15 +392,8 @@ static void HTMLStyleElement_unlink(DispatchEx *dispex) { HTMLStyleElement *This = impl_from_DispatchEx(dispex); HTMLElement_unlink(dispex); - unlink_ref(&This->nsstyle); -} - -static void HTMLStyleElement_destructor(DispatchEx *dispex) -{ - HTMLStyleElement *This = impl_from_DispatchEx(dispex); - unlink_ref(&This->style_sheet); - HTMLElement_destructor(dispex); + unlink_ref(&This->nsstyle); } static void HTMLStyleElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) @@ -429,7 +424,7 @@ static const event_target_vtbl_t HTMLStyleElement_event_target_vtbl = { { HTMLELEMENT_DISPEX_VTBL_ENTRIES, .query_interface= HTMLStyleElement_query_interface, - .destructor = HTMLStyleElement_destructor, + .destructor = HTMLElement_destructor, .traverse = HTMLStyleElement_traverse, .unlink = HTMLStyleElement_unlink },

1 0

Brendan Shanks : qcap: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: wine Branch: master Commit: 4a28ff54b2c1c91490c4a13884ac7fa1a0ccc325 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a28ff54b2c1c91490c4a13884ac7f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Oct 23 15:27:05 2023 -0500 qcap: Ensure unixlib function tables and enum stay in sync. --- dlls/qcap/qcap_private.h | 1 + dlls/qcap/v4l.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/dlls/qcap/qcap_private.h b/dlls/qcap/qcap_private.h index 8b213671775..c9119b6a52e 100644 --- a/dlls/qcap/qcap_private.h +++ b/dlls/qcap/qcap_private.h @@ -141,6 +141,7 @@ enum unix_funcs unix_get_prop, unix_set_prop, unix_read_frame, + unix_funcs_count }; #endif diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index b2ccaa6c53e..134c3eca9e1 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -593,6 +593,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = v4l_device_read_frame, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); + #ifdef _WIN64 typedef ULONG PTR32; @@ -857,6 +859,8 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = wow64_v4l_device_read_frame, }; +C_ASSERT( ARRAYSIZE(__wine_unix_call_wow64_funcs) == unix_funcs_count ); + #endif /* _WIN64 */ #endif /* HAVE_LINUX_VIDEODEV2_H */

1 0

Gabriel Ivăncescu : mshtml: Keep refs from the Attributes and AttributeCollection to the Element.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: wine Branch: master Commit: 9ea3493cb690e93756e874dbc29fdc690fa4715e URL: https://gitlab.winehq.org/wine/wine/-/commit/9ea3493cb690e93756e874dbc29fdc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 2 16:11:19 2023 +0200 mshtml: Keep refs from the Attributes and AttributeCollection to the Element. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlanchor.c | 4 ++-- dlls/mshtml/htmlarea.c | 4 ++-- dlls/mshtml/htmlattr.c | 12 +++++++++- dlls/mshtml/htmlbody.c | 4 ++-- dlls/mshtml/htmlcomment.c | 4 ++-- dlls/mshtml/htmlelem.c | 54 ++++++++++++++++++++++++++------------------ dlls/mshtml/htmlform.c | 4 ++-- dlls/mshtml/htmlframe.c | 4 ++-- dlls/mshtml/htmlgeneric.c | 4 ++-- dlls/mshtml/htmlhead.c | 16 ++++++------- dlls/mshtml/htmlimg.c | 4 ++-- dlls/mshtml/htmlinput.c | 12 +++++----- dlls/mshtml/htmllink.c | 4 ++-- dlls/mshtml/htmlobject.c | 8 +++---- dlls/mshtml/htmlscript.c | 4 ++-- dlls/mshtml/htmlselect.c | 8 +++---- dlls/mshtml/htmlstyleelem.c | 4 ++-- dlls/mshtml/htmltable.c | 12 +++++----- dlls/mshtml/htmltextarea.c | 4 ++-- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/svg.c | 16 ++++++------- 21 files changed, 105 insertions(+), 83 deletions(-)

1 0

Gabriel Ivăncescu : mshtml: Keep ref from the associated Style to the Element.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: wine Branch: master Commit: db2d10b3a3225d576aef4351252a8e48e1a9228a URL: https://gitlab.winehq.org/wine/wine/-/commit/db2d10b3a3225d576aef4351252a8e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Nov 2 16:11:19 2023 +0200 mshtml: Keep ref from the associated Style to the Element. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmlcurstyle.c | 4 +++- dlls/mshtml/htmlelem.c | 24 ++++++++++++++---------- dlls/mshtml/htmlstyle.c | 41 ++++++++++++++++++++++++++++++++++++----- dlls/mshtml/htmlstyle.h | 2 -- 4 files changed, 53 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 27ad42410c1..07f67d5cbf6 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -1295,7 +1295,9 @@ static void *HTMLCurrentStyle_query_interface(DispatchEx *dispex, REFIID riid) static const dispex_static_data_vtbl_t HTMLCurrentStyle_dispex_vtbl = { CSSSTYLE_DISPEX_VTBL_ENTRIES, - .query_interface = HTMLCurrentStyle_query_interface + .query_interface = HTMLCurrentStyle_query_interface, + .traverse = CSSStyle_traverse, + .unlink = CSSStyle_unlink }; static const tid_t HTMLCurrentStyle_iface_tids[] = { diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index e3010d3f059..cfc84523436 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6863,6 +6863,10 @@ void HTMLElement_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback HTMLElement *This = impl_from_DispatchEx(dispex); HTMLDOMNode_traverse(&This->node.event_target.dispex, cb); + if(This->style) + note_cc_edge((nsISupports*)&This->style->IHTMLStyle_iface, "style", cb); + if(This->runtime_style) + note_cc_edge((nsISupports*)&This->runtime_style->IHTMLStyle_iface, "runtime_style", cb); if(This->attrs) note_cc_edge((nsISupports*)&This->attrs->IHTMLAttributeCollection_iface, "attrs", cb); } @@ -6872,6 +6876,16 @@ void HTMLElement_unlink(DispatchEx *dispex) HTMLElement *This = impl_from_DispatchEx(dispex); HTMLDOMNode_unlink(&This->node.event_target.dispex); + if(This->style) { + HTMLStyle *style = This->style; + This->style = NULL; + IHTMLStyle_Release(&style->IHTMLStyle_iface); + } + if(This->runtime_style) { + HTMLStyle *runtime_style = This->runtime_style; + This->runtime_style = NULL; + IHTMLStyle_Release(&runtime_style->IHTMLStyle_iface); + } if(This->attrs) { HTMLAttributeCollection *attrs = This->attrs; This->attrs = NULL; @@ -6884,16 +6898,6 @@ void HTMLElement_destructor(DispatchEx *dispex) HTMLElement *This = impl_from_DispatchEx(dispex); ConnectionPointContainer_Destroy(&This->cp_container); - - if(This->style) { - This->style->elem = NULL; - IHTMLStyle_Release(&This->style->IHTMLStyle_iface); - } - if(This->runtime_style) { - This->runtime_style->elem = NULL; - IHTMLStyle_Release(&This->runtime_style->IHTMLStyle_iface); - } - free(This->filter); HTMLDOMNode_destructor(&This->node.event_target.dispex); } diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 8c4af46836f..6dfa9744df3 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -9967,9 +9967,14 @@ HRESULT CSSStyle_get_dispid(DispatchEx *dispex, BSTR name, DWORD flags, DISPID * return DISP_E_UNKNOWNNAME; } +static inline HTMLStyle *HTMLStyle_from_DispatchEx(DispatchEx *dispex) +{ + return CONTAINING_RECORD(dispex, HTMLStyle, css_style.dispex); +} + static void *HTMLStyle_query_interface(DispatchEx *dispex, REFIID riid) { - HTMLStyle *This = CONTAINING_RECORD(dispex, HTMLStyle, css_style.dispex); + HTMLStyle *This = HTMLStyle_from_DispatchEx(dispex); if(IsEqualGUID(&IID_IHTMLStyle, riid)) return &This->IHTMLStyle_iface; @@ -9986,6 +9991,27 @@ static void *HTMLStyle_query_interface(DispatchEx *dispex, REFIID riid) return CSSStyle_query_interface(&This->css_style.dispex, riid); } +static void HTMLStyle_traverse(DispatchEx *dispex, nsCycleCollectionTraversalCallback *cb) +{ + HTMLStyle *This = HTMLStyle_from_DispatchEx(dispex); + CSSStyle_traverse(&This->css_style.dispex, cb); + + if(This->elem) + note_cc_edge((nsISupports*)&This->elem->node.IHTMLDOMNode_iface, "elem", cb); +} + +static void HTMLStyle_unlink(DispatchEx *dispex) +{ + HTMLStyle *This = HTMLStyle_from_DispatchEx(dispex); + CSSStyle_unlink(&This->css_style.dispex); + + if(This->elem) { + HTMLElement *elem = This->elem; + This->elem = NULL; + IHTMLDOMNode_Release(&elem->node.IHTMLDOMNode_iface); + } +} + void CSSStyle_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { if(mode >= COMPAT_MODE_IE9) @@ -9994,9 +10020,11 @@ void CSSStyle_init_dispex_info(dispex_data_t *info, compat_mode_t mode) dispex_info_add_interface(info, IHTMLCSSStyleDeclaration2_tid, NULL); } -static const dispex_static_data_vtbl_t CSSStyle_dispex_vtbl = { +static const dispex_static_data_vtbl_t HTMLStyle_dispex_vtbl = { CSSSTYLE_DISPEX_VTBL_ENTRIES, - .query_interface = HTMLStyle_query_interface + .query_interface = HTMLStyle_query_interface, + .traverse = HTMLStyle_traverse, + .unlink = HTMLStyle_unlink }; static const tid_t HTMLStyle_iface_tids[] = { @@ -10010,7 +10038,7 @@ static const tid_t HTMLStyle_iface_tids[] = { }; static dispex_static_data_t HTMLStyle_dispex = { "MSStyleCSSProperties", - &CSSStyle_dispex_vtbl, + &HTMLStyle_dispex_vtbl, DispHTMLStyle_tid, HTMLStyle_iface_tids, CSSStyle_init_dispex_info @@ -10088,6 +10116,7 @@ HRESULT HTMLStyle_Create(HTMLElement *elem, HTMLStyle **ret) style->IHTMLStyle6_iface.lpVtbl = &HTMLStyle6Vtbl; style->elem = elem; + IHTMLDOMNode_AddRef(&elem->node.IHTMLDOMNode_iface); init_css_style(&style->css_style, nsstyle, &HTMLStyle_dispex, dispex_compat_mode(&elem->node.event_target.dispex)); nsIDOMCSSStyleDeclaration_Release(nsstyle); @@ -10098,7 +10127,9 @@ HRESULT HTMLStyle_Create(HTMLElement *elem, HTMLStyle **ret) static const dispex_static_data_vtbl_t HTMLW3CComputedStyle_dispex_vtbl = { CSSSTYLE_DISPEX_VTBL_ENTRIES, - .query_interface = CSSStyle_query_interface + .query_interface = CSSStyle_query_interface, + .traverse = CSSStyle_traverse, + .unlink = CSSStyle_unlink }; static const tid_t HTMLW3CComputedStyle_iface_tids[] = { diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 5246e799ce5..f6d5ea7c5bb 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -166,6 +166,4 @@ HRESULT set_elem_style(HTMLElement*,styleid_t,const WCHAR*); #define CSSSTYLE_DISPEX_VTBL_ENTRIES \ .destructor = CSSStyle_destructor, \ - .traverse = CSSStyle_traverse, \ - .unlink = CSSStyle_unlink, \ .get_dispid = CSSStyle_get_dispid

1 0