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

Alexandre Julliard : msvcrt: Export the onexit functions from the import library.
by Alexandre Julliard March 26, 2019

March 26, 2019

Module: wine Branch: master Commit: 0673ddf3a55eb524f8284be3b2fc9ab62a2acf52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0673ddf3a55eb524f8284be3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 26 20:21:14 2019 +0100 msvcrt: Export the onexit functions from the import library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/Makefile.in | 1 + dlls/msvcr110/Makefile.in | 1 + dlls/msvcr120/Makefile.in | 1 + dlls/msvcr70/Makefile.in | 1 + dlls/msvcr71/Makefile.in | 1 + dlls/msvcr80/Makefile.in | 1 + dlls/msvcr90/Makefile.in | 1 + dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/exit.c | 138 +++----------------------------------------- dlls/msvcrt/msvcrt.h | 7 +++ dlls/msvcrt/msvcrt.spec | 3 - dlls/msvcrt/onexit.c | 119 ++++++++++++++++++++++++++++++++++++++ dlls/ucrtbase/Makefile.in | 1 + dlls/ucrtbase/ucrtbase.spec | 12 ++-- 14 files changed, 148 insertions(+), 140 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0673ddf3a55eb524f828…

1 0

Alexandre Julliard : msvcrt: Export the __acrt_iob_func function from the import library.
by Alexandre Julliard March 26, 2019

March 26, 2019

Module: wine Branch: master Commit: ca50117418d6b8a6146dcecd5e78819b28da2e40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca50117418d6b8a6146dcecd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 26 20:22:43 2019 +0100 msvcrt: Export the __acrt_iob_func function from the import library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/Makefile.in | 1 + dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/Makefile.in | 1 + dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/Makefile.in | 1 + dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr70/Makefile.in | 1 + dlls/msvcr70/msvcr70.spec | 4 ++-- dlls/msvcr71/Makefile.in | 1 + dlls/msvcr71/msvcr71.spec | 4 ++-- dlls/msvcr80/Makefile.in | 1 + dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/Makefile.in | 1 + dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/file.c | 12 ++---------- dlls/msvcrt/iob.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 5 ++--- dlls/ucrtbase/Makefile.in | 1 + dlls/ucrtbase/ucrtbase.spec | 4 ++-- 20 files changed, 65 insertions(+), 29 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ca50117418d6b8a6146d…

1 0

Michael Stefaniuc : wineoss.drv: Remove useless cast to self.
by Alexandre Julliard March 26, 2019

March 26, 2019

Module: wine Branch: master Commit: 78aaffb55d52dcbdcfd14380bd4dead79522bdb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78aaffb55d52dcbdcfd14380… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 24 14:26:45 2019 +0100 wineoss.drv: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineoss.drv/mmdevdrv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index fa3f885..afa018a 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -605,8 +605,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, if(!This) return E_OUTOFMEMORY; - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, - (IUnknown **)&This->pUnkFTMarshal); + hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); return hr;

1 0

Jacek Caban : mshtml: Pass style as CSSStyle to current style property getters.
by Alexandre Julliard March 26, 2019

March 26, 2019

Module: wine Branch: master Commit: edb4eca7882b11d5b589ebe0bdf1901fea4eb0be URL: https://source.winehq.org/git/wine.git/?a=commit;h=edb4eca7882b11d5b589ebe0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 17:27:00 2019 +0100 mshtml: Pass style as CSSStyle to current style property getters. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/htmlstyle.c | 8 ++++---- dlls/mshtml/htmlstyle.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 668cc2b..63e8a25 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -45,12 +45,12 @@ struct HTMLCurrentStyle { static inline HRESULT get_current_style_property(HTMLCurrentStyle *current_style, styleid_t sid, BSTR *p) { - return get_nsstyle_property(current_style->css_style.nsstyle, sid, COMPAT_MODE_QUIRKS, p); + return get_style_property(&current_style->css_style, sid, p); } static inline HRESULT get_current_style_property_var(HTMLCurrentStyle *This, styleid_t sid, VARIANT *v) { - return get_nsstyle_property_var(This->css_style.nsstyle, sid, COMPAT_MODE_QUIRKS, v); + return get_style_property_var(&This->css_style, sid, v); } static inline HTMLCurrentStyle *impl_from_IHTMLCurrentStyle(IHTMLCurrentStyle *iface) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index e35c93b..425a53c 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1077,7 +1077,7 @@ static HRESULT nsstyle_to_bstr(const WCHAR *val, DWORD flags, BSTR *p) return S_OK; } -HRESULT get_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, compat_mode_t compat_mode, BSTR *p) +static HRESULT get_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, compat_mode_t compat_mode, BSTR *p) { nsAString str_value; const PRUnichar *value; @@ -1095,7 +1095,7 @@ HRESULT get_nsstyle_property(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, return hres; } -HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, compat_mode_t compat_mode, VARIANT *p) +static HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t sid, compat_mode_t compat_mode, VARIANT *p) { unsigned flags = style_tbl[sid].flags; nsAString str_value; @@ -1145,12 +1145,12 @@ HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration *nsstyle, styleid_t s return S_OK; } -static inline HRESULT get_style_property(CSSStyle *style, styleid_t sid, BSTR *p) +HRESULT get_style_property(CSSStyle *style, styleid_t sid, BSTR *p) { return get_nsstyle_property(style->nsstyle, sid, dispex_compat_mode(&style->dispex), p); } -static inline HRESULT get_style_property_var(CSSStyle *style, styleid_t sid, VARIANT *v) +HRESULT get_style_property_var(CSSStyle *style, styleid_t sid, VARIANT *v) { return get_nsstyle_property_var(style->nsstyle, sid, dispex_compat_mode(&style->dispex), v); } diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 2a67ded..bb92a00 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -140,8 +140,8 @@ HRESULT HTMLStyle_Create(HTMLElement*,HTMLStyle**) DECLSPEC_HIDDEN; void init_css_style(CSSStyle*,nsIDOMCSSStyleDeclaration*,style_qi_t, dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; -HRESULT get_nsstyle_property(nsIDOMCSSStyleDeclaration*,styleid_t,compat_mode_t,BSTR*) DECLSPEC_HIDDEN; -HRESULT get_nsstyle_property_var(nsIDOMCSSStyleDeclaration*,styleid_t,compat_mode_t,VARIANT*) DECLSPEC_HIDDEN; +HRESULT get_style_property(CSSStyle*,styleid_t,BSTR*) DECLSPEC_HIDDEN; +HRESULT get_style_property_var(CSSStyle*,styleid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT get_elem_style(HTMLElement*,styleid_t,BSTR*) DECLSPEC_HIDDEN; HRESULT set_elem_style(HTMLElement*,styleid_t,const WCHAR*) DECLSPEC_HIDDEN;

1 0

Michael Stefaniuc : winealsa.drv: Remove useless cast to self.
by Alexandre Julliard March 26, 2019

March 26, 2019

Module: wine Branch: master Commit: edf2df3679dada489ed345570020ef7338e52351 URL: https://source.winehq.org/git/wine.git/?a=commit;h=edf2df3679dada489ed34557… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 24 14:26:46 2019 +0100 winealsa.drv: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index de89fd0..2bf4d73 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -803,8 +803,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient return E_UNEXPECTED; } - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, - (IUnknown **)&This->pUnkFTMarshal); + hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); return hr;

1 0

Andrew Eikum : winecoreaudio.drv: Remove useless cast to self.
by Alexandre Julliard March 26, 2019

March 26, 2019

Module: wine Branch: master Commit: be0c18b2b10a3a524674ae1481d83d294a761668 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be0c18b2b10a3a524674ae14… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 26 08:34:55 2019 -0500 winecoreaudio.drv: Remove useless cast to self. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winecoreaudio.drv/mmdevdrv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index c362a51..28ada43 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -695,8 +695,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->lock = 0; - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, - (IUnknown **)&This->pUnkFTMarshal); + hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); return hr;

1 0

Andrew Eikum : wineandroid.drv: Remove useless cast to self.
by Alexandre Julliard March 26, 2019

March 26, 2019

Module: wine Branch: master Commit: b51064a3d5186277e2e377f4faf0f17e816689df URL: https://source.winehq.org/git/wine.git/?a=commit;h=b51064a3d5186277e2e377f4… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 26 08:36:16 2019 -0500 wineandroid.drv: Remove useless cast to self. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/mmdevdrv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/mmdevdrv.c b/dlls/wineandroid.drv/mmdevdrv.c index 3968536..1dafe02 100644 --- a/dlls/wineandroid.drv/mmdevdrv.c +++ b/dlls/wineandroid.drv/mmdevdrv.c @@ -379,8 +379,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, if(!This) return E_OUTOFMEMORY; - hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, - (IUnknown **)&This->pUnkFTMarshal); + hr = CoCreateFreeThreadedMarshaler((IUnknown *)&This->IAudioClient_iface, &This->pUnkFTMarshal); if (FAILED(hr)) { HeapFree(GetProcessHeap(), 0, This); return hr;

1 0

Alistair Leslie-Hughes : urlmon: Pass unescaped URLs to InternetOpenUrl in ftp protocol handler.
by Alexandre Julliard March 26, 2019

March 26, 2019

Module: wine Branch: master Commit: d99605d714fcc947b4ba597a9975cf143f61f2dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d99605d714fcc947b4ba597a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Mar 26 15:21:32 2019 +0100 urlmon: Pass unescaped URLs to InternetOpenUrl in ftp protocol handler. Based on a patch by André Hentschel. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26445 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/ftp.c | 21 ++++++++++++--------- dlls/urlmon/tests/Makefile.in | 2 +- dlls/urlmon/tests/url.c | 10 +++++++++- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index aef4a6c..75704ce 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -66,6 +66,7 @@ static HRESULT FtpProtocol_open_request(Protocol *prot, IUri *uri, DWORD request HINTERNET internet_session, IInternetBindInfo *bind_info) { FtpProtocol *This = impl_from_Protocol(prot); + DWORD path_size = 0; BSTR url; HRESULT hres; @@ -73,16 +74,18 @@ static HRESULT FtpProtocol_open_request(Protocol *prot, IUri *uri, DWORD request if(FAILED(hres)) return hres; - This->base.request = InternetOpenUrlW(internet_session, url, NULL, 0, - request_flags|INTERNET_FLAG_EXISTING_CONNECT|INTERNET_FLAG_PASSIVE, - (DWORD_PTR)&This->base); - SysFreeString(url); - if (!This->base.request && GetLastError() != ERROR_IO_PENDING) { - WARN("InternetOpenUrl failed: %d\n", GetLastError()); - return INET_E_RESOURCE_NOT_FOUND; + hres = UrlUnescapeW(url, NULL, &path_size, URL_UNESCAPE_INPLACE); + if(SUCCEEDED(hres)) { + This->base.request = InternetOpenUrlW(internet_session, url, NULL, 0, + request_flags|INTERNET_FLAG_EXISTING_CONNECT|INTERNET_FLAG_PASSIVE, + (DWORD_PTR)&This->base); + if (!This->base.request && GetLastError() != ERROR_IO_PENDING) { + WARN("InternetOpenUrl failed: %d\n", GetLastError()); + hres = INET_E_RESOURCE_NOT_FOUND; + } } - - return S_OK; + SysFreeString(url); + return hres; } static HRESULT FtpProtocol_end_request(Protocol *prot) diff --git a/dlls/urlmon/tests/Makefile.in b/dlls/urlmon/tests/Makefile.in index 2eef129..7217f53 100644 --- a/dlls/urlmon/tests/Makefile.in +++ b/dlls/urlmon/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = urlmon.dll -IMPORTS = urlmon wininet ole32 oleaut32 user32 advapi32 +IMPORTS = urlmon wininet ole32 oleaut32 shlwapi user32 advapi32 C_SRCS = \ generated.c \ diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index ada78c9..0f2b14e 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -32,6 +32,7 @@ #include "urlmon.h" #include "wininet.h" #include "mshtml.h" +#include "shlwapi.h" #include "wine/test.h" @@ -2905,7 +2906,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) url_a = (flags & BINDTEST_INVALID_CN) ? "https://4.15.184.77/favicon.ico" : "https://test.winehq.org/tests/hello.html"; break; case FTP_TEST: - url_a = "ftp://ftp.winehq.org/welcome.msg"; + url_a = "ftp://ftp.winehq.org/welcome%2emsg"; break; default: url_a = "winetest:test"; @@ -2969,6 +2970,13 @@ static void test_BindToStorage(int protocol, DWORD flags, DWORD t) if(FAILED(hres)) return; + if(protocol == FTP_TEST) + { + /* FTP url dont have any escape characters, so convert the url to what is expected */ + DWORD size = 0; + UrlUnescapeW(current_url, NULL, &size, URL_UNESCAPE_INPLACE); + } + hres = IMoniker_QueryInterface(mon, &IID_IBinding, (void**)&bind); ok(hres == E_NOINTERFACE, "IMoniker should not have IBinding interface\n"); if(SUCCEEDED(hres))

1 0

Gijs Vermeulen : hnetcfg: Initialize INetFwRules:: get__NewEnum out parameter.
by Alexandre Julliard March 26, 2019

March 26, 2019

Module: wine Branch: master Commit: 16803516ef0967b1290bcdac269f4e157af163f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=16803516ef0967b1290bcdac… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue Mar 26 17:04:44 2019 +0100 hnetcfg: Initialize INetFwRules::get__NewEnum out parameter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46906 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hnetcfg/policy.c | 4 ++++ dlls/hnetcfg/tests/policy.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/dlls/hnetcfg/policy.c b/dlls/hnetcfg/policy.c index 53f39ae..26b7cc1 100644 --- a/dlls/hnetcfg/policy.c +++ b/dlls/hnetcfg/policy.c @@ -238,6 +238,10 @@ static HRESULT WINAPI netfw_rules_get__NewEnum( fw_rules *This = impl_from_INetFwRules( iface ); FIXME("%p, %p\n", This, newEnum); + + if (!newEnum) return E_POINTER; + *newEnum = NULL; + return E_NOTIMPL; } diff --git a/dlls/hnetcfg/tests/policy.c b/dlls/hnetcfg/tests/policy.c index 3fa8348..8701455 100644 --- a/dlls/hnetcfg/tests/policy.c +++ b/dlls/hnetcfg/tests/policy.c @@ -60,6 +60,9 @@ static void test_policy2_rules(INetFwPolicy2 *policy2) INetFwServiceRestriction_Release(restriction); } + hr = INetFwRules_get__NewEnum(rules, NULL); + ok(hr == E_POINTER, "got %08x\n", hr); + INetFwRules_Release(rules); INetFwRules_Release(rules2); }

1 0

Jacek Caban : mshtml: Use interface agnostic form of dispids for compat_dispid.
by Alexandre Julliard March 26, 2019

March 26, 2019

Module: wine Branch: master Commit: 9d35d09e894ed515a643c14af46a9714c00f4e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d35d09e894ed515a643c14a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 26 17:27:10 2019 +0100 mshtml: Use interface agnostic form of dispids for compat_dispid. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 174 ++++++++++++++++++++++++------------------------ 1 file changed, 87 insertions(+), 87 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9d35d09e894ed515a643…

1 0