October 2013 - Wine-Commits

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

Oct. 25, 2013

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 Oct. 25, 2013

Oct. 25, 2013

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 Oct. 25, 2013

Oct. 25, 2013

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 Oct. 25, 2013

Oct. 25, 2013

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 Oct. 25, 2013

Oct. 25, 2013

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: Call IExternalConnection_ReleaseConnection with the correct final parameter .
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

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

Stefan Dösinger : ddraw/tests: Test DDLOCK_DISCARDCONTENTS.
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: e47edf47fe8c20e1af665d5ff21aa548d15202be URL: http://source.winehq.org/git/wine.git/?a=commit;h=e47edf47fe8c20e1af665d5ff… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 24 14:43:43 2013 +0200 ddraw/tests: Test DDLOCK_DISCARDCONTENTS. --- dlls/ddraw/tests/ddraw1.c | 96 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 96 +++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 100 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 100 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 392 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e47edf47fe8c20e1af665…

1 0

Stefan Dösinger : ddraw: Make default pool resources dynamic.
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: 9e0ba3eab0a20fdcadeb252e793adfcdd221ff36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e0ba3eab0a20fdcadeb252e7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Oct 24 14:43:42 2013 +0200 ddraw: Make default pool resources dynamic. To make DDLOCK_DISCARDCONTENTS actually do anything. The MAPPABLE flag is now redundant. --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/surface.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e01f923..964428a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2873,7 +2873,7 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, * the surface isn't mapped, and that updates done this way will be * visible on the screen. The game Nox is such an application, * Commandos: Behind Enemy Lines is another. */ - const DWORD flags = WINED3D_SURFACE_MAPPABLE | WINED3D_SURFACE_PIN_SYSMEM; + const DWORD flags = WINED3D_SURFACE_PIN_SYSMEM; TRACE("ddraw %p, surface_desc %p, surface %p, outer_unknown %p.\n", ddraw, DDSD, surface, UnkOuter); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index e11b633..bbe7d0e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5623,7 +5623,7 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac } else { - wined3d_desc.usage = WINED3DUSAGE_TEXTURE; + wined3d_desc.usage = WINED3DUSAGE_TEXTURE | WINED3DUSAGE_DYNAMIC; pool = WINED3D_POOL_DEFAULT; } @@ -5771,6 +5771,7 @@ HRESULT ddraw_surface_init(struct ddraw_surface *surface, struct ddraw *ddraw, /* Videomemory adds localvidmem. This is mutually exclusive with * systemmemory and texturemanage. */ desc->ddsCaps.dwCaps |= DDSCAPS_LOCALVIDMEM; + usage |= WINED3DUSAGE_DYNAMIC; } format = wined3dformat_from_ddrawformat(&desc->u4.ddpfPixelFormat);

1 0

Jacek Caban : wininet: Compile tests with -D__WINESRC__.
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: e857a70ae2c4ddba8b231ee2d3cd98f518b66f11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e857a70ae2c4ddba8b231ee2d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 24 12:15:43 2013 +0200 wininet: Compile tests with -D__WINESRC__. --- dlls/wininet/tests/Makefile.in | 1 - dlls/wininet/tests/ftp.c | 24 +- dlls/wininet/tests/http.c | 678 ++++++++++++++++++------------------ dlls/wininet/tests/internet.c | 78 +++--- dlls/wininet/tests/url.c | 28 +- dlls/wininet/tests/urlcache.c | 146 ++++---- dlls/wininet/tests/wininet_test.h | 2 +- 7 files changed, 478 insertions(+), 479 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e857a70ae2c4ddba8b231…

1 0

Alexandre Julliard : winemac: Don' t try to set the app icon before GDI is properly initialized.
by Alexandre Julliard Oct. 24, 2013

Oct. 24, 2013

Module: wine Branch: master Commit: e4a43cfa1f44b4458bd347ce473846daa18f9326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4a43cfa1f44b4458bd347ce4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 24 16:48:12 2013 +0200 winemac: Don't try to set the app icon before GDI is properly initialized. --- dlls/winemac.drv/macdrv_main.c | 15 --------------- dlls/winemac.drv/window.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index df45bb5..5cdd13c 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -91,20 +91,6 @@ const char* debugstr_cf(CFTypeRef t) /*********************************************************************** - * set_app_icon - */ -static void set_app_icon(void) -{ - CFArrayRef images = create_app_icon_images(); - if (images) - { - macdrv_set_application_icon(images); - CFRelease(images); - } -} - - -/*********************************************************************** * get_config_key * * Get a config key from either the app-specific or the default config @@ -208,7 +194,6 @@ static BOOL process_attach(void) return FALSE; } - set_app_icon(); macdrv_clipboard_process_attach(); return TRUE; diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 007d5b0..4e132fa 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -929,6 +929,20 @@ void activate_on_following_focus(void) } +/*********************************************************************** + * set_app_icon + */ +static void set_app_icon(void) +{ + CFArrayRef images = create_app_icon_images(); + if (images) + { + macdrv_set_application_icon(images); + CFRelease(images); + } +} + + /********************************************************************** * CreateDesktopWindow (MACDRV.@) */ @@ -968,6 +982,7 @@ BOOL CDECL macdrv_CreateDesktopWindow(HWND hwnd) SERVER_END_REQ; } + set_app_icon(); return TRUE; }

1 0