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

Alexandre Julliard : windowscodecs: Specify the PSFactoryBuffer class in the idl file.
by Alexandre Julliard Aug. 1, 2011

Aug. 1, 2011

Module: wine Branch: master Commit: b6d2aeee585bc5ac5b66b5e545718e1660689d0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6d2aeee585bc5ac5b66b5e54… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 1 14:27:29 2011 +0200 windowscodecs: Specify the PSFactoryBuffer class in the idl file. --- dlls/windowscodecs/windowscodecs_wincodec.idl | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/windowscodecs_wincodec.idl b/dlls/windowscodecs/windowscodecs_wincodec.idl index 7558f56..fb4dae6 100644 --- a/dlls/windowscodecs/windowscodecs_wincodec.idl +++ b/dlls/windowscodecs/windowscodecs_wincodec.idl @@ -19,6 +19,12 @@ #include "wincodec.idl" [ + threading(both), + uuid(00000301-a8f2-4877-ba0a-fd2b6645fb94) /* IWICFormatConverter */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } + +[ helpstring("WIC Imaging Factory"), threading(both), uuid(cacaf262-9370-4615-a13b-9f5539da4c0a)

1 0

Alexandre Julliard : qmgrprxy: Specify the PSFactoryBuffer class in the idl file.
by Alexandre Julliard Aug. 1, 2011

Aug. 1, 2011

Module: wine Branch: master Commit: c84ce2c72c2fb4ab08ed447f74fa6cf122b9c34c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c84ce2c72c2fb4ab08ed447f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 1 14:27:12 2011 +0200 qmgrprxy: Specify the PSFactoryBuffer class in the idl file. --- dlls/qmgrprxy/qmgrprxy.idl | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/qmgrprxy/qmgrprxy.idl b/dlls/qmgrprxy/qmgrprxy.idl index e1bdce1..369301a 100644 --- a/dlls/qmgrprxy/qmgrprxy.idl +++ b/dlls/qmgrprxy/qmgrprxy.idl @@ -20,3 +20,9 @@ #define DO_NO_IMPORTS #include "bits1_5.idl" + +[ + threading(both), + uuid(5ce34c0d-0dc9-4c1f-897c-daa1b78cee7c) /* IBackgroundCopyManager */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; }

1 0

Alexandre Julliard : widl: Only register interfaces when the factory buffer is known.
by Alexandre Julliard Aug. 1, 2011

Aug. 1, 2011

Module: wine Branch: master Commit: 0359b30b1bc763f3f8904ad20a251f2844c041fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0359b30b1bc763f3f8904ad20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 1 14:28:55 2011 +0200 widl: Only register interfaces when the factory buffer is known. --- tools/widl/register.c | 15 +++------------ 1 files changed, 3 insertions(+), 12 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index 6b9980f..f18e810 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -80,7 +80,7 @@ static const type_t *find_ps_factory( const statement_list_t *stmts ) static int write_interface( const type_t *iface, const type_t *ps_factory ) { const UUID *uuid = get_attrp( iface->attrs, ATTR_UUID ); - const UUID *ps_uuid = ps_factory ? get_attrp( ps_factory->attrs, ATTR_UUID ) : NULL; + const UUID *ps_uuid = get_attrp( ps_factory->attrs, ATTR_UUID ); if (!uuid) return 0; if (!is_object( iface )) return 0; @@ -94,8 +94,7 @@ static int write_interface( const type_t *iface, const type_t *ps_factory ) put_str( indent, "{\n" ); indent++; put_str( indent, "NumMethods = s %u\n", count_methods( iface )); - put_str( indent, "ProxyStubClsid32 = s '%s'\n", - ps_uuid ? format_uuid( ps_uuid ) : "%CLSID_PSFactoryBuffer%" ); + put_str( indent, "ProxyStubClsid32 = s '%s'\n", format_uuid( ps_uuid )); indent--; put_str( indent, "}\n" ); return 1; @@ -222,7 +221,6 @@ static inline void put_string( const char *str ) void write_regscript( const statement_list_t *stmts ) { - int count; const type_t *ps_factory; if (!do_regscript) return; @@ -236,18 +234,11 @@ void write_regscript( const statement_list_t *stmts ) put_str( indent, "NoRemove Interface\n" ); put_str( indent++, "{\n" ); ps_factory = find_ps_factory( stmts ); - count = write_interfaces( stmts, ps_factory ); + if (ps_factory) write_interfaces( stmts, ps_factory ); put_str( --indent, "}\n" ); put_str( indent, "NoRemove CLSID\n" ); put_str( indent++, "{\n" ); - if (count && !ps_factory) - { - put_str( indent, "ForceRemove '%%CLSID_PSFactoryBuffer%%' = s 'PSFactoryBuffer'\n" ); - put_str( indent++, "{\n" ); - put_str( indent, "InprocServer32 = s '%%MODULE%%' { val ThreadingModel = s 'Both' }\n" ); - put_str( --indent, "}\n" ); - } write_coclasses( stmts, NULL ); put_str( --indent, "}\n" );

1 0

Alexandre Julliard : oleaut32: Specify the PSFactoryBuffer class in the idl files.
by Alexandre Julliard Aug. 1, 2011

Aug. 1, 2011

Module: wine Branch: master Commit: df31247ede0f0fb99971b21193e81cb159cd9d58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df31247ede0f0fb99971b2119… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 1 14:27:00 2011 +0200 oleaut32: Specify the PSFactoryBuffer class in the idl files. --- dlls/oleaut32/Makefile.in | 3 +-- dlls/oleaut32/oleaut.c | 1 + dlls/oleaut32/oleaut32_oaidl.idl | 6 ++++++ dlls/oleaut32/oleaut32_ocidl.idl | 6 ++++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index de61a25..ca64fc9 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -3,8 +3,7 @@ IMPORTLIB = oleaut32 IMPORTS = uuid ole32 rpcrt4 user32 gdi32 advapi32 DELAYIMPORTS = comctl32 urlmon windowscodecs EXTRADEFS = -D_OLEAUT32_ -DCOM_NO_WINDOWS_H \ - -DENTRY_PREFIX=OLEAUTPS_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL \ - -DPROXY_CLSID_IS="{0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}}" + -DENTRY_PREFIX=OLEAUTPS_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer C_SRCS = \ connpt.c \ diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 2a3257f..1fe6dcf 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -35,6 +35,7 @@ #include "oleauto.h" #include "initguid.h" #include "typelib.h" +#include "oleaut32_oaidl.h" #include "wine/debug.h" #include "wine/unicode.h" diff --git a/dlls/oleaut32/oleaut32_oaidl.idl b/dlls/oleaut32/oleaut32_oaidl.idl index 320e7ec..3574d08 100644 --- a/dlls/oleaut32/oleaut32_oaidl.idl +++ b/dlls/oleaut32/oleaut32_oaidl.idl @@ -23,3 +23,9 @@ cpp_quote("#if 0 /* oleaut32_oaidl.idl hack */") #include "oaidl.idl" cpp_quote("#endif /* oleaut32_oaidl.idl hack */") + +[ + threading(both), + uuid(b196b286-bab4-101a-b69c-00aa00341d07) +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/oleaut32/oleaut32_ocidl.idl b/dlls/oleaut32/oleaut32_ocidl.idl index 9f6b7cf..514e5d9 100644 --- a/dlls/oleaut32/oleaut32_ocidl.idl +++ b/dlls/oleaut32/oleaut32_ocidl.idl @@ -19,6 +19,12 @@ #include "ocidl.idl" [ + threading(both), + uuid(b196b286-bab4-101a-b69c-00aa00341d07) +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } + +[ helpstring("Standard Font"), progid("StdFont"), threading(both),

1 0

Jacek Caban : mshtml: Added IOmNavigator::get_*Language tests.
by Alexandre Julliard Aug. 1, 2011

Aug. 1, 2011

Module: wine Branch: master Commit: cdd09ba1859fc204042306387dc645d4e80b6500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdd09ba1859fc204042306387… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 31 16:45:45 2011 +0200 mshtml: Added IOmNavigator::get_*Language tests. --- dlls/mshtml/tests/dom.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 08be27d..bba222f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -34,6 +34,8 @@ #include "mshtml_test.h" #include "objsafe.h" +static INT (WINAPI *pLCIDToLocaleName)(LCID,LPWSTR,INT,DWORD); + static const char doc_blank[] = "<html></html>"; static const char doc_str1[] = "<html><body>test</body></html>"; static const char range_test_str[] = @@ -3820,6 +3822,22 @@ static void test_mime_types_col(IOmNavigator *nav) ok(!ref, "ref=%d\n", ref); } +#define test_language_string(a,b) _test_language_string(__LINE__,a,b) +static void _test_language_string(unsigned line, const WCHAR *lang, LCID lcid) +{ + WCHAR buf[64]; + int res; + + if(pLCIDToLocaleName) { + res = pLCIDToLocaleName(lcid, buf, sizeof(buf)/sizeof(WCHAR), 0); + ok_(__FILE__,line)(res, "LCIDToLocaleName failed: %u\n", GetLastError()); + ok_(__FILE__,line)(!lstrcmpW(lang, buf), "lang = %s, expected %s\n", wine_dbgstr_w(lang), wine_dbgstr_w(buf)); + }else { + win_skip("LCIDToLocaleName not available, unable to test language string\n"); + ok_(__FILE__,line)(lang != NULL, "lang == NULL\n"); + } +} + static void test_navigator(IHTMLDocument2 *doc) { IHTMLWindow2 *window; @@ -3877,6 +3895,24 @@ static void test_navigator(IHTMLDocument2 *doc) ok(!memcmp(bstr, v40, sizeof(v40)), "appVersion is %s\n", wine_dbgstr_w(bstr)); SysFreeString(bstr); + bstr = NULL; + hres = IOmNavigator_get_systemLanguage(navigator, &bstr); + ok(hres == S_OK, "get_systemLanguage failed: %08x\n", hres); + test_language_string(bstr, LOCALE_SYSTEM_DEFAULT); + SysFreeString(bstr); + + bstr = NULL; + hres = IOmNavigator_get_browserLanguage(navigator, &bstr); + ok(hres == S_OK, "get_browserLanguage failed: %08x\n", hres); + test_language_string(bstr, GetUserDefaultUILanguage()); + SysFreeString(bstr); + + bstr = NULL; + hres = IOmNavigator_get_userLanguage(navigator, &bstr); + ok(hres == S_OK, "get_userLanguage failed: %08x\n", hres); + test_language_string(bstr, LOCALE_USER_DEFAULT); + SysFreeString(bstr); + hres = IOmNavigator_toString(navigator, NULL); ok(hres == E_INVALIDARG, "toString failed: %08x\n", hres); @@ -5868,6 +5904,8 @@ static void run_domtest(const char *str, domtest_t test) START_TEST(dom) { + pLCIDToLocaleName = (void*)GetProcAddress(GetModuleHandleA("kernel32.dll"), "LCIDToLocaleName"); + CoInitialize(NULL); run_domtest(doc_str1, test_doc_elem);

1 0

Jacek Caban : mshtml: Added IOmNavigator:: get_appMinorVersion implementation.
by Alexandre Julliard Aug. 1, 2011

Aug. 1, 2011

Module: wine Branch: master Commit: 2daff9cc6c1519486128c8e73bc17dafa040344a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2daff9cc6c1519486128c8e73… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 31 16:46:01 2011 +0200 mshtml: Added IOmNavigator::get_appMinorVersion implementation. --- dlls/mshtml/omnavigator.c | 10 ++++++++-- dlls/mshtml/tests/dom.c | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 73e55dd..bfc3d23 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -693,8 +693,14 @@ static HRESULT WINAPI OmNavigator_get_platform(IOmNavigator *iface, BSTR *p) static HRESULT WINAPI OmNavigator_get_appMinorVersion(IOmNavigator *iface, BSTR *p) { OmNavigator *This = impl_from_IOmNavigator(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + static const WCHAR zeroW[] = {'0',0}; + + TRACE("(%p)->(%p)\n", This, p); + + /* NOTE: MSIE returns "0" or values like ";SP2;". Returning "0" should be enough. */ + *p = SysAllocString(zeroW); + return S_OK; } static HRESULT WINAPI OmNavigator_get_connectionSpeed(IOmNavigator *iface, LONG *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index bba222f..a7998d5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3942,6 +3942,12 @@ static void test_navigator(IHTMLDocument2 *doc) skip("nonstandard user agent\n"); } + bstr = NULL; + hres = IOmNavigator_get_appMinorVersion(navigator, &bstr); + ok(hres == S_OK, "get_appMonorVersion failed: %08x\n", hres); + ok(bstr != NULL, "appMinorVersion returned NULL\n"); + SysFreeString(bstr); + test_mime_types_col(navigator); ref = IOmNavigator_Release(navigator);

1 0

Alexandre Julliard : dispex: Specify the PSFactoryBuffer class in the idl file.
by Alexandre Julliard Aug. 1, 2011

Aug. 1, 2011

Module: wine Branch: master Commit: d428dd348f7d8b6823b8e28dd6194fb1f0af7d6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d428dd348f7d8b6823b8e28dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 1 14:26:26 2011 +0200 dispex: Specify the PSFactoryBuffer class in the idl file. --- dlls/dispex/disp_ex.idl | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/dispex/disp_ex.idl b/dlls/dispex/disp_ex.idl index 2db98ff..4008a7a 100644 --- a/dlls/dispex/disp_ex.idl +++ b/dlls/dispex/disp_ex.idl @@ -1 +1,7 @@ #include "dispex.idl" + +[ + threading(both), + uuid(10e2414a-ec59-49d2-bc51-5add2c36febc) /* IDispatchEx */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; }

1 0

Alexandre Julliard : ole32: Specify the PSFactoryBuffer class in the idl files.
by Alexandre Julliard Aug. 1, 2011

Aug. 1, 2011

Module: wine Branch: master Commit: 096bf10f117ff58b40b895d7c91c3482e08ecc10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=096bf10f117ff58b40b895d7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 1 14:26:47 2011 +0200 ole32: Specify the PSFactoryBuffer class in the idl files. --- dlls/ole32/compobj_private.h | 1 - dlls/ole32/dcom.idl | 6 ++++++ dlls/ole32/ole32_objidl.idl | 6 ++++++ dlls/ole32/ole32_oleidl.idl | 6 ++++++ dlls/ole32/ole32_unknwn.idl | 6 ++++++ 5 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index f2a83c8..624909c 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -42,7 +42,6 @@ struct apartment; typedef struct apartment APARTMENT; DEFINE_OLEGUID( CLSID_DfMarshal, 0x0000030b, 0, 0 ); -DEFINE_OLEGUID( CLSID_PSFactoryBuffer, 0x00000320, 0, 0 ); /* signal to stub manager that this is a rem unknown object */ #define MSHLFLAGSP_REMUNKNOWN 0x80000000 diff --git a/dlls/ole32/dcom.idl b/dlls/ole32/dcom.idl index a1c0dcd..4517b46 100644 --- a/dlls/ole32/dcom.idl +++ b/dlls/ole32/dcom.idl @@ -22,6 +22,12 @@ import "unknwn.idl"; [ + threading(both), + uuid(00000320-0000-0000-c000-000000000046) +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } + +[ uuid(99fcfe60-5260-101b-bbcb-00aa0021347a), pointer_default(unique) ] diff --git a/dlls/ole32/ole32_objidl.idl b/dlls/ole32/ole32_objidl.idl index bbb91a4..057a3e3 100644 --- a/dlls/ole32/ole32_objidl.idl +++ b/dlls/ole32/ole32_objidl.idl @@ -97,6 +97,12 @@ coclass Picture_Dib { interface IPicture; } coclass ClassMoniker { interface IMoniker; } [ + threading(both), + uuid(00000320-0000-0000-c000-000000000046) +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } + +[ threading(apartment), uuid(00000323-0000-0000-c000-000000000046) ] diff --git a/dlls/ole32/ole32_oleidl.idl b/dlls/ole32/ole32_oleidl.idl index 93cf079..a3bd881 100644 --- a/dlls/ole32/ole32_oleidl.idl +++ b/dlls/ole32/ole32_oleidl.idl @@ -17,3 +17,9 @@ */ #include "oleidl.idl" + +[ + threading(both), + uuid(00000320-0000-0000-c000-000000000046) +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/ole32/ole32_unknwn.idl b/dlls/ole32/ole32_unknwn.idl index a63f156..9be195f 100644 --- a/dlls/ole32/ole32_unknwn.idl +++ b/dlls/ole32/ole32_unknwn.idl @@ -23,3 +23,9 @@ cpp_quote("#if 0 /* oleaut32_unknwn.idl hack */") #include "unknwn.idl" cpp_quote("#endif /* oleaut32_unknwn.idl hack */") + +[ + threading(both), + uuid(00000320-0000-0000-c000-000000000046) +] +coclass PSFactoryBuffer { interface IFactoryBuffer; }

1 0

Alexandre Julliard : actxprxy: Specify the PSFactoryBuffer class in the idl files.
by Alexandre Julliard Aug. 1, 2011

Aug. 1, 2011

Module: wine Branch: master Commit: 5e0384967034640fa9cad12dec8ec2a7b7db17e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e0384967034640fa9cad12de… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 1 14:26:20 2011 +0200 actxprxy: Specify the PSFactoryBuffer class in the idl files. --- dlls/actxprxy/actxprxy_activscp.idl | 6 ++++++ dlls/actxprxy/actxprxy_comcat.idl | 6 ++++++ dlls/actxprxy/actxprxy_docobj.idl | 6 ++++++ dlls/actxprxy/actxprxy_hlink.idl | 6 ++++++ dlls/actxprxy/actxprxy_htiframe.idl | 6 ++++++ dlls/actxprxy/actxprxy_objsafe.idl | 6 ++++++ dlls/actxprxy/actxprxy_ocmm.idl | 6 ++++++ dlls/actxprxy/actxprxy_servprov.idl | 6 ++++++ dlls/actxprxy/actxprxy_shldisp.idl | 6 ++++++ dlls/actxprxy/actxprxy_shobjidl.idl | 6 ++++++ dlls/actxprxy/actxprxy_urlhist.idl | 6 ++++++ 11 files changed, 66 insertions(+), 0 deletions(-) diff --git a/dlls/actxprxy/actxprxy_activscp.idl b/dlls/actxprxy/actxprxy_activscp.idl index c056a0e..3f0fda7 100644 --- a/dlls/actxprxy/actxprxy_activscp.idl +++ b/dlls/actxprxy/actxprxy_activscp.idl @@ -19,3 +19,9 @@ /* just a wrapper for activscp.idl */ #include "activscp.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/actxprxy/actxprxy_comcat.idl b/dlls/actxprxy/actxprxy_comcat.idl index 6c8155f..548aa0d 100644 --- a/dlls/actxprxy/actxprxy_comcat.idl +++ b/dlls/actxprxy/actxprxy_comcat.idl @@ -19,3 +19,9 @@ /* just a wrapper for comcat.idl */ #include "comcat.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/actxprxy/actxprxy_docobj.idl b/dlls/actxprxy/actxprxy_docobj.idl index 711c385..8b2a83f 100644 --- a/dlls/actxprxy/actxprxy_docobj.idl +++ b/dlls/actxprxy/actxprxy_docobj.idl @@ -19,3 +19,9 @@ /* just a wrapper for docobj.idl */ #include "docobj.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/actxprxy/actxprxy_hlink.idl b/dlls/actxprxy/actxprxy_hlink.idl index 820967d..479e937 100644 --- a/dlls/actxprxy/actxprxy_hlink.idl +++ b/dlls/actxprxy/actxprxy_hlink.idl @@ -19,3 +19,9 @@ /* just a wrapper for hlink.idl */ #include "hlink.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/actxprxy/actxprxy_htiframe.idl b/dlls/actxprxy/actxprxy_htiframe.idl index 146b0a2..e3d5f72 100644 --- a/dlls/actxprxy/actxprxy_htiframe.idl +++ b/dlls/actxprxy/actxprxy_htiframe.idl @@ -19,3 +19,9 @@ /* just a wrapper for htiframe.idl */ #include "htiframe.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/actxprxy/actxprxy_objsafe.idl b/dlls/actxprxy/actxprxy_objsafe.idl index 67e878b..771a4d9 100644 --- a/dlls/actxprxy/actxprxy_objsafe.idl +++ b/dlls/actxprxy/actxprxy_objsafe.idl @@ -19,3 +19,9 @@ /* just a wrapper for objsafe.idl */ #include "objsafe.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/actxprxy/actxprxy_ocmm.idl b/dlls/actxprxy/actxprxy_ocmm.idl index 2df49ce..75e4788 100644 --- a/dlls/actxprxy/actxprxy_ocmm.idl +++ b/dlls/actxprxy/actxprxy_ocmm.idl @@ -19,3 +19,9 @@ /* just a wrapper for ocmm.idl */ #include "ocmm.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/actxprxy/actxprxy_servprov.idl b/dlls/actxprxy/actxprxy_servprov.idl index 08b26ef..1388f23 100644 --- a/dlls/actxprxy/actxprxy_servprov.idl +++ b/dlls/actxprxy/actxprxy_servprov.idl @@ -1 +1,7 @@ #include "servprov.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/actxprxy/actxprxy_shldisp.idl b/dlls/actxprxy/actxprxy_shldisp.idl index 81222a5..e5ddb18 100644 --- a/dlls/actxprxy/actxprxy_shldisp.idl +++ b/dlls/actxprxy/actxprxy_shldisp.idl @@ -19,3 +19,9 @@ /* just a wrapper for shldisp.idl */ #include "shldisp.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/actxprxy/actxprxy_shobjidl.idl b/dlls/actxprxy/actxprxy_shobjidl.idl index 71912fd..ccff236 100644 --- a/dlls/actxprxy/actxprxy_shobjidl.idl +++ b/dlls/actxprxy/actxprxy_shobjidl.idl @@ -19,3 +19,9 @@ /* just a wrapper for shobjidl.idl */ #include "shobjidl.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/actxprxy/actxprxy_urlhist.idl b/dlls/actxprxy/actxprxy_urlhist.idl index 18861b3..f987752 100644 --- a/dlls/actxprxy/actxprxy_urlhist.idl +++ b/dlls/actxprxy/actxprxy_urlhist.idl @@ -19,3 +19,9 @@ /* just a wrapper for urlhist.idl */ #include "urlhist.idl" + +[ + threading(both), + uuid(b8da6310-e19b-11d0-933c-00a0c90dcaa9) /* IActiveScriptStats */ +] +coclass PSFactoryBuffer { interface IFactoryBuffer; }

1 0

Jacek Caban : mshtml: Added IOmNavigator::get_*Language implementations.
by Alexandre Julliard Aug. 1, 2011

Aug. 1, 2011

Module: wine Branch: master Commit: e36d0d2e1bc817934c4fb6eb457c64524b98342d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e36d0d2e1bc817934c4fb6eb4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 31 16:45:26 2011 +0200 mshtml: Added IOmNavigator::get_*Language implementations. --- dlls/mshtml/omnavigator.c | 44 ++++++++++++++++++++++++++++++++++++++------ 1 files changed, 38 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index b4b5c15..73e55dd 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -621,25 +621,57 @@ static HRESULT WINAPI OmNavigator_get_cpuClass(IOmNavigator *iface, BSTR *p) return *p ? S_OK : E_OUTOFMEMORY; } +static HRESULT get_language_string(LCID lcid, BSTR *p) +{ + BSTR ret; + int len; + + len = LCIDToLocaleName(lcid, NULL, 0, 0); + if(!len) { + WARN("LCIDToLocaleName failed: %u\n", GetLastError()); + return E_FAIL; + } + + ret = SysAllocStringLen(NULL, len-1); + if(!ret) + return E_OUTOFMEMORY; + + len = LCIDToLocaleName(lcid, ret, len, 0); + if(!len) { + WARN("LCIDToLocaleName failed: %u\n", GetLastError()); + SysFreeString(ret); + return E_FAIL; + } + + *p = ret; + return S_OK; +} + static HRESULT WINAPI OmNavigator_get_systemLanguage(IOmNavigator *iface, BSTR *p) { OmNavigator *This = impl_from_IOmNavigator(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_language_string(LOCALE_SYSTEM_DEFAULT, p); } static HRESULT WINAPI OmNavigator_get_browserLanguage(IOmNavigator *iface, BSTR *p) { OmNavigator *This = impl_from_IOmNavigator(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_language_string(GetUserDefaultUILanguage(), p); } static HRESULT WINAPI OmNavigator_get_userLanguage(IOmNavigator *iface, BSTR *p) { OmNavigator *This = impl_from_IOmNavigator(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_language_string(LOCALE_USER_DEFAULT, p); } static HRESULT WINAPI OmNavigator_get_platform(IOmNavigator *iface, BSTR *p)

1 0