January 2007 - Wine-commits

Matt Finnicum : riched20: Use CharFromPos instead of FindPixelPos in LinkNotify so it accounts for scrolling .
by Alexandre Julliard 24 Jan '07

24 Jan '07

Module: wine Branch: master Commit: f12e6232a2e018a6bd191d4c441aee3febbfb650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f12e6232a2e018a6bd191d4c4… Author: Matt Finnicum <mattfinn(a)gmail.com> Date: Tue Jan 23 14:44:29 2007 -0600 riched20: Use CharFromPos instead of FindPixelPos in LinkNotify so it accounts for scrolling. --- dlls/riched20/editor.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a06d2f4..9b1904d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2581,15 +2581,18 @@ void ME_LinkNotify(ME_TextEditor *editor { int x,y; ME_Cursor tmpCursor; + int nCharOfs; /* The start of the clicked text. Absolute character offset */ + ME_Run *tmpRun; - BOOL bNothing; + ENLINK info; x = (short)LOWORD(lParam); y = (short)HIWORD(lParam); - ME_FindPixelPos(editor, x, y, &tmpCursor, &bNothing); + nCharOfs = ME_CharFromPos(editor, x, y); + ME_CursorFromCharOfs(editor, nCharOfs, &tmpCursor); tmpRun = &tmpCursor.pRun->member.run; - - if ((tmpRun->style->fmt.dwMask & CFM_LINK) + + if ((tmpRun->style->fmt.dwMask & CFM_LINK) && (tmpRun->style->fmt.dwEffects & CFE_LINK)) { /* The clicked run has CFE_LINK set */ info.nmhdr.hwndFrom = editor->hWnd;

1 0

Matt Finnicum : riched20: Implement EM_LIMITTEXT and some simple tests.
by Alexandre Julliard 24 Jan '07

24 Jan '07

Module: wine Branch: master Commit: dbcf2e391c684e8e364e29993a8d7ef93668bad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbcf2e391c684e8e364e29993… Author: Matt Finnicum <mattfinn(a)gmail.com> Date: Tue Jan 23 13:39:38 2007 -0600 riched20: Implement EM_LIMITTEXT and some simple tests. --- dlls/riched20/editor.c | 11 +++++++++-- dlls/riched20/tests/editor.c | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 561574f..a06d2f4 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -77,7 +77,7 @@ - EM_GETWORDWRAPMODE 1.0asian + EM_GETZOOM 3.0 + EM_HIDESELECTION - - EM_LIMITTEXT + + EM_LIMITTEXT (Also called EM_SETLIMITTEXT) + EM_LINEFROMCHAR + EM_LINEINDEX + EM_LINELENGTH @@ -1429,7 +1429,6 @@ LRESULT WINAPI RichEditANSIWndProc(HWND UNSUPPORTED_MSG(EM_GETTYPOGRAPHYOPTIONS) UNSUPPORTED_MSG(EM_GETUNDONAME) UNSUPPORTED_MSG(EM_GETWORDBREAKPROCEX) - UNSUPPORTED_MSG(EM_LIMITTEXT) /* also known as EM_SETLIMITTEXT */ UNSUPPORTED_MSG(EM_PASTESPECIAL) UNSUPPORTED_MSG(EM_SELECTIONTYPE) UNSUPPORTED_MSG(EM_SETBIDIOPTIONS) @@ -2185,6 +2184,14 @@ LRESULT WINAPI RichEditANSIWndProc(HWND editor->nTextLimit = (int) lParam; return 0; } + case EM_LIMITTEXT: + { + if (wParam == 0) + editor->nTextLimit = 65536; + else + editor->nTextLimit = (int) wParam; + return 0; + } case EM_GETLIMITTEXT: { return editor->nTextLimit; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 6bae95b..f86ca5a 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -2,6 +2,7 @@ * Unit test suite for rich edit control * * Copyright 2006 Google (Thomas Kho) +* Copyright 2007 Matt Finnicum * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -975,6 +976,45 @@ static void test_EM_SETTEXTEX(void) DestroyWindow(hwndRichEdit); } +static void test_EM_LIMITTEXT(void) +{ + int ret; + + HWND hwndRichEdit = new_richedit(NULL); + + /* The main purpose of this test is to demonstrate that the nonsense in MSDN + * about setting the length to -1 for multiline edit controls doesn't happen. + */ + + /* Don't check default gettextlimit case. That's done in other tests */ + + /* Set textlimit to 100 */ + SendMessage (hwndRichEdit, EM_LIMITTEXT, 100, 0); + ret = SendMessage (hwndRichEdit, EM_GETLIMITTEXT, 0, 0); + ok (ret == 100, + "EM_LIMITTEXT: set to 100, returned: %d, expected: 100\n", ret); + + /* Set textlimit to 0 */ + SendMessage (hwndRichEdit, EM_LIMITTEXT, 0, 0); + ret = SendMessage (hwndRichEdit, EM_GETLIMITTEXT, 0, 0); + ok (ret == 65536, + "EM_LIMITTEXT: set to 0, returned: %d, expected: 65536\n", ret); + + /* Set textlimit to -1 */ + SendMessage (hwndRichEdit, EM_LIMITTEXT, -1, 0); + ret = SendMessage (hwndRichEdit, EM_GETLIMITTEXT, 0, 0); + ok (ret == -1, + "EM_LIMITTEXT: set to -1, returned: %d, expected: -1\n", ret); + + /* Set textlimit to -2 */ + SendMessage (hwndRichEdit, EM_LIMITTEXT, -2, 0); + ret = SendMessage (hwndRichEdit, EM_GETLIMITTEXT, 0, 0); + ok (ret == -2, + "EM_LIMITTEXT: set to -2, returned: %d, expected: -2\n", ret); + + DestroyWindow (hwndRichEdit); +} + static void test_EM_EXLIMITTEXT(void) { @@ -1443,6 +1483,7 @@ START_TEST( editor ) test_EM_SETUNDOLIMIT(); test_ES_PASSWORD(); test_EM_SETTEXTEX(); + test_EM_LIMITTEXT(); test_EM_EXLIMITTEXT(); test_EM_GETLIMITTEXT(); test_WM_SETFONT();

1 0

Kai Blin : secur32: Fix off-by-one error when copying the password to the helper.
by Alexandre Julliard 24 Jan '07

24 Jan '07

Module: wine Branch: master Commit: dc98ac1adbaf70b6597a5ead75b1c708bcd54bff URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc98ac1adbaf70b6597a5ead7… Author: Kai Blin <kai.blin(a)gmail.com> Date: Wed Jan 24 10:51:14 2007 +0100 secur32: Fix off-by-one error when copying the password to the helper. This fixes NTLM authentication with Outlook2003. --- dlls/secur32/ntlm.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index b357250..dec559b 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -222,8 +222,9 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ac { helper->pwlen = WideCharToMultiByte(CP_UNIXCP, WC_NO_BEST_FIT_CHARS, auth_data->Password, - auth_data->PasswordLength+1, NULL, 0, NULL, NULL); - + auth_data->PasswordLength+1, NULL, 0, NULL, + NULL) + 1; + helper->password = HeapAlloc(GetProcessHeap(), 0, helper->pwlen); @@ -232,7 +233,7 @@ static SECURITY_STATUS SEC_ENTRY ntlm_Ac helper->password, helper->pwlen, NULL, NULL); } } - + phCredential->dwUpper = fCredentialUse; phCredential->dwLower = (ULONG_PTR)helper; TRACE("ACH phCredential->dwUpper: 0x%08lx, dwLower: 0x%08lx\n",

1 0

Rob Shearman : rpcrt4: When copying quality of service, deep copy TransportCredentials structure too.
by Alexandre Julliard 24 Jan '07

24 Jan '07

Module: wine Branch: master Commit: d05f5f33a41b9336c0a2cc4ebb5dfe61f7131743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05f5f33a41b9336c0a2cc4eb… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jan 24 00:27:10 2007 +0000 rpcrt4: When copying quality of service, deep copy TransportCredentials structure too. Remove some no longer relevant fixmes. --- dlls/rpcrt4/rpc_binding.c | 53 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 46 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index 691f378..0034907 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -993,12 +993,43 @@ static RPC_STATUS RpcQualityOfService_Cr http_credentials_dst = HeapAlloc(GetProcessHeap(), 0, sizeof(*http_credentials_dst)); qos->qos->u.HttpCredentials = http_credentials_dst; if (!http_credentials_dst) goto error; - http_credentials_dst->TransportCredentials = http_credentials_src->TransportCredentials; + http_credentials_dst->TransportCredentials = NULL; http_credentials_dst->Flags = http_credentials_src->Flags; http_credentials_dst->AuthenticationTarget = http_credentials_src->AuthenticationTarget; http_credentials_dst->NumberOfAuthnSchemes = http_credentials_src->NumberOfAuthnSchemes; http_credentials_dst->AuthnSchemes = NULL; http_credentials_dst->ServerCertificateSubject = NULL; + if (http_credentials_src->TransportCredentials) + { + SEC_WINNT_AUTH_IDENTITY_W *cred_dst; + cred_dst = http_credentials_dst->TransportCredentials = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*cred_dst)); + if (!cred_dst) goto error; + cred_dst->Flags = SEC_WINNT_AUTH_IDENTITY_UNICODE; + if (unicode) + { + const SEC_WINNT_AUTH_IDENTITY_W *cred_src = http_credentials_src->TransportCredentials; + cred_dst->UserLength = cred_src->UserLength; + cred_dst->PasswordLength = cred_src->PasswordLength; + cred_dst->DomainLength = cred_src->DomainLength; + cred_dst->User = RPCRT4_strndupW(cred_src->User, cred_src->UserLength); + cred_dst->Password = RPCRT4_strndupW(cred_src->Password, cred_src->PasswordLength); + cred_dst->Domain = RPCRT4_strndupW(cred_src->Domain, cred_src->DomainLength); + } + else + { + const SEC_WINNT_AUTH_IDENTITY_A *cred_src = (const SEC_WINNT_AUTH_IDENTITY_A *)http_credentials_src->TransportCredentials; + cred_dst->UserLength = MultiByteToWideChar(CP_ACP, 0, (char *)cred_src->User, cred_src->UserLength, NULL, 0); + cred_dst->DomainLength = MultiByteToWideChar(CP_ACP, 0, (char *)cred_src->Domain, cred_src->DomainLength, NULL, 0); + cred_dst->PasswordLength = MultiByteToWideChar(CP_ACP, 0, (char *)cred_src->Password, cred_src->PasswordLength, NULL, 0); + cred_dst->User = HeapAlloc(GetProcessHeap(), 0, cred_dst->UserLength * sizeof(WCHAR)); + cred_dst->Password = HeapAlloc(GetProcessHeap(), 0, cred_dst->PasswordLength * sizeof(WCHAR)); + cred_dst->Domain = HeapAlloc(GetProcessHeap(), 0, cred_dst->DomainLength * sizeof(WCHAR)); + if (!cred_dst || !cred_dst->Password || !cred_dst->Domain) goto error; + MultiByteToWideChar(CP_ACP, 0, (char *)cred_src->User, cred_src->UserLength, cred_dst->User, cred_dst->UserLength); + MultiByteToWideChar(CP_ACP, 0, (char *)cred_src->Domain, cred_src->DomainLength, cred_dst->Domain, cred_dst->DomainLength); + MultiByteToWideChar(CP_ACP, 0, (char *)cred_src->Password, cred_src->PasswordLength, cred_dst->Password, cred_dst->PasswordLength); + } + } if (http_credentials_src->NumberOfAuthnSchemes) { http_credentials_dst->AuthnSchemes = HeapAlloc(GetProcessHeap(), 0, http_credentials_src->NumberOfAuthnSchemes * sizeof(*http_credentials_dst->AuthnSchemes)); @@ -1027,6 +1058,13 @@ error: if (qos->qos->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP && qos->qos->u.HttpCredentials) { + if (qos->qos->u.HttpCredentials->TransportCredentials) + { + HeapFree(GetProcessHeap(), 0, qos->qos->u.HttpCredentials->TransportCredentials->User); + HeapFree(GetProcessHeap(), 0, qos->qos->u.HttpCredentials->TransportCredentials->Domain); + HeapFree(GetProcessHeap(), 0, qos->qos->u.HttpCredentials->TransportCredentials->Password); + HeapFree(GetProcessHeap(), 0, qos->qos->u.HttpCredentials->TransportCredentials); + } HeapFree(GetProcessHeap(), 0, qos->qos->u.HttpCredentials->AuthnSchemes); HeapFree(GetProcessHeap(), 0, qos->qos->u.HttpCredentials->ServerCertificateSubject); HeapFree(GetProcessHeap(), 0, qos->qos->u.HttpCredentials); @@ -1050,6 +1088,13 @@ ULONG RpcQualityOfService_Release(RpcQua { if (qos->qos->AdditionalSecurityInfoType == RPC_C_AUTHN_INFO_TYPE_HTTP) { + if (qos->qos->u.HttpCredentials->TransportCredentials) + { + HeapFree(GetProcessHeap(), 0, qos->qos->u.HttpCredentials->TransportCredentials->User); + HeapFree(GetProcessHeap(), 0, qos->qos->u.HttpCredentials->TransportCredentials->Domain); + HeapFree(GetProcessHeap(), 0, qos->qos->u.HttpCredentials->TransportCredentials->Password); + HeapFree(GetProcessHeap(), 0, qos->qos->u.HttpCredentials->TransportCredentials); + } HeapFree(GetProcessHeap(), 0, qos->qos->u.HttpCredentials->AuthnSchemes); HeapFree(GetProcessHeap(), 0, qos->qos->u.HttpCredentials->ServerCertificateSubject); HeapFree(GetProcessHeap(), 0, qos->qos->u.HttpCredentials); @@ -1205,9 +1250,6 @@ RpcBindingSetAuthInfoExA( RPC_BINDING_HA return RPC_S_UNKNOWN_AUTHZ_SERVICE; } - if (SecurityQos) - FIXME("SecurityQos ignored\n"); - r = EnumerateSecurityPackagesA(&package_count, &packages); if (r != SEC_E_OK) { @@ -1321,9 +1363,6 @@ RpcBindingSetAuthInfoExW( RPC_BINDING_HA return RPC_S_UNKNOWN_AUTHZ_SERVICE; } - if (SecurityQos) - FIXME("SecurityQos ignored\n"); - r = EnumerateSecurityPackagesW(&package_count, &packages); if (r != SEC_E_OK) {

1 0

Rob Shearman : rpcrt4: Fix a typo in rpcrt4_conn_open_pipe.
by Alexandre Julliard 24 Jan '07

24 Jan '07

Module: wine Branch: master Commit: 2103bca4db0cb72d3a7021cea42ad22d39b08930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2103bca4db0cb72d3a7021cea… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jan 24 00:27:01 2007 +0000 rpcrt4: Fix a typo in rpcrt4_conn_open_pipe. Fix a typo in rpcrt4_conn_open_pipe where the initial setting of dwFlags was done inside the switch statement instead of at the indented place of at the start of the block (thanks to Jan Zerebecki for noticing this bug). --- dlls/rpcrt4/rpc_transport.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 2776f63..c92d79d 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -165,9 +165,9 @@ static RPC_STATUS rpcrt4_conn_open_pipe( DWORD dwFlags = 0; if (Connection->QOS) { + dwFlags = SECURITY_SQOS_PRESENT; switch (Connection->QOS->qos->ImpersonationType) { - dwFlags = SECURITY_SQOS_PRESENT; case RPC_C_IMP_LEVEL_DEFAULT: /* FIXME: what to do here? */ break;

1 0

Jacek Caban : urlmon: Added CreateBinding test.
by Alexandre Julliard 24 Jan '07

24 Jan '07

Module: wine Branch: master Commit: 61f646f2c1b6e01d4f4bc2b9a2849d33d72a2329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61f646f2c1b6e01d4f4bc2b9a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 23 19:36:38 2007 +0100 urlmon: Added CreateBinding test. --- dlls/urlmon/tests/protocol.c | 339 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 333 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61f646f2c1b6e01d4f4bc…

1 0

Jacek Caban : urlmon: Added beginning BindProtocol implementation.
by Alexandre Julliard 24 Jan '07

24 Jan '07

Module: wine Branch: master Commit: 60df6e06a51a3febf8738300011fad819aad3c5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=60df6e06a51a3febf87383000… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 23 19:36:09 2007 +0100 urlmon: Added beginning BindProtocol implementation. --- dlls/urlmon/bindprot.c | 127 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 114 insertions(+), 13 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 5ae24ac..c3ad2b0 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -38,6 +38,10 @@ typedef struct { const IInternetProtocolSinkVtbl *lpInternetProtocolSinkVtbl; LONG ref; + + IInternetProtocol *protocol; + IInternetBindInfo *bind_info; + IInternetProtocolSink *protocol_sink; } BindProtocol; #define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) @@ -101,6 +105,13 @@ static ULONG WINAPI BindProtocol_Release TRACE("(%p) ref=%d\n", This, ref); if(!ref) { + if(This->protocol) + IInternetProtocol_Release(This->protocol); + if(This->bind_info) + IInternetBindInfo_Release(This->bind_info); + if(This->protocol_sink) + IInternetProtocolSink_Release(This->protocol_sink); + HeapFree(GetProcessHeap(), 0, This); URLMON_UnlockModule(); @@ -114,14 +125,60 @@ static HRESULT WINAPI BindProtocol_Start DWORD grfPI, DWORD dwReserved) { BindProtocol *This = PROTOCOL_THIS(iface); + IInternetProtocol *protocol = NULL; + IServiceProvider *service_provider; + CLSID clsid = IID_NULL; + LPOLESTR clsid_str; + HRESULT hres; - FIXME("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, + TRACE("(%p)->(%s %p %p %08x %d)\n", This, debugstr_w(szUrl), pOIProtSink, pOIBindInfo, grfPI, dwReserved); if(!szUrl || !pOIProtSink || !pOIBindInfo) return E_INVALIDARG; - return E_NOTIMPL; + hres = IInternetProtocolSink_QueryInterface(pOIProtSink, &IID_IServiceProvider, + (void**)&service_provider); + if(SUCCEEDED(hres)) { + /* FIXME: What's protocol CLSID here? */ + IServiceProvider_QueryService(service_provider, &IID_IInternetProtocol, + &IID_IInternetProtocol, (void**)&protocol); + IServiceProvider_Release(service_provider); + } + + if(!protocol) { + IClassFactory *cf; + IUnknown *unk; + + hres = get_protocol_handler(szUrl, &clsid, &cf); + if(FAILED(hres)) + return hres; + + hres = IClassFactory_CreateInstance(cf, (IUnknown*)BINDINFO(This), + &IID_IUnknown, (void**)&unk); + IClassFactory_Release(cf); + if(FAILED(hres)) + return hres; + + hres = IUnknown_QueryInterface(unk, &IID_IInternetProtocol, (void**)&protocol); + IUnknown_Release(unk); + if(FAILED(hres)) + return hres; + } + + StringFromCLSID(&clsid, &clsid_str); + IInternetProtocolSink_ReportProgress(pOIProtSink, BINDSTATUS_PROTOCOLCLASSID, clsid_str); + CoTaskMemFree(clsid_str); + + This->protocol = protocol; + + IInternetBindInfo_AddRef(pOIBindInfo); + This->bind_info = pOIBindInfo; + + IInternetProtocolSink_AddRef(pOIProtSink); + This->protocol_sink = pOIProtSink; + + return IInternetProtocol_Start(protocol, szUrl, PROTSINK(This), BINDINFO(This), 0, 0); } static HRESULT WINAPI BindProtocol_Continue(IInternetProtocol *iface, PROTOCOLDATA *pProtocolData) @@ -142,8 +199,11 @@ static HRESULT WINAPI BindProtocol_Abort static HRESULT WINAPI BindProtocol_Terminate(IInternetProtocol *iface, DWORD dwOptions) { BindProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%08x)\n", This, dwOptions); - return E_NOTIMPL; + + TRACE("(%p)->(%08x)\n", This, dwOptions); + + IInternetProtocol_Terminate(This->protocol, 0); + return S_OK; } static HRESULT WINAPI BindProtocol_Suspend(IInternetProtocol *iface) @@ -164,8 +224,15 @@ static HRESULT WINAPI BindProtocol_Read( ULONG cb, ULONG *pcbRead) { BindProtocol *This = PROTOCOL_THIS(iface); - FIXME("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); - return E_NOTIMPL; + ULONG read = 0; + HRESULT hres; + + TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); + + hres = IInternetProtocol_Read(This->protocol, pv, cb, &read); + + *pcbRead = read; + return hres; } static HRESULT WINAPI BindProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove, @@ -233,8 +300,18 @@ static HRESULT WINAPI BindInfo_GetBindIn DWORD *grfBINDF, BINDINFO *pbindinfo) { BindProtocol *This = BINDINFO_THIS(iface); - FIXME("(%p)->(%p %p)\n", This, grfBINDF, pbindinfo); - return E_NOTIMPL; + HRESULT hres; + + TRACE("(%p)->(%p %p)\n", This, grfBINDF, pbindinfo); + + hres = IInternetBindInfo_GetBindInfo(This->bind_info, grfBINDF, pbindinfo); + if(FAILED(hres)) { + WARN("GetBindInfo failed: %08x\n", hres); + return hres; + } + + *grfBINDF |= BINDF_FROMURLMON; + return hres; } static HRESULT WINAPI BindInfo_GetBindString(IInternetBindInfo *iface, @@ -334,7 +411,23 @@ static HRESULT WINAPI InternetProtocolSi ULONG ulStatusCode, LPCWSTR szStatusText) { BindProtocol *This = PROTSINK_THIS(iface); - FIXME("(%p)->(%u %s)\n", This, ulStatusCode, debugstr_w(szStatusText)); + + TRACE("(%p)->(%u %s)\n", This, ulStatusCode, debugstr_w(szStatusText)); + + switch(ulStatusCode) { + case BINDSTATUS_SENDINGREQUEST: + return IInternetProtocolSink_ReportProgress(This->protocol_sink, + ulStatusCode, NULL); + case BINDSTATUS_CACHEFILENAMEAVAILABLE: + return IInternetProtocolSink_ReportProgress(This->protocol_sink, + ulStatusCode, szStatusText); + case BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE: + return IInternetProtocolSink_ReportProgress(This->protocol_sink, + BINDSTATUS_MIMETYPEAVAILABLE, szStatusText); + default: + FIXME("unsupported ulStatusCode %u\n", ulStatusCode); + } + return E_NOTIMPL; } @@ -342,16 +435,20 @@ static HRESULT WINAPI InternetProtocolSi DWORD grfBSCF, ULONG ulProgress, ULONG ulProgressMax) { BindProtocol *This = PROTSINK_THIS(iface); - FIXME("(%p)->(%d %u %u)\n", This, grfBSCF, ulProgress, ulProgressMax); - return E_NOTIMPL; + + TRACE("(%p)->(%d %u %u)\n", This, grfBSCF, ulProgress, ulProgressMax); + + return S_OK; } static HRESULT WINAPI InternetProtocolSink_ReportResult(IInternetProtocolSink *iface, HRESULT hrResult, DWORD dwError, LPCWSTR szResult) { BindProtocol *This = PROTSINK_THIS(iface); - FIXME("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult)); - return E_NOTIMPL; + + TRACE("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult)); + + return IInternetProtocolSink_ReportResult(This->protocol_sink, hrResult, dwError, szResult); } #undef PROTSINK_THIS @@ -374,7 +471,11 @@ HRESULT create_binding_protocol(LPCWSTR ret->lpInternetBindInfoVtbl = &InternetBindInfoVtbl; ret->lpInternetPriorityVtbl = &InternetPriorityVtbl; ret->lpInternetProtocolSinkVtbl = &InternetProtocolSinkVtbl; + ret->ref = 1; + ret->protocol = NULL; + ret->bind_info = NULL; + ret->protocol_sink = NULL; *protocol = PROTOCOL(ret); return S_OK;

1 0

Jacek Caban : urlmon: Return CLSID from get_protocol_handler.
by Alexandre Julliard 24 Jan '07

24 Jan '07

Module: wine Branch: master Commit: 87de64227a4e6822d5f519851502db1cbb3c37c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87de64227a4e6822d5f519851… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 23 19:35:35 2007 +0100 urlmon: Return CLSID from get_protocol_handler. --- dlls/urlmon/binding.c | 2 +- dlls/urlmon/session.c | 37 ++++++++++++++++++++++--------------- dlls/urlmon/urlmon_main.h | 2 +- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 3da3a5b..edf3bd2 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1079,7 +1079,7 @@ static HRESULT get_protocol(Binding *Thi return S_OK; } - hres = get_protocol_handler(url, &cf); + hres = get_protocol_handler(url, NULL, &cf); if(FAILED(hres)) return hres; diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index a9eb292..670b0f5 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -36,25 +36,26 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct name_space { LPWSTR protocol; IClassFactory *cf; + CLSID clsid; struct name_space *next; } name_space; static name_space *name_space_list = NULL; -static IClassFactory *find_name_space(LPCWSTR protocol) +static name_space *find_name_space(LPCWSTR protocol) { name_space *iter; for(iter = name_space_list; iter; iter = iter->next) { if(!strcmpW(iter->protocol, protocol)) - return iter->cf; + return iter; } return NULL; } -static HRESULT get_protocol_iface(LPCWSTR schema, DWORD schema_len, IUnknown **ret) +static HRESULT get_protocol_iface(LPCWSTR schema, DWORD schema_len, CLSID *pclsid, IUnknown **ret) { WCHAR str_clsid[64]; HKEY hkey = NULL; @@ -92,13 +93,16 @@ static HRESULT get_protocol_iface(LPCWST return hres; } + if(pclsid) + *pclsid = clsid; + return CoGetClassObject(&clsid, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void**)ret); } IInternetProtocolInfo *get_protocol_info(LPCWSTR url) { IInternetProtocolInfo *ret = NULL; - IClassFactory *cf; + name_space *ns; IUnknown *unk; WCHAR schema[64]; DWORD schema_len; @@ -109,18 +113,18 @@ IInternetProtocolInfo *get_protocol_info if(FAILED(hres) || !schema_len) return NULL; - cf = find_name_space(schema); - if(cf) { - hres = IClassFactory_QueryInterface(cf, &IID_IInternetProtocolInfo, (void**)&ret); + ns = find_name_space(schema); + if(ns) { + hres = IClassFactory_QueryInterface(ns->cf, &IID_IInternetProtocolInfo, (void**)&ret); if(SUCCEEDED(hres)) return ret; - hres = IClassFactory_CreateInstance(cf, NULL, &IID_IInternetProtocolInfo, (void**)&ret); + hres = IClassFactory_CreateInstance(ns->cf, NULL, &IID_IInternetProtocolInfo, (void**)&ret); if(SUCCEEDED(hres)) return ret; } - hres = get_protocol_iface(schema, schema_len, &unk); + hres = get_protocol_iface(schema, schema_len, NULL, &unk); if(FAILED(hres)) return NULL; @@ -130,10 +134,10 @@ IInternetProtocolInfo *get_protocol_info return ret; } -HRESULT get_protocol_handler(LPCWSTR url, IClassFactory **ret) +HRESULT get_protocol_handler(LPCWSTR url, CLSID *clsid, IClassFactory **ret) { - IClassFactory *cf; IUnknown *unk; + name_space *ns; WCHAR schema[64]; DWORD schema_len; HRESULT hres; @@ -143,13 +147,15 @@ HRESULT get_protocol_handler(LPCWSTR url if(FAILED(hres) || !schema_len) return schema_len ? hres : E_FAIL; - cf = find_name_space(schema); - if(cf) { - *ret = cf; + ns = find_name_space(schema); + if(ns) { + *ret = ns->cf; + if(clsid) + *clsid = ns->clsid; return S_OK; } - hres = get_protocol_iface(schema, schema_len, &unk); + hres = get_protocol_iface(schema, schema_len, clsid, &unk); if(FAILED(hres)) return hres; @@ -213,6 +219,7 @@ static HRESULT WINAPI InternetSession_Re IClassFactory_AddRef(pCF); new_name_space->cf = pCF; + new_name_space->clsid = *rclsid; new_name_space->next = name_space_list; name_space_list = new_name_space; diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index bc48062..46ec671 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -56,7 +56,7 @@ HRESULT UMCreateStreamOnCacheFile(LPCWST void UMCloseCacheFileStream(IUMCacheStream *pstr); IInternetProtocolInfo *get_protocol_info(LPCWSTR url); -HRESULT get_protocol_handler(LPCWSTR url, IClassFactory **ret); +HRESULT get_protocol_handler(LPCWSTR url, CLSID *clsid, IClassFactory **ret); HRESULT start_binding(LPCWSTR url, IBindCtx *pbc, REFIID riid, void **ppv);

1 0

Jacek Caban : urlmon: Added IInternetProtocolSink interface to BindProtocol .
by Alexandre Julliard 24 Jan '07

24 Jan '07

Module: wine Branch: master Commit: 6c13f391da6d4df83254b9052c06300107baf789 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c13f391da6d4df83254b9052… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 23 19:45:27 2007 +0100 urlmon: Added IInternetProtocolSink interface to BindProtocol. --- dlls/urlmon/bindprot.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 72 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 8f0bf89..5ae24ac 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -35,6 +35,7 @@ typedef struct { const IInternetProtocolVtbl *lpInternetProtocolVtbl; const IInternetBindInfoVtbl *lpInternetBindInfoVtbl; const IInternetPriorityVtbl *lpInternetPriorityVtbl; + const IInternetProtocolSinkVtbl *lpInternetProtocolSinkVtbl; LONG ref; } BindProtocol; @@ -42,6 +43,7 @@ typedef struct { #define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) #define BINDINFO(x) ((IInternetBindInfo*) &(x)->lpInternetBindInfoVtbl) #define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) +#define PROTSINK(x) ((IInternetProtocolSink*) &(x)->lpInternetProtocolSinkVtbl) #define PROTOCOL_THIS(iface) DEFINE_THIS(BindProtocol, InternetProtocol, iface) @@ -67,8 +69,11 @@ static HRESULT WINAPI BindProtocol_Query *ppv = PRIORITY(This); }else if(IsEqualGUID(&IID_IAuthenticate, riid)) { FIXME("(%p)->(IID_IAuthenticate %p)\n", This, ppv); + }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { + FIXME("(%p)->(IID_IServiceProvider %p)\n", This, ppv); }else if(IsEqualGUID(&IID_IInternetProtocolSink, riid)) { - FIXME("(%p)->(IID_IInternetProtocolSink %p)\n", This, ppv); + TRACE("(%p)->(IID_IInternetProtocolSink %p)\n", This, ppv); + *ppv = PROTSINK(This); } if(*ppv) { @@ -296,6 +301,71 @@ static const IInternetPriorityVtbl Inter }; +#define PROTSINK_THIS(iface) DEFINE_THIS(BindProtocol, InternetProtocolSink, iface) + +static HRESULT WINAPI InternetProtocolSink_QueryInterface(IInternetProtocolSink *iface, + REFIID riid, void **ppv) +{ + BindProtocol *This = PROTSINK_THIS(iface); + return IInternetProtocol_QueryInterface(PROTOCOL(This), riid, ppv); +} + +static ULONG WINAPI InternetProtocolSink_AddRef(IInternetProtocolSink *iface) +{ + BindProtocol *This = PROTSINK_THIS(iface); + return IInternetProtocol_AddRef(PROTOCOL(This)); +} + +static ULONG WINAPI InternetProtocolSink_Release(IInternetProtocolSink *iface) +{ + BindProtocol *This = PROTSINK_THIS(iface); + return IInternetProtocol_Release(PROTOCOL(This)); +} + +static HRESULT WINAPI InternetProtocolSink_Switch(IInternetProtocolSink *iface, + PROTOCOLDATA *pProtocolData) +{ + BindProtocol *This = PROTSINK_THIS(iface); + FIXME("(%p)->(%p)\n", This, pProtocolData); + return E_NOTIMPL; +} + +static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink *iface, + ULONG ulStatusCode, LPCWSTR szStatusText) +{ + BindProtocol *This = PROTSINK_THIS(iface); + FIXME("(%p)->(%u %s)\n", This, ulStatusCode, debugstr_w(szStatusText)); + return E_NOTIMPL; +} + +static HRESULT WINAPI InternetProtocolSink_ReportData(IInternetProtocolSink *iface, + DWORD grfBSCF, ULONG ulProgress, ULONG ulProgressMax) +{ + BindProtocol *This = PROTSINK_THIS(iface); + FIXME("(%p)->(%d %u %u)\n", This, grfBSCF, ulProgress, ulProgressMax); + return E_NOTIMPL; +} + +static HRESULT WINAPI InternetProtocolSink_ReportResult(IInternetProtocolSink *iface, + HRESULT hrResult, DWORD dwError, LPCWSTR szResult) +{ + BindProtocol *This = PROTSINK_THIS(iface); + FIXME("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult)); + return E_NOTIMPL; +} + +#undef PROTSINK_THIS + +static const IInternetProtocolSinkVtbl InternetProtocolSinkVtbl = { + InternetProtocolSink_QueryInterface, + InternetProtocolSink_AddRef, + InternetProtocolSink_Release, + InternetProtocolSink_Switch, + InternetProtocolSink_ReportProgress, + InternetProtocolSink_ReportData, + InternetProtocolSink_ReportResult +}; + HRESULT create_binding_protocol(LPCWSTR url, IInternetProtocol **protocol) { BindProtocol *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(BindProtocol)); @@ -303,6 +373,7 @@ HRESULT create_binding_protocol(LPCWSTR ret->lpInternetProtocolVtbl = &BindProtocolVtbl; ret->lpInternetBindInfoVtbl = &InternetBindInfoVtbl; ret->lpInternetPriorityVtbl = &InternetPriorityVtbl; + ret->lpInternetProtocolSinkVtbl = &InternetProtocolSinkVtbl; ret->ref = 1; *protocol = PROTOCOL(ret);

1 0

Jacek Caban : urlmon: Added IInternetPriority interface to BindProtocol.
by Alexandre Julliard 24 Jan '07

24 Jan '07

Module: wine Branch: master Commit: 6bbd8c7f6e93386b3acda688d77f141285ec4e6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bbd8c7f6e93386b3acda688d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jan 23 19:34:00 2007 +0100 urlmon: Added IInternetPriority interface to BindProtocol. --- dlls/urlmon/bindprot.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 9d08671..8f0bf89 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -34,12 +34,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); typedef struct { const IInternetProtocolVtbl *lpInternetProtocolVtbl; const IInternetBindInfoVtbl *lpInternetBindInfoVtbl; + const IInternetPriorityVtbl *lpInternetPriorityVtbl; LONG ref; } BindProtocol; #define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) #define BINDINFO(x) ((IInternetBindInfo*) &(x)->lpInternetBindInfoVtbl) +#define PRIORITY(x) ((IInternetPriority*) &(x)->lpInternetPriorityVtbl) #define PROTOCOL_THIS(iface) DEFINE_THIS(BindProtocol, InternetProtocol, iface) @@ -60,6 +62,13 @@ static HRESULT WINAPI BindProtocol_Query }else if(IsEqualGUID(&IID_IInternetBindInfo, riid)) { TRACE("(%p)->(IID_IInternetBindInfo %p)\n", This, ppv); *ppv = BINDINFO(This); + }else if(IsEqualGUID(&IID_IInternetPriority, riid)) { + TRACE("(%p)->(IID_IInternetPriority %p)\n", This, ppv); + *ppv = PRIORITY(This); + }else if(IsEqualGUID(&IID_IAuthenticate, riid)) { + FIXME("(%p)->(IID_IAuthenticate %p)\n", This, ppv); + }else if(IsEqualGUID(&IID_IInternetProtocolSink, riid)) { + FIXME("(%p)->(IID_IInternetProtocolSink %p)\n", This, ppv); } if(*ppv) { @@ -241,12 +250,59 @@ static const IInternetBindInfoVtbl Inter BindInfo_GetBindString }; +#define PRIORITY_THIS(iface) DEFINE_THIS(BindProtocol, InternetPriority, iface) + +static HRESULT WINAPI InternetPriority_QueryInterface(IInternetPriority *iface, + REFIID riid, void **ppv) +{ + BindProtocol *This = PRIORITY_THIS(iface); + return IInternetProtocol_QueryInterface(PROTOCOL(This), riid, ppv); +} + +static ULONG WINAPI InternetPriority_AddRef(IInternetPriority *iface) +{ + BindProtocol *This = PRIORITY_THIS(iface); + return IInternetProtocol_AddRef(PROTOCOL(This)); +} + +static ULONG WINAPI InternetPriority_Release(IInternetPriority *iface) +{ + BindProtocol *This = PRIORITY_THIS(iface); + return IInternetProtocol_Release(PROTOCOL(This)); +} + +static HRESULT WINAPI InternetPriority_SetPriority(IInternetPriority *iface, LONG nPriority) +{ + BindProtocol *This = PRIORITY_THIS(iface); + FIXME("(%p)->(%d)\n", This, nPriority); + return E_NOTIMPL; +} + +static HRESULT WINAPI InternetPriority_GetPriority(IInternetPriority *iface, LONG *pnPriority) +{ + BindProtocol *This = PRIORITY_THIS(iface); + FIXME("(%p)->(%p)\n", This, pnPriority); + return E_NOTIMPL; +} + +#undef PRIORITY_THIS + +static const IInternetPriorityVtbl InternetPriorityVtbl = { + InternetPriority_QueryInterface, + InternetPriority_AddRef, + InternetPriority_Release, + InternetPriority_SetPriority, + InternetPriority_GetPriority + +}; + HRESULT create_binding_protocol(LPCWSTR url, IInternetProtocol **protocol) { BindProtocol *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(BindProtocol)); ret->lpInternetProtocolVtbl = &BindProtocolVtbl; ret->lpInternetBindInfoVtbl = &InternetBindInfoVtbl; + ret->lpInternetPriorityVtbl = &InternetPriorityVtbl; ret->ref = 1; *protocol = PROTOCOL(ret);

1 0