Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 17:05:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USP10] Sync with Wine Staging 1.9.23. CORE-12409

Browse source 
svn path=/trunk/; revision=73296
This commit is contained in:
Amine Khaldi 2016-11-17 23:13:09 +00:00
parent 10570fa49e
commit 8c9854691e
3 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

29
reactos/dll/win32/usp10/usp10.c
View file

@ -1008,7 +1008,7 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc)
{ {
heap_free(((ScriptCache *)*psc)->widths[i]); heap_free(((ScriptCache *)*psc)->widths[i]);
} }
for (i = 0; i < 0x10; i++) for (i = 0; i < NUM_PAGES; i++)
{ {
unsigned int j; unsigned int j;
if (((ScriptCache *)*psc)->page[i]) if (((ScriptCache *)*psc)->page[i])
@ -3879,16 +3879,33 @@ HRESULT WINAPI ScriptStringGetOrder(SCRIPT_STRING_ANALYSIS ssa, UINT *order)
* Failure: a non-zero HRESULT. * Failure: a non-zero HRESULT.
*/ */
HRESULT WINAPI ScriptGetLogicalWidths(const SCRIPT_ANALYSIS *sa, int nbchars, int nbglyphs, HRESULT WINAPI ScriptGetLogicalWidths(const SCRIPT_ANALYSIS *sa, int nbchars, int nbglyphs,
const int *glyph_width, const WORD *log_clust, const int *advances, const WORD *log_clust,
const SCRIPT_VISATTR *sva, int *widths) const SCRIPT_VISATTR *sva, int *widths)
{ {
int i; int i, next = 0, direction;
TRACE("(%p, %d, %d, %p, %p, %p, %p)\n", TRACE("(%p, %d, %d, %p, %p, %p, %p)\n",
sa, nbchars, nbglyphs, glyph_width, log_clust, sva, widths); sa, nbchars, nbglyphs, advances, log_clust, sva, widths);
if (sa->fRTL && !sa->fLogicalOrder)
direction = -1;
else
direction = 1;
for (i = 0; i < nbchars; i++)
{
int clust_size = get_cluster_size(log_clust, nbchars, i, direction, NULL, NULL);
int advance = get_glyph_cluster_advance(advances, sva, log_clust, nbglyphs, nbchars, log_clust[i], direction);
int j;
for (j = 0; j < clust_size; j++)
{
widths[next] = advance / clust_size;
next++;
if (j) i++;
}
}
/* FIXME */
for (i = 0; i < nbchars; i++) widths[i] = glyph_width[i];
return S_OK; return S_OK;
} }

4
reactos/dll/win32/usp10/usp10_internal.h
View file

@ -145,6 +145,8 @@
#define GLYPH_BLOCK_MASK (GLYPH_BLOCK_SIZE - 1) #define GLYPH_BLOCK_MASK (GLYPH_BLOCK_SIZE - 1)
#define GLYPH_MAX 65536 #define GLYPH_MAX 65536
#define NUM_PAGES 17
#define GSUB_E_NOFEATURE -2 #define GSUB_E_NOFEATURE -2
#define GSUB_E_NOGLYPH -1 #define GSUB_E_NOGLYPH -1
@ -189,7 +191,7 @@ typedef struct {
OUTLINETEXTMETRICW *otm; OUTLINETEXTMETRICW *otm;
SCRIPT_FONTPROPERTIES sfp; SCRIPT_FONTPROPERTIES sfp;
BOOL sfnt; BOOL sfnt;
CacheGlyphPage *page[0x11]; CacheGlyphPage *page[NUM_PAGES];
ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE]; ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE];
LPVOID GSUB_Table; LPVOID GSUB_Table;
LPVOID GDEF_Table; LPVOID GDEF_Table;

2
reactos/media/doc/README.WINE
View file

@ -189,7 +189,7 @@ reactos/dll/win32/twain_32 # Synced to WineStaging-1.9.11
reactos/dll/win32/updspapi # Synced to WineStaging-1.9.11 reactos/dll/win32/updspapi # Synced to WineStaging-1.9.11
reactos/dll/win32/url # Synced to WineStaging-1.9.11 reactos/dll/win32/url # Synced to WineStaging-1.9.11
reactos/dll/win32/urlmon # Synced to WineStaging-1.9.23 reactos/dll/win32/urlmon # Synced to WineStaging-1.9.23
reactos/dll/win32/usp10 # Synced to WineStaging-1.9.16 reactos/dll/win32/usp10 # Synced to WineStaging-1.9.23
reactos/dll/win32/uxtheme # Forked reactos/dll/win32/uxtheme # Forked
reactos/dll/win32/vbscript # Synced to WineStaging-1.9.11 reactos/dll/win32/vbscript # Synced to WineStaging-1.9.11
reactos/dll/win32/version # Synced to WineStaging-1.9.11 reactos/dll/win32/version # Synced to WineStaging-1.9.11