September 2009 - Wine-commits

Jacek Caban : mshtml: Added JScriptProtocolInfo::QueryInfo implementation.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: f66e95c0e2d24a17d77aae5e5babd73504ee1edd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f66e95c0e2d24a17d77aae5e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 8 22:28:28 2009 +0200 mshtml: Added JScriptProtocolInfo::QueryInfo implementation. --- dlls/mshtml/protocol.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 2ca5c8c..193004d 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -974,9 +974,28 @@ static HRESULT WINAPI JSProtocolInfo_QueryInfo(IInternetProtocolInfo *iface, LPC QUERYOPTION QueryOption, DWORD dwQueryFlags, LPVOID pBuffer, DWORD cbBuffer, DWORD* pcbBuf, DWORD dwReserved) { - FIXME("%p)->(%s %08x %08x %p %d %p %d)\n", iface, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer, + TRACE("%p)->(%s %08x %08x %p %d %p %d)\n", iface, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer, cbBuffer, pcbBuf, dwReserved); - return E_NOTIMPL; + + switch(QueryOption) { + case QUERY_USES_NETWORK: + if(!pBuffer || cbBuffer < sizeof(DWORD)) + return E_FAIL; + + *(DWORD*)pBuffer = 0; + if(pcbBuf) + *pcbBuf = sizeof(DWORD); + break; + + case QUERY_IS_SECURE: + FIXME("not supporte QUERY_IS_SECURE\n"); + return E_NOTIMPL; + + default: + return INET_E_USE_DEFAULT_PROTOCOLHANDLER; + } + + return S_OK; } static const IInternetProtocolInfoVtbl JSProtocolInfoVtbl = {

1 0

Jacek Caban : mshtml: Added JSProtocolInfo::ParseUrl implementation.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 5b5c8abcad66f7c73dbbb95cd0d51148f7d09e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b5c8abcad66f7c73dbbb95cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 8 22:28:00 2009 +0200 mshtml: Added JSProtocolInfo::ParseUrl implementation. --- dlls/mshtml/protocol.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index b25bf94..2ca5c8c 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -953,9 +953,21 @@ static HRESULT WINAPI JSProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPCW PARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult, DWORD* pcchResult, DWORD dwReserved) { - FIXME("%p)->(%s %d %x %p %d %p %d)\n", iface, debugstr_w(pwzUrl), ParseAction, + TRACE("%p)->(%s %d %x %p %d %p %d)\n", iface, debugstr_w(pwzUrl), ParseAction, dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved); - return E_NOTIMPL; + + switch(ParseAction) { + case PARSE_SECURITY_URL: + FIXME("PARSE_SECURITY_URL\n"); + return E_NOTIMPL; + case PARSE_DOMAIN: + FIXME("PARSE_DOMAIN\n"); + return E_NOTIMPL; + default: + return INET_E_DEFAULT_ACTION; + } + + return S_OK; } static HRESULT WINAPI JSProtocolInfo_QueryInfo(IInternetProtocolInfo *iface, LPCWSTR pwzUrl,

1 0

Jacek Caban : mshtml: Added JSProtocol class factory stub implementation.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 316cd276608f70aab119d9d24836f411e5a6e347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=316cd276608f70aab119d9d24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 8 22:27:31 2009 +0200 mshtml: Added JSProtocol class factory stub implementation. --- dlls/mshtml/protocol.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/protocol.c b/dlls/mshtml/protocol.c index 97a3a59..b25bf94 100644 --- a/dlls/mshtml/protocol.c +++ b/dlls/mshtml/protocol.c @@ -938,6 +938,58 @@ static ProtocolFactory ResProtocolFactory = { &ResProtocolFactoryVtbl }; +/******************************************************************** + * JSProtocol implementation + */ + +static HRESULT WINAPI JSProtocolFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, + REFIID riid, void **ppv) +{ + FIXME("(%p)->(%p %s %p)\n", iface, pUnkOuter, debugstr_guid(riid), ppv); + return E_NOTIMPL; +} + +static HRESULT WINAPI JSProtocolInfo_ParseUrl(IInternetProtocolInfo *iface, LPCWSTR pwzUrl, + PARSEACTION ParseAction, DWORD dwParseFlags, LPWSTR pwzResult, DWORD cchResult, + DWORD* pcchResult, DWORD dwReserved) +{ + FIXME("%p)->(%s %d %x %p %d %p %d)\n", iface, debugstr_w(pwzUrl), ParseAction, + dwParseFlags, pwzResult, cchResult, pcchResult, dwReserved); + return E_NOTIMPL; +} + +static HRESULT WINAPI JSProtocolInfo_QueryInfo(IInternetProtocolInfo *iface, LPCWSTR pwzUrl, + QUERYOPTION QueryOption, DWORD dwQueryFlags, LPVOID pBuffer, DWORD cbBuffer, DWORD* pcbBuf, + DWORD dwReserved) +{ + FIXME("%p)->(%s %08x %08x %p %d %p %d)\n", iface, debugstr_w(pwzUrl), QueryOption, dwQueryFlags, pBuffer, + cbBuffer, pcbBuf, dwReserved); + return E_NOTIMPL; +} + +static const IInternetProtocolInfoVtbl JSProtocolInfoVtbl = { + InternetProtocolInfo_QueryInterface, + InternetProtocolInfo_AddRef, + InternetProtocolInfo_Release, + JSProtocolInfo_ParseUrl, + InternetProtocolInfo_CombineUrl, + InternetProtocolInfo_CompareUrl, + JSProtocolInfo_QueryInfo +}; + +static const IClassFactoryVtbl JSProtocolFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + JSProtocolFactory_CreateInstance, + ClassFactory_LockServer +}; + +static ProtocolFactory JSProtocolFactory = { + &JSProtocolInfoVtbl, + &JSProtocolFactoryVtbl +}; + HRESULT ProtocolFactory_Create(REFCLSID rclsid, REFIID riid, void **ppv) { ProtocolFactory *cf = NULL; @@ -946,6 +998,8 @@ HRESULT ProtocolFactory_Create(REFCLSID rclsid, REFIID riid, void **ppv) cf = &AboutProtocolFactory; else if(IsEqualGUID(&CLSID_ResProtocol, rclsid)) cf = &ResProtocolFactory; + else if(IsEqualGUID(&CLSID_JSProtocol, rclsid)) + cf = &JSProtocolFactory; if(!cf) { FIXME("not implemented protocol %s\n", debugstr_guid(rclsid));

1 0

Jacek Caban : mshtml: Improve debug messages for timer invocation.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 09c20de83c1d7106c24e62703c0d522ce526ba91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09c20de83c1d7106c24e62703… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 8 22:27:03 2009 +0200 mshtml: Improve debug messages for timer invocation. --- dlls/mshtml/task.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 0759580..61040e8 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -374,8 +374,14 @@ static void call_timer_disp(IDispatch *disp) V_VT(&res) = VT_EMPTY; memset(&ei, 0, sizeof(ei)); + + TRACE(">>>\n"); hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dp, &res, &ei, NULL); - TRACE("ret %08x %s\n", hres, debugstr_variant(&res)); + if(hres == S_OK) + TRACE("<<<\n"); + else + WARN("<<< %08x\n", hres); + VariantClear(&res); }

1 0

Jacek Caban : mshtml: Make empty string is a valid overflow style.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 537bbe2ce5c22ed6da1566dbdd6d579a24775eee URL: http://source.winehq.org/git/wine.git/?a=commit;h=537bbe2ce5c22ed6da1566dbd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Sep 8 22:26:49 2009 +0200 mshtml: Make empty string is a valid overflow style. --- dlls/mshtml/htmlstyle.c | 2 +- dlls/mshtml/tests/dom.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index a993702..5a75e2b 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -2016,7 +2016,7 @@ static HRESULT WINAPI HTMLStyle_put_overflow(IHTMLStyle *iface, BSTR v) TRACE("(%p)->(%s)\n", This, debugstr_w(v)); /* overflow can only be one of the follow values. */ - if(!v || strcmpiW(szVisible, v) == 0 || strcmpiW(szScroll, v) == 0 || + if(!v || !*v || strcmpiW(szVisible, v) == 0 || strcmpiW(szScroll, v) == 0 || strcmpiW(szHidden, v) == 0 || strcmpiW(szAuto, v) == 0) { return set_nsstyle_attr(This->nsstyle, STYLEID_OVERFLOW, v, 0); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 6c03b0e..49f5ab1 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3441,6 +3441,16 @@ static void test_default_style(IHTMLStyle *style) ok(!strcmp_wa(str, "auto"), "str=%s\n", wine_dbgstr_w(str)); SysFreeString(str); + str = a2bstr(""); + hres = IHTMLStyle_put_overflow(style, str); + ok(hres == S_OK, "put_overflow failed: %08x\n", hres); + SysFreeString(str); + + hres = IHTMLStyle_get_overflow(style, &str); + ok(hres == S_OK, "get_overflow failed: %08x\n", hres); + ok(!str, "str=%s\n", wine_dbgstr_w(str)); + SysFreeString(str); + /* restore overflow default */ hres = IHTMLStyle_put_overflow(style, sOverflowDefault); ok(hres == S_OK, "put_overflow failed: %08x\n", hres);

1 0

Juan Lang : winhttp: Add a fixme for WINHTTP_OPTION_SECURITY_FLAGS.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 1dc145d05fde5e9b4defdcbae88ecee3252ac21c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dc145d05fde5e9b4defdcbae… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 2 08:26:20 2009 -0700 winhttp: Add a fixme for WINHTTP_OPTION_SECURITY_FLAGS. --- dlls/winhttp/session.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 7bc61a9..d5649ed 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -581,6 +581,10 @@ static BOOL request_set_option( object_header_t *hdr, DWORD option, LPVOID buffe hdr->redirect_policy = policy; return TRUE; } + case WINHTTP_OPTION_SECURITY_FLAGS: + FIXME("WINHTTP_OPTION_SECURITY_FLAGS unimplemented (%08x)\n", + *(DWORD *)buffer); + return TRUE; default: FIXME("unimplemented option %u\n", option); set_last_error( ERROR_INVALID_PARAMETER );

1 0

Aurimas Fišeras : jscript: Update Lithuanian translation.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 576ee54daf5b96bbc72e8476b105bea5715ee4d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=576ee54daf5b96bbc72e8476b… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Sep 8 21:58:26 2009 +0300 jscript: Update Lithuanian translation. --- dlls/jscript/jscript_Lt.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Lt.rc b/dlls/jscript/jscript_Lt.rc index de0037e..c49aec0 100644 --- a/dlls/jscript/jscript_Lt.rc +++ b/dlls/jscript/jscript_Lt.rc @@ -37,6 +37,7 @@ STRINGTABLE DISCARDABLE IDS_NOT_FUNC "Tikėtasi funkcijos" IDS_NOT_DATE "„[objektas]“ nėra datos objektas" IDS_NOT_NUM "Tikėtasi skaičiaus" + IDS_OBJECT_EXPECTED "Tikėtasi objekto" IDS_ILLEGAL_ASSIGN "Neleistinas priskyrimas" IDS_UNDEFINED "„|“ yra neapibrėžtas" IDS_NOT_BOOL "Tikėtasi loginio objekto"

1 0

Jaime Rave : wined3d: Fix vendor detection when using an Intel X4500HD.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 4700038fdf32c8b5392bb78e35d2f71d4deae6e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4700038fdf32c8b5392bb78e3… Author: Jaime Rave <jaimerave(a)ubuntu-co.com> Date: Tue Sep 8 10:47:34 2009 -0500 wined3d: Fix vendor detection when using an Intel X4500HD. --- dlls/wined3d/directx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9c79bd5..129cbba 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -987,7 +987,7 @@ static GL_Vendors wined3d_guess_vendor(const char *gl_vendor, const char *gl_ren return VENDOR_INTEL; if (strstr(gl_vendor, "Mesa") - || strstr(gl_vendor, "Tungsten Graphics, Inc.")) + || strstr(gl_vendor, "Tungsten Graphics, Inc")) return VENDOR_MESA; FIXME_(d3d_caps)("Received unrecognized GL_VENDOR %s. Returning VENDOR_WINE.\n", debugstr_a(gl_vendor));

1 0

Aric Stewart : msctf: Add stub ITfSourceSingle interface to ThreadMgr.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 515c13774aecc440ca106d955070b1350b89b582 URL: http://source.winehq.org/git/wine.git/?a=commit;h=515c13774aecc440ca106d955… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Sep 8 10:30:10 2009 -0500 msctf: Add stub ITfSourceSingle interface to ThreadMgr. --- dlls/msctf/threadmgr.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 59 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 0661fec..a001792 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -88,7 +88,7 @@ typedef struct tagACLMulti { /* const ITfConfigureSystemKeystrokeFeedVtbl *ConfigureSystemKeystrokeFeedVtbl; */ /* const ITfLangBarItemMgrVtbl *LangBarItemMgrVtbl; */ /* const ITfUIElementMgrVtbl *UIElementMgrVtbl; */ - /* const ITfSourceSingleVtbl *SourceSingleVtbl; */ + const ITfSourceSingleVtbl *SourceSingleVtbl; LONG refCount; /* Aggregation */ @@ -153,6 +153,12 @@ static inline ThreadMgr *impl_from_ITfThreadMgrEventSink(ITfThreadMgrEventSink * return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,ThreadMgrEventSinkVtbl)); } +static inline ThreadMgr *impl_from_ITfSourceSingleVtbl(ITfSourceSingle* iface) + +{ + return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,SourceSingleVtbl)); +} + static HRESULT SetupWindowsHook(ThreadMgr *This) { if (!This->focusHook) @@ -283,6 +289,10 @@ static HRESULT WINAPI ThreadMgr_QueryInterface(ITfThreadMgr *iface, REFIID iid, { *ppvOut = This->CompartmentMgr; } + else if (IsEqualIID(iid, &IID_ITfSourceSingle)) + { + *ppvOut = &This->SourceSingleVtbl; + } if (*ppvOut) { @@ -1172,6 +1182,53 @@ static const ITfThreadMgrEventSinkVtbl ThreadMgr_ThreadMgrEventSinkVtbl = ThreadMgrEventSink_OnPopContext }; +/***************************************************** + * ITfSourceSingle functions + *****************************************************/ +static HRESULT WINAPI ThreadMgrSourceSingle_QueryInterface(ITfSourceSingle *iface, REFIID iid, LPVOID *ppvOut) +{ + ThreadMgr *This = impl_from_ITfSourceSingleVtbl(iface); + return ThreadMgr_QueryInterface((ITfThreadMgr *)This, iid, *ppvOut); +} + +static ULONG WINAPI ThreadMgrSourceSingle_AddRef(ITfSourceSingle *iface) +{ + ThreadMgr *This = impl_from_ITfSourceSingleVtbl(iface); + return ThreadMgr_AddRef((ITfThreadMgr *)This); +} + +static ULONG WINAPI ThreadMgrSourceSingle_Release(ITfSourceSingle *iface) +{ + ThreadMgr *This = impl_from_ITfSourceSingleVtbl(iface); + return ThreadMgr_Release((ITfThreadMgr *)This); +} + +static WINAPI HRESULT ThreadMgrSourceSingle_AdviseSingleSink( ITfSourceSingle *iface, + TfClientId tid, REFIID riid, IUnknown *punk) +{ + ThreadMgr *This = impl_from_ITfSourceSingleVtbl(iface); + FIXME("STUB:(%p) %i %s %p\n",This, tid, debugstr_guid(riid),punk); + return E_NOTIMPL; +} + +static WINAPI HRESULT ThreadMgrSourceSingle_UnadviseSingleSink( ITfSourceSingle *iface, + TfClientId tid, REFIID riid) +{ + ThreadMgr *This = impl_from_ITfSourceSingleVtbl(iface); + FIXME("STUB:(%p) %i %s\n",This, tid, debugstr_guid(riid)); + return E_NOTIMPL; +} + +static const ITfSourceSingleVtbl ThreadMgr_SourceSingleVtbl = +{ + ThreadMgrSourceSingle_QueryInterface, + ThreadMgrSourceSingle_AddRef, + ThreadMgrSourceSingle_Release, + + ThreadMgrSourceSingle_AdviseSingleSink, + ThreadMgrSourceSingle_UnadviseSingleSink, +}; + HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) { ThreadMgr *This; @@ -1197,6 +1254,7 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) This->MessagePumpVtbl= &ThreadMgr_MessagePumpVtbl; This->ClientIdVtbl = &ThreadMgr_ClientIdVtbl; This->ThreadMgrEventSinkVtbl = &ThreadMgr_ThreadMgrEventSinkVtbl; + This->SourceSingleVtbl = &ThreadMgr_SourceSingleVtbl; This->refCount = 1; TlsSetValue(tlsIndex,This);

1 0

Aric Stewart : msctf: Define ITfThreadFocusSink.
by Alexandre Julliard 09 Sep '09

09 Sep '09

Module: wine Branch: master Commit: 6181466ba83888990e367c1f566c3ff128a989d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6181466ba83888990e367c1f5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Sep 8 10:30:20 2009 -0500 msctf: Define ITfThreadFocusSink. --- include/msctf.idl | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/include/msctf.idl b/include/msctf.idl index 204262f..f78289b 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -1344,3 +1344,16 @@ interface ITfSourceSingle : IUnknown [in] TfClientId tid, [in] REFIID riid); }; + +[ + object, + local, + uuid(c0f1db0c-3a20-405c-a303-96b6010a885f), + pointer_default(unique) +] +interface ITfThreadFocusSink : IUnknown +{ + HRESULT OnSetThreadFocus(); + + HRESULT OnKillThreadFocus(); +};

1 0