November 2010 - Wine-Commits

Alexandre Julliard : Wine release 1.3.7
by Alexandre Julliard Nov. 12, 2010

Nov. 12, 2010

Module: website Branch: master Commit: 4e48d9e3edf9375cbb6d0887ac3f6a62f65ee692 URL: http://source.winehq.org/git/website.git/?a=commit;h=4e48d9e3edf9375cbb6d08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 12 20:29:54 2010 +0100 Wine release 1.3.7 --- news/en/2010111201.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2010111201.xml b/news/en/2010111201.xml new file mode 100644 index 0000000..8d83c61 --- /dev/null +++ b/news/en/2010111201.xml @@ -0,0 +1,18 @@ +<news> +<date>November 12, 2010</date> +<title>Wine 1.3.7 Released</title> +<body> + The Wine development release 1.3.7 is now available. + <a href="{$root}/announce/1.3.7">What's new</a> in this release: +<ul> + <li>Improved system tray support.</li> + <li>Better support for installers with assemblies.</li> + <li>Many of the msvcrt "secure" functions implemented.</li> + <li>A lot of fixes to the GStreamer support.</li> + <li>Many MSXML improvements.</li> + <li>Translation updates.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.3.7.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.3.7 : Alexandre Julliard : Release 1.3.7
by Alexandre Julliard Nov. 12, 2010

Nov. 12, 2010

Module: wine Branch: refs/tags/wine-1.3.7 Tag: 30ab8c13d930740bc21481412c3dc98079339651 URL: http://source.winehq.org/git/wine.git/?a=tag;h=30ab8c13d930740bc21481412c3d… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 12 20:20:03 2010 +0100 Release 1.3.7

1 0

Alexandre Julliard : Release 1.3.7.
by Alexandre Julliard Nov. 12, 2010

Nov. 12, 2010

Module: wine Branch: master Commit: b1b485e65cb6e151979e094fbb1c6bd82af5356d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1b485e65cb6e151979e094fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 12 20:20:02 2010 +0100 Release 1.3.7. --- ANNOUNCE | 1206 ++++++++++++++++++++++++++++++++----------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 634 insertions(+), 592 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1b485e65cb6e151979e0…

1 0

Vincent Povirk : gdiplus: Correctly store the given stride in created bitmaps.
by Alexandre Julliard Nov. 12, 2010

Nov. 12, 2010

Module: wine Branch: master Commit: 32bbb0bbcfed7591fe2adcf39a2ccf905cbc7027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32bbb0bbcfed7591fe2adcf39… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Nov 12 10:17:32 2010 -0600 gdiplus: Correctly store the given stride in created bitmaps. --- dlls/gdiplus/image.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index e17edde..69f5865 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1685,6 +1685,8 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, GdipFree(pbmi); if (!hbitmap) return GenericError; + + stride = dib_stride; } else { @@ -1727,7 +1729,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, (*bitmap)->hbitmap = hbitmap; (*bitmap)->hdc = NULL; (*bitmap)->bits = bits; - (*bitmap)->stride = dib_stride; + (*bitmap)->stride = stride; (*bitmap)->own_bits = own_bits; /* set format-related flags */

1 0

Vincent Povirk : mscoree: Implement ClrCreateManagedInstance.
by Alexandre Julliard Nov. 12, 2010

Nov. 12, 2010

Module: wine Branch: master Commit: 3b76a0bed18ed7c8ca74c35fd5edb8400d83ce7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b76a0bed18ed7c8ca74c35fd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 5 17:15:08 2010 -0500 mscoree: Implement ClrCreateManagedInstance. --- dlls/mscoree/corruntimehost.c | 132 ++++++++++++++++++++++++++++++++++++++++ dlls/mscoree/metahost.c | 10 +++ dlls/mscoree/mscoree_main.c | 33 +++++++++- dlls/mscoree/mscoree_private.h | 20 ++++++ 4 files changed, 193 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index c22dd22..d8ee285 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -496,6 +496,138 @@ static const struct ICLRRuntimeHostVtbl CLRHostVtbl = CLRRuntimeHost_ExecuteInDefaultAppDomain }; +/* Create an instance of a type given its name, by calling its constructor with + * no arguments. Note that result MUST be in the stack, or the garbage + * collector may free it prematurely. */ +HRESULT RuntimeHost_CreateManagedInstance(RuntimeHost *This, LPCWSTR name, + MonoDomain *domain, MonoObject **result) +{ + HRESULT hr=S_OK; + char *nameA=NULL; + MonoType *type; + MonoClass *klass; + MonoObject *obj; + + if (!domain) + hr = RuntimeHost_GetDefaultDomain(This, &domain); + + if (SUCCEEDED(hr)) + { + nameA = WtoA(name); + if (!nameA) + hr = E_OUTOFMEMORY; + } + + if (SUCCEEDED(hr)) + { + type = This->mono->mono_reflection_type_from_name(nameA, NULL); + if (!type) + { + ERR("Cannot find type %s\n", debugstr_w(name)); + hr = E_FAIL; + } + } + + if (SUCCEEDED(hr)) + { + klass = This->mono->mono_class_from_mono_type(type); + if (!klass) + { + ERR("Cannot convert type %s to a class\n", debugstr_w(name)); + hr = E_FAIL; + } + } + + if (SUCCEEDED(hr)) + { + obj = This->mono->mono_object_new(domain, klass); + if (!obj) + { + ERR("Cannot allocate object of type %s\n", debugstr_w(name)); + hr = E_FAIL; + } + } + + if (SUCCEEDED(hr)) + { + /* FIXME: Detect exceptions from the constructor? */ + This->mono->mono_runtime_object_init(obj); + *result = obj; + } + + HeapFree(GetProcessHeap(), 0, nameA); + + return hr; +} + +/* Get an IUnknown pointer for a Mono object. + * + * This is just a "light" wrapper around + * System.Runtime.InteropServices.Marshal:GetIUnknownForObject + * + * NOTE: The IUnknown* is created with a reference to the object. + * Until they have a reference, objects must be in the stack to prevent the + * garbage collector from freeing them. */ +HRESULT RuntimeHost_GetIUnknownForObject(RuntimeHost *This, MonoObject *obj, + IUnknown **ppUnk) +{ + MonoDomain *domain; + MonoAssembly *assembly; + MonoImage *image; + MonoClass *klass; + MonoMethod *method; + MonoObject *result; + void *args[2]; + + domain = This->mono->mono_object_get_domain(obj); + + assembly = This->mono->mono_domain_assembly_open(domain, "mscorlib"); + if (!assembly) + { + ERR("Cannot load mscorlib\n"); + return E_FAIL; + } + + image = This->mono->mono_assembly_get_image(assembly); + if (!image) + { + ERR("Couldn't get assembly image\n"); + return E_FAIL; + } + + klass = This->mono->mono_class_from_name(image, "System.Runtime.InteropServices", "Marshal"); + if (!klass) + { + ERR("Couldn't get class from image\n"); + return E_FAIL; + } + + method = This->mono->mono_class_get_method_from_name(klass, "GetIUnknownForObject", 1); + if (!method) + { + ERR("Couldn't get method from class\n"); + return E_FAIL; + } + + args[0] = obj; + args[1] = NULL; + result = This->mono->mono_runtime_invoke(method, NULL, args, NULL); + if (!result) + { + ERR("Couldn't get result pointer\n"); + return E_FAIL; + } + + *ppUnk = *(IUnknown**)This->mono->mono_object_unbox(result); + if (!*ppUnk) + { + ERR("GetIUnknownForObject returned 0\n"); + return E_FAIL; + } + + return S_OK; +} + static void get_utf8_args(int *argc, char ***argv) { WCHAR **argvw; diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 1333f79..889e1fb 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -138,14 +138,24 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) } \ } while (0); + LOAD_MONO_FUNCTION(mono_assembly_get_image); LOAD_MONO_FUNCTION(mono_assembly_open); LOAD_MONO_FUNCTION(mono_config_parse); + LOAD_MONO_FUNCTION(mono_class_from_mono_type); + LOAD_MONO_FUNCTION(mono_class_from_name); + LOAD_MONO_FUNCTION(mono_class_get_method_from_name); LOAD_MONO_FUNCTION(mono_domain_assembly_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); + LOAD_MONO_FUNCTION(mono_object_get_domain); + LOAD_MONO_FUNCTION(mono_object_new); + LOAD_MONO_FUNCTION(mono_object_unbox); + LOAD_MONO_FUNCTION(mono_reflection_type_from_name); + LOAD_MONO_FUNCTION(mono_runtime_invoke); + LOAD_MONO_FUNCTION(mono_runtime_object_init); LOAD_MONO_FUNCTION(mono_set_dirs); LOAD_MONO_FUNCTION(mono_stringify_assembly_name); diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 0e373ed..e63a1db 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -369,8 +369,37 @@ HRESULT WINAPI CorBindToCurrentRuntime(LPCWSTR filename, REFCLSID rclsid, REFIID STDAPI ClrCreateManagedInstance(LPCWSTR pTypeName, REFIID riid, void **ppObject) { - FIXME("(%s,%s,%p)\n", debugstr_w(pTypeName), debugstr_guid(riid), ppObject); - return E_NOTIMPL; + HRESULT ret; + ICLRRuntimeInfo *info; + RuntimeHost *host; + MonoObject *obj; + IUnknown *unk; + + TRACE("(%s,%s,%p)\n", debugstr_w(pTypeName), debugstr_guid(riid), ppObject); + + /* FIXME: How to determine which runtime version to use? */ + ret = get_runtime_info(NULL, NULL, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); + + if (SUCCEEDED(ret)) + { + ret = ICLRRuntimeInfo_GetRuntimeHost(info, &host); + + ICLRRuntimeInfo_Release(info); + } + + if (SUCCEEDED(ret)) + ret = RuntimeHost_CreateManagedInstance(host, pTypeName, NULL, &obj); + + if (SUCCEEDED(ret)) + ret = RuntimeHost_GetIUnknownForObject(host, obj, &unk); + + if (SUCCEEDED(ret)) + { + ret = IUnknown_QueryInterface(unk, riid, ppObject); + IUnknown_Release(unk); + } + + return ret; } BOOL WINAPI StrongNameSignatureVerification(LPCWSTR filename, DWORD inFlags, DWORD* pOutFlags) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 2609b9e..36a4a86 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -77,6 +77,11 @@ extern void free_parsed_config_file(parsed_config_file *file); typedef struct _MonoDomain MonoDomain; typedef struct _MonoAssembly MonoAssembly; typedef struct _MonoAssemblyName MonoAssemblyName; +typedef struct _MonoType MonoType; +typedef struct _MonoImage MonoImage; +typedef struct _MonoClass MonoClass; +typedef struct _MonoObject MonoObject; +typedef struct _MonoMethod MonoMethod; typedef enum { MONO_IMAGE_OK, @@ -92,7 +97,11 @@ typedef struct loaded_mono HMODULE mono_handle; HMODULE glib_handle; + MonoImage* (*mono_assembly_get_image)(MonoAssembly *assembly); MonoAssembly* (*mono_assembly_open)(const char *filename, MonoImageOpenStatus *status); + MonoClass* (*mono_class_from_mono_type)(MonoType *type); + MonoClass* (*mono_class_from_name)(MonoImage *image, const char* name_space, const char *name); + MonoMethod* (*mono_class_get_method_from_name)(MonoClass *klass, const char *name, int param_count); void (*mono_config_parse)(const char *filename); MonoAssembly* (*mono_domain_assembly_open) (MonoDomain *domain, const char *name); void (*mono_free)(void *); @@ -101,6 +110,12 @@ typedef struct loaded_mono int (*mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]); MonoDomain* (*mono_jit_init)(const char *file); int (*mono_jit_set_trace_options)(const char* options); + MonoDomain* (*mono_object_get_domain)(MonoObject *obj); + MonoObject* (*mono_object_new)(MonoDomain *domain, MonoClass *klass); + void* (*mono_object_unbox)(MonoObject *obj); + MonoType* (*mono_reflection_type_from_name)(char *name, MonoImage *image); + MonoObject* (*mono_runtime_invoke)(MonoMethod *method, void *obj, void **params, MonoObject **exc); + void (*mono_runtime_object_init)(MonoObject *this_obj); void (*mono_set_dirs)(const char *assembly_dir, const char *config_dir); char* (*mono_stringify_assembly_name)(MonoAssemblyName *aname); } loaded_mono; @@ -113,6 +128,11 @@ extern HRESULT RuntimeHost_Construct(const CLRRuntimeInfo *runtime_version, extern HRESULT RuntimeHost_GetInterface(RuntimeHost *This, REFCLSID clsid, REFIID riid, void **ppv); +extern HRESULT RuntimeHost_GetIUnknownForObject(RuntimeHost *This, MonoObject *obj, IUnknown **ppUnk); + +extern HRESULT RuntimeHost_CreateManagedInstance(RuntimeHost *This, LPCWSTR name, + MonoDomain *domain, MonoObject **result); + extern HRESULT RuntimeHost_Destroy(RuntimeHost *This); #endif /* __MSCOREE_PRIVATE__ */

1 0

Hans Leidekker : msi: Don't use a temporary directory for local assemblies.
by Alexandre Julliard Nov. 12, 2010

Nov. 12, 2010

Module: wine Branch: master Commit: 9d46ba417ea6cbc05466d18fe0a44ce2ace87db4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d46ba417ea6cbc05466d18fe… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 12 16:18:08 2010 +0100 msi: Don't use a temporary directory for local assemblies. --- dlls/msi/action.c | 2 +- dlls/msi/files.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 6292f4f..5328193 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2170,7 +2170,7 @@ static void set_target_path( MSIPACKAGE *package, MSIFILE *file ) TRACE("file %s is named %s\n", debugstr_w(file->File), debugstr_w(file->FileName)); msi_free( file->TargetPath ); - if (assembly) + if (assembly && !assembly->application) { if (!assembly->tempdir) assembly->tempdir = get_temp_dir(); file->TargetPath = build_directory_name( 2, assembly->tempdir, file->FileName ); diff --git a/dlls/msi/files.c b/dlls/msi/files.c index b3a6176..4dcf5bd 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -186,9 +186,10 @@ static BOOL installfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, return FALSE; msi_file_update_ui(package, f, szInstallFiles); - if (!f->Component->assembly) + if (!f->Component->assembly || f->Component->assembly->application) + { msi_create_directory(package, f->Component->Directory); - + } *path = strdupW(f->TargetPath); *attrs = f->Attributes; } @@ -268,9 +269,10 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) TRACE("copying %s to %s\n", debugstr_w(source), debugstr_w(file->TargetPath)); msi_file_update_ui(package, file, szInstallFiles); - if (!file->Component->assembly) + if (!file->Component->assembly || file->Component->assembly->application) + { msi_create_directory(package, file->Component->Directory); - + } rc = copy_install_file(package, file, source); if (rc != ERROR_SUCCESS) {

1 0

Vincent Povirk : mscoree: Search the Global Assembly Cache for required assemblies.
by Alexandre Julliard Nov. 12, 2010

Nov. 12, 2010

Module: wine Branch: master Commit: d2d743efbb84cf1972bcc90d558a4a029b3466dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d743efbb84cf1972bcc90d5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 5 15:50:01 2010 -0500 mscoree: Search the Global Assembly Cache for required assemblies. --- dlls/mscoree/corruntimehost.c | 15 ----- dlls/mscoree/metahost.c | 112 ++++++++++++++++++++++++++++++++++++++++ dlls/mscoree/mscoree_main.c | 16 ++++++ dlls/mscoree/mscoree_private.h | 19 ++++++- 4 files changed, 146 insertions(+), 16 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 8145948..c22dd22 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -57,21 +57,6 @@ struct DomainEntry MonoDomain *domain; }; -static char *WtoA(LPCWSTR wstr) -{ - int length; - char *result; - - length = WideCharToMultiByte(CP_UTF8, 0, wstr, -1, NULL, 0, NULL, NULL); - - result = HeapAlloc(GetProcessHeap(), 0, length); - - if (result) - WideCharToMultiByte(CP_UTF8, 0, wstr, -1, result, length, NULL, NULL); - - return result; -} - static HRESULT RuntimeHost_AddDomain(RuntimeHost *This, MonoDomain **result) { struct DomainEntry *entry; diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 3f572f7..1333f79 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -33,6 +33,7 @@ #include "corerror.h" #include "mscoree.h" +#include "fusion.h" #include "metahost.h" #include "wine/list.h" #include "mscoree_private.h" @@ -73,6 +74,8 @@ static loaded_mono loaded_monos[NUM_ABI_VERSIONS]; static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path, int abi_version); +static MonoAssembly* mono_assembly_search_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data); + static void set_environment(LPCWSTR bin_path) { WCHAR path_env[MAX_PATH]; @@ -93,6 +96,7 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) static const WCHAR bin[] = {'\\','b','i','n',0}; static const WCHAR lib[] = {'\\','l','i','b',0}; static const WCHAR etc[] = {'\\','e','t','c',0}; + static const WCHAR glibdll[] = {'l','i','b','g','l','i','b','-','2','.','0','-','0','.','d','l','l',0}; WCHAR mono_dll_path[MAX_PATH+16], mono_bin_path[MAX_PATH+4]; WCHAR mono_lib_path[MAX_PATH+4], mono_etc_path[MAX_PATH+4]; char mono_lib_path_a[MAX_PATH], mono_etc_path_a[MAX_PATH]; @@ -134,13 +138,30 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) } \ } while (0); + LOAD_MONO_FUNCTION(mono_assembly_open); LOAD_MONO_FUNCTION(mono_config_parse); LOAD_MONO_FUNCTION(mono_domain_assembly_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); LOAD_MONO_FUNCTION(mono_set_dirs); + LOAD_MONO_FUNCTION(mono_stringify_assembly_name); + + /* GLib imports obsoleted by the 2.0 ABI */ + if (This->mono_abi_version == 1) + { + (*result)->glib_handle = LoadLibraryW(glibdll); + if (!(*result)->glib_handle) goto fail; + + (*result)->mono_free = (void*)GetProcAddress((*result)->glib_handle, "g_free"); + if (!(*result)->mono_free) goto fail; + } + else + { + LOAD_MONO_FUNCTION(mono_free); + } #undef LOAD_MONO_FUNCTION @@ -148,6 +169,8 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) (*result)->mono_config_parse(NULL); + (*result)->mono_install_assembly_preload_hook(mono_assembly_search_hook_fn, *result); + trace_size = GetEnvironmentVariableA("WINE_MONO_TRACE", trace_setting, sizeof(trace_setting)); if (trace_size) @@ -161,7 +184,9 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) fail: ERR("Could not load Mono into this process\n"); FreeLibrary((*result)->mono_handle); + FreeLibrary((*result)->glib_handle); (*result)->mono_handle = NULL; + (*result)->glib_handle = NULL; return E_FAIL; } @@ -1039,6 +1064,93 @@ extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj) return ICLRMetaHost_QueryInterface((ICLRMetaHost*)&GlobalCLRMetaHost, riid, ppobj); } +static MonoAssembly* mono_assembly_search_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data) +{ + loaded_mono *mono = user_data; + HRESULT hr=S_OK; + MonoAssembly *result=NULL; + char *stringname=NULL; + LPWSTR stringnameW; + int stringnameW_size; + IAssemblyCache *asmcache; + ASSEMBLY_INFO info; + WCHAR path[MAX_PATH]; + char *pathA; + MonoImageOpenStatus stat; + static WCHAR fusiondll[] = {'f','u','s','i','o','n',0}; + HMODULE hfusion=NULL; + static HRESULT WINAPI (*pCreateAssemblyCache)(IAssemblyCache**,DWORD); + + stringname = mono->mono_stringify_assembly_name(aname); + + TRACE("%s\n", debugstr_a(stringname)); + + if (!stringname) return NULL; + + /* FIXME: We should search the given paths before the GAC. */ + + if (!pCreateAssemblyCache) + { + hr = LoadLibraryShim(fusiondll, NULL, NULL, &hfusion); + + if (SUCCEEDED(hr)) + { + pCreateAssemblyCache = (void*)GetProcAddress(hfusion, "CreateAssemblyCache"); + if (!pCreateAssemblyCache) + hr = E_FAIL; + } + } + + if (SUCCEEDED(hr)) + hr = pCreateAssemblyCache(&asmcache, 0); + + if (SUCCEEDED(hr)) + { + stringnameW_size = MultiByteToWideChar(CP_UTF8, 0, stringname, -1, NULL, 0); + + stringnameW = HeapAlloc(GetProcessHeap(), 0, stringnameW_size * sizeof(WCHAR)); + if (stringnameW) + MultiByteToWideChar(CP_UTF8, 0, stringname, -1, stringnameW, stringnameW_size); + else + hr = E_OUTOFMEMORY; + + if (SUCCEEDED(hr)) + { + info.cbAssemblyInfo = sizeof(info); + info.pszCurrentAssemblyPathBuf = path; + info.cchBuf = MAX_PATH; + path[0] = 0; + + hr = IAssemblyCache_QueryAssemblyInfo(asmcache, 0, stringnameW, &info); + } + + HeapFree(GetProcessHeap(), 0, stringnameW); + + IAssemblyCache_Release(asmcache); + } + + if (SUCCEEDED(hr)) + { + TRACE("found: %s\n", debugstr_w(path)); + + pathA = WtoA(path); + + if (pathA) + { + result = mono->mono_assembly_open(pathA, &stat); + + if (!result) + ERR("Failed to load %s, status=%u\n", debugstr_w(path), stat); + + HeapFree(GetProcessHeap(), 0, pathA); + } + } + + mono->mono_free(stringname); + + return result; +} + HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, DWORD startup_flags, DWORD runtimeinfo_flags, BOOL legacy, ICLRRuntimeInfo **result) { diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index c913e6e..0e373ed 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -40,6 +40,7 @@ #include "cor.h" #include "corerror.h" #include "mscoree.h" +#include "fusion.h" #include "metahost.h" #include "wine/list.h" #include "mscoree_private.h" @@ -50,6 +51,21 @@ WINE_DEFAULT_DEBUG_CHANNEL( mscoree ); LONG dll_refs = 0; +char *WtoA(LPCWSTR wstr) +{ + int length; + char *result; + + length = WideCharToMultiByte(CP_UTF8, 0, wstr, -1, NULL, 0, NULL, NULL); + + result = HeapAlloc(GetProcessHeap(), 0, length); + + if (result) + WideCharToMultiByte(CP_UTF8, 0, wstr, -1, result, length, NULL, NULL); + + return result; +} + static BOOL get_install_root(LPWSTR install_dir) { const WCHAR dotnet_key[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\','.','N','E','T','F','r','a','m','e','w','o','r','k','\\',0}; diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 46c49c6..2609b9e 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -24,6 +24,8 @@ extern LONG dll_refs; static inline void MSCOREE_LockModule(void) { InterlockedIncrement(&dll_refs); } static inline void MSCOREE_UnlockModule(void) { InterlockedDecrement(&dll_refs); } +extern char *WtoA(LPCWSTR wstr); + extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj); typedef struct tagASSEMBLY ASSEMBLY; @@ -71,21 +73,36 @@ extern HRESULT parse_config_file(LPCWSTR filename, parsed_config_file *result); extern void free_parsed_config_file(parsed_config_file *file); -/* Mono 2.6 embedding */ +/* Mono embedding */ typedef struct _MonoDomain MonoDomain; typedef struct _MonoAssembly MonoAssembly; +typedef struct _MonoAssemblyName MonoAssemblyName; + +typedef enum { + MONO_IMAGE_OK, + MONO_IMAGE_ERROR_ERRNO, + MONO_IMAGE_MISSING_ASSEMBLYREF, + MONO_IMAGE_IMAGE_INVALID +} MonoImageOpenStatus; + +typedef MonoAssembly* (*MonoAssemblyPreLoadFunc)(MonoAssemblyName *aname, char **assemblies_path, void *user_data); typedef struct loaded_mono { HMODULE mono_handle; + HMODULE glib_handle; + MonoAssembly* (*mono_assembly_open)(const char *filename, MonoImageOpenStatus *status); void (*mono_config_parse)(const char *filename); MonoAssembly* (*mono_domain_assembly_open) (MonoDomain *domain, const char *name); + void (*mono_free)(void *); + void (*mono_install_assembly_preload_hook)(MonoAssemblyPreLoadFunc func, void *user_data); void (*mono_jit_cleanup)(MonoDomain *domain); int (*mono_jit_exec)(MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[]); MonoDomain* (*mono_jit_init)(const char *file); int (*mono_jit_set_trace_options)(const char* options); void (*mono_set_dirs)(const char *assembly_dir, const char *config_dir); + char* (*mono_stringify_assembly_name)(MonoAssemblyName *aname); } loaded_mono; /* loaded runtime interfaces */

1 0

Vincent Povirk : mscoree: Add a trace to _CorExeMain.
by Alexandre Julliard Nov. 12, 2010

Nov. 12, 2010

Module: wine Branch: master Commit: 9c238d181dc1f13af234118b8a79630386b07622 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c238d181dc1f13af234118b8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Oct 12 17:06:26 2010 -0500 mscoree: Add a trace to _CorExeMain. --- dlls/mscoree/corruntimehost.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index d8ee285..3c26340 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -669,11 +669,17 @@ __int32 WINAPI _CorExeMain(void) ICLRRuntimeInfo *info; RuntimeHost *host; HRESULT hr; + int i; get_utf8_args(&argc, &argv); GetModuleFileNameW(NULL, filename, MAX_PATH); + TRACE("%s", debugstr_w(filename)); + for (i=0; i<argc; i++) + TRACE(" %s", debugstr_a(argv[i])); + TRACE("\n"); + filenameA = WtoA(filename); if (!filenameA) return -1;

1 0

Detlef Riekenberg : kernel32: Add a stub for SetProcessDEPPolicy.
by Alexandre Julliard Nov. 12, 2010

Nov. 12, 2010

Module: wine Branch: master Commit: 41bd5d4efa1d7c527a35abb69de7b61660f38175 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41bd5d4efa1d7c527a35abb69… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Nov 5 14:10:04 2010 +0100 kernel32: Add a stub for SetProcessDEPPolicy. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/process.c | 9 +++++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 8381ae8..f32371e 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1053,6 +1053,7 @@ @ stdcall SetNamedPipeHandleState(long ptr ptr ptr) @ stdcall SetPriorityClass(long long) @ stdcall SetProcessAffinityMask(long long) +@ stdcall SetProcessDEPPolicy(long) @ stdcall SetProcessPriorityBoost(long long) @ stdcall SetProcessShutdownParameters(long long) @ stdcall SetProcessWorkingSetSize(long long long) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index fdd19db..258bb36 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -3394,3 +3394,12 @@ DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void) FIXME("stub\n"); return OptIn; } +/********************************************************************** + * SetProcessDEPPolicy (KERNEL32.@) + */ +BOOL WINAPI SetProcessDEPPolicy(DWORD newDEP) +{ + FIXME("(%d): stub\n", newDEP); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +}

1 0

Eric Pouech : kernel32: Fixed regression with echoing input characters.
by Alexandre Julliard Nov. 12, 2010

Nov. 12, 2010

Module: wine Branch: master Commit: 7f043168c10cbd7b7a0e5e7e937e08a038e98df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f043168c10cbd7b7a0e5e7e9… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Nov 11 22:30:11 2010 +0100 kernel32: Fixed regression with echoing input characters. --- dlls/kernel32/console.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index d49731f..c0af117 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -156,7 +156,8 @@ static int get_console_bare_fd(HANDLE hin) { int fd; - if (wine_server_handle_to_fd(hin, 0, &fd, NULL) == STATUS_SUCCESS) + if (wine_server_handle_to_fd(wine_server_ptr_handle(console_handle_unmap(hin)), + 0, &fd, NULL) == STATUS_SUCCESS) return fd; return -1; } @@ -1587,7 +1588,7 @@ BOOL WINAPI ReadConsoleW(HANDLE hConsoleInput, LPVOID lpBuffer, if (!GetConsoleMode(hConsoleInput, &mode)) return FALSE; - if ((fd == get_console_bare_fd(hConsoleInput)) == -1) + if ((fd = get_console_bare_fd(hConsoleInput)) != -1) { close(fd); is_bare = TRUE;

1 0