wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Pierre Schweitzer : mpr: Implement provider selection given remote name.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: a65c31e46fa354fc8fbf86c0b9f273f86132a571 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a65c31e46fa354fc8fbf86c0b… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Wed Aug 10 11:50:58 2016 +0200 mpr: Implement provider selection given remote name. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 72 +++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 28 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 50d3d83..c44fec2 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1617,10 +1617,36 @@ static void use_connection_set_accessnameW(struct use_connection_context *ctxt, strcpyW(accessname, ctxt->resource->lpRemoteName); } +static DWORD wnet_use_provider( struct use_connection_context *ctxt, NETRESOURCEW * netres, WNetProvider *provider, BOOLEAN redirect ) +{ + DWORD caps, ret; + + caps = provider->getCaps(WNNC_CONNECTION); + if (!(caps & (WNNC_CON_ADDCONNECTION | WNNC_CON_ADDCONNECTION3))) + return ERROR_BAD_PROVIDER; + + ret = WN_ACCESS_DENIED; + do + { + if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) + ret = provider->addConnection3(ctxt->hwndOwner, netres, ctxt->password, ctxt->userid, ctxt->flags); + else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) + ret = provider->addConnection(netres, ctxt->password, ctxt->userid); + + if (ret == WN_ALREADY_CONNECTED && redirect) + netres->lpLocalName[0] -= 1; + } while (redirect && ret == WN_ALREADY_CONNECTED && netres->lpLocalName[0] >= 'C'); + + if (ret == WN_SUCCESS && ctxt->accessname) + ctxt->set_accessname(ctxt, netres->lpLocalName); + + return ret; +} + static DWORD wnet_use_connection( struct use_connection_context *ctxt ) { WNetProvider *provider; - DWORD index, ret, caps; + DWORD index, ret = WN_NO_NETWORK; BOOL redirect = FALSE; WCHAR letter[3] = {'Z', ':', 0}; NETRESOURCEW netres; @@ -1647,41 +1673,31 @@ static DWORD wnet_use_connection( struct use_connection_context *ctxt ) netres.lpLocalName = letter; } - if (!netres.lpProvider) - { - FIXME("Networking provider selection is not implemented.\n"); - return WN_NO_NETWORK; - } - if (ctxt->flags & CONNECT_INTERACTIVE) return ERROR_BAD_NET_NAME; - index = _findProviderIndexW(netres.lpProvider); - if (index == BAD_PROVIDER_INDEX) - return ERROR_BAD_PROVIDER; - - provider = &providerTable->table[index]; - caps = provider->getCaps(WNNC_CONNECTION); - if (!(caps & (WNNC_CON_ADDCONNECTION | WNNC_CON_ADDCONNECTION3))) - return ERROR_BAD_PROVIDER; - if ((ret = ctxt->pre_set_accessname(ctxt, netres.lpLocalName))) return ret; - ret = WN_ACCESS_DENIED; - do + if (netres.lpProvider) { - if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) - ret = provider->addConnection3(ctxt->hwndOwner, &netres, ctxt->password, ctxt->userid, ctxt->flags); - else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) - ret = provider->addConnection(&netres, ctxt->password, ctxt->userid); + index = _findProviderIndexW(netres.lpProvider); + if (index == BAD_PROVIDER_INDEX) + return ERROR_BAD_PROVIDER; - if (ret != NO_ERROR && redirect) - letter[0] -= 1; - } while (redirect && ret == WN_ALREADY_CONNECTED && letter[0] >= 'C'); - - if (ret == WN_SUCCESS && ctxt->accessname) - ctxt->set_accessname(ctxt, netres.lpLocalName); + provider = &providerTable->table[index]; + ret = wnet_use_provider(ctxt, &netres, provider, redirect); + } + else + { + for (index = 0; index < providerTable->numProviders; index++) + { + provider = &providerTable->table[index]; + ret = wnet_use_provider(ctxt, &netres, provider, redirect); + if (ret == WN_SUCCESS || ret == WN_ALREADY_CONNECTED) + break; + } + } return ret; }

1 0

Pierre Schweitzer : mpr: Implement local name automatic redirection for disks.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: b452e6285915b1ad46920fc8551335ab28bfb4c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b452e6285915b1ad46920fc85… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Wed Aug 10 11:43:46 2016 +0200 mpr: Implement local name automatic redirection for disks. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 71 ++++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 26 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 0d4209c..50d3d83 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1581,18 +1581,18 @@ struct use_connection_context void *accessname; DWORD *buffer_size; DWORD *result; - DWORD (*pre_set_accessname)(struct use_connection_context*); - void (*set_accessname)(struct use_connection_context*); + DWORD (*pre_set_accessname)(struct use_connection_context*, WCHAR *); + void (*set_accessname)(struct use_connection_context*, WCHAR *); }; -static DWORD use_connection_pre_set_accessnameW(struct use_connection_context *ctxt) +static DWORD use_connection_pre_set_accessnameW(struct use_connection_context *ctxt, WCHAR *local_name) { if (ctxt->accessname && ctxt->buffer_size && *ctxt->buffer_size) { DWORD len; - if (ctxt->resource->lpLocalName) - len = strlenW(ctxt->resource->lpLocalName); + if (local_name) + len = strlenW(local_name); else len = strlenW(ctxt->resource->lpRemoteName); @@ -1608,11 +1608,11 @@ static DWORD use_connection_pre_set_accessnameW(struct use_connection_context *c return ERROR_SUCCESS; } -static void use_connection_set_accessnameW(struct use_connection_context *ctxt) +static void use_connection_set_accessnameW(struct use_connection_context *ctxt, WCHAR *local_name) { WCHAR *accessname = ctxt->accessname; - if (ctxt->resource->lpLocalName) - strcpyW(accessname, ctxt->resource->lpLocalName); + if (local_name) + strcpyW(accessname, local_name); else strcpyW(accessname, ctxt->resource->lpRemoteName); } @@ -1621,29 +1621,42 @@ static DWORD wnet_use_connection( struct use_connection_context *ctxt ) { WNetProvider *provider; DWORD index, ret, caps; + BOOL redirect = FALSE; + WCHAR letter[3] = {'Z', ':', 0}; + NETRESOURCEW netres; if (!providerTable || providerTable->numProviders == 0) return WN_NO_NETWORK; if (!ctxt->resource) return ERROR_INVALID_PARAMETER; + netres = *ctxt->resource; - if (!ctxt->resource->lpProvider) + if (!netres.lpLocalName && (ctxt->flags & CONNECT_REDIRECT)) { - FIXME("Networking provider selection is not implemented.\n"); - return WN_NO_NETWORK; + if (netres.dwType != RESOURCETYPE_DISK && netres.dwType != RESOURCETYPE_PRINT) + return ERROR_BAD_DEV_TYPE; + + if (netres.dwType == RESOURCETYPE_PRINT) + { + FIXME("Local device selection is not implemented for printers.\n"); + return WN_NO_NETWORK; + } + + redirect = TRUE; + netres.lpLocalName = letter; } - if (!ctxt->resource->lpLocalName && (ctxt->flags & CONNECT_REDIRECT)) + if (!netres.lpProvider) { - FIXME("Locale device selection is not implemented.\n"); + FIXME("Networking provider selection is not implemented.\n"); return WN_NO_NETWORK; } if (ctxt->flags & CONNECT_INTERACTIVE) return ERROR_BAD_NET_NAME; - index = _findProviderIndexW(ctxt->resource->lpProvider); + index = _findProviderIndexW(netres.lpProvider); if (index == BAD_PROVIDER_INDEX) return ERROR_BAD_PROVIDER; @@ -1652,17 +1665,23 @@ static DWORD wnet_use_connection( struct use_connection_context *ctxt ) if (!(caps & (WNNC_CON_ADDCONNECTION | WNNC_CON_ADDCONNECTION3))) return ERROR_BAD_PROVIDER; - if ((ret = ctxt->pre_set_accessname(ctxt))) + if ((ret = ctxt->pre_set_accessname(ctxt, netres.lpLocalName))) return ret; ret = WN_ACCESS_DENIED; - if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) - ret = provider->addConnection3(ctxt->hwndOwner, ctxt->resource, ctxt->password, ctxt->userid, ctxt->flags); - else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) - ret = provider->addConnection(ctxt->resource, ctxt->password, ctxt->userid); + do + { + if ((caps & WNNC_CON_ADDCONNECTION3) && provider->addConnection3) + ret = provider->addConnection3(ctxt->hwndOwner, &netres, ctxt->password, ctxt->userid, ctxt->flags); + else if ((caps & WNNC_CON_ADDCONNECTION) && provider->addConnection) + ret = provider->addConnection(&netres, ctxt->password, ctxt->userid); + + if (ret != NO_ERROR && redirect) + letter[0] -= 1; + } while (redirect && ret == WN_ALREADY_CONNECTED && letter[0] >= 'C'); if (ret == WN_SUCCESS && ctxt->accessname) - ctxt->set_accessname(ctxt); + ctxt->set_accessname(ctxt, netres.lpLocalName); return ret; } @@ -1694,14 +1713,14 @@ DWORD WINAPI WNetUseConnectionW( HWND hwndOwner, NETRESOURCEW *resource, LPCWSTR return wnet_use_connection(&ctxt); } -static DWORD use_connection_pre_set_accessnameA(struct use_connection_context *ctxt) +static DWORD use_connection_pre_set_accessnameA(struct use_connection_context *ctxt, WCHAR *local_name) { if (ctxt->accessname && ctxt->buffer_size && *ctxt->buffer_size) { DWORD len; - if (ctxt->resourceA->lpLocalName) - len = strlen(ctxt->resourceA->lpLocalName); + if (local_name) + len = WideCharToMultiByte(CP_ACP, 0, local_name, -1, NULL, 0, NULL, NULL) - 1; else len = strlen(ctxt->resourceA->lpRemoteName); @@ -1717,11 +1736,11 @@ static DWORD use_connection_pre_set_accessnameA(struct use_connection_context *c return ERROR_SUCCESS; } -static void use_connection_set_accessnameA(struct use_connection_context *ctxt) +static void use_connection_set_accessnameA(struct use_connection_context *ctxt, WCHAR *local_name) { char *accessname = ctxt->accessname; - if (ctxt->resourceA->lpLocalName) - strcpy(accessname, ctxt->resourceA->lpLocalName); + if (local_name) + WideCharToMultiByte(CP_ACP, 0, local_name, -1, accessname, *ctxt->buffer_size, NULL, NULL); else strcpy(accessname, ctxt->resourceA->lpRemoteName); }

1 0

Michael Stefaniuc : fusion: Avoid using the LPASSEMBLYNAME type.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: 8b6fa5c9bab54c32a6fb270442b92c90b2290b8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b6fa5c9bab54c32a6fb27044… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 11 10:53:25 2016 +0200 fusion: Avoid using the LPASSEMBLYNAME type. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fusion/asmname.c | 2 +- dlls/fusion/tests/asmenum.c | 2 +- dlls/fusion/tests/asmname.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index f7a9452..0baea2f 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -727,7 +727,7 @@ done: /****************************************************************** * CreateAssemblyNameObject (FUSION.@) */ -HRESULT WINAPI CreateAssemblyNameObject(LPASSEMBLYNAME *ppAssemblyNameObj, +HRESULT WINAPI CreateAssemblyNameObject(IAssemblyName **ppAssemblyNameObj, LPCWSTR szAssemblyName, DWORD dwFlags, LPVOID pvReserved) { diff --git a/dlls/fusion/tests/asmenum.c b/dlls/fusion/tests/asmenum.c index a060529..1dc34a2 100644 --- a/dlls/fusion/tests/asmenum.c +++ b/dlls/fusion/tests/asmenum.c @@ -33,7 +33,7 @@ static HRESULT (WINAPI *pCreateAssemblyEnum)(IAssemblyEnum **pEnum, IUnknown *pUnkReserved, IAssemblyName *pName, DWORD dwFlags, LPVOID pvReserved); -static HRESULT (WINAPI *pCreateAssemblyNameObject)(LPASSEMBLYNAME *ppAssemblyNameObj, +static HRESULT (WINAPI *pCreateAssemblyNameObject)(IAssemblyName **ppAssemblyNameObj, LPCWSTR szAssemblyName, DWORD dwFlags, LPVOID pvReserved); static HRESULT (WINAPI *pGetCachePath)(ASM_CACHE_FLAGS dwCacheFlags, diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index e415c3a9..5fb14a4 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -35,7 +35,7 @@ static CHAR string1[MAX_PATH]; if (lstrcmpA(string1, aString) != 0) \ ok(0, "Expected \"%s\", got \"%s\"\n", aString, string1); -static HRESULT (WINAPI *pCreateAssemblyNameObject)(LPASSEMBLYNAME *ppAssemblyNameObj, +static HRESULT (WINAPI *pCreateAssemblyNameObject)(IAssemblyName **ppAssemblyNameObj, LPCWSTR szAssemblyName, DWORD dwFlags, LPVOID pvReserved); static HRESULT (WINAPI *pLoadLibraryShim)(LPCWSTR szDllName, LPCWSTR szVersion,

1 0

Michael Stefaniuc : ole32/tests: Avoid casts from COM objects to ifaces.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: 11c67756d2374270d0deeeacc23735cae33488f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11c67756d2374270d0deeeacc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 11 10:50:49 2016 +0200 ole32/tests: Avoid casts from COM objects to ifaces. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/clipboard.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/clipboard.c b/dlls/ole32/tests/clipboard.c index 13e5220..1a8301e 100644 --- a/dlls/ole32/tests/clipboard.c +++ b/dlls/ole32/tests/clipboard.c @@ -192,7 +192,7 @@ static HRESULT EnumFormatImpl_Create(FORMATETC *fmtetc, UINT fmtetc_cnt, IEnumFO ret->fmtetc_cnt = fmtetc_cnt; ret->fmtetc = HeapAlloc(GetProcessHeap(), 0, fmtetc_cnt*sizeof(FORMATETC)); memcpy(ret->fmtetc, fmtetc, fmtetc_cnt*sizeof(FORMATETC)); - *lplpformatetc = (LPENUMFORMATETC)ret; + *lplpformatetc = &ret->IEnumFORMATETC_iface; return S_OK; } @@ -395,7 +395,7 @@ static HRESULT DataObjectImpl_CreateText(LPCSTR text, LPDATAOBJECT *lplpdataobj) obj->fmtetc = HeapAlloc(GetProcessHeap(), 0, obj->fmtetc_cnt*sizeof(FORMATETC)); InitFormatEtc(obj->fmtetc[0], CF_TEXT, TYMED_HGLOBAL); - *lplpdataobj = (LPDATAOBJECT)obj; + *lplpdataobj = &obj->IDataObject_iface; return S_OK; } @@ -451,7 +451,7 @@ static HRESULT DataObjectImpl_CreateComplex(LPDATAOBJECT *lplpdataobj) InitFormatEtc(obj->fmtetc[7], cf_another, 0xfffff); obj->fmtetc[7].dwAspect = DVASPECT_ICON; - *lplpdataobj = (LPDATAOBJECT)obj; + *lplpdataobj = &obj->IDataObject_iface; return S_OK; }

1 0

Michael Stefaniuc : avifil32: Avoid a cast from a COM object to an iface.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: b7b031aa431076b5e47e834fb4d412628f8ffa61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b031aa431076b5e47e834fb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 11 10:49:26 2016 +0200 avifil32: Avoid a cast from a COM object to an iface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avifil32/getframe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index 46b1683..c8580a8 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -504,7 +504,7 @@ PGETFRAME AVIFILE_CreateGetFrame(PAVISTREAM pStream) IAVIStream_AddRef(pStream); } - return (PGETFRAME)pg; + return &pg->IGetFrame_iface; } /***********************************************************************/

1 0

Sebastian Lackner : configure: Explicitly check for sysinfo function.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: 9815806f16441004b87b11e3c0bbc190e9011044 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9815806f16441004b87b11e3c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Aug 11 08:34:21 2016 +0200 configure: Explicitly check for sysinfo function. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/ntdll/virtual.c | 4 ++-- include/config.h.in | 3 +++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configure b/configure index b8eedc5..bf4d1a7 100755 --- a/configure +++ b/configure @@ -15133,6 +15133,7 @@ for ac_func in \ strtoll \ strtoull \ symlink \ + sysinfo \ tcdrain \ thr_kill2 \ timegm \ diff --git a/configure.ac b/configure.ac index f5dde04..0fad32f 100644 --- a/configure.ac +++ b/configure.ac @@ -2039,6 +2039,7 @@ AC_CHECK_FUNCS(\ strtoll \ strtoull \ symlink \ + sysinfo \ tcdrain \ thr_kill2 \ timegm \ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 1312c8b..e826fa0 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1359,7 +1359,7 @@ void virtual_init_threading(void) */ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) { -#ifdef HAVE_SYS_SYSINFO_H +#ifdef HAVE_SYSINFO struct sysinfo sinfo; #endif @@ -1368,7 +1368,7 @@ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) info->PageSize = page_size; info->MmLowestPhysicalPage = 1; info->MmHighestPhysicalPage = 0x7fffffff / page_size; -#ifdef HAVE_SYS_SYSINFO_H +#ifdef HAVE_SYSINFO if (!sysinfo(&sinfo)) { ULONG64 total = (ULONG64)sinfo.totalram * sinfo.mem_unit; diff --git a/include/config.h.in b/include/config.h.in index 64f56fd..6acafca 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1008,6 +1008,9 @@ /* Define to 1 if you have the <syscall.h> header file. */ #undef HAVE_SYSCALL_H +/* Define to 1 if you have the `sysinfo' function. */ +#undef HAVE_SYSINFO + /* Define to 1 if you have the <sys/asoundlib.h> header file. */ #undef HAVE_SYS_ASOUNDLIB_H

1 0

Daniel Lehman : msvcr120: Add forwards for wcstoll and wcstoll_l.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: beb94094d03ab533f20e0a9aab6df6966e0b5b11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=beb94094d03ab533f20e0a9aa… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Aug 11 08:22:41 2016 +0200 msvcr120: Add forwards for wcstoll and wcstoll_l. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 4 ++-- dlls/ucrtbase/ucrtbase.spec | 4 ++-- 4 files changed, 8 insertions(+), 8 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 e2b5ab9..29b7a4c 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 @@ -57,7 +57,7 @@ @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) ucrtbase._wcstol_l @ stub _wcstold_l -@ stub _wcstoll_l +@ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) ucrtbase._wcstoll_l @ cdecl _wcstombs_l(ptr ptr long ptr) ucrtbase._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) ucrtbase._wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) ucrtbase._wcstoui64 @@ -110,7 +110,7 @@ @ stub wcstoimax @ cdecl wcstol(wstr ptr long) ucrtbase.wcstol @ stub wcstold -@ stub wcstoll +@ cdecl -ret64 wcstoll(wstr ptr long) ucrtbase.wcstoll @ cdecl wcstombs(ptr ptr long) ucrtbase.wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) ucrtbase.wcstombs_s @ cdecl wcstoul(wstr ptr long) ucrtbase.wcstoul diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 0ac1de8..f65d150 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1894,7 +1894,7 @@ @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l @ stub _wcstold_l -@ stub _wcstoll_l +@ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstombs_l(ptr ptr long ptr) MSVCRT__wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 @@ -2476,7 +2476,7 @@ @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s @ cdecl wcstol(wstr ptr long) ntdll.wcstol @ stub wcstold -@ stub wcstoll +@ cdecl -ret64 wcstoll(wstr ptr long) MSVCRT__wcstoi64 @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 99e1fa9..de68b87 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1587,7 +1587,7 @@ @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) msvcr120._wcstol_l @ stub _wcstold_l -@ stub _wcstoll_l +@ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) msvcr120._wcstoll_l @ cdecl _wcstombs_l(ptr ptr long ptr) msvcr120._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcr120._wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) msvcr120._wcstoui64 @@ -2138,7 +2138,7 @@ @ cdecl wcstok_s(ptr wstr ptr) msvcr120.wcstok_s @ cdecl wcstol(wstr ptr long) msvcr120.wcstol @ stub wcstold -@ stub wcstoll +@ cdecl -ret64 wcstoll(wstr ptr long) msvcr120.wcstoll @ cdecl wcstombs(ptr ptr long) msvcr120.wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) msvcr120.wcstombs_s @ cdecl wcstoul(wstr ptr long) msvcr120.wcstoul diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 7582ba9..bb18d4f 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2043,7 +2043,7 @@ @ stub _wcstoimax_l @ cdecl _wcstol_l(wstr ptr long ptr) MSVCRT__wcstol_l @ stub _wcstold_l -@ stub _wcstoll_l +@ cdecl -ret64 _wcstoll_l(wstr ptr long ptr) MSVCRT__wcstoi64_l @ cdecl _wcstombs_l(ptr ptr long ptr) MSVCRT__wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l @ cdecl -ret64 _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 @@ -2583,7 +2583,7 @@ @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s @ cdecl wcstol(wstr ptr long) ntdll.wcstol @ stub wcstold -@ stub wcstoll +@ cdecl -ret64 wcstoll(wstr ptr long) MSVCRT__wcstoi64 @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul

1 0

Daniel Lehman : msvcp110: Use sentry in istream<>::seekg.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: b04b7e24804640ef3e43b72bd2ca77943bd2c1f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b04b7e24804640ef3e43b72bd… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Apr 4 13:39:30 2016 -0700 msvcp110: Use sentry in istream<>::seekg. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 76 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 6b9a820..079c57b 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8789,9 +8789,27 @@ DEFINE_THISCALL_WRAPPER(basic_istream_char_seekg, 12) basic_istream_char* __thiscall basic_istream_char_seekg(basic_istream_char *this, streamoff off, int dir) { basic_ios_char *base = basic_istream_char_get_basic_ios(this); +#if _MSVCP_VER >= 110 + IOSB_iostate state; TRACE("(%p %s %d)\n", this, wine_dbgstr_longlong(off), dir); + state = ios_base_rdstate(&base->base); + ios_base_clear(&base->base, state & ~IOSTATE_eofbit); + + if(basic_istream_char_sentry_create(this, TRUE)) { + basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); + fpos_int ret; + + basic_streambuf_char_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); + + if(ret.off==-1 && ret.pos==0 && ret.state==0) + basic_ios_char_setstate(base, IOSTATE_failbit); + } + basic_istream_char_sentry_destroy(this); +#else + TRACE("(%p %s %d)\n", this, wine_dbgstr_longlong(off), dir); + if(!ios_base_fail(&base->base)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); fpos_int ret; @@ -8805,7 +8823,7 @@ basic_istream_char* __thiscall basic_istream_char_seekg(basic_istream_char *this return this; }else basic_ios_char_clear(base, IOSTATE_goodbit); - +#endif return this; } @@ -8815,9 +8833,27 @@ DEFINE_THISCALL_WRAPPER(basic_istream_char_seekg_fpos, 28) basic_istream_char* __thiscall basic_istream_char_seekg_fpos(basic_istream_char *this, fpos_int pos) { basic_ios_char *base = basic_istream_char_get_basic_ios(this); +#if _MSVCP_VER >= 110 + IOSB_iostate state; TRACE("(%p %s)\n", this, debugstr_fpos_int(&pos)); + state = ios_base_rdstate(&base->base); + ios_base_clear(&base->base, state & ~IOSTATE_eofbit); + + if(basic_istream_char_sentry_create(this, TRUE)) { + basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); + fpos_int ret; + + basic_streambuf_char_pubseekpos(strbuf, &ret, pos, OPENMODE_in); + + if(ret.off==-1 && ret.pos==0 && ret.state==0) + basic_ios_char_setstate(base, IOSTATE_failbit); + } + basic_istream_char_sentry_destroy(this); +#else + TRACE("(%p %s)\n", this, debugstr_fpos_int(&pos)); + if(!ios_base_fail(&base->base)) { basic_streambuf_char *strbuf = basic_ios_char_rdbuf_get(base); fpos_int ret; @@ -8831,7 +8867,7 @@ basic_istream_char* __thiscall basic_istream_char_seekg_fpos(basic_istream_char return this; }else basic_ios_char_clear(base, IOSTATE_goodbit); - +#endif return this; } @@ -10328,9 +10364,27 @@ DEFINE_THISCALL_WRAPPER(basic_istream_wchar_seekg, 12) basic_istream_wchar* __thiscall basic_istream_wchar_seekg(basic_istream_wchar *this, streamoff off, int dir) { basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); +#if _MSVCP_VER >= 110 + IOSB_iostate state; TRACE("(%p %s %d)\n", this, wine_dbgstr_longlong(off), dir); + state = ios_base_rdstate(&base->base); + ios_base_clear(&base->base, state & ~IOSTATE_eofbit); + + if(basic_istream_wchar_sentry_create(this, TRUE)) { + basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); + fpos_int ret; + + basic_streambuf_wchar_pubseekoff(strbuf, &ret, off, dir, OPENMODE_in); + + if(ret.off==-1 && ret.pos==0 && ret.state==0) + basic_ios_wchar_setstate(base, IOSTATE_failbit); + } + basic_istream_wchar_sentry_destroy(this); +#else + TRACE("(%p %s %d)\n", this, wine_dbgstr_longlong(off), dir); + if(!ios_base_fail(&base->base)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); fpos_int ret; @@ -10344,7 +10398,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg(basic_istream_wchar *t return this; }else basic_ios_wchar_clear(base, IOSTATE_goodbit); - +#endif return this; } @@ -10356,9 +10410,27 @@ DEFINE_THISCALL_WRAPPER(basic_istream_wchar_seekg_fpos, 28) basic_istream_wchar* __thiscall basic_istream_wchar_seekg_fpos(basic_istream_wchar *this, fpos_int pos) { basic_ios_wchar *base = basic_istream_wchar_get_basic_ios(this); +#if _MSVCP_VER >= 110 + IOSB_iostate state; TRACE("(%p %s)\n", this, debugstr_fpos_int(&pos)); + state = ios_base_rdstate(&base->base); + ios_base_clear(&base->base, state & ~IOSTATE_eofbit); + + if(basic_istream_wchar_sentry_create(this, TRUE)) { + basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); + fpos_int ret; + + basic_streambuf_wchar_pubseekpos(strbuf, &ret, pos, OPENMODE_in); + + if(ret.off==-1 && ret.pos==0 && ret.state==0) + basic_ios_wchar_setstate(base, IOSTATE_failbit); + } + basic_istream_wchar_sentry_destroy(this); +#else + TRACE("(%p %s)\n", this, debugstr_fpos_int(&pos)); + if(!ios_base_fail(&base->base)) { basic_streambuf_wchar *strbuf = basic_ios_wchar_rdbuf_get(base); fpos_int ret; @@ -10372,7 +10444,7 @@ basic_istream_wchar* __thiscall basic_istream_wchar_seekg_fpos(basic_istream_wch return this; }else basic_ios_wchar_clear(base, IOSTATE_goodbit); - +#endif return this; }

1 0

Daniel Lehman : msvcp110: Use sentry in istream<>::tellg.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: 3888aa4d8d406fce2c63b79e4e8fe164cd549a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3888aa4d8d406fce2c63b79e4… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Apr 4 13:24:21 2016 -0700 msvcp110: Use sentry in istream<>::tellg. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index fbbb320..6b9a820 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8746,6 +8746,20 @@ fpos_int* __thiscall basic_istream_char_tellg(basic_istream_char *this, fpos_int TRACE("(%p %p)\n", this, ret); +#if _MSVCP_VER >= 110 + if(basic_istream_char_sentry_create(this, TRUE)) { + basic_streambuf_char_pubseekoff(basic_ios_char_rdbuf_get(base), + ret, 0, SEEKDIR_cur, OPENMODE_in); + + if(ret->off==-1 && ret->pos==0 && ret->state==0) + basic_ios_char_setstate(base, IOSTATE_failbit); + }else { + ret->off = -1; + ret->pos = 0; + ret->state = 0; + } + basic_istream_char_sentry_destroy(this); +#else if(ios_base_fail(&base->base)) { ret->off = -1; ret->pos = 0; @@ -8758,6 +8772,7 @@ fpos_int* __thiscall basic_istream_char_tellg(basic_istream_char *this, fpos_int if(ret->off==-1 && ret->pos==0 && ret->state==0) basic_ios_char_setstate(base, IOSTATE_failbit); +#endif return ret; } @@ -10270,6 +10285,20 @@ fpos_int* __thiscall basic_istream_wchar_tellg(basic_istream_wchar *this, fpos_i TRACE("(%p %p)\n", this, ret); +#if _MSVCP_VER >= 110 + if(basic_istream_wchar_sentry_create(this, TRUE)) { + basic_streambuf_wchar_pubseekoff(basic_ios_wchar_rdbuf_get(base), + ret, 0, SEEKDIR_cur, OPENMODE_in); + + if(ret->off==-1 && ret->pos==0 && ret->state==0) + basic_ios_wchar_setstate(base, IOSTATE_failbit); + }else { + ret->off = -1; + ret->pos = 0; + ret->state = 0; + } + basic_istream_wchar_sentry_destroy(this); +#else if(ios_base_fail(&base->base)) { ret->off = -1; ret->pos = 0; @@ -10281,7 +10310,7 @@ fpos_int* __thiscall basic_istream_wchar_tellg(basic_istream_wchar *this, fpos_i ret, 0, SEEKDIR_cur, OPENMODE_in); if(ret->off==-1 && ret->pos==0 && ret->state==0) basic_ios_wchar_setstate(base, IOSTATE_failbit); - +#endif return ret; }

1 0

Daniel Lehman : msvcp140: Forward __ExceptionPtr* to msvcr120.
by Alexandre Julliard 11 Aug '16

11 Aug '16

Module: wine Branch: master Commit: 4686a5ee59f91e1033daeeb5bc5d5f5121a8075e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4686a5ee59f91e1033daeeb5b… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Jun 16 16:38:08 2016 -0700 msvcp140: Forward __ExceptionPtr* to msvcr120. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 6e17e0d..f5a0838 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -1693,22 +1693,22 @@ @ stub -arch=win64 ?__ExceptionPtrAssign@@YAXPEAXPEBX@Z @ stub -arch=win32 ?__ExceptionPtrCompare@@YA_NPBX0@Z @ stub -arch=win64 ?__ExceptionPtrCompare@@YA_NPEBX0@Z -@ stub -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX@Z -@ stub -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX@Z +@ cdecl -arch=win32 ?__ExceptionPtrCopy@@YAXPAXPBX@Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPAXPBX@Z +@ cdecl -arch=win64 ?__ExceptionPtrCopy@@YAXPEAXPEBX@Z(ptr ptr) msvcr120.?__ExceptionPtrCopy@@YAXPEAXPEBX@Z @ stub -arch=win32 ?__ExceptionPtrCopyException@@YAXPAXPBX1@Z @ stub -arch=win64 ?__ExceptionPtrCopyException@@YAXPEAXPEBX1@Z -@ stub -arch=win32 ?__ExceptionPtrCreate@@YAXPAX@Z -@ stub -arch=win64 ?__ExceptionPtrCreate@@YAXPEAX@Z -@ stub -arch=win32 ?__ExceptionPtrCurrentException@@YAXPAX@Z -@ stub -arch=win64 ?__ExceptionPtrCurrentException@@YAXPEAX@Z -@ stub -arch=win32 ?__ExceptionPtrDestroy@@YAXPAX@Z -@ stub -arch=win64 ?__ExceptionPtrDestroy@@YAXPEAX@Z -@ stub -arch=win32 ?__ExceptionPtrRethrow@@YAXPBX@Z -@ stub -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX@Z +@ cdecl -arch=win32 ?__ExceptionPtrCreate@@YAXPAX@Z(ptr) msvcr120.?__ExceptionPtrCreate@@YAXPAX@Z +@ cdecl -arch=win64 ?__ExceptionPtrCreate@@YAXPEAX@Z(ptr) msvcr120.?__ExceptionPtrCreate@@YAXPEAX@Z +@ cdecl -arch=win32 ?__ExceptionPtrCurrentException@@YAXPAX@Z(ptr) msvcr120.?__ExceptionPtrCurrentException@@YAXPAX@Z +@ cdecl -arch=win64 ?__ExceptionPtrCurrentException@@YAXPEAX@Z(ptr) msvcr120.?__ExceptionPtrCurrentException@@YAXPEAX@Z +@ cdecl -arch=win32 ?__ExceptionPtrDestroy@@YAXPAX@Z(ptr) msvcr120.?__ExceptionPtrDestroy@@YAXPAX@Z +@ cdecl -arch=win64 ?__ExceptionPtrDestroy@@YAXPEAX@Z(ptr) msvcr120.?__ExceptionPtrDestroy@@YAXPEAX@Z +@ cdecl -arch=win32 ?__ExceptionPtrRethrow@@YAXPBX@Z(ptr) msvcr120.?__ExceptionPtrRethrow@@YAXPBX@Z +@ cdecl -arch=win64 ?__ExceptionPtrRethrow@@YAXPEBX@Z(ptr) msvcr120.?__ExceptionPtrRethrow@@YAXPEBX@Z @ stub -arch=win32 ?__ExceptionPtrSwap@@YAXPAX0@Z @ stub -arch=win64 ?__ExceptionPtrSwap@@YAXPEAX0@Z -@ stub -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX@Z -@ stub -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX@Z +@ cdecl -arch=win32 ?__ExceptionPtrToBool@@YA_NPBX@Z(ptr) msvcr120.?__ExceptionPtrToBool@@YA_NPBX@Z +@ cdecl -arch=win64 ?__ExceptionPtrToBool@@YA_NPEBX@Z(ptr) msvcr120.?__ExceptionPtrToBool@@YA_NPEBX@Z @ cdecl -arch=arm ?always_noconv@codecvt_base@std@@QBA_NXZ(ptr) codecvt_base_always_noconv @ thiscall -arch=i386 ?always_noconv@codecvt_base@std@@QBE_NXZ(ptr) codecvt_base_always_noconv @ cdecl -arch=win64 ?always_noconv@codecvt_base@std@@QEBA_NXZ(ptr) codecvt_base_always_noconv

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2016