From d9bd126c73ff09c363f534b318818d0b4e1b6479 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 20 Jul 2015 22:59:38 +0000 Subject: [PATCH] [USP10] Sync with Wine Staging 1.7.47. CORE-9924 svn path=/trunk/; revision=68503 --- reactos/dll/win32/usp10/shape.c | 7 +------ reactos/media/doc/README.WINE | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/reactos/dll/win32/usp10/shape.c b/reactos/dll/win32/usp10/shape.c index 67afd91a787..336457c14e7 100644 --- a/reactos/dll/win32/usp10/shape.c +++ b/reactos/dll/win32/usp10/shape.c @@ -3336,14 +3336,9 @@ rpRangeProperties = &ShapingData[psa->eScript].defaultTextRange; 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); if (!psc->GPOS_Table || !psc->otm) diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE index 26a1ecd61dd..7803665adf6 100644 --- a/reactos/media/doc/README.WINE +++ b/reactos/media/doc/README.WINE @@ -196,7 +196,7 @@ reactos/dll/win32/unicows # Synced to Wine-1.3.32 (Win9x only, why d 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