wine-commits April 2012

wine-commits@winehq.org

2 participants
718 discussions

Jacek Caban : jscript: Use compiler-generated struct for representing function code.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: d76b675ea8ae66a14cbaab7005a58cfcc703ea15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76b675ea8ae66a14cbaab700… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 24 17:39:09 2012 +0200 jscript: Use compiler-generated struct for representing function code. --- dlls/jscript/compile.c | 34 +++++++++++++++++++--------------- dlls/jscript/engine.c | 47 +++++++++++++++++++++++++---------------------- dlls/jscript/engine.h | 21 ++++++++++++++++----- dlls/jscript/function.c | 18 ++++++++---------- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 4 ++-- dlls/jscript/parser.y | 3 +-- 7 files changed, 72 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d76b675ea8ae66a14cbaa…

1 0

Huw Davies : winspool: Don't leak the handle returned by AddPrinter.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 5d47a691f1283341f8afabb52ac26889d752f7df URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d47a691f1283341f8afabb52… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Apr 24 12:55:48 2012 +0100 winspool: Don't leak the handle returned by AddPrinter. --- dlls/winspool.drv/info.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index a09ebbe..2f09855 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -494,6 +494,7 @@ static BOOL CUPS_LoadPrinters(void) HKEY hkeyPrinter, hkeyPrinters; char loaderror[256]; WCHAR nameW[MAX_PATH]; + HANDLE added_printer; cupshandle = wine_dlopen(SONAME_LIBCUPS, RTLD_NOW, loaderror, sizeof(loaderror)); if (!cupshandle) { @@ -548,10 +549,10 @@ static BOOL CUPS_LoadPrinters(void) pi2.pShareName = emptyStringW; pi2.pSepFile = emptyStringW; - if (!AddPrinterW(NULL, 2, (LPBYTE)&pi2)) { - if (GetLastError() != ERROR_PRINTER_ALREADY_EXISTS) - ERR("printer '%s' not added by AddPrinter (error %d)\n", debugstr_w(nameW), GetLastError()); - } + added_printer = AddPrinterW( NULL, 2, (LPBYTE)&pi2 ); + if (added_printer) ClosePrinter( added_printer ); + else if (GetLastError() != ERROR_PRINTER_ALREADY_EXISTS) + ERR( "printer '%s' not added by AddPrinter (error %d)\n", debugstr_w(nameW), GetLastError() ); } HeapFree(GetProcessHeap(),0,port); @@ -571,8 +572,8 @@ static BOOL CUPS_LoadPrinters(void) } #endif -static BOOL -PRINTCAP_ParseEntry(const char *pent, BOOL isfirst) { +static BOOL PRINTCAP_ParseEntry( const char *pent, BOOL isfirst ) +{ PRINTER_INFO_2A pinfo2a; const char *r; size_t name_len; @@ -581,6 +582,7 @@ PRINTCAP_ParseEntry(const char *pent, BOOL isfirst) { char *port = NULL, *env_default; HKEY hkeyPrinter, hkeyPrinters; WCHAR devnameW[MAX_PATH]; + HANDLE added_printer; while (isspace(*pent)) pent++; r = strchr(pent,':'); @@ -678,10 +680,10 @@ PRINTCAP_ParseEntry(const char *pent, BOOL isfirst) { pinfo2a.pShareName = share_name; pinfo2a.pSepFile = sep_file; - if (!AddPrinterA(NULL,2,(LPBYTE)&pinfo2a)) { - if (GetLastError()!=ERROR_PRINTER_ALREADY_EXISTS) - ERR("%s not added by AddPrinterA (%d)\n",name,GetLastError()); - } + added_printer = AddPrinterA( NULL, 2, (LPBYTE)&pinfo2a ); + if (added_printer) ClosePrinter( added_printer ); + else if (GetLastError() != ERROR_PRINTER_ALREADY_EXISTS) + ERR( "printer '%s' not added by AddPrinter (error %d)\n", debugstr_a(name), GetLastError() ); } RegCloseKey(hkeyPrinters);

1 0

Alexandre Julliard : gdi32: Fix coordinates for row copies in mirrored vertical stretching.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 9674011d75d7cca38dd514d13953748ce98329fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=9674011d75d7cca38dd514d13… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 24 12:38:09 2012 +0200 gdi32: Fix coordinates for row copies in mirrored vertical stretching. --- dlls/gdi32/dibdrv/bitblt.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 7836899..2d088c3 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -1211,7 +1211,7 @@ DWORD stretch_bitmapinfo( const BITMAPINFO *src_info, void *src_bits, struct bit else { last_row.top = dst_start.y - v_params.dst_inc; - last_row.bottom = dst_start.y; + last_row.bottom = last_row.top + 1; this_row = last_row; offset_rect( &this_row, 0, v_params.dst_inc ); copy_rect( &dst_dib, &this_row, &dst_dib, &last_row, NULL, R2_COPYPEN );

1 0

Owen Rudge : mapistub: Forward MAPISendMailW.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: c0b006f868f95fe121b8a142b61be0300f4f2971 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0b006f868f95fe121b8a142b… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Apr 23 14:29:02 2012 +0100 mapistub: Forward MAPISendMailW. --- dlls/mapistub/mapistub.spec | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/mapistub/mapistub.spec b/dlls/mapistub/mapistub.spec index 15cd25d..fce027d 100644 --- a/dlls/mapistub/mapistub.spec +++ b/dlls/mapistub/mapistub.spec @@ -188,3 +188,4 @@ 253 stub FixMAPI@0 254 stdcall FGetComponentPath(str str ptr long long) mapi32.FGetComponentPath 255 stdcall FGetComponentPath@20(str str ptr long long) mapi32.FGetComponentPath +256 stdcall MAPISendMailW(long long ptr long long) mapi32.MAPISendMailW

1 0

Owen Rudge : mapi32: Add stub implementation of MAPISendMailW.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 7031588c7668fdee0561f0fa55c84ce1cc0d41a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7031588c7668fdee0561f0fa5… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Apr 23 14:05:49 2012 +0100 mapi32: Add stub implementation of MAPISendMailW. --- dlls/mapi32/mapi32.spec | 1 + dlls/mapi32/sendmail.c | 28 ++++++++++++++++++++++++++++ dlls/mapi32/util.c | 1 + dlls/mapi32/util.h | 1 + 4 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec index ae85b4a..c84cfd4 100644 --- a/dlls/mapi32/mapi32.spec +++ b/dlls/mapi32/mapi32.spec @@ -188,3 +188,4 @@ 253 stub FixMAPI@0 254 stdcall FGetComponentPath(str str ptr long long) 255 stdcall FGetComponentPath@20(str str ptr long long) FGetComponentPath +256 stdcall MAPISendMailW(ptr ptr ptr long long) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 89daf0f..e313b53 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -408,6 +408,34 @@ ULONG WINAPI MAPISendMail( LHANDLE session, ULONG_PTR uiparam, return MAPI_E_NOT_SUPPORTED; } +/************************************************************************** + * MAPISendMailW (MAPI32.256) + * + * Send a mail. + * + * PARAMS + * session [I] Handle to a MAPI session. + * uiparam [I] Parent window handle. + * message [I] Pointer to a MAPIMessageW structure. + * flags [I] Flags. + * reserved [I] Reserved, pass 0. + * + * RETURNS + * Success: SUCCESS_SUCCESS + * Failure: MAPI_E_FAILURE + * + */ +ULONG WINAPI MAPISendMailW(LHANDLE session, ULONG_PTR uiparam, + lpMapiMessageW message, FLAGS flags, ULONG reserved) +{ + /* Check to see if we have a Simple MAPI provider loaded */ + if (mapiFunctions.MAPISendMailW) + return mapiFunctions.MAPISendMailW(session, uiparam, message, flags, reserved); + + WARN("STUB\n"); + return MAPI_E_NOT_SUPPORTED; +} + ULONG WINAPI MAPISendDocuments(ULONG_PTR uiparam, LPSTR delim, LPSTR paths, LPSTR filenames, ULONG reserved) { diff --git a/dlls/mapi32/util.c b/dlls/mapi32/util.c index 90cfa6e..abc4db6 100644 --- a/dlls/mapi32/util.c +++ b/dlls/mapi32/util.c @@ -1075,6 +1075,7 @@ void load_mapi_providers(void) mapiFunctions.MAPISaveMail = (void*) GetProcAddress(mapi_provider, "MAPISaveMail"); mapiFunctions.MAPISendDocuments = (void*) GetProcAddress(mapi_provider, "MAPISendDocuments"); mapiFunctions.MAPISendMail = (void*) GetProcAddress(mapi_provider, "MAPISendMail"); + mapiFunctions.MAPISendMailW = (void*) GetProcAddress(mapi_provider, "MAPISendMailW"); } /* Extended MAPI functions */ diff --git a/dlls/mapi32/util.h b/dlls/mapi32/util.h index 6fbf81e..4582855 100644 --- a/dlls/mapi32/util.h +++ b/dlls/mapi32/util.h @@ -41,6 +41,7 @@ typedef struct MAPI_FUNCTIONS { LPMAPIRESOLVENAME MAPIResolveName; LPMAPISAVEMAIL MAPISaveMail; LPMAPISENDMAIL MAPISendMail; + LPMAPISENDMAILW MAPISendMailW; LPMAPISENDDOCUMENTS MAPISendDocuments; LPMAPIUNINITIALIZE MAPIUninitialize;

1 0

Owen Rudge : include: Add MAPISendMailW definition and structures.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: e82e3e7fb6a913b7289f56aa4322b19253b85f09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e82e3e7fb6a913b7289f56aa4… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Apr 23 14:05:43 2012 +0100 include: Add MAPISendMailW definition and structures. --- include/mapi.h | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/include/mapi.h b/include/mapi.h index 548e130..1bd69e7 100644 --- a/include/mapi.h +++ b/include/mapi.h @@ -47,6 +47,16 @@ typedef struct LPVOID lpFileType; } MapiFileDesc, *lpMapiFileDesc; +typedef struct +{ + ULONG ulReserved; + ULONG flFlags; + ULONG nPosition; + PWSTR lpszPathName; + PWSTR lpszFileName; + PVOID lpFileType; +} MapiFileDescW, *lpMapiFileDescW; + #ifndef MAPI_ORIG #define MAPI_ORIG 0 #define MAPI_TO 1 @@ -67,6 +77,16 @@ typedef struct typedef struct { ULONG ulReserved; + ULONG ulRecipClass; + PWSTR lpszName; + PWSTR lpszAddress; + ULONG ulEIDSize; + PVOID lpEntryID; +} MapiRecipDescW, *lpMapiRecipDescW; + +typedef struct +{ + ULONG ulReserved; LPSTR lpszSubject; LPSTR lpszNoteText; LPSTR lpszMessageType; @@ -80,6 +100,21 @@ typedef struct lpMapiFileDesc lpFiles; } MapiMessage, *lpMapiMessage; +typedef struct +{ + ULONG ulReserved; + PWSTR lpszSubject; + PWSTR lpszNoteText; + PWSTR lpszMessageType; + PWSTR lpszDateReceived; + PWSTR lpszConversationID; + FLAGS flFlags; + lpMapiRecipDescW lpOriginator; + ULONG nRecipCount; + lpMapiRecipDescW lpRecips; + ULONG nFileCount; + lpMapiFileDescW lpFiles; +} MapiMessageW, *lpMapiMessageW; /* Error codes */ @@ -140,6 +175,10 @@ typedef struct #define MAPI_DIALOG 0x00000008 +/* MAPISendMailW */ + +#define MAPI_FORCE_UNICODE 0x00040000 + /* API typedefs and prototypes */ @@ -194,6 +233,10 @@ typedef ULONG (WINAPI MAPISENDMAIL)(LHANDLE,ULONG_PTR,lpMapiMessage,FLAGS,ULONG) typedef MAPISENDMAIL *LPMAPISENDMAIL; MAPISENDMAIL MAPISendMail; +typedef ULONG (WINAPI MAPISENDMAILW)(LHANDLE,ULONG_PTR,lpMapiMessageW,FLAGS,ULONG); +typedef MAPISENDMAILW *LPMAPISENDMAILW; +MAPISENDMAILW MAPISendMailW; + #ifdef __cplusplus } #endif

1 0

Nikolay Sivov : msxml3: Implement getURI() for IMXAttributes.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 9472b8ca43b5e136882779b706201df7a605e97b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9472b8ca43b5e136882779b70… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 24 11:32:51 2012 +0400 msxml3: Implement getURI() for IMXAttributes. --- dlls/msxml3/mxwriter.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 48d9f8d..779ca7a 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1787,12 +1787,20 @@ static HRESULT WINAPI SAXAttributes_getLength(ISAXAttributes *iface, int *length return S_OK; } -static HRESULT WINAPI SAXAttributes_getURI(ISAXAttributes *iface, int nIndex, const WCHAR **pUrl, - int *pUriSize) +static HRESULT WINAPI SAXAttributes_getURI(ISAXAttributes *iface, int index, const WCHAR **uri, + int *len) { mxattributes *This = impl_from_ISAXAttributes( iface ); - FIXME("(%p)->(%d %p %p): stub\n", This, nIndex, pUrl, pUriSize); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p %p)\n", This, index, uri, len); + + if (index >= This->length || index < 0) return E_INVALIDARG; + if (!uri || !len) return E_POINTER; + + *len = SysStringLen(This->attr[index].uri); + *uri = This->attr[index].uri; + + return S_OK; } static HRESULT WINAPI SAXAttributes_getLocalName(ISAXAttributes *iface, int index, const WCHAR **name,

1 0

Nikolay Sivov : msxml3: Implement getLocalName() for IMXAttributes.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 3f5ec72fcf2113292e95d7227b1c7c6b88bee042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f5ec72fcf2113292e95d7227… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 24 11:30:24 2012 +0400 msxml3: Implement getLocalName() for IMXAttributes. --- dlls/msxml3/mxwriter.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index e4224ed..48d9f8d 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1795,12 +1795,20 @@ static HRESULT WINAPI SAXAttributes_getURI(ISAXAttributes *iface, int nIndex, co return E_NOTIMPL; } -static HRESULT WINAPI SAXAttributes_getLocalName(ISAXAttributes *iface, int nIndex, const WCHAR **localName, - int *length) +static HRESULT WINAPI SAXAttributes_getLocalName(ISAXAttributes *iface, int index, const WCHAR **name, + int *len) { mxattributes *This = impl_from_ISAXAttributes( iface ); - FIXME("(%p)->(%d %p %p): stub\n", This, nIndex, localName, length); - return E_NOTIMPL; + + TRACE("(%p)->(%d %p %p)\n", This, index, name, len); + + if (index >= This->length || index < 0) return E_INVALIDARG; + if (!name || !len) return E_POINTER; + + *len = SysStringLen(This->attr[index].local); + *name = This->attr[index].local; + + return S_OK; } static HRESULT WINAPI SAXAttributes_getQName(ISAXAttributes *iface, int index, const WCHAR **qname, int *length)

1 0

Vincent Povirk : gdiplus: Implement accessors for graphics rendering origin .
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 075775a81b6036a466343f9b5d3c497bcf4a6d85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=075775a81b6036a466343f9b5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 23 13:12:05 2012 -0500 gdiplus: Implement accessors for graphics rendering origin. --- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 26 ++++++++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 5d5a92c..06dee29 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -161,6 +161,7 @@ struct GpGraphics{ UINT textcontrast; /* not used yet. get/set only */ struct list containers; GraphicsContainer contid; /* last-issued container ID */ + INT origin_x, origin_y; /* For giving the caller an HDC when we technically can't: */ HBITMAP temp_hbitmap; int temp_hbitmap_width; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 0845579..92bc27e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1976,6 +1976,7 @@ typedef struct _GraphicsContainerItem { UINT textcontrast; GpMatrix* worldtrans; GpRegion* clip; + INT origin_x, origin_y; } GraphicsContainerItem; static GpStatus init_container(GraphicsContainerItem** container, @@ -1997,6 +1998,8 @@ static GpStatus init_container(GraphicsContainerItem** container, (*container)->unit = graphics->unit; (*container)->textcontrast = graphics->textcontrast; (*container)->pixeloffset = graphics->pixeloffset; + (*container)->origin_x = graphics->origin_x; + (*container)->origin_y = graphics->origin_y; sts = GdipCloneMatrix(graphics->worldtrans, &(*container)->worldtrans); if(sts != Ok){ @@ -2055,6 +2058,8 @@ static GpStatus restore_container(GpGraphics* graphics, graphics->unit = container->unit; graphics->textcontrast = container->textcontrast; graphics->pixeloffset = container->pixeloffset; + graphics->origin_x = container->origin_x; + graphics->origin_y = container->origin_y; return Ok; } @@ -5499,23 +5504,28 @@ GpStatus WINGDIPAPI GdipSetRenderingOrigin(GpGraphics *graphics, INT x, INT y) TRACE("(%p,%i,%i)\n", graphics, x, y); if (!(calls++)) - FIXME("not implemented\n"); + FIXME("value is unused in rendering\n"); - return NotImplemented; + if (!graphics) + return InvalidParameter; + + graphics->origin_x = x; + graphics->origin_y = y; + + return Ok; } GpStatus WINGDIPAPI GdipGetRenderingOrigin(GpGraphics *graphics, INT *x, INT *y) { - static int calls; - TRACE("(%p,%p,%p)\n", graphics, x, y); - if (!(calls++)) - FIXME("not implemented\n"); + if (!graphics || !x || !y) + return InvalidParameter; - *x = *y = 0; + *x = graphics->origin_x; + *y = graphics->origin_y; - return NotImplemented; + return Ok; } GpStatus WINGDIPAPI GdipSetSmoothingMode(GpGraphics *graphics, SmoothingMode mode)

1 0

Vincent Povirk : mscoree: Always call mono_thread_attach before invoking managed code.
by Alexandre Julliard 24 Apr '12

24 Apr '12

Module: wine Branch: master Commit: 3b4d278026486d42d67190649ad3b86ae4b61a87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b4d278026486d42d67190649… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 23 14:55:52 2012 -0500 mscoree: Always call mono_thread_attach before invoking managed code. --- dlls/mscoree/corruntimehost.c | 12 +++++++++++- dlls/mscoree/metahost.c | 1 + dlls/mscoree/mscoree_private.h | 2 ++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index ff789d4..1750f12 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -148,6 +148,8 @@ static HRESULT RuntimeHost_GetIUnknownForDomain(RuntimeHost *This, MonoDomain *d MonoObject *appdomain_object; IUnknown *unk; + This->mono->mono_thread_attach(domain); + assembly = This->mono->mono_domain_assembly_open(domain, "mscorlib"); if (!assembly) { @@ -560,6 +562,8 @@ static HRESULT WINAPI CLRRuntimeHost_ExecuteInDefaultAppDomain(ICLRRuntimeHost* hr = E_FAIL; + This->mono->mono_thread_attach(domain); + filenameA = WtoA(pwzAssemblyPath); assembly = This->mono->mono_domain_assembly_open(domain, filenameA); if (!assembly) @@ -658,6 +662,8 @@ HRESULT RuntimeHost_CreateManagedInstance(RuntimeHost *This, LPCWSTR name, if (SUCCEEDED(hr)) { + This->mono->mono_thread_attach(domain); + type = This->mono->mono_reflection_type_from_name(nameA, NULL); if (!type) { @@ -705,7 +711,9 @@ HRESULT RuntimeHost_CreateManagedInstance(RuntimeHost *This, LPCWSTR name, * * 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. */ + * garbage collector from freeing them. + * + * mono_thread_attach must have already been called for this thread. */ HRESULT RuntimeHost_GetIUnknownForObject(RuntimeHost *This, MonoObject *obj, IUnknown **ppUnk) { @@ -1025,6 +1033,8 @@ HRESULT create_monodata(REFIID riid, LPVOID *ppObj ) hr = CLASS_E_CLASSNOTAVAILABLE; + host->mono->mono_thread_attach(domain); + filenameA = WtoA(filename); assembly = host->mono->mono_domain_assembly_open(domain, filenameA); HeapFree(GetProcessHeap(), 0, filenameA); diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index f877b1e..1296e37 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -186,6 +186,7 @@ static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) LOAD_MONO_FUNCTION(mono_set_dirs); LOAD_MONO_FUNCTION(mono_stringify_assembly_name); LOAD_MONO_FUNCTION(mono_string_new); + LOAD_MONO_FUNCTION(mono_thread_attach); /* GLib imports obsoleted by the 2.0 ABI */ if (This->mono_abi_version == 1) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index d033275..62cf240 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -44,6 +44,7 @@ typedef struct _MonoObject MonoObject; typedef struct _MonoString MonoString; typedef struct _MonoMethod MonoMethod; typedef struct _MonoProfiler MonoProfiler; +typedef struct _MonoThread MonoThread; typedef struct loaded_mono loaded_mono; typedef struct RuntimeHost RuntimeHost; @@ -163,6 +164,7 @@ struct loaded_mono void (CDECL *mono_thread_suspend_all_other_threads)(void); void (CDECL *mono_threads_set_shutting_down)(void); MonoString* (CDECL *mono_string_new)(MonoDomain *domain, const char *str); + MonoThread* (CDECL *mono_thread_attach)(MonoDomain *domain); }; /* loaded runtime interfaces */

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
72
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 April 2012