August 2020 - Wine-commits - list.winehq.org

Alexandre Julliard : urlmon/tests: Update winehq.org's IP address.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: c803ee8c7c08c42222298d0cbfab367f7ca0f019 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c803ee8c7c08c42222298d0c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 23 22:34:00 2020 +0200 urlmon/tests: Update winehq.org's IP address. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ef9d05d9c2e62d31f59d1ad649856031b47a625b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/urlmon/tests/url.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index cfa29248d6..6dd47732dd 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -157,10 +157,9 @@ static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; static WCHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; -static const WCHAR wszWineHQSite[] = - {'w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; -static const WCHAR wszWineHQIP[] = - {'4','.','1','5','.','1','8','4','.','7','7',0}; +#define WINEHQ_IP "4.4.81.124" +static const WCHAR wszWineHQSite[] = L"www.winehq.org"; +static const WCHAR wszWineHQIP[] = L"" WINEHQ_IP; static const CHAR wszIndexHtmlA[] = "index.html"; static const WCHAR cache_fileW[] = {'c',':','\\','c','a','c','h','e','.','h','t','m',0}; static const CHAR dwl_htmlA[] = "dwl.html"; @@ -2870,7 +2869,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) url_a = "its:test.chm::/blank.html"; break; case HTTPS_TEST: - url_a = (flags & BINDTEST_INVALID_CN) ? "https://4.15.184.77/favicon.ico" : "https://test.winehq.org/tests/hello.html"; + url_a = (flags & BINDTEST_INVALID_CN) ? "https://" WINEHQ_IP "/favicon.ico" : "https://test.winehq.org/tests/hello.html"; break; case FTP_TEST: url_a = "ftp://ftp.winehq.org/welcome%2emsg";

1 0

Alexandre Julliard : secur32/tests: Update for new WineHQ certificate.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: b96ba1f645f759d331a451cc2d1db547ebb94c85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b96ba1f645f759d331a451cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 19:23:31 2020 +0200 secur32/tests: Update for new WineHQ certificate. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 16254af818095216e10aee4d9032a8def3ac3344) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/secur32/tests/schannel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index 217dbe8dfa..315133659f 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -564,7 +564,7 @@ static void test_remote_cert(PCCERT_CONTEXT remote_cert) cert_cnt++; } - ok(cert_cnt == 4, "cert_cnt = %u\n", cert_cnt); + ok(cert_cnt == 2, "cert_cnt = %u\n", cert_cnt); ok(incl_remote, "context does not contain cert itself\n"); }

1 0

Alexandre Julliard : wininet/tests: Update for new WineHQ certificate.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: fa1ec750b95b2da2ad5c95c16f9be7e6fa2d8364 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa1ec750b95b2da2ad5c95c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 5 19:23:42 2020 +0200 wininet/tests: Update for new WineHQ certificate. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ccd6b205fa99360e7437f1c5bc63e0075f8e6760) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wininet/tests/http.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index e0ea78cfb4..c07d60d2a9 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -6079,13 +6079,12 @@ typedef struct { static const cert_struct_test_t test_winehq_org_cert = { "US\r\n" "55114\r\n" - "MN\r\n" + "Minnesota\r\n" "Saint Paul\r\n" "Ste 120\r\n" "700 Raymond Ave\r\n" "CodeWeavers\r\n" "IT\r\n" - "Secure Link SSL Wildcard\r\n" "*.winehq.org", "US\r\n"

1 0

Michael Stefaniuc : Release 5.0.2.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 736b5569449b3e991371dc6f2882ecbb1ac027cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=736b5569449b3e991371dc6f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Jul 26 22:38:29 2020 +0200 Release 5.0.2. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 374 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 5 + VERSION | 2 +- configure | 18 +-- 4 files changed, 196 insertions(+), 203 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=736b5569449b3e991371…

1 0

Tag wine-5.0.2 : Alexandre Julliard : Release 5.0.2
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: refs/tags/wine-5.0.2 Tag: 4b97c1d9b58c6d99948b91073640848bd75fd2e5 URL: https://source.winehq.org/git/wine.git/?a=tag;h=4b97c1d9b58c6d99948b9107364… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 7 17:40:53 2020 +0200 Release 5.0.2

1 0

Gijs Vermeulen : advpack: Extract inf file before installing in ExecuteCab().
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 302aab40ade41d4d518442509835f8a8e0e6ca20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=302aab40ade41d4d51844250… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon May 11 00:10:57 2020 +0200 advpack: Extract inf file before installing in ExecuteCab(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=29806 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 90ddc58a86736971478bd4353237c4723992c3a7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/advpack/install.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/install.c b/dlls/advpack/install.c index 70dc4d74aa..d82de9c361 100644 --- a/dlls/advpack/install.c +++ b/dlls/advpack/install.c @@ -677,8 +677,15 @@ HRESULT WINAPI ExecuteCabW(HWND hwnd, CABINFOW* pCab, LPVOID pReserved) ZeroMemory(&info, sizeof(ADVInfo)); - if (pCab->pszCab && *pCab->pszCab) - FIXME("Cab archive not extracted!\n"); + if ((pCab->pszCab && *pCab->pszCab) && (pCab->pszInf && *pCab->pszInf) && *pCab->szSrcPath) + { + TRACE("pszCab: %s, pszInf: %s, szSrcPath: %s\n", debugstr_w(pCab->pszCab), debugstr_w(pCab->pszInf), + debugstr_w(pCab->szSrcPath)); + + hr = ExtractFilesW(pCab->pszCab, pCab->szSrcPath, 0, pCab->pszInf, NULL, 0); + if (FAILED(hr)) + ERR("Failed to extract .inf file!\n"); + } hr = install_init(pCab->pszInf, pCab->pszSection, pCab->szSrcPath, pCab->dwFlags, &info); if (hr != S_OK)

1 0

Markus Engel : user32: Force undefined bits in GetKeyState() and GetKeyboardState() to zero.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 6d695ef5e994314dc4f4e349928fde7154e701f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d695ef5e994314dc4f4e349… Author: Markus Engel <markus_wine(a)familie-engel.online> Date: Mon May 18 18:35:58 2020 +0200 user32: Force undefined bits in GetKeyState() and GetKeyboardState() to zero. Only the highest and lowest bits in the return values of these functions have a meaning, the others are undefined. While the other bits are always cleared in Windows, wine stores information there. Some programs expect these undefined bits to be zero, though, so make sure they are not set. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=30814 Signed-off-by: Markus Engel <markus_wine(a)familie-engel.online> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d9855df17f905da97b4bd92227427c4f899babf1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/input.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 0325e2ce3d..ac90c12c60 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -555,7 +555,7 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetKeyState(INT vkey) { req->tid = GetCurrentThreadId(); req->key = vkey; - if (!wine_server_call( req )) retval = (signed char)reply->state; + if (!wine_server_call( req )) retval = (signed char)(reply->state & 0x81); } SERVER_END_REQ; TRACE("key (0x%x) -> %x\n", vkey, retval); @@ -569,6 +569,7 @@ SHORT WINAPI DECLSPEC_HOTPATCH GetKeyState(INT vkey) BOOL WINAPI DECLSPEC_HOTPATCH GetKeyboardState( LPBYTE state ) { BOOL ret; + UINT i; TRACE("(%p)\n", state); @@ -579,6 +580,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetKeyboardState( LPBYTE state ) req->key = -1; wine_server_set_reply( req, state, 256 ); ret = !wine_server_call_err( req ); + for (i = 0; i < 256; i++) state[i] &= 0x81; } SERVER_END_REQ; return ret;

1 0

Dmitry Timoshkov : server: All fields up to CheckSum are mandatory regardless of SizeOfOptionalHeader value.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 57d88e0a1c6c13ce57d7ed3701a604fb19f99e6f URL: https://source.winehq.org/git/wine.git/?a=commit;h=57d88e0a1c6c13ce57d7ed37… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 6 15:15:54 2020 +0800 server: All fields up to CheckSum are mandatory regardless of SizeOfOptionalHeader value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42125 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ae9eb36e21c9b8e31b1e4a4c1eb6deae9b90262d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/mapping.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 6990a1913d..ac144b1bb9 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -579,7 +579,7 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s } opt; } nt; off_t pos; - int size; + int size, opt_size; size_t mz_size, clr_va, clr_size; unsigned int i, cpu_mask = get_supported_cpu_mask(); @@ -595,7 +595,8 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s size = pread( unix_fd, &nt, sizeof(nt), pos ); if (size < sizeof(nt.Signature) + sizeof(nt.FileHeader)) return STATUS_INVALID_IMAGE_PROTECT; /* zero out Optional header in the case it's not present or partial */ - size = min( size, sizeof(nt.Signature) + sizeof(nt.FileHeader) + nt.FileHeader.SizeOfOptionalHeader ); + opt_size = max( nt.FileHeader.SizeOfOptionalHeader, offsetof( IMAGE_OPTIONAL_HEADER32, CheckSum )); + size = min( size, sizeof(nt.Signature) + sizeof(nt.FileHeader) + opt_size ); if (size < sizeof(nt)) memset( (char *)&nt + size, 0, sizeof(nt) - size ); if (nt.Signature != IMAGE_NT_SIGNATURE) {

1 0

Dmitry Timoshkov : ntdll: Don't try to map the PE file past the size of the backing file.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: 70ce97ea6d4987da2b7b07a86dfcf9f187e3c383 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70ce97ea6d4987da2b7b07a8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 6 15:15:56 2020 +0800 ntdll: Don't try to map the PE file past the size of the backing file. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42125 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a0772da5cf507b10800d5358554d682f82f48724) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntdll/virtual.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 5890344f7a..9d8249ea4f 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1592,6 +1592,7 @@ static NTSTATUS map_image( HANDLE hmapping, ACCESS_MASK access, int fd, int top_ /* unaligned sections, this happens for native subsystem binaries */ /* in that case Windows simply maps in the whole file */ + total_size = min( total_size, ROUND_SIZE( 0, st.st_size )); if (map_file_into_view( view, fd, 0, total_size, 0, VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY, removable ) != STATUS_SUCCESS) goto error;

1 0

Dmitry Timoshkov : kernel32: On process entry store PEB address in %ebx.
by Alexandre Julliard 07 Aug '20

07 Aug '20

Module: wine Branch: stable Commit: cf297b1fb6a0408ee8c832f6c1c18c6251d677c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf297b1fb6a0408ee8c832f6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 6 15:15:58 2020 +0800 kernel32: On process entry store PEB address in %ebx. 8k demo custom PE loader depends on this. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42125 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 360820fb5830750b23543dc34188970aa9431835) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/process.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 7875f3469a..58bbbac522 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -94,12 +94,18 @@ __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") - "pushl 4(%ebp)\n\t" /* deliberately mis-align the stack by 8, Doom 3 needs this */ + "pushl %ebx\n\t" + __ASM_CFI(".cfi_rel_offset %ebx,-4\n\t") + "movl 8(%ebp),%ebx\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" + "pushl %ebx\n\t" "call *12(%ebp)\n\t" - "leave\n\t" + "leal -4(%ebp),%esp\n\t" + "popl %ebx\n\t" + __ASM_CFI(".cfi_same_value %ebx\n\t") + "popl %ebp\n\t" __ASM_CFI(".cfi_def_cfa %esp,4\n\t") __ASM_CFI(".cfi_same_value %ebp\n\t") "ret" )

1 0