December 2010 - Wine-Commits

Dmitry Timoshkov : kernel32: Truncate the reported by GlobalMemoryStatus() memory limits for Win9x versions too.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 1036b2e0af8dcaeb82b85758a0a65b77d6cb3e9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1036b2e0af8dcaeb82b85758a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Oct 6 19:05:01 2010 +0900 kernel32: Truncate the reported by GlobalMemoryStatus() memory limits for Win9x versions too. (cherry picked from commit 83bfa7636ee7457806b389e5626066c6ac435488) --- dlls/kernel32/heap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index bdfa00b..3c190b3 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1325,7 +1325,7 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) osver.dwOSVersionInfoSize = sizeof(osver); GetVersionExW(&osver); - if ( osver.dwMajorVersion >= 5 ) + if ( osver.dwMajorVersion >= 5 || osver.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS ) { lpBuffer->dwTotalPhys = min( memstatus.ullTotalPhys, MAXDWORD ); lpBuffer->dwAvailPhys = min( memstatus.ullAvailPhys, MAXDWORD );

1 0

Juan Lang : wininet: More completely implement querying INTERNET_OPTION_SECURITY_FLAGS.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 1d5545a5de6dab92ea993d9c2bcc852c5b6af428 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d5545a5de6dab92ea993d9c2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 29 09:13:41 2010 -0700 wininet: More completely implement querying INTERNET_OPTION_SECURITY_FLAGS. (cherry picked from commit 0e4e2a378abeee691c710d38920dcbac1f9dec9c) --- dlls/wininet/http.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 7ed60e9..000c164 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1576,7 +1576,8 @@ static DWORD HTTPREQ_QueryOption(object_header_t *hdr, DWORD option, void *buffe *(DWORD*)buffer = SECURITY_FLAG_SECURE; else *(DWORD*)buffer = 0; - FIXME("Semi-STUB INTERNET_OPTION_SECURITY_FLAGS: %x\n",*(DWORD*)buffer); + *(DWORD *)buffer |= req->netConnection.security_flags; + /* FIXME: set connection cipher strength (SECURITY_FLAG_STRENGTH_*) */ return ERROR_SUCCESS; }

1 0

Alexandre Julliard : mshtml: Try installing Gecko from the global data dir too.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: d2525dc21671676f6f4ca08c06f96e52b0b8f5a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2525dc21671676f6f4ca08c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 21:38:46 2010 +0200 mshtml: Try installing Gecko from the global data dir too. (cherry picked from commit 2510df000d48dd8c505a633e97c31eef16c3113f) --- dlls/mshtml/Makefile.in | 2 +- dlls/mshtml/install.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index dcd81de..06812a8 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = mshtml.dll IMPORTLIB = mshtml IMPORTS = strmiids uuid urlmon shlwapi ole32 oleaut32 user32 gdi32 advapi32 kernel32 -EXTRADEFS = -DCOM_NO_WINDOWS_H +EXTRADEFS = -DCOM_NO_WINDOWS_H -DGECKO_DATADIR="\"$(datadir)\"" DELAYIMPORTS = wininet C_SRCS = \ diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index ab054bf..4113903 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -281,10 +281,12 @@ static BOOL install_from_default_dir(void) ret = install_from_unix_file(file_name); heap_free(file_name); - if(ret) - return TRUE; - return install_from_unix_file("/usr/share/wine/gecko/" GECKO_FILE_NAME); + if (!ret) + ret = install_from_unix_file( GECKO_DATADIR "/wine/gecko/" GECKO_FILE_NAME); + if (!ret && strcmp( GECKO_DATADIR, "/usr/share" )) + ret = install_from_unix_file("/usr/share/wine/gecko/" GECKO_FILE_NAME); + return ret; } static HRESULT WINAPI InstallCallback_QueryInterface(IBindStatusCallback *iface,

1 0

Alexandre Julliard : wininet: Load X509_STORE_CTX_get_ex_data from libcrypto not libssl.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 8fc929d3330b01d30d09a32321c32c142a1890a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fc929d3330b01d30d09a3232… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 20 21:40:21 2010 +0200 wininet: Load X509_STORE_CTX_get_ex_data from libcrypto not libssl. (cherry picked from commit 0cc9c52f8c5ad5e1f821177f165fbb72be90d2d9) --- dlls/wininet/netconnection.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index ba0f12a..f7de478 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -146,7 +146,6 @@ MAKE_FUNCPTR(SSL_CTX_get_timeout); MAKE_FUNCPTR(SSL_CTX_set_timeout); MAKE_FUNCPTR(SSL_CTX_set_default_verify_paths); MAKE_FUNCPTR(SSL_CTX_set_verify); -MAKE_FUNCPTR(X509_STORE_CTX_get_ex_data); /* OpenSSL's libcrypto functions that we use */ MAKE_FUNCPTR(BIO_new_fp); @@ -156,6 +155,7 @@ MAKE_FUNCPTR(CRYPTO_set_locking_callback); MAKE_FUNCPTR(ERR_free_strings); MAKE_FUNCPTR(ERR_get_error); MAKE_FUNCPTR(ERR_error_string); +MAKE_FUNCPTR(X509_STORE_CTX_get_ex_data); MAKE_FUNCPTR(i2d_X509); MAKE_FUNCPTR(sk_num); MAKE_FUNCPTR(sk_value); @@ -427,7 +427,6 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) DYNSSL(SSL_CTX_set_timeout); DYNSSL(SSL_CTX_set_default_verify_paths); DYNSSL(SSL_CTX_set_verify); - DYNSSL(X509_STORE_CTX_get_ex_data); #undef DYNSSL #define DYNCRYPTO(x) \ @@ -445,6 +444,7 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) DYNCRYPTO(ERR_free_strings); DYNCRYPTO(ERR_get_error); DYNCRYPTO(ERR_error_string); + DYNCRYPTO(X509_STORE_CTX_get_ex_data); DYNCRYPTO(i2d_X509); DYNCRYPTO(sk_num); DYNCRYPTO(sk_value);

1 0

Alexandre Julliard : wine.inf: Add a few more common functions to be excluded from relay traces.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 3580277ee0caceadde0e5b492fdfd9f26bb107b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3580277ee0caceadde0e5b492… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 6 11:44:48 2010 +0200 wine.inf: Add a few more common functions to be excluded from relay traces. (cherry picked from commit c6a6541d13d51f6f1d350a27edbc986bb7ccdf35) --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index a57d462..f25e067 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -476,7 +476,7 @@ HKLM,%CurrentVersionNT%\ProfileList,,16 [Debugger] HKLM,%CurrentVersionNT%\AeDebug,"Debugger",2,"winedbg --auto %ld %ld" HKLM,%CurrentVersionNT%\AeDebug,"Auto",2,"1" -HKCU,Software\Wine\Debug,"RelayExclude",2,"ntdll.RtlEnterCriticalSection;ntdll.RtlLeaveCriticalSection;kernel32.48;kernel32.49;kernel32.94;kernel32.95;kernel32.96;kernel32.97;kernel32.98" +HKCU,Software\Wine\Debug,"RelayExclude",2,"ntdll.RtlEnterCriticalSection;ntdll.RtlLeaveCriticalSection;kernel32.48;kernel32.49;kernel32.94;kernel32.95;kernel32.96;kernel32.97;kernel32.98;kernel32.TlsGetValue;kernel32.TlsSetValue;kernel32.FlsGetValue;kernel32.FlsSetValue;kernel32.SetLastError" HKCU,Software\Wine\Debug,"RelayFromExclude",2,"winex11.drv;user32;gdi32;advapi32;kernel32" [Desktop]

1 0

Alexandre Julliard : winhlp32: Use a standard About dialog, with the proper icon.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 9ba7b19827dbef2c3c80580acef8fccd5dee9125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ba7b19827dbef2c3c80580ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 15 12:13:13 2010 +0200 winhlp32: Use a standard About dialog, with the proper icon. (cherry picked from commit 5d69141014d698497a5427a6ce16ebbed09bc852) --- programs/winhlp32/Bg.rc | 3 --- programs/winhlp32/Cs.rc | 3 --- programs/winhlp32/Da.rc | 3 --- programs/winhlp32/De.rc | 3 --- programs/winhlp32/En.rc | 10 ++-------- programs/winhlp32/Eo.rc | 3 --- programs/winhlp32/Es.rc | 3 --- programs/winhlp32/Fi.rc | 3 --- programs/winhlp32/Fr.rc | 5 +---- programs/winhlp32/Hu.rc | 3 --- programs/winhlp32/It.rc | 3 --- programs/winhlp32/Ja.rc | 3 --- programs/winhlp32/Ko.rc | 3 --- programs/winhlp32/Lt.rc | 3 --- programs/winhlp32/Makefile.in | 2 -- programs/winhlp32/Nl.rc | 3 --- programs/winhlp32/No.rc | 3 --- programs/winhlp32/Pl.rc | 3 --- programs/winhlp32/Pt.rc | 6 ------ programs/winhlp32/Rm.rc | 3 --- programs/winhlp32/Ro.rc | 3 --- programs/winhlp32/Ru.rc | 3 --- programs/winhlp32/Si.rc | 3 --- programs/winhlp32/Sk.rc | 3 --- programs/winhlp32/Sr.rc | 3 --- programs/winhlp32/Sv.rc | 3 --- programs/winhlp32/Tr.rc | 3 --- programs/winhlp32/Uk.rc | 3 --- programs/winhlp32/Wa.rc | 3 --- programs/winhlp32/Zh.rc | 6 ------ programs/winhlp32/macro.c | 6 +++++- programs/winhlp32/winhelp.c | 1 - programs/winhlp32/winhelp_res.h | 1 - 33 files changed, 8 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ba7b19827dbef2c3c805…

1 0

Aleksey Bragin : msi: Fix freed memory access and fix freeing of invalid pointer.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 516616bf8e7755aa797aa1e4ce9a0e0bbe4f6f15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=516616bf8e7755aa797aa1e4c… Author: Aleksey Bragin <aleksey(a)reactos.org> Date: Fri Oct 22 20:08:58 2010 +0400 msi: Fix freed memory access and fix freeing of invalid pointer. (cherry picked from commit 8c5718ec9d0613be7208e1ceaecac0e7434c4cf5) --- dlls/msi/action.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 7ae8286..eeb349b 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1967,7 +1967,7 @@ static UINT ITERATE_CostFinalizeConditions(MSIRECORD *row, LPVOID param) VS_FIXEDFILEINFO *msi_get_disk_file_version( LPCWSTR filename ) { static const WCHAR name[] = {'\\',0}; - VS_FIXEDFILEINFO *ret; + VS_FIXEDFILEINFO *ptr, *ret; LPVOID version; DWORD versize, handle; UINT sz; @@ -1984,12 +1984,15 @@ VS_FIXEDFILEINFO *msi_get_disk_file_version( LPCWSTR filename ) GetFileVersionInfoW( filename, 0, versize, version ); - if (!VerQueryValueW( version, name, (LPVOID *)&ret, &sz )) + if (!VerQueryValueW( version, name, (LPVOID *)&ptr, &sz )) { msi_free( version ); return NULL; } + ret = msi_alloc( sz ); + memcpy( ret, ptr, sz ); + msi_free( version ); return ret; }

1 0

Jacek Caban : mshtml: Try installing Gecko from hardcoded '/usr/share/wine/ gecko/' location.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: d375ffab7d24c1b1f8c3494b290bcee222799804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d375ffab7d24c1b1f8c3494b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 1 15:30:19 2010 +0200 mshtml: Try installing Gecko from hardcoded '/usr/share/wine/gecko/' location. (cherry picked from commit 1f716bcbf4b7784587a2cb3870041c4a032f1039) --- dlls/mshtml/install.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index 65faa5a..ab054bf 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -281,7 +281,10 @@ static BOOL install_from_default_dir(void) ret = install_from_unix_file(file_name); heap_free(file_name); - return ret; + if(ret) + return TRUE; + + return install_from_unix_file("/usr/share/wine/gecko/" GECKO_FILE_NAME); } static HRESULT WINAPI InstallCallback_QueryInterface(IBindStatusCallback *iface,

1 0

Juan Lang : wininet: Don' t call SSL_connect until initialization is complete.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: 2df1064e69fb3df6dcf35e32b77b78e6f80d3ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2df1064e69fb3df6dcf35e32b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 28 18:15:58 2010 -0700 wininet: Don't call SSL_connect until initialization is complete. (cherry picked from commit 98dbdadcdafaa3708e36074708ade5782f892fe4) --- dlls/wininet/netconnection.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 08152f5..5676020 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -666,14 +666,6 @@ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) goto fail; } - if (pSSL_connect(connection->ssl_s) <= 0) - { - res = (DWORD_PTR)pSSL_get_ex_data(connection->ssl_s, error_idx); - if (!res) - res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; - ERR("SSL_connect failed: %d\n", res); - goto fail; - } if (!pSSL_set_ex_data(connection->ssl_s, hostname_idx, hostname)) { ERR("SSL_set_ex_data failed: %s\n", @@ -688,6 +680,14 @@ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; goto fail; } + if (pSSL_connect(connection->ssl_s) <= 0) + { + res = (DWORD_PTR)pSSL_get_ex_data(connection->ssl_s, error_idx); + if (!res) + res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + ERR("SSL_connect failed: %d\n", res); + goto fail; + } verify_res = pSSL_get_verify_result(connection->ssl_s); if (verify_res != X509_V_OK) {

1 0

Juan Lang : wininet: Store WININET_NETCONNECTION * in SSL context.
by Alexandre Julliard Dec. 2, 2010

Dec. 2, 2010

Module: wine Branch: stable Commit: f59f6fd6b532348e72ae676f56479174b6401075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f59f6fd6b532348e72ae676f5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Sep 28 16:33:19 2010 -0700 wininet: Store WININET_NETCONNECTION * in SSL context. (cherry picked from commit ce0164c3f784e1768b74296b7a19c92d030a8723) --- dlls/wininet/netconnection.c | 25 ++++++++++++++++++++++++- 1 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 07786d3..12aef21 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -117,6 +117,7 @@ static SSL_METHOD *meth; static SSL_CTX *ctx; static int hostname_idx; static int error_idx; +static int conn_idx; #define MAKE_FUNCPTR(f) static typeof(f) * p##f @@ -454,6 +455,15 @@ DWORD NETCON_init(WININET_NETCONNECTION *connection, BOOL useSSL) LeaveCriticalSection(&init_ssl_cs); return ERROR_OUTOFMEMORY; } + conn_idx = pSSL_get_ex_new_index(0, (void *)"netconn index", + NULL, NULL, NULL); + if (conn_idx == -1) + { + ERR("SSL_get_ex_new_index failed; %s\n", + pERR_error_string(pERR_get_error(), 0)); + LeaveCriticalSection(&init_ssl_cs); + return ERROR_OUTOFMEMORY; + } pSSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, netconn_secure_verify); pCRYPTO_set_id_callback(ssl_thread_id); @@ -665,7 +675,20 @@ DWORD NETCON_secure_connect(WININET_NETCONNECTION *connection, LPWSTR hostname) ERR("SSL_connect failed: %d\n", res); goto fail; } - pSSL_set_ex_data(connection->ssl_s, hostname_idx, hostname); + if (!pSSL_set_ex_data(connection->ssl_s, hostname_idx, hostname)) + { + ERR("SSL_set_ex_data failed: %s\n", + pERR_error_string(pERR_get_error(), 0)); + res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + goto fail; + } + if (!pSSL_set_ex_data(connection->ssl_s, conn_idx, connection)) + { + ERR("SSL_set_ex_data failed: %s\n", + pERR_error_string(pERR_get_error(), 0)); + res = ERROR_INTERNET_SECURITY_CHANNEL_ERROR; + goto fail; + } cert = pSSL_get_peer_certificate(connection->ssl_s); if (!cert) {

1 0