September 2018 - Wine-commits

Sebastian Lackner : kernel32: Fill stack with meaningful values in call_process_entry mis-align workaround.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: 87b315ee787ddb10cc1e6d0f1487c44d087b9188 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87b315ee787ddb10cc1e6d0f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jul 8 21:19:56 2018 +0200 kernel32: Fill stack with meaningful values in call_process_entry mis-align workaround. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 61d92d1317272c4528872b091a5308905dd00429) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/process.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 62dc815..e23786b 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1082,7 +1082,9 @@ __ASM_GLOBAL_FUNC( call_process_entry, __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") "movl %esp,%ebp\n\t" __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") - "subl $12,%esp\n\t" /* deliberately mis-align the stack by 8, Doom 3 needs this */ + "pushl 4(%ebp)\n\t" /* deliberately mis-align the stack by 8, Doom 3 needs this */ + "pushl 4(%ebp)\n\t" /* Driller expects readable address at this offset */ + "pushl 4(%ebp)\n\t" "pushl 8(%ebp)\n\t" "call *12(%ebp)\n\t" "leave\n\t"

1 0

Michael Müller : msvcr120: Add stub for _SetWinRTOutOfMemoryExceptionCallback.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: 89ec909ca12191e90394463b540faeab43966a36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89ec909ca12191e90394463b… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Jul 9 13:41:45 2018 +0200 msvcr120: Add stub for _SetWinRTOutOfMemoryExceptionCallback. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0dde2b8a2f15251cf1cd9738c6e30fbbc30369fe) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcrt/misc.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 0edd871..7041795 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -10,7 +10,7 @@ @ stub _NLG_Return2 @ stub _SetImageBase @ stub _SetThrowImageBase -@ stub _SetWinRTOutOfMemoryExceptionCallback +@ cdecl _SetWinRTOutOfMemoryExceptionCallback(ptr) ucrtbase._SetWinRTOutOfMemoryExceptionCallback @ cdecl __AdjustPointer(ptr ptr) ucrtbase.__AdjustPointer @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 529103f..109666e 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -844,7 +844,7 @@ @ stub -arch=i386 _NLG_Return @ stub -arch=i386 _NLG_Return2 @ stub -arch=arm,win64 __NLG_Return2 -@ stub _SetWinRTOutOfMemoryExceptionCallback +@ cdecl _SetWinRTOutOfMemoryExceptionCallback(ptr) MSVCR120__SetWinRTOutOfMemoryExceptionCallback @ stub -arch=win64 _SetImageBase @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(ptr long str ptr ptr) diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 2dc8a07..064aa77 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -838,7 +838,7 @@ @ stub -arch=i386 _NLG_Return @ stub -arch=i386 _NLG_Return2 @ stub -arch=arm,win64 __NLG_Return2 -@ stub _SetWinRTOutOfMemoryExceptionCallback +@ cdecl _SetWinRTOutOfMemoryExceptionCallback(ptr) msvcr120._SetWinRTOutOfMemoryExceptionCallback @ stub -arch=win64 _SetImageBase @ stub -arch=win64 _SetThrowImageBase @ cdecl _Strftime(ptr long str ptr ptr) msvcr120._Strftime diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index c197d69..c5f8f42 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -578,4 +578,12 @@ void CDECL MSVCRT__crtSleep(DWORD timeout) TRACE("(%u)\n", timeout); Sleep(timeout); } + +/********************************************************************* + * _SetWinRTOutOfMemoryExceptionCallback (MSVCR120.@) + */ +void CDECL MSVCR120__SetWinRTOutOfMemoryExceptionCallback(void *callback) +{ + FIXME("(%p): stub\n", callback); +} #endif diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index d1498d1..504b27d 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -39,7 +39,7 @@ @ stub _NLG_Dispatch2 @ stub _NLG_Return @ stub _NLG_Return2 -@ stub _SetWinRTOutOfMemoryExceptionCallback +@ cdecl _SetWinRTOutOfMemoryExceptionCallback(ptr) MSVCR120__SetWinRTOutOfMemoryExceptionCallback @ cdecl _Strftime(ptr long str ptr ptr) @ cdecl _W_Getdays() @ cdecl _W_Getmonths() diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index 331a087..8048dc5 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -6,7 +6,7 @@ @ stub _NLG_Dispatch2 @ stub _NLG_Return @ stub _NLG_Return2 -@ stub _SetWinRTOutOfMemoryExceptionCallback +@ cdecl _SetWinRTOutOfMemoryExceptionCallback(ptr) ucrtbase._SetWinRTOutOfMemoryExceptionCallback @ cdecl __AdjustPointer(ptr ptr) ucrtbase.__AdjustPointer @ stub __BuildCatchObject @ stub __BuildCatchObjectHelper

1 0

Louis Lenders : ntoskrnl.exe: Add stub for IoUnregisterPlugPlayNotification.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: be4b62e892651ffd79125cff56ac75553a4b25a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be4b62e892651ffd79125cff… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Jun 26 17:05:31 2018 +0200 ntoskrnl.exe: Add stub for IoUnregisterPlugPlayNotification. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 37e22ebb33ddc205bd2c364e9bc79e263c92325b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 1e63e3f..521350b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2682,6 +2682,15 @@ NTSTATUS WINAPI IoRegisterPlugPlayNotification(IO_NOTIFICATION_EVENT_CATEGORY ca } /***************************************************** + * IoUnregisterPlugPlayNotification (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoUnregisterPlugPlayNotification(PVOID notification) +{ + FIXME("stub: %p\n", notification); + return STATUS_SUCCESS; +} + +/***************************************************** * IoCsqInitialize (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoCsqInitialize(PIO_CSQ csq, PIO_CSQ_INSERT_IRP insert_irp, PIO_CSQ_REMOVE_IRP remove_irp, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 27797a2..46a1dee 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -471,7 +471,7 @@ @ stub IoThreadToProcess @ stdcall IoUnregisterFileSystem(ptr) @ stub IoUnregisterFsRegistrationChange -@ stub IoUnregisterPlugPlayNotification +@ stdcall IoUnregisterPlugPlayNotification(ptr) @ stdcall IoUnregisterShutdownNotification(ptr) @ stub IoUpdateShareAccess @ stub IoValidateDeviceIoControlAccess

1 0

Alex Henrie : include: Add wmemmove to wchar.h.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: 6fffe72ab6c1ca6864ce5b92478aa4853b7b2060 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6fffe72ab6c1ca6864ce5b92… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 28 15:49:56 2018 -0600 include: Add wmemmove to wchar.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b583a636c15b7d377967ed05acf8c7473e916062) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/msvcrt/wchar.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index b6e9109..c300391 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -500,6 +500,11 @@ static inline wchar_t* __cdecl wmemcpy(wchar_t *dst, const wchar_t *src, size_t return memcpy(dst, src, n * sizeof(wchar_t)); } +static inline wchar_t* __cdecl wmemmove(wchar_t *dst, const wchar_t *src, size_t n) +{ + return memmove(dst, src, n * sizeof(wchar_t)); +} + #ifdef __cplusplus } #endif

1 0

Alex Henrie : include: Add wmemset to wchar.h.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: d7c16365207852f397fdf20b491c51df7cb16cb8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7c16365207852f397fdf20b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon May 28 15:49:57 2018 -0600 include: Add wmemset to wchar.h. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ae023be3eeb98fbeee4130972fdfbd1866b8e495) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/msvcrt/wchar.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/msvcrt/wchar.h b/include/msvcrt/wchar.h index c300391..6d5bb41 100644 --- a/include/msvcrt/wchar.h +++ b/include/msvcrt/wchar.h @@ -505,6 +505,14 @@ static inline wchar_t* __cdecl wmemmove(wchar_t *dst, const wchar_t *src, size_t return memmove(dst, src, n * sizeof(wchar_t)); } +static inline wchar_t* __cdecl wmemset(wchar_t *s, wchar_t c, size_t n) +{ + size_t i; + for (i = 0; i < n; i++) + s[i] = c; + return s; +} + #ifdef __cplusplus } #endif

1 0

Michael Müller : dxdiagn: Add several more fields for DisplayDevices.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: ec06793c3926ea559274cbbf39d9bda433b171b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec06793c3926ea559274cbbf… Author: Michael Müller <michael(a)fds-team.de> Date: Thu May 24 01:48:32 2018 +0000 dxdiagn: Add several more fields for DisplayDevices. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3eee8b5594f7063e3c657ad79ec8ea58386edf6a) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dxdiagn/provider.c | 159 +++++++++++++++++++++++++++++++++++++++++ dlls/dxdiagn/tests/container.c | 2 + 2 files changed, 161 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ec06793c3926ea559274…

1 0

Hans Leidekker : winhttp: Store the server certificate context in the request.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: 9a019013344c5e126907cecb2dd49a5f083e4a7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a019013344c5e126907cecb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 11 09:20:35 2018 +0200 winhttp: Store the server certificate context in the request. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f5ea51d36092b162ca49555c927ba51608f64f92) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winhttp/net.c | 1 - dlls/winhttp/request.c | 11 +++++++++++ dlls/winhttp/session.c | 14 ++++++-------- dlls/winhttp/tests/winhttp.c | 5 +++++ dlls/winhttp/winhttp_private.h | 2 ++ 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index d0d02d5..d577a64 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -47,7 +47,6 @@ #include "windef.h" #include "winbase.h" #include "winhttp.h" -#include "wincrypt.h" #include "schannel.h" #include "winhttp_private.h" diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 96a2c91..56ec910 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1765,6 +1765,10 @@ static BOOL open_connection( request_t *request ) return FALSE; } } + + CertFreeCertificateContext( request->server_cert ); + request->server_cert = NULL; + if (!ensure_cred_handle( connect->session ) || !netconn_secure_connect( netconn, connect->hostname, request->security_flags, &connect->session->cred_handle )) @@ -1787,6 +1791,13 @@ static BOOL open_connection( request_t *request ) request->netconn = netconn; } + if (netconn->secure && !(request->server_cert = netconn_get_certificate( netconn ))) + { + heap_free( addressW ); + netconn_close( netconn ); + return FALSE; + } + done: request->read_pos = request->read_size = 0; request->read_chunked = FALSE; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index c878d68..e67a526 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -40,7 +40,6 @@ #include "winsock2.h" #include "ws2ipdef.h" #include "winhttp.h" -#include "wincrypt.h" #include "winreg.h" #define COBJMACROS #include "ole2.h" @@ -597,6 +596,8 @@ static void request_destroy( object_header_t *hdr ) } release_object( &request->connect->hdr ); + CertFreeCertificateContext( request->server_cert ); + destroy_authinfo( request->authinfo ); destroy_authinfo( request->proxy_authinfo ); @@ -759,14 +760,14 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf return FALSE; } - if (!request->netconn || !(cert = netconn_get_certificate( request->netconn ))) return FALSE; + if (!(cert = CertDuplicateCertificateContext( request->server_cert ))) return FALSE; *(CERT_CONTEXT **)buffer = (CERT_CONTEXT *)cert; *buflen = sizeof(cert); return TRUE; } case WINHTTP_OPTION_SECURITY_CERTIFICATE_STRUCT: { - const CERT_CONTEXT *cert; + const CERT_CONTEXT *cert = request->server_cert; const CRYPT_OID_INFO *oidInfo; WINHTTP_CERTIFICATE_INFO *ci = buffer; @@ -778,16 +779,14 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf set_last_error( ERROR_INSUFFICIENT_BUFFER ); return FALSE; } - if (!request->netconn || !(cert = netconn_get_certificate( request->netconn ))) return FALSE; + if (!cert) return FALSE; ci->ftExpiry = cert->pCertInfo->NotAfter; ci->ftStart = cert->pCertInfo->NotBefore; ci->lpszSubjectInfo = blob_to_str( cert->dwCertEncodingType, &cert->pCertInfo->Subject ); ci->lpszIssuerInfo = blob_to_str( cert->dwCertEncodingType, &cert->pCertInfo->Issuer ); ci->lpszProtocolName = NULL; - oidInfo = CryptFindOIDInfo( CRYPT_OID_INFO_OID_KEY, - cert->pCertInfo->SignatureAlgorithm.pszObjId, - 0 ); + oidInfo = CryptFindOIDInfo( CRYPT_OID_INFO_OID_KEY, cert->pCertInfo->SignatureAlgorithm.pszObjId, 0 ); if (oidInfo) ci->lpszSignatureAlgName = (LPWSTR)oidInfo->pwszName; else @@ -795,7 +794,6 @@ static BOOL request_query_option( object_header_t *hdr, DWORD option, LPVOID buf ci->lpszEncryptionAlgName = NULL; ci->dwKeySize = request->netconn ? netconn_get_cipher_strength( request->netconn ) : 0; - CertFreeCertificateContext( cert ); *buflen = sizeof(*ci); return TRUE; } diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 302974c..4b4a84c 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -1107,6 +1107,11 @@ static void test_secure_connection(void) } ok(read_size >= available_size, "read_size = %u, available_size = %u\n", read_size, available_size); + size = sizeof(cert); + ret = WinHttpQueryOption(req, WINHTTP_OPTION_SERVER_CERT_CONTEXT, &cert, &size); + ok(ret, "failed to retrieve certificate context %u\n", GetLastError()); + if (ret) CertFreeCertificateContext(cert); + cleanup: WinHttpCloseHandle(req); WinHttpCloseHandle(con); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index ee41481..b04205b 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -45,6 +45,7 @@ #include "ole2.h" #include "sspi.h" +#include "wincrypt.h" static const WCHAR getW[] = {'G','E','T',0}; static const WCHAR postW[] = {'P','O','S','T',0}; @@ -208,6 +209,7 @@ typedef struct DWORD optional_len; netconn_t *netconn; DWORD security_flags; + const CERT_CONTEXT *server_cert; int resolve_timeout; int connect_timeout; int send_timeout;

1 0

Alex Henrie : iphlpapi: Cast caddr_t to char* before doing pointer arithmetic.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: c6599788a6f1cff586a0d8d09e548da0c123f1ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6599788a6f1cff586a0d8d0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jun 28 13:54:45 2018 +0200 iphlpapi: Cast caddr_t to char* before doing pointer arithmetic. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9b626f512037a8ca615b0ef4d210096df11d3663) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/iphlpapi/ifenum.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index eed1be1..c3abdf0 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -1013,13 +1013,13 @@ static DWORD enumIPAddresses(PDWORD pcAddresses, struct ifconf *ifc) if (ioctlRet == 0) { ifPtr = ifc->ifc_buf; - while (ifPtr && ifPtr < ifc->ifc_buf + ifc->ifc_len) { + while (ifPtr && (char *)ifPtr < ifc->ifc_buf + ifc->ifc_len) { struct ifreq *ifr = (struct ifreq *)ifPtr; if (ifr->ifr_addr.sa_family == AF_INET) numAddresses++; - ifPtr += ifreq_len((struct ifreq *)ifPtr); + ifPtr = (char *)ifPtr + ifreq_len((struct ifreq *)ifPtr); } } else @@ -1074,10 +1074,10 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *ppIpAddrTable, HANDLE heap, DWORD flags) ret = NO_ERROR; (*ppIpAddrTable)->dwNumEntries = numAddresses; ifPtr = ifc.ifc_buf; - while (!ret && ifPtr && ifPtr < ifc.ifc_buf + ifc.ifc_len) { + while (!ret && ifPtr && (char *)ifPtr < ifc.ifc_buf + ifc.ifc_len) { struct ifreq *ifr = (struct ifreq *)ifPtr; - ifPtr += ifreq_len(ifr); + ifPtr = (char *)ifPtr + ifreq_len(ifr); if (ifr->ifr_addr.sa_family != AF_INET) continue;

1 0

Jason Edmeades : cmd: Fix issue in WCMD_assoc highlighted by valgrind.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: 554f6cf9aa01af54fb6d5aeed48394ae5de8bed5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=554f6cf9aa01af54fb6d5aee… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Wed Jul 4 22:08:40 2018 +0100 cmd: Fix issue in WCMD_assoc highlighted by valgrind. In an error condition, the wrong variable was being used for an insert, resulting in a read from uninitialized data. This could be triggered for example by 'ftype jason=', and the error message should have included jason but instead was just ''. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=38849 Signed-off-by: Jason Edmeades <us(a)edmeades.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ab46a89c3b8649844a70ee30abffbbd275128bc3) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/builtins.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 04b098e..3648f29 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4883,7 +4883,7 @@ void WCMD_assoc (const WCHAR *args, BOOL assoc) { LoadStringW(hinst, WCMD_NOFTYPE, msgbuffer, sizeof(msgbuffer)/sizeof(WCHAR)); } - WCMD_output_stderr(msgbuffer, keyValue); + WCMD_output_stderr(msgbuffer, args); errorlevel = 2; }

1 0

André Hentschel : dbghelp: Recompute location after fixing it.
by Alexandre Julliard 13 Sep '18

13 Sep '18

Module: wine Branch: stable Commit: dc682e5acdcd7ff31045b9b634b5b7780aabfb32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc682e5acdcd7ff31045b9b6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 2 15:52:42 2018 +0200 dbghelp: Recompute location after fixing it. Fix a assertion raised by every exception with newer clang versions (>3.7) at least on ARM64: ../../../dlls/dbghelp/dwarf.c:1641: void dwarf2_parse_variable(dwarf2_subprogram_t *, struct symt_block *, dwarf2_debug_info_t *): Assertion `subpgm->func' failed. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 3d482d3f9f0a3ffa69540af87594b3c1dc46e07b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dbghelp/dwarf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 1a75a79..dc3ec29 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -942,6 +942,7 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx, *ptr = xloc.u.block.size; memcpy(ptr + 1, xloc.u.block.ptr, xloc.u.block.size); loc->offset = (unsigned long)ptr; + compute_location(&lctx, loc, NULL, frame); } } return TRUE;

1 0