wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Vincent Povirk : mscoree: Do a "normal" runtime shutdown from _CorExeMain.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: 770918a91b3c804d6427c936562e4136ba931e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=770918a91b3c804d6427c9365… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 24 15:17:24 2013 -0500 mscoree: Do a "normal" runtime shutdown from _CorExeMain. This needs to work differently from CorExitProcess because we need to wait for foreground threads and abort the rest. --- dlls/mscoree/corruntimehost.c | 8 ++++++-- dlls/mscoree/metahost.c | 4 ++++ dlls/mscoree/mscoree_private.h | 2 ++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index c37651a..4ae85b9 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -1034,7 +1034,7 @@ __int32 WINAPI _CorExeMain(void) int exit_code; int argc; char **argv; - MonoDomain *domain; + MonoDomain *domain=NULL; MonoImage *image; MonoImageOpenStatus status; MonoAssembly *assembly=NULL; @@ -1101,7 +1101,11 @@ __int32 WINAPI _CorExeMain(void) HeapFree(GetProcessHeap(), 0, argv); - unload_all_runtimes(); + if (domain) + { + mono_thread_manage(); + mono_jit_cleanup(domain); + } return exit_code; } diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index ae0e123..de1d004 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -88,6 +88,7 @@ static void (CDECL *mono_free)(void *); static MonoImage* (CDECL *mono_image_open)(const char *fname, MonoImageOpenStatus *status); MonoImage* (CDECL *mono_image_open_from_module_handle)(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status); static void (CDECL *mono_install_assembly_preload_hook)(MonoAssemblyPreLoadFunc func, void *user_data); +void (CDECL *mono_jit_cleanup)(MonoDomain *domain); int (CDECL *mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]); MonoDomain* (CDECL *mono_jit_init)(const char *file); static int (CDECL *mono_jit_set_trace_options)(const char* options); @@ -106,6 +107,7 @@ static void (CDECL *mono_set_verbose_level)(DWORD level); MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); static char* (CDECL *mono_stringify_assembly_name)(MonoAssemblyName *aname); MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); +void (CDECL *mono_thread_manage)(void); static void (CDECL *mono_thread_pool_cleanup)(void); static void (CDECL *mono_thread_suspend_all_other_threads)(void); static void (CDECL *mono_threads_set_shutting_down)(void); @@ -204,6 +206,7 @@ static HRESULT load_mono(CLRRuntimeInfo *This) LOAD_MONO_FUNCTION(mono_free); LOAD_MONO_FUNCTION(mono_image_open); LOAD_MONO_FUNCTION(mono_install_assembly_preload_hook); + LOAD_MONO_FUNCTION(mono_jit_cleanup); LOAD_MONO_FUNCTION(mono_jit_exec); LOAD_MONO_FUNCTION(mono_jit_init); LOAD_MONO_FUNCTION(mono_jit_set_trace_options); @@ -221,6 +224,7 @@ static HRESULT load_mono(CLRRuntimeInfo *This) LOAD_MONO_FUNCTION(mono_stringify_assembly_name); LOAD_MONO_FUNCTION(mono_string_new); LOAD_MONO_FUNCTION(mono_thread_attach); + LOAD_MONO_FUNCTION(mono_thread_manage); LOAD_MONO_FUNCTION(mono_trace_set_assembly); #undef LOAD_MONO_FUNCTION diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 58a5088..2a6d32e 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -145,6 +145,7 @@ extern MonoClass* (CDECL *mono_class_from_mono_type)(MonoType *type); extern MonoClass* (CDECL *mono_class_from_name)(MonoImage *image, const char* name_space, const char *name); extern MonoMethod* (CDECL *mono_class_get_method_from_name)(MonoClass *klass, const char *name, int param_count); extern MonoAssembly* (CDECL *mono_domain_assembly_open)(MonoDomain *domain, const char *name); +extern void (CDECL *mono_jit_cleanup)(MonoDomain *domain); extern int (CDECL *mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]); extern MonoDomain* (CDECL *mono_jit_init)(const char *file); extern MonoImage* (CDECL *mono_image_open_from_module_handle)(HMODULE module_handle, char* fname, UINT has_entry_point, MonoImageOpenStatus* status); @@ -157,6 +158,7 @@ extern MonoObject* (CDECL *mono_runtime_invoke)(MonoMethod *method, void *obj, v extern void (CDECL *mono_runtime_object_init)(MonoObject *this_obj); extern MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); extern MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); +extern void (CDECL *mono_thread_manage)(void); extern void (CDECL *mono_trace_set_assembly)(MonoAssembly *assembly); /* loaded runtime interfaces */

1 0

Vincent Povirk : mscoree: Remove support for multiple Mono ABI versions.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: 6b889fe9188a97765bcbcc2cae5ca2480a73e7af URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b889fe9188a97765bcbcc2ca… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Oct 24 14:34:24 2013 -0500 mscoree: Remove support for multiple Mono ABI versions. Having two instances of Mono loaded at once is problematic, and now that we use the 2.0 runtime to support 1.x there's no need to support old versions. --- dlls/mscoree/corruntimehost.c | 88 ++++++------- dlls/mscoree/metahost.c | 280 +++++++++++++++++----------------------- dlls/mscoree/mscoree_private.h | 72 ++++------- 3 files changed, 183 insertions(+), 257 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6b889fe9188a97765bcbc…

1 0

Nikolay Sivov : ole32: Support activation context in CLSIDFromProgID().
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: 0af3bd8365c9b975261a9cd9ddb23b7f791bc095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0af3bd8365c9b975261a9cd9d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 24 22:49:20 2013 +0400 ole32: Support activation context in CLSIDFromProgID(). --- dlls/ole32/compobj.c | 19 +++++++++++++++++++ dlls/ole32/tests/compobj.c | 10 +++------- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 4d791f4..8f3f303 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -135,6 +135,13 @@ struct ifacepsredirect_data ULONG name_offset; }; +struct progidredirect_data +{ + ULONG size; + DWORD reserved; + ULONG clsid_offset; +}; + struct class_reg_data { union @@ -2331,12 +2338,24 @@ HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *ppszProgID) */ HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID clsid) { + ACTCTX_SECTION_KEYED_DATA data; + if (!progid || !clsid) { ERR("neither progid (%p) nor clsid (%p) are optional\n", progid, clsid); return E_INVALIDARG; } + data.cbSize = sizeof(data); + if (FindActCtxSectionStringW(0, NULL, ACTIVATION_CONTEXT_SECTION_COM_PROGID_REDIRECTION, + progid, &data)) + { + struct progidredirect_data *progiddata = (struct progidredirect_data*)data.lpData; + CLSID *alias = (CLSID*)((BYTE*)data.lpSectionBase + progiddata->clsid_offset); + *clsid = *alias; + return S_OK; + } + return clsid_from_string_reg(progid, clsid); } diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 81f099c..3deedf3 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -379,12 +379,9 @@ static void test_CLSIDFromProgID(void) clsid = CLSID_NULL; hr = CLSIDFromProgID(progidW, &clsid); -todo_wine - ok(hr == S_OK, "got 0x%08x\n", hr); - if (hr == S_OK) - /* it returns generated CLSID here */ - ok(!IsEqualCLSID(&clsid, &CLSID_non_existent) && !IsEqualCLSID(&clsid, &CLSID_NULL), - "got wrong clsid %s\n", debugstr_guid(&clsid)); + /* it returns generated CLSID here */ + ok(!IsEqualCLSID(&clsid, &CLSID_non_existent) && !IsEqualCLSID(&clsid, &CLSID_NULL), + "got wrong clsid %s\n", debugstr_guid(&clsid)); /* duplicate progid present in context - returns generated guid here too */ clsid = CLSID_NULL; @@ -393,7 +390,6 @@ todo_wine clsid1 = CLSID_StdFont; /* that's where it differs from StdFont */ clsid1.Data4[7] = 0x52; -todo_wine ok(!IsEqualCLSID(&clsid, &CLSID_StdFont) && !IsEqualCLSID(&clsid, &CLSID_NULL) && !IsEqualCLSID(&clsid, &clsid1), "got %s\n", debugstr_guid(&clsid));

1 0

Nikolay Sivov : ole32: Add a helper to map ProgID to CLSID using registry.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: f96631e1108e6b23e0432e1c4fbac1a151341bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f96631e1108e6b23e0432e1c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 24 22:12:56 2013 +0400 ole32: Add a helper to map ProgID to CLSID using registry. --- dlls/ole32/compobj.c | 61 +++++++++++++++++++++++--------------------- dlls/ole32/tests/compobj.c | 9 ++++++ 2 files changed, 41 insertions(+), 29 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index b8954fb..4d791f4 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2066,6 +2066,36 @@ static HRESULT __CLSIDFromString(LPCWSTR s, LPCLSID id) /*****************************************************************************/ +static HRESULT clsid_from_string_reg(LPCOLESTR progid, CLSID *clsid) +{ + static const WCHAR clsidW[] = { '\\','C','L','S','I','D',0 }; + WCHAR buf2[CHARS_IN_GUID]; + LONG buf2len = sizeof(buf2); + HKEY xhkey; + WCHAR *buf; + + memset(clsid, 0, sizeof(*clsid)); + buf = HeapAlloc( GetProcessHeap(),0,(strlenW(progid)+8) * sizeof(WCHAR) ); + strcpyW( buf, progid ); + strcatW( buf, clsidW ); + if (open_classes_key(HKEY_CLASSES_ROOT, buf, MAXIMUM_ALLOWED, &xhkey)) + { + HeapFree(GetProcessHeap(),0,buf); + WARN("couldn't open key for ProgID %s\n", debugstr_w(progid)); + return CO_E_CLASSSTRING; + } + HeapFree(GetProcessHeap(),0,buf); + + if (RegQueryValueW(xhkey,NULL,buf2,&buf2len)) + { + RegCloseKey(xhkey); + WARN("couldn't query clsid value for ProgID %s\n", debugstr_w(progid)); + return CO_E_CLASSSTRING; + } + RegCloseKey(xhkey); + return __CLSIDFromString(buf2,clsid); +} + HRESULT WINAPI CLSIDFromString(LPCOLESTR idstr, LPCLSID id ) { HRESULT ret; @@ -2076,7 +2106,7 @@ HRESULT WINAPI CLSIDFromString(LPCOLESTR idstr, LPCLSID id ) ret = __CLSIDFromString(idstr, id); if(ret != S_OK) { /* It appears a ProgID is also valid */ CLSID tmp_id; - ret = CLSIDFromProgID(idstr, &tmp_id); + ret = clsid_from_string_reg(idstr, &tmp_id); if(SUCCEEDED(ret)) *id = tmp_id; } @@ -2301,40 +2331,13 @@ HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *ppszProgID) */ HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID clsid) { - static const WCHAR clsidW[] = { '\\','C','L','S','I','D',0 }; - WCHAR buf2[CHARS_IN_GUID]; - LONG buf2len = sizeof(buf2); - HKEY xhkey; - WCHAR *buf; - if (!progid || !clsid) { ERR("neither progid (%p) nor clsid (%p) are optional\n", progid, clsid); return E_INVALIDARG; } - /* initialise clsid in case of failure */ - memset(clsid, 0, sizeof(*clsid)); - - buf = HeapAlloc( GetProcessHeap(),0,(strlenW(progid)+8) * sizeof(WCHAR) ); - strcpyW( buf, progid ); - strcatW( buf, clsidW ); - if (open_classes_key(HKEY_CLASSES_ROOT, buf, MAXIMUM_ALLOWED, &xhkey)) - { - HeapFree(GetProcessHeap(),0,buf); - WARN("couldn't open key for ProgID %s\n", debugstr_w(progid)); - return CO_E_CLASSSTRING; - } - HeapFree(GetProcessHeap(),0,buf); - - if (RegQueryValueW(xhkey,NULL,buf2,&buf2len)) - { - RegCloseKey(xhkey); - WARN("couldn't query clsid value for ProgID %s\n", debugstr_w(progid)); - return CO_E_CLASSSTRING; - } - RegCloseKey(xhkey); - return __CLSIDFromString(buf2,clsid); + return clsid_from_string_reg(progid, clsid); } /****************************************************************************** diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 3bc98fc..81f099c 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -368,6 +368,15 @@ static void test_CLSIDFromProgID(void) { GUID clsid1; + memset(&clsid, 0xcc, sizeof(clsid)); + hr = CLSIDFromProgID(wszNonExistent, &clsid); + ok(hr == CO_E_CLASSSTRING, "got 0x%08x\n", hr); + ok(IsEqualCLSID(&clsid, &CLSID_NULL), "should have zero CLSID on failure\n"); + + /* CLSIDFromString() doesn't check activation context */ + hr = CLSIDFromString(progidW, &clsid); + ok(hr == CO_E_CLASSSTRING, "got 0x%08x\n", hr); + clsid = CLSID_NULL; hr = CLSIDFromProgID(progidW, &clsid); todo_wine

1 0

Alexandre Julliard : winetest: Disable caching for php files.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: tools Branch: master Commit: 755172c04c2eb2b128796860df5a079aeaeb54c2 URL: http://source.winehq.org/git/tools.git/?a=commit;h=755172c04c2eb2b128796860… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 25 12:35:47 2013 +0200 winetest: Disable caching for php files. --- winetest/tests/.htaccess | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/winetest/tests/.htaccess b/winetest/tests/.htaccess index f6c2d00..3189dbd 100644 --- a/winetest/tests/.htaccess +++ b/winetest/tests/.htaccess @@ -8,3 +8,13 @@ SetEnv no-gzip dont-vary Options ExecCGI SetHandler cgi-script </Files> + +<FilesMatch "\.php$"> +FileETag None +<ifModule mod_headers.c> +Header unset ETag +Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate" +Header set Pragma "no-cache" +Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT" +</ifModule> +</FilesMatch>

1 0

Huw Davies : ole32: If an object exposes IExternalConnection then don' t take down the stub manager if we have remaining weak refs in a call that would otherwise ignore them .
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 5077fc895fe98eabd8d511340853db120ad82f06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5077fc895fe98eabd8d511340… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 24 16:16:52 2013 +0100 ole32: If an object exposes IExternalConnection then don't take down the stub manager if we have remaining weak refs in a call that would otherwise ignore them. --- dlls/ole32/stubmanager.c | 3 ++- dlls/ole32/tests/marshal.c | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 6e59581..fbbf413 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -440,7 +440,8 @@ ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tablewea IExternalConnection_ReleaseConnection(m->extern_conn, EXTCONN_STRONG, 0, last_unlock_releases); if (rc == 0) - stub_manager_int_release(m); + if (!(m->extern_conn && last_unlock_releases && m->weakrefs)) + stub_manager_int_release(m); return rc; } diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 105e644..680b831 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1125,7 +1125,6 @@ static void test_tableweak_marshal_and_unmarshal_twice(void) * behaviour is altered; the remaining weak ref prevents stub shutdown. */ if (with_external_conn) { -todo_wine ok_more_than_one_lock(); IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); release_host_object(tid, 0); @@ -1347,7 +1346,6 @@ static void test_tableweak_and_normal_marshal_and_unmarshal(void) * behaviour is altered; the remaining weak ref prevents stub shutdown. */ if (with_external_conn) { -todo_wine ok_more_than_one_lock(); IStream_Seek(data.pStream1, ullZero, STREAM_SEEK_SET, NULL); release_host_object(tid, 1); @@ -1397,7 +1395,6 @@ static void test_tableweak_and_normal_marshal_and_releasedata(void) if (with_external_conn) { -todo_wine ok_more_than_one_lock(); IStream_Seek(data.pStream1, ullZero, STREAM_SEEK_SET, NULL); release_host_object(tid, 1);

1 0

Huw Davies : ole32: Call IExternalConnection_ReleaseConnection with the correct final parameter .
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 1864db2faaf671648ba75111a13d52af130a4426 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1864db2faaf671648ba75111a… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 24 16:16:51 2013 +0100 ole32: Call IExternalConnection_ReleaseConnection with the correct final parameter. --- dlls/ole32/stubmanager.c | 2 +- dlls/ole32/tests/marshal.c | 5 ----- 2 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 9f33056..6e59581 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -437,7 +437,7 @@ ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tablewea TRACE("removed %u refs from %p (oid %s), rc is now %u\n", refs, m, wine_dbgstr_longlong(m->oid), rc); if (last_extern_ref && m->extern_conn) - IExternalConnection_ReleaseConnection(m->extern_conn, EXTCONN_STRONG, 0, TRUE /* FIXME: Use last_unlock releases? */); + IExternalConnection_ReleaseConnection(m->extern_conn, EXTCONN_STRONG, 0, last_unlock_releases); if (rc == 0) stub_manager_int_release(m); diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index cd49a7c..105e644 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -430,7 +430,6 @@ static void test_normal_marshal_and_unmarshal(void) ok_more_than_one_lock(); ok_zero_external_conn(); -todo_wine ok_last_release_closes(FALSE); IUnknown_Release(pProxy); @@ -512,7 +511,6 @@ static void test_same_apartment_unmarshal_failure(void) ok_no_locks(); ok_zero_external_conn(); -todo_wine ok_last_release_closes(FALSE); IStream_Release(pStream); @@ -1582,7 +1580,6 @@ static void test_lock_object_external(void) ok_no_locks(); ok_zero_external_conn(); -todo_wine ok_last_release_closes(FALSE); /* test CoLockObjectExternal doesn't release the last reference to an @@ -1603,7 +1600,6 @@ todo_wine ok_more_than_one_lock(); ok_zero_external_conn(); -todo_wine ok_last_release_closes(FALSE); CoDisconnectObject((IUnknown*)&Test_ClassFactory, 0); @@ -1676,7 +1672,6 @@ static void test_normal_marshal_and_unmarshal_twice(void) ok_more_than_one_lock(); ok_zero_external_conn(); -todo_wine ok_last_release_closes(FALSE); IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL);

1 0

Huw Davies : ole32: When releasing marshal data of a normal ref ignore any remaining weak refs .
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 8235b55917e74a3be687e3be36670bf328569f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8235b55917e74a3be687e3be3… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 24 16:16:50 2013 +0100 ole32: When releasing marshal data of a normal ref ignore any remaining weak refs. --- dlls/ole32/stubmanager.c | 2 +- dlls/ole32/tests/marshal.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/stubmanager.c b/dlls/ole32/stubmanager.c index 973114e..9f33056 100644 --- a/dlls/ole32/stubmanager.c +++ b/dlls/ole32/stubmanager.c @@ -578,7 +578,7 @@ void stub_manager_release_marshal_data(struct stub_manager *m, ULONG refs, const else if (ifstub->flags & MSHLFLAGS_TABLESTRONG) refs = 1; - stub_manager_ext_release(m, refs, tableweak, FALSE); + stub_manager_ext_release(m, refs, tableweak, !tableweak); } /* is an ifstub table marshaled? */ diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index d0865f3..cd49a7c 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1399,12 +1399,12 @@ static void test_tableweak_and_normal_marshal_and_releasedata(void) if (with_external_conn) { +todo_wine ok_more_than_one_lock(); IStream_Seek(data.pStream1, ullZero, STREAM_SEEK_SET, NULL); release_host_object(tid, 1); } -else todo_wine ok_no_locks(); IStream_Release(data.pStream1);

1 0

Huw Davies : ole32/tests: Add some tests for CoReleaseMarshalData with a combination of normal and weak marshals .
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 17d81e0987afd3e55af9f92a0cb63aa3cd4b8305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17d81e0987afd3e55af9f92a0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 24 16:16:49 2013 +0100 ole32/tests: Add some tests for CoReleaseMarshalData with a combination of normal and weak marshals. --- dlls/ole32/tests/marshal.c | 98 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 3510aad..d0865f3 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -1364,6 +1364,102 @@ todo_wine CloseHandle(thread); } +static void test_tableweak_and_normal_marshal_and_releasedata(void) +{ + HRESULT hr; + DWORD tid; + HANDLE thread; + struct duo_marshal_data data; + + cLocks = 0; + external_connections = 0; + + data.hReadyEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + data.hQuitEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + data.marshal_flags1 = MSHLFLAGS_TABLEWEAK; + data.marshal_flags2 = MSHLFLAGS_NORMAL; + hr = CreateStreamOnHGlobal(NULL, TRUE, &data.pStream1); + ok_ole_success(hr, CreateStreamOnHGlobal); + hr = CreateStreamOnHGlobal(NULL, TRUE, &data.pStream2); + ok_ole_success(hr, CreateStreamOnHGlobal); + + thread = CreateThread(NULL, 0, duo_marshal_thread_proc, &data, 0, &tid); + ok( !WaitForSingleObject(data.hReadyEvent, 10000), "wait timed out\n" ); + CloseHandle(data.hReadyEvent); + + ok_more_than_one_lock(); + ok_non_zero_external_conn(); + + /* release normal - which in the non-external conn case will free the object despite the weak ref. */ + IStream_Seek(data.pStream2, ullZero, STREAM_SEEK_SET, NULL); + release_host_object(tid, 2); + + ok_zero_external_conn(); + ok_last_release_closes(TRUE); + + if (with_external_conn) + { + ok_more_than_one_lock(); + IStream_Seek(data.pStream1, ullZero, STREAM_SEEK_SET, NULL); + release_host_object(tid, 1); + } + +else todo_wine + ok_no_locks(); + + IStream_Release(data.pStream1); + IStream_Release(data.pStream2); + + SetEvent(data.hQuitEvent); + ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); + CloseHandle(thread); +} + +static void test_two_tableweak_marshal_and_releasedata(void) +{ + HRESULT hr; + DWORD tid; + HANDLE thread; + struct duo_marshal_data data; + + cLocks = 0; + external_connections = 0; + + data.hReadyEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + data.hQuitEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + data.marshal_flags1 = MSHLFLAGS_TABLEWEAK; + data.marshal_flags2 = MSHLFLAGS_TABLEWEAK; + hr = CreateStreamOnHGlobal(NULL, TRUE, &data.pStream1); + ok_ole_success(hr, CreateStreamOnHGlobal); + hr = CreateStreamOnHGlobal(NULL, TRUE, &data.pStream2); + ok_ole_success(hr, CreateStreamOnHGlobal); + + thread = CreateThread(NULL, 0, duo_marshal_thread_proc, &data, 0, &tid); + ok( !WaitForSingleObject(data.hReadyEvent, 10000), "wait timed out\n" ); + CloseHandle(data.hReadyEvent); + + ok_more_than_one_lock(); + ok_zero_external_conn(); + + /* release one weak ref - the remaining weak ref will keep the obj alive */ + IStream_Seek(data.pStream1, ullZero, STREAM_SEEK_SET, NULL); + release_host_object(tid, 1); + + ok_more_than_one_lock(); + + IStream_Seek(data.pStream2, ullZero, STREAM_SEEK_SET, NULL); + release_host_object(tid, 2); + + ok_no_locks(); + + IStream_Release(data.pStream1); + IStream_Release(data.pStream2); + + SetEvent(data.hQuitEvent); + ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); + CloseHandle(thread); +} + /* tests success case of a same-thread table-strong marshal, unmarshal, unmarshal */ static void test_tablestrong_marshal_and_unmarshal_twice(void) { @@ -3435,6 +3531,8 @@ START_TEST(marshal) test_tableweak_marshal_releasedata1(); test_tableweak_marshal_releasedata2(); test_tableweak_and_normal_marshal_and_unmarshal(); + test_tableweak_and_normal_marshal_and_releasedata(); + test_two_tableweak_marshal_and_releasedata(); test_tablestrong_marshal_and_unmarshal_twice(); test_lock_object_external(); test_disconnect_stub();

1 0

Huw Davies : ole32/tests: Make the two reference marshalling thread more generic.
by Alexandre Julliard 24 Oct '13

24 Oct '13

Module: wine Branch: master Commit: 61fb28de3f18d65609f9e26af883ffd5f55694db URL: http://source.winehq.org/git/wine.git/?a=commit;h=61fb28de3f18d65609f9e26af… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Oct 24 16:16:48 2013 +0100 ole32/tests: Make the two reference marshalling thread more generic. --- dlls/ole32/tests/marshal.c | 56 +++++++++++++++++++++++-------------------- 1 files changed, 30 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index 48f3cea..3510aad 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -346,10 +346,10 @@ static DWORD start_host_object(IStream *stream, REFIID riid, IUnknown *object, M /* asks thread to release the marshal data because it has to be done by the * same thread that marshaled the interface in the first place. */ -static void release_host_object(DWORD tid) +static void release_host_object(DWORD tid, WPARAM wp) { HANDLE event = CreateEventA(NULL, FALSE, FALSE, NULL); - PostThreadMessageA(tid, RELEASEMARSHALDATA, 0, (LPARAM)event); + PostThreadMessageA(tid, RELEASEMARSHALDATA, wp, (LPARAM)event); ok( !WaitForSingleObject(event, 10000), "wait timed out\n" ); CloseHandle(event); } @@ -1130,7 +1130,7 @@ static void test_tableweak_marshal_and_unmarshal_twice(void) todo_wine ok_more_than_one_lock(); IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); - release_host_object(tid); + release_host_object(tid, 0); } /* Without IExternalConnection this line is shows the difference between weak and strong table marshaling @@ -1171,7 +1171,7 @@ static void test_tableweak_marshal_releasedata1(void) /* release the remaining reference on the object by calling * CoReleaseMarshalData in the hosting thread */ IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); - release_host_object(tid); + release_host_object(tid, 0); ok_more_than_one_lock(); ok_non_zero_external_conn(); @@ -1224,7 +1224,7 @@ static void test_tableweak_marshal_releasedata2(void) /* release the remaining reference on the object by calling * CoReleaseMarshalData in the hosting thread */ IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); - release_host_object(tid); + release_host_object(tid, 0); ok_no_locks(); @@ -1244,27 +1244,27 @@ static void test_tableweak_marshal_releasedata2(void) end_host_object(tid, thread); } -struct weak_and_normal_marshal_data +struct duo_marshal_data { - IStream *pStreamWeak; - IStream *pStreamNormal; + MSHLFLAGS marshal_flags1, marshal_flags2; + IStream *pStream1, *pStream2; HANDLE hReadyEvent; HANDLE hQuitEvent; }; -static DWORD CALLBACK weak_and_normal_marshal_thread_proc(void *p) +static DWORD CALLBACK duo_marshal_thread_proc(void *p) { HRESULT hr; - struct weak_and_normal_marshal_data *data = p; + struct duo_marshal_data *data = p; HANDLE hQuitEvent = data->hQuitEvent; MSG msg; pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); - hr = CoMarshalInterface(data->pStreamWeak, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHCTX_INPROC, NULL, MSHLFLAGS_TABLEWEAK); + hr = CoMarshalInterface(data->pStream1, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHCTX_INPROC, NULL, data->marshal_flags1); ok_ole_success(hr, "CoMarshalInterface"); - hr = CoMarshalInterface(data->pStreamNormal, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); + hr = CoMarshalInterface(data->pStream2, &IID_IClassFactory, (IUnknown*)&Test_ClassFactory, MSHCTX_INPROC, NULL, data->marshal_flags2); ok_ole_success(hr, "CoMarshalInterface"); /* force the message queue to be created before signaling parent thread */ @@ -1278,7 +1278,7 @@ static DWORD CALLBACK weak_and_normal_marshal_thread_proc(void *p) { if (msg.hwnd == NULL && msg.message == RELEASEMARSHALDATA) { - CoReleaseMarshalData(data->pStreamWeak); + CoReleaseMarshalData(msg.wParam == 1 ? data->pStream1 : data->pStream2); SetEvent((HANDLE)msg.lParam); } else @@ -1300,33 +1300,37 @@ static void test_tableweak_and_normal_marshal_and_unmarshal(void) IUnknown *pProxyNormal = NULL; DWORD tid; HANDLE thread; - struct weak_and_normal_marshal_data data; + struct duo_marshal_data data; cLocks = 0; external_connections = 0; data.hReadyEvent = CreateEventA(NULL, FALSE, FALSE, NULL); data.hQuitEvent = CreateEventA(NULL, FALSE, FALSE, NULL); - hr = CreateStreamOnHGlobal(NULL, TRUE, &data.pStreamWeak); + data.marshal_flags1 = MSHLFLAGS_TABLEWEAK; + data.marshal_flags2 = MSHLFLAGS_NORMAL; + hr = CreateStreamOnHGlobal(NULL, TRUE, &data.pStream1); ok_ole_success(hr, CreateStreamOnHGlobal); - hr = CreateStreamOnHGlobal(NULL, TRUE, &data.pStreamNormal); + hr = CreateStreamOnHGlobal(NULL, TRUE, &data.pStream2); ok_ole_success(hr, CreateStreamOnHGlobal); - thread = CreateThread(NULL, 0, weak_and_normal_marshal_thread_proc, &data, 0, &tid); + thread = CreateThread(NULL, 0, duo_marshal_thread_proc, &data, 0, &tid); ok( !WaitForSingleObject(data.hReadyEvent, 10000), "wait timed out\n" ); CloseHandle(data.hReadyEvent); ok_more_than_one_lock(); ok_non_zero_external_conn(); - IStream_Seek(data.pStreamWeak, ullZero, STREAM_SEEK_SET, NULL); - hr = CoUnmarshalInterface(data.pStreamWeak, &IID_IClassFactory, (void **)&pProxyWeak); + /* weak */ + IStream_Seek(data.pStream1, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(data.pStream1, &IID_IClassFactory, (void **)&pProxyWeak); ok_ole_success(hr, CoUnmarshalInterface); ok_more_than_one_lock(); - IStream_Seek(data.pStreamNormal, ullZero, STREAM_SEEK_SET, NULL); - hr = CoUnmarshalInterface(data.pStreamNormal, &IID_IClassFactory, (void **)&pProxyNormal); + /* normal */ + IStream_Seek(data.pStream2, ullZero, STREAM_SEEK_SET, NULL); + hr = CoUnmarshalInterface(data.pStream2, &IID_IClassFactory, (void **)&pProxyNormal); ok_ole_success(hr, CoUnmarshalInterface); ok_more_than_one_lock(); @@ -1347,13 +1351,13 @@ static void test_tableweak_and_normal_marshal_and_unmarshal(void) { todo_wine ok_more_than_one_lock(); - IStream_Seek(data.pStreamWeak, ullZero, STREAM_SEEK_SET, NULL); - release_host_object(tid); + IStream_Seek(data.pStream1, ullZero, STREAM_SEEK_SET, NULL); + release_host_object(tid, 1); } ok_no_locks(); - IStream_Release(data.pStreamWeak); - IStream_Release(data.pStreamNormal); + IStream_Release(data.pStream1); + IStream_Release(data.pStream2); SetEvent(data.hQuitEvent); ok( !WaitForSingleObject(thread, 10000), "wait timed out\n" ); @@ -1403,7 +1407,7 @@ static void test_tablestrong_marshal_and_unmarshal_twice(void) /* release the remaining reference on the object by calling * CoReleaseMarshalData in the hosting thread */ IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); - release_host_object(tid); + release_host_object(tid, 0); IStream_Release(pStream); ok_no_locks();

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2013