May 2012 - Wine-commits - list.winehq.org

Juan Lang : crypt32: Initialize key spec correctly.
by Alexandre Julliard 31 May '12

31 May '12

Module: wine Branch: master Commit: f86ab49be2a3f8ce778fb6ed5fa3e91e9ccfad75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f86ab49be2a3f8ce778fb6ed5… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed May 30 14:26:56 2012 -0700 crypt32: Initialize key spec correctly. --- dlls/crypt32/cert.c | 4 ++-- dlls/crypt32/tests/cert.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 2d6697c..478fff3 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -3139,7 +3139,7 @@ PCCERT_CONTEXT WINAPI CertCreateSelfSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HAN PCCERT_CONTEXT context = NULL; BOOL ret, releaseContext = FALSE; PCERT_PUBLIC_KEY_INFO pubKey = NULL; - DWORD pubKeySize = 0,dwKeySpec = AT_SIGNATURE; + DWORD pubKeySize = 0, dwKeySpec; TRACE("(%08lx, %p, %08x, %p, %p, %p, %p, %p)\n", hProv, pSubjectIssuerBlob, dwFlags, pKeyProvInfo, pSignatureAlgorithm, pStartTime, @@ -3151,6 +3151,7 @@ PCCERT_CONTEXT WINAPI CertCreateSelfSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HAN return NULL; } + dwKeySpec = pKeyProvInfo ? pKeyProvInfo->dwKeySpec : AT_SIGNATURE; if (!hProv) { if (!pKeyProvInfo) @@ -3181,7 +3182,6 @@ PCCERT_CONTEXT WINAPI CertCreateSelfSignCertificate(HCRYPTPROV_OR_NCRYPT_KEY_HAN if (!ret) return NULL; } - dwKeySpec = pKeyProvInfo->dwKeySpec; /* check if the key is here */ ret = CryptGetUserKey(hProv,dwKeySpec,&hKey); if(!ret) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index 5d95711..f31236a 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -2156,7 +2156,6 @@ static void testCreateSelfSignCert(void) SetLastError(0xdeadbeef); context = pCertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, NULL, NULL); - todo_wine ok(context == NULL, "expected failure\n"); if (context != NULL) CertFreeCertificateContext(context); @@ -2278,7 +2277,6 @@ static void testCreateSelfSignCert(void) SetLastError(0xdeadbeef); context = pCertCreateSelfSignCertificate(csp, &name, 0, &info, NULL, NULL, NULL, NULL); - todo_wine ok(context == NULL, "expected failure\n"); if (context != NULL) CertFreeCertificateContext(context);

1 0

Hans Leidekker : msi: Don't terminate the string in msi_id2stringA.
by Alexandre Julliard 31 May '12

31 May '12

Module: wine Branch: master Commit: c959e38625ee3c72310f91e995ffdad19b21e450 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c959e38625ee3c72310f91e99… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 31 10:05:14 2012 +0200 msi: Don't terminate the string in msi_id2stringA. This makes sure that the last string can be fully written when saving the string table. --- dlls/msi/string.c | 32 ++++++++------------------------ dlls/msi/tests/db.c | 2 +- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/dlls/msi/string.c b/dlls/msi/string.c index 4185c15..065c04a 100644 --- a/dlls/msi/string.c +++ b/dlls/msi/string.c @@ -357,14 +357,12 @@ const WCHAR *msi_string_lookup_id( const string_table *st, UINT id ) * [in/out] sz - number of bytes available in the buffer on input * number of bytes used on output * - * The size includes the terminating nul character. Short buffers - * will be filled, but not nul terminated. + * Returned string is not nul terminated. */ static UINT msi_id2stringA( const string_table *st, UINT id, LPSTR buffer, UINT *sz ) { - UINT len; + UINT len, lenW; const WCHAR *str; - int n; TRACE("Finding string %d of %d\n", id, st->maxcount); @@ -372,26 +370,14 @@ static UINT msi_id2stringA( const string_table *st, UINT id, LPSTR buffer, UINT if( !str ) return ERROR_FUNCTION_FAILED; - len = WideCharToMultiByte( st->codepage, 0, str, -1, NULL, 0, NULL, NULL ); - - if( !buffer ) + lenW = strlenW( str ); + len = WideCharToMultiByte( st->codepage, 0, str, lenW, NULL, 0, NULL, NULL ); + if( *sz < len ) { *sz = len; - return ERROR_SUCCESS; - } - - if( len > *sz ) - { - n = strlenW( str ) + 1; - while( n && (len > *sz) ) - len = WideCharToMultiByte( st->codepage, 0, - str, --n, NULL, 0, NULL, NULL ); + return ERROR_MORE_DATA; } - else - n = -1; - - *sz = WideCharToMultiByte( st->codepage, 0, str, n, buffer, len, NULL, NULL ); - + *sz = WideCharToMultiByte( st->codepage, 0, str, lenW, buffer, *sz, NULL, NULL ); return ERROR_SUCCESS; } @@ -588,7 +574,7 @@ UINT msi_save_string_table( const string_table *st, IStorage *storage, UINT *byt data = msi_alloc( datasize ); if( ! data ) { - WARN("Failed to alloc data %d bytes\n", poolsize ); + WARN("Failed to alloc data %d bytes\n", datasize ); goto err; } @@ -622,8 +608,6 @@ UINT msi_save_string_table( const string_table *st, IStorage *storage, UINT *byt ERR("failed to fetch string\n"); sz = 0; } - if( sz && (sz < (datasize - used ) ) ) - sz--; if (sz) pool[ n*2 + 1 ] = st->strings[i].persistent_refcount; diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 7a2fd7c..8b62c39 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -9345,7 +9345,7 @@ static void test_createtable(void) size = sizeof(buffer); res = MsiRecordGetString(hrec, 1, buffer, &size ); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); - todo_wine ok(!strcmp(buffer,"b"), "b != %s\n", buffer); + ok(!strcmp(buffer,"b"), "b != %s\n", buffer); res = MsiCloseHandle( hrec ); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);

1 0

Jacek Caban : urlmon: Set INTERNET_ERROR_MASK_COMBINED_SEC_CERT flag for HTTP requests.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 586e8b0c616124c61991e8fb371a72db6c338fda URL: http://source.winehq.org/git/wine.git/?a=commit;h=586e8b0c616124c61991e8fb3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 30 16:53:20 2012 +0200 urlmon: Set INTERNET_ERROR_MASK_COMBINED_SEC_CERT flag for HTTP requests. --- dlls/urlmon/http.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index a081ad0..e1ac49c 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -276,7 +276,7 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques LPOLESTR accept_mimes[257]; const WCHAR **accept_types; BYTE security_id[512]; - DWORD len, port; + DWORD len, port, flags; ULONG num, error; BOOL res, b; HRESULT hres; @@ -419,10 +419,15 @@ static HRESULT HttpProtocol_open_request(Protocol *prot, IUri *uri, DWORD reques } } + flags = INTERNET_ERROR_MASK_COMBINED_SEC_CERT; + res = InternetSetOptionW(This->base.request, INTERNET_OPTION_ERROR_MASK, &flags, sizeof(flags)); + if(!res) + WARN("InternetSetOption(INTERNET_OPTION_ERROR_MASK) failed: %u\n", GetLastError()); + b = TRUE; res = InternetSetOptionW(This->base.request, INTERNET_OPTION_HTTP_DECODING, &b, sizeof(b)); if(!res) - WARN("InternetSetOption(INTERNET_OPTION_HTTP_DECODING) failed: %08x\n", GetLastError()); + WARN("InternetSetOption(INTERNET_OPTION_HTTP_DECODING) failed: %u\n", GetLastError()); do { error = send_http_request(This);

1 0

Jacek Caban : urlmon: Correctly handle BINDF_NO_UI in handle_http_error.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 45a6619e445cc1b0a1a86811b6ec1e1bbb56b90b URL: http://source.winehq.org/git/wine.git/?a=commit;h=45a6619e445cc1b0a1a86811b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 30 16:53:32 2012 +0200 urlmon: Correctly handle BINDF_NO_UI in handle_http_error. --- dlls/urlmon/http.c | 28 ++++++++++++---------------- 1 files changed, 12 insertions(+), 16 deletions(-) diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c index e1ac49c..7ec93fc 100644 --- a/dlls/urlmon/http.c +++ b/dlls/urlmon/http.c @@ -119,6 +119,9 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error) IWindowForBindingUI *wfb_ui; IHttpSecurity *http_security; BOOL security_problem; + DWORD dlg_flags; + HWND hwnd; + DWORD res; HRESULT hres; switch(error) { @@ -183,7 +186,6 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error) hres = IServiceProvider_QueryService(serv_prov, &IID_IWindowForBindingUI, &IID_IWindowForBindingUI, (void**)&wfb_ui); if(SUCCEEDED(hres)) { - HWND hwnd; const IID *iid_reason; if(security_problem) @@ -194,26 +196,20 @@ static HRESULT handle_http_error(HttpProtocol *This, DWORD error) iid_reason = &IID_IWindowForBindingUI; hres = IWindowForBindingUI_GetWindow(wfb_ui, iid_reason, &hwnd); - if(SUCCEEDED(hres) && hwnd) - { - DWORD res; - - res = InternetErrorDlg(hwnd, This->base.request, error, - FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS | FLAGS_ERROR_UI_FLAGS_GENERATE_DATA, - NULL); - - if(res == ERROR_INTERNET_FORCE_RETRY || res == ERROR_SUCCESS) - hres = RPC_E_RETRY; - else - hres = E_FAIL; - } IWindowForBindingUI_Release(wfb_ui); + if(FAILED(hres)) + hwnd = NULL; } IServiceProvider_Release(serv_prov); - if(hres == RPC_E_RETRY) - return hres; + dlg_flags = FLAGS_ERROR_UI_FLAGS_CHANGE_OPTIONS | FLAGS_ERROR_UI_FLAGS_GENERATE_DATA; + if(This->base.bindf & BINDF_NO_UI) + dlg_flags |= FLAGS_ERROR_UI_FLAGS_NO_UI; + + res = InternetErrorDlg(hwnd, This->base.request, error, dlg_flags, NULL); + if(res == ERROR_INTERNET_FORCE_RETRY || res == ERROR_SUCCESS) + return RPC_E_RETRY; return internet_error_to_hres(error); }

1 0

Rico Schüller : d3dx9: Crop the input in ID3DXBaseEffect::SetBool().
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: f658aabfd5a49506d2b916805e3df7556442853e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f658aabfd5a49506d2b916805… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed May 30 14:36:18 2012 +0200 d3dx9: Crop the input in ID3DXBaseEffect::SetBool(). --- dlls/d3dx9_36/effect.c | 2 ++ dlls/d3dx9_36/tests/effect.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index def73a0..5ac79d1 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1725,6 +1725,8 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetBool(ID3DXBaseEffect *iface, D3DXHA if (param && !param->element_count && param->rows == 1 && param->columns == 1) { + /* crop input */ + b = b ? TRUE : FALSE; set_number(param->data, param->type, &b, D3DXPT_BOOL); return D3D_OK; } diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index eb52f7e..c4046c7 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -1857,11 +1857,12 @@ static void test_effect_parameter_value(IDirect3DDevice9 *device) test_effect_parameter_value_GetTestGroup(&res[k], effect, &blob[res_value_offset], parameter, i); /* SetBool */ - bvalue = 1; + bvalue = 5; memcpy(expected_value, &blob[res_value_offset], res_desc->Bytes); hr = effect->lpVtbl->SetBool(effect, parameter, bvalue); if (!res_desc->Elements && res_desc->Rows == 1 && res_desc->Columns == 1) { + bvalue = bvalue ? TRUE : FALSE; set_number(expected_value, res_desc->Type, &bvalue, D3DXPT_BOOL); ok(hr == D3D_OK, "%u - %s: SetBool failed, got %#x, expected %#x\n", i, res_full_name, hr, D3D_OK); }

1 0

Jacek Caban : mshtml: Added IWindowForBindingUI stub implementation.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: cf9d0d320c0603018d3c463f8daa69cbfd68a755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf9d0d320c0603018d3c463f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 30 15:49:15 2012 +0200 mshtml: Added IWindowForBindingUI stub implementation. --- dlls/mshtml/htmldoc.c | 2 + dlls/mshtml/mshtml_private.h | 3 ++ dlls/mshtml/service.c | 5 +++ dlls/mshtml/view.c | 56 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 66 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 05eb664..a0ab79d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2428,6 +2428,8 @@ HRESULT HTMLDocument_Create(IUnknown *pUnkOuter, REFIID riid, void** ppvObject) doc->usermode = UNKNOWN_USERMODE; + init_binding_ui(doc); + hres = create_nscontainer(doc, &doc->nscontainer); if(FAILED(hres)) { ERR("Failed to init Gecko, returning CLASS_E_CLASSNOTAVAILABLE\n"); diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7eaaa57..3eb81b9 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -453,6 +453,8 @@ struct HTMLDocumentObj { ICustomDoc ICustomDoc_iface; ITargetContainer ITargetContainer_iface; + IWindowForBindingUI IWindowForBindingUI_iface; + LONG ref; NSContainer *nscontainer; @@ -657,6 +659,7 @@ void HTMLDocument_Service_Init(HTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_Hlink_Init(HTMLDocument*) DECLSPEC_HIDDEN; void TargetContainer_Init(HTMLDocumentObj*) DECLSPEC_HIDDEN; +void init_binding_ui(HTMLDocumentObj*) DECLSPEC_HIDDEN; void HTMLDocumentNode_SecMgr_Init(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/service.c b/dlls/mshtml/service.c index 9cafbf0..56744e6 100644 --- a/dlls/mshtml/service.c +++ b/dlls/mshtml/service.c @@ -254,6 +254,11 @@ static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFG return IHTMLDocument2_QueryInterface(&This->IHTMLDocument2_iface, riid, ppv); } + if(IsEqualGUID(&IID_IWindowForBindingUI, guidService)) { + TRACE("IID_IWindowForBindingUI\n"); + return IWindowForBindingUI_QueryInterface(&This->doc_obj->IWindowForBindingUI_iface, riid, ppv); + } + TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); if(This->doc_obj->client) { diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 3852046..6701987 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -912,3 +912,59 @@ void HTMLDocument_View_Init(HTMLDocument *This) This->IOleDocumentView_iface.lpVtbl = &OleDocumentViewVtbl; This->IViewObjectEx_iface.lpVtbl = &ViewObjectVtbl; } + +static inline HTMLDocumentObj *impl_from_IWindowForBindingUI(IWindowForBindingUI *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocumentObj, IWindowForBindingUI_iface); +} + +static HRESULT WINAPI WindowForBindingUI_QueryInterface(IWindowForBindingUI *iface, REFIID riid, void **ppv) +{ + HTMLDocumentObj *This = impl_from_IWindowForBindingUI(iface); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv); + *ppv = &This->IWindowForBindingUI_iface; + }else if(IsEqualGUID(&IID_IWindowForBindingUI, riid)) { + TRACE("(%p)->(IID_IWindowForBindingUI %p)\n", This, ppv); + *ppv = &This->IWindowForBindingUI_iface; + }else { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WindowForBindingUI_AddRef(IWindowForBindingUI *iface) +{ + HTMLDocumentObj *This = impl_from_IWindowForBindingUI(iface); + return htmldoc_addref(&This->basedoc); +} + +static ULONG WINAPI WindowForBindingUI_Release(IWindowForBindingUI *iface) +{ + HTMLDocumentObj *This = impl_from_IWindowForBindingUI(iface); + return htmldoc_release(&This->basedoc); +} + +static HRESULT WINAPI WindowForBindingUI_GetWindow(IWindowForBindingUI *iface, REFGUID rguidReason, HWND *phwnd) +{ + HTMLDocumentObj *This = impl_from_IWindowForBindingUI(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_guid(rguidReason), phwnd); + return E_NOTIMPL; +} + +static const IWindowForBindingUIVtbl WindowForBindingUIVtbl = { + WindowForBindingUI_QueryInterface, + WindowForBindingUI_AddRef, + WindowForBindingUI_Release, + WindowForBindingUI_GetWindow +}; + +void init_binding_ui(HTMLDocumentObj *doc) +{ + doc->IWindowForBindingUI_iface.lpVtbl = &WindowForBindingUIVtbl; +}

1 0

Jacek Caban : mshtml: Added support for BSCallback::QueryService( IID_IWindowForBindingUI).
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 3c1e2132e5e2efc1ba80fd6cfb6a2715d19c253c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c1e2132e5e2efc1ba80fd6cf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 30 15:49:28 2012 +0200 mshtml: Added support for BSCallback::QueryService(IID_IWindowForBindingUI). --- dlls/mshtml/navigate.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 3697070..1979af3 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -582,7 +582,11 @@ static HRESULT WINAPI BSCServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, REFIID riid, void **ppv) { BSCallback *This = impl_from_IServiceProvider(iface); + TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + + if(This->doc && IsEqualGUID(guidService, &IID_IWindowForBindingUI)) + return IServiceProvider_QueryService(&This->doc->basedoc.IServiceProvider_iface, guidService, riid, ppv); return E_NOINTERFACE; } @@ -721,6 +725,8 @@ HRESULT start_binding(HTMLWindow *window, HTMLDocumentNode *doc, BSCallback *bsc TRACE("(%p %p %p %p)\n", window, doc, bscallback, bctx); bscallback->doc = doc; + if(!doc && window) + bscallback->doc = window->doc; /* NOTE: IE7 calls IsSystemMoniker here*/ @@ -992,8 +998,11 @@ static HRESULT on_start_nsrequest(nsChannelBSC *This) list_remove(&This->bsc.entry); list_init(&This->bsc.entry); update_window_doc(This->window); - if(This->window->doc != This->bsc.doc) + if(This->window->doc != This->bsc.doc) { + if(This->bsc.doc) + list_remove(&This->bsc.entry); This->bsc.doc = This->window->doc; + } list_add_head(&This->bsc.doc->bindings, &This->bsc.entry); if(This->window->readystate != READYSTATE_LOADING) set_ready_state(This->window, READYSTATE_LOADING);

1 0

Jacek Caban : mshtml: Forward BSCallback::QueryService call to document.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 0847563dd410916f3a1095bff3afc2fb71981064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0847563dd410916f3a1095bff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 30 15:49:41 2012 +0200 mshtml: Forward BSCallback::QueryService call to document. --- dlls/mshtml/view.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index 6701987..08c5332 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -953,8 +953,11 @@ static ULONG WINAPI WindowForBindingUI_Release(IWindowForBindingUI *iface) static HRESULT WINAPI WindowForBindingUI_GetWindow(IWindowForBindingUI *iface, REFGUID rguidReason, HWND *phwnd) { HTMLDocumentObj *This = impl_from_IWindowForBindingUI(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_guid(rguidReason), phwnd); - return E_NOTIMPL; + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(rguidReason), phwnd); + + *phwnd = This->hwnd; + return S_OK; } static const IWindowForBindingUIVtbl WindowForBindingUIVtbl = {

1 0

Jacek Caban : mshtml: Added IWindowForBindingUI tests.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 5665730a32f3803c96a40aa570a7d25a7aa905a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5665730a32f3803c96a40aa57… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 30 15:49:54 2012 +0200 mshtml: Added IWindowForBindingUI tests. --- dlls/mshtml/tests/htmldoc.c | 73 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 58 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 838e2ae..3a35abf 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -94,7 +94,7 @@ DEFINE_GUID(SID_SContainerDispatch,0xb722be00,0x4e68,0x101b,0xa2,0xbc,0x00,0xaa, static IOleDocumentView *view = NULL; -static HWND container_hwnd = NULL, hwnd = NULL, last_hwnd = NULL; +static HWND container_hwnd = NULL, doc_hwnd = NULL, last_hwnd = NULL; DEFINE_EXPECT(LockContainer); DEFINE_EXPECT(SetActiveObject); @@ -346,7 +346,7 @@ static void test_timer(DWORD flags) if(flags & EXPECT_SETTITLE) SET_EXPECT(Exec_SETTITLE); - while(!*b && GetMessage(&msg, hwnd, 0, 0)) { + while(!*b && GetMessage(&msg, doc_hwnd, 0, 0)) { TranslateMessage(&msg); DispatchMessage(&msg); } @@ -1295,6 +1295,45 @@ static HRESULT WINAPI Moniker_BindToObject(IMoniker *iface, IBindCtx *pcb, IMoni return E_NOTIMPL; } +static void test_binding_ui(IUnknown *unk) +{ + IWindowForBindingUI *binding_ui; + IServiceProvider *serv_prov; + HWND binding_hwnd; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IServiceProvider, (void**)&serv_prov); + ok(hres == S_OK, "Could not get IServiceProvider: %08x\n", hres); + + hres = IServiceProvider_QueryService(serv_prov, &IID_IWindowForBindingUI, &IID_IWindowForBindingUI, + (void**)&binding_ui); + ok(hres == S_OK, "Could not get IWindowForBindingUI: %08x\n", hres); + + hres = IWindowForBindingUI_GetWindow(binding_ui, &IID_IHttpSecurity, &binding_hwnd); + ok(hres == S_OK, "GetWindow(IID_IHttpSecurity) failed: %08x\n", hres); + if(doc_hwnd) + ok(binding_hwnd == doc_hwnd, "binding_hwnd != doc_hwnd\n"); + else + todo_wine ok(binding_hwnd != NULL, "binding_hwnd == NULL\n"); + + hres = IWindowForBindingUI_GetWindow(binding_ui, &IID_IAuthenticate, &binding_hwnd); + ok(hres == S_OK, "GetWindow(IID_IHttpSecurity) failed: %08x\n", hres); + if(doc_hwnd) + ok(binding_hwnd == doc_hwnd, "binding_hwnd != doc_hwnd\n"); + else + todo_wine ok(binding_hwnd != NULL, "binding_hwnd == NULL\n"); + + hres = IWindowForBindingUI_GetWindow(binding_ui, &IID_IWindowForBindingUI, &binding_hwnd); + ok(hres == S_OK, "GetWindow(IID_IHttpSecurity) failed: %08x\n", hres); + if(doc_hwnd) + ok(binding_hwnd == doc_hwnd, "binding_hwnd != doc_hwnd\n"); + else + todo_wine ok(binding_hwnd != NULL, "binding_hwnd == NULL\n"); + + IWindowForBindingUI_Release(binding_ui); + IServiceProvider_Release(serv_prov); +} + static void continue_binding(IBindStatusCallback *callback) { FORMATETC formatetc = {0xc02d, NULL, 1, -1, TYMED_ISTREAM}; @@ -1303,6 +1342,8 @@ static void continue_binding(IBindStatusCallback *callback) static const WCHAR wszTextHtml[] = {'t','e','x','t','/','h','t','m','l',0}; + test_binding_ui((IUnknown*)callback); + if(report_mime) { hres = IBindStatusCallback_OnProgress(callback, 0, 0, BINDSTATUS_MIMETYPEAVAILABLE, wszTextHtml); @@ -2162,6 +2203,7 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum ok(hres == S_OK, "Could not get IOleInPlaceActiveObject: %08x\n", hres); if(activeobj) { + HWND hwnd = (void*)0xdeadbeef; hres = IOleInPlaceActiveObject_GetWindow(activeobj, &hwnd); ok(hres == E_FAIL, "GetWindow returned %08x, expected E_FAIL\n", hres); ok(hwnd == NULL, "hwnd=%p, expected NULL\n", hwnd); @@ -2201,11 +2243,11 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum CHECK_CALLED(ShowUI); if(activeobj) { - hres = IOleInPlaceActiveObject_GetWindow(activeobj, &hwnd); + hres = IOleInPlaceActiveObject_GetWindow(activeobj, &doc_hwnd); ok(hres == S_OK, "GetWindow failed: %08x\n", hres); - ok(hwnd != NULL, "hwnd == NULL\n"); + ok(doc_hwnd != NULL, "hwnd == NULL\n"); if(last_hwnd) - ok(hwnd == last_hwnd, "hwnd != last_hwnd\n"); + ok(doc_hwnd == last_hwnd, "hwnd != last_hwnd\n"); } hres = IOleDocumentView_UIActivate(view, TRUE); @@ -2214,7 +2256,7 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum if(activeobj) { hres = IOleInPlaceActiveObject_GetWindow(activeobj, &tmp_hwnd); ok(hres == S_OK, "GetWindow failed: %08x\n", hres); - ok(tmp_hwnd == hwnd, "tmp_hwnd=%p, expected %p\n", tmp_hwnd, hwnd); + ok(tmp_hwnd == doc_hwnd, "tmp_hwnd=%p, expected %p\n", tmp_hwnd, doc_hwnd); } } @@ -2253,11 +2295,11 @@ static HRESULT WINAPI DocumentSite_ActivateMe(IOleDocumentSite *iface, IOleDocum CHECK_CALLED(Exec_SETPROGRESSPOS); if(activeobj) { - hres = IOleInPlaceActiveObject_GetWindow(activeobj, &hwnd); + hres = IOleInPlaceActiveObject_GetWindow(activeobj, &doc_hwnd); ok(hres == S_OK, "GetWindow failed: %08x\n", hres); - ok(hwnd != NULL, "hwnd == NULL\n"); + ok(doc_hwnd != NULL, "doc_hwnd == NULL\n"); if(last_hwnd) - ok(hwnd == last_hwnd, "hwnd != last_hwnd\n"); + ok(doc_hwnd == last_hwnd, "doc_hwnd != last_hwnd\n"); } } @@ -6154,7 +6196,7 @@ static void test_Activate(IHTMLDocument2 *doc, DWORD flags) GUID guid; HRESULT hres; - last_hwnd = hwnd; + last_hwnd = doc_hwnd; if(view) IOleDocumentView_Release(view); @@ -6219,10 +6261,10 @@ static void test_Window(IHTMLDocument2 *doc, BOOL expect_success) if(expect_success) { ok(hres == S_OK, "GetWindow failed: %08x\n", hres); - ok(tmp_hwnd == hwnd, "tmp_hwnd=%p, expected %p\n", tmp_hwnd, hwnd); + ok(tmp_hwnd == doc_hwnd, "tmp_hwnd=%p, expected %p\n", tmp_hwnd, doc_hwnd); }else { ok(hres == E_FAIL, "GetWindow returned %08x, expected E_FAIL\n", hres); - ok(IsWindow(hwnd), "hwnd is destroyed\n"); + ok(IsWindow(doc_hwnd), "hwnd is destroyed\n"); } IOleInPlaceActiveObject_Release(activeobject); @@ -6574,7 +6616,7 @@ static void test_QueryInterface(IHTMLDocument2 *doc) static void init_test(enum load_state_t ls) { doc_unk = NULL; - hwnd = last_hwnd = NULL; + doc_hwnd = last_hwnd = NULL; set_clientsite = FALSE; load_from_stream = FALSE; call_UIActivate = CallUIActivate_None; @@ -6686,9 +6728,9 @@ static void test_HTMLDocument(BOOL do_load, BOOL mime) IOleDocumentView_Release(view); view = NULL; - ok(IsWindow(hwnd), "hwnd is destroyed\n"); + ok(IsWindow(doc_hwnd), "hwnd is destroyed\n"); release_document(doc); - ok(!IsWindow(hwnd), "hwnd is not destroyed\n"); + ok(!IsWindow(doc_hwnd), "hwnd is not destroyed\n"); } static void test_HTMLDocument_hlink(DWORD status) @@ -6820,6 +6862,7 @@ static void test_HTMLDocument_http(BOOL with_wbapp) test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); test_GetCurMoniker((IUnknown*)doc, http_mon, NULL); test_travellog(doc); + test_binding_ui((IUnknown*)doc); nav_url = nav_serv_url = "http://www.winehq.org/"; /* for valid prev nav_url */ if(support_wbapp) {

1 0

Henri Verbeet : wined3d: Use NAN.
by Alexandre Julliard 30 May '12

30 May '12

Module: wine Branch: master Commit: 1a93983bd4baed5a7e1a6ac522236c16509027c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a93983bd4baed5a7e1a6ac52… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed May 30 16:14:56 2012 +0200 wined3d: Use NAN. --- dlls/wined3d/drawprim.c | 2 ++ dlls/wined3d/utils.c | 2 ++ dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 2e30175..c8944e5 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -25,6 +25,8 @@ */ #include "config.h" +#include "wine/port.h" + #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index dc63d8b..f8f301a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -25,6 +25,8 @@ */ #include "config.h" +#include "wine/port.h" + #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 096fe60..6632f6e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -200,7 +200,7 @@ static inline float float_16_to_32(const unsigned short *in) { return sgn * powf(2, (float)e - 15.0f) * (1.0f + ((float)m / 1024.0f)); } else { if(m == 0) return sgn / 0.0f; /* +INF / -INF */ - else return 0.0f / 0.0f; /* NAN */ + else return NAN; } } @@ -222,7 +222,7 @@ static inline float float_24_to_32(DWORD in) else { if (m == 0) return sgn / 0.0f; /* +INF / -INF */ - else return 0.0f / 0.0f; /* NAN */ + else return NAN; } }

1 0