November 2010 - Wine-commits

Maarten Lankhorst : quartz: Fix video renderer EndOfStream.
by Alexandre Julliard 10 Nov '10

10 Nov '10

Module: wine Branch: master Commit: a5798fc96caa6610ffcceaae3584ea5b67b758ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5798fc96caa6610ffcceaae3… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Nov 9 23:42:41 2010 +0100 quartz: Fix video renderer EndOfStream. --- dlls/quartz/videorenderer.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 9645d83..2ad75c4 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -939,11 +939,14 @@ static HRESULT WINAPI VideoRenderer_InputPin_EndOfStream(IPin * iface) BaseInputPin* This = (BaseInputPin*)iface; VideoRendererImpl *pFilter; IMediaEventSink* pEventSink; - HRESULT hr; + HRESULT hr = S_OK; TRACE("(%p/%p)->()\n", This, iface); + EnterCriticalSection(This->pin.pCritSec); pFilter = (VideoRendererImpl*)This->pin.pinInfo.pFilter; + if (This->flushing || This->end_of_stream) + goto out; hr = IFilterGraph_QueryInterface(pFilter->filter.filterInfo.pGraph, &IID_IMediaEventSink, (LPVOID*)&pEventSink); if (SUCCEEDED(hr)) { @@ -951,6 +954,9 @@ static HRESULT WINAPI VideoRenderer_InputPin_EndOfStream(IPin * iface) IMediaEventSink_Release(pEventSink); } MediaSeekingPassThru_EOS(pFilter->seekthru_unk); + This->end_of_stream = 1; +out: + LeaveCriticalSection(This->pin.pCritSec); return hr; }

1 0

Alexandre Julliard : rpcrt4: Implement waiting in RpcMgmtWaitServerListen.
by Alexandre Julliard 10 Nov '10

10 Nov '10

Module: wine Branch: master Commit: 749f22948c9443364637fa11711ff591d48baa0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=749f22948c9443364637fa117… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 9 23:11:35 2010 +0100 rpcrt4: Implement waiting in RpcMgmtWaitServerListen. --- dlls/rpcrt4/rpc_server.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 0ffc085..8e7fe0e 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -104,6 +104,8 @@ static BOOL std_listen; static LONG manual_listen_count; /* total listeners including auto listeners */ static LONG listen_count; +/* event set once all listening is finished */ +static HANDLE listen_done_event; static UUID uuid_nil; @@ -772,6 +774,10 @@ static void RPCRT4_stop_listen(BOOL auto_listen) LIST_FOR_EACH_ENTRY(cps, &protseqs, RpcServerProtseq, entry) RPCRT4_sync_with_server_thread(cps); + EnterCriticalSection(&listen_cs); + if (listen_done_event) SetEvent( listen_done_event ); + listen_done_event = 0; + LeaveCriticalSection(&listen_cs); return; } assert(listen_count >= 0); @@ -1469,6 +1475,8 @@ RPC_STATUS WINAPI RpcServerListen( UINT MinimumCallThreads, UINT MaxCalls, UINT */ RPC_STATUS WINAPI RpcMgmtWaitServerListen( void ) { + HANDLE event; + TRACE("()\n"); EnterCriticalSection(&listen_cs); @@ -1477,11 +1485,20 @@ RPC_STATUS WINAPI RpcMgmtWaitServerListen( void ) LeaveCriticalSection(&listen_cs); return RPC_S_NOT_LISTENING; } - + if (listen_done_event) { + LeaveCriticalSection(&listen_cs); + return RPC_S_ALREADY_LISTENING; + } + event = CreateEventW( NULL, TRUE, FALSE, NULL ); + listen_done_event = event; + LeaveCriticalSection(&listen_cs); - FIXME("not waiting for server calls to finish\n"); + TRACE( "waiting for server calls to finish\n" ); + WaitForSingleObject( event, INFINITE ); + TRACE( "done waiting\n" ); + CloseHandle( event ); return RPC_S_OK; }

1 0

Alexandre Julliard : include: Move IXMLDOMDocument3 definition to msxml2. idl.
by Alexandre Julliard 10 Nov '10

10 Nov '10

Module: wine Branch: master Commit: fd53e320c1395dd459dd1c6a70819722c90a6c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd53e320c1395dd459dd1c6a7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 10 10:23:46 2010 +0100 include: Move IXMLDOMDocument3 definition to msxml2.idl. --- include/msxml2.idl | 21 +++++++++++++++++++++ include/msxml2did.h | 5 +++++ include/msxml6.idl | 21 --------------------- include/msxml6did.h | 5 +---- 4 files changed, 27 insertions(+), 25 deletions(-) diff --git a/include/msxml2.idl b/include/msxml2.idl index 9a5fe1d..0235e18 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -632,6 +632,27 @@ interface IXMLDOMDocument2 : IXMLDOMDocument } [ + local, + object, + dual, + uuid(2933bf96-7b36-11d2-b20e-00c04f983e60), + oleautomation, +] +interface IXMLDOMDocument3 : IXMLDOMDocument2 +{ + [id(DISPID_XMLDOM_DOCUMENT3_VALIDATENODE)] + HRESULT validateNode( + [in] IXMLDOMNode *node, + [out, retval] IXMLDOMParseError **error); + + [id(DISPID_XMLDOM_DOCUMENT3_IMPORTNODE)] + HRESULT importNode( + [in] IXMLDOMNode *node, + [in] VARIANT_BOOL deep, + [out, retval] IXMLDOMNode **clone); +} + +[ local, object, dual, diff --git a/include/msxml2did.h b/include/msxml2did.h index d7489d0..2bbe3bf 100644 --- a/include/msxml2did.h +++ b/include/msxml2did.h @@ -224,6 +224,11 @@ #define DISPID_XMLDOM_DOCUMENT2_GETPROPERTY 0x000000cc #define DISPID_XMLDOM_DOCUMENT2__TOP 0x000000cd +#define DISPID_XMLDOM_DOCUMENT3 0x000000ce +#define DISPID_XMLDOM_DOCUMENT3_VALIDATENODE 0x000000cf +#define DISPID_XMLDOM_DOCUMENT3_IMPORTNODE 0x000000d0 +#define DISPID_XMLDOM_DOCUMENT3__TOP 0x000000d1 + #define DISPID_XMLDOM_SCHEMACOLLECTION 0x00000002 #define DISPID_XMLDOM_SCHEMACOLLECTION_ADD 0x00000003 #define DISPID_XMLDOM_SCHEMACOLLECTION_GET 0x00000004 diff --git a/include/msxml6.idl b/include/msxml6.idl index 5b14e47..62d680e 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -39,27 +39,6 @@ coclass FreeThreadedDOMDocument60 } [ - local, - object, - dual, - uuid(2933bf96-7b36-11d2-b20e-00c04f983e60), - oleautomation, -] -interface IXMLDOMDocument3 : IXMLDOMDocument2 -{ - [id(DISPID_XMLDOM_DOCUMENT3_VALIDATENODE)] - HRESULT validateNode( - [in] IXMLDOMNode *node, - [out, retval] IXMLDOMParseError **error); - - [id(DISPID_XMLDOM_DOCUMENT3_IMPORTNODE)] - HRESULT importNode( - [in] IXMLDOMNode *node, - [in] VARIANT_BOOL deep, - [out, retval] IXMLDOMNode **clone); -} - -[ uuid(88d96a07-f192-11d4-a65f-0040963251e5) ] coclass XMLSchemaCache60 diff --git a/include/msxml6did.h b/include/msxml6did.h index 192976f..1e52578 100644 --- a/include/msxml6did.h +++ b/include/msxml6did.h @@ -19,9 +19,6 @@ #ifndef __MSXML6DID_H__ #define __MSXML6DID_H__ -#define DISPID_XMLDOM_DOCUMENT3 0x000000ce -#define DISPID_XMLDOM_DOCUMENT3_VALIDATENODE 0x000000cf -#define DISPID_XMLDOM_DOCUMENT3_IMPORTNODE 0x000000d0 -#define DISPID_XMLDOM_DOCUMENT3__TOP 0x000000d1 +#include <msxml2did.h> #endif /* __MSXML6DID_H__ */

1 0

Alexandre Julliard : include: Move coclass definitions to msxml2.idl.
by Alexandre Julliard 10 Nov '10

10 Nov '10

Module: wine Branch: master Commit: 6c90ebd5e51b94d3efc8ae324f7c2138edba695f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c90ebd5e51b94d3efc8ae324… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 10 11:43:20 2010 +0100 include: Move coclass definitions to msxml2.idl. --- dlls/msxml3/tests/domdoc.c | 1 - dlls/msxml3/tests/saxreader.c | 4 -- include/msxml2.idl | 71 +++++++++++++++++++++++++++++++++++++++-- include/msxml6.idl | 65 ------------------------------------- 4 files changed, 68 insertions(+), 73 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index b2399a8..f86026d 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -38,7 +38,6 @@ #include "initguid.h" DEFINE_GUID(IID_IObjectSafety, 0xcb5bdc81, 0x93c1, 0x11cf, 0x8f,0x20, 0x00,0x80,0x5f,0x2c,0xd0,0x64); -DEFINE_GUID(CLSID_DOMDocument60, 0x88d96a05, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); static int g_unexpectedcall, g_expectedcall; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index d2bf5c2..6480f07 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -29,8 +29,6 @@ #include "wine/test.h" -#include "initguid.h" - typedef enum _CH { CH_ENDTEST, CH_PUTDOCUMENTLOCATOR, @@ -46,8 +44,6 @@ typedef enum _CH { CH_SKIPPEDENTITY } CH; -DEFINE_GUID(CLSID_SAXXMLReader60, 0x88d96a0c, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); - static const WCHAR szSimpleXML[] = { '<','?','x','m','l',' ','v','e','r','s','i','o','n','=','\"','1','.','0','\"',' ','?','>','\n', '<','B','a','n','k','A','c','c','o','u','n','t','>','\n', diff --git a/include/msxml2.idl b/include/msxml2.idl index 0235e18..6c37e3d 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -1324,6 +1324,15 @@ coclass DOMDocument40 } [ + uuid(88d96a05-f192-11d4-a65f-0040963251e5) +] +coclass DOMDocument60 +{ + [default] interface IXMLDOMDocument3; + [default, source] dispinterface XMLDOMDocumentEvents; +} + +[ uuid(F6D90F12-9C73-11D3-B32E-00C04F990BB4) ] coclass FreeThreadedDOMDocument @@ -1360,6 +1369,15 @@ coclass FreeThreadedDOMDocument40 } [ + uuid(88d96a06-f192-11d4-a65f-0040963251e5), +] +coclass FreeThreadedDOMDocument60 +{ + [default] interface IXMLDOMDocument3; + [default, source] dispinterface XMLDOMDocumentEvents; +} + +[ uuid(f5078f1e-c551-11d3-89b9-0000f81fe221) ] coclass XMLHTTP26 @@ -1421,7 +1439,15 @@ coclass XMLSchemaCache30 coclass XMLSchemaCache40 { [default] interface IXMLDOMSchemaCollection2; -}; +} + +[ + uuid(88d96a07-f192-11d4-a65f-0040963251e5) +] +coclass XMLSchemaCache60 +{ + [default] interface IXMLDOMSchemaCollection2; +} [ uuid(2933BF94-7B36-11d2-B20E-00C04F983E60) @@ -2744,7 +2770,16 @@ coclass SAXXMLReader40 { [default] interface IVBSAXXMLReader; interface ISAXXMLReader; -}; +} + +[ + uuid(88d96a0c-f192-11d4-a65f-0040963251e5) +] +coclass SAXXMLReader60 +{ + [default] interface IVBSAXXMLReader; + interface ISAXXMLReader; +} [ uuid(fc220ad8-a72a-4ee8-926e-0b7ad152a020) @@ -2804,7 +2839,27 @@ coclass MXXMLWriter40 interface IVBSAXDTDHandler; interface IVBSAXErrorHandler; interface IVBSAXLexicalHandler; -}; +} + +[ + uuid(88d96a0f-f192-11d4-a65f-0040963251e5) +] +coclass MXXMLWriter60 +{ + [default] interface IMXWriter; + + interface ISAXContentHandler; + interface ISAXDeclHandler; + interface ISAXDTDHandler; + interface ISAXErrorHandler; + interface ISAXLexicalHandler; + + interface IVBSAXContentHandler; + interface IVBSAXDeclHandler; + interface IVBSAXDTDHandler; + interface IVBSAXErrorHandler; + interface IVBSAXLexicalHandler; +} [ uuid(4dd441ad-526d-4a77-9f1b-9841ed802fb0) @@ -2836,6 +2891,16 @@ coclass SAXAttributes40 interface ISAXAttributes; }; +[ + uuid(88d96a0e-f192-11d4-a65f-0040963251e5) +] +coclass SAXAttributes60 +{ + [default] interface IMXAttributes; + interface IVBSAXAttributes; + interface ISAXAttributes; +} + /* * Error Codes */ diff --git a/include/msxml6.idl b/include/msxml6.idl index 62d680e..5861ee4 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -19,68 +19,3 @@ #include <msxml6did.h> import "msxml2.idl"; - -[ - uuid(88d96a05-f192-11d4-a65f-0040963251e5) -] -coclass DOMDocument60 -{ - [default] interface IXMLDOMDocument3; - [default, source] dispinterface XMLDOMDocumentEvents; -} - -[ - uuid(88d96a06-f192-11d4-a65f-0040963251e5), -] -coclass FreeThreadedDOMDocument60 -{ - [default] interface IXMLDOMDocument3; - [default, source] dispinterface XMLDOMDocumentEvents; -} - -[ - uuid(88d96a07-f192-11d4-a65f-0040963251e5) -] -coclass XMLSchemaCache60 -{ - [default] interface IXMLDOMSchemaCollection2; -} - -[ - uuid(88d96a0f-f192-11d4-a65f-0040963251e5) -] -coclass MXXMLWriter60 -{ - [default] interface IMXWriter; - - interface ISAXContentHandler; - interface ISAXDeclHandler; - interface ISAXDTDHandler; - interface ISAXErrorHandler; - interface ISAXLexicalHandler; - - interface IVBSAXContentHandler; - interface IVBSAXDeclHandler; - interface IVBSAXDTDHandler; - interface IVBSAXErrorHandler; - interface IVBSAXLexicalHandler; -} - -[ - uuid(88d96a0c-f192-11d4-a65f-0040963251e5) -] -coclass SAXXMLReader60 -{ - [default] interface IVBSAXXMLReader; - interface ISAXXMLReader; -} - -[ - uuid(88d96a0e-f192-11d4-a65f-0040963251e5) -] -coclass SAXAttributes60 -{ - [default] interface IMXAttributes; - interface IVBSAXAttributes; - interface ISAXAttributes; -}

1 0

Yaron Shahrabani : website: 404 Translated to Hebrew
by Jeremy Newman 10 Nov '10

10 Nov '10

Module: website Branch: master Commit: 229450b61a9575ba7a7de92be08c7406ff5647cf URL: http://source.winehq.org/git/website.git/?a=commit;h=229450b61a9575ba7a7de9… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Wed Nov 10 12:27:43 2010 +0200 website: 404 Translated to Hebrew --0016367faf9dfce90d0494b04fb7 Content-Type: text/plain; charset=UTF-8 Kind regards, Yaron Shahrabani <Hebrew translator> <div dir="ltr">Kind regards,<br clear="all"><div dir="ltr"><span style="font-size:large"><font color="#990000">Yaron</font><font color="#330000"> Shahrabani</font></span><blockquote style="margin:0 0 0 40px;border:none;padding:0px"> <div><font color="#666666"><span style="font-size:x-small"><font color="#FF0000"><</font></span>Hebrew translator<span style="font-size:x-small"><font color="#FF0000">></font></span></font></div></blockquote></div> <br> </div> >From 80de7af1f7c46e12f474f52bd108b7928f489519 Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Wed, 10 Nov 2010 12:24:54 +0200 Subject: website: 404 Translated to Hebrew --- templates/he/global/404.template | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/he/global/404.template b/templates/he/global/404.template index bcdf221..d4b4245 100644 --- a/templates/he/global/404.template +++ b/templates/he/global/404.template @@ -1,18 +1,18 @@ - - + + -<h1 class="title">404 Not Found</h1> +<h1 class="title">404 לא נמצא</h1> <p> - Sorry, that document was not found. Please check your URL - and try again. + מסמך זה לא נמצא. נא לוודא שהכתובת נכונה ולנסות שוב, + עמך הסליחה. </p> <hr> <p> - If you followed a link from a WineHQ.org page and reached this page in error, - please report it to the WineHQ.org - <a href="http://bugs.winehq.org/enter_bug.cgi?product=WineHQ.org">Bugzilla</a>. + אם הגעת לכאן דרך קישור מעמוד ב־WineHQ.org והגעת לעמוד זה בטעות, + נא לדווח על כך + ל־<a href="http://bugs.winehq.org/enter_bug.cgi?product=WineHQ.org">Bugzilla</a> של WineHQ.org. </p>

1 0

Vincent Povirk : mscoree: Report that all . NET versions are installed if Mono is missing.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: add7454df791f4576403fea9a38f0276187c41c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=add7454df791f4576403fea9a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 9 09:15:44 2010 -0600 mscoree: Report that all .NET versions are installed if Mono is missing. --- dlls/mscoree/metahost.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 0f28788..5506946 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -69,6 +69,12 @@ static CRITICAL_SECTION runtime_list_cs = { &runtime_list_cs_debug, -1, 0, 0, 0, static HRESULT load_mono(CLRRuntimeInfo *This, loaded_mono **result) { /* FIXME: stub */ + if (This->mono_abi_version == -1) + MESSAGE("wine: Install the Windows version of Mono to run .NET executables\n"); + + if (This->mono_abi_version <= 0) + return E_FAIL; + *result = NULL; return S_OK; @@ -517,10 +523,15 @@ static void find_runtimes(void) } } - runtimes_initialized = 1; - if (!any_runtimes_found) - MESSAGE("wine: Install the Windows version of Mono to run .NET executables\n"); + { + /* Report all runtimes are available if Mono isn't installed. + * FIXME: Remove this when Mono is properly packaged. */ + for (i=0; i<NUM_RUNTIMES; i++) + runtimes[i].mono_abi_version = -1; + } + + runtimes_initialized = 1; end: LeaveCriticalSection(&runtime_list_cs);

1 0

Vincent Povirk : mscoree: Use the new search methods for GetCORVersion/ GetCORSystemDirectory.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: 84ef0fca574639efcb6fe35bd624feb1ed7ae510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84ef0fca574639efcb6fe35bd… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 1 14:18:12 2010 -0500 mscoree: Use the new search methods for GetCORVersion/GetCORSystemDirectory. --- dlls/mscoree/mscoree_main.c | 50 +++++++++++++++++------------------------ dlls/mscoree/tests/mscoree.c | 8 ++++++ 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 9c91112..d2d7445 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -460,56 +460,48 @@ HRESULT WINAPI _CorValidateImage(PVOID* imageBase, LPCWSTR imageName) HRESULT WINAPI GetCORSystemDirectory(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength) { - static const WCHAR slash[] = {'\\',0}; - WCHAR system_dir[MAX_PATH]; - WCHAR version[MAX_PATH]; + ICLRRuntimeInfo *info; + HRESULT ret; - FIXME("(%p, %d, %p): semi-stub!\n", pbuffer, cchBuffer, dwLength); + TRACE("(%p, %d, %p)!\n", pbuffer, cchBuffer, dwLength); - if (!dwLength) + if (!dwLength || !pbuffer) return E_POINTER; - if (!pbuffer) - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + ret = get_runtime_info(NULL, NULL, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); - if (!get_install_root(system_dir)) - { - ERR("error reading registry key for installroot, returning empty path\n"); - *dwLength = 0; - } - else + if (SUCCEEDED(ret)) { - GetCORVersion(version, MAX_PATH, dwLength); - lstrcatW(system_dir, version); - lstrcatW(system_dir, slash); - *dwLength = lstrlenW(system_dir) + 1; + *dwLength = cchBuffer; + ret = ICLRRuntimeInfo_GetRuntimeDirectory(info, pbuffer, dwLength); - if (cchBuffer < *dwLength) - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); - - lstrcpyW(pbuffer, system_dir); + ICLRRuntimeInfo_Release(info); } - return S_OK; + return ret; } HRESULT WINAPI GetCORVersion(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength) { - static const WCHAR version[] = {'v','2','.','0','.','5','0','7','2','7',0}; + ICLRRuntimeInfo *info; + HRESULT ret; - FIXME("(%p, %d, %p): semi-stub!\n", pbuffer, cchBuffer, dwLength); + TRACE("(%p, %d, %p)!\n", pbuffer, cchBuffer, dwLength); if (!dwLength || !pbuffer) return E_POINTER; - *dwLength = lstrlenW(version) + 1; + ret = get_runtime_info(NULL, NULL, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, TRUE, &info); - if (cchBuffer < *dwLength) - return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + if (SUCCEEDED(ret)) + { + *dwLength = cchBuffer; + ret = ICLRRuntimeInfo_GetVersionString(info, pbuffer, dwLength); - lstrcpyW(pbuffer, version); + ICLRRuntimeInfo_Release(info); + } - return S_OK; + return ret; } HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWSTR pConfigurationFile, diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 6426ac6..1b3cd77 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -87,6 +87,14 @@ static void test_versioninfo(void) } hr = pGetCORVersion(version, 1, &size); + if (hr == CLR_E_SHIM_RUNTIME) + { + /* FIXME: Get Mono packaged properly so we can fail here. */ + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER),"GetCORVersion returned %08x\n", hr); + skip("No .NET runtimes are installed\n"); + return; + } + ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER),"GetCORVersion returned %08x\n", hr); hr = pGetCORVersion(version, MAX_PATH, &size);

1 0

Vincent Povirk : mscoree: Use the . NET 4 interfaces to implement CorBindToRuntimeEx.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: 601b240f1e3649afac64d48e4966d16cf59c165d URL: http://source.winehq.org/git/wine.git/?a=commit;h=601b240f1e3649afac64d48e4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 1 15:37:25 2010 -0500 mscoree: Use the .NET 4 interfaces to implement CorBindToRuntimeEx. --- dlls/mscoree/corruntimehost.c | 27 --------------------------- dlls/mscoree/mscoree_main.c | 20 ++++++++++++++------ dlls/mscoree/mscoree_private.h | 2 -- 3 files changed, 14 insertions(+), 35 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 831f6de..1e9cc7f 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -42,7 +42,6 @@ struct RuntimeHost const CLRRuntimeInfo *version; const loaded_mono *mono; LONG ref; - BOOL legacy; /* if True, this was created by create_corruntimehost, and Release frees it */ }; static inline RuntimeHost *impl_from_ICorRuntimeHost( ICorRuntimeHost *iface ) @@ -86,10 +85,6 @@ static ULONG WINAPI corruntimehost_Release(ICorRuntimeHost* iface) ULONG ref; ref = InterlockedDecrement( &This->ref ); - if ( ref == 0 && This->legacy ) - { - RuntimeHost_Destroy(This); - } return ref; } @@ -289,7 +284,6 @@ HRESULT RuntimeHost_Construct(const CLRRuntimeInfo *runtime_version, This->ref = 1; This->version = runtime_version; This->mono = loaded_mono; - This->legacy = FALSE; *result = This; @@ -318,24 +312,3 @@ HRESULT RuntimeHost_Destroy(RuntimeHost *This) HeapFree( GetProcessHeap(), 0, This ); return S_OK; } - -IUnknown* create_corruntimehost(void) -{ - RuntimeHost *This; - IUnknown *result; - - if (FAILED(RuntimeHost_Construct(NULL, NULL, &This))) - return NULL; - - This->legacy = TRUE; - - if (FAILED(RuntimeHost_GetInterface(This, &CLSID_CorRuntimeHost, &IID_IUnknown, (void**)&result))) - { - RuntimeHost_Destroy(This); - return NULL; - } - - FIXME("return iface %p\n", result); - - return result; -} diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index d2d7445..e528360 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -628,16 +628,24 @@ HRESULT WINAPI LoadStringRC(UINT resId, LPWSTR pBuffer, int iBufLen, int bQuiet) HRESULT WINAPI CorBindToRuntimeEx(LPWSTR szVersion, LPWSTR szBuildFlavor, DWORD nflags, REFCLSID rslsid, REFIID riid, LPVOID *ppv) { - FIXME("%s %s %d %s %s %p\n", debugstr_w(szVersion), debugstr_w(szBuildFlavor), nflags, debugstr_guid( rslsid ), + HRESULT ret; + ICLRRuntimeInfo *info; + + TRACE("%s %s %d %s %s %p\n", debugstr_w(szVersion), debugstr_w(szBuildFlavor), nflags, debugstr_guid( rslsid ), debugstr_guid( riid ), ppv); - if(IsEqualGUID( riid, &IID_ICorRuntimeHost )) + *ppv = NULL; + + ret = get_runtime_info(NULL, szVersion, NULL, nflags, 0, TRUE, &info); + + if (SUCCEEDED(ret)) { - *ppv = create_corruntimehost(); - return S_OK; + ret = ICLRRuntimeInfo_GetInterface(info, rslsid, riid, ppv); + + ICLRRuntimeInfo_Release(info); } - *ppv = NULL; - return E_NOTIMPL; + + return ret; } HRESULT WINAPI CorBindToCurrentRuntime(LPCWSTR filename, REFCLSID rclsid, REFIID riid, LPVOID *ppv) diff --git a/dlls/mscoree/mscoree_private.h b/dlls/mscoree/mscoree_private.h index 62fa0bf..a77de0a 100644 --- a/dlls/mscoree/mscoree_private.h +++ b/dlls/mscoree/mscoree_private.h @@ -20,8 +20,6 @@ #ifndef __MSCOREE_PRIVATE__ #define __MSCOREE_PRIVATE__ -extern IUnknown* create_corruntimehost(void); - extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj); typedef struct tagASSEMBLY ASSEMBLY;

1 0

Vincent Povirk : mscoree: Use the . NET 4 interfaces to implement CorBindToRuntimeHost.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: 0985e02969d9791f6c439e3012a47f6187b202f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0985e02969d9791f6c439e301… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 1 15:43:31 2010 -0500 mscoree: Use the .NET 4 interfaces to implement CorBindToRuntimeHost. --- dlls/mscoree/mscoree_main.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index e528360..d1f4324 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -319,17 +319,25 @@ HRESULT WINAPI CorBindToRuntimeHost(LPCWSTR pwszVersion, LPCWSTR pwszBuildFlavor DWORD startupFlags, REFCLSID rclsid, REFIID riid, LPVOID *ppv) { - FIXME("(%s, %s, %s, %p, %d, %s, %s, %p): semi-stub!\n", debugstr_w(pwszVersion), + HRESULT ret; + ICLRRuntimeInfo *info; + + TRACE("(%s, %s, %s, %p, %d, %s, %s, %p)\n", debugstr_w(pwszVersion), debugstr_w(pwszBuildFlavor), debugstr_w(pwszHostConfigFile), pReserved, startupFlags, debugstr_guid(rclsid), debugstr_guid(riid), ppv); - if (!get_mono_path(NULL)) + *ppv = NULL; + + ret = get_runtime_info(NULL, pwszVersion, pwszHostConfigFile, startupFlags, 0, TRUE, &info); + + if (SUCCEEDED(ret)) { - MESSAGE("wine: Install the Windows version of Mono to run .NET executables\n"); - return E_FAIL; + ret = ICLRRuntimeInfo_GetInterface(info, rclsid, riid, ppv); + + ICLRRuntimeInfo_Release(info); } - return S_OK; + return ret; } BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

1 0

Vincent Povirk : mscoree: Support searching for .NET runtimes by exe file.
by Alexandre Julliard 09 Nov '10

09 Nov '10

Module: wine Branch: master Commit: d5fa2ceacac454d3ba8b33caada1419aeda031f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5fa2ceacac454d3ba8b33caa… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 1 16:05:36 2010 -0500 mscoree: Support searching for .NET runtimes by exe file. --- dlls/mscoree/metahost.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 5506946..17554a9 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -925,9 +925,9 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, static const DWORD supported_startup_flags = 0; static const DWORD supported_runtime_flags = RUNTIME_INFO_UPGRADE_VERSION; int i; - - if (exefile) - FIXME("ignoring exe filename %s\n", debugstr_w(exefile)); + WCHAR local_version[MAX_PATH]; + ULONG local_version_size = MAX_PATH; + HRESULT hr; if (config_file) FIXME("ignoring config filename %s\n", debugstr_w(config_file)); @@ -938,6 +938,15 @@ HRESULT get_runtime_info(LPCWSTR exefile, LPCWSTR version, LPCWSTR config_file, if (runtimeinfo_flags & ~supported_runtime_flags) FIXME("unsupported runtimeinfo flags %x\n", runtimeinfo_flags & ~supported_runtime_flags); + if (exefile && !version) + { + hr = CLRMetaHost_GetVersionFromFile(0, exefile, local_version, &local_version_size); + + version = local_version; + + if (FAILED(hr)) return hr; + } + if (version) { return CLRMetaHost_GetRuntime(0, version, &IID_ICLRRuntimeInfo, (void**)result);

1 0