November 2012 - Wine-commits

Alexandre Julliard : gdi32: Move checking of the subpixel support and gasp flags to freetype.c.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 123da6f888b954c242bd49a4abab8cad0e1436fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=123da6f888b954c242bd49a4a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 2 17:21:28 2012 +0100 gdi32: Move checking of the subpixel support and gasp flags to freetype.c. --- dlls/gdi32/font.c | 101 ++--------------------------------- dlls/gdi32/freetype.c | 138 +++++++++++++++++++++++++++++++++++++------------ 2 files changed, 110 insertions(+), 129 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index a2d4d3e..09ea1b7 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -39,12 +39,6 @@ #include "wine/unicode.h" #include "wine/debug.h" -#ifdef WORDS_BIGENDIAN -#define get_be_word(x) (x) -#else -#define get_be_word(x) RtlUshortByteSwap(x) -#endif - WINE_DEFAULT_DEBUG_CHANNEL(font); /* Device -> World size conversion */ @@ -266,69 +260,6 @@ static void FONT_NewTextMetricExWToA(const NEWTEXTMETRICEXW *ptmW, NEWTEXTMETRIC memcpy(&ptmA->ntmFontSig, &ptmW->ntmFontSig, sizeof(FONTSIGNATURE)); } -static DWORD get_font_ppem( HDC hdc ) -{ - TEXTMETRICW tm; - DWORD ppem; - DC *dc = get_dc_ptr( hdc ); - - if (!dc) return GDI_ERROR; - - GetTextMetricsW( hdc, &tm ); - ppem = abs( INTERNAL_YWSTODS( dc, tm.tmAscent + tm.tmDescent - tm.tmInternalLeading ) ); - release_dc_ptr( dc ); - return ppem; -} - -#define GASP_GRIDFIT 0x01 -#define GASP_DOGRAY 0x02 - -static BOOL get_gasp_flags( HDC hdc, WORD *flags ) -{ - DWORD size, gasp_tag = 0x70736167; - WORD buf[16]; /* Enough for seven ranges before we need to alloc */ - WORD *alloced = NULL, *ptr = buf; - WORD num_recs, version; - DWORD ppem = get_font_ppem( hdc ); - BOOL ret = FALSE; - - *flags = 0; - if (ppem == GDI_ERROR) return FALSE; - - size = GetFontData( hdc, gasp_tag, 0, NULL, 0 ); - if (size == GDI_ERROR) return FALSE; - if (size < 4 * sizeof(WORD)) return FALSE; - if (size > sizeof(buf)) - { - ptr = alloced = HeapAlloc( GetProcessHeap(), 0, size ); - if (!ptr) return FALSE; - } - - GetFontData( hdc, gasp_tag, 0, ptr, size ); - - version = get_be_word( *ptr++ ); - num_recs = get_be_word( *ptr++ ); - - if (version > 1 || size < (num_recs * 2 + 2) * sizeof(WORD)) - { - FIXME( "Unsupported gasp table: ver %d size %d recs %d\n", version, size, num_recs ); - goto done; - } - - while (num_recs--) - { - *flags = get_be_word( *(ptr + 1) ); - if (ppem <= get_be_word( *ptr )) break; - ptr += 2; - } - TRACE( "got flags %04x for ppem %d\n", *flags, ppem ); - ret = TRUE; - -done: - HeapFree( GetProcessHeap(), 0, alloced ); - return ret; -} - enum smoothing { no_smoothing, aa_smoothing, subpixel_smoothing }; static DWORD get_desktop_value( const WCHAR *name, DWORD *value ) @@ -392,19 +323,8 @@ static UINT get_subpixel_orientation( void ) UINT get_font_aa_flags( HDC hdc, const LOGFONTW *lf ) { - WORD gasp_flags; - static int hinter = -1; - static int subpixel_enabled = -1; enum smoothing smoothing; - if (hinter == -1 || subpixel_enabled == -1) - { - RASTERIZER_STATUS status; - GetRasterizerCaps(&status, sizeof(status)); - hinter = status.wFlags & WINE_TT_HINTER_ENABLED; - subpixel_enabled = status.wFlags & WINE_TT_SUBPIXEL_RENDERING_ENABLED; - } - switch (lf->lfQuality) { case NONANTIALIASED_QUALITY: @@ -423,24 +343,15 @@ UINT get_font_aa_flags( HDC hdc, const LOGFONTW *lf ) smoothing = get_default_smoothing(); } - if (smoothing == subpixel_smoothing) - { - if (subpixel_enabled) - { - UINT ret = get_subpixel_orientation(); - if (ret != GGO_GRAY4_BITMAP) return ret; - } - smoothing = aa_smoothing; - } - - if (smoothing == aa_smoothing) + switch (smoothing) { - if (hinter && get_gasp_flags( hdc, &gasp_flags ) && !(gasp_flags & GASP_DOGRAY)) - return GGO_BITMAP; + case subpixel_smoothing: + return get_subpixel_orientation(); + case aa_smoothing: return GGO_GRAY4_BITMAP; + default: + return GGO_BITMAP; } - - return GGO_BITMAP; } /*********************************************************************** diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index ad179f1..a70b853 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -894,6 +894,44 @@ static inline FT_Fixed FT_FixedFromFIXED(FIXED f) return (FT_Fixed)((int)f.value << 16 | (unsigned int)f.fract); } +static BOOL is_hinting_enabled(void) +{ + static int enabled = -1; + + if (enabled == -1) + { + /* Use the >= 2.2.0 function if available */ + if (pFT_Get_TrueType_Engine_Type) + { + FT_TrueTypeEngineType type = pFT_Get_TrueType_Engine_Type(library); + enabled = (type == FT_TRUETYPE_ENGINE_TYPE_PATENTED); + } +#ifdef FT_DRIVER_HAS_HINTER + else + { + /* otherwise if we've been compiled with < 2.2.0 headers use the internal macro */ + FT_Module mod = pFT_Get_Module(library, "truetype"); + enabled = (mod && FT_DRIVER_HAS_HINTER(mod)); + } +#endif + else enabled = FALSE; + } + return enabled; +} + +static BOOL is_subpixel_rendering_enabled( void ) +{ +#ifdef HAVE_FREETYPE_FTLCDFIL_H + static int enabled = -1; + if (enabled == -1) + enabled = (pFT_Library_SetLcdFilter && + pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature); + return enabled; +#else + return FALSE; +#endif +} + static const struct list *get_face_list_from_family(const Family *family) { @@ -4426,6 +4464,53 @@ static FT_Encoding pick_charmap( FT_Face face, int charset ) return *encs; } +#define GASP_GRIDFIT 0x01 +#define GASP_DOGRAY 0x02 +#define GASP_TAG MS_MAKE_TAG('g','a','s','p') + +static BOOL get_gasp_flags( GdiFont *font, WORD *flags ) +{ + DWORD size; + WORD buf[16]; /* Enough for seven ranges before we need to alloc */ + WORD *alloced = NULL, *ptr = buf; + WORD num_recs, version; + BOOL ret = FALSE; + + *flags = 0; + size = get_font_data( font, GASP_TAG, 0, NULL, 0 ); + if (size == GDI_ERROR) return FALSE; + if (size < 4 * sizeof(WORD)) return FALSE; + if (size > sizeof(buf)) + { + ptr = alloced = HeapAlloc( GetProcessHeap(), 0, size ); + if (!ptr) return FALSE; + } + + get_font_data( font, GASP_TAG, 0, ptr, size ); + + version = GET_BE_WORD( *ptr++ ); + num_recs = GET_BE_WORD( *ptr++ ); + + if (version > 1 || size < (num_recs * 2 + 2) * sizeof(WORD)) + { + FIXME( "Unsupported gasp table: ver %d size %d recs %d\n", version, size, num_recs ); + goto done; + } + + while (num_recs--) + { + *flags = GET_BE_WORD( *(ptr + 1) ); + if (font->ft_face->size->metrics.y_ppem <= GET_BE_WORD( *ptr )) break; + ptr += 2; + } + TRACE( "got flags %04x for ppem %d\n", *flags, font->ft_face->size->metrics.y_ppem ); + ret = TRUE; + +done: + HeapFree( GetProcessHeap(), 0, alloced ); + return ret; +} + /************************************************************* * freetype_SelectFont */ @@ -4868,6 +4953,25 @@ found_face: done: if (ret) { + /* fixup the antialiasing flags for that font */ + switch (*aa_flags) + { + case WINE_GGO_HRGB_BITMAP: + case WINE_GGO_HBGR_BITMAP: + case WINE_GGO_VRGB_BITMAP: + case WINE_GGO_VBGR_BITMAP: + if (is_subpixel_rendering_enabled()) break; + *aa_flags = GGO_GRAY4_BITMAP; + /* fall through */ + case GGO_GRAY4_BITMAP: + if (is_hinting_enabled()) + { + WORD gasp_flags; + if (get_gasp_flags( ret, &gasp_flags ) && !(gasp_flags & GASP_DOGRAY)) + *aa_flags = GGO_BITMAP; + } + break; + } dc->gdiFont = ret; physdev->font = ret; } @@ -7430,40 +7534,6 @@ static BOOL freetype_FontIsLinked( PHYSDEV dev ) return ret; } -static BOOL is_hinting_enabled(void) -{ - /* Use the >= 2.2.0 function if available */ - if(pFT_Get_TrueType_Engine_Type) - { - FT_TrueTypeEngineType type = pFT_Get_TrueType_Engine_Type(library); - return type == FT_TRUETYPE_ENGINE_TYPE_PATENTED; - } -#ifdef FT_DRIVER_HAS_HINTER - else - { - FT_Module mod; - - /* otherwise if we've been compiled with < 2.2.0 headers - use the internal macro */ - mod = pFT_Get_Module(library, "truetype"); - if(mod && FT_DRIVER_HAS_HINTER(mod)) - return TRUE; - } -#endif - - return FALSE; -} - -static BOOL is_subpixel_rendering_enabled( void ) -{ -#ifdef HAVE_FREETYPE_FTLCDFIL_H - return pFT_Library_SetLcdFilter && - pFT_Library_SetLcdFilter( NULL, 0 ) != FT_Err_Unimplemented_Feature; -#else - return FALSE; -#endif -} - /************************************************************************* * GetRasterizerCaps (GDI32.@) */

1 0

Alexandre Julliard : gdi32: Set the font anti-aliasing flags from the fontconfig information if available .
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 9d888b371fe93eeda0f2915e133a9fca329c35d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d888b371fe93eeda0f2915e1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 2 19:46:18 2012 +0100 gdi32: Set the font anti-aliasing flags from the fontconfig information if available. --- dlls/gdi32/freetype.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a70b853..98c7b40 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -345,6 +345,7 @@ struct tagGdiFont { SHORT yMax; SHORT yMin; DWORD ntmFlags; + DWORD aa_flags; UINT ntmCellHeight, ntmAvgWidth; FONTSIGNATURE fs; GdiFont *base_font; @@ -4544,8 +4545,6 @@ static HFONT freetype_SelectFont( PHYSDEV dev, HFONT hfont, UINT *aa_flags ) GetObjectW( hfont, sizeof(lf), &lf ); lf.lfWidth = abs(lf.lfWidth); - if (!*aa_flags) *aa_flags = get_font_aa_flags( dev->hdc, &lf ); - can_use_bitmap = GetDeviceCaps(dev->hdc, TEXTCAPS) & TC_RA_ABLE; TRACE("%s, h=%d, it=%d, weight=%d, PandF=%02x, charset=%d orient %d escapement %d\n", @@ -4946,6 +4945,7 @@ found_face: TRACE("Loaded GSUB table of %i bytes\n",length); } } + ret->aa_flags = face->aa_flags; TRACE("caching: gdiFont=%p hfont=%p\n", ret, hfont); @@ -4953,6 +4953,9 @@ found_face: done: if (ret) { + if (!*aa_flags) *aa_flags = ret->aa_flags; + if (!*aa_flags) *aa_flags = get_font_aa_flags( dev->hdc, &lf ); + /* fixup the antialiasing flags for that font */ switch (*aa_flags) {

1 0

Christian Costa : kernel32: Implement CompareStringOrdinal.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: ba5cade700a0f1ad18b9c8b9824fd8ac91c7493b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba5cade700a0f1ad18b9c8b98… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Oct 31 09:56:39 2012 +0100 kernel32: Implement CompareStringOrdinal. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/locale.c | 33 ++++++++++++++++++ dlls/kernel32/tests/locale.c | 76 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 109 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b7efa0f..0bd1adc 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -201,6 +201,7 @@ @ stdcall CompareStringA(long long str long str long) @ stdcall CompareStringW(long long wstr long wstr long) @ stdcall CompareStringEx(wstr long wstr long wstr long ptr ptr long) +@ stdcall CompareStringOrdinal(wstr long wstr long long) @ stdcall ConnectNamedPipe(long ptr) @ stub ConsoleMenuControl @ stub ConsoleSubst diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index c41442c..57daab1 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -3047,6 +3047,39 @@ INT WINAPI CompareStringA(LCID lcid, DWORD flags, return ret; } +/****************************************************************************** + * CompareStringOrdinal (KERNEL32.@) + */ +INT WINAPI CompareStringOrdinal(const WCHAR *str1, INT len1, const WCHAR *str2, INT len2, BOOL ignore_case) +{ + int ret, len; + + if (!str1 || !str2) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + if (len1 < 0) len1 = strlenW(str1); + if (len2 < 0) len2 = strlenW(str2); + + len = min(len1, len2); + if (ignore_case) + { + ret = memicmpW(str1, str2, len); + } + else + { + ret = 0; + for (; len > 0; len--) + if ((ret = (*str1++ - *str2++))) break; + } + if (!ret) ret = len1 - len2; + + if (ret < 0) return CSTR_LESS_THAN; + if (ret > 0) return CSTR_GREATER_THAN; + return CSTR_EQUAL; +} + /************************************************************************* * lstrcmp (KERNEL32.@) * lstrcmpA (KERNEL32.@) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 0225c2b..197f562 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -87,6 +87,7 @@ static INT (WINAPI *pIdnToAscii)(DWORD, LPCWSTR, INT, LPWSTR, INT); static INT (WINAPI *pIdnToUnicode)(DWORD, LPCWSTR, INT, LPWSTR, INT); static INT (WINAPI *pGetLocaleInfoEx)(LPCWSTR, LCTYPE, LPWSTR, INT); static BOOL (WINAPI *pIsValidLocaleName)(LPCWSTR); +static INT (WINAPI *pCompareStringOrdinal)(const WCHAR *, INT, const WCHAR *, INT, BOOL); static void InitFunctionPointers(void) { @@ -106,6 +107,7 @@ static void InitFunctionPointers(void) pIdnToUnicode = (void*)GetProcAddress(hKernel32, "IdnToUnicode"); pGetLocaleInfoEx = (void*)GetProcAddress(hKernel32, "GetLocaleInfoEx"); pIsValidLocaleName = (void*)GetProcAddress(hKernel32, "IsValidLocaleName"); + pCompareStringOrdinal = (void*)GetProcAddress(hKernel32, "CompareStringOrdinal"); } #define eq(received, expected, label, type) \ @@ -3478,11 +3480,82 @@ static void test_IsValidLocaleName(void) ok(!ret, "IsValidLocaleName should have failed\n"); } +void test_CompareStringOrdinal(void) +{ + INT ret; + WCHAR test1[] = { 't','e','s','t',0 }; + WCHAR test2[] = { 'T','e','S','t',0 }; + WCHAR test3[] = { 't','e','s','t','3',0 }; + WCHAR null1[] = { 'a',0,'a',0 }; + WCHAR null2[] = { 'a',0,'b',0 }; + WCHAR bills1[] = { 'b','i','l','l','\'','s',0 }; + WCHAR bills2[] = { 'b','i','l','l','s',0 }; + WCHAR coop1[] = { 'c','o','-','o','p',0 }; + WCHAR coop2[] = { 'c','o','o','p',0 }; + WCHAR nonascii1[] = { 0x0102,0 }; + WCHAR nonascii2[] = { 0x0201,0 }; + + if (!pCompareStringOrdinal) + { + win_skip("CompareStringOrdinal not supported\n"); + return; + } + + /* Check errors */ + SetLastError(0xdeadbeef); + ret = pCompareStringOrdinal(NULL, 0, NULL, 0, FALSE); + ok(!ret, "Got %u, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got %x, expected %x\n", GetLastError(), ERROR_INVALID_PARAMETER); + SetLastError(0xdeadbeef); + ret = pCompareStringOrdinal(test1, -1, NULL, 0, FALSE); + ok(!ret, "Got %u, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got %x, expected %x\n", GetLastError(), ERROR_INVALID_PARAMETER); + SetLastError(0xdeadbeef); + ret = pCompareStringOrdinal(NULL, 0, test1, -1, FALSE); + ok(!ret, "Got %u, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got %x, expected %x\n", GetLastError(), ERROR_INVALID_PARAMETER); + + /* Check case */ + ret = pCompareStringOrdinal(test1, -1, test1, -1, FALSE); + ok(ret == CSTR_EQUAL, "Got %u, expected %u\n", ret, CSTR_EQUAL); + ret = pCompareStringOrdinal(test1, -1, test2, -1, FALSE); + ok(ret == CSTR_GREATER_THAN, "Got %u, expected %u\n", ret, CSTR_GREATER_THAN); + ret = pCompareStringOrdinal(test2, -1, test1, -1, FALSE); + ok(ret == CSTR_LESS_THAN, "Got %u, expected %u\n", ret, CSTR_LESS_THAN); + ret = pCompareStringOrdinal(test1, -1, test2, -1, TRUE); + ok(ret == CSTR_EQUAL, "Got %u, expected %u\n", ret, CSTR_EQUAL); + + /* Check different sizes */ + ret = pCompareStringOrdinal(test1, 3, test2, -1, TRUE); + ok(ret == CSTR_LESS_THAN, "Got %u, expected %u\n", ret, CSTR_LESS_THAN); + ret = pCompareStringOrdinal(test1, -1, test2, 3, TRUE); + ok(ret == CSTR_GREATER_THAN, "Got %u, expected %u\n", ret, CSTR_GREATER_THAN); + + /* Check null character */ + ret = pCompareStringOrdinal(null1, 3, null2, 3, FALSE); + ok(ret == CSTR_LESS_THAN, "Got %u, expected %u\n", ret, CSTR_LESS_THAN); + ret = pCompareStringOrdinal(null1, 3, null2, 3, TRUE); + ok(ret == CSTR_LESS_THAN, "Got %u, expected %u\n", ret, CSTR_LESS_THAN); + ret = pCompareStringOrdinal(test1, 5, test3, 5, FALSE); + ok(ret == CSTR_LESS_THAN, "Got %u, expected %u\n", ret, CSTR_LESS_THAN); + ret = pCompareStringOrdinal(test1, 4, test1, 5, FALSE); + ok(ret == CSTR_LESS_THAN, "Got %u, expected %u\n", ret, CSTR_LESS_THAN); + + /* Check ordinal behaviour */ + ret = pCompareStringOrdinal(bills1, -1, bills2, -1, FALSE); + ok(ret == CSTR_LESS_THAN, "Got %u, expected %u\n", ret, CSTR_LESS_THAN); + ret = pCompareStringOrdinal(coop2, -1, coop1, -1, FALSE); + ok(ret == CSTR_GREATER_THAN, "Got %u, expected %u\n", ret, CSTR_GREATER_THAN); + ret = pCompareStringOrdinal(nonascii1, -1, nonascii2, -1, FALSE); + ok(ret == CSTR_LESS_THAN, "Got %u, expected %u\n", ret, CSTR_LESS_THAN); + ret = pCompareStringOrdinal(nonascii1, -1, nonascii2, -1, TRUE); + ok(ret == CSTR_LESS_THAN, "Got %u, expected %u\n", ret, CSTR_LESS_THAN); +} + START_TEST(locale) { InitFunctionPointers(); - test_EnumTimeFormatsA(); test_EnumDateFormatsA(); test_GetLocaleInfoA(); @@ -3512,6 +3585,7 @@ START_TEST(locale) test_IdnToAscii(); test_IdnToUnicode(); test_IsValidLocaleName(); + test_CompareStringOrdinal(); /* this requires collation table patch to make it MS compatible */ if (0) test_sorting(); }

1 0

Nikolay Sivov : dwrite: Support more script ranges, up to Mongolian.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 8222d4cd3cb9ac001e7988da659a3e822b3494df URL: http://source.winehq.org/git/wine.git/?a=commit;h=8222d4cd3cb9ac001e7988da6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 2 15:52:05 2012 -0400 dwrite: Support more script ranges, up to Mongolian. --- dlls/dwrite/analyzer.c | 56 ++++++++++++++++++++- dlls/dwrite/tests/analyzer.c | 110 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 162 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 6794c10..34b9faf 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -31,20 +31,37 @@ enum scriptcode { Script_Arabic = 0, Script_Armenian = 1, Script_Bengali = 3, - Script_C1Controls = 12, + Script_Canadian = 8, + Script_Cherokee = 11, + Script_Controls = 12, Script_Coptic = 13, Script_Cyrillic = 16, Script_Devanagari = 18, + Script_Ethiopic = 19, + Script_Georgian = 20, Script_Greek = 23, Script_Gujarati = 24, Script_Gurmukhi = 25, + Script_Hangul = 27, Script_Hebrew = 29, + Script_Kannada = 32, + Script_Khmer = 36, + Script_Lao = 37, Script_Latin = 38, + Script_Malayalam = 44, + Script_Mongolian = 45, + Script_Myanmar = 46, Script_NKo = 48, + Script_Ogham = 49, Script_Oriya = 53, + Script_Runic = 58, + Script_Sinhala = 61, Script_Syriac = 64, Script_Tamil = 68, + Script_Telugu = 69, Script_Thaana = 70, + Script_Thai = 71, + Script_Tibetan = 72, Script_Symbol = 77, Script_Unknown = (UINT16)-1 }; @@ -70,7 +87,7 @@ static const struct script_range script_ranges[] = { /* ASCII punctuation and symbols, control char DEL: U+007B–U+007F */ { Script_Symbol, 0x7b, 0x7f }, /* C1 Controls: U+0080–U+009F */ - { Script_C1Controls, 0x80, 0x9f }, + { Script_Controls, 0x80, 0x9f }, /* Latin-1 Supplement: U+00A0–U+00FF */ /* Latin Extended-A: U+0100–U+017F */ /* Latin Extended-B: U+0180–U+024F */ @@ -116,6 +133,41 @@ static const struct script_range script_ranges[] = { { Script_Oriya, 0xb00, 0xb7f }, /* Tamil: U+0B80–U+0BFF */ { Script_Tamil, 0xb80, 0xbff }, + /* Telugu: U+0C00–U+0C7F */ + { Script_Telugu, 0xc00, 0xc7f }, + /* Kannada: U+0C80–U+0CFF */ + { Script_Kannada, 0xc80, 0xcff }, + /* Malayalam: U+0D00–U+0D7F */ + { Script_Malayalam, 0xd00, 0xd7f }, + /* Sinhala: U+0D80–U+0DFF */ + { Script_Sinhala, 0xd80, 0xdff }, + /* Thai: U+0E00–U+0E7F */ + { Script_Thai, 0xe00, 0xe7f }, + /* Lao: U+0E80–U+0EFF */ + { Script_Lao, 0xe80, 0xeff }, + /* Tibetan: U+0F00–U+0FFF */ + { Script_Tibetan, 0xf00, 0xfff }, + /* Myanmar: U+1000–U+109F */ + { Script_Myanmar, 0x1000, 0x109f }, + /* Georgian: U+10A0–U+10FF */ + { Script_Georgian, 0x10a0, 0x10ff }, + /* Hangul Jamo: U+1100–U+11FF */ + { Script_Hangul, 0x1100, 0x11ff }, + /* Ethiopic: U+1200–U+137F */ + /* Ethiopic Extensions: U+1380–U+139F */ + { Script_Ethiopic, 0x1200, 0x139f }, + /* Cherokee: U+13A0–U+13FF */ + { Script_Cherokee, 0x13a0, 0x13ff }, + /* Canadian Aboriginal Syllabics: U+1400–U+167F */ + { Script_Canadian, 0x1400, 0x167f }, + /* Ogham: U+1680–U+169F */ + { Script_Ogham, 0x1680, 0x169f }, + /* Runic: U+16A0–U+16F0 */ + { Script_Runic, 0x16a0, 0x16f0 }, + /* Khmer: U+1780–U+17FF */ + { Script_Khmer, 0x1780, 0x17ff }, + /* Mongolian: U+1800–U+18AF */ + { Script_Mongolian, 0x1800, 0x18af}, /* unsupported range */ { Script_Unknown } }; diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index dbd0307..050837e 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -400,20 +400,37 @@ enum scriptcode { Script_Arabic = 0, Script_Armenian = 1, Script_Bengali = 3, - Script_C1Controls = 12, + Script_Canadian = 8, + Script_Cherokee = 11, + Script_Controls = 12, Script_Coptic = 13, Script_Cyrillic = 16, Script_Devanagari = 18, + Script_Ethiopic = 19, + Script_Georgian = 20, Script_Greek = 23, Script_Gujarati = 24, Script_Gurmukhi = 25, + Script_Hangul = 27, Script_Hebrew = 29, + Script_Kannada = 32, + Script_Khmer = 36, + Script_Lao = 37, Script_Latin = 38, + Script_Malayalam = 44, + Script_Mongolian = 45, + Script_Myanmar = 46, Script_NKo = 48, + Script_Ogham = 49, Script_Oriya = 53, + Script_Runic = 58, + Script_Sinhala = 61, Script_Syriac = 64, Script_Tamil = 68, + Script_Telugu = 69, Script_Thaana = 70, + Script_Thai = 71, + Script_Tibetan = 72, Script_Symbol = 77 }; @@ -482,7 +499,7 @@ static struct sa_test sa_tests[] = { { /* C1 Controls, Latin-1 Supplement */ {0x80,0x90,0x9f,0xa0,0xc0,0xb8,0xbf,0xc0,0xff,0}, 2, - { { 0, 3, { Script_C1Controls, DWRITE_SCRIPT_SHAPES_DEFAULT } }, + { { 0, 3, { Script_Controls, DWRITE_SCRIPT_SHAPES_DEFAULT } }, { 3, 6, { Script_Latin, DWRITE_SCRIPT_SHAPES_DEFAULT } }, } }, @@ -596,6 +613,95 @@ static struct sa_test sa_tests[] = { {0xba4,0xbae,0xbbf,0xbb4,0xbcd,'.',0}, 1, { { 0, 6, { Script_Tamil, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, + { + /* Telugu */ + {0xc24,0xc46,0xc32,0xc41,0xc17,0xc41,'.',0}, 1, + { { 0, 7, { Script_Telugu, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Kannada */ + {0xc95,0xca8,0xccd,0xca8,0xca1,'.',0}, 1, + { { 0, 6, { Script_Kannada, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Malayalam */ + {0xd2e,0xd32,0xd2f,0xd3e,0xd33,0xd02,'.',0}, 1, + { { 0, 7, { Script_Malayalam, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Sinhala */ + {0xd82,0xd85,0xd9a,0xdcf,'.',0}, 1, + { { 0, 5, { Script_Sinhala, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Thai */ + {0x0e04,0x0e27,0x0e32,0x0e21,0x0e1e,0x0e22,0x0e32,0x0e22,0x0e32,0x0e21, + 0x0e2d,0x0e22,0x0e39,0x0e48,0x0e17,0x0e35,0x0e48,0x0e44,0x0e2b,0x0e19, + 0x0e04,0x0e27,0x0e32,0x0e21,0x0e2a, 0x0e33,0x0e40,0x0e23,0x0e47,0x0e08, + 0x0e2d,0x0e22,0x0e39,0x0e48,0x0e17,0x0e35,0x0e48,0x0e19,0x0e31,0x0e48,0x0e19,'.',0}, 1, + { { 0, 42, { Script_Thai, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Lao */ + {0xead,0xeb1,0xe81,0xeaa,0xead,0xe99,0xea5,0xeb2,0xea7,'.',0}, 1, + { { 0, 10, { Script_Lao, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Tibetan */ + {0xf04,0xf05,0xf0e,0x020,0xf51,0xf7c,0xf53,0xf0b,0xf5a,0xf53,0xf0b, + 0xf51,0xf44,0xf0b,0xf54,0xf7c,0xf0d,'.',0}, 1, + { { 0, 18, { Script_Tibetan, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Myanmar */ + {0x1019,0x103c,0x1014,0x103a,0x1019,0x102c,0x1021,0x1000,0x1039,0x1001,0x101b,0x102c,'.',0}, 1, + { { 0, 13, { Script_Myanmar, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Georgian */ + {0x10a0,0x10d0,0x10da,0x10f1,0x10fb,'.',0}, 1, + { { 0, 6, { Script_Georgian, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Hangul */ + {0x1100,0x1110,0x1160,0x1170,0x11a8,'.',0}, 1, + { { 0, 6, { Script_Hangul, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Ethiopic */ + {0x130d,0x12d5,0x12dd,0}, 1, + { { 0, 3, { Script_Ethiopic, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Cherokee */ + {0x13e3,0x13b3,0x13a9,0x0020,0x13a6,0x13ec,0x13c2,0x13af,0x13cd,0x13d7,0}, 1, + { { 0, 10, { Script_Cherokee, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Canadian */ + {0x1403,0x14c4,0x1483,0x144e,0x1450,0x1466,0}, 1, + { { 0, 6, { Script_Canadian, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Ogham */ + {0x169b,0x1691,0x168c,0x1690,0x168b,0x169c,0}, 1, + { { 0, 6, { Script_Ogham, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Runic */ + {0x16a0,0x16a1,0x16a2,0x16a3,0x16a4,0x16a5,0}, 1, + { { 0, 6, { Script_Runic, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Khmer */ + {0x1781,0x17c1,0x1798,0x179a,0x1797,0x17b6,0x179f,0x17b6,0}, 1, + { { 0, 8, { Script_Khmer, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Mongolian */ + {0x182e,0x1823,0x1829,0x182d,0x1823,0x182f,0x0020,0x182a,0x1822,0x1834,0x1822,0x182d,0x180c,0}, 1, + { { 0, 13, { Script_Mongolian, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, /* keep this as end marker */ { {0} } };

1 0

Jacek Caban : cabinet: Improved debug traces.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 173dff4ccb91fd3a263a1c9b149a2897097ef359 URL: http://source.winehq.org/git/wine.git/?a=commit;h=173dff4ccb91fd3a263a1c9b1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 2 11:45:48 2012 +0100 cabinet: Improved debug traces. --- dlls/cabinet/fdi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 3d1aec9..2680e72 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -2490,9 +2490,9 @@ BOOL __cdecl FDICopy( fdi_decomp_state *decomp_state; FDI_Int *fdi = get_fdi_ptr( hfdi ); - TRACE("(hfdi == ^%p, pszCabinet == ^%p, pszCabPath == ^%p, flags == %0d, " + TRACE("(hfdi == ^%p, pszCabinet == %s, pszCabPath == %s, flags == %x, " "pfnfdin == ^%p, pfnfdid == ^%p, pvUser == ^%p)\n", - hfdi, pszCabinet, pszCabPath, flags, pfnfdin, pfnfdid, pvUser); + hfdi, debugstr_a(pszCabinet), debugstr_a(pszCabPath), flags, pfnfdin, pfnfdid, pvUser); if (!fdi) return FALSE;

1 0

Jacek Caban : wininet: Write received data to cache before notifying progress.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: b012765e916b26e5b060d3e9f9c832873c127b58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b012765e916b26e5b060d3e9f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 2 13:49:05 2012 +0100 wininet: Write received data to cache before notifying progress. --- dlls/wininet/http.c | 117 +++++++++++++++++++++++++++------------------ dlls/wininet/tests/http.c | 4 +- 2 files changed, 72 insertions(+), 49 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f465ad7..73dd991 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2233,6 +2233,47 @@ static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, return INET_SetOption(hdr, option, buffer, size); } +static void create_cache_entry(http_request_t *req) +{ + WCHAR url[INTERNET_MAX_URL_LENGTH]; + WCHAR file_name[MAX_PATH+1]; + BOOL b; + + /* FIXME: We should free previous cache file earlier */ + heap_free(req->cacheFile); + CloseHandle(req->hCacheFile); + req->hCacheFile = NULL; + + b = HTTP_GetRequestURL(req, url); + if(!b) { + WARN("Could not get URL\n"); + return; + } + + b = CreateUrlCacheEntryW(url, req->contentLength, NULL, file_name, 0); + if(!b) { + WARN("Could not create cache entry: %08x\n", GetLastError()); + return; + } + + req->cacheFile = heap_strdupW(file_name); + req->hCacheFile = CreateFileW(req->cacheFile, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, + NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + if(req->hCacheFile == INVALID_HANDLE_VALUE) { + WARN("Could not create file: %u\n", GetLastError()); + req->hCacheFile = NULL; + return; + } + + if(req->read_size) { + DWORD written; + + b = WriteFile(req->hCacheFile, req->read_buf+req->read_pos, req->read_size, &written, NULL); + if(!b) + FIXME("WriteFile failed: %u\n", GetLastError()); + } +} + /* read some more data into the read buffer (the read section must be held) */ static DWORD read_more_data( http_request_t *req, int maxlen ) { @@ -2314,10 +2355,29 @@ static BOOL end_of_read_data( http_request_t *req ) return !req->read_size && req->data_stream->vtbl->end_of_data(req->data_stream, req); } +static DWORD read_http_stream(http_request_t *req, BYTE *buf, DWORD size, DWORD *read, read_mode_t read_mode) +{ + DWORD res; + + res = req->data_stream->vtbl->read(req->data_stream, req, buf, size, read, read_mode); + assert(*read <= size); + + if(*read && req->hCacheFile) { + BOOL bres; + DWORD written; + + bres = WriteFile(req->hCacheFile, buf, *read, &written, NULL); + if(!bres) + FIXME("WriteFile failed: %u\n", GetLastError()); + } + + return res; +} + /* fetch some more data into the read buffer (the read section must be held) */ static DWORD refill_read_buffer(http_request_t *req, read_mode_t read_mode, DWORD *read_bytes) { - DWORD res, read=0, want; + DWORD res, read=0; if(req->read_size == sizeof(req->read_buf)) return ERROR_SUCCESS; @@ -2328,10 +2388,8 @@ static DWORD refill_read_buffer(http_request_t *req, read_mode_t read_mode, DWOR req->read_pos = 0; } - want = sizeof(req->read_buf) - req->read_size; - res = req->data_stream->vtbl->read(req->data_stream, req, req->read_buf+req->read_size, - want, &read, read_mode); - assert(read <= want); + res = read_http_stream(req, req->read_buf+req->read_size, sizeof(req->read_buf) - req->read_size, + &read, read_mode); req->read_size += read; TRACE("read %u bytes, read_size %u\n", read, req->read_size); @@ -2723,7 +2781,7 @@ static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD * } if(ret_read < size) { - res = req->data_stream->vtbl->read(req->data_stream, req, (BYTE*)buffer+ret_read, size-ret_read, &current_read, read_mode); + res = read_http_stream(req, (BYTE*)buffer+ret_read, size-ret_read, &current_read, read_mode); ret_read += current_read; } @@ -2732,15 +2790,6 @@ static DWORD HTTPREQ_Read(http_request_t *req, void *buffer, DWORD size, DWORD * *read = ret_read; TRACE( "retrieved %u bytes (%u)\n", ret_read, req->contentLength ); - if(req->hCacheFile && res == ERROR_SUCCESS && ret_read) { - BOOL res; - DWORD written; - - res = WriteFile(req->hCacheFile, buffer, ret_read, &written, NULL); - if(!res) - WARN("WriteFile failed: %u\n", GetLastError()); - } - if(size && !ret_read) http_release_netconn(req, res == ERROR_SUCCESS); @@ -4610,35 +4659,6 @@ static void http_process_keep_alive(http_request_t *req) req->netconn->keep_alive = !strcmpiW(req->version, g_szHttp1_1); } -static void HTTP_CacheRequest(http_request_t *request) -{ - WCHAR url[INTERNET_MAX_URL_LENGTH]; - WCHAR cacheFileName[MAX_PATH+1]; - BOOL b; - - b = HTTP_GetRequestURL(request, url); - if(!b) { - WARN("Could not get URL\n"); - return; - } - - b = CreateUrlCacheEntryW(url, request->contentLength, NULL, cacheFileName, 0); - if(b) { - heap_free(request->cacheFile); - CloseHandle(request->hCacheFile); - - request->cacheFile = heap_strdupW(cacheFileName); - request->hCacheFile = CreateFileW(request->cacheFile, GENERIC_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, - NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if(request->hCacheFile == INVALID_HANDLE_VALUE) { - WARN("Could not create file: %u\n", GetLastError()); - request->hCacheFile = NULL; - } - }else { - WARN("Could not create cache entry: %08x\n", GetLastError()); - } -} - static DWORD open_http_connection(http_request_t *request, BOOL *reusing) { const BOOL is_https = (request->hdr.dwFlags & INTERNET_FLAG_SECURE) != 0; @@ -4997,14 +5017,14 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, } while (loop_next); - if(res == ERROR_SUCCESS) - HTTP_CacheRequest(request); - lend: heap_free(requestString); /* TODO: send notification for P3P header */ + if(res == ERROR_SUCCESS) + create_cache_entry(request); + if (request->session->appInfo->hdr.dwFlags & INTERNET_FLAG_ASYNC) { if (res == ERROR_SUCCESS) { @@ -5107,6 +5127,9 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ } } + if(res == ERROR_SUCCESS) + create_cache_entry(request); + if (res == ERROR_SUCCESS && request->contentLength) HTTP_ReceiveRequestData(request, TRUE); else diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index c4db996..38d1845 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1259,7 +1259,7 @@ static void test_http_cache(void) FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); file_size = GetFileSize(file, NULL); - todo_wine ok(file_size == 106, "file size = %u\n", file_size); + ok(file_size == 106, "file size = %u\n", file_size); size = sizeof(buf); ret = InternetReadFile(request, buf, sizeof(buf), &size); @@ -1267,7 +1267,7 @@ static void test_http_cache(void) ok(size == 100, "size = %u\n", size); file_size = GetFileSize(file, NULL); - todo_wine ok(file_size == 106, "file size = %u\n", file_size); + ok(file_size == 106, "file size = %u\n", file_size); CloseHandle(file); ok(InternetCloseHandle(request), "Close request handle failed\n");

1 0

Jacek Caban : wininet: Commit cache file as soon as all data is written.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 54639c5dc5c336662547726ce89322498e85e8be URL: http://source.winehq.org/git/wine.git/?a=commit;h=54639c5dc5c336662547726ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 2 13:49:22 2012 +0100 wininet: Commit cache file as soon as all data is written. --- dlls/wininet/http.c | 51 ++++++++++++++++++++++++++++++--------------- dlls/wininet/tests/http.c | 2 +- 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 73dd991..8937a39 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1815,18 +1815,8 @@ static void HTTPREQ_Destroy(object_header_t *hdr) TRACE("\n"); if(request->hCacheFile) { - WCHAR url[INTERNET_MAX_URL_LENGTH]; - CloseHandle(request->hCacheFile); - - if(HTTP_GetRequestURL(request, url)) { - DWORD headersLen; - - headersLen = request->rawHeaders ? strlenW(request->rawHeaders) : 0; - CommitUrlCacheEntryW(url, request->cacheFile, request->expires, - request->last_modified, NORMAL_CACHE_ENTRY, - request->rawHeaders, headersLen, NULL, 0); - } + DeleteFileW(request->cacheFile); } heap_free(request->cacheFile); @@ -2233,6 +2223,25 @@ static DWORD HTTPREQ_SetOption(object_header_t *hdr, DWORD option, void *buffer, return INET_SetOption(hdr, option, buffer, size); } +static void commit_cache_entry(http_request_t *req) +{ + WCHAR url[INTERNET_MAX_URL_LENGTH]; + + TRACE("%p\n", req); + + CloseHandle(req->hCacheFile); + req->hCacheFile = NULL; + + if(HTTP_GetRequestURL(req, url)) { + DWORD headersLen; + + headersLen = req->rawHeaders ? strlenW(req->rawHeaders) : 0; + CommitUrlCacheEntryW(url, req->cacheFile, req->expires, + req->last_modified, NORMAL_CACHE_ENTRY, + req->rawHeaders, headersLen, NULL, 0); + } +} + static void create_cache_entry(http_request_t *req) { WCHAR url[INTERNET_MAX_URL_LENGTH]; @@ -2271,6 +2280,9 @@ static void create_cache_entry(http_request_t *req) b = WriteFile(req->hCacheFile, req->read_buf+req->read_pos, req->read_size, &written, NULL); if(!b) FIXME("WriteFile failed: %u\n", GetLastError()); + + if(req->data_stream->vtbl->end_of_data(req->data_stream, req)) + commit_cache_entry(req); } } @@ -2362,13 +2374,18 @@ static DWORD read_http_stream(http_request_t *req, BYTE *buf, DWORD size, DWORD res = req->data_stream->vtbl->read(req->data_stream, req, buf, size, read, read_mode); assert(*read <= size); - if(*read && req->hCacheFile) { - BOOL bres; - DWORD written; + if(req->hCacheFile) { + if(*read) { + BOOL bres; + DWORD written; - bres = WriteFile(req->hCacheFile, buf, *read, &written, NULL); - if(!bres) - FIXME("WriteFile failed: %u\n", GetLastError()); + bres = WriteFile(req->hCacheFile, buf, *read, &written, NULL); + if(!bres) + FIXME("WriteFile failed: %u\n", GetLastError()); + } + + if(req->data_stream->vtbl->end_of_data(req->data_stream, req)) + commit_cache_entry(req); } return res; diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 38d1845..c9bd0a4 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1255,7 +1255,7 @@ static void test_http_cache(void) ret = InternetQueryOptionA(request, INTERNET_OPTION_DATAFILE_NAME, file_name, &size); ok(ret, "InternetQueryOptionA(INTERNET_OPTION_DATAFILE_NAME) failed: %u\n", GetLastError()); - file = CreateFile(file_name, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, + file = CreateFile(file_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); file_size = GetFileSize(file, NULL);

1 0

Jacek Caban : urlmon: Moved extracting callback from IBindCtx to separated function.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 8012d4ae717c685a9eab0faeaa5b95baa46a7cd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8012d4ae717c685a9eab0faea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 2 13:49:36 2012 +0100 urlmon: Moved extracting callback from IBindCtx to separated function. --- dlls/urlmon/bindctx.c | 103 ++++++++++++++++++++++++++++--------------------- 1 files changed, 59 insertions(+), 44 deletions(-) diff --git a/dlls/urlmon/bindctx.c b/dlls/urlmon/bindctx.c index 79260ef..914ed9f 100644 --- a/dlls/urlmon/bindctx.c +++ b/dlls/urlmon/bindctx.c @@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); -static WCHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; +static WCHAR bscb_holderW[] = { '_','B','S','C','B','_','H','o','l','d','e','r','_',0 }; extern IID IID_IBindStatusCallbackHolder; @@ -51,6 +51,44 @@ static void *get_callback_iface(BindStatusCallback *This, REFIID riid) return SUCCEEDED(hres) ? ret : NULL; } +static IBindStatusCallback *bsch_from_bctx(IBindCtx *bctx) +{ + IBindStatusCallback *bsc; + IUnknown *unk; + HRESULT hres; + + hres = IBindCtx_GetObjectParam(bctx, bscb_holderW, &unk); + if(FAILED(hres)) + return NULL; + + hres = IUnknown_QueryInterface(unk, &IID_IBindStatusCallback, (void**)&bsc); + IUnknown_Release(unk); + return SUCCEEDED(hres) ? bsc : NULL; +} + +static IBindStatusCallback *bsc_from_bctx(IBindCtx *bctx) +{ + BindStatusCallback *holder; + IBindStatusCallback *bsc; + HRESULT hres; + + bsc = bsch_from_bctx(bctx); + if(!bsc) + return NULL; + + hres = IBindStatusCallback_QueryInterface(bsc, &IID_IBindStatusCallbackHolder, (void**)&holder); + if(FAILED(hres)) + return bsc; + + if(holder->callback) { + IBindStatusCallback_Release(bsc); + bsc = holder->callback; + } + + IBindStatusCallbackEx_Release(&holder->IBindStatusCallbackEx_iface); + return bsc; +} + static inline BindStatusCallback *impl_from_IBindStatusCallbackEx(IBindStatusCallbackEx *iface) { return CONTAINING_RECORD(iface, BindStatusCallback, IBindStatusCallbackEx_iface); @@ -516,7 +554,6 @@ HRESULT WINAPI RegisterBindStatusCallback(IBindCtx *pbc, IBindStatusCallback *pb { BindStatusCallback *holder; IBindStatusCallback *bsc, *prev = NULL; - IUnknown *unk; HRESULT hres; TRACE("(%p %p %p %x)\n", pbc, pbsc, ppbscPrevious, dwReserved); @@ -524,34 +561,30 @@ HRESULT WINAPI RegisterBindStatusCallback(IBindCtx *pbc, IBindStatusCallback *pb if (!pbc || !pbsc) return E_INVALIDARG; - hres = IBindCtx_GetObjectParam(pbc, BSCBHolder, &unk); - if(SUCCEEDED(hres)) { - hres = IUnknown_QueryInterface(unk, &IID_IBindStatusCallback, (void**)&bsc); - IUnknown_Release(unk); + bsc = bsch_from_bctx(pbc); + if(bsc) { + hres = IBindStatusCallback_QueryInterface(bsc, &IID_IBindStatusCallbackHolder, (void**)&holder); if(SUCCEEDED(hres)) { - hres = IBindStatusCallback_QueryInterface(bsc, &IID_IBindStatusCallbackHolder, (void**)&holder); - if(SUCCEEDED(hres)) { - if(ppbscPrevious) { - IBindStatusCallback_AddRef(holder->callback); - *ppbscPrevious = holder->callback; - } - - set_callback(holder, pbsc); - - IBindStatusCallback_Release(bsc); - IBindStatusCallbackEx_Release(&holder->IBindStatusCallbackEx_iface); - return S_OK; - }else { - prev = bsc; + if(ppbscPrevious) { + IBindStatusCallback_AddRef(holder->callback); + *ppbscPrevious = holder->callback; } + + set_callback(holder, pbsc); + + IBindStatusCallback_Release(bsc); + IBindStatusCallbackEx_Release(&holder->IBindStatusCallbackEx_iface); + return S_OK; + }else { + prev = bsc; } - IBindCtx_RevokeObjectParam(pbc, BSCBHolder); + IBindCtx_RevokeObjectParam(pbc, bscb_holderW); } hres = wrap_callback(pbsc, &bsc); if(SUCCEEDED(hres)) { - hres = IBindCtx_RegisterObjectParam(pbc, BSCBHolder, (IUnknown*)bsc); + hres = IBindCtx_RegisterObjectParam(pbc, bscb_holderW, (IUnknown*)bsc); IBindStatusCallback_Release(bsc); } if(FAILED(hres)) { @@ -579,39 +612,21 @@ HRESULT WINAPI RegisterBindStatusCallback(IBindCtx *pbc, IBindStatusCallback *pb */ HRESULT WINAPI RevokeBindStatusCallback(IBindCtx *pbc, IBindStatusCallback *pbsc) { - BindStatusCallback *holder; IBindStatusCallback *callback; - IUnknown *unk; - BOOL dorevoke = FALSE; - HRESULT hres; TRACE("(%p %p)\n", pbc, pbsc); if (!pbc || !pbsc) return E_INVALIDARG; - hres = IBindCtx_GetObjectParam(pbc, BSCBHolder, &unk); - if(FAILED(hres)) + callback = bsc_from_bctx(pbc); + if(!callback) return S_OK; - hres = IUnknown_QueryInterface(unk, &IID_IBindStatusCallback, (void**)&callback); - IUnknown_Release(unk); - if(FAILED(hres)) - return S_OK; + if(callback == pbsc) + IBindCtx_RevokeObjectParam(pbc, bscb_holderW); - hres = IBindStatusCallback_QueryInterface(callback, &IID_IBindStatusCallbackHolder, (void**)&holder); - if(SUCCEEDED(hres)) { - if(pbsc == holder->callback) - dorevoke = TRUE; - IBindStatusCallbackEx_Release(&holder->IBindStatusCallbackEx_iface); - }else if(pbsc == callback) { - dorevoke = TRUE; - } IBindStatusCallback_Release(callback); - - if(dorevoke) - IBindCtx_RevokeObjectParam(pbc, BSCBHolder); - return S_OK; }

1 0

Jacek Caban : urlmon: Added AsyncInstallDistributionUnit implementation.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 59055c4d45c674c2a9dc2efcb8d0a973f870f3ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=59055c4d45c674c2a9dc2efcb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 2 13:49:53 2012 +0100 urlmon: Added AsyncInstallDistributionUnit implementation. --- dlls/urlmon/Makefile.in | 2 + dlls/urlmon/axinstall.c | 399 +++++++++++++++++++++++++++++++++++++++++++++ dlls/urlmon/bindctx.c | 2 +- dlls/urlmon/download.c | 82 ++++++++-- dlls/urlmon/resource.h | 26 +++ dlls/urlmon/rsrc.rc | 35 ++++ dlls/urlmon/umon.c | 11 -- dlls/urlmon/urlmon_main.c | 2 + dlls/urlmon/urlmon_main.h | 19 ++ 9 files changed, 551 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59055c4d45c674c2a9dc2…

1 0

Francois Gouget : winemenubuilder: Use the same icon name on Mac OS X as on Unix.
by Alexandre Julliard 02 Nov '12

02 Nov '12

Module: wine Branch: master Commit: 712b3571be129feb32fbd947071d914ceab4995b URL: http://source.winehq.org/git/wine.git/?a=commit;h=712b3571be129feb32fbd9470… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Nov 1 23:20:13 2012 +0100 winemenubuilder: Use the same icon name on Mac OS X as on Unix. --- programs/winemenubuilder/winemenubuilder.c | 82 ++++++++++++---------------- 1 files changed, 36 insertions(+), 46 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 96ec29d..8c941e2 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -199,7 +199,6 @@ static WCHAR* assoc_query(ASSOCSTR assocStr, LPCWSTR name, LPCWSTR extra); static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppStream); /* Utility routines */ -#ifndef __APPLE__ static unsigned short crc16(const char* string) { unsigned short crc = 0; @@ -218,7 +217,6 @@ static unsigned short crc16(const char* string) } return crc; } -#endif static char *strdupA( const char *str ) { @@ -1069,6 +1067,35 @@ static HRESULT open_icon(LPCWSTR filename, int index, BOOL bWait, IStream **ppSt return hr; } +static char* compute_native_identifier(int exeIndex, LPCWSTR icoPathW) +{ + char* nativeIdentifier; + char *icoPathA; + unsigned short crc; + char *basename, *ext; + + icoPathA = wchars_to_utf8_chars(icoPathW); + if (icoPathA == NULL) + return NULL; + + crc = crc16(icoPathA); + basename = strrchr(icoPathA, '\\'); + if (basename == NULL) + basename = icoPathA; + else + { + *basename = 0; + basename++; + } + ext = strrchr(basename, '.'); + if (ext) + *ext = 0; + + nativeIdentifier = heap_printf("%04X_%s.%d", crc, basename, exeIndex); + HeapFree(GetProcessHeap(), 0, icoPathA); + return nativeIdentifier; +} + #ifdef __APPLE__ #define ICNS_SLOTS 6 @@ -1102,9 +1129,6 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico } best[ICNS_SLOTS]; int indexes[ICNS_SLOTS]; int i; - GUID guid; - WCHAR *guidStrW = NULL; - char *guidStrA = NULL; char *icnsPath = NULL; LARGE_INTEGER zero; HRESULT hr; @@ -1165,26 +1189,16 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico } } - hr = CoCreateGuid(&guid); - if (FAILED(hr)) - { - WINE_WARN("CoCreateGuid failed, error 0x%08X\n", hr); - goto end; - } - hr = StringFromCLSID(&guid, &guidStrW); - if (FAILED(hr)) - { - WINE_WARN("StringFromCLSID failed, error 0x%08X\n", hr); - goto end; - } - guidStrA = wchars_to_utf8_chars(guidStrW); - if (guidStrA == NULL) + if (destFilename) + *nativeIdentifier = heap_printf("%s", destFilename); + else + *nativeIdentifier = compute_native_identifier(exeIndex, icoPathW); + if (*nativeIdentifier == NULL) { hr = E_OUTOFMEMORY; - WINE_WARN("out of memory converting GUID string\n"); goto end; } - icnsPath = heap_printf("/tmp/%s.icns", guidStrA); + icnsPath = heap_printf("/tmp/%s.icns", *nativeIdentifier); if (icnsPath == NULL) { hr = E_OUTOFMEMORY; @@ -1209,8 +1223,6 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico end: HeapFree(GetProcessHeap(), 0, iconDirEntries); - CoTaskMemFree(guidStrW); - HeapFree(GetProcessHeap(), 0, guidStrA); if (SUCCEEDED(hr)) *nativeIdentifier = icnsPath; else @@ -1244,10 +1256,7 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico ICONDIRENTRY *iconDirEntries = NULL; int numEntries; int i; - char *icoPathA = NULL; char *iconsDir = NULL; - unsigned short crc; - char *p, *q; HRESULT hr = S_OK; LARGE_INTEGER zero; @@ -1255,28 +1264,10 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico if (FAILED(hr)) goto end; - icoPathA = wchars_to_utf8_chars(icoPathW); - if (icoPathA == NULL) - { - hr = E_OUTOFMEMORY; - goto end; - } - crc = crc16(icoPathA); - p = strrchr(icoPathA, '\\'); - if (p == NULL) - p = icoPathA; - else - { - *p = 0; - p++; - } - q = strrchr(p, '.'); - if (q) - *q = 0; if (destFilename) *nativeIdentifier = heap_printf("%s", destFilename); else - *nativeIdentifier = heap_printf("%04X_%s.%d", crc, p, exeIndex); + *nativeIdentifier = compute_native_identifier(exeIndex, icoPathW); if (*nativeIdentifier == NULL) { hr = E_OUTOFMEMORY; @@ -1353,7 +1344,6 @@ static HRESULT platform_write_icon(IStream *icoStream, int exeIndex, LPCWSTR ico end: HeapFree(GetProcessHeap(), 0, iconDirEntries); - HeapFree(GetProcessHeap(), 0, icoPathA); HeapFree(GetProcessHeap(), 0, iconsDir); return hr; }

1 0