wine-commits May 2013

wine-commits@winehq.org

2 participants
498 discussions

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

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: 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

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

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

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

Christian Costa : msi: Use next cabinet from the media table instead of failing when there is a mismatch with continuous cabinet .
by Alexandre Julliard 01 May '13

01 May '13

Module: wine Branch: master Commit: 7129293b9a75b72ec73a37ca321cf20e8d34f5de URL: http://source.winehq.org/git/wine.git/?a=commit;h=7129293b9a75b72ec73a37ca3… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed May 1 15:27:31 2013 +0200 msi: Use next cabinet from the media table instead of failing when there is a mismatch with continuous cabinet. --- dlls/msi/media.c | 25 +++++++++++++++++++++++-- dlls/msi/tests/install.c | 4 ++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 612624d..d97f4bd 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -358,8 +358,29 @@ static INT_PTR cabinet_next_cabinet(FDINOTIFICATIONTYPE fdint, if (strcmpiW( mi->cabinet, cab )) { - ERR("Continuous cabinet does not match the next cabinet in the Media table\n"); - goto done; + char *next_cab; + ULONG length; + + WARN("Continuous cabinet %s does not match the next cabinet %s in the media table => use latter one\n", debugstr_w(cab), debugstr_w(mi->cabinet)); + + /* Use cabinet name from the media table */ + next_cab = strdupWtoA(mi->cabinet); + /* Modify path to cabinet file with full filename (psz3 points to a 256 bytes buffer that can be modified contrary to psz1 and psz2) */ + length = strlen(pfdin->psz3) + 1 + strlen(next_cab) + 1; + if (length > 256) + { + WARN("Cannot update next cabinet filename with a string size %u > 256\n", length); + msi_free(next_cab); + goto done; + } + else + { + strcat(pfdin->psz3, "\\"); + strcat(pfdin->psz3, next_cab); + } + /* Path psz3 and cabinet psz1 are concatenated by FDI so just reset psz1 */ + *pfdin->psz1 = 0; + msi_free(next_cab); } if (!(cabinet_file = get_cabinet_filename(mi))) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 207fdef..e5d996e 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3122,9 +3122,9 @@ static void test_continuouscabs(void) } else { - todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); - todo_wine ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); ok(delete_pf("msitest", FALSE), "Directory not created\n"); }

1 0

Christian Costa : msi: Add tests to show that only msi cab filename is taken in case of mismatch with the one given by previous cab .
by Alexandre Julliard 01 May '13

01 May '13

Module: wine Branch: master Commit: e249b930921a34ef43ee87095e48a70e1286dbe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e249b930921a34ef43ee87095… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed May 1 15:20:20 2013 +0200 msi: Add tests to show that only msi cab filename is taken in case of mismatch with the one given by previous cab. --- dlls/msi/tests/install.c | 108 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 92 insertions(+), 16 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 3065654..207fdef 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -392,6 +392,13 @@ static const CHAR cc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tV "2\t2\t\ttest2.cab\tDISK2\t\n" "3\t12\t\ttest3.cab\tDISK3\t\n"; +static const CHAR cc3_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" + "Media\tDiskId\n" + "1\t10\t\ttest1.cab\tDISK1\t\n" + "2\t2\t\ttest2_.cab\tDISK2\t\n" + "3\t12\t\ttest3.cab\tDISK3\t\n"; + static const CHAR co_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" "File\tFile\n" @@ -1460,6 +1467,18 @@ static const msi_table cc2_tables[] = ADD_TABLE(property), }; +static const msi_table cc3_tables[] = +{ + ADD_TABLE(cc_component), + ADD_TABLE(directory), + ADD_TABLE(cc_feature), + ADD_TABLE(cc_feature_comp), + ADD_TABLE(cc_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(cc3_media), + ADD_TABLE(property), +}; + static const msi_table co_tables[] = { ADD_TABLE(cc_component), @@ -2013,7 +2032,7 @@ static INT_PTR CDECL fci_open(char *pszFile, int oflag, int pmode, int *err, voi DWORD dwAccess = 0; DWORD dwShareMode = 0; DWORD dwCreateDisposition = OPEN_EXISTING; - + dwAccess = GENERIC_READ | GENERIC_WRITE; /* FILE_SHARE_DELETE is not supported by Windows Me/98/95 */ dwShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; @@ -2036,7 +2055,7 @@ static UINT CDECL fci_read(INT_PTR hf, void *memory, UINT cb, int *err, void *pv HANDLE handle = (HANDLE)hf; DWORD dwRead; BOOL res; - + res = ReadFile(handle, memory, cb, &dwRead, NULL); ok(res, "Failed to ReadFile\n"); @@ -2175,7 +2194,7 @@ static INT_PTR CDECL get_open_info(char *pszName, USHORT *pdate, USHORT *ptime, res = GetFileInformationByHandle(handle, &finfo); ok(res, "Expected GetFileInformationByHandle to succeed\n"); - + FileTimeToLocalFileTime(&finfo.ftLastWriteTime, &filetime); FileTimeToDosDateTime(&filetime, pdate, ptime); @@ -3025,11 +3044,18 @@ static void test_continuouscabs(void) MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); r = MsiInstallProductA(msifile, NULL); - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); - ok(delete_pf("msitest", FALSE), "Directory not created\n"); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + } + else + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + } delete_cab_files(); DeleteFile(msifile); @@ -3043,16 +3069,66 @@ static void test_continuouscabs(void) if (r == ERROR_INSTALL_PACKAGE_REJECTED) { skip("Not enough rights to perform tests\n"); - goto error; } - ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); - ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); - ok(delete_pf("msitest\\tiberius", TRUE), "File not installed\n"); - ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); - ok(delete_pf("msitest", FALSE), "Directory not created\n"); + else + { + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); + ok(delete_pf("msitest\\tiberius", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + } + + delete_cab_files(); + DeleteFile(msifile); + + /* Tests to show that only msi cab filename is taken in case of mismatch with the one given by previous cab */ + + /* Filename from cab is right and the one from msi is wrong */ + create_cc_test_files(); + create_database(msifile, cc3_tables, sizeof(cc3_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + } + else + { + ok(r == ERROR_INSTALL_FAILURE, "Expected ERROR_INSTALL_FAIRE, got %u\n", r); + todo_wine ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); + ok(!delete_pf("msitest\\caesar", TRUE), "File installed\n"); + todo_wine ok(!delete_pf("msitest\\maximus", TRUE), "File installed\n"); + todo_wine ok(!delete_pf("msitest", FALSE), "Directory created\n"); + } + + delete_cab_files(); + DeleteFile(msifile); + + /* Filename from msi is right and the one from cab is wrong */ + create_cc_test_files(); + ok(MoveFile("test2.cab", "test2_.cab"), "Cannot rename test3.cab to test3_.cab"); + create_database(msifile, cc3_tables, sizeof(cc3_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + if (r == ERROR_INSTALL_PACKAGE_REJECTED) + { + skip("Not enough rights to perform tests\n"); + } + else + { + todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File not installed\n"); + todo_wine ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); + } -error: delete_cab_files(); DeleteFile(msifile); }

1 0

Ruslan Kabatsayev : netapi32: Add stub for NetGetAnyDCName.
by Alexandre Julliard 01 May '13

01 May '13

Module: wine Branch: master Commit: 23b0c321ae1545d75371d49e956b24e3ffac163c URL: http://source.winehq.org/git/wine.git/?a=commit;h=23b0c321ae1545d75371d49e9… Author: Ruslan Kabatsayev <b7.10110111(a)gmail.com> Date: Sat Apr 27 16:01:53 2013 +0400 netapi32: Add stub for NetGetAnyDCName. --- dlls/netapi32/access.c | 14 ++++++++++++++ dlls/netapi32/netapi32.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 09b5b63..b77da79 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -729,6 +729,20 @@ NetGetDCName(LPCWSTR servername, LPCWSTR domainname, LPBYTE *bufptr) } /************************************************************ + * NetGetAnyDCName (NETAPI32.@) + * + * Return the name of any domain controller (DC) for a + * domain that is directly trusted by the specified server + */ + +NET_API_STATUS WINAPI NetGetAnyDCName(LPCWSTR servername, LPCWSTR domainname, LPBYTE *bufptr) +{ + FIXME("(%s, %s, %p) stub!\n", debugstr_w(servername), + debugstr_w(domainname), bufptr); + return ERROR_NO_SUCH_DOMAIN; +} + +/************************************************************ * NetGroupEnum (NETAPI32.@) * */ diff --git a/dlls/netapi32/netapi32.spec b/dlls/netapi32/netapi32.spec index 50e7b0e..8e0f3ea 100644 --- a/dlls/netapi32/netapi32.spec +++ b/dlls/netapi32/netapi32.spec @@ -90,7 +90,7 @@ @ stub NetFileClose @ stdcall NetFileEnum(wstr wstr wstr long ptr long ptr ptr ptr) @ stub NetFileGetInfo -@ stub NetGetAnyDCName +@ stdcall NetGetAnyDCName(wstr wstr ptr) @ stdcall NetGetDCName(wstr wstr ptr) @ stub NetGetDisplayInformationIndex @ stdcall NetGetJoinInformation(wstr ptr ptr)

1 0

Hans Leidekker : wininet/tests: Skip proxy tests on broken wininet.
by Alexandre Julliard 01 May '13

01 May '13

Module: wine Branch: master Commit: d8c92b6294eeb84bd245fc264caf801194ac1c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8c92b6294eeb84bd245fc264… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 1 12:13:24 2013 +0200 wininet/tests: Skip proxy tests on broken wininet. --- dlls/wininet/tests/http.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 664fbbf..5f0bf43 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2193,7 +2193,12 @@ static void test_proxy_direct(int port) ok(hr != NULL, "HttpOpenRequest failed\n"); r = HttpSendRequest(hr, NULL, 0, NULL, 0); - ok(r, "HttpSendRequest failed %u\n", GetLastError()); + ok(r || broken(!r), "HttpSendRequest failed %u\n", GetLastError()); + if (!r) + { + win_skip("skipping proxy tests on broken wininet\n"); + goto done; + } test_status_code(hr, 407); @@ -2419,6 +2424,7 @@ static void test_proxy_direct(int port) ok(r, "HttpQueryInfo failed\n"); ok(!strcmp(buffer, "200"), "proxy code wrong\n"); +done: InternetCloseHandle(hr); InternetCloseHandle(hc); InternetCloseHandle(hi);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2013