August 2016 - Wine-Commits - list.winehq.org

Piotr Caban : ieframe: Restore closed IOleClientSite in DoVerb.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: bc47b126a9bb72942b15a340892899e123a6b7ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc47b126a9bb72942b15a3408… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 11 18:46:09 2016 +0200 ieframe: Restore closed IOleClientSite in DoVerb. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 17379dcd083e66539014ab73cade423c22f26128) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/oleobject.c | 28 +++++++++++++++++++++++++++- dlls/ieframe/tests/webbrowser.c | 24 ++++++++++++++++++------ 3 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 371cb03..2df5e1c 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -189,6 +189,7 @@ struct WebBrowser { INT version; IOleClientSite *client; + IOleClientSite *client_closed; IOleContainer *container; IOleInPlaceSiteEx *inplace; diff --git a/dlls/ieframe/oleobject.c b/dlls/ieframe/oleobject.c index 1076afe..4dcc536 100644 --- a/dlls/ieframe/oleobject.c +++ b/dlls/ieframe/oleobject.c @@ -292,6 +292,11 @@ static void release_client_site(WebBrowser *This) This->client = NULL; } + if(This->client_closed) { + IOleClientSite_Release(This->client_closed); + This->client_closed = NULL; + } + if(This->shell_embedding_hwnd) { DestroyWindow(This->shell_embedding_hwnd); This->shell_embedding_hwnd = NULL; @@ -460,6 +465,11 @@ static HRESULT WINAPI OleObject_SetClientSite(IOleObject *iface, LPOLECLIENTSITE TRACE("(%p)->(%p)\n", This, pClientSite); + if(This->client_closed) { + IOleClientSite_Release(This->client_closed); + This->client_closed = NULL; + } + if(This->client == pClientSite) return S_OK; @@ -549,6 +559,8 @@ static HRESULT WINAPI OleObject_SetHostNames(IOleObject *iface, LPCOLESTR szCont static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) { WebBrowser *This = impl_from_IOleObject(iface); + IOleClientSite *client; + HRESULT hres; TRACE("(%p)->(%d)\n", This, dwSaveOption); @@ -569,7 +581,13 @@ static HRESULT WINAPI OleObject_Close(IOleObject *iface, DWORD dwSaveOption) if(This->inplace) IOleInPlaceSiteEx_OnInPlaceDeactivate(This->inplace); - return IOleObject_SetClientSite(iface, NULL); + /* store old client site - we need to restore it in DoVerb */ + client = This->client; + if(This->client) + IOleClientSite_AddRef(This->client); + hres = IOleObject_SetClientSite(iface, NULL); + This->client_closed = client; + return hres; } static HRESULT WINAPI OleObject_SetMoniker(IOleObject *iface, DWORD dwWhichMoniker, IMoniker* pmk) @@ -611,6 +629,14 @@ static HRESULT WINAPI OleObject_DoVerb(IOleObject *iface, LONG iVerb, struct tag TRACE("(%p)->(%d %p %p %d %p %s)\n", This, iVerb, lpmsg, pActiveSite, lindex, hwndParent, wine_dbgstr_rect(lprcPosRect)); + /* restore closed client site if we have one */ + if(!This->client && This->client_closed) { + IOleClientSite *client = This->client_closed; + This->client_closed = NULL; + IOleObject_SetClientSite(iface, client); + IOleClientSite_Release(client); + } + switch (iVerb) { case OLEIVERB_SHOW: diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 3201499..783740a 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -50,7 +50,7 @@ DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); static BOOL expect_ ## func = FALSE, called_ ## func = FALSE #define SET_EXPECT(func) \ - expect_ ## func = TRUE + do { called_ ## func = FALSE; expect_ ## func = TRUE; } while(0) #define CHECK_EXPECT2(func) \ do { \ @@ -70,6 +70,12 @@ DEFINE_OLEGUID(CGID_DocHostCmdPriv, 0x000214D4L, 0, 0); expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define CHECK_NOT_CALLED(func) \ + do { \ + ok(!called_ ## func, "unexpected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + #define CLEAR_CALLED(func) \ expect_ ## func = called_ ## func = FALSE @@ -3634,19 +3640,25 @@ static void test_Close(IWebBrowser2 *wb, BOOL do_download) hres = IOleObject_DoVerb(oo, OLEIVERB_HIDE, NULL, (IOleClientSite*)0xdeadbeef, 0, (HWND)0xdeadbeef, NULL); ok(hres == S_OK, "DoVerb failed: %08x\n", hres); - todo_wine CHECK_CALLED(GetContainer); - todo_wine CHECK_CALLED(Site_GetWindow); - todo_wine CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); - todo_wine CHECK_CALLED(Invoke_AMBIENT_SILENT); + CHECK_CALLED(GetContainer); + CHECK_CALLED(Site_GetWindow); + CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + CHECK_CALLED(Invoke_AMBIENT_SILENT); hres = IOleObject_GetClientSite(oo, &ocs); ok(hres == S_OK, "hres = %x\n", hres); - todo_wine ok(ocs == &ClientSite, "ocs != &ClientSite\n"); + ok(ocs == &ClientSite, "ocs != &ClientSite\n"); if(ocs) IOleClientSite_Release(ocs); + SET_EXPECT(OnFocus_FALSE); + SET_EXPECT(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE); + SET_EXPECT(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE); hres = IOleObject_Close(oo, OLECLOSE_NOSAVE); ok(hres == S_OK, "OleObject_Close failed: %x\n", hres); + todo_wine CHECK_NOT_CALLED(OnFocus_FALSE); + todo_wine CHECK_NOT_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE); + todo_wine CHECK_NOT_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE); test_close = FALSE; IOleObject_Release(oo);

1 0

Piotr Caban : msvcrt: Fix mbtowc behavior for buffers containing more than one character.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: ab49e20fbf80274f0b41e60a48e7a3978404c207 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab49e20fbf80274f0b41e60a4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 6 22:09:14 2016 +0200 msvcrt: Fix mbtowc behavior for buffers containing more than one character. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a36b5f0741ac7e6a44aaa9d804ebdb7524186723) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/mbcs.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index c206af1..3b27b9d 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2154,17 +2154,25 @@ int CDECL MSVCRT_mbtowc_l(MSVCRT_wchar_t *dst, const char* str, MSVCRT_size_t n, if(n <= 0 || !str) return 0; - if(!locinfo->lc_codepage) - tmpdst = (unsigned char)*str; - else if(!MultiByteToWideChar(locinfo->lc_codepage, 0, str, n, &tmpdst, 1)) - return -1; - if(dst) - *dst = tmpdst; - /* return the number of bytes from src that have been used */ - if(!*str) + + if(!*str) { + if(dst) *dst = 0; return 0; - if(n >= 2 && MSVCRT__isleadbyte_l((unsigned char)*str, locale) && str[1]) + } + + if(!locinfo->lc_codepage) { + if(dst) *dst = (unsigned char)*str; + return 1; + } + if(n>=2 && MSVCRT__isleadbyte_l((unsigned char)*str, locale)) { + if(!MultiByteToWideChar(locinfo->lc_codepage, 0, str, 2, &tmpdst, 1)) + return -1; + if(dst) *dst = tmpdst; return 2; + } + if(!MultiByteToWideChar(locinfo->lc_codepage, 0, str, 1, &tmpdst, 1)) + return -1; + if(dst) *dst = tmpdst; return 1; }

1 0

Piotr Caban : msvcp110: Fix num_put<char> structure layout.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: ba34505057c20b8f9aff03954cf390c467b82da0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba34505057c20b8f9aff03954… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 10 15:24:12 2016 +0200 msvcp110: Fix num_put<char> structure layout. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 77184106c8c2bff7db9ea5d20b3b3330196befc1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcp90/locale.c | 37 ++++++++++++++++++++++++++++++++----- dlls/msvcp90/msvcp90.h | 2 ++ 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f3ad140..6b8a035 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -7116,7 +7116,9 @@ DEFINE_THISCALL_WRAPPER(num_put_char__Init, 8) void __thiscall num_put_char__Init(num_put *this, const _Locinfo *locinfo) { TRACE("(%p %p)\n", this, locinfo); +#if _MSVCP_VER < 110 _Locinfo__Getcvt(locinfo, &this->cvt); +#endif } /* ??0?$num_put(a)DV?$ostreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ @@ -7861,7 +7863,9 @@ DEFINE_THISCALL_WRAPPER(num_put_wchar__Init, 8) void __thiscall num_put_wchar__Init(num_put *this, const _Locinfo *locinfo) { TRACE("(%p %p)\n", this, locinfo); +#if _MSVCP_VER < 110 _Locinfo__Getcvt(locinfo, &this->cvt); +#endif } /* ??0?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@QAE(a)ABV_Locinfo@1(a)I@Z */ @@ -8096,6 +8100,7 @@ ostreambuf_iterator_wchar* __cdecl num_put_wchar__Put(const num_put *this, ostre return ret; } +#if _MSVCP_VER < 110 /* ?_Putc@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@PBDI(a)Z */ /* ?_Putc@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@PEBD_K(a)Z */ /* ?_Putc@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@PBDI(a)Z */ @@ -8116,6 +8121,7 @@ ostreambuf_iterator_wchar* __cdecl num_put_wchar__Putc(const num_put *this, ostr *ret = dest; return ret; } +#endif /* ?_Putgrouped@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@ABA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@PBDI_W(a)Z */ /* ?_Putgrouped@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@AEBA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@PEBD_K_W(a)Z */ @@ -8200,6 +8206,27 @@ ostreambuf_iterator_wchar* __cdecl num_put_short__Fput(const num_put *this, ostr return NULL; } +#if _MSVCP_VER < 110 +static void num_put_wchar_wide_put(const num_put *this, + ostreambuf_iterator_wchar *dest, ios_base *base, + const char *buf, MSVCP_size_t count) +{ + num_put_wchar__Putc(this, dest, *dest, buf, count); +} +#else +static void num_put_wchar_wide_put(const num_put *this, + ostreambuf_iterator_wchar *dest, ios_base *base, + const char *buf, MSVCP_size_t count) +{ + ctype_wchar *ctype; + MSVCP_size_t i; + + ctype = ctype_wchar_use_facet(IOS_LOCALE(base)); + for(i=0; i<count; i++) + ostreambuf_iterator_wchar_put(dest, ctype_wchar_widen_ch(ctype, buf[i])); +} +#endif + /* TODO: This function should be removed when num_put_wchar__Fput is implemented */ static ostreambuf_iterator_wchar* num_put__fput(const num_put *this, ostreambuf_iterator_wchar *ret, ostreambuf_iterator_wchar dest, ios_base *base, wchar_t fill, char *buf, @@ -8250,7 +8277,7 @@ static ostreambuf_iterator_wchar* num_put__fput(const num_put *this, ostreambuf_ base->wide = 0; if((adjustfield & FMTFLAG_internal) && (buf[0]=='-' || buf[0]=='+')) { - num_put_wchar__Putc(this, &dest, dest, buf, 1); + num_put_wchar_wide_put(this, &dest, base, buf, 1); buf++; } if(adjustfield != FMTFLAG_left) { @@ -8264,7 +8291,7 @@ static ostreambuf_iterator_wchar* num_put__fput(const num_put *this, ostreambuf_ else if(!buf[i]) num_put_wchar__Rep(this, &dest, dest, sep, 1); else - num_put_wchar__Putc(this, &dest, dest, buf+i, 1); + num_put_wchar_wide_put(this, &dest, base, buf+i, 1); } return num_put_wchar__Rep(this, ret, dest, fill, pad); @@ -8343,10 +8370,10 @@ static ostreambuf_iterator_wchar* num_put__Iput(const num_put *this, ostreambuf_ base->wide = 0; if((adjustfield & FMTFLAG_internal) && (buf[0]=='-' || buf[0]=='+')) { - num_put_wchar__Putc(this, &dest, dest, buf, 1); + num_put_wchar_wide_put(this, &dest, base, buf, 1); buf++; }else if((adjustfield & FMTFLAG_internal) && (buf[1]=='x' || buf[1]=='X')) { - num_put_wchar__Putc(this, &dest, dest, buf, 2); + num_put_wchar_wide_put(this, &dest, base, buf, 2); buf += 2; } if(adjustfield != FMTFLAG_left) { @@ -8358,7 +8385,7 @@ static ostreambuf_iterator_wchar* num_put__Iput(const num_put *this, ostreambuf_ if(!buf[i]) num_put_wchar__Rep(this, &dest, dest, sep, 1); else - num_put_wchar__Putc(this, &dest, dest, buf+i, 1); + num_put_wchar_wide_put(this, &dest, base, buf+i, 1); } return num_put_wchar__Rep(this, ret, dest, fill, pad); diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 2d0f4f8..545bce0 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -549,7 +549,9 @@ istreambuf_iterator_wchar *__thiscall num_get_wchar_get_bool(const num_get*, ist /* class num_put<wchar> */ typedef struct { locale_facet facet; +#if _MSVCP_VER < 110 _Cvtvec cvt; +#endif } num_put; num_put* num_put_char_use_facet(const locale*);

1 0

Austin English : dbghelp: Add forwards for EnumerateLoadedModulesEx/ EnumerateLoadedModulesExW.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 4577ade52da5076e2467c1455a75da55f0887212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4577ade52da5076e2467c1455… Author: Austin English <austinenglish(a)gmail.com> Date: Wed May 11 16:31:13 2016 -0500 dbghelp: Add forwards for EnumerateLoadedModulesEx/EnumerateLoadedModulesExW. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6e0366fd5ea0a3a56f4680d4b477be1562f534d3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dbghelp/dbghelp.spec | 4 ++-- include/dbghelp.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec index 6004f95..3655f8c 100644 --- a/dlls/dbghelp/dbghelp.spec +++ b/dlls/dbghelp/dbghelp.spec @@ -4,8 +4,8 @@ @ stdcall EnumDirTreeW(long wstr wstr ptr ptr ptr) @ stdcall EnumerateLoadedModules(long ptr ptr) @ stdcall EnumerateLoadedModules64(long ptr ptr) -@ stub EnumerateLoadedModulesEx -@ stub EnumerateLoadedModulesExW +@ stdcall EnumerateLoadedModulesEx(long ptr ptr) EnumerateLoadedModules64 +@ stdcall EnumerateLoadedModulesExW(long ptr ptr) EnumerateLoadedModulesW64 @ stdcall EnumerateLoadedModulesW64(long ptr ptr) @ stdcall ExtensionApiVersion() @ stdcall FindDebugInfoFile(str str ptr) diff --git a/include/dbghelp.h b/include/dbghelp.h index 483ef29..bd6176e 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -908,6 +908,8 @@ typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACK64)(PCSTR, DWORD64, ULONG, P BOOL WINAPI EnumerateLoadedModules64(HANDLE, PENUMLOADED_MODULES_CALLBACK64, PVOID); typedef BOOL (CALLBACK *PENUMLOADED_MODULES_CALLBACKW64)(PCWSTR, DWORD64, ULONG, PVOID); BOOL WINAPI EnumerateLoadedModulesW64(HANDLE, PENUMLOADED_MODULES_CALLBACKW64, PVOID); +BOOL WINAPI EnumerateLoadedModulesEx(HANDLE, PENUMLOADED_MODULES_CALLBACK64, PVOID); +BOOL WINAPI EnumerateLoadedModulesExW(HANDLE, PENUMLOADED_MODULES_CALLBACKW64, PVOID); typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACK64)(PCSTR, DWORD64, PVOID); BOOL WINAPI SymEnumerateModules64(HANDLE, PSYM_ENUMMODULES_CALLBACK64, PVOID); typedef BOOL (CALLBACK *PSYM_ENUMMODULES_CALLBACKW64)(PCWSTR, DWORD64, PVOID);

1 0

Piotr Caban : msvcrt: Add mbsrtowcs_s implementation.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 08da46f08bd2793b2b54f6ec0197350d89b8b873 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08da46f08bd2793b2b54f6ec0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 16 13:29:41 2016 +0200 msvcrt: Add mbsrtowcs_s implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 540d969150e7ff87d731d6f4b9baa9a6f90f2737) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-convert-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/mbcs.c | 29 ++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 38 insertions(+), 9 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index f926ba8..4fe9037 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -88,7 +88,7 @@ @ stub mbrtoc32 @ cdecl mbrtowc(ptr str long ptr) ucrtbase.mbrtowc @ cdecl mbsrtowcs(ptr ptr long ptr) ucrtbase.mbsrtowcs -@ stub mbsrtowcs_s +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) ucrtbase.mbsrtowcs_s @ cdecl mbstowcs(ptr str long) ucrtbase.mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) ucrtbase.mbstowcs_s @ cdecl mbtowc(ptr str long) ucrtbase.mbtowc diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d4cfa44..dfda3dd 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1744,7 +1744,7 @@ @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc @ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ stub mbsrtowcs_s +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index cd56cf8..aaf67ec 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2103,7 +2103,7 @@ @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc @ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ stub mbsrtowcs_s +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 4c0e95a..8159f0a 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2280,7 +2280,7 @@ @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc @ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ stub mbsrtowcs_s +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index d7979d6..5087e9c 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1943,7 +1943,7 @@ @ cdecl mbrlen(ptr long ptr) msvcr120.mbrlen @ cdecl mbrtowc(ptr str long ptr) msvcr120.mbrtowc @ cdecl mbsrtowcs(ptr ptr long ptr) msvcr120.mbsrtowcs -@ stub mbsrtowcs_s +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) msvcr120.mbsrtowcs_s @ cdecl mbstowcs(ptr str long) msvcr120.mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) msvcr120.mbstowcs_s @ cdecl mbtowc(ptr str long) msvcr120.mbtowc diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 4def939..2611bcc 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1425,7 +1425,7 @@ @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc @ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ stub mbsrtowcs_s +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 752db52..45e1d6b 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1397,7 +1397,7 @@ @ cdecl mbrlen(ptr long ptr) MSVCRT_mbrlen @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc @ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ stub mbsrtowcs_s +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index e7adaad..c206af1 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -2357,6 +2357,35 @@ MSVCRT_size_t CDECL MSVCRT_mbsrtowcs(MSVCRT_wchar_t *wcstr, } /********************************************************************* + * mbsrtowcs_s(MSVCRT.@) + */ +int CDECL MSVCRT_mbsrtowcs_s(MSVCRT_size_t *ret, MSVCRT_wchar_t *wcstr, MSVCRT_size_t len, + const char **mbstr, MSVCRT_size_t count, MSVCRT_mbstate_t *state) +{ + MSVCRT_size_t tmp; + + if(!ret) ret = &tmp; + if(!MSVCRT_CHECK_PMT(!!wcstr == !!len)) { + *ret = -1; + return MSVCRT_EINVAL; + } + + *ret = MSVCRT_mbsrtowcs(wcstr, mbstr, count>len ? len : count, state); + if(*ret == -1) { + if(wcstr) *wcstr = 0; + return *MSVCRT__errno(); + } + (*ret)++; + if(*ret > len) { + /* no place for terminating '\0' */ + if(wcstr) *wcstr = 0; + return 0; + } + if(wcstr) wcstr[(*ret)-1] = 0; + return 0; +} + +/********************************************************************* * _mbctohira (MSVCRT.@) * * Converts a sjis katakana character to hiragana. diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ca1c97f..fb64163 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1365,7 +1365,7 @@ @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc # stub mbsdup_dbg(wstr long ptr long) @ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -# stub mbsrtowcs_s(ptr ptr long ptr long ptr) +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index bbae921..c4c6510 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2415,7 +2415,7 @@ @ stub mbrtoc32 @ cdecl mbrtowc(ptr str long ptr) MSVCRT_mbrtowc @ cdecl mbsrtowcs(ptr ptr long ptr) MSVCRT_mbsrtowcs -@ stub mbsrtowcs_s +@ cdecl mbsrtowcs_s(ptr ptr long ptr long ptr) MSVCRT_mbsrtowcs_s @ cdecl mbstowcs(ptr str long) MSVCRT_mbstowcs @ cdecl mbstowcs_s(ptr ptr long str long) MSVCRT__mbstowcs_s @ cdecl mbtowc(ptr str long) MSVCRT_mbtowc

1 0

Olivier F. R. Dierick : shell32: Set last error explicitly in SHFileOperation().
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: e3853a5e0f79b9cc191801b0ff2690f2cdd4a4ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3853a5e0f79b9cc191801b0f… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Sat Apr 23 16:03:39 2016 +0200 shell32: Set last error explicitly in SHFileOperation(). Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9f202b78046adbb30cb9b936e72ce3ca0c4fa1fa) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/shlfileop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 234a141..6f20181 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -894,7 +894,6 @@ int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp) if (ForFree) continue; retCode = ERROR_OUTOFMEMORY; nFileOp.fAnyOperationsAborted = TRUE; - SetLastError(retCode); return retCode; } } @@ -1564,6 +1563,7 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp) if (ret == ERROR_CANCELLED) lpFileOp->fAnyOperationsAborted = TRUE; + SetLastError(ERROR_SUCCESS); return ret; }

1 0

Alistair Leslie-Hughes : wininet: Free socket when connection is freed.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: bbacc9a40593cd33b36ad42b4400a39e1e5d5397 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbacc9a40593cd33b36ad42b4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Apr 11 18:41:25 2016 +1000 wininet: Free socket when connection is freed. 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> (cherry picked from commit 5ee82583f7716c140a02c4eb043e80d64cd33c04) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/netconnection.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 7305860..63b84aa 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -396,6 +396,7 @@ void free_netconn(netconn_t *netconn) DeleteSecurityContext(&netconn->ssl_ctx); } + close_netconn(netconn); heap_free(netconn); }

1 0

Luis Sahagun : winevdm: Tell dosbox to read the current user's config.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: a7704487daf1d70bf3a0a19ef45c4ac50f558f9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7704487daf1d70bf3a0a19ef… Author: Luis Sahagun <shankao(a)gmail.com> Date: Thu Jun 2 17:48:38 2016 +0800 winevdm: Tell dosbox to read the current user's config. Signed-off-by: Luis Sahagun <shankao(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6a05abed484cdfbb75956508a5837dbf58424f88) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winevdm/winevdm.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index 290ad25..08bfcfe 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -192,12 +192,13 @@ static void start_dosbox( const char *appname, const char *args ) p += sprintf( p, "exit\n" ); if (WriteFile( file, buffer, strlen(buffer), &written, NULL ) && written == strlen(buffer)) { - const char *args[4]; + const char *args[5]; char *config_file = wine_get_unix_file_name( config ); args[0] = dosbox; - args[1] = "-conf"; - args[2] = config_file; - args[3] = NULL; + args[1] = "-userconf"; + args[2] = "-conf"; + args[3] = config_file; + args[4] = NULL; ret = _spawnvp( _P_WAIT, args[0], args ); } CloseHandle( file );

1 0

Rob Walker : setupapi: Add stub for setupapi.dll.CM_Get_DevNode_Status.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: ac8732a6a20d82ba60999fedf07569ff32e573ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac8732a6a20d82ba60999fedf… Author: Rob Walker <bob.mt.wya(a)gmail.com> Date: Thu Jun 2 18:08:11 2016 +0100 setupapi: Add stub for setupapi.dll.CM_Get_DevNode_Status. Signed-off-by: Rob Walker <bob.mt.wya(a)gmail.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 10058e7c4efb472a372b09705c16d312d62d6b0c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/cfgmgr32/cfgmgr32.spec | 4 ++-- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index f442157..90a05ab 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -60,8 +60,8 @@ @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr long long) setupapi.CM_Get_DevNode_Registry_PropertyW @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExA @ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExW -@ stub CM_Get_DevNode_Status -@ stub CM_Get_DevNode_Status_Ex +@ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status +@ stdcall CM_Get_DevNode_Status_Ex(ptr ptr long long ptr) setupapi.CM_Get_DevNode_Status_Ex @ stdcall CM_Get_Device_IDA(ptr ptr long long) setupapi.CM_Get_Device_IDA @ stdcall CM_Get_Device_IDW(ptr ptr long long) setupapi.CM_Get_Device_IDW @ stdcall CM_Get_Device_ID_ExA(ptr ptr long long ptr) setupapi.CM_Get_Device_ID_ExA diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index c1dbed5..29065fc 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -71,8 +71,8 @@ @ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr long long) @ stdcall CM_Get_DevNode_Registry_Property_ExA(long long ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) -@ stub CM_Get_DevNode_Status -@ stub CM_Get_DevNode_Status_Ex +@ stdcall CM_Get_DevNode_Status(ptr ptr long long) +@ stdcall CM_Get_DevNode_Status_Ex(ptr ptr long long ptr) @ stdcall CM_Get_Device_IDA(ptr ptr long long) @ stdcall CM_Get_Device_IDW(ptr ptr long long) @ stdcall CM_Get_Device_ID_ExA(ptr ptr long long ptr) diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index a57f5fe..e5061fb 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -419,6 +419,26 @@ CONFIGRET WINAPI CM_Get_DevNode_Registry_PropertyW(DEVINST dev, ULONG prop, PULO } /*********************************************************************** + * CM_Get_DevNode_Status (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Status(ULONG *status, ULONG *problem, DEVINST dev, + ULONG flags) +{ + FIXME("%p %p 0x%08x 0x%08x: stub\n", status, problem, dev, flags); + return CR_FAILURE; +} + +/*********************************************************************** + * CM_Get_DevNode_Status_Ex (SETUPAPI.@) + */ +CONFIGRET WINAPI CM_Get_DevNode_Status_Ex(ULONG *status, ULONG *problem, DEVINST dev, + ULONG flags, HMACHINE machine) +{ + FIXME("%p %p 0x%08x 0x%08x %p: stub\n", status, problem, dev, flags, machine); + return CR_FAILURE; +} + +/*********************************************************************** * CM_Enumerate_Classes (SETUPAPI.@) */ CONFIGRET WINAPI CM_Enumerate_Classes(ULONG index, LPGUID class, ULONG flags)

1 0

Nikolay Sivov : comctl32/datetime: Use MCM_GETRANGE result directly in DTM_GETRANGE.
by Alexandre Julliard Aug. 22, 2016

Aug. 22, 2016

Module: wine Branch: stable Commit: 617528893a4148483975c33743189d34eb36098a URL: http://source.winehq.org/git/wine.git/?a=commit;h=617528893a4148483975c3374… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 14 20:19:26 2016 +0300 comctl32/datetime: Use MCM_GETRANGE result directly in DTM_GETRANGE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a62d17874423a13eb7a39edf71b9fcd549b85e4a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/datetime.c | 4 +--- dlls/comctl32/tests/datetime.c | 7 +++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 5c73a90..83db50e 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1555,7 +1555,6 @@ static LRESULT WINAPI DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { DATETIME_INFO *infoPtr = ((DATETIME_INFO *)GetWindowLongPtrW (hwnd, 0)); - LRESULT ret; TRACE ("%x, %lx, %lx\n", uMsg, wParam, lParam); @@ -1571,8 +1570,7 @@ DATETIME_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) return DATETIME_SetSystemTime (infoPtr, wParam, (SYSTEMTIME *) lParam); case DTM_GETRANGE: - ret = SendMessageW (infoPtr->hMonthCal, MCM_GETRANGE, wParam, lParam); - return ret ? ret : 1; /* bug emulation */ + return SendMessageW (infoPtr->hMonthCal, MCM_GETRANGE, wParam, lParam); case DTM_SETRANGE: return SendMessageW (infoPtr->hMonthCal, MCM_SETRANGE, wParam, lParam); diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 195c719..3701750 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -406,6 +406,13 @@ static void test_dtm_set_and_get_range(void) ok_sequence(sequences, DATETIME_SEQ_INDEX, test_dtm_set_and_get_range_seq, "test_dtm_set_and_get_range", FALSE); + /* DTM_SETRANGE with 0 flags */ + r = SendMessageA(hWnd, DTM_SETRANGE, 0, (LPARAM)st); + ok(r, "got %lu\n", r); + r = SendMessageA(hWnd, DTM_GETRANGE, 0, (LPARAM)getSt); + ok(r == 0, "got %lu\n", r); + ok(getSt[0].wYear == 0 && getSt[1].wYear == 0, "got %u, %u\n", getSt[0].wYear, getSt[1].wYear); + DestroyWindow(hWnd); }

1 0