October 2010 - Wine-Commits

Jacek Caban : urlmon: Added support for sending post data from stream.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: 237264dc61e362c55d23cfd2fb15da9845721a8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=237264dc61e362c55d23cfd2f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 21:36:44 2010 +0200 urlmon: Added support for sending post data from stream. --- dlls/urlmon/ftp.c | 6 +++++ dlls/urlmon/gopher.c | 6 +++++ dlls/urlmon/http.c | 53 +++++++++++++++++++++++++++++++++++++------- dlls/urlmon/protocol.c | 46 +++++++++++++++++++++++++++++++++++++++ dlls/urlmon/urlmon_main.h | 3 ++ 5 files changed, 105 insertions(+), 9 deletions(-) diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c index 86ddab7..c2b48d2 100644 --- a/dlls/urlmon/ftp.c +++ b/dlls/urlmon/ftp.c @@ -59,6 +59,11 @@ static HRESULT FtpProtocol_open_request(Protocol *prot, IUri *uri, DWORD request return S_OK; } +static HRESULT FtpProtocol_end_request(Protocol *prot) +{ + return E_NOTIMPL; +} + static HRESULT FtpProtocol_start_downloading(Protocol *prot) { FtpProtocol *This = ASYNCPROTOCOL_THIS(prot); @@ -82,6 +87,7 @@ static void FtpProtocol_close_connection(Protocol *prot) static const ProtocolVtbl AsyncProtocolVtbl = { FtpProtocol_open_request, + FtpProtocol_end_request, FtpProtocol_start_downloading, FtpProtocol_close_connection }; diff --git a/dlls/urlmon/gopher.c b/dlls/urlmon/gopher.c index 4fb61b3..da241e9 100644 --- a/dlls/urlmon/gopher.c +++ b/dlls/urlmon/gopher.c @@ -56,6 +56,11 @@ static HRESULT GopherProtocol_open_request(Protocol *prot, IUri *uri, DWORD requ return S_OK; } +static HRESULT GopherProtocol_end_request(Protocol *prot) +{ + return E_NOTIMPL; +} + static HRESULT GopherProtocol_start_downloading(Protocol *prot) { return S_OK; @@ -69,6 +74,7 @@ static void GopherProtocol_close_connection(Protocol *prot) static const ProtocolVtbl AsyncProtocolVtbl = { GopherProtocol_open_request, + GopherProtocol_end_request, GopherProtocol_start_downloading, GopherProtocol_close_connection }; diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index 52a2425..e95ea6c 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -71,7 +71,8 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques HINTERNET internet_session, IInternetBindInfo *bind_info) { HttpProtocol *This = ASYNCPROTOCOL_THIS(prot); - LPWSTR addl_header = NULL, post_cookie = NULL, optional = NULL; + INTERNET_BUFFERSW send_buffer = {sizeof(INTERNET_BUFFERSW)}; + LPWSTR addl_header = NULL, post_cookie = NULL; IServiceProvider *service_provider = NULL; IHttpNegotiate2 *http_negotiate2 = NULL; BSTR url, host, user, pass, path; @@ -220,13 +221,30 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques } } + send_buffer.lpcszHeader = This->full_header; + send_buffer.dwHeadersLength = send_buffer.dwHeadersTotal = strlenW(This->full_header); + if(This->base.bind_info.dwBindVerb != BINDVERB_GET) { - /* Native does not use GlobalLock/GlobalUnlock, so we won't either */ - if (This->base.bind_info.stgmedData.tymed != TYMED_HGLOBAL) - WARN("Expected This->base.bind_info.stgmedData.tymed to be TYMED_HGLOBAL, not %d\n", - This->base.bind_info.stgmedData.tymed); - else - optional = (LPWSTR)This->base.bind_info.stgmedData.u.hGlobal; + switch(This->base.bind_info.stgmedData.tymed) { + case TYMED_HGLOBAL: + /* Native does not use GlobalLock/GlobalUnlock, so we won't either */ + send_buffer.lpvBuffer = This->base.bind_info.stgmedData.u.hGlobal; + send_buffer.dwBufferLength = send_buffer.dwBufferTotal = This->base.bind_info.cbstgmedData; + break; + case TYMED_ISTREAM: { + LARGE_INTEGER offset; + + send_buffer.dwBufferTotal = This->base.bind_info.cbstgmedData; + This->base.post_stream = This->base.bind_info.stgmedData.u.pstm; + IStream_AddRef(This->base.post_stream); + + offset.QuadPart = 0; + IStream_Seek(This->base.post_stream, offset, STREAM_SEEK_SET, NULL); + break; + } + default: + FIXME("Unsupported This->base.bind_info.stgmedData.tymed %d\n", This->base.bind_info.stgmedData.tymed); + } } b = TRUE; @@ -234,8 +252,11 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques if(!res) WARN("InternetSetOption(INTERNET_OPTION_HTTP_DECODING) failed: %08x\n", GetLastError()); - res = HttpSendRequestW(This->base.request, This->full_header, lstrlenW(This->full_header), - optional, optional ? This->base.bind_info.cbstgmedData : 0); + if(This->base.post_stream) + res = HttpSendRequestExW(This->base.request, &send_buffer, NULL, 0, 0); + else + res = HttpSendRequestW(This->base.request, send_buffer.lpcszHeader, send_buffer.dwHeadersLength, + send_buffer.lpvBuffer, send_buffer.dwBufferLength); if(!res && GetLastError() != ERROR_IO_PENDING) { WARN("HttpSendRequest failed: %d\n", GetLastError()); return INET_E_DOWNLOAD_FAILURE; @@ -244,6 +265,19 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques return S_OK; } +static HRESULT HttpProtocol_end_request(Protocol *protocol) +{ + BOOL res; + + res = HttpEndRequestW(protocol->request, NULL, 0, 0); + if(!res && GetLastError() != ERROR_IO_PENDING) { + FIXME("HttpEndRequest failed: %u\n", GetLastError()); + return E_FAIL; + } + + return S_OK; +} + static HRESULT HttpProtocol_start_downloading(Protocol *prot) { HttpProtocol *This = ASYNCPROTOCOL_THIS(prot); @@ -332,6 +366,7 @@ static void HttpProtocol_close_connection(Protocol *prot) static const ProtocolVtbl AsyncProtocolVtbl = { HttpProtocol_open_request, + HttpProtocol_end_request, HttpProtocol_start_downloading, HttpProtocol_close_connection }; diff --git a/dlls/urlmon/protocol.c b/dlls/urlmon/protocol.c index 85af513..669343b 100644 --- a/dlls/urlmon/protocol.c +++ b/dlls/urlmon/protocol.c @@ -104,6 +104,8 @@ static void request_complete(Protocol *protocol, INTERNET_ASYNC_RESULT *ar) { PROTOCOLDATA data; + TRACE("(%p)->(%p)\n", protocol, ar); + if(!ar->dwResult) { WARN("request failed: %d\n", ar->dwError); return; @@ -191,6 +193,42 @@ static void WINAPI internet_status_callback(HINTERNET internet, DWORD_PTR contex } } +static HRESULT write_post_stream(Protocol *protocol) +{ + BYTE buf[0x20000]; + DWORD written; + ULONG size; + BOOL res; + HRESULT hres; + + protocol->flags &= ~FLAG_REQUEST_COMPLETE; + + while(1) { + size = 0; + hres = IStream_Read(protocol->post_stream, buf, sizeof(buf), &size); + if(FAILED(hres) || !size) + break; + res = InternetWriteFile(protocol->request, buf, size, &written); + if(!res) { + FIXME("InternetWriteFile failed: %u\n", GetLastError()); + hres = E_FAIL; + break; + } + } + + if(SUCCEEDED(hres)) { + IStream_Release(protocol->post_stream); + protocol->post_stream = NULL; + + hres = protocol->vtbl->end_request(protocol); + } + + if(FAILED(hres)) + return report_result(protocol, hres); + + return S_OK; +} + static HINTERNET create_internet_session(IInternetBindInfo *bind_info) { LPWSTR global_user_agent = NULL; @@ -293,6 +331,9 @@ HRESULT protocol_continue(Protocol *protocol, PROTOCOLDATA *data) return S_OK; } + if(protocol->post_stream) + return write_post_stream(protocol); + if(data->pData == (LPVOID)BINDSTATUS_DOWNLOADINGDATA) { hres = protocol->vtbl->start_downloading(protocol); if(FAILED(hres)) { @@ -450,5 +491,10 @@ void protocol_close_connection(Protocol *protocol) if(protocol->connection) InternetCloseHandle(protocol->connection); + if(protocol->post_stream) { + IStream_Release(protocol->post_stream); + protocol->post_stream = NULL; + } + protocol->flags = 0; } diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 7391982..215a868 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -103,11 +103,14 @@ typedef struct { ULONG content_length; ULONG available_bytes; + IStream *post_stream; + LONG priority; } Protocol; struct ProtocolVtbl { HRESULT (*open_request)(Protocol*,IUri*,DWORD,HINTERNET,IInternetBindInfo*); + HRESULT (*end_request)(Protocol*); HRESULT (*start_downloading)(Protocol*); void (*close_connection)(Protocol*); };

1 0

Jacek Caban : urlmon: Added IBinding::Abort implementation.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: 1db24bedfc3bfc9df6e3bfb35595e077de534af4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1db24bedfc3bfc9df6e3bfb35… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 21:35:53 2010 +0200 urlmon: Added IBinding::Abort implementation. --- dlls/urlmon/binding.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 49e9ac1..8bfaf76 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -882,8 +882,19 @@ static ULONG WINAPI Binding_Release(IBinding *iface) static HRESULT WINAPI Binding_Abort(IBinding *iface) { Binding *This = BINDING_THIS(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + HRESULT hres; + + TRACE("(%p)\n", This); + + if(This->state & BINDING_ABORTED) + return E_FAIL; + + hres = IInternetProtocol_Abort(This->protocol, E_ABORT, ERROR_SUCCESS); + if(FAILED(hres)) + return hres; + + This->state |= BINDING_ABORTED; + return S_OK; } static HRESULT WINAPI Binding_Suspend(IBinding *iface) @@ -1053,7 +1064,7 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres TRACE("(%p)->(%d %u %u)\n", This, bscf, progress, progress_max); - if(This->download_state == END_DOWNLOAD || (This->state & BINDING_STOPPED)) + if(This->download_state == END_DOWNLOAD || (This->state & (BINDING_STOPPED|BINDING_ABORTED))) return; if(This->stgmed_buf->file != INVALID_HANDLE_VALUE) @@ -1081,6 +1092,9 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres BINDSTATUS_DOWNLOADINGDATA, This->url); } + if(This->state & (BINDING_STOPPED|BINDING_ABORTED)) + return; + if(This->to_object) { if(!(This->state & BINDING_OBJAVAIL)) { IBinding_AddRef(BINDING(This));

1 0

Jacek Caban : urlmon: Added IBinding:: Abort and binding without callback tests.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: d563d5b35c5e052789b17232544548e674656d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d563d5b35c5e052789b172325… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 21:36:32 2010 +0200 urlmon: Added IBinding::Abort and binding without callback tests. --- dlls/urlmon/tests/url.c | 519 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 359 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d563d5b35c5e052789b17…

1 0

Jacek Caban : urlmon: Use default binding callback if no callback is provided.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: a3aa115ac3bbbc3c1d2156448d5e11057cbb25dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3aa115ac3bbbc3c1d2156448… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 21:36:18 2010 +0200 urlmon: Use default binding callback if no callback is provided. --- dlls/urlmon/bindctx.c | 2 +- dlls/urlmon/binding.c | 10 +++++----- dlls/urlmon/download.c | 42 +++++++++++++++++++++++++++++++----------- dlls/urlmon/urlmon_main.h | 2 ++ 4 files changed, 39 insertions(+), 17 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 67391a4..b08eb80 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -477,7 +477,7 @@ static void set_callback(BindStatusCallback *This, IBindStatusCallback *bsc) This->serv_prov = hres == S_OK ? serv_prov : NULL; } -static HRESULT wrap_callback(IBindStatusCallback *bsc, IBindStatusCallback **ret_iface) +HRESULT wrap_callback(IBindStatusCallback *bsc, IBindStatusCallback **ret_iface) { BindStatusCallback *ret; diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 8bfaf76..b7f742d 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1369,12 +1369,12 @@ static HRESULT get_callback(IBindCtx *pbc, IBindStatusCallback **callback) HRESULT hres; hres = IBindCtx_GetObjectParam(pbc, bscb_holderW, &unk); - if(SUCCEEDED(hres)) { - hres = IUnknown_QueryInterface(unk, &IID_IBindStatusCallback, (void**)callback); - IUnknown_Release(unk); - } + if(FAILED(hres)) + return create_default_callback(callback); - return SUCCEEDED(hres) ? S_OK : INET_E_DATA_NOT_AVAILABLE; + hres = IUnknown_QueryInterface(unk, &IID_IBindStatusCallback, (void**)callback); + IUnknown_Release(unk); + return hres; } static BOOL is_urlmon_protocol(LPCWSTR url) diff --git a/dlls/urlmon/download.c b/dlls/urlmon/download.c index fee9606..cc49849 100644 --- a/dlls/urlmon/download.c +++ b/dlls/urlmon/download.c @@ -171,14 +171,16 @@ static HRESULT WINAPI DownloadBSC_OnStopBinding(IBindStatusCallback *iface, TRACE("(%p)->(%08x %s)\n", This, hresult, debugstr_w(szError)); - if(This->cache_file) { - BOOL b; - - b = CopyFileW(This->cache_file, This->file_name, FALSE); - if(!b) - FIXME("CopyFile failed: %u\n", GetLastError()); - }else { - FIXME("No cache file\n"); + if(This->file_name) { + if(This->cache_file) { + BOOL b; + + b = CopyFileW(This->cache_file, This->file_name, FALSE); + if(!b) + FIXME("CopyFile failed: %u\n", GetLastError()); + }else { + FIXME("No cache file\n"); + } } if(This->callback) @@ -301,7 +303,7 @@ static const IServiceProviderVtbl ServiceProviderVtbl = { DwlServiceProvider_QueryService }; -static IBindStatusCallback *DownloadBSC_Create(IBindStatusCallback *callback, LPCWSTR file_name) +static HRESULT DownloadBSC_Create(IBindStatusCallback *callback, LPCWSTR file_name, IBindStatusCallback **ret_callback) { DownloadBSC *ret = heap_alloc(sizeof(*ret)); @@ -315,7 +317,22 @@ static IBindStatusCallback *DownloadBSC_Create(IBindStatusCallback *callback, LP IBindStatusCallback_AddRef(callback); ret->callback = callback; - return STATUSCLB(ret); + *ret_callback = STATUSCLB(ret); + return S_OK; +} + +HRESULT create_default_callback(IBindStatusCallback **ret) +{ + IBindStatusCallback *callback; + HRESULT hres; + + hres = DownloadBSC_Create(NULL, NULL, &callback); + if(FAILED(hres)) + return hres; + + hres = wrap_callback(callback, ret); + IBindStatusCallback_Release(callback); + return hres; } /*********************************************************************** @@ -348,7 +365,10 @@ HRESULT WINAPI URLDownloadToFileW(LPUNKNOWN pCaller, LPCWSTR szURL, LPCWSTR szFi if(pCaller) FIXME("pCaller not supported\n"); - callback = DownloadBSC_Create(lpfnCB, szFileName); + hres = DownloadBSC_Create(lpfnCB, szFileName, &callback); + if(FAILED(hres)) + return hres; + hres = CreateAsyncBindCtx(0, callback, NULL, &bindctx); IBindStatusCallback_Release(callback); if(FAILED(hres)) diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index 62e461d..7391982 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -80,6 +80,8 @@ HRESULT bind_to_object(IMoniker *mon, LPCWSTR url, IBindCtx *pbc, REFIID riid, v HRESULT create_binding_protocol(LPCWSTR url, BOOL from_urlmon, IInternetProtocol **protocol); void set_binding_sink(IInternetProtocol *bind_protocol, IInternetProtocolSink *sink, IInternetBindInfo *bind_info); IWinInetInfo *get_wininet_info(IInternetProtocol*); +HRESULT create_default_callback(IBindStatusCallback**); +HRESULT wrap_callback(IBindStatusCallback*,IBindStatusCallback**); typedef struct ProtocolVtbl ProtocolVtbl;

1 0

Jacek Caban : mshtml: Report better status in on_stop_nsrequest.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: 6fff7e7c05c124955db69722c13731a9e3d537c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fff7e7c05c124955db69722c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 21:35:22 2010 +0200 mshtml: Report better status in on_stop_nsrequest. --- dlls/mshtml/mshtml_private.h | 9 ++++++++- dlls/mshtml/navigate.c | 18 ++++++++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e4e074a..6888f00 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -34,6 +34,9 @@ #include "nsiface.h" +#define NS_ERROR_GENERATE_FAILURE(module,code) \ + ((nsresult) (((PRUint32)(1<<31)) | ((PRUint32)(module+0x45)<<16) | ((PRUint32)(code)))) + #define NS_OK ((nsresult)0x00000000L) #define NS_ERROR_FAILURE ((nsresult)0x80004005L) #define NS_ERROR_OUT_OF_MEMORY ((nsresult)0x8007000EL) @@ -42,7 +45,11 @@ #define NS_ERROR_NOT_AVAILABLE ((nsresult)0x80040111L) #define NS_ERROR_INVALID_ARG ((nsresult)0x80070057L) #define NS_ERROR_UNEXPECTED ((nsresult)0x8000ffffL) -#define NS_ERROR_UNKNOWN_PROTOCOL ((nsresult)0x804b0012L) + +#define NS_ERROR_MODULE_NETWORK 6 + +#define NS_BINDING_ABORTED NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 2) +#define NS_ERROR_UNKNOWN_PROTOCOL NS_ERROR_GENERATE_FAILURE(NS_ERROR_MODULE_NETWORK, 18) #define NS_FAILED(res) ((res) & 0x80000000) #define NS_SUCCEEDED(res) (!NS_FAILED(res)) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 2ddadae..fc13a3e 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -992,7 +992,18 @@ static HRESULT on_start_nsrequest(nsChannelBSC *This) static void on_stop_nsrequest(nsChannelBSC *This, HRESULT result) { - nsresult nsres; + nsresult nsres, request_result; + + switch(result) { + case S_OK: + request_result = NS_OK; + break; + case E_ABORT: + request_result = NS_BINDING_ABORTED; + break; + default: + request_result = NS_ERROR_FAILURE; + } if(!This->bsc.readed && SUCCEEDED(result)) { TRACE("No data read! Calling OnStartRequest\n"); @@ -1001,15 +1012,14 @@ static void on_stop_nsrequest(nsChannelBSC *This, HRESULT result) if(This->nslistener) { nsres = nsIStreamListener_OnStopRequest(This->nslistener, - (nsIRequest*)NSCHANNEL(This->nschannel), - This->nscontext, SUCCEEDED(result) ? NS_OK : NS_ERROR_FAILURE); + (nsIRequest*)NSCHANNEL(This->nschannel), This->nscontext, request_result); if(NS_FAILED(nsres)) WARN("OnStopRequet failed: %08x\n", nsres); } if(This->nschannel->load_group) { nsres = nsILoadGroup_RemoveRequest(This->nschannel->load_group, - (nsIRequest*)NSCHANNEL(This->nschannel), NULL, NS_OK); + (nsIRequest*)NSCHANNEL(This->nschannel), NULL, request_result); if(NS_FAILED(nsres)) ERR("RemoveRequest failed: %08x\n", nsres); }

1 0

Jacek Caban : mshtml: Moved more code to handle_docobj_load.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: f7910c930400c4f9bcb99ed9914cb2438c5afd4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7910c930400c4f9bcb99ed99… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 21:35:39 2010 +0200 mshtml: Moved more code to handle_docobj_load. --- dlls/mshtml/nsevents.c | 66 ++++++++++++++++++++++++----------------------- 1 files changed, 34 insertions(+), 32 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 8dda1e5..85d6e56 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -178,65 +178,67 @@ static nsresult NSAPI handle_keypress(nsIDOMEventListener *iface, static void handle_docobj_load(HTMLDocumentObj *doc) { - IOleCommandTarget *olecmd = NULL; HRESULT hres; - if(!doc->client) - return; + if(doc->nscontainer->editor_controller) { + nsIController_Release(doc->nscontainer->editor_controller); + doc->nscontainer->editor_controller = NULL; + } - hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&olecmd); - if(SUCCEEDED(hres)) { - if(doc->download_state) { - VARIANT state, progress; + if(doc->usermode == EDITMODE) + handle_edit_load(&doc->basedoc); - V_VT(&progress) = VT_I4; - V_I4(&progress) = 0; - IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETPROGRESSPOS, - OLECMDEXECOPT_DONTPROMPTUSER, &progress, NULL); + if(doc->client) { + IOleCommandTarget *olecmd = NULL; - V_VT(&state) = VT_I4; - V_I4(&state) = 0; - IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETDOWNLOADSTATE, - OLECMDEXECOPT_DONTPROMPTUSER, &state, NULL); - } + hres = IOleClientSite_QueryInterface(doc->client, &IID_IOleCommandTarget, (void**)&olecmd); + if(SUCCEEDED(hres)) { + if(doc->download_state) { + VARIANT state, progress; + + V_VT(&progress) = VT_I4; + V_I4(&progress) = 0; + IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETPROGRESSPOS, + OLECMDEXECOPT_DONTPROMPTUSER, &progress, NULL); - IOleCommandTarget_Exec(olecmd, &CGID_ShellDocView, 103, 0, NULL, NULL); - IOleCommandTarget_Exec(olecmd, &CGID_MSHTML, IDM_PARSECOMPLETE, 0, NULL, NULL); - IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_HTTPEQUIV_DONE, 0, NULL, NULL); + V_VT(&state) = VT_I4; + V_I4(&state) = 0; + IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_SETDOWNLOADSTATE, + OLECMDEXECOPT_DONTPROMPTUSER, &state, NULL); + } - IOleCommandTarget_Release(olecmd); + IOleCommandTarget_Exec(olecmd, &CGID_ShellDocView, 103, 0, NULL, NULL); + IOleCommandTarget_Exec(olecmd, &CGID_MSHTML, IDM_PARSECOMPLETE, 0, NULL, NULL); + IOleCommandTarget_Exec(olecmd, NULL, OLECMDID_HTTPEQUIV_DONE, 0, NULL, NULL); + + IOleCommandTarget_Release(olecmd); + } } + doc->download_state = 0; } static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event) { HTMLDocumentNode *doc = NSEVENTLIST_THIS(iface)->This->doc; - HTMLDocumentObj *doc_obj; nsIDOMHTMLElement *nsbody = NULL; + HTMLDocumentObj *doc_obj = NULL; TRACE("(%p)\n", doc); if(!doc || !doc->basedoc.window) return NS_ERROR_FAILURE; - doc_obj = doc->basedoc.doc_obj; + if(doc->basedoc.doc_obj && doc->basedoc.doc_obj->basedoc.doc_node == doc) + doc_obj = doc->basedoc.doc_obj; connect_scripts(doc->basedoc.window); - if(doc_obj->nscontainer->editor_controller) { - nsIController_Release(doc_obj->nscontainer->editor_controller); - doc_obj->nscontainer->editor_controller = NULL; - } - - if(doc_obj->usermode == EDITMODE) - handle_edit_load(&doc_obj->basedoc); - - if(doc == doc_obj->basedoc.doc_node) + if(doc_obj) handle_docobj_load(doc_obj); set_ready_state(doc->basedoc.window, READYSTATE_COMPLETE); - if(doc == doc_obj->basedoc.doc_node) { + if(doc_obj) { if(doc_obj->view_sink) IAdviseSink_OnViewChange(doc_obj->view_sink, DVASPECT_CONTENT, -1);

1 0

Jacek Caban : urlmon: Use existing callback holder in RegisterBindStatusCallback if already exists .
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: 428c1bbac6d9da0d5b09b3b13db0c07a34a63fb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=428c1bbac6d9da0d5b09b3b13… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 6 21:36:03 2010 +0200 urlmon: Use existing callback holder in RegisterBindStatusCallback if already exists. --- dlls/urlmon/bindctx.c | 54 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 40 insertions(+), 14 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 0b3efa6..67391a4 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -460,9 +460,30 @@ static const IAuthenticateVtbl BSCAuthenticateVtbl = { BSCAuthenticate_Authenticate }; -static IBindStatusCallback *create_bsc(IBindStatusCallback *bsc) +static void set_callback(BindStatusCallback *This, IBindStatusCallback *bsc) { - BindStatusCallback *ret = heap_alloc_zero(sizeof(BindStatusCallback)); + IServiceProvider *serv_prov; + HRESULT hres; + + if(This->callback) + IBindStatusCallback_Release(This->callback); + if(This->serv_prov) + IServiceProvider_Release(This->serv_prov); + + IBindStatusCallback_AddRef(bsc); + This->callback = bsc; + + hres = IBindStatusCallback_QueryInterface(bsc, &IID_IServiceProvider, (void**)&serv_prov); + This->serv_prov = hres == S_OK ? serv_prov : NULL; +} + +static HRESULT wrap_callback(IBindStatusCallback *bsc, IBindStatusCallback **ret_iface) +{ + BindStatusCallback *ret; + + ret = heap_alloc_zero(sizeof(BindStatusCallback)); + if(!ret) + return E_OUTOFMEMORY; ret->lpBindStatusCallbackExVtbl = &BindStatusCallbackExVtbl; ret->lpServiceProviderVtbl = &BSCServiceProviderVtbl; @@ -470,13 +491,10 @@ static IBindStatusCallback *create_bsc(IBindStatusCallback *bsc) ret->lpAuthenticateVtbl = &BSCAuthenticateVtbl; ret->ref = 1; + set_callback(ret, bsc); - IBindStatusCallback_AddRef(bsc); - ret->callback = bsc; - - IBindStatusCallback_QueryInterface(bsc, &IID_IServiceProvider, (void**)&ret->serv_prov); - - return STATUSCLB(ret); + *ret_iface = STATUSCLB(ret); + return S_OK; } /*********************************************************************** @@ -511,25 +529,33 @@ HRESULT WINAPI RegisterBindStatusCallback(IBindCtx *pbc, IBindStatusCallback *pb hres = IBindCtx_GetObjectParam(pbc, BSCBHolder, &unk); if(SUCCEEDED(hres)) { hres = IUnknown_QueryInterface(unk, &IID_IBindStatusCallback, (void**)&bsc); + IUnknown_Release(unk); if(SUCCEEDED(hres)) { hres = IBindStatusCallback_QueryInterface(bsc, &IID_IBindStatusCallbackHolder, (void**)&holder); if(SUCCEEDED(hres)) { - prev = holder->callback; - IBindStatusCallback_AddRef(prev); + if(ppbscPrevious) { + IBindStatusCallback_AddRef(holder->callback); + *ppbscPrevious = holder->callback; + } + + set_callback(holder, pbsc); + IBindStatusCallback_Release(bsc); IBindStatusCallback_Release(STATUSCLB(holder)); + return S_OK; }else { prev = bsc; } } - IUnknown_Release(unk); IBindCtx_RevokeObjectParam(pbc, BSCBHolder); } - bsc = create_bsc(pbsc); - hres = IBindCtx_RegisterObjectParam(pbc, BSCBHolder, (IUnknown*)bsc); - IBindStatusCallback_Release(bsc); + hres = wrap_callback(pbsc, &bsc); + if(SUCCEEDED(hres)) { + hres = IBindCtx_RegisterObjectParam(pbc, BSCBHolder, (IUnknown*)bsc); + IBindStatusCallback_Release(bsc); + } if(FAILED(hres)) { if(prev) IBindStatusCallback_Release(prev);

1 0

Juan Lang : cryptui: Don' t crash displaying a certificate hierarchy when the certificate' s signer isn't found.
by Alexandre Julliard Oct. 7, 2010

Oct. 7, 2010

Module: wine Branch: master Commit: d48a56db5cc99358fd181eb14083a4189370150c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d48a56db5cc99358fd181eb14… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 6 11:39:58 2010 -0700 cryptui: Don't crash displaying a certificate hierarchy when the certificate's signer isn't found. Spotted by André Hentschel. --- dlls/cryptui/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 339ad61..3a8f8f8 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -4040,8 +4040,8 @@ static void show_cert_chain(HWND hwnd, struct hierarchy_data *data) tvis.u.item.pszText = name; tvis.u.item.state = TVIS_EXPANDED; tvis.u.item.stateMask = TVIS_EXPANDED; - if (i == 1 && - (provSigner->pChainContext->TrustStatus.dwErrorStatus & + if (i == 1 && (!provSigner->pChainContext || + provSigner->pChainContext->TrustStatus.dwErrorStatus & CERT_TRUST_IS_PARTIAL_CHAIN)) { /* The root of the chain has a special case: if the chain is

1 0

Cheer Xiao : uninstaller: Update simplified Chinese translation.
by Alexandre Julliard Oct. 6, 2010

Oct. 6, 2010

Module: wine Branch: stable Commit: cb80282c4aea656f12ddf2ee62bfa61dadbc324a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb80282c4aea656f12ddf2ee6… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Wed Sep 29 14:22:39 2010 +0800 uninstaller: Update simplified Chinese translation. (cherry picked from commit d6a306b9814737b46438fb030915351e0eb33313) --- programs/uninstaller/Zh.rc | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/uninstaller/Zh.rc b/programs/uninstaller/Zh.rc index 368814c..f8092a6 100644 --- a/programs/uninstaller/Zh.rc +++ b/programs/uninstaller/Zh.rc @@ -2,6 +2,7 @@ * Uninstaller (Simplified and Traditional Chinese Resource) * * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> + * Copyright 2010 Cheer Xiao <xiaqqaix.at.gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -25,9 +26,9 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED -STRINGTABLE DISCARDABLE { - IDS_APPNAME, "Wine 应有程序卸载管理器" - IDS_UNINSTALLFAILED, "卸载命令运行失败 '%s', 可能是找不到可运行程序.\r\n你想把这项卸载命令从注册表中删除吗?" +STRINGTABLE { + IDS_APPNAME, "Wine 应用程序卸载管理器" + IDS_UNINSTALLFAILED, "卸载命令 '%s' 运行失败，可能是找不到可执行程序。\r\n你想把这项卸载命令从注册表中删除吗？" } LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL

1 0

Cheer Xiao : winemine: Update simplified Chinese translation.
by Alexandre Julliard Oct. 6, 2010

Oct. 6, 2010

Module: wine Branch: stable Commit: 91fc3bc857829ec8d2246af30299983c7dcbeeb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91fc3bc857829ec8d2246af30… Author: Cheer Xiao <xiaqqaix(a)gmail.com> Date: Wed Sep 29 14:24:24 2010 +0800 winemine: Update simplified Chinese translation. (cherry picked from commit 91b4a24a6653f72585151599d9b25ee851e62ee2) --- programs/winemine/Zh.rc | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/winemine/Zh.rc b/programs/winemine/Zh.rc index e28a204..146b899 100644 --- a/programs/winemine/Zh.rc +++ b/programs/winemine/Zh.rc @@ -2,6 +2,7 @@ * WineMine (Simplified and Traditional Chinese Resource) * * Copyright 2008 Hongbo Ni <hongbo.at.njstar.com> + * Copyright 2010 Cheer Xiao <xiaqqaix.at.gmail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -36,7 +37,7 @@ MENU_WINEMINE MENU DISCARDABLE POPUP "选项(&O)" { MENUITEM "新游戏(&N)\tF2", IDM_NEW MENUITEM SEPARATOR - MENUITEM "标出问题(&M)", IDM_MARKQ + MENUITEM "允许问号标记(&M)", IDM_MARKQ MENUITEM SEPARATOR MENUITEM "初学者(&B)", IDM_BEGINNER MENUITEM "高级(&A)", IDM_ADVANCED @@ -72,7 +73,7 @@ CAPTION "最快时间" DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 STYLE DS_MODALFRAME | DS_3DLOOK | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP -CAPTION "祝贺!" +CAPTION "祝贺！" { LTEXT "请输入你的名字", -1, 10, 10, 150, 10 EDITTEXT IDC_EDITNAME, 25, 20, 110, 12

1 0