November 2011 - Wine-commits

Andrew Talbot : dinput: Remove unused Wine debug channel.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: f3d0c715a33322f52cb01dfc2230a4f1c427d441 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3d0c715a33322f52cb01dfc2… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sat Nov 12 22:49:32 2011 +0000 dinput: Remove unused Wine debug channel. --- dlls/dinput/config.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index 56cbdf3..abf3fd5 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -18,15 +18,12 @@ #define NONAMELESSUNION -#include "wine/debug.h" #include "wine/unicode.h" #include "objbase.h" #include "dinput_private.h" #include "device_private.h" #include "resource.h" -WINE_DEFAULT_DEBUG_CHANNEL(dinput); - typedef struct { int nobjects; IDirectInputDevice8W *lpdid;

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 32664381fb59bb47ca972b92b428dcba23c392a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32664381fb59bb47ca972b92b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Nov 13 17:24:46 2011 +0100 po: Update German translation. --- po/de.po | 40 +++++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 21 deletions(-) diff --git a/po/de.po b/po/de.po index 89cc6e0..1803b0c 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-11-01 14:03+0100\n" +"PO-Revision-Date: 2011-11-12 17:21+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -2034,73 +2034,71 @@ msgstr "%uMB benutzt, %uMB verfügbar" #: gdi32.rc:25 msgid "Western" -msgstr "" +msgstr "Westlich" #: gdi32.rc:26 msgid "Central European" -msgstr "" +msgstr "Mitteleuropäisch" #: gdi32.rc:27 msgid "Cyrillic" -msgstr "" +msgstr "Kyrillisch" #: gdi32.rc:28 -#, fuzzy msgid "Greek" -msgstr "Grün" +msgstr "Griechisch" #: gdi32.rc:29 msgid "Turkish" -msgstr "" +msgstr "Türkisch" #: gdi32.rc:30 msgid "Hebrew" -msgstr "" +msgstr "Hebräisch" #: gdi32.rc:31 msgid "Arabic" -msgstr "" +msgstr "Arabisch" #: gdi32.rc:32 msgid "Baltic" -msgstr "" +msgstr "Baltisch" #: gdi32.rc:33 msgid "Vietnamese" -msgstr "" +msgstr "Vietnamesisch" #: gdi32.rc:34 msgid "Thai" -msgstr "" +msgstr "Thailändisch" #: gdi32.rc:35 -#, fuzzy msgid "Japanese" -msgstr "Ausschnitt" +msgstr "Japanisch" #: gdi32.rc:36 msgid "CHINESE_GB2312" -msgstr "" +msgstr "CHINESE_GB2312" #: gdi32.rc:37 msgid "Hangul" -msgstr "" +msgstr "Koreanisch" #: gdi32.rc:38 msgid "CHINESE_BIG5" -msgstr "" +msgstr "CHINESE_BIG5" #: gdi32.rc:39 msgid "Hangul(Johab)" -msgstr "" +msgstr "Koreanisch(Johab)" #: gdi32.rc:40 msgid "Symbol" -msgstr "" +msgstr "Symbol" #: gdi32.rc:41 msgid "OEM/DOS" -msgstr "" +msgstr "OEM/DOS" #: hhctrl.rc:56 msgid "S&ync" @@ -11013,7 +11011,7 @@ msgstr "Festplattenreset fehlgeschlagen!" #: winecfg.rc:91 msgid "(System default)" -msgstr "(System Ordner)" +msgstr "(System Standard)" #: winecfg.rc:51 msgid ""

1 0

Hans Leidekker : winhttp: Convert string data to UTF-8 and add a corresponding content type header.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 3c9d356bc44c208264c07e7d123a62dfdc068255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c9d356bc44c208264c07e7d1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 10 11:37:31 2011 +0100 winhttp: Convert string data to UTF-8 and add a corresponding content type header. --- dlls/winhttp/request.c | 62 ++++++++++++++++++++++++++++++++++------- dlls/winhttp/tests/winhttp.c | 21 +++++++++++++- 2 files changed, 71 insertions(+), 12 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 51c433e..e0c68e6 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2217,6 +2217,7 @@ static void free_request( struct winhttp_request *request ) heap_free( (WCHAR *)request->proxy.lpszProxyBypass ); heap_free( request->buffer ); heap_free( request->verb ); + VariantClear( &request->data ); } static ULONG WINAPI winhttp_request_Release( @@ -2860,6 +2861,20 @@ static DWORD request_set_parameters( struct winhttp_request *request ) return ERROR_SUCCESS; } +static void request_set_utf8_content_type( struct winhttp_request *request ) +{ + static const WCHAR fmtW[] = {'%','s',':',' ','%','s',0}; + static const WCHAR text_plainW[] = {'t','e','x','t','/','p','l','a','i','n',0}; + static const WCHAR charset_utf8W[] = {'c','h','a','r','s','e','t','=','u','t','f','-','8',0}; + WCHAR headerW[64]; + int len; + + len = sprintfW( headerW, fmtW, attr_content_type, text_plainW ); + WinHttpAddRequestHeaders( request->hrequest, headerW, len, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW ); + len = sprintfW( headerW, fmtW, attr_content_type, charset_utf8W ); + WinHttpAddRequestHeaders( request->hrequest, headerW, len, WINHTTP_ADDREQ_FLAG_COALESCE_WITH_SEMICOLON ); +} + static HRESULT request_send( struct winhttp_request *request ) { SAFEARRAY *sa = NULL; @@ -2871,24 +2886,47 @@ static HRESULT request_send( struct winhttp_request *request ) DWORD err; if ((err = request_set_parameters( request ))) return HRESULT_FROM_WIN32( err ); - VariantInit( &data ); - if (strcmpW( request->verb, getW ) && VariantChangeType( &data, &request->data, 0, VT_ARRAY|VT_UI1 ) == S_OK) + if (strcmpW( request->verb, getW )) { - SAFEARRAY *sa = V_ARRAY( &data ); - if ((hr = SafeArrayAccessData( sa, (void **)&ptr )) != S_OK) return hr; - if ((hr = SafeArrayGetUBound( sa, 1, &size ) != S_OK)) + VariantInit( &data ); + if (V_VT( &request->data ) == VT_BSTR) { - SafeArrayUnaccessData( sa ); - return hr; + UINT i, cp = CP_ACP; + const WCHAR *str = V_BSTR( &request->data ); + int len = strlenW( str ); + + for (i = 0; i < len; i++) + { + if (str[i] > 127) + { + cp = CP_UTF8; + break; + } + } + size = WideCharToMultiByte( cp, 0, str, len, NULL, 0, NULL, NULL ); + if (!(ptr = heap_alloc( size ))) return E_OUTOFMEMORY; + WideCharToMultiByte( cp, 0, str, len, ptr, size, NULL, NULL ); + if (cp == CP_UTF8) request_set_utf8_content_type( request ); + } + else if (VariantChangeType( &data, &request->data, 0, VT_ARRAY|VT_UI1 ) == S_OK) + { + sa = V_ARRAY( &data ); + if ((hr = SafeArrayAccessData( sa, (void **)&ptr )) != S_OK) return hr; + if ((hr = SafeArrayGetUBound( sa, 1, &size ) != S_OK)) + { + SafeArrayUnaccessData( sa ); + return hr; + } + size++; } - size++; } wait_set_status_callback( request, WINHTTP_CALLBACK_STATUS_REQUEST_SENT ); if (!(ret = WinHttpSendRequest( request->hrequest, NULL, 0, ptr, size, size, 0 ))) { err = get_last_error(); } - if (sa && (hr = SafeArrayUnaccessData( sa )) != S_OK) return hr; + if (!sa) heap_free( ptr ); + else if ((hr = SafeArrayUnaccessData( sa )) != S_OK) return hr; if (!ret) return HRESULT_FROM_WIN32( err ); if ((err = wait_for_completion( request ))) return HRESULT_FROM_WIN32( err ); @@ -2914,7 +2952,7 @@ static HRESULT WINAPI winhttp_request_Send( VARIANT body ) { struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); - HRESULT hr = S_OK; + HRESULT hr; TRACE("%p, %s\n", request, debugstr_variant(&body)); @@ -2929,7 +2967,9 @@ static HRESULT WINAPI winhttp_request_Send( LeaveCriticalSection( &request->cs ); return S_OK; } - request->data = body; + VariantClear( &request->data ); + if ((hr = VariantCopyInd( &request->data, &body )) != S_OK) return hr; + if (request->wait) /* async request */ { if (!(request->thread = CreateThread( NULL, 0, send_and_receive_proc, request, 0, NULL ))) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 01b74e3..acf88dc 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2111,17 +2111,22 @@ static void test_IWinHttpRequest(void) static const WCHAR passwordW[] = {'p','a','s','s','w','o','r','d',0}; static const WCHAR url1W[] = {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR url2W[] = {'w','i','n','e','h','q','.','o','r','g',0}; + static const WCHAR url3W[] = {'h','t','t','p',':','/','/','c','r','o','s','s','o','v','e','r','.', + 'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m','/', + 'p','o','s','t','t','e','s','t','.','p','h','p',0}; static const WCHAR method1W[] = {'G','E','T',0}; static const WCHAR method2W[] = {'I','N','V','A','L','I','D',0}; + static const WCHAR method3W[] = {'P','O','S','T',0}; static const WCHAR proxy_serverW[] = {'p','r','o','x','y','s','e','r','v','e','r',0}; static const WCHAR bypas_listW[] = {'b','y','p','a','s','s','l','i','s','t',0}; static const WCHAR connectionW[] = {'C','o','n','n','e','c','t','i','o','n',0}; static const WCHAR dateW[] = {'D','a','t','e',0}; + static const WCHAR test_dataW[] = {'t','e','s','t','d','a','t','a',128,0}; HRESULT hr; IWinHttpRequest *req; BSTR method, url, username, password, response = NULL, status_text = NULL, headers = NULL; BSTR date, today, connection, value = NULL; - VARIANT async, empty, timeout, body, proxy_server, bypass_list; + VARIANT async, empty, timeout, body, proxy_server, bypass_list, data; VARIANT_BOOL succeeded; LONG status; WCHAR todayW[WINHTTP_TIME_FORMAT_BUFSIZE]; @@ -2140,6 +2145,20 @@ static void test_IWinHttpRequest(void) V_VT( &async ) = VT_BOOL; V_BOOL( &async ) = VARIANT_FALSE; + method = SysAllocString( method3W ); + url = SysAllocString( url3W ); + hr = IWinHttpRequest_Open( req, method, url, async ); + ok( hr == S_OK, "got %08x\n", hr ); + SysFreeString( method ); + SysFreeString( url ); + + V_VT( &data ) = VT_BSTR; + V_BSTR( &data ) = SysAllocString( test_dataW ); + hr = IWinHttpRequest_Send( req, data ); + ok( hr == S_OK || broken(hr == HRESULT_FROM_WIN32(ERROR_WINHTTP_INVALID_SERVER_RESPONSE)), + "got %08x\n", hr ); + SysFreeString( V_BSTR( &data ) ); + hr = IWinHttpRequest_Open( req, NULL, NULL, empty ); ok( hr == E_INVALIDARG, "got %08x\n", hr );

1 0

Hans Leidekker : scrrun: Add stub implementations of DllRegisterServer and DllUnregisterServer.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 655e16f1c9a1543190fd5b0f9aad38fb06396fa3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=655e16f1c9a1543190fd5b0f9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 10 11:38:00 2011 +0100 scrrun: Add stub implementations of DllRegisterServer and DllUnregisterServer. --- dlls/scrrun/scrrun.c | 18 ++++++++++++++++++ dlls/scrrun/scrrun.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/scrrun.c b/dlls/scrrun/scrrun.c index 84a7bef..e825697 100644 --- a/dlls/scrrun/scrrun.c +++ b/dlls/scrrun/scrrun.c @@ -41,3 +41,21 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) } return TRUE; } + +/*********************************************************************** + * DllRegisterServer (scrrun.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + FIXME("\n"); + return S_OK; +} + +/*********************************************************************** + * DllUnregisterServer (scrrun.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + FIXME("\n"); + return S_OK; +} diff --git a/dlls/scrrun/scrrun.spec b/dlls/scrrun/scrrun.spec index 5316d8f..838e9ea 100644 --- a/dlls/scrrun/scrrun.spec +++ b/dlls/scrrun/scrrun.spec @@ -1,6 +1,6 @@ @ stub DLLGetDocumentation @ stub DllCanUnloadNow @ stub DllGetClassObject -@ stub DllRegisterServer -@ stub DllUnregisterServer +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() @ stub DoOpenPipeStream

1 0

Hans Leidekker : msi: Process messages while waiting for custom actions to complete.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 353016f92f14f97be8f971af2b9d58d8162e6b25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=353016f92f14f97be8f971af2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 10 11:38:28 2011 +0100 msi: Process messages while waiting for custom actions to complete. --- dlls/msi/dialog.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 8b10215..4e908ff 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3786,8 +3786,16 @@ void msi_dialog_check_messages( HANDLE handle ) /* in threads other than the UI thread, block */ if( uiThreadId != GetCurrentThreadId() ) { - if( handle ) - MsgWaitForMultipleObjectsEx( 1, &handle, INFINITE, 0, 0 ); + if (!handle) return; + while (MsgWaitForMultipleObjectsEx( 1, &handle, INFINITE, QS_ALLINPUT, 0 ) == WAIT_OBJECT_0 + 1) + { + MSG msg; + while (PeekMessageW( &msg, NULL, 0, 0, PM_REMOVE )) + { + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } + } return; }

1 0

Hans Leidekker : msi: Trace the exit code from custom action processes.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: a1005503830a65f2f53080d8906baebd30c78127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1005503830a65f2f53080d89… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 10 11:38:47 2011 +0100 msi: Trace the exit code from custom action processes. --- dlls/msi/custom.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 16a44c3..3b8e677 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -308,6 +308,7 @@ static UINT custom_get_process_return( HANDLE process ) DWORD rc = 0; GetExitCodeProcess( process, &rc ); + TRACE("exit code is %u\n", rc); if (rc != 0) return ERROR_FUNCTION_FAILED; return ERROR_SUCCESS;

1 0

Jacek Caban : mshtml: Store window URL as BSTR.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 535e2b23a3408ae072ff0092c89e11bd67cbf60f URL: http://source.winehq.org/git/wine.git/?a=commit;h=535e2b23a3408ae072ff0092c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 10 14:35:11 2011 +0100 mshtml: Store window URL as BSTR. --- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/navigate.c | 6 ++---- dlls/mshtml/persist.c | 11 ++++++++--- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 3a15c58..08da2d7 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -308,7 +308,7 @@ struct HTMLWindow { nsChannelBSC *bscallback; IMoniker *mon; - LPOLESTR url; + BSTR url; IHTMLEventObj *event; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 0e0ea27..a2ecd8b 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1261,7 +1261,7 @@ static void handle_navigation_error(nsChannelBSC *This, DWORD result) SAFEARRAYBOUND bound; VARIANT var, varOut; LONG ind; - BSTR url, unk; + BSTR unk; HRESULT hres; if(!This->window) @@ -1296,8 +1296,7 @@ static void handle_navigation_error(nsChannelBSC *This, DWORD result) ind = 1; V_VT(&var) = VT_BSTR; - url = SysAllocString(This->window->url); - V_BSTR(&var) = url; + V_BSTR(&var) = This->window->url; SafeArrayPutElement(sa, &ind, &var); ind = 3; @@ -1338,7 +1337,6 @@ static void handle_navigation_error(nsChannelBSC *This, DWORD result) V_BOOL(&varOut) = VARIANT_TRUE; IOleCommandTarget_Exec(olecmd, &CGID_DocHostCmdPriv, 1, 0, &var, FAILED(hres)?NULL:&varOut); - SysFreeString(url); SysFreeString(unk); SafeArrayDestroy(sa); IOleCommandTarget_Release(olecmd); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 2e2643f..412dab7 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -68,6 +68,7 @@ static BOOL use_gecko_script(HTMLWindow *window) void set_current_mon(HTMLWindow *This, IMoniker *mon) { + WCHAR *url; HRESULT hres; if(This->mon) { @@ -76,7 +77,7 @@ void set_current_mon(HTMLWindow *This, IMoniker *mon) } if(This->url) { - CoTaskMemFree(This->url); + SysFreeString(This->url); This->url = NULL; } @@ -86,9 +87,13 @@ void set_current_mon(HTMLWindow *This, IMoniker *mon) IMoniker_AddRef(mon); This->mon = mon; - hres = IMoniker_GetDisplayName(mon, NULL, NULL, &This->url); - if(FAILED(hres)) + hres = IMoniker_GetDisplayName(mon, NULL, NULL, &url); + if(SUCCEEDED(hres)) { + This->url = SysAllocString(url); + CoTaskMemFree(url); + }else { WARN("GetDisplayName failed: %08x\n", hres); + } set_script_mode(This, use_gecko_script(This) ? SCRIPTMODE_GECKO : SCRIPTMODE_ACTIVESCRIPT); }

1 0

Jacek Caban : mshtml: Use IUri in set_current_mon if possible and store it in window object.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: d7f7f33e7dd12e70b5d901cd04722b300e39ff08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7f7f33e7dd12e70b5d901cd0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 10 14:35:41 2011 +0100 mshtml: Use IUri in set_current_mon if possible and store it in window object. --- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/persist.c | 41 +++++++++++++++++++++++++++++++++++------ 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 08da2d7..90ba6ad 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -308,6 +308,7 @@ struct HTMLWindow { nsChannelBSC *bscallback; IMoniker *mon; + IUri *uri; BSTR url; IHTMLEventObj *event; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 412dab7..2ad108d 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -68,7 +68,7 @@ static BOOL use_gecko_script(HTMLWindow *window) void set_current_mon(HTMLWindow *This, IMoniker *mon) { - WCHAR *url; + IUriContainer *uri_container; HRESULT hres; if(This->mon) { @@ -76,6 +76,11 @@ void set_current_mon(HTMLWindow *This, IMoniker *mon) This->mon = NULL; } + if(This->uri) { + IUri_Release(This->uri); + This->uri = NULL; + } + if(This->url) { SysFreeString(This->url); This->url = NULL; @@ -87,12 +92,36 @@ void set_current_mon(HTMLWindow *This, IMoniker *mon) IMoniker_AddRef(mon); This->mon = mon; - hres = IMoniker_GetDisplayName(mon, NULL, NULL, &url); + hres = IMoniker_QueryInterface(mon, &IID_IUriContainer, (void**)&uri_container); if(SUCCEEDED(hres)) { - This->url = SysAllocString(url); - CoTaskMemFree(url); - }else { - WARN("GetDisplayName failed: %08x\n", hres); + hres = IUriContainer_GetIUri(uri_container, &This->uri); + IUriContainer_Release(uri_container); + if(hres != S_OK) { + WARN("GetIUri failed: %08x\n", hres); + This->uri = NULL; + } + } + + if(!This->uri) { + WCHAR *url; + + hres = IMoniker_GetDisplayName(mon, NULL, NULL, &url); + if(SUCCEEDED(hres)) { + hres = CreateUri(url, 0, 0, &This->uri); + if(FAILED(hres)) { + WARN("CrateUri failed: %08x\n", hres); + This->url = SysAllocString(url); + } + CoTaskMemFree(url); + }else { + WARN("GetDisplayName failed: %08x\n", hres); + } + } + + if(!This->url && This->uri) { + hres = IUri_GetDisplayUri(This->uri, &This->url); + if(FAILED(hres)) + WARN("GetDisplayUri failed: %08x\n", hres); } set_script_mode(This, use_gecko_script(This) ? SCRIPTMODE_GECKO : SCRIPTMODE_ACTIVESCRIPT);

1 0

Jacek Caban : mshtml: Use IUri in use_gecko_script.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 1190c8cbd6b10237f229da4d1fcc7624aac455c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1190c8cbd6b10237f229da4d1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 10 14:35:50 2011 +0100 mshtml: Use IUri in use_gecko_script. --- dlls/mshtml/persist.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 2ad108d..ef80f8d 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -32,6 +32,9 @@ #include "shlguid.h" #include "idispids.h" +#define NO_SHLWAPI_REG +#include "shlwapi.h" + #include "wine/debug.h" #include "mshtml_private.h" @@ -50,11 +53,9 @@ typedef struct { static BOOL use_gecko_script(HTMLWindow *window) { - DWORD zone; + DWORD zone, scheme; HRESULT hres; - static const WCHAR aboutW[] = {'a','b','o','u','t',':'}; - hres = IInternetSecurityManager_MapUrlToZone(window->secmgr, window->url, &zone, 0); if(FAILED(hres)) { WARN("Could not map %s to zone: %08x\n", debugstr_w(window->url), hres); @@ -62,8 +63,11 @@ static BOOL use_gecko_script(HTMLWindow *window) } TRACE("zone %d\n", zone); - return zone != URLZONE_LOCAL_MACHINE && zone != URLZONE_TRUSTED - && strncmpiW(aboutW, window->url, sizeof(aboutW)/sizeof(WCHAR)); + if(zone == URLZONE_LOCAL_MACHINE || zone == URLZONE_TRUSTED || !window->uri) + return FALSE; + + hres = IUri_GetScheme(window->uri, &scheme); + return FAILED(hres) || scheme != URL_SCHEME_ABOUT; } void set_current_mon(HTMLWindow *This, IMoniker *mon)

1 0

Jacek Caban : mshtml: Fixed memory leak in nsIURL:: GetDirectory implementation.
by Alexandre Julliard 14 Nov '11

14 Nov '11

Module: wine Branch: master Commit: 734050f5c57cba6dfafe36a15c27a6dee1120152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=734050f5c57cba6dfafe36a15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 10 14:35:59 2011 +0100 mshtml: Fixed memory leak in nsIURL::GetDirectory implementation. --- dlls/mshtml/nsio.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index bf41f35..d266ddf 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2427,6 +2427,7 @@ static nsresult NSAPI nsURL_GetDirectory(nsIURL *iface, nsACString *aDirectory) SysFreeString(path); TRACE("ret %s\n", debugstr_a(dir)); nsACString_SetData(aDirectory, dir ? dir : ""); + heap_free(dir); return NS_OK; }

1 0