[USP10] Sync with Wine Staging 3.3. CORE-14434

[reactos.git] / dll / win32 / usp10 / usp10.c

diff --git a/dll/win32/usp10/usp10.c b/dll/win32/usp10/usp10.c
index abc40fc..fe83722 100644 (file)
--- a/dll/win32/usp10/usp10.c
+++ b/dll/win32/usp10/usp10.c
@@ -24,11 +24,23 @@
  * and filtering characters and bi-directional text with custom line breaks.
  */
 
  * and filtering characters and bi-directional text with custom line breaks.
  */
 

+#include <stdarg.h>
+#include <stdlib.h>
+#include <math.h>
+
+#include "windef.h"
+#include "winbase.h"
+#include "wingdi.h"
+#include "winuser.h"
+#include "winnls.h"
+#include "winreg.h"
+#include "usp10.h"
+

 #include "usp10_internal.h"
 
 #include "usp10_internal.h"
 

-#include <math.h>
-#include <winuser.h>
-#include <winreg.h>
+#include "wine/debug.h"
+#include "wine/heap.h"
+#include "wine/unicode.h"

 
 WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);
 
 
 WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);
 


@@ -1143,7 +1155,7 @@ HRESULT WINAPI ScriptGetProperties(const SCRIPT_PROPERTIES ***props, int *num)
 
     if (!props && !num) return E_INVALIDARG;
 
 
     if (!props && !num) return E_INVALIDARG;
 

-    if (num) *num = sizeof(script_props)/sizeof(script_props[0]);
+    if (num) *num = ARRAY_SIZE(script_props);

     if (props) *props = script_props;
 
     return S_OK;
     if (props) *props = script_props;
 
     return S_OK;


@@ -3597,14 +3609,13 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN
     if  (!psa->fNoGlyphIndex)                                     /* Have Glyphs?                      */
         fuOptions |= ETO_GLYPH_INDEX;                             /* Say don't do translation to glyph */
 
     if  (!psa->fNoGlyphIndex)                                     /* Have Glyphs?                      */
         fuOptions |= ETO_GLYPH_INDEX;                             /* Say don't do translation to glyph */
 

-    lpDx = heap_alloc(cGlyphs * sizeof(INT) * 2);
-    if (!lpDx) return E_OUTOFMEMORY;
+    if (!(lpDx = heap_calloc(cGlyphs, 2 * sizeof(*lpDx))))
+        return E_OUTOFMEMORY;

     fuOptions |= ETO_PDY;
 
     if (psa->fRTL && psa->fLogicalOrder)
     {
     fuOptions |= ETO_PDY;
 
     if (psa->fRTL && psa->fLogicalOrder)
     {

-        reordered_glyphs = heap_alloc( cGlyphs * sizeof(WORD) );
-        if (!reordered_glyphs)
+        if (!(reordered_glyphs = heap_calloc(cGlyphs, sizeof(*reordered_glyphs))))

         {
             heap_free( lpDx );
             return E_OUTOFMEMORY;
         {
             heap_free( lpDx );
             return E_OUTOFMEMORY;


@@ -3743,8 +3754,7 @@ HRESULT WINAPI ScriptLayout(int runs, const BYTE *level, int *vistolog, int *log
     if (!level || (!vistolog && !logtovis))
         return E_INVALIDARG;
 
     if (!level || (!vistolog && !logtovis))
         return E_INVALIDARG;
 

-    indexs = heap_alloc(sizeof(int) * runs);
-    if (!indexs)
+    if (!(indexs = heap_calloc(runs, sizeof(*indexs))))

         return E_OUTOFMEMORY;
 
     if (vistolog)
         return E_OUTOFMEMORY;
 
     if (vistolog)