October 2009 - Wine-Commits

Henri Verbeet : wined3d: Restore the thread' s previous GL context in WineD3D_ReleaseFakeGLContext().
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

Module: wine Branch: master Commit: 30d2660d99d7a4c38088a439c3ba2ebc258f09d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30d2660d99d7a4c38088a439c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 27 10:10:43 2009 +0100 wined3d: Restore the thread's previous GL context in WineD3D_ReleaseFakeGLContext(). --- dlls/wined3d/directx.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ffd3301..2640aa6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -217,6 +217,8 @@ struct wined3d_fake_gl_ctx HDC dc; HWND wnd; HGLRC gl_ctx; + HDC restore_dc; + HGLRC restore_gl_ctx; }; static void WineD3D_ReleaseFakeGLContext(struct wined3d_fake_gl_ctx *ctx) @@ -236,6 +238,11 @@ static void WineD3D_ReleaseFakeGLContext(struct wined3d_fake_gl_ctx *ctx) ReleaseDC(ctx->wnd, ctx->dc); DestroyWindow(ctx->wnd); + + if (ctx->restore_gl_ctx && !pwglMakeCurrent(ctx->restore_dc, ctx->restore_gl_ctx)) + { + ERR_(d3d_caps)("Failed to restore previous GL context.\n"); + } } static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) @@ -245,6 +252,9 @@ static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) TRACE("getting context...\n"); + ctx->restore_dc = pwglGetCurrentDC(); + ctx->restore_gl_ctx = pwglGetCurrentContext(); + /* We need a fake window as a hdc retrieved using GetDC(0) can't be used for much GL purposes. */ ctx->wnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL); @@ -309,6 +319,10 @@ fail: ctx->dc = NULL; if (ctx->wnd) DestroyWindow(ctx->wnd); ctx->wnd = NULL; + if (ctx->restore_gl_ctx && !pwglMakeCurrent(ctx->restore_dc, ctx->restore_gl_ctx)) + { + ERR_(d3d_caps)("Failed to restore previous GL context.\n"); + } return FALSE; }

1 0

Hans Leidekker : msi: Avoid accessing uninitialized memory in ACTION_AppSearchReg.
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

Module: wine Branch: master Commit: 2eb33f5bcb008e88c7adf45bf77b02537ed1cb2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eb33f5bcb008e88c7adf45bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 27 10:07:50 2009 +0100 msi: Avoid accessing uninitialized memory in ACTION_AppSearchReg. Found by valgrind. --- dlls/msi/appsearch.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 4ef4087..95daabb 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -445,7 +445,8 @@ static UINT ACTION_AppSearchReg(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNAT if (sz == 0) goto end; - if ((ptr = strchrW((LPWSTR)value, '"')) && (end = strchrW(++ptr, '"'))) + if ((regType == REG_SZ || regType == REG_EXPAND_SZ) && + (ptr = strchrW((LPWSTR)value, '"')) && (end = strchrW(++ptr, '"'))) *end = '\0'; else ptr = (LPWSTR)value;

1 0

Alexandre Julliard : shell32: Specify the full application path when starting winemenubuilder.exe.
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

Module: wine Branch: master Commit: d72e7af9b1883c5632e794d934da3bf187217d49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72e7af9b1883c5632e794d93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 27 11:21:34 2009 +0100 shell32: Specify the full application path when starting winemenubuilder.exe. --- dlls/shell32/changenotify.c | 30 +++--------------------------- dlls/shell32/shell32_main.h | 2 ++ dlls/shell32/shelllink.c | 35 ++++++++++++++++++++++++++++------- 3 files changed, 33 insertions(+), 34 deletions(-) diff --git a/dlls/shell32/changenotify.c b/dlls/shell32/changenotify.c index 43a5fb8..96ffd99 100644 --- a/dlls/shell32/changenotify.c +++ b/dlls/shell32/changenotify.c @@ -105,31 +105,6 @@ static const char * DumpEvent( LONG event ) #undef DUMPEV } -static BOOL RefreshFileTypeAssociations(void) -{ - static WCHAR szWinemenubuilder[] = { - 'w','i','n','e','m','e','n','u','b','u','i','l','d','e','r','.','e','x','e', - ' ','-','a',0 }; - STARTUPINFOW si; - PROCESS_INFORMATION pi; - BOOL ret; - - TRACE("starting %s\n",debugstr_w(szWinemenubuilder)); - - memset(&si, 0, sizeof(si)); - si.cb = sizeof(si); - - ret = CreateProcessW( NULL, szWinemenubuilder, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); - - if (ret) - { - CloseHandle( pi.hProcess ); - CloseHandle( pi.hThread ); - } - - return ret; -} - static const char * NodeName(const NOTIFICATIONLIST *item) { const char *str; @@ -425,10 +400,11 @@ void WINAPI SHChangeNotify(LONG wEventId, UINT uFlags, LPCVOID dwItem1, LPCVOID if (wEventId & SHCNE_ASSOCCHANGED) { + static const WCHAR args[] = {' ','-','a',0 }; TRACE("refreshing file type associations\n"); - RefreshFileTypeAssociations(); + run_winemenubuilder( args ); } - + /* if we allocated it, free it. The ANSI flag is also set in its Unicode sibling. */ if ((typeFlag & SHCNF_PATHA) || (typeFlag & SHCNF_PRINTERA)) { diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index 12d50e2..16fb4a5 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -197,6 +197,8 @@ BOOL UNIXFS_is_rooted_at_desktop(void); extern const GUID CLSID_UnixFolder; extern const GUID CLSID_UnixDosFolder; +extern BOOL run_winemenubuilder( const WCHAR *args ); + /* Default shell folder value registration */ HRESULT SHELL_RegisterShellFolders(void); diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 231c72c..414cc54 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -395,30 +395,33 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFile return r; } -static BOOL StartLinkProcessor( LPCOLESTR szLink ) +BOOL run_winemenubuilder( const WCHAR *args ) { - static const WCHAR szFormat[] = { - 'w','i','n','e','m','e','n','u','b','u','i','l','d','e','r','.','e','x','e', - ' ','-','w',' ','"','%','s','"',0 }; + static const WCHAR menubuilder[] = {'\\','w','i','n','e','m','e','n','u','b','u','i','l','d','e','r','.','e','x','e',0}; LONG len; LPWSTR buffer; STARTUPINFOW si; PROCESS_INFORMATION pi; BOOL ret; + WCHAR app[MAX_PATH]; - len = sizeof(szFormat) + lstrlenW( szLink ) * sizeof(WCHAR); + GetSystemDirectoryW( app, MAX_PATH - sizeof(menubuilder)/sizeof(WCHAR) ); + strcatW( app, menubuilder ); + + len = (strlenW( app ) + strlenW( args ) + 1) * sizeof(WCHAR); buffer = HeapAlloc( GetProcessHeap(), 0, len ); if( !buffer ) return FALSE; - wsprintfW( buffer, szFormat, szLink ); + strcpyW( buffer, app ); + strcatW( buffer, args ); TRACE("starting %s\n",debugstr_w(buffer)); memset(&si, 0, sizeof(si)); si.cb = sizeof(si); - ret = CreateProcessW( NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); + ret = CreateProcessW( app, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); HeapFree( GetProcessHeap(), 0, buffer ); @@ -431,6 +434,24 @@ static BOOL StartLinkProcessor( LPCOLESTR szLink ) return ret; } +static BOOL StartLinkProcessor( LPCOLESTR szLink ) +{ + static const WCHAR szFormat[] = {' ','-','w',' ','"','%','s','"',0 }; + LONG len; + LPWSTR buffer; + BOOL ret; + + len = sizeof(szFormat) + lstrlenW( szLink ) * sizeof(WCHAR); + buffer = HeapAlloc( GetProcessHeap(), 0, len ); + if( !buffer ) + return FALSE; + + wsprintfW( buffer, szFormat, szLink ); + ret = run_winemenubuilder( buffer ); + HeapFree( GetProcessHeap(), 0, buffer ); + return ret; +} + static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFileName, BOOL fRemember) { IShellLinkImpl *This = impl_from_IPersistFile(iface);

1 0

Hans Leidekker : wininet: Clean up locks after closing libssl and libcrypto .
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

Module: wine Branch: master Commit: 248939d358790c953dc7b002ae800e36b7c883e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=248939d358790c953dc7b002a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 27 10:04:20 2009 +0100 wininet: Clean up locks after closing libssl and libcrypto. Found by valgrind. --- dlls/wininet/netconnection.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 97c764f..16cce40 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -289,14 +289,6 @@ void NETCON_unload(void) #if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) if (OpenSSL_crypto_handle) { - if (ssl_locks) - { - int i; - - for (i = 0; i < pCRYPTO_num_locks(); i++) - DeleteCriticalSection(&ssl_locks[i]); - HeapFree(GetProcessHeap(), 0, ssl_locks); - } wine_dlclose(OpenSSL_crypto_handle, NULL, 0); } if (OpenSSL_ssl_handle) @@ -305,6 +297,12 @@ void NETCON_unload(void) pSSL_CTX_free(ctx); wine_dlclose(OpenSSL_ssl_handle, NULL, 0); } + if (ssl_locks) + { + int i; + for (i = 0; i < pCRYPTO_num_locks(); i++) DeleteCriticalSection(&ssl_locks[i]); + HeapFree(GetProcessHeap(), 0, ssl_locks); + } #endif }

1 0

Hans Leidekker : winhttp: Clean up locks after closing libssl and libcrypto .
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

Module: wine Branch: master Commit: 629fd8fcbca495ce8b8d5cd91e76299b5422fe94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=629fd8fcbca495ce8b8d5cd91… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 27 10:04:05 2009 +0100 winhttp: Clean up locks after closing libssl and libcrypto. SSL_CTX_free() triggers a call to the locking callback. Found by valgrind. --- dlls/winhttp/net.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 28b3972..53911d6 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -316,13 +316,6 @@ void netconn_unload( void ) #if defined(SONAME_LIBSSL) && defined(SONAME_LIBCRYPTO) if (libcrypto_handle) { - if (ssl_locks) - { - int i; - - for (i = 0; i < num_ssl_locks; i++) DeleteCriticalSection( &ssl_locks[i] ); - HeapFree( GetProcessHeap(), 0, ssl_locks ); - } wine_dlclose( libcrypto_handle, NULL, 0 ); } if (libssl_handle) @@ -331,6 +324,12 @@ void netconn_unload( void ) pSSL_CTX_free( ctx ); wine_dlclose( libssl_handle, NULL, 0 ); } + if (ssl_locks) + { + int i; + for (i = 0; i < num_ssl_locks; i++) DeleteCriticalSection( &ssl_locks[i] ); + HeapFree( GetProcessHeap(), 0, ssl_locks ); + } #endif }

1 0

Juan Lang : cryptui: Support sorting columns by clicking on their headers.
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

Module: wine Branch: master Commit: 3a7d3fcc8a00a69ee763195c56e3e47c076b549a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7d3fcc8a00a69ee763195c5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 26 15:30:16 2009 -0700 cryptui: Support sorting columns by clicking on their headers. --- dlls/cryptui/main.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 9807064..a772329 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -1062,6 +1062,49 @@ static void cert_mgr_do_export(HWND hwnd) } } +static int CALLBACK cert_mgr_sort_by_text(HWND lv, int col, int index1, + int index2) +{ + LVITEMW item; + WCHAR buf1[MAX_STRING_LEN]; + WCHAR buf2[MAX_STRING_LEN]; + + item.cchTextMax = sizeof(buf1) / sizeof(buf1[0]); + item.mask = LVIF_TEXT; + item.pszText = buf1; + item.iItem = index1; + item.iSubItem = col; + SendMessageW(lv, LVM_GETITEMW, 0, (LPARAM)&item); + item.pszText = buf2; + item.iItem = index2; + SendMessageW(lv, LVM_GETITEMW, 0, (LPARAM)&item); + return strcmpW(buf1, buf2); +} + +static int CALLBACK cert_mgr_sort_by_subject(LPARAM lp1, LPARAM lp2, LPARAM lp) +{ + return cert_mgr_sort_by_text((HWND)lp, 0, lp1, lp2); +} + +static int CALLBACK cert_mgr_sort_by_issuer(LPARAM lp1, LPARAM lp2, LPARAM lp) +{ + return cert_mgr_sort_by_text((HWND)lp, 1, lp1, lp2); +} + +static int CALLBACK cert_mgr_sort_by_date(LPARAM lp1, LPARAM lp2, LPARAM lp) +{ + PCCERT_CONTEXT cert1 = (PCCERT_CONTEXT)lp1; + PCCERT_CONTEXT cert2 = (PCCERT_CONTEXT)lp2; + return CompareFileTime(&cert1->pCertInfo->NotAfter, + &cert2->pCertInfo->NotAfter); +} + +static int CALLBACK cert_mgr_sort_by_friendly_name(LPARAM lp1, LPARAM lp2, + LPARAM lp) +{ + return cert_mgr_sort_by_text((HWND)lp, 3, lp1, lp2); +} + static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) { @@ -1141,6 +1184,35 @@ static LRESULT CALLBACK cert_mgr_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, cert_mgr_do_remove(hwnd); break; } + case LVN_COLUMNCLICK: + { + NMLISTVIEW *nmlv = (NMLISTVIEW *)lp; + HWND lv = GetDlgItem(hwnd, IDC_MGR_CERTS); + + /* FIXME: doesn't support swapping sort order between ascending + * and descending. + */ + switch (nmlv->iSubItem) + { + case 0: + SendMessageW(lv, LVM_SORTITEMSEX, (WPARAM)lv, + (LPARAM)cert_mgr_sort_by_subject); + break; + case 1: + SendMessageW(lv, LVM_SORTITEMSEX, (WPARAM)lv, + (LPARAM)cert_mgr_sort_by_issuer); + break; + case 2: + SendMessageW(lv, LVM_SORTITEMS, 0, + (LPARAM)cert_mgr_sort_by_date); + break; + case 3: + SendMessageW(lv, LVM_SORTITEMSEX, (WPARAM)lv, + (LPARAM)cert_mgr_sort_by_friendly_name); + break; + } + break; + } } break; }

1 0

Andrew Eikum : mshtml: Fix typo in TRACE.
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

Module: wine Branch: master Commit: 9d62f4753391435bb365d0341de8f808ab2dbf60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d62f4753391435bb365d0341… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Oct 26 18:02:14 2009 -0500 mshtml: Fix typo in TRACE. --- dlls/mshtml/htmlwindow.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index bda8719..c66f245 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -124,7 +124,7 @@ static HRESULT WINAPI HTMLWindow2_QueryInterface(IHTMLWindow2 *iface, REFIID rii TRACE("(%p)->(IID_IHTMLWindow2 %p)\n", This, ppv); *ppv = HTMLWINDOW2(This); }else if(IsEqualGUID(&IID_IHTMLWindow3, riid)) { - TRACE("(%p)->(IID_IHTMLWindow2 %p)\n", This, ppv); + TRACE("(%p)->(IID_IHTMLWindow3 %p)\n", This, ppv); *ppv = HTMLWINDOW3(This); }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE;

1 0

Jacek Caban : mshtml: Moved binding list to HTMLDocumentNode.
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

Module: wine Branch: master Commit: 745f601d2359f7a72d6c839991e9b7d287e54d29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=745f601d2359f7a72d6c83999… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 26 23:05:37 2009 +0100 mshtml: Moved binding list to HTMLDocumentNode. --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlwindow.c | 3 ++ dlls/mshtml/mshtml_private.h | 11 ++++----- dlls/mshtml/navigate.c | 49 ++++++++++++++++++++++++----------------- dlls/mshtml/nsio.c | 37 +++++++++++++++++++++++++------ dlls/mshtml/persist.c | 2 +- dlls/mshtml/script.c | 2 +- 7 files changed, 70 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=745f601d2359f7a72d6c8…

1 0

Jacek Caban : mshtml: Allow task queue to be used for different targets.
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

Module: wine Branch: master Commit: 12bddc55edf91d27eeab158d4eab8f2a22da6b7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=12bddc55edf91d27eeab158d4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Oct 26 23:05:10 2009 +0100 mshtml: Allow task queue to be used for different targets. --- dlls/mshtml/htmldoc.c | 3 +- dlls/mshtml/mshtml_private.h | 34 ++++++---- dlls/mshtml/mutation.c | 19 ++++-- dlls/mshtml/nsio.c | 21 +++++-- dlls/mshtml/olecmd.c | 2 +- dlls/mshtml/persist.c | 99 +++++++++++++++++++++++---- dlls/mshtml/task.c | 153 +++++++++--------------------------------- 7 files changed, 167 insertions(+), 164 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=12bddc55edf91d27eeab1…

1 0

Hans Leidekker : wininet: Avoid accessing uninitialized memory in HttpSendRequestExW.
by Alexandre Julliard Oct. 27, 2009

Oct. 27, 2009

Module: wine Branch: master Commit: e62fdaf0f1fa08e82f54b72ce6ae4dabaac8e507 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e62fdaf0f1fa08e82f54b72ce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Oct 27 10:03:36 2009 +0100 wininet: Avoid accessing uninitialized memory in HttpSendRequestExW. Found by valgrind. --- dlls/wininet/http.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d8db8af..1426439 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3338,8 +3338,16 @@ BOOL WINAPI HttpSendRequestExW(HINTERNET hRequest, req = &workRequest.u.HttpSendRequestW; if (lpBuffersIn) { - /* FIXME: this should use dwHeadersLength or may not be necessary at all */ - req->lpszHeader = heap_strdupW(lpBuffersIn->lpcszHeader); + DWORD size; + + if (lpBuffersIn->dwHeadersLength == ~0u) + size = (strlenW( lpBuffersIn->lpcszHeader ) + 1) * sizeof(WCHAR); + else + size = lpBuffersIn->dwHeadersLength * sizeof(WCHAR); + + req->lpszHeader = HeapAlloc( GetProcessHeap(), 0, size ); + memcpy( req->lpszHeader, lpBuffersIn->lpcszHeader, size ); + req->dwHeaderLength = lpBuffersIn->dwHeadersLength; req->lpOptional = lpBuffersIn->lpvBuffer; req->dwOptionalLength = lpBuffersIn->dwBufferLength;

1 0