May 2013 - Wine-commits - list.winehq.org

Sam Edwards : gdi32: Improve glyph positioning for the subpixel case in get_glyph_outline.
by Alexandre Julliard 02 May '13

02 May '13

Module: wine Branch: master Commit: a7dee44c24285bd48d17399d7e3b8822116c894f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7dee44c24285bd48d17399d7… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Wed May 1 09:28:12 2013 -0600 gdi32: Improve glyph positioning for the subpixel case in get_glyph_outline. --- dlls/gdi32/freetype.c | 34 ++++++++++++++++++++++++---------- 1 files changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5b3c138..30ab574 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6352,20 +6352,35 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, } x_shift = ft_face->glyph->bitmap_left - lpgm->gmptGlyphOrigin.x; - if ( x_shift < 0 ) x_shift = 0; - if ( x_shift + (src_width / hmul) > width ) - x_shift = width - (src_width / hmul); + if ( x_shift < 0 ) + { + src += hmul * -x_shift; + src_width -= hmul * -x_shift; + } + else if ( x_shift > 0 ) + { + dst += x_shift; + width -= x_shift; + } y_shift = lpgm->gmptGlyphOrigin.y - ft_face->glyph->bitmap_top; - if ( y_shift < 0 ) y_shift = 0; - if ( y_shift + (src_height / vmul) > height ) - y_shift = height - (src_height / vmul); + if ( y_shift < 0 ) + { + src += src_pitch * vmul * -y_shift; + src_height -= vmul * -y_shift; + } + else if ( y_shift > 0 ) + { + dst += y_shift * ( pitch / sizeof(*dst) ); + height -= y_shift; + } - dst += x_shift + y_shift * ( pitch / 4 ); + width = min( width, src_width / hmul ); height = min( height, src_height / vmul ); + while ( height-- ) { - for ( x = 0; x < width && x < src_width / hmul; x++ ) + for ( x = 0; x < width; x++ ) { if ( rgb ) { @@ -6383,8 +6398,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, } } src += src_pitch * vmul; - dst += pitch / 4; - src_height -= vmul; + dst += pitch / sizeof(*dst); } break;

1 0

Sam Edwards : gdi32: Clip font glyphs to fit within text metrics.
by Alexandre Julliard 02 May '13

02 May '13

Module: wine Branch: master Commit: 21dbe1c949af569daf0a4db4eef45e40fc780f0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=21dbe1c949af569daf0a4db4e… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Tue Apr 30 01:20:57 2013 -0600 gdi32: Clip font glyphs to fit within text metrics. --- dlls/gdi32/freetype.c | 41 ++++++++++++++++++-------- dlls/gdi32/tests/font.c | 41 +++++++++++++++++++++++++++ dlls/gdi32/tests/wine_test.sfd | 60 +++++++++++++++++++++++++++++++++------ dlls/gdi32/tests/wine_test.ttf | Bin 1652 -> 1760 bytes 4 files changed, 119 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 30ab574..c30a358 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -538,6 +538,7 @@ static BOOL use_default_fallback = FALSE; static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, FT_UInt *glyph); static BOOL get_outline_text_metrics(GdiFont *font); +static BOOL get_bitmap_text_metrics(GdiFont *font); static BOOL get_text_metrics(GdiFont *font, LPTEXTMETRICW ptm); static void remove_face_from_cache( Face *face ); @@ -5868,6 +5869,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)}; FT_Face ft_face = incoming_font->ft_face; GdiFont *font = incoming_font; + FT_Glyph_Metrics metrics; FT_UInt glyph_index; DWORD width, height, pitch, needed = 0; FT_Bitmap ft_bitmap; @@ -6019,6 +6021,22 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, return GDI_ERROR; } + /* Some poorly-created fonts contain glyphs that exceed the boundaries set + * by the text metrics. The proper behavior is to clip the glyph metrics to + * fit within the maximums specified in the text metrics. */ + metrics = ft_face->glyph->metrics; + if(incoming_font->potm || get_outline_text_metrics(incoming_font) || + get_bitmap_text_metrics(incoming_font)) { + TEXTMETRICW *ptm = &incoming_font->potm->otmTextMetrics; + top = min( metrics.horiBearingY, ptm->tmAscent << 6 ); + bottom = max( metrics.horiBearingY - metrics.height, -(ptm->tmDescent << 6) ); + metrics.horiBearingY = top; + metrics.height = top - bottom; + + /* TODO: Are we supposed to clip the width as well...? */ + /* metrics.width = min( metrics.width, ptm->tmMaxCharWidth << 6 ); */ + } + if(FT_IS_SCALABLE(incoming_font->ft_face)) { TEXTMETRICW tm; if (get_text_metrics(incoming_font, &tm) && @@ -6026,7 +6044,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, em_scale = MulDiv(incoming_font->ppem, 1 << 16, incoming_font->ft_face->units_per_EM); avgAdvance = pFT_MulFix(incoming_font->ntmAvgWidth, em_scale); if (avgAdvance && - (ft_face->glyph->metrics.horiAdvance+63) >> 6 == pFT_MulFix(incoming_font->ntmAvgWidth*2, em_scale)) + (metrics.horiAdvance+63) >> 6 == pFT_MulFix(incoming_font->ntmAvgWidth*2, em_scale)) TRACE("Fixed-pitch full-width character detected\n"); else avgAdvance = 0; /* cancel this feature */ @@ -6034,16 +6052,15 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, } if(!needsTransform) { - left = (INT)(ft_face->glyph->metrics.horiBearingX) & -64; - right = (INT)((ft_face->glyph->metrics.horiBearingX + ft_face->glyph->metrics.width) + 63) & -64; + left = (INT)(metrics.horiBearingX) & -64; + right = (INT)((metrics.horiBearingX + metrics.width) + 63) & -64; if (!avgAdvance) - adv = (INT)(ft_face->glyph->metrics.horiAdvance + 63) >> 6; + adv = (INT)(metrics.horiAdvance + 63) >> 6; else adv = (INT)avgAdvance * 2; - top = (ft_face->glyph->metrics.horiBearingY + 63) & -64; - bottom = (ft_face->glyph->metrics.horiBearingY - - ft_face->glyph->metrics.height) & -64; + top = (metrics.horiBearingY + 63) & -64; + bottom = (metrics.horiBearingY - metrics.height) & -64; lpgm->gmCellIncX = adv; lpgm->gmCellIncY = 0; } else { @@ -6054,10 +6071,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, for(xc = 0; xc < 2; xc++) { for(yc = 0; yc < 2; yc++) { - vec.x = (ft_face->glyph->metrics.horiBearingX + - xc * ft_face->glyph->metrics.width); - vec.y = ft_face->glyph->metrics.horiBearingY - - yc * ft_face->glyph->metrics.height; + vec.x = metrics.horiBearingX + xc * metrics.width; + vec.y = metrics.horiBearingY - yc * metrics.height; TRACE("Vec %ld,%ld\n", vec.x, vec.y); pFT_Vector_Transform(&vec, &transMat); if(xc == 0 && yc == 0) { @@ -6077,7 +6092,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, top = (top + 63) & -64; TRACE("transformed box: (%d,%d - %d,%d)\n", left, top, right, bottom); - vec.x = ft_face->glyph->metrics.horiAdvance; + vec.x = metrics.horiAdvance; vec.y = 0; pFT_Vector_Transform(&vec, &transMat); lpgm->gmCellIncY = -((vec.y+63) >> 6); @@ -6090,7 +6105,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, lpgm->gmCellIncX = pFT_MulFix(vec.x, em_scale) * 2; } - vec.x = ft_face->glyph->metrics.horiAdvance; + vec.x = metrics.horiAdvance; vec.y = 0; pFT_Vector_Transform(&vec, &transMatUnrotated); if (!avgAdvance || vec.y) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index e5e7ff9..bc4e614 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -4561,6 +4561,46 @@ static void test_GetGlyphOutline_empty_contour(void) ReleaseDC(NULL, hdc); } +static void test_GetGlyphOutline_metric_clipping(void) +{ + HDC hdc; + LOGFONTA lf; + HFONT hfont, hfont_prev; + GLYPHMETRICS gm; + TEXTMETRICA tm; + DWORD ret; + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = 72; + lstrcpyA(lf.lfFaceName, "wine_test"); + + SetLastError(0xdeadbeef); + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "CreateFontIndirectA error %u\n", GetLastError()); + + hdc = GetDC(NULL); + + hfont_prev = SelectObject(hdc, hfont); + ok(hfont_prev != NULL, "SelectObject failed\n"); + + SetLastError(0xdeadbeef); + ret = GetTextMetrics(hdc, &tm); + ok(ret, "GetTextMetrics error %u\n", GetLastError()); + + GetGlyphOutlineA(hdc, 'A', GGO_METRICS, &gm, 0, NULL, &mat); + ok(gm.gmptGlyphOrigin.y <= tm.tmAscent, + "Glyph top(%d) exceeds ascent(%d)\n", + gm.gmptGlyphOrigin.y, tm.tmAscent); + GetGlyphOutlineA(hdc, 'D', GGO_METRICS, &gm, 0, NULL, &mat); + ok(gm.gmptGlyphOrigin.y - gm.gmBlackBoxY >= -tm.tmDescent, + "Glyph bottom(%d) exceeds descent(%d)\n", + gm.gmptGlyphOrigin.y - gm.gmBlackBoxY, -tm.tmDescent); + + SelectObject(hdc, hfont_prev); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); +} + static void test_CreateScalableFontResource(void) { char ttf_name[MAX_PATH]; @@ -4643,6 +4683,7 @@ static void test_CreateScalableFontResource(void) ok(ret, "font wine_test should be enumerated\n"); test_GetGlyphOutline_empty_contour(); + test_GetGlyphOutline_metric_clipping(); ret = pRemoveFontResourceExA(fot_name, FR_PRIVATE, 0); ok(!ret, "RemoveFontResourceEx() with not matching flags should fail\n"); diff --git a/dlls/gdi32/tests/wine_test.sfd b/dlls/gdi32/tests/wine_test.sfd index 5adf7cf..4c19377 100644 --- a/dlls/gdi32/tests/wine_test.sfd +++ b/dlls/gdi32/tests/wine_test.sfd @@ -20,7 +20,7 @@ OS2Version: 2 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1288336343 -ModificationTime: 1352483620 +ModificationTime: 1366465321 PfmFamily: 17 TTFWeight: 500 TTFWidth: 5 @@ -32,10 +32,10 @@ OS2TypoAOffset: 1 OS2TypoDescent: 0 OS2TypoDOffset: 1 OS2TypoLinegap: 184 -OS2WinAscent: 0 -OS2WinAOffset: 1 -OS2WinDescent: 0 -OS2WinDOffset: 1 +OS2WinAscent: 1638 +OS2WinAOffset: 0 +OS2WinDescent: 410 +OS2WinDOffset: 0 HheadAscent: 0 HheadAOffset: 1 HheadDescent: 0 @@ -78,15 +78,17 @@ ShortTable: maxp 16 0 EndShort LangName: 1033 "" "" "" "Wine : wine_test : 4-11-2010" -GaspTable: 1 65535 2 +GaspTable: 1 65535 2 0 Encoding: UnicodeBmp UnicodeInterp: none NameList: Adobe Glyph List DisplaySize: -24 AntiAlias: 1 FitToEm: 1 -WinInfo: 65 65 19 -BeginChars: 65539 5 +WinInfo: 48 16 4 +BeginPrivate: 0 +EndPrivate +BeginChars: 65539 7 StartChar: .notdef Encoding: 65536 -1 0 @@ -178,10 +180,10 @@ LayerCount: 2 EndChar StartChar: dieresis -Encoding: 168 168 0 +Encoding: 168 168 4 Width: 1000 VWidth: 0 -Flags: HW +Flags: W LayerCount: 2 Fore SplineSet @@ -201,5 +203,43 @@ SplineSet 310.707 834.805 310.707 834.805 254.492 773.213 c 1,12,13 EndSplineSet EndChar + +StartChar: A +Encoding: 65 65 5 +Width: 1000 +VWidth: 0 +Flags: WO +LayerCount: 2 +Fore +SplineSet +459 1258 m 29,0,-1 + 462 1639 l 5,1,-1 + 389 1638 l 5,2,-1 + 492 1815 l 5,3,-1 + 609 1638.5 l 5,4,-1 + 531 1637.5 l 5,5,-1 + 523 1258 l 5,6,-1 + 459 1258 l 29,0,-1 +EndSplineSet +EndChar + +StartChar: D +Encoding: 68 68 6 +Width: 1000 +VWidth: 0 +Flags: WO +LayerCount: 2 +Fore +SplineSet +461 -30.7998 m 29,0,-1 + 464 -411.8 l 5,1,-1 + 391 -410.8 l 5,2,-1 + 494 -587.8 l 5,3,-1 + 611 -411.3 l 5,4,-1 + 533 -410.3 l 5,5,-1 + 525 -30.7998 l 5,6,-1 + 461 -30.7998 l 29,0,-1 +EndSplineSet +EndChar EndChars EndSplineFont diff --git a/dlls/gdi32/tests/wine_test.ttf b/dlls/gdi32/tests/wine_test.ttf index 1e546eb..0868802 100644 Binary files a/dlls/gdi32/tests/wine_test.ttf and b/dlls/gdi32/tests/wine_test.ttf differ

1 0

Hans Leidekker : wbemprox: Implement more properties of Win32_OperatingSystem.
by Alexandre Julliard 02 May '13

02 May '13

Module: wine Branch: master Commit: 1bd0bd5f965dee6ad36794bf11d0cb183ce7a40e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bd0bd5f965dee6ad36794bf1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 2 12:02:06 2013 +0200 wbemprox: Implement more properties of Win32_OperatingSystem. --- dlls/wbemprox/builtin.c | 49 +++++++++++++++++++++++++++++++++++----------- 1 files changed, 37 insertions(+), 12 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 8b3e3c3..2106f67 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -163,6 +163,10 @@ static const WCHAR prop_osarchitectureW[] = {'O','S','A','r','c','h','i','t','e','c','t','u','r','e',0}; static const WCHAR prop_oslanguageW[] = {'O','S','L','a','n','g','u','a','g','e',0}; +static const WCHAR prop_osproductsuiteW[] = + {'O','S','P','r','o','d','u','c','t','S','u','i','t','e',0}; +static const WCHAR prop_ostypeW[] = + {'O','S','T','y','p','e',0}; static const WCHAR prop_parameterW[] = {'P','a','r','a','m','e','t','e','r',0}; static const WCHAR prop_pnpdeviceidW[] = @@ -179,6 +183,8 @@ static const WCHAR prop_releasedateW[] = {'R','e','l','e','a','s','e','D','a','t','e',0}; static const WCHAR prop_serialnumberW[] = {'S','e','r','i','a','l','N','u','m','b','e','r',0}; +static const WCHAR prop_servicepackmajorW[] = + {'S','e','r','v','i','c','e','P','a','c','k','M','a','j','o','r','V','e','r','s','i','o','n',0}; static const WCHAR prop_servicetypeW[] = {'S','e','r','v','i','c','e','T','y','p','e',0}; static const WCHAR prop_startmodeW[] = @@ -193,6 +199,8 @@ static const WCHAR prop_stateW[] = {'S','t','a','t','e',0}; static const WCHAR prop_strvalueW[] = {'S','t','r','i','n','g','V','a','l','u','e',0}; +static const WCHAR prop_suitemaskW[] = + {'S','u','i','t','e','M','a','s','k',0}; static const WCHAR prop_systemdirectoryW[] = {'S','y','s','t','e','m','D','i','r','e','c','t','o','r','y',0}; static const WCHAR prop_systemnameW[] = @@ -288,12 +296,17 @@ static const struct column col_networkadapter[] = }; static const struct column col_os[] = { - { prop_captionW, CIM_STRING }, - { prop_csdversionW, CIM_STRING }, - { prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, - { prop_osarchitectureW, CIM_STRING }, - { prop_oslanguageW, CIM_UINT32, VT_I4 }, - { prop_systemdirectoryW, CIM_STRING|COL_FLAG_DYNAMIC } + { prop_captionW, CIM_STRING }, + { prop_csdversionW, CIM_STRING }, + { prop_lastbootuptimeW, CIM_DATETIME|COL_FLAG_DYNAMIC }, + { prop_osarchitectureW, CIM_STRING }, + { prop_oslanguageW, CIM_UINT32, VT_I4 }, + { prop_osproductsuiteW, CIM_UINT32, VT_I4 }, + { prop_ostypeW, CIM_UINT16, VT_I4 }, + { prop_servicepackmajorW, CIM_UINT16, VT_I4 }, + { prop_suitemaskW, CIM_UINT32, VT_I4 }, + { prop_systemdirectoryW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_versionW, CIM_STRING } }; static const struct column col_param[] = { @@ -429,6 +442,8 @@ static const WCHAR os_32bitW[] = {'3','2','-','b','i','t',0}; static const WCHAR os_64bitW[] = {'6','4','-','b','i','t',0}; +static const WCHAR os_versionW[] = + {'5','.','1','.','2','6','0','0',0}; static const WCHAR sounddevice_productnameW[] = {'W','i','n','e',' ','A','u','d','i','o',' ','D','e','v','i','c','e',0}; static const WCHAR videocontroller_deviceidW[] = @@ -515,7 +530,12 @@ struct record_operatingsystem const WCHAR *lastbootuptime; const WCHAR *osarchitecture; UINT32 oslanguage; + UINT32 osproductsuite; + UINT16 ostype; + UINT16 servicepackmajor; + UINT32 suitemask; const WCHAR *systemdirectory; + const WCHAR *version; }; struct record_param { @@ -1178,12 +1198,17 @@ static void fill_os( struct table *table ) if (!(table->data = heap_alloc( sizeof(*rec) ))) return; rec = (struct record_operatingsystem *)table->data; - rec->caption = os_captionW; - rec->csdversion = os_csdversionW; - rec->lastbootuptime = get_lastbootuptime(); - rec->osarchitecture = get_osarchitecture(); - rec->oslanguage = MAKELANGID( LANG_ENGLISH, SUBLANG_ENGLISH_US ); - rec->systemdirectory = get_systemdirectory(); + rec->caption = os_captionW; + rec->csdversion = os_csdversionW; + rec->lastbootuptime = get_lastbootuptime(); + rec->osarchitecture = get_osarchitecture(); + rec->oslanguage = MAKELANGID( LANG_ENGLISH, SUBLANG_ENGLISH_US ); + rec->osproductsuite = 2461140; /* Windows XP Professional */ + rec->ostype = 18; /* WINNT */ + rec->servicepackmajor = 3; + rec->suitemask = 272; /* Single User + Terminal */ + rec->systemdirectory = get_systemdirectory(); + rec->version = os_versionW; TRACE("created 1 row\n"); table->num_rows = 1;

1 0

Hans Leidekker : wbemprox: Implement Win32_Processor.Family.
by Alexandre Julliard 02 May '13

02 May '13

Module: wine Branch: master Commit: fb81961d8b300189e6f3b4bd125998d61e35a3ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb81961d8b300189e6f3b4bd1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 2 12:02:34 2013 +0200 wbemprox: Implement Win32_Processor.Family. --- dlls/wbemprox/builtin.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 2106f67..3266bd2 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -123,6 +123,8 @@ static const WCHAR prop_driveW[] = {'D','r','i','v','e',0}; static const WCHAR prop_drivetypeW[] = {'D','r','i','v','e','T','y','p','e',0}; +static const WCHAR prop_familyW[] = + {'F','a','m','i','l','y',0}; static const WCHAR prop_filesystemW[] = {'F','i','l','e','S','y','s','t','e','m',0}; static const WCHAR prop_flavorW[] = @@ -334,6 +336,7 @@ static const struct column col_processor[] = { { prop_cpustatusW, CIM_UINT16 }, { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_familyW, CIM_UINT16, VT_I4 }, { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, { prop_maxclockspeedW, CIM_UINT32, VT_I4 }, { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, @@ -563,6 +566,7 @@ struct record_processor { UINT16 cpu_status; const WCHAR *device_id; + UINT16 family; const WCHAR *manufacturer; UINT32 maxclockspeed; const WCHAR *name; @@ -1143,6 +1147,7 @@ static void fill_processor( struct table *table ) rec->cpu_status = 1; /* CPU Enabled */ sprintfW( device_id, fmtW, i ); rec->device_id = heap_strdupW( device_id ); + rec->family = 2; /* Unknown */ rec->manufacturer = heap_strdupW( manufacturer ); rec->maxclockspeed = maxclockspeed; rec->name = heap_strdupW( name );

1 0

Hans Leidekker : wbemprox: Return a BSTR from get_stringvalue.
by Alexandre Julliard 02 May '13

02 May '13

Module: wine Branch: master Commit: 283db88d78ee6cf534ff4b819e2fff6a347d9b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=283db88d78ee6cf534ff4b819… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 2 12:03:02 2013 +0200 wbemprox: Return a BSTR from get_stringvalue. --- dlls/wbemprox/reg.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/reg.c b/dlls/wbemprox/reg.c index b4731fe..bcb9fe3 100644 --- a/dlls/wbemprox/reg.c +++ b/dlls/wbemprox/reg.c @@ -270,24 +270,24 @@ done: static HRESULT get_stringvalue( HKEY root, const WCHAR *subkey, const WCHAR *name, VARIANT *value, VARIANT *retval ) { HRESULT hr = S_OK; - WCHAR *buf = NULL; + BSTR str = NULL; DWORD size; LONG res; TRACE("%p, %s, %s\n", root, debugstr_w(subkey), debugstr_w(name)); if ((res = RegGetValueW( root, subkey, name, RRF_RT_REG_SZ, NULL, NULL, &size ))) goto done; - if (!(buf = heap_alloc( size ))) + if (!(str = SysAllocStringLen( NULL, size / sizeof(WCHAR) - 1 ))) { hr = E_OUTOFMEMORY; goto done; } - if (!(res = RegGetValueW( root, subkey, name, RRF_RT_REG_SZ, NULL, buf, &size ))) - set_variant( VT_BSTR, 0, buf, value ); + if (!(res = RegGetValueW( root, subkey, name, RRF_RT_REG_SZ, NULL, str, &size ))) + set_variant( VT_BSTR, 0, str, value ); done: set_variant( VT_UI4, res, NULL, retval ); - heap_free( buf ); + if (res) SysFreeString( str ); return hr; }

1 0

Volkan Gezer : Turkish translation for release 1.5.29
by Jeremy Newman 01 May '13

01 May '13

Module: website Branch: master Commit: 969d867823aa35c4a8b77a63b8bd07672fa8c89f URL: http://source.winehq.org/git/website.git/?a=commit;h=969d867823aa35c4a8b77a… Author: Volkan Gezer <vlkngzr(a)gmail.com> Date: Tue Apr 30 00:40:15 2013 +0200 Turkish translation for release 1.5.29 --- news/tr/2013041201.xml | 17 +++++++++++++++++ news/tr/2013042601.xml | 15 +++++++++++++++ templates/tr/devel.template | 2 +- templates/tr/download/debian.template | 6 +++--- templates/tr/download/ubuntu.template | 4 ++-- 5 files changed, 38 insertions(+), 6 deletions(-) diff --git a/news/tr/2013041201.xml b/news/tr/2013041201.xml new file mode 100644 index 0000000..ca2048c --- /dev/null +++ b/news/tr/2013041201.xml @@ -0,0 +1,17 @@ +<news> +<date>12 Nisan 2013</date> +<title>Wine 1.5.28 Yayınlandı</title> +<body> +<p> Wine geliştirme sürümü 1.5.28 artık kullanılabilir.</p> +<p> Bu sürümde <a href="{$root}/announce/1.5.28">Ne yeni</a>: +<ul> + <li>Tüm güvenli bağlantılar için GnuTLS kullanılıyor, OpenSSL artık gerekli değil.</li> + <li>Mac sürücüsü öntanımlı olarak etkin.</li> + <li>Dahili FixedSys yazı tipleri.</li> + <li>Oyun kolu denetim paneli için yeni simge.</li> + <li>Postscript sürücü ilerlemeleri.</li> + <li>Çeşitli hata onarımları.</li> +</ul></p> +<p><p>Kaynak <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.28.tar.bz2">hemen indirilebilir</a>. +İkili paketler derlenme aşamasında ve ilgili <a href="{$root}/download">indirme konumlarında</a> bulunabilecek. +</p></body></news> diff --git a/news/tr/2013042601.xml b/news/tr/2013042601.xml new file mode 100644 index 0000000..854f7ed --- /dev/null +++ b/news/tr/2013042601.xml @@ -0,0 +1,15 @@ +<news> +<date>26 Nisan 2013</date> +<title>Wine 1.5.29 Yayınlandı</title> +<body> +<p> Wine geliştirme sürümü 1.5.29 artık kullanılabilir.</p> +<p> Bu sürümde <a href="{$root}/announce/1.5.29">Ne yeni</a>: +<ul> + <li>Mac sürücüsü içiinde girdi yöntemi desteği.</li> + <li>Mac OS X üzerinde TLS 1.1 ve 1.2 bağlantı desteği.</li> + <li>JavaScript performans ilerlemeleri.</li> + <li>Çeşitli hata onarımları.</li> +</ul></p> +<p><p>Kaynak <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.29.tar.bz2">hemen indirilebilir</a>. +İkili paketler derlenme aşamasında ve ilgili <a href="{$root}/download">indirme konumlarında</a> bulunabilecek. +</p></body></news> diff --git a/templates/tr/devel.template b/templates/tr/devel.template index b0da581..d19dfe8 100644 --- a/templates/tr/devel.template +++ b/templates/tr/devel.template @@ -3,7 +3,7 @@ <h1 class="title">Geliştirme Bağlantıları</h1> -<p>Wine geliştirmeye hoşgeldiniz. Bu sayfada geliştiriciler için çeşitli bağlantılar ve kaynaklar bulacaksınız.</p> +<p>Wine geliştirmeye hoş geldiniz. Bu sayfada geliştiriciler için çeşitli bağlantılar ve kaynaklar bulacaksınız.</p> <table border="0" cellpadding="10" cellspacing="1" bgcolor="#EFEFEF" style="margin-left: 20px;"> diff --git a/templates/tr/download/debian.template b/templates/tr/download/debian.template index b45a55c..382011c 100644 --- a/templates/tr/download/debian.template +++ b/templates/tr/download/debian.template @@ -1,8 +1,8 @@ - - + + <h1 class="title"><a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a> -Wine for Debian Sid +Debian Sid için Wine <a href="http://www.debian.org/" target="_new"><img src="{$root}/images/distro/debian.png" width="50" height="50" alt="Debian Linux" border="0"></a></h1> <p>Debian tabanlı dağıtımlaar, APT olarak bilinen paket yönetiminde kullanılan özel bir araç ile kurulum yaparlar. APT, bir yazılım için gerekli bağımlılıkları kuran, ve APT depoları olarak bilinen konumlarda tarama yaparak paketi güncel tutan bir yazılımdır. Debian tabanlı dağıtımlar Wine'ı içeren yazılım depolarına sahiptir ancak burada indirmek için en son kullanılabilir beta sürümlerini kendi depolarımızda tutuyoruz.</p> diff --git a/templates/tr/download/ubuntu.template b/templates/tr/download/ubuntu.template index 4b3c962..5c177ab 100644 --- a/templates/tr/download/ubuntu.template +++ b/templates/tr/download/ubuntu.template @@ -1,5 +1,5 @@ - - + + <h1 class="title"><a href="http://www.ubuntu.com/" target="_new"><img src="{$root}/images/distro/ubuntu.png" width="50" height="50" alt="Ubuntu Logo" border="0"></a> Ubuntu ve Ubuntu türevleri için Wine

1 0

Austin English : msvcr110: Add a missing function header.
by Alexandre Julliard 01 May '13

01 May '13

Module: wine Branch: master Commit: 991e8467c7e6618ad8598969ef01d26ad03f09d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=991e8467c7e6618ad8598969e… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 30 15:42:30 2013 -0700 msvcr110: Add a missing function header. --- dlls/msvcr110/msvcr110.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/msvcr110/msvcr110.c b/dlls/msvcr110/msvcr110.c index 1049e2a..9cf945a 100644 --- a/dlls/msvcr110/msvcr110.c +++ b/dlls/msvcr110/msvcr110.c @@ -40,6 +40,9 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) return TRUE; } +/********************************************************************* + * __crtSetUnhandledExceptionFilter (MSVCR110.@) + */ LPTOP_LEVEL_EXCEPTION_FILTER CDECL MSVCR110__crtSetUnhandledExceptionFilter(LPTOP_LEVEL_EXCEPTION_FILTER filter) { return SetUnhandledExceptionFilter(filter);

1 0

Austin English : msvcr110: Implement __crtGetShowWindowMode.
by Alexandre Julliard 01 May '13

01 May '13

Module: wine Branch: master Commit: c649d8746dc3865d086fd39bfa5774127cbd2248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c649d8746dc3865d086fd39bf… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 30 15:43:15 2013 -0700 msvcr110: Implement __crtGetShowWindowMode. --- dlls/msvcr110/msvcr110.c | 15 +++++++++++++++ dlls/msvcr110/msvcr110.spec | 2 +- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/dlls/msvcr110/msvcr110.c b/dlls/msvcr110/msvcr110.c index 9cf945a..04a0dc2 100644 --- a/dlls/msvcr110/msvcr110.c +++ b/dlls/msvcr110/msvcr110.c @@ -23,6 +23,9 @@ #include "stdlib.h" #include "windef.h" #include "winbase.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /********************************************************************* * DllMain (MSVCR110.@) @@ -47,3 +50,15 @@ LPTOP_LEVEL_EXCEPTION_FILTER CDECL MSVCR110__crtSetUnhandledExceptionFilter(LPTO { return SetUnhandledExceptionFilter(filter); } + +/********************************************************************* + * __crtGetShowWindowMode (MSVCR110.@) + */ +int CDECL MSVCR110__crtGetShowWindowMode(void) +{ + STARTUPINFOW si; + + GetStartupInfoW(&si); + TRACE("window=%d\n", si.wShowWindow); + return si.wShowWindow; +} diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 12fc808..c38763a 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -918,7 +918,7 @@ @ stub -arch=i386,win64 __crtFlsSetValue @ stub -arch=i386,win64 __crtGetDateFormatEx @ stub -arch=i386,win64 __crtGetLocaleInfoEx -@ stub __crtGetShowWindowMode +@ cdecl __crtGetShowWindowMode() MSVCR110__crtGetShowWindowMode @ stub -arch=i386,win64 __crtGetTimeFormatEx @ stub -arch=i386,win64 __crtGetUserDefaultLocaleName @ stub -arch=i386,win64 __crtInitializeCriticalSectionEx

1 0

Daniel Jelinski : xolehlp: Fix calling convention.
by Alexandre Julliard 01 May '13

01 May '13

Module: wine Branch: master Commit: 8651c3b00f0e69f1da812f54cb54d4670e80f072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8651c3b00f0e69f1da812f54c… Author: Daniel Jelinski <djelinski1(a)gmail.com> Date: Tue Apr 30 23:15:43 2013 +0200 xolehlp: Fix calling convention. --- dlls/xolehlp/xolehlp.c | 6 +++--- dlls/xolehlp/xolehlp.spec | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index e1ec12c..475ef67 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -38,7 +38,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) return TRUE; } -HRESULT WINAPI DtcGetTransactionManager(char *host, char *tm_name, REFIID riid, +HRESULT CDECL DtcGetTransactionManager(char *host, char *tm_name, REFIID riid, DWORD dwReserved1, WORD wcbReserved2, void *pvReserved2, void **ppv) { FIXME("(%s, %s, %s, %d, %d, %p, %p): stub\n", debugstr_a(host), debugstr_a(tm_name), @@ -46,7 +46,7 @@ HRESULT WINAPI DtcGetTransactionManager(char *host, char *tm_name, REFIID riid, return E_NOTIMPL; } -HRESULT WINAPI DtcGetTransactionManagerExA(CHAR *host, CHAR *tm_name, REFIID riid, +HRESULT CDECL DtcGetTransactionManagerExA(CHAR *host, CHAR *tm_name, REFIID riid, DWORD options, void *config, void **ppv) { FIXME("(%s, %s, %s, %d, %p, %p): stub\n", debugstr_a(host), debugstr_a(tm_name), @@ -54,7 +54,7 @@ HRESULT WINAPI DtcGetTransactionManagerExA(CHAR *host, CHAR *tm_name, REFIID rii return E_NOTIMPL; } -HRESULT WINAPI DtcGetTransactionManagerExW(WCHAR *host, WCHAR *tm_name, REFIID riid, +HRESULT CDECL DtcGetTransactionManagerExW(WCHAR *host, WCHAR *tm_name, REFIID riid, DWORD options, void *config, void **ppv) { FIXME("(%s, %s, %s, %d, %p, %p): stub\n", debugstr_w(host), debugstr_w(tm_name), diff --git a/dlls/xolehlp/xolehlp.spec b/dlls/xolehlp/xolehlp.spec index 0b149de..80c7c60 100644 --- a/dlls/xolehlp/xolehlp.spec +++ b/dlls/xolehlp/xolehlp.spec @@ -1,6 +1,6 @@ @ stub GetDtcLocaleResourceHandle -@ stdcall DtcGetTransactionManager(str str ptr long long ptr ptr) +@ cdecl DtcGetTransactionManager(str str ptr long long ptr ptr) @ stub DtcGetTransactionManagerEx @ stub DtcGetTransactionManagerC -@ stdcall DtcGetTransactionManagerExA(str str ptr long ptr ptr) -@ stdcall DtcGetTransactionManagerExW(wstr wstr ptr long ptr ptr) +@ cdecl DtcGetTransactionManagerExA(str str ptr long ptr ptr) +@ cdecl DtcGetTransactionManagerExW(wstr wstr ptr long ptr ptr)

1 0

Sergey Guralnik : riched20: Fix richtext copy/paste to OOffice.
by Alexandre Julliard 01 May '13

01 May '13

Module: wine Branch: master Commit: 8849885f73921db8ba138fd56c3f448382404acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8849885f73921db8ba138fd56… Author: Sergey Guralnik <serhio(a)etersoft.ru> Date: Tue Apr 30 09:06:06 2013 +0300 riched20: Fix richtext copy/paste to OOffice. --- dlls/riched20/writer.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 440cb1b..6a4538c 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -297,6 +297,14 @@ ME_StreamOutRTFFontAndColorTbl(ME_OutStream *pStream, ME_DisplayItem *pFirstRun, if (!ME_StreamOutPrint(pStream, "}\r\n")) return FALSE; + /* It seems like Open Office ignores \deff0 tag at RTF-header. + As result it can't correctly parse text before first \fN tag, + so we can put \f0 immediately after font table. This forces + parser to use the same font, that \deff0 specifies. + It makes OOffice happy */ + if (!ME_StreamOutPrint(pStream, "\\f0")) + return FALSE; + /* Output the color table */ if (!ME_StreamOutPrint(pStream, "{\\colortbl;")) return FALSE; /* first entry is auto-color */ for (i = 1; i < pStream->nColorTblLen; i++)

1 0