Module: wine Branch: master Commit: 042f23cacc0d588254bccfaf683f52a60d851e91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=042f23cacc0d588254bccfaf68...
Author: Louis Lenders xerox_xerox2000@yahoo.co.uk Date: Tue Aug 24 12:51:33 2010 +0200
mscoree: Improve GetCORVersion.
---
dlls/mscoree/mscoree_main.c | 9 ++++----- dlls/mscoree/tests/mscoree.c | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 0e6f252..d1f035c 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -348,20 +348,19 @@ HRESULT WINAPI GetCORSystemDirectory(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwL
HRESULT WINAPI GetCORVersion(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength) { - static const WCHAR version[] = {'v','1','.','1','.','4','3','2','2',0}; + static const WCHAR version[] = {'v','2','.','0','.','5','0','7','2','7',0};
FIXME("(%p, %d, %p): semi-stub!\n", pbuffer, cchBuffer, dwLength);
- if (!dwLength) + if (!dwLength || !pbuffer) return E_POINTER;
*dwLength = lstrlenW(version);
if (cchBuffer < *dwLength) - return ERROR_INSUFFICIENT_BUFFER; + return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
- if (pbuffer) - lstrcpyW(pbuffer, version); + lstrcpyW(pbuffer, version);
return S_OK; } diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index f0826a5..ba1e938 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -51,10 +51,10 @@ static void test_versioninfo(void) HRESULT hr;
hr = pGetCORVersion(NULL, MAX_PATH, &size); - todo_wine ok(hr == E_POINTER,"GetCORVersion returned %08x\n", hr); + ok(hr == E_POINTER,"GetCORVersion returned %08x\n", hr);
hr = pGetCORVersion(version, 1, &size); - todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER),"GetCORVersion returned %08x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER),"GetCORVersion returned %08x\n", hr);
hr = pGetCORVersion(version, MAX_PATH, &size); ok(hr == S_OK,"GetCORVersion returned %08x\n", hr);