- Wine-Commits - list.winehq.org

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

Victor Chiletto : msvcrt, ucrtbase: Introduce rewind_preserve_stack.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: wine Branch: master Commit: 6cfe757eb715d05d8038206dbc5afa1b44b7d1d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/6cfe757eb715d05d8038206dbc5afa… Author: Victor Chiletto <v(a)hnn.net.br> Date: Sat Jul 22 02:00:48 2023 -0300 msvcrt, ucrtbase: Introduce rewind_preserve_stack. This is a small thunk to rewind that preserves the first argument passed. This is needed because on some versions of GCC, rewind's call to _unlock_file is tail-call optimized, which modifies the stack. --- dlls/msvcrt/file.c | 15 ++++++++++++++- dlls/ucrtbase/tests/misc.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 3 ++- 3 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 58a607e3bbe..7cccf96b1c7 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -42,7 +42,7 @@ #include "winnls.h" #include "msvcrt.h" #include "mtdll.h" - +#include "wine/asm.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -1658,6 +1658,19 @@ int CDECL clearerr_s(FILE* file) return 0; } +#if defined(__i386__) +/* Stack preserving thunk for rewind + * needed for the UIO mod for Fallout: New Vegas + */ +__ASM_GLOBAL_FUNC(rewind_preserve_stack, + "pushl 4(%esp)\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + "call "__ASM_NAME("rewind") "\n\t" + "addl $4,%esp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset -4\n\t") + "ret") +#endif + /********************************************************************* * rewind (MSVCRT.@) */ diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 069de0787b7..86cdec88108 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -1591,6 +1591,47 @@ static void test_fopen_exclusive( void ) unlink(path); } +#if defined(__i386__) +#include "pshpack1.h" +struct rewind_thunk { + BYTE push_esp[4]; /* push [esp+0x4] */ + BYTE call_rewind; /* call */ + DWORD rewind_addr; /* relative addr of rewind */ + BYTE pop_eax; /* pop eax */ + BYTE ret; /* ret */ +}; +#include "poppack.h" + +static FILE * (CDECL *test_rewind_wrapper)(FILE *fp); + +static void test_rewind_i386_abi(void) +{ + FILE *fp_in, *fp_out; + + struct rewind_thunk *thunk = VirtualAlloc(NULL, sizeof(*thunk), MEM_COMMIT, PAGE_EXECUTE_READWRITE); + + thunk->push_esp[0] = 0xff; + thunk->push_esp[1] = 0x74; + thunk->push_esp[2] = 0x24; + thunk->push_esp[3] = 0x04; + + thunk->call_rewind = 0xe8; + thunk->rewind_addr = (BYTE *) rewind - (BYTE *) (&thunk->rewind_addr + 1); + + thunk->pop_eax = 0x58; + thunk->ret = 0xc3; + + test_rewind_wrapper = (void *) thunk; + + fp_in = fopen("rewind_abi.tst", "wb"); + fp_out = test_rewind_wrapper(fp_in); + ok(fp_in == fp_out, "rewind modified the first argument in the stack\n"); + + fclose(fp_in); + unlink("rewind_abi.tst"); +} +#endif + START_TEST(misc) { int arg_c; @@ -1633,4 +1674,7 @@ START_TEST(misc) test_thread_storage(); test_fenv(); test_fopen_exclusive(); +#if defined(__i386__) + test_rewind_i386_abi(); +#endif } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 4f54e1641fc..33c66e2f0b3 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2470,7 +2470,8 @@ @ cdecl remquof(float float ptr) @ cdecl remquol(double double ptr) remquo @ cdecl rename(str str) -@ cdecl rewind(ptr) +@ cdecl -arch=i386 rewind(ptr) rewind_preserve_stack +@ cdecl -arch=!i386 rewind(ptr) @ cdecl rint(double) MSVCRT_rint @ cdecl rintf(float) @ cdecl rintl(double) MSVCRT_rint

1 0

Hans Leidekker : advapi32/tests: Get rid of an unreliable eventlog test.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: wine Branch: master Commit: 03a2d4851b2e7dcc76f096752ec149a30514c9de URL: https://gitlab.winehq.org/wine/wine/-/commit/03a2d4851b2e7dcc76f096752ec149… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 2 15:09:32 2023 +0100 advapi32/tests: Get rid of an unreliable eventlog test. It can take a while before a new eventlog file is created on Windows. Rather than waiting for it I chose to remove this test since it seems doubtful that any application will need to access the file directly. --- dlls/advapi32/tests/eventlog.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/dlls/advapi32/tests/eventlog.c b/dlls/advapi32/tests/eventlog.c index b5965eb609d..b27d1bde7d2 100644 --- a/dlls/advapi32/tests/eventlog.c +++ b/dlls/advapi32/tests/eventlog.c @@ -1156,24 +1156,10 @@ static void test_autocreation(void) /* On Windows we also automatically get an eventlog file */ GetSystemDirectoryA(sysdir, sizeof(sysdir)); - /* NT4 - W2K3 */ lstrcpyA(eventlogfile, sysdir); - lstrcatA(eventlogfile, "\\config\\"); + lstrcatA(eventlogfile, "\\winevt\\Logs\\"); lstrcatA(eventlogfile, eventlogname); - lstrcatA(eventlogfile, ".evt"); - - if (GetFileAttributesA(eventlogfile) == INVALID_FILE_ATTRIBUTES) - { - /* Vista+ */ - lstrcpyA(eventlogfile, sysdir); - lstrcatA(eventlogfile, "\\winevt\\Logs\\"); - lstrcatA(eventlogfile, eventlogname); - lstrcatA(eventlogfile, ".evtx"); - } - - todo_wine - ok(GetFileAttributesA(eventlogfile) != INVALID_FILE_ATTRIBUTES, - "Expected an eventlog file\n"); + lstrcatA(eventlogfile, ".evtx"); if (pWow64RevertWow64FsRedirection) pWow64RevertWow64FsRedirection(redir);

1 0

Bartosz Kosiorek : msvcrt: Add _mbsnbcat_l implementation.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: wine Branch: master Commit: 557a760e7fbba2212ee2e38f4332564a97444dad URL: https://gitlab.winehq.org/wine/wine/-/commit/557a760e7fbba2212ee2e38f433256… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Mon Oct 30 20:29:51 2023 +0100 msvcrt: Add _mbsnbcat_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 52 +++++++++++++++++++++++++++++++++------------ dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 8 files changed, 46 insertions(+), 22 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index f33973f856d..9659cd1f3a2 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1124,7 +1124,7 @@ @ cdecl _mbslwr_s(str long) @ cdecl _mbslwr_s_l(str long ptr) @ cdecl _mbsnbcat(str str long) -@ stub _mbsnbcat_l +@ cdecl _mbsnbcat_l(str str long ptr) @ cdecl _mbsnbcat_s(str long ptr long) @ stub _mbsnbcat_s_l @ cdecl _mbsnbcmp(str str long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 418387e1d29..4bab0eddc99 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1481,7 +1481,7 @@ @ cdecl _mbslwr_s(str long) @ cdecl _mbslwr_s_l(str long ptr) @ cdecl _mbsnbcat(str str long) -@ stub _mbsnbcat_l +@ cdecl _mbsnbcat_l(str str long ptr) @ cdecl _mbsnbcat_s(str long ptr long) @ stub _mbsnbcat_s_l @ cdecl _mbsnbcmp(str str long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 786f4b18caf..e0d87f7f7f1 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1492,7 +1492,7 @@ @ cdecl _mbslwr_s(str long) @ cdecl _mbslwr_s_l(str long ptr) @ cdecl _mbsnbcat(str str long) -@ stub _mbsnbcat_l +@ cdecl _mbsnbcat_l(str str long ptr) @ cdecl _mbsnbcat_s(str long ptr long) @ stub _mbsnbcat_s_l @ cdecl _mbsnbcmp(str str long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index cbd720580ac..5cc72177a33 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -796,7 +796,7 @@ @ cdecl _mbslwr_s(str long) @ cdecl _mbslwr_s_l(str long ptr) @ cdecl _mbsnbcat(str str long) -@ stub _mbsnbcat_l +@ cdecl _mbsnbcat_l(str str long ptr) @ cdecl _mbsnbcat_s(str long ptr long) @ stub _mbsnbcat_s_l @ cdecl _mbsnbcmp(str str long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 6bdbe9ee0e9..556ba1fa1a7 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -774,7 +774,7 @@ @ cdecl _mbslwr_s(str long) @ cdecl _mbslwr_s_l(str long ptr) @ cdecl _mbsnbcat(str str long) -@ stub _mbsnbcat_l +@ cdecl _mbsnbcat_l(str str long ptr) @ cdecl _mbsnbcat_s(str long ptr long) @ stub _mbsnbcat_s_l @ cdecl _mbsnbcmp(str str long) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 06f84d1db4a..23d0bbbaeb8 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2187,24 +2187,40 @@ size_t CDECL _mbsnbcnt(const unsigned char* str, size_t len) } /********************************************************************* - * _mbsnbcat(MSVCRT.@) + * _mbsnbcat_l(MSVCRT.@) */ -unsigned char* CDECL _mbsnbcat(unsigned char* dst, const unsigned char* src, size_t len) +unsigned char* CDECL _mbsnbcat_l(unsigned char *dst, const unsigned char *src, size_t len, _locale_t locale) { - if(get_mbcinfo()->ismbcodepage) + pthreadmbcinfo mbcinfo; + + if (!MSVCRT_CHECK_PMT(dst && src)) + return NULL; + + if (locale) + mbcinfo = locale->mbcinfo; + else + mbcinfo = get_mbcinfo(); + + if (mbcinfo->ismbcodepage) { unsigned char *res = dst; - while (*dst) { - if (_ismbblead(*dst++)) { - if (*dst) { - dst++; - } else { - /* as per msdn overwrite the lead byte in front of '\0' */ - dst--; - break; - } - } - } + + while (*dst) + { + if (_ismbblead_l(*dst++, locale)) + { + if (*dst) + { + dst++; + } + else + { + /* as per msdn overwrite the lead byte in front of '\0' */ + dst--; + break; + } + } + } while (*src && len--) *dst++ = *src++; *dst = '\0'; return res; @@ -2212,6 +2228,14 @@ unsigned char* CDECL _mbsnbcat(unsigned char* dst, const unsigned char* src, siz return u_strncat(dst, src, len); /* ASCII CP */ } +/********************************************************************* + * _mbsnbcat(MSVCRT.@) + */ +unsigned char* CDECL _mbsnbcat(unsigned char *dst, const unsigned char *src, size_t len) +{ + return _mbsnbcat_l(dst, src, len, NULL); +} + int CDECL _mbsnbcat_s(unsigned char *dst, size_t size, const unsigned char *src, size_t len) { unsigned char *ptr = dst; diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a77ed171fb1..e5e938959b8 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -745,7 +745,7 @@ @ cdecl _mbslwr_s(str long) @ cdecl _mbslwr_s_l(str long ptr) @ cdecl _mbsnbcat(str str long) -# stub _mbsnbcat_l(str str long ptr) +@ cdecl _mbsnbcat_l(str str long ptr) @ cdecl _mbsnbcat_s(str long ptr long) # stub _mbsnbcat_s_l(str long ptr long ptr) @ cdecl _mbsnbcmp(str str long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 5b4c2beb491..4f54e1641fc 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -640,7 +640,7 @@ @ cdecl _mbslwr_s(str long) @ cdecl _mbslwr_s_l(str long ptr) @ cdecl _mbsnbcat(str str long) -@ stub _mbsnbcat_l +@ cdecl _mbsnbcat_l(str str long ptr) @ cdecl _mbsnbcat_s(str long ptr long) @ stub _mbsnbcat_s_l @ cdecl _mbsnbcmp(str str long) @@ -1209,7 +1209,7 @@ @ cdecl _o__mbslwr_s(str long) _mbslwr_s @ cdecl _o__mbslwr_s_l(str long ptr) _mbslwr_s_l @ cdecl _o__mbsnbcat(str str long) _mbsnbcat -@ stub _o__mbsnbcat_l +@ cdecl _o__mbsnbcat_l(str str long ptr) _mbsnbcat_l @ cdecl _o__mbsnbcat_s(str long ptr long) _mbsnbcat_s @ stub _o__mbsnbcat_s_l @ cdecl _o__mbsnbcmp(str str long) _mbsnbcmp

1 0

Bartosz Kosiorek : msvcrt: Add _cprintf_l implementation.
by Alexandre Julliard Nov. 2, 2023

Nov. 2, 2023

Module: wine Branch: master Commit: 07404c0b6cf4cad44aff15847bca5042b0a02d3c URL: https://gitlab.winehq.org/wine/wine/-/commit/07404c0b6cf4cad44aff15847bca50… Author: Bartosz Kosiorek <gang65(a)poczta.onet.pl> Date: Mon Oct 30 20:22:03 2023 +0100 msvcrt: Add _cprintf_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/console.c | 17 +++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 7 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index a39b15c6707..b0a4cffc9d6 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -736,7 +736,7 @@ @ cdecl _copysign(double double) copysign @ cdecl -arch=!i386 _copysignf(float float) copysignf @ varargs _cprintf(str) -@ stub _cprintf_l +@ varargs _cprintf_l(str ptr) @ stub _cprintf_p @ stub _cprintf_p_l @ stub _cprintf_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index a48d98455ce..660986a92f7 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1084,7 +1084,7 @@ @ cdecl _copysign(double double) copysign @ cdecl -arch=!i386 _copysignf(float float) copysignf @ varargs _cprintf(str) -@ stub _cprintf_l +@ varargs _cprintf_l(str ptr) @ stub _cprintf_p @ stub _cprintf_p_l @ stub _cprintf_s diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index b23663783a7..16bc8495882 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1076,7 +1076,7 @@ @ cdecl _copysign(double double) copysign @ cdecl _copysignf(float float) copysignf @ varargs _cprintf(str) -@ stub _cprintf_l +@ varargs _cprintf_l(str ptr) @ stub _cprintf_p @ stub _cprintf_p_l @ stub _cprintf_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ec570c8ab1f..9035a39c1e7 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -400,7 +400,7 @@ @ cdecl _copysign(double double) copysign @ cdecl -arch=!i386 _copysignf(float float) copysignf @ varargs _cprintf(str) -@ stub _cprintf_l +@ varargs _cprintf_l(str ptr) @ stub _cprintf_p @ stub _cprintf_p_l @ stub _cprintf_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index b7d60374372..fdf5e56b5f0 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -383,7 +383,7 @@ @ cdecl _copysign(double double) copysign @ cdecl -arch=!i386 _copysignf(float float) copysignf @ varargs _cprintf(str) -@ stub _cprintf_l +@ varargs _cprintf_l(str ptr) @ stub _cprintf_p @ stub _cprintf_p_l @ stub _cprintf_s diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 2c92f0b3811..99cf35872aa 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -540,6 +540,23 @@ int CDECL _vcprintf(const char* format, va_list valist) return pf_printf_a(puts_clbk_console_a, NULL, format, NULL, 0, arg_clbk_valist, NULL, &valist); } +#if _MSVCR_VER<=120 +/********************************************************************* + * _cprintf_l (MSVCRT.@) + */ +int WINAPIV _cprintf_l(const char* format, _locale_t locale, ...) +{ + int retval; + va_list valist; + + va_start(valist, locale); + retval = _vcprintf_l(format, locale, valist); + va_end(valist); + + return retval; +} +#endif + /********************************************************************* * _cprintf (MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index fae66edf6a4..6891c5e84ed 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -370,7 +370,7 @@ @ cdecl _copysign(double double) copysign @ cdecl -arch=!i386 _copysignf(float float) copysignf @ varargs _cprintf(str) -# stub _cprintf_l(str ptr) +@ varargs _cprintf_l(str ptr) # stub _cprintf_p(str) # stub _cprintf_p_l(str ptr) # stub _cprintf_s(str)

1 0