Hans Leidekker : mscoree: Add a stub implementation for CorExitProcess and GetRequestedRuntimeInfo.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8c34da22978590981fcd68d88d311caef1e39779
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8c34da22978590981fcd68d88d311caef1e39779

Author: Hans Leidekker <hans at it.vu.nl>
Date:   Mon Dec 11 14:25:39 2006 +0100

mscoree: Add a stub implementation for CorExitProcess and GetRequestedRuntimeInfo.

---

 dlls/mscoree/mscoree.spec   |    4 ++--
 dlls/mscoree/mscoree_main.c |   19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec
index 32dd72b..80dac08 100644
--- a/dlls/mscoree/mscoree.spec
+++ b/dlls/mscoree/mscoree.spec
@@ -22,7 +22,7 @@
 @ stub CorBindToRuntimeEx
 @ stdcall CorBindToRuntimeHost(wstr wstr wstr ptr long ptr ptr ptr)
 @ stub CorDllMainWorker
-@ stub CorExitProcess
+@ stdcall CorExitProcess(long)
 @ stub CorGetSvc
 @ stub CorIsLatestSvc
 @ stub CorMarkThreadInThreadPool
@@ -57,7 +57,7 @@
 @ stub GetPrivateContextsPerfCounters
 @ stub GetProcessExecutableHeap
 @ stub GetRealProcAddress
-@ stub GetRequestedRuntimeInfo
+@ stdcall GetRequestedRuntimeInfo(wstr wstr wstr long long ptr long ptr ptr long ptr)
 @ stub GetRequestedRuntimeVersion
 @ stub GetRequestedRuntimeVersionForCLSID
 @ stub GetStartupFlags
diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c
index 6941612..414e725 100644
--- a/dlls/mscoree/mscoree_main.c
+++ b/dlls/mscoree/mscoree_main.c
@@ -175,6 +175,12 @@ int WINAPI _CorExeMain2(PBYTE ptrMemory,
     return -1;
 }
 
+void WINAPI CorExitProcess(int exitCode)
+{
+    FIXME("(%x) stub\n", exitCode);
+    ExitProcess(exitCode);
+}
+
 void WINAPI _CorImageUnloading(LPCVOID* imageBase)
 {
     TRACE("(%p): stub\n", imageBase);
@@ -206,10 +212,21 @@ HRESULT WINAPI GetCORVersion(LPWSTR pbuf
     return S_OK;
 }
 
+HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWSTR pConfigurationFile,
+    DWORD startupFlags, DWORD runtimeInfoFlags, LPWSTR pDirectory, DWORD dwDirectory, DWORD *dwDirectoryLength,
+    LPWSTR pVersion, DWORD cchBuffer, DWORD *dwlength)
+{
+    FIXME("(%s, %s, %s, 0x%08x, 0x%08x, %p, 0x%08x, %p, %p, 0x%08x, %p) stub\n", debugstr_w(pExe),
+          debugstr_w(pwszVersion), debugstr_w(pConfigurationFile), startupFlags, runtimeInfoFlags, pDirectory,
+          dwDirectory, dwDirectoryLength, pVersion, cchBuffer, dwlength);
+    return GetCORVersion(pVersion, cchBuffer, dwlength);
+}
+
 HRESULT WINAPI LoadLibraryShim( LPCWSTR szDllName, LPCWSTR szVersion, LPVOID pvReserved, HMODULE * phModDll)
 {
-    *phModDll = LoadLibraryW(szDllName);
     FIXME("(%p %s, %p, %p, %p): semi-stub\n", szDllName, debugstr_w(szDllName), szVersion, pvReserved, phModDll);
+
+    if (phModDll) *phModDll = LoadLibraryW(szDllName);
     return S_OK;
 }