March 2013 - Wine-Commits - list.winehq.org

Francois Gouget : testbot/web: Refresh the JobDetails page normally after canceling or restarting a job.
by Alexandre Julliard March 28, 2013

March 28, 2013

Module: tools Branch: master Commit: 938ba099ac2a888271cfab4d60dd4df3244723fd URL: http://source.winehq.org/git/tools.git/?a=commit;h=938ba099ac2a888271cfab4d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 28 14:43:28 2013 +0100 testbot/web: Refresh the JobDetails page normally after canceling or restarting a job. This is possible now that Job::Cancel() updates the job status synchronously. --- testbot/web/JobDetails.pl | 27 ++++----------------------- 1 files changed, 4 insertions(+), 23 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 429a87c..944d178 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -167,7 +167,8 @@ sub OnCancel return !1; } - return 1; + $self->Redirect("/JobDetails.pl?Key=" . $self->{JobId}); + exit; } sub OnRestart @@ -188,7 +189,8 @@ sub OnRestart return !1; } - return 1; + $self->Redirect("/JobDetails.pl?Key=" . $self->{JobId}); + exit; } sub OnAction @@ -238,27 +240,6 @@ sub GenerateBody { my $self = shift; - if ($self->{ActionPerformed}) - { - print "<h1>" . $self->GetTitle() . "</h1>\n"; - print "<div class='Content'>\n"; - my $Action = $self->GetParam("Action"); - if ($Action eq "Cancel job") - { - print "<p>Job will be canceled.</p>\n"; - } - elsif ($Action eq "Restart job") - { - print "<p>Job will be restarted.</p>\n"; - } - else - { - print "<p>Unknown action $Action.</p>\n"; - } - print "</div>\n"; - return; - } - $self->SUPER::GenerateBody(@_); print "<div class='Content'>\n";

1 0

Jacek Caban : mshtml: Added IHTMLButtonElement::disabled tests.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 873efd464279905c68d04d81afe869d592ea79cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=873efd464279905c68d04d81a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 13:12:51 2013 +0100 mshtml: Added IHTMLButtonElement::disabled tests. --- dlls/mshtml/tests/dom.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 54bb68c..5bd0ff1 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5392,6 +5392,34 @@ static void _set_button_name(unsigned line, IHTMLElement *elem, const char *name _test_button_name(line, elem, name); } +#define test_button_get_disabled(i,b) _test_button_get_disabled(__LINE__,i,b) +static void _test_button_get_disabled(unsigned line, IHTMLElement *elem, VARIANT_BOOL exb) +{ + IHTMLButtonElement *button = _get_button_iface(line, (IUnknown*)elem); + VARIANT_BOOL disabled = 100; + HRESULT hres; + + hres = IHTMLButtonElement_get_disabled(button, &disabled); + ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08x\n", hres); + ok_(__FILE__,line) (disabled == exb, "disabled=%x, expected %x\n", disabled, exb); + IHTMLButtonElement_Release(button); + + _test_elem3_get_disabled(line, (IUnknown*)elem, exb); +} + +#define test_button_set_disabled(i,b) _test_button_set_disabled(__LINE__,i,b) +static void _test_button_set_disabled(unsigned line, IHTMLElement *elem, VARIANT_BOOL b) +{ + IHTMLButtonElement *button = _get_button_iface(line, (IUnknown*)elem); + HRESULT hres; + + hres = IHTMLButtonElement_put_disabled(button, b); + ok_(__FILE__,line) (hres == S_OK, "put_disabled failed: %08x\n", hres); + IHTMLButtonElement_Release(button); + + _test_button_get_disabled(line, elem, b); +} + static void test_button_elem(IHTMLElement *elem) { test_button_name(elem, NULL); @@ -6151,6 +6179,10 @@ static void test_elems(IHTMLDocument2 *doc) ok(elem != NULL, "elem == NULL\n"); if(elem) { test_button_elem(elem); + test_button_get_disabled(elem, VARIANT_FALSE); + test_button_set_disabled(elem, VARIANT_TRUE); + test_elem3_set_disabled((IUnknown*)elem, VARIANT_FALSE); + test_button_get_disabled(elem, VARIANT_FALSE); IHTMLElement_Release(elem); }

1 0

Jacek Caban : mshtml: Added IHTMLButtonElement::disabled implementation.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: add03f99d8ae8464898efcbd074bbf8e1b192bb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=add03f99d8ae8464898efcbd0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 13:12:39 2013 +0100 mshtml: Added IHTMLButtonElement::disabled implementation. --- dlls/mshtml/htmlinput.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlinput.c b/dlls/mshtml/htmlinput.c index d6bd394..4d304b2 100644 --- a/dlls/mshtml/htmlinput.c +++ b/dlls/mshtml/htmlinput.c @@ -1552,15 +1552,35 @@ static HRESULT WINAPI HTMLButtonElement_get_status(IHTMLButtonElement *iface, VA static HRESULT WINAPI HTMLButtonElement_put_disabled(IHTMLButtonElement *iface, VARIANT_BOOL v) { HTMLButtonElement *This = impl_from_IHTMLButtonElement(iface); - FIXME("(%p)->(%x)\n", This, v); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)->(%x)\n", This, v); + + nsres = nsIDOMHTMLButtonElement_SetDisabled(This->nsbutton, !!v); + if(NS_FAILED(nsres)) { + ERR("SetDisabled failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLButtonElement_get_disabled(IHTMLButtonElement *iface, VARIANT_BOOL *p) { HTMLButtonElement *This = impl_from_IHTMLButtonElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + cpp_bool disabled; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMHTMLButtonElement_GetDisabled(This->nsbutton, &disabled); + if(NS_FAILED(nsres)) { + ERR("GetDisabled failed: %08x\n", nsres); + return E_FAIL; + } + + *p = disabled ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI HTMLButtonElement_get_form(IHTMLButtonElement *iface, IHTMLFormElement **p) @@ -1623,6 +1643,18 @@ static HRESULT HTMLButtonElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) return S_OK; } +static HRESULT HTMLButtonElementImpl_put_disabled(HTMLDOMNode *iface, VARIANT_BOOL v) +{ + HTMLButtonElement *This = button_from_HTMLDOMNode(iface); + return IHTMLButtonElement_put_disabled(&This->IHTMLButtonElement_iface, v); +} + +static HRESULT HTMLButtonElementImpl_get_disabled(HTMLDOMNode *iface, VARIANT_BOOL *p) +{ + HTMLButtonElement *This = button_from_HTMLDOMNode(iface); + return IHTMLButtonElement_get_disabled(&This->IHTMLButtonElement_iface, p); +} + static const NodeImplVtbl HTMLButtonElementImplVtbl = { HTMLButtonElement_QI, HTMLElement_destructor, @@ -1630,6 +1662,10 @@ static const NodeImplVtbl HTMLButtonElementImplVtbl = { HTMLElement_clone, HTMLElement_handle_event, HTMLElement_get_attr_col, + NULL, + NULL, + HTMLButtonElementImpl_put_disabled, + HTMLButtonElementImpl_get_disabled }; static const tid_t HTMLButtonElement_iface_tids[] = {

1 0

Piotr Caban : msvcrt: Don't forward _getpid to kernel32.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: db58873868c7286b5bdeca7e5b30938d49a6ca1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=db58873868c7286b5bdeca7e5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:13:43 2013 +0100 msvcrt: Don't forward _getpid to kernel32. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/process.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 1236b58..dc87b8e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -526,7 +526,7 @@ @ cdecl _getdrives() kernel32.GetLogicalDrives @ cdecl _getmaxstdio() MSVCRT__getmaxstdio @ cdecl _getmbcp() -@ cdecl _getpid() kernel32.GetCurrentProcessId +@ cdecl _getpid() _getpid @ stub _getsystime(ptr) @ cdecl _getw(ptr) MSVCRT__getw # stub _getwch() diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index cc64c2d..872edf8 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -1317,3 +1317,11 @@ void * CDECL _getdllprocaddr(MSVCRT_intptr_t dll, const char *name, int ordinal) if (HIWORD(ordinal)) return NULL; return GetProcAddress( (HMODULE)dll, (LPCSTR)(ULONG_PTR)ordinal ); } + +/********************************************************************* + * _getpid (MSVCRT.@) + */ +int CDECL _getpid(void) +{ + return GetCurrentProcessId(); +}

1 0

Piotr Caban : msvcrt: Added _wcstoul_l implementation.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 8f9b0abf729f610310f3fd0308386554a2b57297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f9b0abf729f610310f3fd030… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:13:21 2013 +0100 msvcrt: Added _wcstoul_l implementation. --- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/wcs.c | 23 +++++++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c992f7f..1236b58 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1124,7 +1124,7 @@ @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l -# stub _wcstoul_l(wstr ptr long ptr) +@ cdecl _wcstoul_l(wstr ptr long ptr) MSVCRT__wcstoul_l @ cdecl _wcsupr(wstr) ntdll._wcsupr # stub _wcsupr_l(wstr ptr) @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @@ -1501,7 +1501,7 @@ @ cdecl wcstol(wstr ptr long) ntdll.wcstol @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s -@ cdecl wcstoul(wstr ptr long) ntdll.wcstoul +@ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul @ stub wcsxfrm(ptr wstr long) @ cdecl wctob(long) MSVCRT_wctob @ cdecl wctomb(ptr long) MSVCRT_wctomb diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 6e7c479..7408bec 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1586,6 +1586,29 @@ unsigned __int64 CDECL MSVCRT__wcstoui64(const MSVCRT_wchar_t *nptr, return MSVCRT__wcstoui64_l(nptr, endptr, base, NULL); } +/********************************************************************* + * _wcstoul_l (MSVCRT.@) + */ +MSVCRT_ulong __cdecl MSVCRT__wcstoul_l(const MSVCRT_wchar_t *s, + MSVCRT_wchar_t **end, int base, MSVCRT__locale_t locale) +{ + __int64 ret = MSVCRT__wcstoui64_l(s, end, base, locale); + + if(ret > MSVCRT_ULONG_MAX) { + ret = MSVCRT_ULONG_MAX; + *MSVCRT__errno() = MSVCRT_ERANGE; + } + return ret; +} + +/********************************************************************* + * wcstoul (MSVCRT.@) + */ +MSVCRT_ulong __cdecl MSVCRT_wcstoul(const MSVCRT_wchar_t *s, MSVCRT_wchar_t **end, int base) +{ + return MSVCRT__wcstoul_l(s, end, base, NULL); +} + /****************************************************************** * wcsnlen (MSVCRT.@) */

1 0

Piotr Caban : msvcrt: Don't forward towupper and towlower to ntdll.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 975801cceb9492a08743af1d8c6de332fc56d250 URL: http://source.winehq.org/git/wine.git/?a=commit;h=975801cceb9492a08743af1d8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:12:52 2013 +0100 msvcrt: Don't forward towupper and towlower to ntdll. --- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/wcs.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 278932e..c81f628 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1453,8 +1453,8 @@ # stub tmpnam_s(ptr long) @ cdecl tolower(long) MSVCRT_tolower @ cdecl toupper(long) MSVCRT_toupper -@ cdecl towlower(long) ntdll.towlower -@ cdecl towupper(long) ntdll.towupper +@ cdecl towlower(long) MSVCRT_towlower +@ cdecl towupper(long) MSVCRT_towupper @ cdecl ungetc(long ptr) MSVCRT_ungetc @ cdecl ungetwc(long ptr) MSVCRT_ungetwc # stub utime diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index b0a52d7..1968a2a 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1592,9 +1592,25 @@ int CDECL MSVCRT__towupper_l(MSVCRT_wint_t c, MSVCRT__locale_t locale) } /********************************************************************* + * towupper (MSVCRT.@) + */ +int CDECL MSVCRT_towupper(MSVCRT_wint_t c) +{ + return MSVCRT__towupper_l(c, NULL); +} + +/********************************************************************* * _towlower_l (MSVCRT.@) */ int CDECL MSVCRT__towlower_l(MSVCRT_wint_t c, MSVCRT__locale_t locale) { return tolowerW(c); } + +/********************************************************************* + * towlower (MSVCRT.@) + */ +int CDECL MSVCRT_towlower(MSVCRT_wint_t c) +{ + return MSVCRT__towlower_l(c, NULL); +}

1 0

Piotr Caban : msvcrt: Don't forward strchr to ntdll.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: bf237452effdd4f10e657596af38ec207cc0964a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf237452effdd4f10e657596a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:12:09 2013 +0100 msvcrt: Don't forward strchr to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index be94008..6b11ba4 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1411,7 +1411,7 @@ @ varargs sscanf_s(str str) MSVCRT_sscanf_s @ cdecl strcat(str str) ntdll.strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s -@ cdecl strchr(str long) ntdll.strchr +@ cdecl strchr(str long) MSVCRT_strchr @ cdecl strcmp(str str) ntdll.strcmp @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) ntdll.strcpy diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index f7c2118..6d56cc0 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1575,6 +1575,14 @@ void* __cdecl MSVCRT_memset(void *dst, int c, MSVCRT_size_t n) } /********************************************************************* + * strchr (MSVCRT.@) + */ +char* __cdecl MSVCRT_strchr(const char *str, int c) +{ + return strchr(str, c); +} + +/********************************************************************* * _strnicmp_l (MSVCRT.@) */ int __cdecl MSVCRT__strnicmp_l(const char *s1, const char *s2,

1 0

Piotr Caban : msvcrt: Don't forward wcsncpy to ntdll.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 9e322594576ea23825c4e255e3e9f5c39c62e71a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e322594576ea23825c4e255e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:13:08 2013 +0100 msvcrt: Don't forward wcsncpy to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index c81f628..c992f7f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1486,7 +1486,7 @@ @ cdecl wcsncat(wstr wstr long) ntdll.wcsncat @ cdecl wcsncat_s(wstr long wstr long) MSVCRT_wcsncat_s @ cdecl wcsncmp(wstr wstr long) ntdll.wcsncmp -@ cdecl wcsncpy(ptr wstr long) ntdll.wcsncpy +@ cdecl wcsncpy(ptr wstr long) MSVCRT_wcsncpy @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 1968a2a..6e7c479 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1247,6 +1247,21 @@ INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, con } /****************************************************************** + * wcsncpy (MSVCRT.@) + */ +MSVCRT_wchar_t* __cdecl MSVCRT_wcsncpy( MSVCRT_wchar_t* s1, + const MSVCRT_wchar_t *s2, MSVCRT_size_t n ) +{ + MSVCRT_size_t i; + + for(i=0; i<n; i++) + if(!(s1[i] = s2[i])) break; + for(; i<n; i++) + s1[i] = 0; + return s1; +} + +/****************************************************************** * wcsncpy_s (MSVCRT.@) */ INT CDECL MSVCRT_wcsncpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, const MSVCRT_wchar_t *wcSrc,

1 0

Piotr Caban : msvcr90: Don't forward set_se_translator to msvcrt.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 39fa807b5374b56704095993561caa7d34d86721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39fa807b5374b567040959935… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:15:01 2013 +0100 msvcr90: Don't forward set_se_translator to msvcrt. --- dlls/msvcr90/msvcr90.c | 17 +++++++++++++++++ dlls/msvcr90/msvcr90.spec | 4 ++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index 9b3d8c7..dc97160 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -24,8 +24,11 @@ #include "windef.h" #include "winbase.h" +typedef void (__cdecl *MSVCRT__se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info); + static void* (__cdecl *MSVCRT_operator_new)(size_t); static void (__cdecl *MSVCRT_operator_delete)(void*); +static MSVCRT__se_translator_function (__cdecl *MSVCRT__set_se_translator)(MSVCRT__se_translator_function); static void init_cxx_funcs(void) { @@ -35,11 +38,15 @@ static void init_cxx_funcs(void) { MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPEAX_K@Z"); MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPEAX@Z"); + MSVCRT__set_se_translator = (void*)GetProcAddress(hmod, + "?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z"); } else { MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPAXI@Z"); MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPAX@Z"); + MSVCRT__set_se_translator = (void*)GetProcAddress(hmod, + "?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z"); } } @@ -99,3 +106,13 @@ void CDECL MSVCR90_operator_delete(void *ptr) { return MSVCRT_operator_delete(ptr); } + +/********************************************************************* + * ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z (MSVCR90.@) + * + * Naver LINE expects that this function is implemented inside msvcr90 + */ +MSVCRT__se_translator_function CDECL MSVCR90__set_se_translator(MSVCRT__se_translator_function func) +{ + return MSVCRT__set_se_translator(func); +} diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c555c6e..158c9f5 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -97,8 +97,8 @@ @ cdecl ?_set_new_mode@@YAHH(a)Z(long) msvcrt.?_set_new_mode@@YAHH(a)Z @ stub -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZH(a)Z # void (__cdecl*__cdecl _set_se_translator(int))(unsigned int,struct _EXCEPTION_POINTERS *) @ stub -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZH(a)Z # void (__cdecl*__cdecl _set_se_translator(int))(unsigned int,struct _EXCEPTION_POINTERS * __ptr64) -@ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z -@ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z +@ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) MSVCR90__set_se_translator +@ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0(a)Z@Z(ptr) MSVCR90__set_se_translator @ cdecl -arch=win32 ?_sopen@@YAHPBDHHH(a)Z(str long long long) msvcrt._sopen @ cdecl -arch=win64 ?_sopen@@YAHPEBDHHH(a)Z(str long long long) msvcrt._sopen @ stub -arch=win32 ?_type_info_dtor_internal_method(a)type_info@@QAEXXZ # public: void __thiscall type_info::_type_info_dtor_internal_method(void)

1 0

Piotr Caban : msvcr90: Don't forward new and delete to msvcrt.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 1d02768f9453f0ef7010488a68828b873bfc2fab URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d02768f9453f0ef7010488a6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 16:14:47 2013 +0100 msvcr90: Don't forward new and delete to msvcrt. --- dlls/msvcr90/msvcr90.c | 40 ++++++++++++++++++++++++++++++++++++++++ dlls/msvcr90/msvcr90.spec | 12 ++++++------ 2 files changed, 46 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr90/msvcr90.c b/dlls/msvcr90/msvcr90.c index de6d86e..9b3d8c7 100644 --- a/dlls/msvcr90/msvcr90.c +++ b/dlls/msvcr90/msvcr90.c @@ -24,6 +24,25 @@ #include "windef.h" #include "winbase.h" +static void* (__cdecl *MSVCRT_operator_new)(size_t); +static void (__cdecl *MSVCRT_operator_delete)(void*); + +static void init_cxx_funcs(void) +{ + HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + + if (sizeof(void *) > sizeof(int)) /* 64-bit has different names */ + { + MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPEAX_K@Z"); + MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPEAX@Z"); + } + else + { + MSVCRT_operator_new = (void*)GetProcAddress(hmod, "??2(a)YAPAXI@Z"); + MSVCRT_operator_delete = (void*)GetProcAddress(hmod, "??3(a)YAXPAX@Z"); + } +} + /********************************************************************* * DllMain (MSVCR90.@) */ @@ -33,6 +52,7 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hdll); + init_cxx_funcs(); _set_printf_count_output(0); } return TRUE; @@ -59,3 +79,23 @@ void * CDECL MSVCR90_encode_pointer(void * ptr) { return EncodePointer(ptr); } + +/********************************************************************* + * ??2(a)YAPAXI@Z (MSVCR90.@) + * + * Naver LINE expects that this function is implemented inside msvcr90 + */ +void* CDECL MSVCR90_operator_new(size_t size) +{ + return MSVCRT_operator_new(size); +} + +/********************************************************************* + * ??3(a)YAXPAX@Z (MSVCR90.@) + * + * Naver LINE expects that this function is implemented inside msvcr90 + */ +void CDECL MSVCR90_operator_delete(void *ptr) +{ + return MSVCRT_operator_delete(ptr); +} diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 0aa1ed4..c555c6e 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -30,12 +30,12 @@ @ cdecl -arch=win64 ??1exception(a)std@@UEAA(a)XZ(ptr) msvcrt.??1exception@@UEAA(a)XZ @ thiscall -arch=i386 ??1type_info@@UAE(a)XZ(ptr) msvcrt.??1type_info@@UAE(a)XZ @ cdecl -arch=win64 ??1type_info@@UEAA(a)XZ(ptr) msvcrt.??1type_info@@UEAA(a)XZ -@ cdecl -arch=win32 ??2(a)YAPAXI@Z(long) msvcrt.??2(a)YAPAXI@Z -@ cdecl -arch=win64 ??2(a)YAPEAX_K@Z(long) msvcrt.??2(a)YAPEAX_K@Z +@ cdecl -arch=win32 ??2(a)YAPAXI@Z(long) MSVCR90_operator_new +@ cdecl -arch=win64 ??2(a)YAPEAX_K@Z(long) MSVCR90_operator_new @ cdecl -arch=win32 ??2(a)YAPAXIHPBDH@Z(long long str long) msvcrt.??2(a)YAPAXIHPBDH@Z @ cdecl -arch=win64 ??2(a)YAPEAX_KHPEBDH@Z(long long str long) msvcrt.??2(a)YAPEAX_KHPEBDH@Z -@ cdecl -arch=win32 ??3(a)YAXPAX@Z(ptr) msvcrt.??3(a)YAXPAX@Z -@ cdecl -arch=win64 ??3(a)YAXPEAX@Z(ptr) msvcrt.??3(a)YAXPEAX@Z +@ cdecl -arch=win32 ??3(a)YAXPAX@Z(ptr) MSVCR90_operator_delete +@ cdecl -arch=win64 ??3(a)YAXPEAX@Z(ptr) MSVCR90_operator_delete @ thiscall -arch=i386 ??4__non_rtti_object(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) msvcrt.??4__non_rtti_object@@QAEAAV0(a)ABV0@@Z @ cdecl -arch=win64 ??4__non_rtti_object(a)std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) msvcrt.??4__non_rtti_object@@QEAAAEAV0(a)AEBV0@@Z @ thiscall -arch=i386 ??4bad_cast(a)std@@QAEAAV01(a)ABV01@@Z(ptr ptr) msvcrt.??4bad_cast@@QAEAAV0(a)ABV0@@Z @@ -61,8 +61,8 @@ @ cdecl -arch=win64 ??_U(a)YAPEAX_K@Z(long) msvcrt.??_U(a)YAPEAX_K@Z @ cdecl -arch=win32 ??_U(a)YAPAXIHPBDH@Z(long long str long) msvcrt.??_U(a)YAPAXIHPBDH@Z @ cdecl -arch=win64 ??_U(a)YAPEAX_KHPEBDH@Z(long long str long) msvcrt.??_U(a)YAPEAX_KHPEBDH@Z -@ cdecl -arch=win32 ??_V(a)YAXPAX@Z(ptr) msvcrt.??_V(a)YAXPAX@Z -@ cdecl -arch=win64 ??_V(a)YAXPEAX@Z(ptr) msvcrt.??_V(a)YAXPEAX@Z +@ cdecl -arch=win32 ??_V(a)YAXPAX@Z(ptr) MSVCR90_operator_delete +@ cdecl -arch=win64 ??_V(a)YAXPEAX@Z(ptr) MSVCR90_operator_delete @ stub -arch=win32 ?_Name_base(a)type_info@@CAPBDPBV1(a)PAU__type_info_node@@@Z # private: static char const * __cdecl type_info::_Name_base(class type_info const *,struct __type_info_node *) @ stub -arch=win64 ?_Name_base(a)type_info@@CAPEBDPEBV1(a)PEAU__type_info_node@@@Z # private: static char const * __ptr64 __cdecl type_info::_Name_base(class type_info const * __ptr64,struct __type_info_node * __ptr64) @ stub -arch=win32 ?_Name_base_internal(a)type_info@@CAPBDPBV1(a)PAU__type_info_node@@@Z # private: static char const * __cdecl type_info::_Name_base_internal(class type_info const *,struct __type_info_node *)

1 0