December 2012 - Wine-Commits

Huw Davies : usp10: Move the application of pair values to a helper function.
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Module: wine Branch: master Commit: 08fcdd5f6f2a31704ac964137d5f55b0fe86c504 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08fcdd5f6f2a31704ac964137… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 20 12:55:33 2012 +0000 usp10: Move the application of pair values to a helper function. --- dlls/usp10/opentype.c | 48 +++++++++++++++++++++++++++--------------------- 1 files changed, 27 insertions(+), 21 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index edaf917..45d28ef 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1186,6 +1186,30 @@ static VOID GPOS_apply_SingleAdjustment(const OT_LookupTable *look, const WORD * } } +static void apply_pair_value( const void *pos_table, WORD val_fmt1, WORD val_fmt2, const WORD *pair, + INT ppem, POINT *adjust, POINT *advance ) +{ + GPOS_ValueRecord val_rec1 = {0,0,0,0,0,0,0,0}; + GPOS_ValueRecord val_rec2 = {0,0,0,0,0,0,0,0}; + INT size; + + size = GPOS_get_value_record( val_fmt1, pair, &val_rec1 ); + GPOS_get_value_record( val_fmt2, pair + size, &val_rec2 ); + + if (val_fmt1) + { + GPOS_get_value_record_offsets( pos_table, &val_rec1, val_fmt1, ppem, adjust, advance ); + TRACE( "Glyph 1 resulting cumulative offset is %i,%i design units\n", adjust[0].x, adjust[0].y ); + TRACE( "Glyph 1 resulting cumulative advance is %i,%i design units\n", advance[0].x, advance[0].y ); + } + if (val_fmt2) + { + GPOS_get_value_record_offsets( pos_table, &val_rec2, val_fmt2, ppem, adjust + 1, advance + 1 ); + TRACE( "Glyph 2 resulting cumulative offset is %i,%i design units\n", adjust[1].x, adjust[1].y ); + TRACE( "Glyph 2 resulting cumulative advance is %i,%i design units\n", advance[1].x, advance[1].y ); + } +} + static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const WORD *glyphs, INT glyph_index, INT write_dir, INT glyph_count, INT ppem, LPPOINT ptAdjust, LPPOINT ptAdvance) { int j; @@ -1222,28 +1246,10 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const WORD *gly if (glyphs[glyph_index+write_dir] == second_glyph) { int next = 1; - GPOS_ValueRecord ValueRecord1 = {0,0,0,0,0,0,0,0}; - GPOS_ValueRecord ValueRecord2 = {0,0,0,0,0,0,0,0}; - TRACE("Format 1: Found Pair %x,%x\n",glyphs[glyph_index],glyphs[glyph_index+write_dir]); - - GPOS_get_value_record(ValueFormat1, pair_val_rec->Value1, &ValueRecord1); - GPOS_get_value_record(ValueFormat2, pair_val_rec->Value1 + val_fmt1_size, &ValueRecord2); - if (ValueFormat1) - { - GPOS_get_value_record_offsets((const BYTE*)ppf1, &ValueRecord1, ValueFormat1, ppem, &ptAdjust[0], &ptAdvance[0]); - TRACE("Glyph 1 resulting cumulative offset is %i,%i design units\n",ptAdjust[0].x,ptAdjust[0].y); - TRACE("Glyph 1 resulting cumulative advance is %i,%i design units\n",ptAdvance[0].x,ptAdvance[0].y); - } - if (ValueFormat2) - { - GPOS_get_value_record_offsets((const BYTE*)ppf1, &ValueRecord2, ValueFormat2, ppem, &ptAdjust[1], &ptAdvance[1]); - TRACE("Glyph 2 resulting cumulative offset is %i,%i design units\n",ptAdjust[1].x,ptAdjust[1].y); - TRACE("Glyph 2 resulting cumulative advance is %i,%i design units\n",ptAdvance[1].x,ptAdvance[1].y); - next++; - } - if (next) - return glyph_index + next; + apply_pair_value( ppf1, ValueFormat1, ValueFormat2, pair_val_rec->Value1, ppem, ptAdjust, ptAdvance ); + if (ValueFormat2) next++; + return glyph_index + next; } pair_val_rec = (const GPOS_PairValueRecord *)(pair_val_rec->Value1 + val_fmt1_size + val_fmt2_size); }

1 0

Huw Davies : usp10: Add support for format 2 pair adjustments.
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Module: wine Branch: master Commit: 496898db510a3a38483d25ed3f1afbf76016500a URL: http://source.winehq.org/git/wine.git/?a=commit;h=496898db510a3a38483d25ed3… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 20 12:55:34 2012 +0000 usp10: Add support for format 2 pair adjustments. --- dlls/usp10/opentype.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 45d28ef..10edc23 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -352,6 +352,18 @@ typedef struct { } GPOS_PairPosFormat1; typedef struct { + WORD PosFormat; + WORD Coverage; + WORD ValueFormat1; + WORD ValueFormat2; + WORD ClassDef1; + WORD ClassDef2; + WORD Class1Count; + WORD Class2Count; + WORD Class1Record[1]; +} GPOS_PairPosFormat2; + +typedef struct { WORD SecondGlyph; WORD Value1[1]; WORD Value2[1]; @@ -1255,6 +1267,37 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const WORD *gly } } } + else if (GET_BE_WORD(ppf1->PosFormat) == 2) + { + const GPOS_PairPosFormat2 *ppf2 = (const GPOS_PairPosFormat2*)((const BYTE*)look + offset); + int index; + WORD ValueFormat1 = GET_BE_WORD( ppf2->ValueFormat1 ); + WORD ValueFormat2 = GET_BE_WORD( ppf2->ValueFormat2 ); + INT val_fmt1_size = GPOS_get_value_record( ValueFormat1, NULL, NULL ); + INT val_fmt2_size = GPOS_get_value_record( ValueFormat2, NULL, NULL ); + WORD class1_count = GET_BE_WORD( ppf2->Class1Count ); + WORD class2_count = GET_BE_WORD( ppf2->Class2Count ); + + offset = GET_BE_WORD( ppf2->Coverage ); + index = GSUB_is_glyph_covered( (const BYTE*)ppf2 + offset, glyphs[glyph_index] ); + if (index != -1) + { + WORD class1, class2; + class1 = OT_get_glyph_class( (const BYTE *)ppf2 + GET_BE_WORD(ppf2->ClassDef1), glyphs[glyph_index] ); + class2 = OT_get_glyph_class( (const BYTE *)ppf2 + GET_BE_WORD(ppf2->ClassDef2), glyphs[glyph_index + write_dir] ); + if (class1 < class1_count && class2 < class2_count) + { + const WORD *pair_val = ppf2->Class1Record + (class1 * class2_count + class2) * (val_fmt1_size + val_fmt2_size); + int next = 1; + + TRACE( "Format 2: Found Pair %x,%x\n", glyphs[glyph_index], glyphs[glyph_index + write_dir] ); + + apply_pair_value( ppf2, ValueFormat1, ValueFormat2, pair_val, ppem, ptAdjust, ptAdvance ); + if (ValueFormat2) next++; + return glyph_index + next; + } + } + } else FIXME("Pair Adjustment Positioning: Format %i Unhandled\n",GET_BE_WORD(ppf1->PosFormat)); }

1 0

Frédéric Delanoy : cmd: Remove dead assignments ( clang).
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Module: wine Branch: master Commit: 5188f08bf426497ea0f17e3f6751320cc11aeaae URL: http://source.winehq.org/git/wine.git/?a=commit;h=5188f08bf426497ea0f17e3f6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Dec 19 21:55:40 2012 +0100 cmd: Remove dead assignments (clang). --- programs/cmd/builtins.c | 1 - programs/cmd/wcmdmain.c | 5 ----- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 8715c51..acf0882 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -440,7 +440,6 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app } /* Loop copying data from source to destination until EOF read */ - ok = TRUE; do { char buffer[MAXSTRING]; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 3884727..d2884c9 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1157,8 +1157,6 @@ void WCMD_run_program (WCHAR *command, BOOL called) static const WCHAR batExt[] = {'.','b','a','t','\0'}; static const WCHAR cmdExt[] = {'.','c','m','d','\0'}; - launched = TRUE; - /* Special case BAT and CMD */ if (ext && (!strcmpiW(ext, batExt) || !strcmpiW(ext, cmdExt))) { BOOL oldinteractive = interactive; @@ -2404,9 +2402,6 @@ int wmain (int argc, WCHAR *argvW[]) * parameters after the /C or /K by pretending there was a single space */ if (argPos == NULL) argPos = (WCHAR *)spaceW; - /* Build the command to execute - It is what is left in argPos */ - len = strlenW(argPos); - /* Take a copy */ cmd = heap_strdupW(argPos);

1 0

Detlef Riekenberg : api-ms-win-downlevel-user32-l1-1-0: Add dll.
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Module: wine Branch: master Commit: 5b5e8d9b680e57f2d870b90ce3186b3c5530fcb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b5e8d9b680e57f2d870b90ce… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Dec 20 08:49:59 2012 +0100 api-ms-win-downlevel-user32-l1-1-0: Add dll. --- configure | 1 + configure.ac | 1 + .../api-ms-win-downlevel-user32-l1-1-0/Makefile.in | 3 ++ .../api-ms-win-downlevel-user32-l1-1-0.spec | 22 ++++++++++++++++++++ tools/make_specfiles | 4 +++ 5 files changed, 31 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 595ea7d..7041f83 100755 --- a/configure +++ b/configure @@ -15352,6 +15352,7 @@ wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-shlwapi-l1-1-0 enable_api_ms_win_downlevel_shlwapi_l1_1_0 +wine_fn_config_dll api-ms-win-downlevel-user32-l1-1-0 enable_api_ms_win_downlevel_user32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-version-l1-1-0 enable_api_ms_win_downlevel_version_l1_1_0 wine_fn_config_dll apphelp enable_apphelp wine_fn_config_test dlls/apphelp/tests apphelp_test diff --git a/configure.ac b/configure.ac index 6e99a46..fa15fb6 100644 --- a/configure.ac +++ b/configure.ac @@ -2531,6 +2531,7 @@ WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-downlevel-user32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0) WINE_CONFIG_DLL(apphelp) WINE_CONFIG_TEST(dlls/apphelp/tests) diff --git a/dlls/api-ms-win-downlevel-user32-l1-1-0/Makefile.in b/dlls/api-ms-win-downlevel-user32-l1-1-0/Makefile.in new file mode 100644 index 0000000..eca911a --- /dev/null +++ b/dlls/api-ms-win-downlevel-user32-l1-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-downlevel-user32-l1-1-0.dll + +(a)MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-downlevel-user32-l1-1-0/api-ms-win-downlevel-user32-l1-1-0.spec b/dlls/api-ms-win-downlevel-user32-l1-1-0/api-ms-win-downlevel-user32-l1-1-0.spec new file mode 100644 index 0000000..182d964 --- /dev/null +++ b/dlls/api-ms-win-downlevel-user32-l1-1-0/api-ms-win-downlevel-user32-l1-1-0.spec @@ -0,0 +1,22 @@ +@ stdcall CharLowerA(str) user32.CharLowerA +@ stdcall CharLowerBuffA(str long) user32.CharLowerBuffA +@ stdcall CharLowerBuffW(wstr long) user32.CharLowerBuffW +@ stdcall CharLowerW(wstr) user32.CharLowerW +@ stdcall CharNextA(str) user32.CharNextA +@ stdcall CharNextExA(long str long) user32.CharNextExA +@ stdcall CharNextW(wstr) user32.CharNextW +@ stdcall CharPrevA(str str) user32.CharPrevA +@ stdcall CharPrevExA(long str str long) user32.CharPrevExA +@ stdcall CharPrevW(wstr wstr) user32.CharPrevW +@ stdcall CharUpperA(str) user32.CharUpperA +@ stdcall CharUpperBuffA(str long) user32.CharUpperBuffA +@ stdcall CharUpperBuffW(wstr long) user32.CharUpperBuffW +@ stdcall CharUpperW(wstr) user32.CharUpperW +@ stdcall IsCharAlphaA(long) user32.IsCharAlphaA +@ stdcall IsCharAlphaNumericA(long) user32.IsCharAlphaNumericA +@ stdcall IsCharAlphaNumericW(long) user32.IsCharAlphaNumericW +@ stdcall IsCharAlphaW(long) user32.IsCharAlphaW +@ stdcall IsCharLowerA(long) user32.IsCharLowerA +@ stdcall IsCharLowerW(long) user32.IsCharLowerW +@ stdcall IsCharUpperA(long) user32.IsCharUpperA +@ stdcall IsCharUpperW(long) user32.IsCharUpperW diff --git a/tools/make_specfiles b/tools/make_specfiles index b5937be..20453ba 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -125,6 +125,10 @@ my @dll_groups = "api-ms-win-downlevel-shlwapi-l1-1-0", ], [ + "user32", + "api-ms-win-downlevel-user32-l1-1-0", + ], + [ "version", "api-ms-win-downlevel-version-l1-1-0", ],

1 0

Nikolay Sivov : shlwapi: Implement IsCharSpaceA().
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Module: wine Branch: master Commit: 16cc2b87530947415dcff6e545bdd77a232edbb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16cc2b87530947415dcff6e54… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Dec 20 08:43:27 2012 +0400 shlwapi: Implement IsCharSpaceA(). --- dlls/shlwapi/ordinal.c | 19 ------------------- dlls/shlwapi/shlwapi.spec | 1 + dlls/shlwapi/string.c | 25 +++++++++++++++++++++++++ include/shlwapi.h | 4 ++++ 4 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 88f415b..19ab3d9 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -638,25 +638,6 @@ INT WINAPI SHStringFromGUIDW(REFGUID guid, LPWSTR lpszDest, INT cchMax) } /************************************************************************* - * @ [SHLWAPI.29] - * - * Determine if a Unicode character is a space. - * - * PARAMS - * wc [I] Character to check. - * - * RETURNS - * TRUE, if wc is a space, - * FALSE otherwise. - */ -BOOL WINAPI IsCharSpaceW(WCHAR wc) -{ - WORD CharType; - - return GetStringTypeW(CT_CTYPE1, &wc, 1, &CharType) && (CharType & C1_SPACE); -} - -/************************************************************************* * @ [SHLWAPI.30] * * Determine if a Unicode character is a blank. diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 025d48a..bf33e62 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -566,6 +566,7 @@ @ stdcall HashData (ptr long ptr long) @ stdcall IntlStrEqWorkerA(long str str long) StrIsIntlEqualA @ stdcall IntlStrEqWorkerW(long wstr wstr long) StrIsIntlEqualW +@ stdcall IsCharSpaceA(long) @ stdcall PathAddBackslashA (str) @ stdcall PathAddBackslashW (wstr) @ stdcall PathAddExtensionA (str str) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index 18606ce..1a4ad14 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -2824,3 +2824,28 @@ end: HeapFree(GetProcessHeap(), 0, dllname); return hr; } + +BOOL WINAPI IsCharSpaceA(CHAR c) +{ + WORD CharType; + return GetStringTypeA(GetSystemDefaultLCID(), CT_CTYPE1, &c, 1, &CharType) && (CharType & C1_SPACE); +} + +/************************************************************************* + * @ [SHLWAPI.29] + * + * Determine if a Unicode character is a space. + * + * PARAMS + * wc [I] Character to check. + * + * RETURNS + * TRUE, if wc is a space, + * FALSE otherwise. + */ +BOOL WINAPI IsCharSpaceW(WCHAR wc) +{ + WORD CharType; + + return GetStringTypeW(CT_CTYPE1, &wc, 1, &CharType) && (CharType & C1_SPACE); +} diff --git a/include/shlwapi.h b/include/shlwapi.h index 067ef7b..a1436fa 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -935,6 +935,10 @@ HRESULT WINAPI StrRetToBufW(STRRET*,LPCITEMIDLIST,LPWSTR,UINT); HRESULT WINAPI StrRetToBSTR(STRRET*,LPCITEMIDLIST,BSTR*); +BOOL WINAPI IsCharSpaceA(CHAR); +BOOL WINAPI IsCharSpaceW(WCHAR); +#define IsCharSpace WINELIB_NAME_AW(IsCharSpace) + #endif /* NO_SHLWAPI_STRFCNS */

1 0

Piotr Caban : msvcrt: Don' t call local_unwind2 when Cookie equals MSVCRT_JMP_MAGIC in longjmp.
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Module: wine Branch: master Commit: 76969a8651f525cb87095a80ba4c220888ef6226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76969a8651f525cb87095a80b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 20 11:13:45 2012 +0100 msvcrt: Don't call local_unwind2 when Cookie equals MSVCRT_JMP_MAGIC in longjmp. --- dlls/msvcrt/except_i386.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 7c3265c..8639579 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -1014,17 +1014,18 @@ void CDECL MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval) if (jmp->Registration) { - if (!IsBadReadPtr(&jmp->Cookie, sizeof(long)) && - jmp->Cookie == MSVCRT_JMP_MAGIC && jmp->UnwindFunc) + if (IsBadReadPtr(&jmp->Cookie, sizeof(long)) || jmp->Cookie != MSVCRT_JMP_MAGIC) + { + msvcrt_local_unwind2((MSVCRT_EXCEPTION_FRAME*)jmp->Registration, + jmp->TryLevel, (void *)jmp->Ebp); + } + else if(jmp->UnwindFunc) { MSVCRT_unwind_function unwind_func; unwind_func=(MSVCRT_unwind_function)jmp->UnwindFunc; unwind_func(jmp); } - else - msvcrt_local_unwind2((MSVCRT_EXCEPTION_FRAME*)jmp->Registration, - jmp->TryLevel, (void *)jmp->Ebp); } if (!retval)

1 0

Detlef Riekenberg : api-ms-win-downlevel-normaliz-l1-1-0: Add dll.
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Module: wine Branch: master Commit: dcce81854068e054cbc56b6bfc9baa520e43b803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcce81854068e054cbc56b6bf… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Dec 20 08:50:00 2012 +0100 api-ms-win-downlevel-normaliz-l1-1-0: Add dll. --- configure | 1 + configure.ac | 1 + .../Makefile.in | 3 +++ .../api-ms-win-downlevel-normaliz-l1-1-0.spec | 2 ++ tools/make_specfiles | 4 ++++ 5 files changed, 11 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 7041f83..a3453fa 100755 --- a/configure +++ b/configure @@ -15351,6 +15351,7 @@ wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 +wine_fn_config_dll api-ms-win-downlevel-normaliz-l1-1-0 enable_api_ms_win_downlevel_normaliz_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-shlwapi-l1-1-0 enable_api_ms_win_downlevel_shlwapi_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-user32-l1-1-0 enable_api_ms_win_downlevel_user32_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-version-l1-1-0 enable_api_ms_win_downlevel_version_l1_1_0 diff --git a/configure.ac b/configure.ac index fa15fb6..6642d38 100644 --- a/configure.ac +++ b/configure.ac @@ -2530,6 +2530,7 @@ WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-downlevel-normaliz-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-shlwapi-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-user32-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-version-l1-1-0) diff --git a/dlls/api-ms-win-downlevel-normaliz-l1-1-0/Makefile.in b/dlls/api-ms-win-downlevel-normaliz-l1-1-0/Makefile.in new file mode 100644 index 0000000..0fce8ac --- /dev/null +++ b/dlls/api-ms-win-downlevel-normaliz-l1-1-0/Makefile.in @@ -0,0 +1,3 @@ +MODULE = api-ms-win-downlevel-normaliz-l1-1-0.dll + +(a)MAKE_DLL_RULES@ diff --git a/dlls/api-ms-win-downlevel-normaliz-l1-1-0/api-ms-win-downlevel-normaliz-l1-1-0.spec b/dlls/api-ms-win-downlevel-normaliz-l1-1-0/api-ms-win-downlevel-normaliz-l1-1-0.spec new file mode 100644 index 0000000..04e68b6 --- /dev/null +++ b/dlls/api-ms-win-downlevel-normaliz-l1-1-0/api-ms-win-downlevel-normaliz-l1-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall IdnToAscii(long wstr long ptr long) kernel32.IdnToAscii +@ stdcall IdnToUnicode(long wstr long ptr long) kernel32.IdnToUnicode diff --git a/tools/make_specfiles b/tools/make_specfiles index 20453ba..11157ad 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -121,6 +121,10 @@ my @dll_groups = "api-ms-win-downlevel-advapi32-l1-1-0", ], [ + "kernel32", + "api-ms-win-downlevel-normaliz-l1-1-0", + ], + [ "shlwapi", "api-ms-win-downlevel-shlwapi-l1-1-0", ],

1 0

Dmitry Timoshkov : wineps.drv: Keep track of all supported device resolutions.
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Module: wine Branch: master Commit: d5f27e194a70047f4040ebbb374ef163860d10ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5f27e194a70047f4040ebbb3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Dec 19 12:43:46 2012 +0800 wineps.drv: Keep track of all supported device resolutions. --- dlls/wineps.drv/driver.c | 22 +++++++++++++++------- dlls/wineps.drv/ppd.c | 21 +++++++++++++++++++++ dlls/wineps.drv/psdrv.h | 8 ++++++++ 3 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 70ee2b0..18be8e0 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -638,14 +638,22 @@ DWORD PSDRV_DeviceCapabilities(LPSTR lpszDriver, LPCSTR lpszDevice, LPCSTR lpszP case DC_ENUMRESOLUTIONS: { - LONG *lp = (LONG*)lpszOutput; + RESOLUTION *res; + LONG *lp = (LONG *)lpszOutput; + int i = 0; - if(lpszOutput != NULL) { - lp[0] = pi->ppd->DefaultResolution; - lp[1] = pi->ppd->DefaultResolution; - } - ret = 1; - break; + LIST_FOR_EACH_ENTRY(res, &pi->ppd->Resolutions, RESOLUTION, entry) + { + i++; + if (lpszOutput != NULL) + { + lp[0] = res->resx; + lp[1] = res->resy; + lp += 2; + } + } + ret = i; + break; } /* Windows returns 9999 too */ diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index 1cba1b8..9d529b4 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -659,6 +659,7 @@ PPD *PSDRV_ParsePPD( char *fname, HANDLE printer ) ppd->ColorDevice = CD_NotSpecified; + list_init( &ppd->Resolutions ); list_init( &ppd->InstalledFonts ); list_init( &ppd->PageSizes ); list_init( &ppd->Constraints ); @@ -713,6 +714,26 @@ PPD *PSDRV_ParsePPD( char *fname, HANDLE printer ) WARN("failed to parse DefaultResolution %s\n", debugstr_a(tuple.value)); } + else if(!strcmp("*Resolution", tuple.key)) + { + SIZE sz; + if (parse_resolution(tuple.option, &sz)) + { + RESOLUTION *res; + + TRACE("Resolution %dx%d, invocation %s\n", sz.cx, sz.cy, tuple.value); + + res = HeapAlloc( GetProcessHeap(), 0, sizeof(*res) ); + res->resx = sz.cx; + res->resy = sz.cy; + res->InvocationString = tuple.value; + tuple.value = NULL; + list_add_tail( &ppd->Resolutions, &res->entry ); + } + else + WARN("failed to parse Resolution %s\n", debugstr_a(tuple.option)); + } + else if(!strcmp("*Font", tuple.key)) { FONTNAME *fn = HeapAlloc( PSDRV_Heap, 0, sizeof(*fn) ); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index 428f7ba..12ce526 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -183,6 +183,13 @@ typedef struct WORD WinDuplex; /* eg DMDUP_SIMPLEX */ } DUPLEX; +typedef struct +{ + struct list entry; + int resx, resy; + char *InvocationString; +} RESOLUTION; + /* Many Mac OS X based ppd files don't include a *ColorDevice line, so we use a tristate here rather than a boolean. Code that cares is expected to treat these as if they were colour. */ @@ -196,6 +203,7 @@ typedef struct { char *NickName; int LanguageLevel; COLORDEVICE ColorDevice; + struct list Resolutions; int DefaultResolution; signed int LandscapeOrientation; char *JCLBegin;

1 0

Huw Davies : usp10: Glyph class tables are just generic class tables.
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Module: wine Branch: master Commit: 79cbcf96123991496d064391c346223971d08e46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79cbcf96123991496d064391c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Dec 20 12:55:32 2012 +0000 usp10: Glyph class tables are just generic class tables. --- dlls/usp10/opentype.c | 34 ++++++++++++++++++---------------- 1 files changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 81135b8..edaf917 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -93,19 +93,19 @@ typedef struct { WORD StartGlyph; WORD GlyphCount; WORD ClassValueArray[1]; -} GDEF_ClassDefFormat1; +} OT_ClassDefFormat1; typedef struct { WORD Start; WORD End; WORD Class; -} GDEF_ClassRangeRecord; +} OT_ClassRangeRecord; typedef struct { WORD ClassFormat; WORD ClassRangeCount; - GDEF_ClassRangeRecord ClassRangeRecord[1]; -} GDEF_ClassDefFormat2; + OT_ClassRangeRecord ClassRangeRecord[1]; +} OT_ClassDefFormat2; /* These are all structures needed for the GSUB table */ @@ -525,20 +525,13 @@ DWORD OpenType_CMAP_GetGlyphIndex(HDC hdc, ScriptCache *psc, DWORD utf32c, LPWOR * GDEF **********/ -static WORD GDEF_get_glyph_class(const GDEF_Header *header, WORD glyph) +static WORD OT_get_glyph_class(const void *table, WORD glyph) { - int offset; WORD class = 0; - const GDEF_ClassDefFormat1 *cf1; - - if (!header) - return 0; + const OT_ClassDefFormat1 *cf1 = table; - offset = GET_BE_WORD(header->GlyphClassDef); - if (!offset) - return 0; + if (!table) return 0; - cf1 = (GDEF_ClassDefFormat1*)(((BYTE*)header)+offset); if (GET_BE_WORD(cf1->ClassFormat) == 1) { if (glyph >= GET_BE_WORD(cf1->StartGlyph)) @@ -550,7 +543,7 @@ static WORD GDEF_get_glyph_class(const GDEF_Header *header, WORD glyph) } else if (GET_BE_WORD(cf1->ClassFormat) == 2) { - const GDEF_ClassDefFormat2 *cf2 = (GDEF_ClassDefFormat2*)cf1; + const OT_ClassDefFormat2 *cf2 = table; int i, top; top = GET_BE_WORD(cf2->ClassRangeCount); for (i = 0; i < top; i++) @@ -585,10 +578,19 @@ static VOID *load_gdef_table(HDC hdc) void OpenType_GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGlyphs, const WORD cGlyphs, WORD* pwLogClust, const WORD cChars, SCRIPT_GLYPHPROP *pGlyphProp) { int i; + void *glyph_class_table = NULL; if (!psc->GDEF_Table) psc->GDEF_Table = load_gdef_table(hdc); + if (psc->GDEF_Table) + { + const GDEF_Header *header = psc->GDEF_Table; + WORD offset = GET_BE_WORD( header->GlyphClassDef ); + if (offset) + glyph_class_table = (BYTE *)psc->GDEF_Table + offset; + } + for (i = 0; i < cGlyphs; i++) { WORD class; @@ -602,7 +604,7 @@ void OpenType_GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGly char_count++; } - class = GDEF_get_glyph_class(psc->GDEF_Table, pwGlyphs[i]); + class = OT_get_glyph_class( glyph_class_table, pwGlyphs[i] ); switch (class) {

1 0

Dmitry Timoshkov : wineps.drv: Ignore requested resolutions not supported by device.
by Alexandre Julliard Dec. 20, 2012

Dec. 20, 2012

Module: wine Branch: master Commit: d170f05ece150db8ae298e504753ec25b9d77350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d170f05ece150db8ae298e504… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 20 16:24:06 2012 +0800 wineps.drv: Ignore requested resolutions not supported by device. --- dlls/wineps.drv/init.c | 35 +++++++++++++++++++++++++++++------ 1 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 98768a4..2085a47 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -151,20 +151,43 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) static void PSDRV_UpdateDevCaps( PSDRV_PDEVICE *physDev ) { PAGESIZE *page; - INT width = 0, height = 0; + RESOLUTION *res; + INT width = 0, height = 0, resx = 0, resy = 0; - if (physDev->Devmode->dmPublic.dmFields & DM_PRINTQUALITY) + if (physDev->Devmode->dmPublic.dmFields & (DM_PRINTQUALITY | DM_YRESOLUTION | DM_LOGPIXELS)) { - physDev->logPixelsX = physDev->Devmode->dmPublic.u1.s1.dmPrintQuality; - physDev->logPixelsY = physDev->logPixelsX; + if (physDev->Devmode->dmPublic.dmFields & DM_PRINTQUALITY) + resx = resy = physDev->Devmode->dmPublic.u1.s1.dmPrintQuality; + + if (physDev->Devmode->dmPublic.dmFields & DM_YRESOLUTION) + resy = physDev->Devmode->dmPublic.dmYResolution; + + if (physDev->Devmode->dmPublic.dmFields & DM_LOGPIXELS) + resx = resy = physDev->Devmode->dmPublic.dmLogPixels; + + LIST_FOR_EACH_ENTRY(res, &physDev->pi->ppd->Resolutions, RESOLUTION, entry) + { + if (res->resx == resx && res->resy == resy) + { + physDev->logPixelsX = resx; + physDev->logPixelsY = resy; + break; + } + } + + if (&res->entry == &physDev->pi->ppd->Resolutions) + { + WARN("Requested resolution %dx%d is not supported by device\n", resx, resy); + physDev->logPixelsX = physDev->pi->ppd->DefaultResolution; + physDev->logPixelsY = physDev->logPixelsX; + } } else { + WARN("Using default device resolution %d\n", physDev->pi->ppd->DefaultResolution); physDev->logPixelsX = physDev->pi->ppd->DefaultResolution; physDev->logPixelsY = physDev->logPixelsX; } - if (physDev->Devmode->dmPublic.dmFields & DM_YRESOLUTION) - physDev->logPixelsY = physDev->Devmode->dmPublic.dmYResolution; if(physDev->Devmode->dmPublic.dmFields & DM_PAPERSIZE) { LIST_FOR_EACH_ENTRY(page, &physDev->pi->ppd->PageSizes, PAGESIZE, entry) {

1 0