[ros-diffs] [akhaldi] 68503: [USP10] Sync with Wine Staging 1.7.47. CORE-9924

Author: akhaldi
Date: Mon Jul 20 22:59:38 2015
New Revision: 68503

URL: http://svn.reactos.org/svn/reactos?rev=68503&view=rev
Log:
[USP10] Sync with Wine Staging 1.7.47. CORE-9924

Modified:
    trunk/reactos/dll/win32/usp10/shape.c
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/win32/usp10/shape.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shape.c?re…
==============================================================================
--- trunk/reactos/dll/win32/usp10/shape.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/usp10/shape.c	[iso-8859-1] Mon Jul 20 22:59:38 2015
@@ -3336,13 +3336,8 @@
 
 void SHAPE_ApplyOpenTypePositions(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const
WORD* pwGlyphs, INT cGlyphs, int *piAdvance, GOFFSET *pGoffset )
 {
-    const TEXTRANGE_PROPERTIES *rpRangeProperties;
+    const TEXTRANGE_PROPERTIES *rpRangeProperties =
&ShapingData[psa->eScript].defaultGPOSTextRange;
     int i;
-
-    rpRangeProperties = &ShapingData[psa->eScript].defaultGPOSTextRange;
-
-    if (!rpRangeProperties)
-        return;
 
     load_ot_tables(hdc, psc);
 

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Mon Jul 20 22:59:38 2015
@@ -196,7 +196,7 @@
 reactos/dll/win32/updspapi            # Synced to WineStaging-1.7.37
 reactos/dll/win32/url                 # Synced to WineStaging-1.7.37
 reactos/dll/win32/urlmon              # Synced to WineStaging-1.7.37
-reactos/dll/win32/usp10               # Synced to WineStaging-1.7.37
+reactos/dll/win32/usp10               # Synced to WineStaging-1.7.47
 reactos/dll/win32/uxtheme             # Forked
 reactos/dll/win32/vbscript            # Synced to WineStaging-1.7.37
 reactos/dll/win32/version             # Synced to WineStaging-1.7.37