Nikolay Sivov : mscoree: Use E_NOT_SUFFICIENT_BUFFER definition.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Oct 16 09:44:20 CDT 2014
Module: wine
Branch: master
Commit: a99d8cb21bd0f658518a16459172974593f17fff
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a99d8cb21bd0f658518a16459172974593f17fff
Author: Nikolay Sivov <nsivov at codeweavers.com>
Date: Thu Oct 16 00:00:23 2014 +0400
mscoree: Use E_NOT_SUFFICIENT_BUFFER definition.
---
dlls/mscoree/metahost.c | 6 +++---
dlls/mscoree/tests/metahost.c | 2 +-
dlls/mscoree/tests/mscoree.c | 8 ++++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c
index 2383068..f07145b 100644
--- a/dlls/mscoree/metahost.c
+++ b/dlls/mscoree/metahost.c
@@ -360,7 +360,7 @@ static HRESULT WINAPI CLRRuntimeInfo_GetVersionString(ICLRRuntimeInfo* iface,
if (buffer_size >= *pcchBuffer)
MultiByteToWideChar(CP_UTF8, 0, version, -1, pwzBuffer, buffer_size);
else
- hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+ hr = E_NOT_SUFFICIENT_BUFFER;
}
return hr;
@@ -421,7 +421,7 @@ static HRESULT WINAPI CLRRuntimeInfo_GetRuntimeDirectory(ICLRRuntimeInfo* iface,
if (buffer_size >= size)
strcpyW(pwzBuffer, system_dir);
else
- hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+ hr = E_NOT_SUFFICIENT_BUFFER;
}
return hr;
@@ -1051,7 +1051,7 @@ HRESULT WINAPI CLRMetaHost_GetVersionFromFile(ICLRMetaHost* iface,
if (buffer_size >= *pcchBuffer)
MultiByteToWideChar(CP_UTF8, 0, version, -1, pwzBuffer, buffer_size);
else
- hr = HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+ hr = E_NOT_SUFFICIENT_BUFFER;
}
}
diff --git a/dlls/mscoree/tests/metahost.c b/dlls/mscoree/tests/metahost.c
index d00bb4f..5a8b3e0 100644
--- a/dlls/mscoree/tests/metahost.c
+++ b/dlls/mscoree/tests/metahost.c
@@ -122,7 +122,7 @@ static void test_enumruntimes(void)
count = 1;
hr = ICLRRuntimeInfo_GetVersionString(runtime_info, buf, &count);
- ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetVersionString returned %x\n", hr);
+ ok(hr == E_NOT_SUFFICIENT_BUFFER, "GetVersionString returned %x\n", hr);
ok(count > 1, "GetVersionString returned count %u\n", count);
count = 0xdeadbeef;
diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c
index fcea603..30b068d 100644
--- a/dlls/mscoree/tests/mscoree.c
+++ b/dlls/mscoree/tests/mscoree.c
@@ -92,7 +92,7 @@ static void test_versioninfo(void)
return;
}
- ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER),"GetCORVersion returned %08x\n", hr);
+ ok(hr == E_NOT_SUFFICIENT_BUFFER, "GetCORVersion returned %08x\n", hr);
hr = pGetCORVersion(version, MAX_PATH, &size);
ok(hr == S_OK,"GetCORVersion returned %08x\n", hr);
@@ -107,12 +107,12 @@ static void test_versioninfo(void)
path_len = size;
hr = pGetCORSystemDirectory(path, path_len-1 , &size);
- ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetCORSystemDirectory returned %08x\n", hr);
+ ok(hr == E_NOT_SUFFICIENT_BUFFER, "GetCORSystemDirectory returned %08x\n", hr);
if (0) /* crashes on <= w2k3 */
{
hr = pGetCORSystemDirectory(NULL, MAX_PATH , &size);
- ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetCORSystemDirectory returned %08x\n", hr);
+ ok(hr == E_NOT_SUFFICIENT_BUFFER, "GetCORSystemDirectory returned %08x\n", hr);
}
hr = pGetCORSystemDirectory(path, MAX_PATH , NULL);
@@ -140,7 +140,7 @@ static void test_versioninfo(void)
ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr);
hr = pGetRequestedRuntimeInfo( NULL, v2_0, NULL, 0, 0, path, 1, &path_len, version, MAX_PATH, &size);
- ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "GetRequestedRuntimeInfo returned %08x\n", hr);
+ ok(hr == E_NOT_SUFFICIENT_BUFFER, "GetRequestedRuntimeInfo returned %08x\n", hr);
/* if one of the buffers is NULL, the other one is still happily filled */
memset(version, 0, sizeof(version));
More information about the wine-cvs
mailing list