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

Alexandre Julliard : widl: Only register interfaces when the factory buffer is known.
by Alexandre Julliard 01 Aug '11

01 Aug '11

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 : ole32: Fix a couple of race conditions with the local server pipe.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: f01c1c429d9bb35e4831efc217bfd236f5a023b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f01c1c429d9bb35e4831efc21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 1 16:20:40 2011 +0200 ole32: Fix a couple of race conditions with the local server pipe. --- dlls/ole32/rpc.c | 44 ++++++++++++++++++++++++-------------------- 1 files changed, 24 insertions(+), 20 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 1a0b575..8ac5d2d 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1890,7 +1890,7 @@ static DWORD WINAPI local_server_thread(LPVOID param) ULONG res; BOOL multi_use = lsp->multi_use; OVERLAPPED ovl; - HANDLE pipe_event; + HANDLE pipe_event, hPipe, new_pipe; DWORD bytes; TRACE("Starting threader for %s.\n",debugstr_guid(&lsp->clsid)); @@ -1899,22 +1899,19 @@ static DWORD WINAPI local_server_thread(LPVOID param) get_localserver_pipe_name(pipefn, &lsp->clsid); ovl.hEvent = pipe_event = CreateEventW(NULL, FALSE, FALSE, NULL); + hPipe = CreateNamedPipeW( pipefn, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_TYPE_BYTE|PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, + 4096, 4096, 500 /* 0.5 second timeout */, NULL ); + if (hPipe == INVALID_HANDLE_VALUE) + { + FIXME("pipe creation failed for %s, le is %u\n", debugstr_w(pipefn), GetLastError()); + CloseHandle(pipe_event); + return 1; + } + SetEvent(lsp->ready_event); - /* Clients trying to connect between now and CreateNamedPipeW() will - * fail and will have to retry. See also the end of the loop. - */ - while (1) { - HANDLE hPipe; - hPipe = CreateNamedPipeW( pipefn, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, - PIPE_TYPE_BYTE|PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, - 4096, 4096, 500 /* 0.5 second timeout */, NULL ); - if (hPipe == INVALID_HANDLE_VALUE) - { - FIXME("pipe creation failed for %s, le is %u\n", debugstr_w(pipefn), GetLastError()); - CloseHandle(pipe_event); - return 1; - } + while (1) { if (!ConnectNamedPipe(hPipe, &ovl)) { DWORD error = GetLastError(); @@ -1976,18 +1973,25 @@ static DWORD WINAPI local_server_thread(LPVOID param) FlushFileBuffers(hPipe); DisconnectNamedPipe(hPipe); - CloseHandle(hPipe); - /* Clients trying to connect between now and CreateNamedPipeW() will - * fail and will have to retry. - */ - TRACE("done marshalling IClassFactory\n"); if (!multi_use) { TRACE("single use object, shutting down pipe %s\n", debugstr_w(pipefn)); + CloseHandle(hPipe); break; } + new_pipe = CreateNamedPipeW( pipefn, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, + PIPE_TYPE_BYTE|PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, + 4096, 4096, 500 /* 0.5 second timeout */, NULL ); + CloseHandle(hPipe); + if (new_pipe == INVALID_HANDLE_VALUE) + { + FIXME("pipe creation failed for %s, le is %u\n", debugstr_w(pipefn), GetLastError()); + CloseHandle(pipe_event); + return 1; + } + hPipe = new_pipe; } CloseHandle(pipe_event); return 0;

1 0

Dan Kegel : riched20/tests: Fix test_EM_FINDWORDBREAK comments.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 28b2d03a8c3dd057a22347b881c02721c974f0b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28b2d03a8c3dd057a22347b88… Author: Dan Kegel <dank(a)kegel.com> Date: Sun Jul 31 20:31:54 2011 -0700 riched20/tests: Fix test_EM_FINDWORDBREAK comments. --- dlls/riched20/tests/editor.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 6bc2d6b..77ce09e 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -7054,11 +7054,11 @@ static void test_EM_FINDWORDBREAK_W(void) BOOL isdelimiter; /* expected result of WB_ISDELIMITER */ } delimiter_tests[] = { {0x0a, FALSE}, /* newline */ - {0x0b, FALSE}, /* vertical tab mark */ + {0x0b, FALSE}, /* vertical tab */ {0x0c, FALSE}, /* form feed */ {0x0d, FALSE}, /* carriage return */ - {0x20, TRUE}, /* ANSI Space */ - {0x61, FALSE}, /* ASCII capital letter a */ + {0x20, TRUE}, /* space */ + {0x61, FALSE}, /* capital letter a */ {0xa0, FALSE}, /* no-break space */ {0x2000, FALSE}, /* en quad */ {0x3000, FALSE}, /* Ideographic space */ @@ -7067,8 +7067,8 @@ static void test_EM_FINDWORDBREAK_W(void) {0x115f, FALSE}, /* Hangul Choseong Filler (no sound, used with two letter Hangul words) Ordinary Letter */ {0xac00, FALSE}, /* Hangul character GA*/ {0xd7af, FALSE}, /* End of Hangul character chart */ - {0xf020, TRUE}, /* High Surrogate Space */ - {0xff20, FALSE}, /* MS private for CP_SYMBOL round trip? */ + {0xf020, TRUE}, /* MS private for CP_SYMBOL round trip?, see kb897872 */ + {0xff20, FALSE}, /* fullwidth commercial @ */ {WCH_EMBEDDING, FALSE}, /* object replacement character*/ }; int i; @@ -7103,11 +7103,11 @@ static void test_EM_FINDWORDBREAK_A(void) BOOL isdelimiter; /* expected result of WB_ISDELIMITER */ } delimiter_tests[] = { {0x0a, FALSE}, /* newline */ - {0x0b, FALSE}, /* vertical tab mark */ + {0x0b, FALSE}, /* vertical tab */ {0x0c, FALSE}, /* form feed */ {0x0d, FALSE}, /* carriage return */ - {0x20, TRUE}, /* ANSI Space */ - {0x61, FALSE}, /* ASCII capital letter a */ + {0x20, TRUE}, /* space */ + {0x61, FALSE}, /* capital letter a */ }; int i; HWND hwndRichEdit = new_richedit(NULL);

1 0

Jacek Caban : mshtml: Added IOmNavigator::get_*Language implementations.
by Alexandre Julliard 01 Aug '11

01 Aug '11

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

Jacek Caban : mshtml: Added IOmNavigator::get_*Language tests.
by Alexandre Julliard 01 Aug '11

01 Aug '11

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 01 Aug '11

01 Aug '11

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 : makefiles: Also install the program manpages from the top-level makefile.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 41107a940f59302ae93145727e6a7ba590fe7671 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41107a940f59302ae93145727… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 1 13:40:19 2011 +0200 makefiles: Also install the program manpages from the top-level makefile. --- Makefile.in | 3 ++- aclocal.m4 | 9 +++++++++ configure | 49 +++++++++++++++++++++++++++++-------------------- configure.ac | 40 ++++++++++++++++++++-------------------- tools/make_makefiles | 3 ++- 5 files changed, 62 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=41107a940f59302ae9314…

1 0

Alexandre Julliard : actxprxy: Specify the PSFactoryBuffer class in the idl files.
by Alexandre Julliard 01 Aug '11

01 Aug '11

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

Alexandre Julliard : dispex: Specify the PSFactoryBuffer class in the idl file.
by Alexandre Julliard 01 Aug '11

01 Aug '11

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 : msdaps: Specify the PSFactoryBuffer class in the idl files.
by Alexandre Julliard 01 Aug '11

01 Aug '11

Module: wine Branch: master Commit: 9a5141b32590fcdec8a4b96d8822ea4b25072392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a5141b32590fcdec8a4b96d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 1 14:26:36 2011 +0200 msdaps: Specify the PSFactoryBuffer class in the idl files. --- .gitignore | 2 -- dlls/msdaps/Makefile.in | 6 +----- dlls/msdaps/main.c | 1 + dlls/msdaps/msdaps.idl | 6 ++++++ dlls/msdaps/row_server.idl | 7 +++++++ 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index ed67e11..8a77f70 100644 --- a/.gitignore +++ b/.gitignore @@ -67,10 +67,8 @@ dlls/libkernel.def dlls/libwinspool.def dlls/libxinput.def dlls/msdaps/msdaps.h -dlls/msdaps/msdaps_i.c dlls/msdaps/msdaps_p.c dlls/msdaps/row_server.h -dlls/msdaps/row_server_i.c dlls/msdaps/row_server_p.c dlls/mshtml.tlb/mshtml_tlb.tlb dlls/mshtml/nsiface.h diff --git a/dlls/msdaps/Makefile.in b/dlls/msdaps/Makefile.in index 01b0b72..3f3d619 100644 --- a/dlls/msdaps/Makefile.in +++ b/dlls/msdaps/Makefile.in @@ -1,6 +1,6 @@ MODULE = msdaps.dll IMPORTS = uuid oleaut32 ole32 rpcrt4 advapi32 -EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_CLSID_IS="{ 0x06210e88, 0x01f5, 0x11d1, { 0xb5, 0x12, 0x00, 0x80, 0xc7, 0x81, 0xc3, 0x84 } }" -DENTRY_PREFIX=msdaps_ +EXTRADEFS = -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer -DENTRY_PREFIX=msdaps_ EXTRAIDLFLAGS = --win32-align=2 EXTRA_OBJS = dlldata.o @@ -10,10 +10,6 @@ C_SRCS = \ row_server.c \ usrmarshal.c -IDL_I_SRCS = \ - msdaps.idl \ - row_server.idl - IDL_P_SRCS = \ msdaps.idl \ row_server.idl diff --git a/dlls/msdaps/main.c b/dlls/msdaps/main.c index b673b58..14c6c01 100644 --- a/dlls/msdaps/main.c +++ b/dlls/msdaps/main.c @@ -29,6 +29,7 @@ #include "wingdi.h" #include "winuser.h" #include "winerror.h" +#include "initguid.h" #include "objbase.h" #include "oleauto.h" #define DBINITCONSTANTS diff --git a/dlls/msdaps/msdaps.idl b/dlls/msdaps/msdaps.idl index c0a8e11..dbbe75c 100644 --- a/dlls/msdaps/msdaps.idl +++ b/dlls/msdaps/msdaps.idl @@ -1 +1,7 @@ #include "oledb.idl" + +[ + threading(both), + uuid(06210e88-01f5-11d1-b512-0080c781c384) +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } diff --git a/dlls/msdaps/row_server.idl b/dlls/msdaps/row_server.idl index 6fb49b0..afe9463 100644 --- a/dlls/msdaps/row_server.idl +++ b/dlls/msdaps/row_server.idl @@ -20,6 +20,13 @@ import "oledb.idl"; + +[ + threading(both), + uuid(06210e88-01f5-11d1-b512-0080c781c384) +] +coclass PSFactoryBuffer { interface IFactoryBuffer; } + [ object, uuid(38248178-cf6d-11de-abe5-000c2916d865),

1 0