January 2017 - Wine-Commits

André Hentschel : compstui: Fix SetCPSUIUserData spec file entry.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 1791b7d6ad7a9a08ef702c4b6676ab779f3b5b3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1791b7d6ad7a9a08ef702c4b6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 20 21:11:49 2017 +0100 compstui: Fix SetCPSUIUserData spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/compstui/compstui.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/compstui/compstui.spec b/dlls/compstui/compstui.spec index 08fdb47..7ba72a5 100644 --- a/dlls/compstui/compstui.spec +++ b/dlls/compstui/compstui.spec @@ -1,4 +1,4 @@ @ stdcall CommonPropertySheetUIA(long ptr long ptr) @ stdcall CommonPropertySheetUIW(long ptr long ptr) @ stdcall GetCPSUIUserData(long) -@ stdcall SetCPSUIUserData(long ptr) +@ stdcall SetCPSUIUserData(long long)

1 0

André Hentschel : atl: Fix AtlModuleInit spec file entry.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 26e8873f734ae23ed853aca60d416d2fa089402b URL: http://source.winehq.org/git/wine.git/?a=commit;h=26e8873f734ae23ed853aca60… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 20 21:11:48 2017 +0100 atl: Fix AtlModuleInit spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/atl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index da12228..9624253 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -8,7 +8,7 @@ 13 stdcall AtlMarshalPtrInProc(ptr ptr ptr) 14 stdcall AtlUnmarshalPtr(ptr ptr ptr) 15 stdcall AtlModuleGetClassObject(ptr ptr ptr ptr) -16 stdcall AtlModuleInit(ptr long long) +16 stdcall AtlModuleInit(ptr ptr long) 17 stdcall AtlModuleRegisterClassObjects(ptr long long) 18 stdcall AtlModuleRegisterServer(ptr long ptr) 19 stdcall AtlModuleRegisterTypeLib(ptr wstr)

1 0

André Hentschel : odbc32: Fix some spec file entries.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 0c785e593be33a7debcc8bfd5e432b4d9f6a1be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c785e593be33a7debcc8bfd5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 20 21:11:18 2017 +0100 odbc32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbc32/odbc32.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/odbc32/odbc32.spec b/dlls/odbc32/odbc32.spec index 766eec0..ccb540b 100644 --- a/dlls/odbc32/odbc32.spec +++ b/dlls/odbc32/odbc32.spec @@ -38,7 +38,7 @@ 38 stdcall SQLGetStmtAttr(long long ptr long ptr) 39 stdcall SQLSetConnectAttr(long long ptr long) 40 stdcall SQLColumns(long str long str long str long str long) - 41 stdcall SQLDriverConnect(long long str long str long str long) + 41 stdcall SQLDriverConnect(long long str long str long ptr long) 42 stdcall SQLGetConnectOption(long long ptr) 43 stdcall SQLGetData(long long long ptr long ptr) 44 stdcall SQLGetFunctions(long long ptr) @@ -103,7 +103,7 @@ 138 stdcall SQLGetStmtAttrW(long long ptr long ptr) 139 stdcall SQLSetConnectAttrW(long long ptr long) 140 stdcall SQLColumnsW(long wstr long wstr long wstr long wstr long) -141 stdcall SQLDriverConnectW(long long wstr long wstr long wstr long) +141 stdcall SQLDriverConnectW(long long wstr long wstr long ptr long) 142 stdcall SQLGetConnectOptionW(long long ptr) 145 stdcall SQLGetInfoW(long long ptr long ptr) 147 stdcall SQLGetTypeInfoW(long long)

1 0

André Hentschel : ntdll: Fix some more spec file entries.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 726698a1bfb33319be0f6daf641867443e57a37f URL: http://source.winehq.org/git/wine.git/?a=commit;h=726698a1bfb33319be0f6daf6… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 20 13:51:48 2017 +0100 ntdll: Fix some more spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 86 ++++++++++++++++++------------------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 56 ++++++++++++------------ 2 files changed, 71 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=726698a1bfb33319be0f6…

1 0

André Hentschel : krnl386.exe16: Fix some spec file entries.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: c005d8944135c5fda2c459954fac6327c22d7506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c005d8944135c5fda2c459954… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 20 21:11:10 2017 +0100 krnl386.exe16: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/krnl386.exe16.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/krnl386.exe16/krnl386.exe16.spec b/dlls/krnl386.exe16/krnl386.exe16.spec index f80cfcc..a06ba8c 100644 --- a/dlls/krnl386.exe16/krnl386.exe16.spec +++ b/dlls/krnl386.exe16/krnl386.exe16.spec @@ -587,12 +587,12 @@ @ stdcall -arch=win32 -register AllocMappedBuffer() @ stdcall -arch=win32 -register FreeMappedBuffer() @ stdcall -arch=win32 -register OT_32ThkLSF() -@ stdcall -arch=win32 ThunkInitLSF(long str long str str) +@ stdcall -arch=win32 ThunkInitLSF(ptr str long str str) @ stdcall -arch=win32 -register LogApiThkLSF(str) -@ stdcall -arch=win32 ThunkInitLS(long str long str str) +@ stdcall -arch=win32 ThunkInitLS(ptr str long str str) @ stdcall -arch=win32 -register LogApiThkSL(str) @ stdcall -arch=win32 -register Common32ThkLS() -@ stdcall -arch=win32 ThunkInitSL(long str long str str) +@ stdcall -arch=win32 ThunkInitSL(ptr str long str str) @ stdcall -arch=win32 -register LogCBThkSL(str) @ stdcall -arch=win32 ReleaseThunkLock(ptr) @ stdcall -arch=win32 RestoreThunkLock(long) @@ -600,7 +600,7 @@ @ stdcall -arch=win32 GetThunkBuff() @ stdcall -arch=win32 GetThunkStuff(str str) @ stdcall -arch=win32 K32WOWCallback16(long long) -@ stdcall -arch=win32 K32WOWCallback16Ex(ptr long long ptr ptr) +@ stdcall -arch=win32 K32WOWCallback16Ex(long long long ptr ptr) @ stdcall -arch=win32 K32WOWGetVDMPointer(long long long) @ stdcall -arch=win32 K32WOWHandle32(long long) @ stdcall -arch=win32 K32WOWHandle16(long long) @@ -615,7 +615,7 @@ @ stdcall -arch=win32 K32WOWDirectedYield16(long) @ stdcall -arch=win32 K32WOWGetVDMPointerFix(long long long) @ stdcall -arch=win32 K32WOWGetVDMPointerUnfix(long) -@ stdcall -arch=win32 K32WOWGetDescriptor(long long) +@ stdcall -arch=win32 K32WOWGetDescriptor(long ptr) @ stdcall -arch=win32 _KERNEL32_86(ptr) @ stdcall -arch=win32 SSOnBigStack() @ varargs -arch=win32 SSCall(long long ptr) @@ -686,7 +686,7 @@ @ stdcall -arch=win32 -norelay SUnMapLS_IP_EBP_36() @ stdcall -arch=win32 -norelay SUnMapLS_IP_EBP_40() @ stdcall -arch=win32 -norelay SUnMapLS_IP_EBP_8() -@ stdcall -arch=win32 ThunkConnect32(ptr str str str ptr ptr) +@ stdcall -arch=win32 ThunkConnect32(ptr str str str ptr long) @ stdcall -arch=win32 UTRegister(long str str str ptr ptr ptr) @ stdcall -arch=win32 UTUnRegister(long) @ stdcall -arch=win32 UnMapLS(long) @@ -712,7 +712,7 @@ @ stdcall -arch=win32 InitTask16(ptr) @ stdcall -arch=win32 IsBadReadPtr16(long long) @ stdcall -arch=win32 IsTask16(long) -@ stdcall -arch=win32 LoadModule16(str long) +@ stdcall -arch=win32 LoadModule16(str ptr) @ stdcall -arch=win32 LoadResource16(long long) @ stdcall -arch=win32 LocalAlloc16(long long) @ stdcall -arch=win32 LocalInit16(long long long)

1 0

André Hentschel : comctl32: Fix some spec file entries.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 99913e883b1cbb55b230e103d8f39f3824d0fba1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99913e883b1cbb55b230e103d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 20 21:11:13 2017 +0100 comctl32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/comctl32.spec | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/comctl32.spec b/dlls/comctl32/comctl32.spec index 1a5ab57..c3e9167 100644 --- a/dlls/comctl32/comctl32.spec +++ b/dlls/comctl32/comctl32.spec @@ -10,8 +10,8 @@ 6 stdcall CreateStatusWindowA(long str long long) 7 stdcall CreateToolbar(long long long long long long ptr long) 8 stdcall CreateMappedBitmap(long long long ptr long) - 9 stdcall -noname DPA_LoadStream(ptr ptr ptr long) - 10 stdcall -noname DPA_SaveStream(ptr ptr ptr long) + 9 stdcall -noname DPA_LoadStream(ptr ptr ptr ptr) + 10 stdcall -noname DPA_SaveStream(ptr ptr ptr ptr) 11 stdcall -noname DPA_Merge(ptr ptr long ptr ptr long) #12 stub Cctl1632_ThunkData32 13 stdcall MakeDragList(long) @@ -40,10 +40,10 @@ 236 stdcall -noname Str_SetPtrW(wstr wstr) 320 stdcall -ordinal DSA_Create(long long) 321 stdcall -ordinal DSA_Destroy(ptr) -322 stdcall -ordinal DSA_GetItem(ptr long long) +322 stdcall -ordinal DSA_GetItem(ptr long ptr) 323 stdcall -ordinal DSA_GetItemPtr(ptr long) -324 stdcall -ordinal DSA_InsertItem(ptr long long) -325 stdcall -ordinal DSA_SetItem (ptr long long) +324 stdcall -ordinal DSA_InsertItem(ptr long ptr) +325 stdcall -ordinal DSA_SetItem (ptr long ptr) 326 stdcall -ordinal DSA_DeleteItem(ptr long) 327 stdcall -ordinal DSA_DeleteAllItems(ptr) 328 stdcall -ordinal DPA_Create(long) @@ -62,7 +62,7 @@ 341 stdcall -noname SendNotify(long long long ptr) 342 stdcall -noname SendNotifyEx(long long long ptr long) 345 stdcall -ordinal TaskDialogIndirect(ptr ptr ptr ptr) -350 stdcall -noname -private StrChrA(str str) +350 stdcall -noname -private StrChrA(str long) 351 stdcall -noname -private StrRChrA(str str long) 352 stdcall -noname -private StrCmpNA(str str long) 353 stdcall -noname -private StrCmpNIA(str str long) @@ -93,10 +93,10 @@ 382 stdcall -noname SmoothScrollWindow(ptr) 383 stub -noname DoReaderMode 384 stdcall -noname SetPathWordBreakProc(ptr long) -385 stdcall -ordinal DPA_EnumCallback(long long long) -386 stdcall -ordinal DPA_DestroyCallback(ptr ptr long) -387 stdcall -ordinal DSA_EnumCallback(ptr ptr long) -388 stdcall -ordinal DSA_DestroyCallback(ptr ptr long) +385 stdcall -ordinal DPA_EnumCallback(long long ptr) +386 stdcall -ordinal DPA_DestroyCallback(ptr ptr ptr) +387 stdcall -ordinal DSA_EnumCallback(ptr ptr ptr) +388 stdcall -ordinal DSA_DestroyCallback(ptr ptr ptr) 389 stub -noname SHGetProcessDword 390 stdcall -noname ImageList_SetColorTable(ptr long long ptr) 400 stdcall -ordinal CreateMRUListW(ptr)

1 0

André Hentschel : advapi32: Fix some spec file entries.
by Alexandre Julliard Jan. 26, 2017

Jan. 26, 2017

Module: wine Branch: master Commit: 7efd984f281e280ee5a9242a0ba332e12efccb93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7efd984f281e280ee5a9242a0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Jan 20 21:11:03 2017 +0100 advapi32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 6 +++--- .../api-ms-win-security-lsapolicy-l1-1-0.spec | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 0ecd4e9..8e2911c 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -452,7 +452,7 @@ # @ stub LsaManageSidNameMapping @ stdcall LsaNtStatusToWinError(long) @ stub LsaOpenAccount -@ stdcall LsaOpenPolicy(long long long long) +@ stdcall LsaOpenPolicy(long ptr long long) # @ stub LsaOpenPolicySce @ stub LsaOpenSecret @ stub LsaOpenTrustedDomain @@ -698,10 +698,10 @@ # @ stub SetInformationCodeAuthzLevelW # @ stub SetInformationCodeAuthzPolicyW @ stdcall SetKernelObjectSecurity(long long ptr) -@ stdcall SetNamedSecurityInfoA(str long ptr ptr ptr ptr ptr) +@ stdcall SetNamedSecurityInfoA(str long long ptr ptr ptr ptr) # @ stub SetNamedSecurityInfoExA # @ stub SetNamedSecurityInfoExW -@ stdcall SetNamedSecurityInfoW(wstr long ptr ptr ptr ptr ptr) +@ stdcall SetNamedSecurityInfoW(wstr long long ptr ptr ptr ptr) @ stdcall SetPrivateObjectSecurity(long ptr ptr ptr long) # @ stub SetPrivateObjectSecurityEx # @ stub SetSecurityAccessMask diff --git a/dlls/api-ms-win-security-lsapolicy-l1-1-0/api-ms-win-security-lsapolicy-l1-1-0.spec b/dlls/api-ms-win-security-lsapolicy-l1-1-0/api-ms-win-security-lsapolicy-l1-1-0.spec index 311ae94..4dd2973 100644 --- a/dlls/api-ms-win-security-lsapolicy-l1-1-0/api-ms-win-security-lsapolicy-l1-1-0.spec +++ b/dlls/api-ms-win-security-lsapolicy-l1-1-0/api-ms-win-security-lsapolicy-l1-1-0.spec @@ -11,7 +11,7 @@ @ stdcall LsaLookupNames2(ptr long long ptr ptr ptr) advapi32.LsaLookupNames2 @ stdcall LsaLookupSids(ptr long ptr ptr ptr) advapi32.LsaLookupSids @ stub LsaLookupSids2 -@ stdcall LsaOpenPolicy(long long long long) advapi32.LsaOpenPolicy +@ stdcall LsaOpenPolicy(long ptr long long) advapi32.LsaOpenPolicy @ stub LsaOpenSecret @ stdcall LsaQueryInformationPolicy(ptr long ptr) advapi32.LsaQueryInformationPolicy @ stub LsaQuerySecret

1 0

Aric Stewart : usp10: Implement GSUB Context Substitution types 1 and 2.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: 5e6b2c0ed6c57fa98d1d6003bf234bebe049a34a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e6b2c0ed6c57fa98d1d6003b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jan 25 07:14:52 2017 -0600 usp10: Implement GSUB Context Substitution types 1 and 2. Used by the font Noto Nastaliq Urdu. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 192 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 192 insertions(+) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index d7afbe1..29ec503 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -238,6 +238,51 @@ typedef struct{ }GSUB_SubstLookupRecord; typedef struct{ + WORD SubstFormat; + WORD Coverage; + WORD SubRuleSetCount; + WORD SubRuleSet[1]; +}GSUB_ContextSubstFormat1; + +typedef struct{ + WORD SubRuleCount; + WORD SubRule[1]; +}GSUB_SubRuleSet; + +typedef struct { + WORD GlyphCount; + WORD SubstCount; + WORD Input[1]; +}GSUB_SubRule_1; + +typedef struct { + GSUB_SubstLookupRecord SubstLookupRecord[1]; +}GSUB_SubRule_2; + +typedef struct { + WORD SubstFormat; + WORD Coverage; + WORD ClassDef; + WORD SubClassSetCnt; + WORD SubClassSet[1]; +}GSUB_ContextSubstFormat2; + +typedef struct { + WORD SubClassRuleCnt; + WORD SubClassRule[1]; +}GSUB_SubClassSet; + +typedef struct { + WORD GlyphCount; + WORD SubstCount; + WORD Class[1]; +}GSUB_SubClassRule_1; + +typedef struct { + GSUB_SubstLookupRecord SubstLookupRecord[1]; +}GSUB_SubClassRule_2; + +typedef struct{ WORD SubstFormat; /* = 1 */ WORD Coverage; WORD ChainSubRuleSetCount; @@ -940,6 +985,151 @@ static INT GSUB_apply_LigatureSubst(const OT_LookupTable *look, WORD *glyphs, IN return GSUB_E_NOGLYPH; } +static INT GSUB_apply_ContextSubst(const OT_LookupList* lookup, const OT_LookupTable *look, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) +{ + int j; + TRACE("Context Substitution Subtable\n"); + for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) + { + const GSUB_ContextSubstFormat1 *csf1; + + csf1 = (const GSUB_ContextSubstFormat1*)GSUB_get_subtable(look, j); + if (GET_BE_WORD(csf1->SubstFormat) == 1) + { + int offset, index; + TRACE("Context Substitution Subtable: Class 1\n"); + offset = GET_BE_WORD(csf1->Coverage); + index = GSUB_is_glyph_covered((const BYTE*)csf1+offset, glyphs[glyph_index]); + TRACE(" Coverage index %i\n",index); + if (index != -1) + { + int k, count; + const GSUB_SubRuleSet *srs; + offset = GET_BE_WORD(csf1->SubRuleSet[index]); + srs = (const GSUB_SubRuleSet*)((const BYTE*)csf1+offset); + count = GET_BE_WORD(srs->SubRuleCount); + TRACE(" SubRuleSet has %i members\n",count); + for (k = 0; k < count; k++) + { + const GSUB_SubRule_1 *sr; + const GSUB_SubRule_2 *sr_2; + int g_count, l; + int newIndex = glyph_index; + + offset = GET_BE_WORD(srs->SubRule[k]); + sr = (const GSUB_SubRule_1*)((const BYTE*)srs+offset); + g_count = GET_BE_WORD(sr->GlyphCount); + TRACE(" SubRule has %i glyphs\n",g_count); + for (l = 0; l < g_count-1; l++) + if (glyphs[glyph_index + (write_dir * (l+1))] != GET_BE_WORD(sr->Input[l])) break; + + if (l < g_count-1) + { + TRACE(" Rule does not match\n"); + continue; + } + + TRACE(" Rule matches\n"); + sr_2 = (const GSUB_SubRule_2*)((const BYTE*)sr+ + FIELD_OFFSET(GSUB_SubRule_1, Input[g_count-1])); + + for (l = 0; l < GET_BE_WORD(sr->SubstCount); l++) + { + int lookupIndex = GET_BE_WORD(sr_2->SubstLookupRecord[l].LookupListIndex); + int SequenceIndex = GET_BE_WORD(sr_2->SubstLookupRecord[l].SequenceIndex) * write_dir; + + TRACE(" SUBST: %i -> %i %i\n",l, SequenceIndex, lookupIndex); + newIndex = GSUB_apply_lookup(lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count); + if (newIndex == -1) + { + ERR(" Chain failed to generate a glyph\n"); + continue; + } + } + return newIndex; + } + } + } + else if (GET_BE_WORD(csf1->SubstFormat) == 2) + { + const GSUB_ContextSubstFormat2 *csf2; + const void *glyph_class_table; + int offset, index; + + csf2 = (const GSUB_ContextSubstFormat2*)csf1; + TRACE("Context Substitution Subtable: Class 2\n"); + offset = GET_BE_WORD(csf2->Coverage); + index = GSUB_is_glyph_covered((const BYTE*)csf2+offset, glyphs[glyph_index]); + TRACE(" Coverage index %i\n",index); + if (index != -1) + { + int k, count, class; + const GSUB_SubClassSet *scs; + + offset = GET_BE_WORD(csf2->ClassDef); + glyph_class_table = (const BYTE *)csf2 + offset; + + class = OT_get_glyph_class(glyph_class_table,glyphs[glyph_index]); + + offset = GET_BE_WORD(csf2->SubClassSet[class]); + if (offset == 0) + { + TRACE(" No class rule table for class %i\n",class); + continue; + } + scs = (const GSUB_SubClassSet*)((const BYTE*)csf2+offset); + count = GET_BE_WORD(scs->SubClassRuleCnt); + TRACE(" SubClassSet has %i members\n",count); + for (k = 0; k < count; k++) + { + const GSUB_SubClassRule_1 *sr; + const GSUB_SubClassRule_2 *sr_2; + int g_count, l; + int newIndex = glyph_index; + + offset = GET_BE_WORD(scs->SubClassRule[k]); + sr = (const GSUB_SubClassRule_1*)((const BYTE*)scs+offset); + g_count = GET_BE_WORD(sr->GlyphCount); + TRACE(" SubClassRule has %i glyphs classes\n",g_count); + for (l = 0; l < g_count-1; l++) + { + int g_class = OT_get_glyph_class(glyph_class_table, glyphs[glyph_index + (write_dir * (l+1))]); + if (g_class != GET_BE_WORD(sr->Class[l])) break; + } + + if (l < g_count-1) + { + TRACE(" Rule does not match\n"); + continue; + } + + TRACE(" Rule matches\n"); + sr_2 = (const GSUB_SubClassRule_2*)((const BYTE*)sr+ + FIELD_OFFSET(GSUB_SubClassRule_1, Class[g_count-1])); + + for (l = 0; l < GET_BE_WORD(sr->SubstCount); l++) + { + int lookupIndex = GET_BE_WORD(sr_2->SubstLookupRecord[l].LookupListIndex); + int SequenceIndex = GET_BE_WORD(sr_2->SubstLookupRecord[l].SequenceIndex) * write_dir; + + TRACE(" SUBST: %i -> %i %i\n",l, SequenceIndex, lookupIndex); + newIndex = GSUB_apply_lookup(lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count); + if (newIndex == -1) + { + ERR(" Chain failed to generate a glyph\n"); + continue; + } + } + return newIndex; + } + } + } + else + FIXME("Unhandled Context Substitution Format %i\n", GET_BE_WORD(csf1->SubstFormat)); + } + return GSUB_E_NOGLYPH; +} + static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_LookupTable *look, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int j; @@ -1084,6 +1274,8 @@ static INT GSUB_apply_lookup(const OT_LookupList* lookup, INT lookup_index, WORD return GSUB_apply_AlternateSubst(look, glyphs, glyph_index, write_dir, glyph_count); case 4: return GSUB_apply_LigatureSubst(look, glyphs, glyph_index, write_dir, glyph_count); + case 5: + return GSUB_apply_ContextSubst(lookup, look, glyphs, glyph_index, write_dir, glyph_count); case 6: return GSUB_apply_ChainContextSubst(lookup, look, glyphs, glyph_index, write_dir, glyph_count); case 7:

1 0

Andrew Eikum : kernel32: Use different default sublangs for Spanish and Chinese.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: 7737693693ca46a88c41cfeab95d2b65423d8e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7737693693ca46a88c41cfeab… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 24 14:43:53 2017 -0600 kernel32: Use different default sublangs for Spanish and Chinese. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 20 ++++++++++++++++---- dlls/kernel32/nls/esn.nls | 2 +- dlls/kernel32/nls/esp.nls | 2 +- dlls/kernel32/tests/locale.c | 8 ++++---- dlls/msvcr120/tests/msvcr120.c | 8 +++----- 5 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 9b3a957..2bf1024 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -359,6 +359,18 @@ static UINT find_charset( const WCHAR *name ) return 0; } +static WORD get_default_sublang(LCID lang) +{ + switch (PRIMARYLANGID(lang)) + { + case LANG_SPANISH: + return SUBLANG_SPANISH_MODERN; + case LANG_CHINESE: + return SUBLANG_CHINESE_SIMPLIFIED; + default: + return SUBLANG_DEFAULT; + } +} /*********************************************************************** * find_locale_id_callback @@ -402,7 +414,7 @@ static BOOL CALLBACK find_locale_id_callback( HMODULE hModule, LPCWSTR type, } else /* match default language */ { - if (SUBLANGID(LangID) == SUBLANG_DEFAULT) matches++; + if (SUBLANGID(LangID) == get_default_sublang( LangID )) matches++; } if (data->codepage) @@ -1671,7 +1683,7 @@ INT WINAPI GetLocaleInfoW( LCID lcid, LCTYPE lctype, LPWSTR buffer, INT len ) /* replace SUBLANG_NEUTRAL by SUBLANG_DEFAULT */ if (SUBLANGID(lang_id) == SUBLANG_NEUTRAL) - lang_id = MAKELANGID(PRIMARYLANGID(lang_id), SUBLANG_DEFAULT); + lang_id = MAKELANGID(PRIMARYLANGID(lang_id), get_default_sublang( lang_id )); if (!(hrsrc = FindResourceExW( kernel32_handle, (LPWSTR)RT_STRING, ULongToPtr((lctype >> 4) + 1), lang_id ))) @@ -2776,7 +2788,7 @@ LCID WINAPI ConvertDefaultLocale( LCID lcid ) langid = LANGIDFROMLCID(lcid); if (SUBLANGID(langid) == SUBLANG_NEUTRAL) { - langid = MAKELANGID(PRIMARYLANGID(langid), SUBLANG_DEFAULT); + langid = MAKELANGID(PRIMARYLANGID(langid), get_default_sublang( langid )); lcid = MAKELCID(langid, SORTIDFROMLCID(lcid)); } } @@ -4212,7 +4224,7 @@ static BOOL NLS_GetLanguageGroupName(LGRPID lgrpid, LPWSTR szName, ULONG nameSiz langId = GetSystemDefaultLangID(); if (SUBLANGID(langId) == SUBLANG_NEUTRAL) - langId = MAKELANGID( PRIMARYLANGID(langId), SUBLANG_DEFAULT ); + langId = MAKELANGID(PRIMARYLANGID(langId), get_default_sublang( langId )); hResource = FindResourceExW( kernel32_handle, (LPWSTR)RT_STRING, szResourceName, langId ); diff --git a/dlls/kernel32/nls/esn.nls b/dlls/kernel32/nls/esn.nls index 7306c00..4108ca2 100644 --- a/dlls/kernel32/nls/esn.nls +++ b/dlls/kernel32/nls/esn.nls @@ -123,7 +123,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN LOCALE_SMONTHNAME12 "diciembre" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "." - LOCALE_SNAME "es-ES_modern" + LOCALE_SNAME "es-ES" LOCALE_SNATIVECTRYNAME "España" LOCALE_SNATIVECURRNAME "euro" LOCALE_SNATIVEDIGITS "0123456789" diff --git a/dlls/kernel32/nls/esp.nls b/dlls/kernel32/nls/esp.nls index 5260627..5547752 100644 --- a/dlls/kernel32/nls/esp.nls +++ b/dlls/kernel32/nls/esp.nls @@ -123,7 +123,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH LOCALE_SMONTHNAME12 "diciembre" LOCALE_SMONTHNAME13 "" LOCALE_SMONTHOUSANDSEP "." - LOCALE_SNAME "es-ES" + LOCALE_SNAME "es-ES_tradnl" LOCALE_SNATIVECTRYNAME "España" LOCALE_SNATIVECURRNAME "euro" LOCALE_SNATIVEDIGITS "0123456789" diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 4224c0a..7cbaafa 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -255,7 +255,7 @@ static const struct neutralsublang_name2_t neutralsublang_names2[] = { { {'e','s',0}, {'e','s','-','E','S',0}, MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), SORT_DEFAULT), MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH), SORT_DEFAULT) /* vista */, - {'e','s','-','E','S','_','t','r','a','d','n','l',0}, 0x1 }, + {'e','s','-','E','S','_','t','r','a','d','n','l',0} }, { {'g','a',0}, {'g','a','-','I','E',0}, MAKELCID(MAKELANGID(LANG_IRISH, SUBLANG_IRISH_IRELAND), SORT_DEFAULT), 0, {0}, 0x3 }, { {'i','t',0}, {'i','t','-','I','T',0}, @@ -273,7 +273,7 @@ static const struct neutralsublang_name2_t neutralsublang_names2[] = { { {'u','z',0}, {'u','z','-','L','a','t','n','-','U','Z',0}, MAKELCID(MAKELANGID(LANG_UZBEK, SUBLANG_UZBEK_LATIN), SORT_DEFAULT) }, { {'z','h',0}, {'z','h','-','C','N',0}, - MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT), 0, {0}, 0x3 }, + MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT) }, { {0} } }; @@ -2684,7 +2684,7 @@ static const struct neutralsublang_name_t neutralsublang_names[] = { { {'a','z',0}, MAKELCID(MAKELANGID(LANG_AZERI, SUBLANG_AZERI_LATIN), SORT_DEFAULT) }, { {'d','e',0}, MAKELCID(MAKELANGID(LANG_GERMAN, SUBLANG_GERMAN), SORT_DEFAULT) }, { {'e','n',0}, MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT) }, - { {'e','s',0}, MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), SORT_DEFAULT), 1 }, + { {'e','s',0}, MAKELCID(MAKELANGID(LANG_SPANISH, SUBLANG_SPANISH_MODERN), SORT_DEFAULT) }, { {'g','a',0}, MAKELCID(MAKELANGID(LANG_IRISH, SUBLANG_IRISH_IRELAND), SORT_DEFAULT) }, { {'i','t',0}, MAKELCID(MAKELANGID(LANG_ITALIAN, SUBLANG_ITALIAN), SORT_DEFAULT) }, { {'m','s',0}, MAKELCID(MAKELANGID(LANG_MALAY, SUBLANG_MALAY_MALAYSIA), SORT_DEFAULT) }, @@ -2693,7 +2693,7 @@ static const struct neutralsublang_name_t neutralsublang_names[] = { { {'s','r',0}, MAKELCID(MAKELANGID(LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN), SORT_DEFAULT), 1 }, { {'s','v',0}, MAKELCID(MAKELANGID(LANG_SWEDISH, SUBLANG_SWEDISH), SORT_DEFAULT) }, { {'u','z',0}, MAKELCID(MAKELANGID(LANG_UZBEK, SUBLANG_UZBEK_LATIN), SORT_DEFAULT) }, - { {'z','h',0}, MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT), 1 }, + { {'z','h',0}, MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT) }, { {0} } }; diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index e631738..13f3672 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -453,11 +453,10 @@ static void test____lc_locale_name_func(void) const char *locale; const WCHAR name[10]; const WCHAR broken_name[10]; - BOOL todo; } tests[] = { { "American", {'e','n',0}, {'e','n','-','U','S',0} }, { "Belgian", {'n','l','-','B','E',0} }, - { "Chinese", {'z','h',0}, {'z','h','-','C','N',0}, TRUE }, + { "Chinese", {'z','h',0}, {'z','h','-','C','N',0} }, { "Dutch", {'n','l',0}, {'n','l','-','N','L',0} }, { "English", {'e','n',0}, {'e','n','-','U','S',0} }, { "French", {'f','r',0}, {'f','r','-','F','R',0} }, @@ -476,9 +475,8 @@ static void test____lc_locale_name_func(void) lc_names = p____lc_locale_name_func(); ok(lc_names[0] == NULL, "%d - lc_names[0] = %s\n", i, wine_dbgstr_w(lc_names[0])); - todo_wine_if(tests[i].todo) - ok(!lstrcmpW(lc_names[1], tests[i].name) || broken(!lstrcmpW(lc_names[1], tests[i].broken_name)), - "%d - lc_names[1] = %s\n", i, wine_dbgstr_w(lc_names[1])); + ok(!lstrcmpW(lc_names[1], tests[i].name) || broken(!lstrcmpW(lc_names[1], tests[i].broken_name)), + "%d - lc_names[1] = %s\n", i, wine_dbgstr_w(lc_names[1])); for(j=LC_MIN+2; j<=LC_MAX; j++) { ok(!lstrcmpW(lc_names[1], lc_names[j]), "%d - lc_names[%d] = %s, expected %s\n",

1 0

Francois Gouget : iphlpapi/tests: Remove an unnecessary NULL cast.
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Module: wine Branch: master Commit: 77f78ddbf92bd5b5785c88a041b9aedae0a50d39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f78ddbf92bd5b5785c88a04… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Jan 24 15:52:02 2017 +0100 iphlpapi/tests: Remove an unnecessary NULL cast. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/iphlpapi/tests/iphlpapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 6991a39..cb73a9d 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1582,7 +1582,7 @@ static void test_AllocateAndGetTcpExTableFromStack(void) ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); ret = pAllocateAndGetTcpExTableFromStack( (void **)&table_ex, FALSE, INVALID_HANDLE_VALUE, 0, AF_INET ); ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); - ret = pAllocateAndGetTcpExTableFromStack( (void **)NULL, FALSE, GetProcessHeap(), 0, AF_INET ); + ret = pAllocateAndGetTcpExTableFromStack( NULL, FALSE, GetProcessHeap(), 0, AF_INET ); ok( ret == ERROR_INVALID_PARAMETER, "got %u\n", ret ); }

1 0