April 2012 - Wine-commits - list.winehq.org

Hans Leidekker : sxs: Add locking around operations on the assembly cache.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 9790edd2192bfdb2009a9e06fe6bede025b77b1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9790edd2192bfdb2009a9e06f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 30 09:35:10 2012 +0200 sxs: Add locking around operations on the assembly cache. --- dlls/sxs/cache.c | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/dlls/sxs/cache.c b/dlls/sxs/cache.c index e0ec0d0..46686e5 100644 --- a/dlls/sxs/cache.c +++ b/dlls/sxs/cache.c @@ -36,6 +36,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(sxs); +static const WCHAR cache_mutex_nameW[] = + {'_','_','W','I','N','E','_','S','X','S','_','C','A','C','H','E','_','M','U','T','E','X','_','_',0}; + static const WCHAR win32W[] = {'w','i','n','3','2',0}; static const WCHAR win32_policyW[] = {'w','i','n','3','2','-','p','o','l','i','c','y',0}; static const WCHAR backslashW[] = {'\\',0}; @@ -44,6 +47,7 @@ struct cache { IAssemblyCache IAssemblyCache_iface; LONG refs; + HANDLE lock; }; static inline struct cache *impl_from_IAssemblyCache(IAssemblyCache *iface) @@ -87,6 +91,7 @@ static ULONG WINAPI cache_Release( IAssemblyCache *iface ) if (!refs) { TRACE("destroying %p\n", cache); + CloseHandle( cache->lock ); HeapFree( GetProcessHeap(), 0, cache ); } return refs; @@ -179,6 +184,16 @@ static WCHAR *build_policy_path( const WCHAR *arch, const WCHAR *name, const WCH return ret; } +static void cache_lock( struct cache *cache ) +{ + WaitForSingleObject( cache->lock, INFINITE ); +} + +static void cache_unlock( struct cache *cache ) +{ + ReleaseMutex( cache->lock ); +} + #define ASSEMBLYINFO_FLAG_INSTALLED 1 static HRESULT WINAPI cache_QueryAssemblyInfo( @@ -187,6 +202,7 @@ static HRESULT WINAPI cache_QueryAssemblyInfo( LPCWSTR assembly_name, ASSEMBLY_INFO *info ) { + struct cache *cache = impl_from_IAssemblyCache( iface ); IAssemblyName *name_obj; const WCHAR *arch, *name, *token, *type, *version; WCHAR *p, *path = NULL; @@ -217,6 +233,8 @@ static HRESULT WINAPI cache_QueryAssemblyInfo( IAssemblyName_Release( name_obj ); return S_OK; } + cache_lock( cache ); + if (!strcmpW( type, win32W )) path = build_manifest_path( arch, name, token, version ); else if (!strcmpW( type, win32_policyW )) path = build_policy_path( arch, name, token, version ); else @@ -250,6 +268,7 @@ static HRESULT WINAPI cache_QueryAssemblyInfo( done: HeapFree( GetProcessHeap(), 0, path ); IAssemblyName_Release( name_obj ); + cache_unlock( cache ); return hr; } @@ -657,12 +676,14 @@ static HRESULT WINAPI cache_InstallAssembly( LPCWSTR path, LPCFUSION_INSTALL_REFERENCE ref ) { + struct cache *cache = impl_from_IAssemblyCache( iface ); HRESULT hr, init; IXMLDOMDocument *doc = NULL; struct assembly *assembly = NULL; TRACE("%p, 0x%08x, %s, %p\n", iface, flags, debugstr_w(path), ref); + cache_lock( cache ); init = CoInitialize( NULL ); hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void **)&doc ); @@ -683,6 +704,7 @@ done: free_assembly( assembly ); if (doc) IXMLDOMDocument_Release( doc ); if (SUCCEEDED(init)) CoUninitialize(); + cache_unlock( cache ); return hr; } @@ -728,6 +750,7 @@ static HRESULT WINAPI cache_UninstallAssembly( LPCFUSION_INSTALL_REFERENCE ref, ULONG *disp ) { + struct cache *cache = impl_from_IAssemblyCache( iface ); HRESULT hr, init; IXMLDOMDocument *doc = NULL; struct assembly *assembly = NULL; @@ -742,6 +765,7 @@ static HRESULT WINAPI cache_UninstallAssembly( FIXME("application reference not supported\n"); return E_NOTIMPL; } + cache_lock( cache ); init = CoInitialize( NULL ); hr = CreateAssemblyNameObject( &name_obj, assembly_name, CANOF_PARSE_DISPLAY_NAME, NULL ); @@ -787,6 +811,7 @@ done: free_assembly( assembly ); if (doc) IXMLDOMDocument_Release( doc ); if (SUCCEEDED(init)) CoUninitialize(); + cache_unlock( cache ); return hr; } @@ -822,7 +847,12 @@ HRESULT WINAPI CreateAssemblyCache( IAssemblyCache **obj, DWORD reserved ) cache->IAssemblyCache_iface.lpVtbl = &cache_vtbl; cache->refs = 1; - + cache->lock = CreateMutexW( NULL, FALSE, cache_mutex_nameW ); + if (!cache->lock) + { + HeapFree( GetProcessHeap(), 0, cache ); + return HRESULT_FROM_WIN32( GetLastError() ); + } *obj = &cache->IAssemblyCache_iface; return S_OK; }

1 0

Hans Leidekker : msi: Add support for uninstalling global assemblies.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 605e0b7b4176bf5e5cf5888073103016e56b8a2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=605e0b7b4176bf5e5cf588807… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 30 09:35:25 2012 +0200 msi: Add support for uninstalling global assemblies. --- dlls/msi/assembly.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msi/files.c | 16 ++++++++++------ dlls/msi/msipriv.h | 1 + 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index af23c4a..712bb23 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -425,6 +425,45 @@ UINT msi_install_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) return ERROR_SUCCESS; } +UINT msi_uninstall_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) +{ + HRESULT hr; + IAssemblyCache *cache; + MSIASSEMBLY *assembly = comp->assembly; + MSIFEATURE *feature = NULL; + + if (comp->assembly->feature) + feature = msi_get_loaded_feature( package, comp->assembly->feature ); + + if (assembly->application) + { + if (feature) feature->Action = INSTALLSTATE_ABSENT; + return ERROR_SUCCESS; + } + TRACE("removing %s\n", debugstr_w(assembly->display_name)); + + if (assembly->attributes == msidbAssemblyAttributesWin32) + { + cache = package->cache_sxs; + hr = IAssemblyCache_UninstallAssembly( cache, 0, assembly->display_name, NULL, NULL ); + if (FAILED( hr )) WARN("failed to uninstall assembly 0x%08x\n", hr); + } + else + { + unsigned int i; + for (i = 0; i < CLR_VERSION_MAX; i++) + { + if (!assembly->clr_version[i]) continue; + cache = package->cache_net[i]; + hr = IAssemblyCache_UninstallAssembly( cache, 0, assembly->display_name, NULL, NULL ); + if (FAILED( hr )) WARN("failed to uninstall assembly 0x%08x\n", hr); + } + } + if (feature) feature->Action = INSTALLSTATE_ABSENT; + assembly->installed = FALSE; + return ERROR_SUCCESS; +} + static WCHAR *build_local_assembly_path( const WCHAR *filename ) { UINT i; diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 6edf781..fe72c24 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -1308,22 +1308,26 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) msi_ui_actiondata( package, szRemoveFiles, uirow ); msiobj_release( &uirow->hdr ); } + + msi_init_assembly_caches( package ); LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) { - MSIFOLDER *folder; - comp->Action = msi_get_component_action( package, comp ); if (comp->Action != INSTALLSTATE_ABSENT) continue; - if (comp->assembly && !comp->assembly->application) continue; - if (comp->Attributes & msidbComponentAttributesPermanent) { TRACE("permanent component, not removing directory\n"); continue; } - folder = msi_get_loaded_folder( package, comp->Directory ); - remove_folder( folder ); + if (comp->assembly && !comp->assembly->application) + msi_uninstall_assembly( package, comp ); + else + { + MSIFOLDER *folder = msi_get_loaded_folder( package, comp->Directory ); + remove_folder( folder ); + } } + msi_destroy_assembly_caches( package ); return ERROR_SUCCESS; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index bdce06b..80f5414 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1027,6 +1027,7 @@ extern UINT msi_create_empty_local_file(LPWSTR path, LPCWSTR suffix) DECLSPEC_HI extern UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) DECLSPEC_HIDDEN; extern MSIASSEMBLY *msi_load_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; extern UINT msi_install_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; +extern UINT msi_uninstall_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; extern BOOL msi_init_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; extern void msi_destroy_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; extern WCHAR *msi_font_version_from_file(const WCHAR *) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : kernel32: Fix buffer overflows in K32GetModuleFileNameExA/W.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: d08f34cd8ecd883a0f0c6bd9b150d92407f0f7c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d08f34cd8ecd883a0f0c6bd9b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 30 14:19:57 2012 +0200 kernel32: Fix buffer overflows in K32GetModuleFileNameExA/W. --- dlls/kernel32/module.c | 31 ++++++++++++++++++++++++----- dlls/psapi/tests/psapi_main.c | 42 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 63 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index 6b91a4c..57a24ba 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1247,17 +1247,26 @@ DWORD WINAPI K32GetModuleFileNameExW(HANDLE process, HMODULE module, LPWSTR file_name, DWORD size) { LDR_MODULE ldr_module; + DWORD len; + + if (!size) return 0; if(!get_ldr_module(process, module, &ldr_module)) return 0; - size = min(ldr_module.FullDllName.Length / sizeof(WCHAR), size); + len = ldr_module.FullDllName.Length / sizeof(WCHAR); + if (size <= len) + { + len = size; + size--; + } + if (!ReadProcessMemory(process, ldr_module.FullDllName.Buffer, file_name, size * sizeof(WCHAR), NULL)) return 0; file_name[size] = 0; - return size; + return len; } /*********************************************************************** @@ -1267,32 +1276,42 @@ DWORD WINAPI K32GetModuleFileNameExA(HANDLE process, HMODULE module, LPSTR file_name, DWORD size) { WCHAR *ptr; + DWORD len; TRACE("(hProcess=%p, hModule=%p, %p, %d)\n", process, module, file_name, size); - if (!file_name || !size) return 0; + if (!file_name || !size) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return 0; + } if ( process == GetCurrentProcess() ) { - DWORD len = GetModuleFileNameA( module, file_name, size ); + len = GetModuleFileNameA( module, file_name, size ); if (size) file_name[size - 1] = '\0'; return len; } if (!(ptr = HeapAlloc(GetProcessHeap(), 0, size * sizeof(WCHAR)))) return 0; - if (!K32GetModuleFileNameExW(process, module, ptr, size)) + len = K32GetModuleFileNameExW(process, module, ptr, size); + if (!len) { file_name[0] = '\0'; } else { if (!WideCharToMultiByte( CP_ACP, 0, ptr, -1, file_name, size, NULL, NULL )) + { file_name[size - 1] = 0; + len = size; + } + else if (len < size) len = strlen( file_name ); } HeapFree(GetProcessHeap(), 0, ptr); - return strlen(file_name); + return len; } /*********************************************************************** diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 1944065..8db695e 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -49,6 +49,7 @@ static BOOL (WINAPI *pEnumProcesses)(DWORD*, DWORD, DWORD*); static BOOL (WINAPI *pEnumProcessModules)(HANDLE, HMODULE*, DWORD, LPDWORD); static DWORD (WINAPI *pGetModuleBaseNameA)(HANDLE, HMODULE, LPSTR, DWORD); static DWORD (WINAPI *pGetModuleFileNameExA)(HANDLE, HMODULE, LPSTR, DWORD); +static DWORD (WINAPI *pGetModuleFileNameExW)(HANDLE, HMODULE, LPWSTR, DWORD); static BOOL (WINAPI *pGetModuleInformation)(HANDLE, HMODULE, LPMODULEINFO, DWORD); static DWORD (WINAPI *pGetMappedFileNameA)(HANDLE, LPVOID, LPSTR, DWORD); static DWORD (WINAPI *pGetMappedFileNameW)(HANDLE, LPVOID, LPWSTR, DWORD); @@ -67,6 +68,7 @@ static BOOL InitFunctionPtrs(HMODULE hpsapi) PSAPI_GET_PROC(EnumProcesses); PSAPI_GET_PROC(GetModuleBaseNameA); PSAPI_GET_PROC(GetModuleFileNameExA); + PSAPI_GET_PROC(GetModuleFileNameExW); PSAPI_GET_PROC(GetModuleInformation); PSAPI_GET_PROC(GetMappedFileNameA); PSAPI_GET_PROC(GetMappedFileNameW); @@ -471,18 +473,22 @@ static void test_GetModuleFileNameEx(void) { HMODULE hMod = GetModuleHandle(NULL); char szModExPath[MAX_PATH+1], szModPath[MAX_PATH+1]; + WCHAR buffer[MAX_PATH]; DWORD ret; - + SetLastError(0xdeadbeef); - pGetModuleFileNameExA(NULL, hMod, szModExPath, sizeof(szModExPath)); + ret = pGetModuleFileNameExA(NULL, hMod, szModExPath, sizeof(szModExPath)); + ok( !ret, "GetModuleFileNameExA succeeded\n" ); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetModuleFileNameExA(hpQI, hMod, szModExPath, sizeof(szModExPath)); + ret = pGetModuleFileNameExA(hpQI, hMod, szModExPath, sizeof(szModExPath)); + ok( !ret, "GetModuleFileNameExA succeeded\n" ); ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetModuleFileNameExA(hpQV, hBad, szModExPath, sizeof(szModExPath)); + ret = pGetModuleFileNameExA(hpQV, hBad, szModExPath, sizeof(szModExPath)); + ok( !ret, "GetModuleFileNameExA succeeded\n" ); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); ret = pGetModuleFileNameExA(hpQV, NULL, szModExPath, sizeof(szModExPath)); @@ -492,6 +498,34 @@ static void test_GetModuleFileNameEx(void) GetModuleFileNameA(NULL, szModPath, sizeof(szModPath)); ok(!strncmp(szModExPath, szModPath, MAX_PATH), "szModExPath=\"%s\" szModPath=\"%s\"\n", szModExPath, szModPath); + + SetLastError(0xdeadbeef); + memset( szModExPath, 0xcc, sizeof(szModExPath) ); + ret = pGetModuleFileNameExA(hpQV, NULL, szModExPath, 4 ); + ok( ret == 4, "wrong length %u\n", ret ); + ok( broken(szModExPath[3]) /*w2kpro*/ || strlen(szModExPath) == 3, + "szModExPath=\"%s\" ret=%d\n", szModExPath, ret ); + ok(GetLastError() == 0xdeadbeef, "got error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = pGetModuleFileNameExA(hpQV, NULL, szModExPath, 0 ); + ok( ret == 0, "wrong length %u\n", ret ); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pGetModuleFileNameExW(hpQV, NULL, buffer, 4 ); + ok( ret == 4, "wrong length %u\n", ret ); + ok( broken(buffer[3]) /*w2kpro*/ || lstrlenW(buffer) == 3, + "buffer=%s ret=%d\n", wine_dbgstr_w(buffer), ret ); + ok(GetLastError() == 0xdeadbeef, "got error %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + buffer[0] = 0xcc; + ret = pGetModuleFileNameExW(hpQV, NULL, buffer, 0 ); + ok( ret == 0, "wrong length %u\n", ret ); + ok(GetLastError() == 0xdeadbeef, "got error %d\n", GetLastError()); + ok( buffer[0] == 0xcc, "buffer modified %s\n", wine_dbgstr_w(buffer) ); } static void test_GetModuleBaseName(void)

1 0

Jacek Caban : wininet: Use hostname stored in server_t in NETCON_secure_connect.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 905ede6c6d3366aa10098f83d8d248b7ce4e0c8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=905ede6c6d3366aa10098f83d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 30 14:49:41 2012 +0200 wininet: Use hostname stored in server_t in NETCON_secure_connect. --- dlls/wininet/http.c | 2 +- dlls/wininet/internet.h | 2 +- dlls/wininet/netconnection.c | 20 ++------------------ 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 69068bf..54db118 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4616,7 +4616,7 @@ static DWORD open_http_connection(http_request_t *request, BOOL *reusing) if(session->appInfo->proxy) res = HTTP_SecureProxyConnect(request); if(res == ERROR_SUCCESS) - res = NETCON_secure_connect(request->netconn, session->hostName); + res = NETCON_secure_connect(request->netconn); if(res != ERROR_SUCCESS) { WARN("Couldn't connect securely to host\n"); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 720b330..6cf1f38 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -525,7 +525,7 @@ BOOL INTERNET_FindProxyForProtocol(LPCWSTR szProxy, LPCWSTR proto, WCHAR *foundP DWORD create_netconn(BOOL, server_t *, DWORD, DWORD, netconn_t **) DECLSPEC_HIDDEN; void free_netconn(netconn_t*) DECLSPEC_HIDDEN; void NETCON_unload(void) DECLSPEC_HIDDEN; -DWORD NETCON_secure_connect(netconn_t *connection, LPWSTR hostname) DECLSPEC_HIDDEN; +DWORD NETCON_secure_connect(netconn_t *connection) DECLSPEC_HIDDEN; DWORD NETCON_send(netconn_t *connection, const void *msg, size_t len, int flags, int *sent /* out */) DECLSPEC_HIDDEN; DWORD NETCON_recv(netconn_t *connection, void *buf, size_t len, int flags, diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 870b317..4d3e13f 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -114,7 +114,6 @@ static const SSL_METHOD *meth; static SSL_METHOD *meth; #endif static SSL_CTX *ctx; -static int hostname_idx; static int error_idx; static int conn_idx; @@ -309,7 +308,6 @@ static DWORD netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) { SSL *ssl; - WCHAR *server; BOOL ret = FALSE; HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, CERT_STORE_CREATE_NEW_FLAG, NULL); @@ -317,7 +315,6 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) ssl = pX509_STORE_CTX_get_ex_data(ctx, pSSL_get_ex_data_X509_STORE_CTX_idx()); - server = pSSL_get_ex_data(ssl, hostname_idx); conn = pSSL_get_ex_data(ssl, conn_idx); if (store) { @@ -342,7 +339,7 @@ static int netconn_secure_verify(int preverify_ok, X509_STORE_CTX *ctx) if (!endCert) ret = FALSE; if (ret) { - DWORD_PTR err = netconn_verify_cert(endCert, store, server, + DWORD_PTR err = netconn_verify_cert(endCert, store, conn->server->name, conn->security_flags); if (err) @@ -457,12 +454,6 @@ static DWORD init_openssl(void) return ERROR_OUTOFMEMORY; } - hostname_idx = pSSL_get_ex_new_index(0, (void *)"hostname index", NULL, NULL, NULL); - if(hostname_idx == -1) { - ERR("SSL_get_ex_new_index failed; %s\n", pERR_error_string(pERR_get_error(), 0)); - return ERROR_OUTOFMEMORY; - } - error_idx = pSSL_get_ex_new_index(0, (void *)"error index", NULL, NULL, NULL); if(error_idx == -1) { ERR("SSL_get_ex_new_index failed; %s\n", pERR_error_string(pERR_get_error(), 0)); @@ -692,7 +683,7 @@ int sock_get_error( int err ) * NETCON_secure_connect * Initiates a secure connection over an existing plaintext connection. */ -DWORD NETCON_secure_connect(netconn_t *connection, LPWSTR hostname) +DWORD NETCON_secure_connect(netconn_t *connection) { DWORD res = ERROR_NOT_SUPPORTED; #ifdef SONAME_LIBSSL @@ -721,13 +712,6 @@ DWORD NETCON_secure_connect(netconn_t *connection, LPWSTR hostname) goto fail; } - if (!pSSL_set_ex_data(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(ssl_s, conn_idx, connection)) { ERR("SSL_set_ex_data failed: %s\n",

1 0

André Hentschel : ntdll: Correctly handle Thumb exceptions on ARM.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 2a58169dbc41e0110bce7839b52fdd211c9375c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a58169dbc41e0110bce7839b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 29 21:43:02 2012 +0200 ntdll: Correctly handle Thumb exceptions on ARM. --- dlls/ntdll/signal_arm.c | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/signal_arm.c b/dlls/ntdll/signal_arm.c index 7514b4d..93a2ff5 100644 --- a/dlls/ntdll/signal_arm.c +++ b/dlls/ntdll/signal_arm.c @@ -356,20 +356,33 @@ NTSTATUS context_from_server( CONTEXT *to, const context_t *from ) return STATUS_SUCCESS; } +extern void raise_func_trampoline_thumb( EXCEPTION_RECORD *rec, CONTEXT *context, raise_func func ); +__ASM_GLOBAL_FUNC( raise_func_trampoline_thumb, + ".thumb\n\t" + "blx r2\n\t" + "bkpt") + +extern void raise_func_trampoline_arm( EXCEPTION_RECORD *rec, CONTEXT *context, raise_func func ); +__ASM_GLOBAL_FUNC( raise_func_trampoline_arm, + ".arm\n\t" + "blx r2\n\t" + "bkpt") + /*********************************************************************** * setup_exception_record * * Setup the exception record and context on the thread stack. */ -static EXCEPTION_RECORD *setup_exception_record( SIGCONTEXT *sigcontext, void *stack_ptr, raise_func func ) +static EXCEPTION_RECORD *setup_exception( SIGCONTEXT *sigcontext, raise_func func ) { struct stack_layout { CONTEXT context; EXCEPTION_RECORD rec; - } *stack = stack_ptr; + } *stack; DWORD exception_code = 0; + stack = (struct stack_layout *)(SP_sig(sigcontext) & ~3); stack--; /* push the stack_layout structure */ stack->rec.ExceptionRecord = NULL; @@ -382,9 +395,13 @@ static EXCEPTION_RECORD *setup_exception_record( SIGCONTEXT *sigcontext, void *s /* now modify the sigcontext to return to the raise function */ SP_sig(sigcontext) = (DWORD)stack; - PC_sig(sigcontext) = (DWORD)func; + if (CPSR_sig(sigcontext) & 0x20) + PC_sig(sigcontext) = (DWORD)raise_func_trampoline_thumb; + else + PC_sig(sigcontext) = (DWORD)raise_func_trampoline_arm; REGn_sig(0, sigcontext) = (DWORD)&stack->rec; /* first arg for raise_func */ REGn_sig(1, sigcontext) = (DWORD)&stack->context; /* second arg for raise_func */ + REGn_sig(2, sigcontext) = (DWORD)func; /* the raise_func as third arg for the trampoline */ return &stack->rec; @@ -542,7 +559,6 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) { EXCEPTION_RECORD *rec; SIGCONTEXT *context = ucontext; - void *stack = (void *) (SP_sig(context) & ~3); /* check for page fault inside the thread stack */ if (TRAP_sig(context) == TRAP_ARM_PAGEFLT && @@ -553,13 +569,13 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) /* check if this was the last guard page */ if ((char *)info->si_addr < (char *)NtCurrentTeb()->DeallocationStack + 2*4096) { - rec = setup_exception_record( context, stack, raise_segv_exception ); + rec = setup_exception( context, raise_segv_exception ); rec->ExceptionCode = EXCEPTION_STACK_OVERFLOW; } return; } - rec = setup_exception_record( context, stack, raise_segv_exception ); + rec = setup_exception( context, raise_segv_exception ); if (rec->ExceptionCode == EXCEPTION_STACK_OVERFLOW) return; switch(TRAP_sig(context))

1 0

André Hentschel : winebuild: Expect a Thumb mode toolchain on ARM.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 833b655ae62ef7c6e2bd9b5713e0063a0000988b URL: http://source.winehq.org/git/wine.git/?a=commit;h=833b655ae62ef7c6e2bd9b571… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 29 21:43:14 2012 +0200 winebuild: Expect a Thumb mode toolchain on ARM. --- tools/winebuild/spec32.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 1e5c694..7743acc 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -415,6 +415,9 @@ static void output_asm_constructor( const char *constructor ) output( "\tnop\n" ); break; case CPU_ARM: + output( "\tblx %s\n", asm_name(constructor) ); + output( "\t.arm\n" ); + break; case CPU_POWERPC: output( "\tbl %s\n", asm_name(constructor) ); break; @@ -458,6 +461,10 @@ void output_module( DLLSPEC *spec ) output( "\tjmp 1f\n" ); break; case CPU_ARM: + output( "\n\t.syntax unified\n" ); + output( "\n\t.thumb\n" ); + output( "\tb.w 1f\n" ); + break; case CPU_POWERPC: output( "\tb 1f\n" ); break;

1 0

André Hentschel : configure: Check for Thumb2 on ARM and compile always in ARM mode.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 33ca051472db9f6730afedef532901fd29c68be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33ca051472db9f6730afedef5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 29 21:43:43 2012 +0200 configure: Check for Thumb2 on ARM and compile always in ARM mode. --- configure | 26 ++++++++++++++++++++++++++ configure.ac | 8 ++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 46827c1..5b8c648 100755 --- a/configure +++ b/configure @@ -4124,6 +4124,32 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi ;; + arm*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports Thumb2" >&5 +$as_echo_n "checking whether $CC supports Thumb2... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int ac_test(int i) { return i; } +int +main () +{ +asm(".syntax unified\n.thumb\nb.w ac_test\n.arm"); if (ac_test(1)) return 1 + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "You need a target with Thumb2 support to build Wine for ARM." "$LINENO" 5 +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$CFLAGS -marm" + ;; *-mingw32*|*-cygwin*) enable_win16=${enable_win16:-no} CFLAGS="$CFLAGS -D_WIN32" diff --git a/configure.ac b/configure.ac index efc03af..18da8c5 100644 --- a/configure.ac +++ b/configure.ac @@ -168,6 +168,14 @@ case $host in AC_SUBST(TARGETFLAGS,"-m64") fi ;; + arm*) + AC_MSG_CHECKING([whether $CC supports Thumb2]) + WINE_TRY_ASM_LINK([".syntax unified\n.thumb\nb.w ac_test\n.arm"],[int ac_test(int i) { return i; }], [if (ac_test(1)) return 1], + [AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no]) + AC_MSG_ERROR([You need a target with Thumb2 support to build Wine for ARM.])]) + CFLAGS="$CFLAGS -marm" + ;; *-mingw32*|*-cygwin*) enable_win16=${enable_win16:-no} CFLAGS="$CFLAGS -D_WIN32"

1 0

André Hentschel : libwine: Always use Thumb instructions on ARM.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: f93d3ad2f557df43af165468a0910c9d9a3015e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f93d3ad2f557df43af165468a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Apr 29 21:43:51 2012 +0200 libwine: Always use Thumb instructions on ARM. --- libs/wine/port.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/libs/wine/port.c b/libs/wine/port.c index da74e85..8e8caf8 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -153,12 +153,7 @@ __ASM_GLOBAL_FUNC( wine_call_on_stack, "mov sp, r2\n\t" /* stack */ "mov r2, r0\n\t" /* func -> scratch register */ "mov r0, r1\n\t" /* arg */ -#if defined(__thumb__) "blx r2\n\t" /* call func */ -#else - "mov LR, PC\n\t" /* return after branch */ - "mov PC, r2\n\t" /* call func */ -#endif "mov sp, r4\n\t" /* restore old sp from local var */ "pop {r4,PC}") /* fetch return address into pc */ #elif defined(__sparc__) && defined(__GNUC__)

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: 95abff7bc591f05d6e20a8f669f2d23ac16484da URL: http://source.winehq.org/git/wine.git/?a=commit;h=95abff7bc591f05d6e20a8f66… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Apr 30 10:44:04 2012 +0200 po: Update French translation. --- po/fr.po | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/po/fr.po b/po/fr.po index 3e74166..565bde4 100644 --- a/po/fr.po +++ b/po/fr.po @@ -3554,16 +3554,12 @@ msgid "URI to be decoded is incorrect" msgstr "L'URI à décoder est incorrecte" #: jscript.rc:57 -#, fuzzy -#| msgid "Enumeration value out of range.\n" msgid "Number of fraction digits is out of range" -msgstr "Valeur d'énumération hors plage.\n" +msgstr "Nombre de décimales hors plage" #: jscript.rc:58 -#, fuzzy -#| msgid "Subscript out of range" msgid "Precision is out of range" -msgstr "Indice hors limites" +msgstr "Précision hors limites" #: jscript.rc:59 msgid "Array length must be a finite positive integer"

1 0

Christian Costa : dmsynth: COM cleanup of IDirectMusicSynth8. Rename parameters.
by Alexandre Julliard 30 Apr '12

30 Apr '12

Module: wine Branch: master Commit: ecc369a0024825213ec741c73b78dfc0c1d92c5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecc369a0024825213ec741c73… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Apr 30 11:43:17 2012 +0200 dmsynth: COM cleanup of IDirectMusicSynth8. Rename parameters. --- dlls/dmsynth/dmsynth_private.h | 2 +- dlls/dmsynth/synth.c | 284 +++++++++++++++++++++++++-------------- 2 files changed, 183 insertions(+), 103 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ecc369a0024825213ec74…

1 0