Nikolay Sivov : propsys: Use E_NOT_SUFFICIENT_BUFFER definition.

[Alexandre Julliard]

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

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Wed Oct  8 08:39:26 2014 +0400

propsys: Use E_NOT_SUFFICIENT_BUFFER definition.

---

 dlls/propsys/propsys_main.c  |  6 +++---
 dlls/propsys/tests/propsys.c | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c
index 6713adf..7631023 100644
--- a/dlls/propsys/propsys_main.c
+++ b/dlls/propsys/propsys_main.c
@@ -293,12 +293,12 @@ HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch
 
     /* GUIDSTRING_MAX accounts for null terminator, +1 for space character. */
     if (cch <= GUIDSTRING_MAX + 1)
-        return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+        return E_NOT_SUFFICIENT_BUFFER;
 
     if (!pkey)
     {
         psz[0] = '\0';
-        return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+        return E_NOT_SUFFICIENT_BUFFER;
     }
 
     sprintfW(psz, guid_fmtW, pkey->fmtid.Data1, pkey->fmtid.Data2,
@@ -336,7 +336,7 @@ HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY pkey, LPWSTR psz, UINT cch
                 *p++ = *ptr--;
         }
 
-        return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+        return E_NOT_SUFFICIENT_BUFFER;
     }
 }
 
diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c
index fc595f9..99d1c460 100644
--- a/dlls/propsys/tests/propsys.c
+++ b/dlls/propsys/tests/propsys.c
@@ -108,19 +108,19 @@ static void test_PSStringFromPropertyKey(void)
         {NULL, NULL, 0, E_POINTER},
         {&prop, NULL, 0, E_POINTER},
         {&prop, NULL, PKEYSTR_MAX, E_POINTER},
-        {NULL, out, 0, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW},
-        {NULL, out, PKEYSTR_MAX, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_fillerW, FALSE, 0, TRUE, fillerW},
-        {&prop, out, 0, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW},
-        {&prop, out, GUIDSTRING_MAX, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW},
-        {&prop, out, GUIDSTRING_MAX + 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW},
-        {&prop, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncatedW, TRUE, S_OK, TRUE, truncatedW},
-        {&prop, out, PKEYSTR_MAX - 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated2W, TRUE, S_OK, TRUE, truncated2W},
-        {&prop, out, PKEYSTR_MAX - 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated3W, TRUE, S_OK, TRUE, truncated3W},
+        {NULL, out, 0, E_NOT_SUFFICIENT_BUFFER, fillerW},
+        {NULL, out, PKEYSTR_MAX, E_NOT_SUFFICIENT_BUFFER, zero_fillerW, FALSE, 0, TRUE, fillerW},
+        {&prop, out, 0, E_NOT_SUFFICIENT_BUFFER, fillerW},
+        {&prop, out, GUIDSTRING_MAX, E_NOT_SUFFICIENT_BUFFER, fillerW},
+        {&prop, out, GUIDSTRING_MAX + 1, E_NOT_SUFFICIENT_BUFFER, fillerW},
+        {&prop, out, GUIDSTRING_MAX + 2, E_NOT_SUFFICIENT_BUFFER, zero_truncatedW, TRUE, S_OK, TRUE, truncatedW},
+        {&prop, out, PKEYSTR_MAX - 2, E_NOT_SUFFICIENT_BUFFER, zero_truncated2W, TRUE, S_OK, TRUE, truncated2W},
+        {&prop, out, PKEYSTR_MAX - 1, E_NOT_SUFFICIENT_BUFFER, zero_truncated3W, TRUE, S_OK, TRUE, truncated3W},
         {&prop, out, PKEYSTR_MAX, S_OK, expectedW},
-        {&prop2, out, GUIDSTRING_MAX + 2, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), zero_truncated4W, TRUE, S_OK, TRUE, truncated4W},
+        {&prop2, out, GUIDSTRING_MAX + 2, E_NOT_SUFFICIENT_BUFFER, zero_truncated4W, TRUE, S_OK, TRUE, truncated4W},
         {&prop2, out, GUIDSTRING_MAX + 6, S_OK, expected2W},
         {&prop2, out, PKEYSTR_MAX, S_OK, expected2W},
-        {&prop3, out, GUIDSTRING_MAX + 1, HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), fillerW},
+        {&prop3, out, GUIDSTRING_MAX + 1, E_NOT_SUFFICIENT_BUFFER, fillerW},
         {&prop3, out, GUIDSTRING_MAX + 2, S_OK, expected3W},
         {&prop3, out, PKEYSTR_MAX, S_OK, expected3W},
     };