Skip to content

W
wine-winehq
Commit b9a0fe18 authored by Paul Gofman's avatar Paul Gofman Committed by Alexandre Julliard
Browse files
Options

mscoree: Fix calling convention for mono callback functions.

ms_abi calling convention is required for x86_64 arch. Signed-off-by: 's avatarPaul Gofman <gofmanp@gmail.com> Signed-off-by: 's avatarVincent Povirk <vincent@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 2b2b1794
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
dlls/mscoree/metahost.c
View file @ b9a0fe18
......@@ -110,11 +110,11 @@ static BOOL get_mono_path(LPWSTR path);
static BOOL find_mono_dll(LPCWSTR path, LPWSTR dll_path);
static MonoAssembly* mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data);
static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data);
static void mono_shutdown_callback_fn(MonoProfiler *prof);
static void CDECL mono_shutdown_callback_fn(MonoProfiler *prof);
static void mono_print_handler_fn(const char *string, INT is_stdout);
static void CDECL mono_print_handler_fn(const char *string, INT is_stdout);
static MonoImage* CDECL image_open_module_handle_dummy(HMODULE module_handle,
char* fname, UINT has_entry_point, MonoImageOpenStatus* status)
......@@ -249,12 +249,12 @@ fail:
return E_FAIL;
}
static void mono_shutdown_callback_fn(MonoProfiler *prof)
static void CDECL mono_shutdown_callback_fn(MonoProfiler *prof)
{
is_mono_shutdown = TRUE;
}
static void mono_print_handler_fn(const char *string, INT is_stdout)
static void CDECL mono_print_handler_fn(const char *string, INT is_stdout)
{
wine_dbg_printf("%s", string);
}
......@@ -1144,7 +1144,7 @@ HRESULT get_file_from_strongname(WCHAR* stringnameW, WCHAR* assemblies_path, int
return hr;
}
static MonoAssembly* mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data)
static MonoAssembly* CDECL mono_assembly_preload_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data)
{
HRESULT hr;
MonoAssembly *result=NULL;
......
dlls/mscoree/mscoree_private.h
View file @ b9a0fe18
......@@ -128,11 +128,11 @@ typedef enum {
MONO_IMAGE_IMAGE_INVALID
} MonoImageOpenStatus;
typedef MonoAssembly* (*MonoAssemblyPreLoadFunc)(MonoAssemblyName *aname, char **assemblies_path, void *user_data);
typedef MonoAssembly* (CDECL *MonoAssemblyPreLoadFunc)(MonoAssemblyName *aname, char **assemblies_path, void *user_data);
typedef void (*MonoProfileFunc)(MonoProfiler *prof);
typedef void (CDECL *MonoProfileFunc)(MonoProfiler *prof);
typedef void (*MonoPrintCallback) (const char *string, INT is_stdout);
typedef void (CDECL *MonoPrintCallback) (const char *string, INT is_stdout);
extern BOOL is_mono_started DECLSPEC_HIDDEN;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment