Nikolay Sivov : dwrite: Use E_NOT_SUFFICIENT_BUFFER definition.

Alexandre Julliard julliard at wine.codeweavers.com
Wed Oct 8 14:09:27 CDT 2014


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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Tue Oct  7 09:38:34 2014 +0400

dwrite: Use E_NOT_SUFFICIENT_BUFFER definition.

---

 dlls/dwrite/analyzer.c       | 2 +-
 dlls/dwrite/tests/analyzer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c
index 5851e90..1a05335 100644
--- a/dlls/dwrite/analyzer.c
+++ b/dlls/dwrite/analyzer.c
@@ -860,7 +860,7 @@ static HRESULT WINAPI dwritetextanalyzer_GetGlyphs(IDWriteTextAnalyzer2 *iface,
     script = analysis->script > Script_LastId ? Script_Unknown : analysis->script;
 
     if (max_glyph_count < length)
-        return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER);
+        return E_NOT_SUFFICIENT_BUFFER;
 
     if (substitution)
         FIXME("number substitution is not supported.\n");
diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c
index 1add761..233f072 100644
--- a/dlls/dwrite/tests/analyzer.c
+++ b/dlls/dwrite/tests/analyzer.c
@@ -1121,7 +1121,7 @@ static void test_GetGlyphs(void)
     sa.shapes = DWRITE_SCRIPT_SHAPES_DEFAULT;
     hr = IDWriteTextAnalyzer_GetGlyphs(analyzer, test1W, lstrlenW(test1W), fontface, FALSE, FALSE, &sa, NULL,
         NULL, NULL, NULL, 0, maxglyphcount, clustermap, props, glyphs1, shapingprops, &actual_count);
-    ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "got 0x%08x\n", hr);
+    ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr);
 
 if (0) {
     /* NULL fontface - crashes on Windows */




More information about the wine-cvs mailing list