July 2011 - Wine-Commits - list.winehq.org

Hans Leidekker : winhttp: Implement IWinHttpRequest::SetCredentials.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: b218ed1a690a3553c9fc64b4ab2a7076371744a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b218ed1a690a3553c9fc64b4a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sat Jul 23 18:15:23 2011 +0200 winhttp: Implement IWinHttpRequest::SetCredentials. --- dlls/winhttp/request.c | 24 ++++++++++++++++++++++-- dlls/winhttp/tests/winhttp.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 65e0aa7..d170573 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2361,8 +2361,28 @@ static HRESULT WINAPI winhttp_request_SetCredentials( BSTR password, HTTPREQUEST_SETCREDENTIALS_FLAGS flags ) { - FIXME("\n"); - return E_NOTIMPL; + struct winhttp_request *request = impl_from_IWinHttpRequest( iface ); + DWORD target, scheme = WINHTTP_AUTH_SCHEME_BASIC; /* FIXME: query supported schemes */ + + TRACE("%p, %s, %p\n", request, debugstr_w(username), password); + + if (request->state < REQUEST_STATE_OPEN) + { + return HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ); + } + switch (flags) + { + case HTTPREQUEST_SETCREDENTIALS_FOR_SERVER: + target = WINHTTP_AUTH_TARGET_SERVER; + break; + case HTTPREQUEST_SETCREDENTIALS_FOR_PROXY: + target = WINHTTP_AUTH_TARGET_PROXY; + break; + default: + return E_INVALIDARG; + } + if (WinHttpSetCredentials( request->hrequest, target, scheme, username, password, NULL )) return S_OK; + return HRESULT_FROM_WIN32( GetLastError() ); } static HRESULT WINAPI winhttp_request_Open( diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 1227902..acffece 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -2100,13 +2100,15 @@ static void test_credentials(void) static void test_IWinHttpRequest(void) { + static const WCHAR usernameW[] = {'u','s','e','r','n','a','m','e',0}; + 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 method1W[] = {'G','E','T',0}; static const WCHAR method2W[] = {'I','N','V','A','L','I','D',0}; HRESULT hr; IWinHttpRequest *req; - BSTR method, url, response = NULL, status_text = NULL; + BSTR method, url, username, password, response = NULL, status_text = NULL; VARIANT async, empty, timeout, body; VARIANT_BOOL succeeded; LONG status; @@ -2189,6 +2191,9 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_SetTimeouts( req, 10000, 10000, 10000, 10000 ); ok( hr == S_OK, "got %08x\n", hr ); + hr = IWinHttpRequest_SetCredentials( req, NULL, NULL, 0xdeadbeef ); + ok( hr == HRESULT_FROM_WIN32( ERROR_WINHTTP_CANNOT_CALL_BEFORE_OPEN ), "got %08x\n", hr ); + SysFreeString( method ); method = SysAllocString( method1W ); SysFreeString( url ); @@ -2205,6 +2210,20 @@ static void test_IWinHttpRequest(void) hr = IWinHttpRequest_SetTimeouts( req, 10000, 10000, 10000, 10000 ); ok( hr == S_OK, "got %08x\n", hr ); + hr = IWinHttpRequest_SetCredentials( req, NULL, NULL, 0xdeadbeef ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + username = SysAllocString( usernameW ); + hr = IWinHttpRequest_SetCredentials( req, username, NULL, 0xdeadbeef ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + password = SysAllocString( passwordW ); + hr = IWinHttpRequest_SetCredentials( req, username, password, 0xdeadbeef ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = IWinHttpRequest_SetCredentials( req, username, password, HTTPREQUEST_SETCREDENTIALS_FOR_SERVER ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IWinHttpRequest_Send( req, empty ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2221,6 +2240,9 @@ static void test_IWinHttpRequest(void) trace("%s\n", wine_dbgstr_w(status_text)); SysFreeString( status_text ); + hr = IWinHttpRequest_SetCredentials( req, username, password, HTTPREQUEST_SETCREDENTIALS_FOR_SERVER ); + ok( hr == S_OK, "got %08x\n", hr ); + VariantInit( &timeout ); V_VT( &timeout ) = VT_I4; V_I4( &timeout ) = 10; @@ -2234,6 +2256,9 @@ static void test_IWinHttpRequest(void) ok( hr == S_OK, "got %08x\n", hr ); SysFreeString( status_text ); + hr = IWinHttpRequest_SetCredentials( req, username, password, HTTPREQUEST_SETCREDENTIALS_FOR_SERVER ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = IWinHttpRequest_Send( req, empty ); ok( hr == S_OK, "got %08x\n", hr ); @@ -2264,6 +2289,8 @@ static void test_IWinHttpRequest(void) SysFreeString( method ); SysFreeString( url ); + SysFreeString( username ); + SysFreeString( password ); CoUninitialize(); }

1 0

Hans Leidekker : winhttp: Use an offset instead of a pointer for the write position.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: 73646d352901f8eea2d819485cda0cb139d8c678 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73646d352901f8eea2d819485… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Sat Jul 23 18:14:52 2011 +0200 winhttp: Use an offset instead of a pointer for the write position. --- dlls/winhttp/request.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 5d10410..b639f6c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -2157,7 +2157,7 @@ struct winhttp_request HANDLE wait; HANDLE cancel; char *buffer; - char *ptr; + DWORD offset; DWORD bytes_available; DWORD bytes_read; LONG resolve_timeout; @@ -2624,7 +2624,6 @@ static DWORD request_read_body( struct winhttp_request *request, DWORD timeout ) if (!(request->buffer = heap_alloc( buflen ))) return E_OUTOFMEMORY; size = total_bytes_read = 0; - request->ptr = request->buffer; do { wait_set_status_callback( request, WINHTTP_CALLBACK_STATUS_DATA_AVAILABLE ); @@ -2648,14 +2647,15 @@ static DWORD request_read_body( struct winhttp_request *request, DWORD timeout ) request->buffer = tmp; } wait_set_status_callback( request, WINHTTP_CALLBACK_STATUS_READ_COMPLETE ); - if (!WinHttpReadData( request->hrequest, request->ptr, request->bytes_available, &request->bytes_read )) + if (!WinHttpReadData( request->hrequest, request->buffer + request->offset, + request->bytes_available, &request->bytes_read )) { err = GetLastError(); goto error; } wait_for_completion( request, timeout ); total_bytes_read += request->bytes_read; - request->ptr += request->bytes_read; + request->offset += request->bytes_read; } while (request->bytes_read); request->state = REQUEST_STATE_BODY_RECEIVED; @@ -2713,9 +2713,9 @@ static HRESULT WINAPI winhttp_request_get_ResponseText( if ((err = request_read_body( request, INFINITE ))) return HRESULT_FROM_WIN32( err ); if ((err = request_get_codepage( request, &codepage ))) return HRESULT_FROM_WIN32( err ); - len = MultiByteToWideChar( codepage, 0, request->buffer, request->ptr - request->buffer, NULL, 0 ); + len = MultiByteToWideChar( codepage, 0, request->buffer, request->offset, NULL, 0 ); if (!(*body = SysAllocStringLen( NULL, len ))) return E_OUTOFMEMORY; - MultiByteToWideChar( codepage, 0, request->buffer, request->ptr - request->buffer, *body, len ); + MultiByteToWideChar( codepage, 0, request->buffer, request->offset, *body, len ); (*body)[len] = 0; return S_OK; } @@ -2788,7 +2788,7 @@ static HRESULT WINAPI winhttp_request_Abort( request->wait = NULL; request->cancel = NULL; request->buffer = NULL; - request->ptr = NULL; + request->offset = 0; request->bytes_available = 0; request->bytes_read = 0; return S_OK;

1 0

Jacek Caban : mshtml: Added support for javascript: URLs.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: 5751441f39cbe1f20d885d879d86c30a556fd5c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5751441f39cbe1f20d885d879… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 23 12:52:17 2011 +0200 mshtml: Added support for javascript: URLs. --- dlls/mshtml/htmlwindow.c | 100 ++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 87 insertions(+), 13 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 06ae7ae..ba292ab 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -27,6 +27,9 @@ #include "mshtmdid.h" #include "shlguid.h" +#define NO_SHLWAPI_REG +#include "shlwapi.h" + #include "wine/debug.h" #include "mshtml_private.h" @@ -1666,6 +1669,52 @@ static ULONG WINAPI HTMLPrivateWindow_Release(IHTMLPrivateWindow *iface) return IHTMLWindow2_Release(&This->IHTMLWindow2_iface); } +static void handle_javascript(HTMLWindow *window, const WCHAR *code) +{ + VARIANT v; + HRESULT hres; + + static const WCHAR jscriptW[] = {'j','s','c','r','i','p','t',0}; + + set_download_state(window->doc_obj, 1); + + V_VT(&v) = VT_EMPTY; + hres = exec_script(window, code, jscriptW, &v); + if(SUCCEEDED(hres) && V_VT(&v) != VT_EMPTY) { + FIXME("javascirpt URL returned %s\n", debugstr_variant(&v)); + VariantClear(&v); + } + + if(window->doc_obj->view_sink) + IAdviseSink_OnViewChange(window->doc_obj->view_sink, DVASPECT_CONTENT, -1); + + set_download_state(window->doc_obj, 0); +} + +typedef struct { + task_t header; + HTMLWindow *window; + IUri *uri; +} navigate_javascript_task_t; + +static void navigate_javascript_proc(task_t *_task) +{ + navigate_javascript_task_t *task = (navigate_javascript_task_t*)_task; + BSTR code; + HRESULT hres; + + task->window->readystate = READYSTATE_COMPLETE; + + hres = IUri_GetPath(task->uri, &code); + if(SUCCEEDED(hres)) { + handle_javascript(task->window, code); + SysFreeString(code); + } + + IHTMLWindow2_Release(&task->window->IHTMLWindow2_iface); + IUri_Release(task->uri); +} + typedef struct { task_t header; HTMLWindow *window; @@ -1691,12 +1740,12 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, BSTR arg4, VARIANT *post_data_var, VARIANT *headers_var, ULONG flags) { HTMLWindow *This = impl_from_IHTMLPrivateWindow(iface); - navigate_task_t *task; DWORD post_data_size = 0; BYTE *post_data = NULL; WCHAR *headers = NULL; nsChannelBSC *bsc; IMoniker *mon; + DWORD scheme; BSTR new_url; IUri *uri; HRESULT hres; @@ -1740,7 +1789,6 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, return hres; hres = CreateURLMonikerEx2(NULL, uri, &mon, URL_MK_UNIFORM); - IUri_Release(uri); if(FAILED(hres)) return hres; @@ -1771,22 +1819,48 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, prepare_for_binding(&This->doc_obj->basedoc, mon, NULL, TRUE); + hres = IUri_GetScheme(uri, &scheme); + + if(scheme != URL_SCHEME_JAVASCRIPT) { + navigate_task_t *task; + + IUri_Release(uri); + + task = heap_alloc(sizeof(*task)); + if(!task) { + IUnknown_Release((IUnknown*)bsc); + IMoniker_Release(mon); + return E_OUTOFMEMORY; + } + + IHTMLWindow2_AddRef(&This->IHTMLWindow2_iface); + task->window = This; + task->bscallback = bsc; + task->mon = mon; + push_task(&task->header, navigate_proc, This->task_magic); + + /* Silently and repeated when real loading starts? */ + This->readystate = READYSTATE_LOADING; + }else { + navigate_javascript_task_t *task; - task = heap_alloc(sizeof(*task)); - if(!task) { IUnknown_Release((IUnknown*)bsc); IMoniker_Release(mon); - return E_OUTOFMEMORY; - } - IHTMLWindow2_AddRef(&This->IHTMLWindow2_iface); - task->window = This; - task->bscallback = bsc; - task->mon = mon; - push_task(&task->header, navigate_proc, This->task_magic); + task = heap_alloc(sizeof(*task)); + if(!task) { + IUri_Release(uri); + return E_OUTOFMEMORY; + } - /* Silently and repeated when real loading starts? */ - This->readystate = READYSTATE_LOADING; + IHTMLWindow2_AddRef(&This->IHTMLWindow2_iface); + task->window = This; + task->uri = uri; + push_task(&task->header, navigate_javascript_proc, This->task_magic); + + /* Why silently? */ + This->readystate = READYSTATE_COMPLETE; + } return S_OK; }

1 0

Jacek Caban : mshtml: Downgrade GetAsciiHost FIXME to WARN.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: bccd8997d116c0581dd977b7a743af88305ad902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bccd8997d116c0581dd977b7a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 23 12:51:19 2011 +0200 mshtml: Downgrade GetAsciiHost FIXME to WARN. --- dlls/mshtml/nsio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 7d26529..fdfa44f 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2174,7 +2174,7 @@ static nsresult NSAPI nsURI_GetAsciiHost(nsIURL *iface, nsACString *aAsciiHost) if(This->nsuri) return nsIURI_GetAsciiHost(This->nsuri, aAsciiHost); - FIXME("Use Uri_PUNYCODE_IDN_HOST flag\n"); + WARN("Use Uri_PUNYCODE_IDN_HOST flag\n"); return get_uri_string(This, Uri_PROPERTY_HOST, aAsciiHost); }

1 0

Jacek Caban : mshtml: Split set_moniker implementation.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: b14fc2c9d1b98e1f99ba41806852b1169309b232 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b14fc2c9d1b98e1f99ba41806… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 23 12:51:38 2011 +0200 mshtml: Split set_moniker implementation. --- dlls/mshtml/binding.h | 1 + dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/persist.c | 60 ++++++++++++++++++++++++--------------------- 3 files changed, 34 insertions(+), 28 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h index f3c4d3e..3e8b87c 100644 --- a/dlls/mshtml/binding.h +++ b/dlls/mshtml/binding.h @@ -106,6 +106,7 @@ HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsChannel*,DWORD,BOOL*) DECLS HRESULT create_doc_uri(HTMLWindow*,WCHAR*,nsWineURI**) DECLSPEC_HIDDEN; HRESULT load_nsuri(HTMLWindow*,nsWineURI*,nsChannelBSC*,DWORD) DECLSPEC_HIDDEN; HRESULT set_moniker(HTMLDocument*,IMoniker*,IBindCtx*,nsChannelBSC*,BOOL) DECLSPEC_HIDDEN; +void prepare_for_binding(HTMLDocument*,IMoniker*,IBindCtx*,BOOL) DECLSPEC_HIDDEN; HRESULT create_channelbsc(IMoniker*,WCHAR*,BYTE*,DWORD,nsChannelBSC**) DECLSPEC_HIDDEN; HRESULT channelbsc_load_stream(nsChannelBSC*,IStream*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 377825d..911e1f2 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1747,6 +1747,7 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, return hres; } + prepare_for_binding(&This->doc_obj->basedoc, mon, NULL, TRUE); hres = set_moniker(&This->doc_obj->basedoc, mon, NULL, bsc, TRUE); if(SUCCEEDED(hres)) hres = async_start_doc_binding(This, bsc); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 0907810..550414f 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -188,23 +188,10 @@ static void set_downloading_proc(task_t *_task) } } -HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannelBSC *async_bsc, BOOL set_download) +void prepare_for_binding(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BOOL navigated_binding) { - nsChannelBSC *bscallback; - docobj_task_t *task; - download_proc_task_t *download_task; - nsWineURI *nsuri; - LPOLESTR url; HRESULT hres; - hres = IMoniker_GetDisplayName(mon, pibc, NULL, &url); - if(FAILED(hres)) { - WARN("GetDiaplayName failed: %08x\n", hres); - return hres; - } - - TRACE("got url: %s\n", debugstr_w(url)); - if(This->doc_obj->client) { VARIANT silent, offline; @@ -233,8 +220,6 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel set_current_mon(This->window, mon); } - set_ready_state(This->window, READYSTATE_LOADING); - if(This->doc_obj->client) { IOleCommandTarget *cmdtrg = NULL; @@ -243,7 +228,7 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel if(SUCCEEDED(hres)) { VARIANT var, out; - if(!async_bsc) { + if(!navigated_binding) { V_VT(&var) = VT_I4; V_I4(&var) = 0; IOleCommandTarget_Exec(cmdtrg, &CGID_ShellDocView, 37, 0, &var, NULL); @@ -259,24 +244,39 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel IOleCommandTarget_Release(cmdtrg); } } +} - hres = create_doc_uri(This->window, url, &nsuri); +HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannelBSC *async_bsc, BOOL set_download) +{ + download_proc_task_t *download_task; + nsChannelBSC *bscallback; + nsWineURI *nsuri; + LPOLESTR url; + HRESULT hres; - if(SUCCEEDED(hres)) - { - if(async_bsc) { + hres = IMoniker_GetDisplayName(mon, pibc, NULL, &url); + if(FAILED(hres)) { + WARN("GetDiaplayName failed: %08x\n", hres); + return hres; + } + + TRACE("got url: %s\n", debugstr_w(url)); + + set_ready_state(This->window, READYSTATE_LOADING); + + hres = create_doc_uri(This->window, url, &nsuri); + if(SUCCEEDED(hres)) { + if(async_bsc) bscallback = async_bsc; - }else { + else hres = create_channelbsc(mon, NULL, NULL, 0, &bscallback); - } } - if(SUCCEEDED(hres)) - { + if(SUCCEEDED(hres)) { remove_target_tasks(This->task_magic); abort_document_bindings(This->doc_node); - hres = load_nsuri(This->window, nsuri, bscallback, LOAD_INITIAL_DOCUMENT_URI); + hres = load_nsuri(This->window, nsuri, bscallback, 0/*LOAD_INITIAL_DOCUMENT_URI*/); nsISupports_Release((nsISupports*)nsuri); /* FIXME */ if(SUCCEEDED(hres)) set_window_bscallback(This->window, bscallback); @@ -284,8 +284,7 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel IUnknown_Release((IUnknown*)bscallback); } - if(FAILED(hres)) - { + if(FAILED(hres)) { CoTaskMemFree(url); return hres; } @@ -293,6 +292,8 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel HTMLDocument_LockContainer(This->doc_obj, TRUE); if(This->doc_obj->frame) { + docobj_task_t *task; + task = heap_alloc(sizeof(docobj_task_t)); task->doc = This->doc_obj; push_task(&task->header, set_progress_proc, This->doc_obj->basedoc.task_magic); @@ -433,6 +434,7 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva } } + prepare_for_binding(This, pimkName, pibc, FALSE); hres = set_moniker(This, pimkName, pibc, NULL, TRUE); if(FAILED(hres)) return hres; @@ -703,6 +705,7 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, LPSTREAM return hres; } + prepare_for_binding(This, mon, NULL, FALSE); hres = set_moniker(This, mon, NULL, NULL, TRUE); IMoniker_Release(mon); if(FAILED(hres)) @@ -761,6 +764,7 @@ static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) return hres; } + prepare_for_binding(This, mon, NULL, FALSE); hres = set_moniker(This, mon, NULL, NULL, FALSE); IMoniker_Release(mon); if(FAILED(hres))

1 0

Francois Gouget : d3dx9_36: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: f87745d4976c3b897592e1fe251cff4b950b0100 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f87745d4976c3b897592e1fe2… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 23 13:42:39 2011 +0200 d3dx9_36: Fix compilation on systems that don't support nameless unions. --- dlls/d3dx9_36/effect.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 499682c..47baf39 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -18,8 +18,10 @@ #include "config.h" #include "wine/port.h" +#define NONAMELESSUNION #include "wine/debug.h" #include "wine/unicode.h" + #include "windef.h" #include "wingdi.h" #include "d3dx9_36_private.h" @@ -897,9 +899,9 @@ static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) for (k = 0; k < 4; ++k) { if ((i < param->rows) && (k < param->columns)) - matrix->m[i][k] = get_float(param->type, (float *)param->data + i * param->columns + k); + matrix->u.m[i][k] = get_float(param->type, (float *)param->data + i * param->columns + k); else - matrix->m[i][k] = 0.0f; + matrix->u.m[i][k] = 0.0f; } } }

1 0

Jacek Caban : mshtml: Call set_moniker asynchronously in SuperNavigate.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: 730299bae610581b4232953899ea308fd0521fb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=730299bae610581b423295389… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 23 12:51:57 2011 +0200 mshtml: Call set_moniker asynchronously in SuperNavigate. --- dlls/mshtml/htmlwindow.c | 46 +++++++++++++++++++++++++++++++++++++----- dlls/mshtml/tests/htmldoc.c | 2 +- 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 911e1f2..06ae7ae 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1666,10 +1666,32 @@ static ULONG WINAPI HTMLPrivateWindow_Release(IHTMLPrivateWindow *iface) return IHTMLWindow2_Release(&This->IHTMLWindow2_iface); } +typedef struct { + task_t header; + HTMLWindow *window; + nsChannelBSC *bscallback; + IMoniker *mon; +} navigate_task_t; + +static void navigate_proc(task_t *_task) +{ + navigate_task_t *task = (navigate_task_t*)_task; + HRESULT hres; + + hres = set_moniker(&task->window->doc_obj->basedoc, task->mon, NULL, task->bscallback, TRUE); + if(SUCCEEDED(hres)) + hres = start_binding(task->window, NULL, (BSCallback*)task->bscallback, NULL); + + IUnknown_Release((IUnknown*)task->bscallback); + IHTMLWindow2_Release(&task->window->IHTMLWindow2_iface); + IMoniker_Release(task->mon); +} + static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, BSTR url, BSTR arg2, BSTR arg3, BSTR arg4, VARIANT *post_data_var, VARIANT *headers_var, ULONG flags) { HTMLWindow *This = impl_from_IHTMLPrivateWindow(iface); + navigate_task_t *task; DWORD post_data_size = 0; BYTE *post_data = NULL; WCHAR *headers = NULL; @@ -1748,13 +1770,25 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, } prepare_for_binding(&This->doc_obj->basedoc, mon, NULL, TRUE); - hres = set_moniker(&This->doc_obj->basedoc, mon, NULL, bsc, TRUE); - if(SUCCEEDED(hres)) - hres = async_start_doc_binding(This, bsc); - IUnknown_Release((IUnknown*)bsc); - IMoniker_Release(mon); - return hres; + + task = heap_alloc(sizeof(*task)); + if(!task) { + IUnknown_Release((IUnknown*)bsc); + IMoniker_Release(mon); + return E_OUTOFMEMORY; + } + + IHTMLWindow2_AddRef(&This->IHTMLWindow2_iface); + task->window = This; + task->bscallback = bsc; + task->mon = mon; + push_task(&task->header, navigate_proc, This->task_magic); + + /* Silently and repeated when real loading starts? */ + This->readystate = READYSTATE_LOADING; + + return S_OK; } static HRESULT WINAPI HTMLPrivateWindow_GetPendingUrl(IHTMLPrivateWindow *iface, BSTR *url) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index f22bdbd..88d0e8d 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -4306,7 +4306,7 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace) SET_EXPECT(Invoke_OnReadyStateChange_Loading); test_download(DWL_VERBDONE); - todo_wine CHECK_CALLED(Invoke_OnReadyStateChange_Loading); + CHECK_CALLED(Invoke_OnReadyStateChange_Loading); hres = IHTMLPrivateWindow_GetAddressBarUrl(priv_window, &str2); ok(hres == S_OK, "GetAddressBarUrl failed: %08x\n", hres);

1 0

Jacek Caban : mshtml: Added javascript: URLs test.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: 39b02829ea8e83830809bfb30bd1cafa1e790138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39b02829ea8e83830809bfb30… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 23 12:52:42 2011 +0200 mshtml: Added javascript: URLs test. --- dlls/mshtml/tests/htmldoc.c | 165 ++++++++++++++++++++++++++++--------------- 1 files changed, 109 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39b02829ea8e83830809b…

1 0

Jacek Caban : mshtml: Moved script mode out of get_script_host to allow exec_script calls in Gecko script mode .
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: ddf46bbe9f86996a37a46e743cfe339b85ef79f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddf46bbe9f86996a37a46e743… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 23 12:51:06 2011 +0200 mshtml: Moved script mode out of get_script_host to allow exec_script calls in Gecko script mode. --- dlls/mshtml/script.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 01a849c..003413e 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -795,11 +795,6 @@ static ScriptHost *get_script_host(HTMLWindow *window, const GUID *guid) { ScriptHost *iter; - if(IsEqualGUID(&CLSID_JScript, guid) && window->scriptmode != SCRIPTMODE_ACTIVESCRIPT) { - TRACE("Ignoring JScript\n"); - return NULL; - } - LIST_FOR_EACH_ENTRY(iter, &window->script_hosts, ScriptHost, entry) { if(IsEqualGUID(guid, &iter->guid)) return iter; @@ -818,6 +813,11 @@ void doc_insert_script(HTMLWindow *window, nsIDOMHTMLScriptElement *nsscript) return; } + if(IsEqualGUID(&CLSID_JScript, &guid) && window->scriptmode != SCRIPTMODE_ACTIVESCRIPT) { + TRACE("Ignoring JScript\n"); + return; + } + script_host = get_script_host(window, &guid); if(!script_host) return; @@ -859,6 +859,11 @@ IDispatch *script_parse_event(HTMLWindow *window, LPCWSTR text) ptr = text; } + if(IsEqualGUID(&CLSID_JScript, &guid) && window->scriptmode != SCRIPTMODE_ACTIVESCRIPT) { + TRACE("Ignoring JScript\n"); + return NULL; + } + script_host = get_script_host(window, &guid); if(!script_host || !script_host->parse_proc) return NULL;

1 0

Jacek Caban : mshtml: Moved binding-related declarations to separate file.
by Alexandre Julliard July 25, 2011

July 25, 2011

Module: wine Branch: master Commit: 1e60c2f30046826e60c2e75e5a4b825fb53ac472 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e60c2f30046826e60c2e75e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 23 12:50:11 2011 +0200 mshtml: Moved binding-related declarations to separate file. --- dlls/mshtml/binding.h | 112 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmlwindow.c | 1 + dlls/mshtml/mshtml_private.h | 53 -------------------- dlls/mshtml/navigate.c | 44 ++--------------- dlls/mshtml/nsembed.c | 1 + dlls/mshtml/nsio.c | 1 + dlls/mshtml/persist.c | 1 + 7 files changed, 120 insertions(+), 93 deletions(-) diff --git a/dlls/mshtml/binding.h b/dlls/mshtml/binding.h new file mode 100644 index 0000000..f3c4d3e --- /dev/null +++ b/dlls/mshtml/binding.h @@ -0,0 +1,112 @@ +/* + * Copyright 2011 Jacek Caban for CodeWeavers + * + * 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 + */ + +typedef struct nsWineURI nsWineURI; + +/* Keep sync with request_method_strings in nsio.c */ +typedef enum { + METHOD_GET, + METHOD_PUT, + METHOD_POST +} REQUEST_METHOD; + +typedef struct { + nsIHttpChannel nsIHttpChannel_iface; + nsIUploadChannel nsIUploadChannel_iface; + nsIHttpChannelInternal nsIHttpChannelInternal_iface; + + LONG ref; + + nsWineURI *uri; + nsIInputStream *post_data_stream; + BOOL post_data_contains_headers; + nsILoadGroup *load_group; + nsIInterfaceRequestor *notif_callback; + nsISupports *owner; + nsLoadFlags load_flags; + nsIURI *original_uri; + nsIURI *referrer; + char *content_type; + char *charset; + PRUint32 response_status; + REQUEST_METHOD request_method; + struct list response_headers; + struct list request_headers; + UINT url_scheme; +} nsChannel; + +typedef struct BSCallbackVtbl BSCallbackVtbl; + +struct BSCallback { + IBindStatusCallback IBindStatusCallback_iface; + IServiceProvider IServiceProvider_iface; + IHttpNegotiate2 IHttpNegotiate2_iface; + IInternetBindInfo IInternetBindInfo_iface; + + const BSCallbackVtbl *vtbl; + + LONG ref; + + LPWSTR headers; + HGLOBAL post_data; + ULONG post_data_len; + ULONG readed; + DWORD bindf; + BOOL bindinfo_ready; + + IMoniker *mon; + IBinding *binding; + + HTMLDocumentNode *doc; + + struct list entry; +}; + +typedef struct nsProtocolStream nsProtocolStream; + +struct nsChannelBSC { + BSCallback bsc; + + HTMLWindow *window; + + nsChannel *nschannel; + nsIStreamListener *nslistener; + nsISupports *nscontext; + BOOL is_js; + + nsProtocolStream *nsstream; +}; + +typedef struct { + struct list entry; + WCHAR *header; + WCHAR *data; +} http_header_t; + +HRESULT set_http_header(struct list*,const WCHAR*,int,const WCHAR*,int) DECLSPEC_HIDDEN; +HRESULT create_redirect_nschannel(const WCHAR*,nsChannel*,nsChannel**) DECLSPEC_HIDDEN; + +nsresult on_start_uri_open(NSContainer*,nsIURI*,PRBool*) DECLSPEC_HIDDEN; +HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsChannel*,DWORD,BOOL*) DECLSPEC_HIDDEN; +HRESULT create_doc_uri(HTMLWindow*,WCHAR*,nsWineURI**) DECLSPEC_HIDDEN; +HRESULT load_nsuri(HTMLWindow*,nsWineURI*,nsChannelBSC*,DWORD) DECLSPEC_HIDDEN; +HRESULT set_moniker(HTMLDocument*,IMoniker*,IBindCtx*,nsChannelBSC*,BOOL) DECLSPEC_HIDDEN; + +HRESULT create_channelbsc(IMoniker*,WCHAR*,BYTE*,DWORD,nsChannelBSC**) DECLSPEC_HIDDEN; +HRESULT channelbsc_load_stream(nsChannelBSC*,IStream*) DECLSPEC_HIDDEN; +void channelbsc_set_channel(nsChannelBSC*,nsChannel*,nsIStreamListener*,nsISupports*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index e0d542b..89702b1 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -31,6 +31,7 @@ #include "mshtml_private.h" #include "htmlevent.h" +#include "binding.h" #include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7a5b24e..6344b0e 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -491,51 +491,6 @@ struct NSContainer { HWND hwnd; }; -typedef struct nsWineURI nsWineURI; - -nsresult on_start_uri_open(NSContainer*,nsIURI*,PRBool*) DECLSPEC_HIDDEN; - -/* Keep sync with request_method_strings in nsio.c */ -typedef enum { - METHOD_GET, - METHOD_PUT, - METHOD_POST -} REQUEST_METHOD; - -typedef struct { - nsIHttpChannel nsIHttpChannel_iface; - nsIUploadChannel nsIUploadChannel_iface; - nsIHttpChannelInternal nsIHttpChannelInternal_iface; - - LONG ref; - - nsWineURI *uri; - nsIInputStream *post_data_stream; - BOOL post_data_contains_headers; - nsILoadGroup *load_group; - nsIInterfaceRequestor *notif_callback; - nsISupports *owner; - nsLoadFlags load_flags; - nsIURI *original_uri; - nsIURI *referrer; - char *content_type; - char *charset; - PRUint32 response_status; - REQUEST_METHOD request_method; - struct list response_headers; - struct list request_headers; - UINT url_scheme; -} nsChannel; - -typedef struct { - struct list entry; - WCHAR *header; - WCHAR *data; -} http_header_t; - -HRESULT set_http_header(struct list*,const WCHAR*,int,const WCHAR*,int) DECLSPEC_HIDDEN; -HRESULT create_redirect_nschannel(const WCHAR*,nsChannel*,nsChannel**) DECLSPEC_HIDDEN; - typedef struct { HRESULT (*qi)(HTMLDOMNode*,REFIID,void**); void (*destructor)(HTMLDOMNode*); @@ -701,13 +656,9 @@ void release_nsio(void) DECLSPEC_HIDDEN; BOOL is_gecko_path(const char*) DECLSPEC_HIDDEN; HRESULT nsuri_to_url(LPCWSTR,BOOL,BSTR*) DECLSPEC_HIDDEN; -HRESULT create_doc_uri(HTMLWindow*,WCHAR*,nsWineURI**) DECLSPEC_HIDDEN; -HRESULT load_nsuri(HTMLWindow*,nsWineURI*,nsChannelBSC*,DWORD) DECLSPEC_HIDDEN; -HRESULT hlink_frame_navigate(HTMLDocument*,LPCWSTR,nsChannel*,DWORD,BOOL*) DECLSPEC_HIDDEN; HRESULT navigate_url(HTMLWindow*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; HRESULT set_frame_doc(HTMLFrameBase*,nsIDOMDocument*) DECLSPEC_HIDDEN; -HRESULT set_moniker(HTMLDocument*,IMoniker*,IBindCtx*,nsChannelBSC*,BOOL) DECLSPEC_HIDDEN; void call_property_onchanged(ConnectionPoint*,DISPID) DECLSPEC_HIDDEN; HRESULT call_set_active_object(IOleInPlaceUIWindow*,IOleInPlaceActiveObject*) DECLSPEC_HIDDEN; @@ -744,10 +695,6 @@ void abort_document_bindings(HTMLDocumentNode*) DECLSPEC_HIDDEN; HRESULT bind_mon_to_buffer(HTMLDocumentNode*,IMoniker*,void**,DWORD*) DECLSPEC_HIDDEN; -HRESULT create_channelbsc(IMoniker*,WCHAR*,BYTE*,DWORD,nsChannelBSC**) DECLSPEC_HIDDEN; -HRESULT channelbsc_load_stream(nsChannelBSC*,IStream*) DECLSPEC_HIDDEN; -void channelbsc_set_channel(nsChannelBSC*,nsChannel*,nsIStreamListener*,nsISupports*) DECLSPEC_HIDDEN; - void set_ready_state(HTMLWindow*,READYSTATE) DECLSPEC_HIDDEN; HRESULT HTMLSelectionObject_Create(HTMLDocumentNode*,nsISelection*,IHTMLSelectionObject**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 6d84d3f..7c38935 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -38,22 +38,23 @@ #include "wine/unicode.h" #include "mshtml_private.h" +#include "binding.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); #define CONTENT_LENGTH "Content-Length" #define UTF16_STR "utf-16" -typedef struct { +struct nsProtocolStream { nsIInputStream nsIInputStream_iface; LONG ref; char buf[1024]; DWORD buf_size; -} nsProtocolStream; +}; -typedef struct { +struct BSCallbackVtbl { void (*destroy)(BSCallback*); HRESULT (*init_bindinfo)(BSCallback*); HRESULT (*start_binding)(BSCallback*); @@ -62,31 +63,6 @@ typedef struct { HRESULT (*on_progress)(BSCallback*,ULONG,LPCWSTR); HRESULT (*on_response)(BSCallback*,DWORD,LPCWSTR); HRESULT (*beginning_transaction)(BSCallback*,WCHAR**); -} BSCallbackVtbl; - -struct BSCallback { - IBindStatusCallback IBindStatusCallback_iface; - IServiceProvider IServiceProvider_iface; - IHttpNegotiate2 IHttpNegotiate2_iface; - IInternetBindInfo IInternetBindInfo_iface; - - const BSCallbackVtbl *vtbl; - - LONG ref; - - LPWSTR headers; - HGLOBAL post_data; - ULONG post_data_len; - ULONG readed; - DWORD bindf; - BOOL bindinfo_ready; - - IMoniker *mon; - IBinding *binding; - - HTMLDocumentNode *doc; - - struct list entry; }; static inline nsProtocolStream *impl_from_nsIInputStream(nsIInputStream *iface) @@ -862,18 +838,6 @@ HRESULT bind_mon_to_buffer(HTMLDocumentNode *doc, IMoniker *mon, void **buf, DWO return hres; } -struct nsChannelBSC { - BSCallback bsc; - - HTMLWindow *window; - - nsChannel *nschannel; - nsIStreamListener *nslistener; - nsISupports *nscontext; - - nsProtocolStream *nsstream; -}; - static HRESULT read_post_data_stream(nsChannelBSC *This, nsChannel *nschannel) { PRUint32 data_len = 0, available = 0; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 2cac2b2..73817da 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -35,6 +35,7 @@ #include "mshtml_private.h" #include "htmlevent.h" +#include "binding.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); WINE_DECLARE_DEBUG_CHANNEL(gecko); diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index ca2b763..7d26529 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -36,6 +36,7 @@ #include "wine/unicode.h" #include "mshtml_private.h" +#include "binding.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 6915e3d..64e27ed 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -37,6 +37,7 @@ #include "mshtml_private.h" #include "htmlevent.h" +#include "binding.h" #include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml);

1 0