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

Akihiro Sagawa : reg: Update Japanese translation.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: c775536e076d94134a180ba3d6418455475fee60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c775536e076d94134a180ba3d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Aug 22 22:34:36 2009 +0900 reg: Update Japanese translation. --- programs/reg/Ja.rc | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/programs/reg/Ja.rc b/programs/reg/Ja.rc index a2c1434..28ac408 100644 --- a/programs/reg/Ja.rc +++ b/programs/reg/Ja.rc @@ -32,4 +32,9 @@ STRINGTABLE STRING_ADD_USAGE, "REG ADD キー名 [/v 値名 | /ve] [/t type] [/s セパレータ] [/d データ] [/f]\n" STRING_DELETE_USAGE, "REG DELETE キー名 [/v 値名 | /ve | /va] [/f]\n" STRING_QUERY_USAGE, "REG QUERY キー名 [/v 値名 | /ve] [/s]\n" + STRING_SUCCESS, "操作は正常に完了しました\n" + STRING_INVALID_KEY, "エラー: キー名が無効です\n" + STRING_INVALID_CMDLINE, "エラー: コマンドライン引数が無効です\n" + STRING_NO_REMOTE, "エラー: リモートマシンにキーを追加できませんでした\n" + STRING_CANNOT_FIND, "エラー: システムは指定されたキーまたは値を見つけられませんでした\n" }

1 0

Akihiro Sagawa : appwiz.cpl: Update and refine Japanese translation.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 145352188dcf962ce179b931cd95a6afc30aa216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=145352188dcf962ce179b931c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Aug 22 22:34:33 2009 +0900 appwiz.cpl: Update and refine Japanese translation. --- dlls/appwiz.cpl/Ja.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/appwiz.cpl/Ja.rc b/dlls/appwiz.cpl/Ja.rc index c6d32e4..2f410ba 100644 --- a/dlls/appwiz.cpl/Ja.rc +++ b/dlls/appwiz.cpl/Ja.rc @@ -32,16 +32,16 @@ STRINGTABLE IDS_CPL_DESC, "新しいソフトウェアをインストールするか、既存のソフトウェアを削除することができます。" IDS_TAB1_TITLE, "アプリケーション" - IDS_UNINSTALL_FAILED, "アンインストーラーを起動することができません。 '%s'. レジストリからアンインストールできるプログラム登録を削除しますか？" - IDS_NOT_SPECIFIED, "指定されません" + IDS_UNINSTALL_FAILED, "アンインストーラー '%s' を起動することができません。このプログラムに対するアンインストール項目をレジストリから削除しますか？" + IDS_NOT_SPECIFIED, "指定されていません" IDS_COLUMN_NAME, "名前" IDS_COLUMN_PUBLISHER, "発行元" IDS_COLUMN_VERSION, "バージョン" IDS_INSTALL_FILTER, "インストールプログラム\0*instal*.exe;*setup*.exe;*.msi\0プログラム(*.exe)\0*.exe\0すべてのファイル (*.*)\0*.*\0\0" - IDS_REMOVE, "削除(&R)…" - IDS_MODIFY_REMOVE, "変更/削除(&M)…" + IDS_REMOVE, "削除(&R)..." + IDS_MODIFY_REMOVE, "変更と削除(&M)..." } IDD_MAIN DIALOG 0, 0, 320, 220 @@ -53,11 +53,11 @@ FONT 9, "MS Shell Dlg" CONTROL "インストール(&I)...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 - CONTROL "以下のソフトウェアを自動的に削除できます。プログラムを削除またはインストールされたコンポーネントを変更するには、リストからプログラムを選択し [追加と削除] をクリックしてください。", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "以下のソフトウェアを自動的に削除できます。プログラムを削除またはインストールされたコンポーネントを変更するには、リストからプログラムを選択し [変更と削除] をクリックしてください。", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 CONTROL "サポート情報(&S)...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 - CONTROL "&Modify...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 - CONTROL "&Remove...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 + CONTROL "変更(&M)...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "削除(&R)...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 }

1 0

Akihiro Sagawa : uninstaller: Add Japanese translation.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 81ea79bf3be127c7b5dd18e83e227509749c6c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ea79bf3be127c7b5dd18e83… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Aug 22 22:34:35 2009 +0900 uninstaller: Add Japanese translation. --- programs/uninstaller/Ja.rc | 31 +++++++++++++++++++++++++++++++ programs/uninstaller/Makefile.in | 1 + 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/programs/uninstaller/Ja.rc b/programs/uninstaller/Ja.rc new file mode 100644 index 0000000..4a4bf04 --- /dev/null +++ b/programs/uninstaller/Ja.rc @@ -0,0 +1,31 @@ +/* + * Uninstaller (Japanese Resources) + * + * Copyright 2005 Jonathan Ernst + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE { + IDS_APPNAME, "Wine アプリケーションアンインストーラ" + IDS_UNINSTALLFAILED, "アンインストールコマンド '%s' の実行に失敗しました。コマンドが存在しないためかもしれません。\r\nレジストリからこの登録を削除しますか?" +} diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in index 0c9851c..adba2cc 100644 --- a/programs/uninstaller/Makefile.in +++ b/programs/uninstaller/Makefile.in @@ -23,6 +23,7 @@ RC_SRCS = \ Fr.rc \ Hu.rc \ It.rc \ + Ja.rc \ Ko.rc \ Lt.rc \ Nl.rc \

1 0

Jacek Caban : msxml3: Get rid of not used aggregation support in domelement .
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: c2b2e1ea9b8e7a8c4d40bed4fa9acde43afd532e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2b2e1ea9b8e7a8c4d40bed4f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Aug 22 19:51:45 2009 +0200 msxml3: Get rid of not used aggregation support in domelement. --- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/element.c | 113 ++++++++++++++----------------------------- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/node.c | 2 +- 4 files changed, 39 insertions(+), 80 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 84bd43c..2d54fe0 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -1043,7 +1043,7 @@ static HRESULT WINAPI domdoc_createElement( xmldoc_add_orphan(xmlnode->doc, xmlnode); TRACE("created xmlptr %p\n", xmlnode); - elem_unk = create_element(xmlnode, NULL); + elem_unk = create_element(xmlnode); HeapFree(GetProcessHeap(), 0, xml_name); hr = IUnknown_QueryInterface(elem_unk, &IID_IXMLDOMElement, (void **)element); diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 33db539..ce99ba9 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -41,8 +41,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(msxml); typedef struct _domelem { const struct IXMLDOMElementVtbl *lpVtbl; - const struct IUnknownVtbl *lpInternalUnkVtbl; - IUnknown *pUnkOuter; LONG ref; xmlnode *node; } domelem; @@ -52,11 +50,6 @@ static inline domelem *impl_from_IXMLDOMElement( IXMLDOMElement *iface ) return (domelem *)((char*)iface - FIELD_OFFSET(domelem, lpVtbl)); } -static inline domelem *impl_from_InternalUnknown( IUnknown *iface ) -{ - return (domelem *)((char*)iface - FIELD_OFFSET(domelem, lpInternalUnkVtbl)); -} - static inline xmlNodePtr get_element( domelem *This ) { return This->node->node; @@ -68,23 +61,54 @@ static HRESULT WINAPI domelem_QueryInterface( void** ppvObject ) { domelem *This = impl_from_IXMLDOMElement( iface ); + TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); - return IUnknown_QueryInterface(This->pUnkOuter, riid, ppvObject); + if ( IsEqualGUID( riid, &IID_IXMLDOMElement ) || + IsEqualGUID( riid, &IID_IDispatch ) || + IsEqualGUID( riid, &IID_IUnknown ) ) + { + *ppvObject = &This->lpVtbl; + } + else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) + { + *ppvObject = IXMLDOMNode_from_impl(This->node); + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef( (IUnknown*)*ppvObject ); + return S_OK; } static ULONG WINAPI domelem_AddRef( IXMLDOMElement *iface ) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IUnknown_AddRef(This->pUnkOuter); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI domelem_Release( IXMLDOMElement *iface ) { domelem *This = impl_from_IXMLDOMElement( iface ); - return IUnknown_Release(This->pUnkOuter); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + IXMLDOMNode_Release(IXMLDOMNode_from_impl(This->node)); + heap_free(This); + } + + return ref; } static HRESULT WINAPI domelem_GetTypeInfoCount( @@ -727,66 +751,7 @@ static const struct IXMLDOMElementVtbl domelem_vtbl = domelem_normalize, }; -static HRESULT WINAPI Internal_QueryInterface( - IUnknown *iface, - REFIID riid, - void** ppvObject ) -{ - domelem *This = impl_from_InternalUnknown( iface ); - TRACE("%p %s %p\n", This, debugstr_guid(riid), ppvObject); - - if ( IsEqualGUID( riid, &IID_IXMLDOMElement ) || - IsEqualGUID( riid, &IID_IDispatch ) || - IsEqualGUID( riid, &IID_IUnknown ) ) - { - *ppvObject = &This->lpVtbl; - } - else if ( IsEqualGUID( riid, &IID_IXMLDOMNode ) ) - { - *ppvObject = IXMLDOMNode_from_impl(This->node); - } - else - { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); - return E_NOINTERFACE; - } - - IUnknown_AddRef( (IUnknown*)*ppvObject ); - - return S_OK; -} - -static ULONG WINAPI Internal_AddRef( - IUnknown *iface ) -{ - domelem *This = impl_from_InternalUnknown( iface ); - return InterlockedIncrement( &This->ref ); -} - -static ULONG WINAPI Internal_Release( - IUnknown *iface ) -{ - domelem *This = impl_from_InternalUnknown( iface ); - ULONG ref; - - ref = InterlockedDecrement( &This->ref ); - if ( ref == 0 ) - { - IXMLDOMNode_Release( IXMLDOMNode_from_impl(This->node) ); - HeapFree( GetProcessHeap(), 0, This ); - } - - return ref; -} - -static const struct IUnknownVtbl internal_unk_vtbl = -{ - Internal_QueryInterface, - Internal_AddRef, - Internal_Release -}; - -IUnknown* create_element( xmlNodePtr element, IUnknown *pUnkOuter ) +IUnknown* create_element( xmlNodePtr element ) { domelem *This; @@ -796,12 +761,6 @@ IUnknown* create_element( xmlNodePtr element, IUnknown *pUnkOuter ) This->lpVtbl = &domelem_vtbl; This->ref = 1; - This->lpInternalUnkVtbl = &internal_unk_vtbl; - - if(pUnkOuter) - This->pUnkOuter = pUnkOuter; /* Don't take a ref on outer Unknown */ - else - This->pUnkOuter = (IUnknown *)&This->lpInternalUnkVtbl; This->node = create_basic_node( element, (IUnknown*)&This->lpVtbl ); if(!This->node) @@ -810,7 +769,7 @@ IUnknown* create_element( xmlNodePtr element, IUnknown *pUnkOuter ) return NULL; } - return (IUnknown*) &This->lpInternalUnkVtbl; + return (IUnknown*) &This->lpVtbl; } #endif diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index d09b380..18b44bd 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -39,7 +39,7 @@ extern IUnknown *create_domdoc( xmlNodePtr document ); extern IUnknown *create_xmldoc( void ); extern IXMLDOMNode *create_node( xmlNodePtr node ); -extern IUnknown *create_element( xmlNodePtr element, IUnknown *pUnkOuter ); +extern IUnknown *create_element( xmlNodePtr element ); extern IUnknown *create_attribute( xmlNodePtr attribute ); extern IUnknown *create_text( xmlNodePtr text ); extern IUnknown *create_pi( xmlNodePtr pi ); diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 2876ef3..a7fa63f 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1580,7 +1580,7 @@ IXMLDOMNode *create_node( xmlNodePtr node ) switch(node->type) { case XML_ELEMENT_NODE: - pUnk = create_element( node, NULL ); + pUnk = create_element( node ); break; case XML_ATTRIBUTE_NODE: pUnk = create_attribute( node );

1 0

Jacek Caban : mshtml: Use URL moniker to load http documents.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 80f02b82d68902f32578a7bcf6cfbaa715b724ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f02b82d68902f32578a7bcf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Aug 22 19:40:01 2009 +0200 mshtml: Use URL moniker to load http documents. --- dlls/mshtml/mshtml_private.h | 5 --- dlls/mshtml/nsio.c | 48 +--------------------------- dlls/mshtml/persist.c | 12 ++----- dlls/shdocvw/navigate.c | 72 +++++------------------------------------ dlls/urlmon/tests/url.c | 8 +--- 5 files changed, 15 insertions(+), 130 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 724d827..a28949b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -33,9 +33,6 @@ #include "nsiface.h" -#define GENERATE_MSHTML_NS_FAILURE(code) \ - ((nsresult) ((PRUint32)(1<<31) | ((PRUint32)(0x45+6)<<16) | (PRUint32)(code))) - #define NS_OK ((nsresult)0x00000000L) #define NS_ERROR_FAILURE ((nsresult)0x80004005L) #define NS_NOINTERFACE ((nsresult)0x80004002L) @@ -44,8 +41,6 @@ #define NS_ERROR_UNEXPECTED ((nsresult)0x8000ffffL) #define NS_ERROR_UNKNOWN_PROTOCOL ((nsresult)0x804b0012L) -#define WINE_NS_LOAD_FROM_MONIKER GENERATE_MSHTML_NS_FAILURE(0) - #define NS_FAILED(res) ((res) & 0x80000000) #define NS_SUCCEEDED(res) (!NS_FAILED(res)) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 83e8602..addf1b5 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -608,37 +608,6 @@ static nsresult NSAPI nsChannel_Open(nsIHttpChannel *iface, nsIInputStream **_re return NS_ERROR_NOT_IMPLEMENTED; } -static BOOL do_load_from_moniker_hack(nsChannel *This) -{ - nsACString scheme_str; - nsresult nsres; - BOOL ret = TRUE; - - /* - * We should always load the page from IMoniker, but Wine is not yet - * ready for this. This function is a heuristic, that decides which - * way of loading is better (Gecko implementation or IMoniker). The - * aim is to always return TRUE. - */ - - /* Load from moniker if there is no Gecko channel available */ - if(!This->channel) - return TRUE; - - nsACString_Init(&scheme_str, NULL); - nsres = nsIWineURI_GetScheme(This->uri, &scheme_str); - - if(NS_SUCCEEDED(nsres)) { - const char *scheme; - - nsACString_GetData(&scheme_str, &scheme); - ret = !strcmp(scheme, "wine") || !strcmp(scheme, "about"); - } - - nsACString_Finish(&scheme_str); - return ret; -} - static HRESULT create_mon_for_nschannel(nsChannel *channel, IMoniker **mon) { nsIWineURI *wine_uri; @@ -732,8 +701,7 @@ static nsresult async_open_doc_uri(nsChannel *This, NSContainer *container, This->content_type = heap_strdupWtoA(container->doc->mime); } - if(do_load_from_moniker_hack(This)) - return WINE_NS_LOAD_FROM_MONIKER; + return NS_OK; }else { BOOL cont = before_async_open(This, container); @@ -764,23 +732,9 @@ static nsresult async_open(nsChannel *This, NSContainer *container, nsIStreamLis { nsChannelBSC *bscallback; IMoniker *mon = NULL; - nsresult nsres; task_t *task; HRESULT hres; - if(This->channel) { - nsres = nsIChannel_AsyncOpen(This->channel, listener, context); - - if(mon) - IMoniker_Release(mon); - - if(NS_FAILED(nsres) && (This->load_flags & LOAD_INITIAL_DOCUMENT_URI)) - return WINE_NS_LOAD_FROM_MONIKER; - return nsres; - } - - TRACE("channel == NULL\n"); - hres = create_mon_for_nschannel(This, &mon); if(FAILED(hres)) return NS_ERROR_UNEXPECTED; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 55bccc2..f2a3df7 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -314,17 +314,11 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO if(post_data_stream) nsIInputStream_Release(post_data_stream); - if(NS_SUCCEEDED(nsres)) { - /* FIXME: don't return here (URL Moniker needs to be good enough) */ - + if(NS_FAILED(nsres)) { + WARN("LoadURI failed: %08x\n", nsres); IUnknown_Release((IUnknown*)bscallback); CoTaskMemFree(url); - - if(bind_complete) - *bind_complete = TRUE; - return S_OK; - }else if(nsres != WINE_NS_LOAD_FROM_MONIKER) { - WARN("LoadURI failed: %08x\n", nsres); + return E_FAIL; } } diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 0e6f68d..4b17d33 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -513,46 +513,6 @@ static BOOL try_application_url(LPCWSTR url) return ShellExecuteExW(&exec_info); } -static HRESULT http_load_hack(DocHost *This, IMoniker *mon, IBindStatusCallback *callback, IBindCtx *bindctx) -{ - IPersistMoniker *persist; - IUnknown *doc; - HRESULT hres; - - /* - * FIXME: - * We should use URLMoniker's BindToObject instead creating HTMLDocument here. - * This should be fixed when mshtml.dll and urlmon.dll will be good enough. - */ - - hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, - CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, - &IID_IUnknown, (void**)&doc); - - if(FAILED(hres)) { - ERR("Could not create HTMLDocument: %08x\n", hres); - return hres; - } - - hres = IUnknown_QueryInterface(doc, &IID_IPersistMoniker, (void**)&persist); - if(FAILED(hres)) { - IUnknown_Release(doc); - return hres; - } - - hres = IPersistMoniker_Load(persist, FALSE, mon, bindctx, 0); - IPersistMoniker_Release(persist); - - if(SUCCEEDED(hres)) - hres = IBindStatusCallback_OnObjectAvailable(callback, &IID_IUnknown, doc); - else - WARN("Load failed: %08x\n", hres); - - IUnknown_Release(doc); - - return IBindStatusCallback_OnStopBinding(callback, hres, NULL); -} - static HRESULT create_moniker(LPCWSTR url, IMoniker **mon) { WCHAR new_url[INTERNET_MAX_URL_LENGTH]; @@ -585,14 +545,9 @@ static HRESULT create_moniker(LPCWSTR url, IMoniker **mon) static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCtx *bindctx, IBindStatusCallback *callback) { - WCHAR schema[30]; - DWORD schema_len; + IUnknown *unk = NULL; HRESULT hres; - static const WCHAR httpW[] = {'h','t','t','p',0}; - static const WCHAR httpsW[] = {'h','t','t','p','s',0}; - static const WCHAR ftpW[]= {'f','t','p',0}; - if(mon) { IMoniker_AddRef(mon); }else { @@ -609,24 +564,15 @@ static HRESULT bind_to_object(DocHost *This, IMoniker *mon, LPCWSTR url, IBindCt IBindCtx_RegisterObjectParam(bindctx, (LPOLESTR)SZ_HTML_CLIENTSITE_OBJECTPARAM, (IUnknown*)CLIENTSITE(This)); - hres = CoInternetParseUrl(This->url, PARSE_SCHEMA, 0, schema, sizeof(schema)/sizeof(schema[0]), - &schema_len, 0); - if(SUCCEEDED(hres) && - (!strcmpW(schema, httpW) || !strcmpW(schema, httpsW) || !strcmpW(schema, ftpW))) { - hres = http_load_hack(This, mon, callback, bindctx); + hres = IMoniker_BindToObject(mon, bindctx, NULL, &IID_IUnknown, (void**)&unk); + if(SUCCEEDED(hres)) { + hres = S_OK; + if(unk) + IUnknown_Release(unk); + }else if(try_application_url(url)) { + hres = S_OK; }else { - IUnknown *unk = NULL; - - hres = IMoniker_BindToObject(mon, bindctx, NULL, &IID_IUnknown, (void**)&unk); - if(SUCCEEDED(hres)) { - hres = S_OK; - if(unk) - IUnknown_Release(unk); - }else if(try_application_url(url)) { - hres = S_OK; - }else { - FIXME("BindToObject failed: %08x\n", hres); - } + FIXME("BindToObject failed: %08x\n", hres); } IMoniker_Release(mon); diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index a4d873e..5badf86 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -2551,16 +2551,12 @@ static void test_BindToObject(int protocol, BOOL emul) CHECK_CALLED(Obj_OnStopBinding); } - if(test_protocol != HTTP_TEST || test_protocol == HTTPS_TEST || emul || urls[test_protocol] == SHORT_RESPONSE_URL) { + if(test_protocol != HTTP_TEST || emul || urls[test_protocol] == SHORT_RESPONSE_URL || !(bindf & BINDF_ASYNCHRONOUS)) { ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n"); ok(IBindCtx_Release(bctx) == 0, "bctx should be destroyed here\n"); }else { todo_wine ok(IMoniker_Release(mon) == 0, "mon should be destroyed here\n"); - - if(bindf & BINDF_ASYNCHRONOUS) - IBindCtx_Release(bctx); - else - todo_wine ok(IBindCtx_Release(bctx) == 0, "bctx should be destroyed here\n"); + IBindCtx_Release(bctx); } if(emul)

1 0

Jacek Caban : urlmon: Call OnStopBinding before Terminate.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 8cee331b7556544a6c4edd93a0af9be031174a84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cee331b7556544a6c4edd93a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Aug 22 19:39:33 2009 +0200 urlmon: Call OnStopBinding before Terminate. --- dlls/urlmon/binding.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index ba6f564..210e8e2 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1082,8 +1082,8 @@ static HRESULT WINAPI InternetProtocolSink_ReportResult(IInternetProtocolSink *i TRACE("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult)); - IInternetProtocol_Terminate(This->protocol, 0); stop_binding(This, hrResult, szResult); + IInternetProtocol_Terminate(This->protocol, 0); return S_OK; }

1 0

Jacek Caban : wininet: Don't free gzip_stream in HTTPREQ_CloseConnection.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 4dfec39b6f1dfc4dc430cc79cf47d2e908c58ba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dfec39b6f1dfc4dc430cc79c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Aug 22 19:46:30 2009 +0200 wininet: Don't free gzip_stream in HTTPREQ_CloseConnection. --- dlls/wininet/http.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 7e6178c..681658e 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1545,6 +1545,14 @@ static void HTTPREQ_Destroy(object_header_t *hdr) HeapFree(GetProcessHeap(), 0, lpwhr->pCustHeaders[i].lpszValue); } +#ifdef HAVE_ZLIB + if(lpwhr->gzip_stream) { + if(!lpwhr->gzip_stream->end_of_data) + inflateEnd(&lpwhr->gzip_stream->zstream); + HeapFree(GetProcessHeap(), 0, lpwhr->gzip_stream); + } +#endif + HeapFree(GetProcessHeap(), 0, lpwhr->pCustHeaders); HeapFree(GetProcessHeap(), 0, lpwhr); } @@ -1555,14 +1563,6 @@ static void HTTPREQ_CloseConnection(object_header_t *hdr) TRACE("%p\n",lpwhr); -#ifdef HAVE_ZLIB - if(lpwhr->gzip_stream) { - inflateEnd(&lpwhr->gzip_stream->zstream); - HeapFree(GetProcessHeap(), 0, lpwhr->gzip_stream); - lpwhr->gzip_stream = NULL; - } -#endif - if (!NETCON_connected(&lpwhr->netConnection)) return; @@ -2057,6 +2057,7 @@ static DWORD read_gzip_data(http_request_t *req, BYTE *buf, int size, BOOL sync, if(zres == Z_STREAM_END) { TRACE("end of data\n"); req->gzip_stream->end_of_data = TRUE; + inflateEnd(&req->gzip_stream->zstream); }else if(zres != Z_OK) { WARN("inflate failed %d\n", zres); if(!read)

1 0

Jacek Caban : mshtml: Don' t return Gecko interfaces implementation from nsChannel::QueryInterface.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: 55014297f8862718d0d1191210395bf067aa4467 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55014297f8862718d0d119121… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Aug 22 19:38:14 2009 +0200 mshtml: Don't return Gecko interfaces implementation from nsChannel::QueryInterface. --- dlls/mshtml/nsio.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 90c1683..83e8602 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -195,9 +195,6 @@ static nsresult NSAPI nsChannel_QueryInterface(nsIHttpChannel *iface, nsIIDRef r return NS_OK; } - - if(This->channel) - return nsIChannel_QueryInterface(This->channel, riid, result); return NS_NOINTERFACE; }

1 0

Jacek Caban : shdocvw: Return succes in bind status callback functions.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: c19c009e4890511826c7dd41f941abd608c92c8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c19c009e4890511826c7dd41f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Aug 22 19:38:41 2009 +0200 shdocvw: Return succes in bind status callback functions. --- dlls/shdocvw/navigate.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index d6c0e3e..0e6f68d 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -220,7 +220,7 @@ static HRESULT WINAPI BindStatusCallback_OnProgress(IBindStatusCallback *iface, FIXME("status code %u\n", ulStatusCode); } - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI BindStatusCallback_OnStopBinding(IBindStatusCallback *iface, @@ -357,7 +357,7 @@ static HRESULT WINAPI HttpNegotiate_BeginningTransaction(IHttpNegotiate *iface, { BindStatusCallback *This = HTTPNEG_THIS(iface); - FIXME("(%p)->(%s %s %d %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders), + TRACE("(%p)->(%s %s %d %p)\n", This, debugstr_w(szURL), debugstr_w(szHeaders), dwReserved, pszAdditionalHeaders); if(This->headers) { @@ -374,9 +374,9 @@ static HRESULT WINAPI HttpNegotiate_OnResponse(IHttpNegotiate *iface, LPWSTR *pszAdditionalRequestHeaders) { BindStatusCallback *This = HTTPNEG_THIS(iface); - FIXME("(%p)->(%d %s %s %p)\n", This, dwResponseCode, debugstr_w(szResponseHeaders), + TRACE("(%p)->(%d %s %s %p)\n", This, dwResponseCode, debugstr_w(szResponseHeaders), debugstr_w(szRequestHeaders), pszAdditionalRequestHeaders); - return E_NOTIMPL; + return S_OK; } #undef HTTPNEG_THIS

1 0

Jacek Caban : mshtml: Treat wyciwyg protocol as Gecko special protocol.
by Alexandre Julliard 24 Aug '09

24 Aug '09

Module: wine Branch: master Commit: e4c203a2bc4197b91588e31a629c3dea5a168559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4c203a2bc4197b91588e31a6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Aug 22 19:37:59 2009 +0200 mshtml: Treat wyciwyg protocol as Gecko special protocol. --- dlls/mshtml/nsio.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index e09eb46..90c1683 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2186,15 +2186,15 @@ static nsresult NSAPI nsIOService_GetProtocolFlags(nsIIOService *iface, const ch static BOOL is_gecko_special_uri(const char *spec) { - static const char chromeW[] = "chrome:"; - static const char jarW[] = "jar:"; - static const char resourceW[] = "resource:"; - static const char javascriptW[] = "javascript:"; - - return !strncasecmp(spec, chromeW, sizeof(chromeW)-1) - || !strncasecmp(spec, resourceW, sizeof(resourceW)-1) - || !strncasecmp(spec, jarW, sizeof(jarW)-1) - || !strncasecmp(spec, javascriptW, sizeof(javascriptW)-1); + static const char *special_schemes[] = {"chrome:", "jar:", "resource:", "javascript:", "wyciwyg:"}; + int i; + + for(i=0; i < sizeof(special_schemes)/sizeof(*special_schemes); i++) { + if(!strncasecmp(spec, special_schemes[i], strlen(special_schemes[i]))) + return TRUE; + } + + return FALSE; } static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString *aSpec,

1 0