mscoree: Reimplemented GetCORVersion using a helper that checks properly the return buffer; shortened a few FIXMEs (1/4)

[Paul Chitescu]

Changelog: mscoree: Reimplemented GetCORVersion using a helper that checks 
properly the return buffer; shortened a few FIXMEs (1/4)
-------------- next part --------------
--- ./dlls/mscoree/mscoree_main.c.orig	2006-11-13 15:23:51.000000000 +0200
+++ ./dlls/mscoree/mscoree_main.c	2006-11-13 23:01:55.000000000 +0200
@@ -19,17 +19,40 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <stdarg.h>
+#include "config.h"
+#include "wine/port.h"
+#include "wine/library.h"
+#include "wine/debug.h"
 
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"
 #include "ole2.h"
 
-#include "wine/debug.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL( mscoree );
 
+static const WCHAR defaultCORversion[] = {'v','1','.','1','.','4','3','2','2',0};
+/*
+  .NET 1.0: v1.0.3705
+  .NET 1.1: v1.1.4322
+  .NET 2.0: v2.0.50727
+*/
+
+/* this helper is needed very often */
+static HRESULT copyToWBuffer(LPCWSTR str, LPWSTR pBuf, DWORD cchBuf, LPDWORD pBufLen)
+{
+    DWORD len;
+    if (!(pBuf && cchBuf))
+	return E_POINTER;
+    len = lstrlenW(str);
+    if (pBufLen)
+	*pBufLen = len;
+    if (cchBuf < len)
+        return ERROR_INSUFFICIENT_BUFFER;
+    lstrcpyW(pBuf, str);
+    return S_OK;
+}
+
 HRESULT WINAPI CorBindToRuntimeHost(LPCWSTR pwszVersion, LPCWSTR pwszBuildFlavor,
                                     LPCWSTR pwszHostConfigFile, VOID *pReserved,
                                     DWORD startupFlags, REFCLSID rclsid,
@@ -98,30 +121,16 @@
     return E_FAIL;
 }
 
-HRESULT WINAPI GetCORVersion(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength)
+HRESULT WINAPI GetCORVersion(LPWSTR pBuffer, DWORD cchBuffer, DWORD *dwLength)
 {
-    static const WCHAR version[] = {'v','1','.','1','.','4','3','2','2',0};
-
-    FIXME("(%p, %d, %p): semi-stub!\n", pbuffer, cchBuffer, dwLength);
-
-    if (!dwLength)
-        return E_POINTER;
-
-    *dwLength = lstrlenW(version);
-
-    if (cchBuffer < *dwLength)
-        return ERROR_INSUFFICIENT_BUFFER;
-
-    if (pbuffer)
-        lstrcpyW(pbuffer, version);
-
-    return S_OK;
+    WARN("(%p, %d, %p): semi-stub\n", pBuffer, cchBuffer, dwLength);
+    return copyToWBuffer(defaultCORversion, pBuffer, cchBuffer, dwLength);
 }
 
-HRESULT WINAPI LoadLibraryShim( LPCWSTR szDllName, LPCWSTR szVersion, LPVOID pvReserved, HMODULE * phModDll)
+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);
+    FIXME("(%s, %p, %p, %p): semi-stub\n", debugstr_w(szDllName), szVersion, pvReserved, phModDll);
     return S_OK;
 }
 
@@ -133,6 +142,6 @@
 
 HRESULT WINAPI GetAssemblyMDImport(LPCWSTR szFileName, REFIID riid, IUnknown **ppIUnk)
 {
-    FIXME("(%p %s, %p, %p): stub\n", szFileName, debugstr_w(szFileName), riid, *ppIUnk);
+    FIXME("(%s, %p, %p): stub\n", debugstr_w(szFileName), riid, *ppIUnk);
     return ERROR_CALL_NOT_IMPLEMENTED;
 }