August 2012 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : kernel32: Add GetCurrentConsoleFont stub.
by Alexandre Julliard 22 Aug '12

22 Aug '12

Module: wine Branch: master Commit: 71d3d4f1bafbcec65ba165d28aa18ab2be3b1459 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d3d4f1bafbcec65ba165d28… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Aug 20 14:20:16 2012 +1000 kernel32: Add GetCurrentConsoleFont stub. --- dlls/kernel32/console.c | 8 ++++++++ dlls/kernel32/kernel32.spec | 2 +- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 4218c29..1881bac 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3224,3 +3224,11 @@ BOOL WINAPI SetConsoleIcon(HICON icon) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } + +BOOL WINAPI GetCurrentConsoleFont(HANDLE hConsole, BOOL maxwindow, LPCONSOLE_FONT_INFO fontinfo) +{ + FIXME(": (%p, %d, %p) stub!\n", hConsole, maxwindow, fontinfo); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; + +} diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 736fbde..b263818 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -494,7 +494,7 @@ @ stdcall GetCurrencyFormatA(long long str ptr str long) @ stdcall GetCurrencyFormatW(long long str ptr str long) @ stdcall GetCurrentActCtx(ptr) -@ stub GetCurrentConsoleFont +@ stdcall GetCurrentConsoleFont(long long ptr) @ stdcall GetCurrentDirectoryA(long ptr) @ stdcall GetCurrentDirectoryW(long ptr) @ stdcall GetCurrentProcess()

1 0

Alistair Leslie-Hughes : kernel32: Add GetConsoleFontSize stub.
by Alexandre Julliard 22 Aug '12

22 Aug '12

Module: wine Branch: master Commit: 53d73559499f698efa9340f66ceb4aa694e5c569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53d73559499f698efa9340f66… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Aug 20 14:45:03 2012 +1000 kernel32: Add GetConsoleFontSize stub. --- dlls/kernel32/console.c | 29 +++++++++++++++++++++++++++++ dlls/kernel32/kernel32.spec | 2 +- include/wincon.h | 15 ++++++++++++++- 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 1881bac..d6d1414 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3230,5 +3230,34 @@ BOOL WINAPI GetCurrentConsoleFont(HANDLE hConsole, BOOL maxwindow, LPCONSOLE_FON FIXME(": (%p, %d, %p) stub!\n", hConsole, maxwindow, fontinfo); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; +} + +#ifdef __i386__ +#undef GetConsoleFontSize +DWORD WINAPI GetConsoleFontSize(HANDLE hConsole, DWORD font) +{ + union { + COORD c; + DWORD w; + } x; + + FIXME(": (%p, %d) stub!\n", hConsole, font); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + + x.c.X = 0; + x.c.Y = 0; + return x.w; +} +#endif /* defined(__i386__) */ + +#ifndef __i386__ +COORD WINAPI GetConsoleFontSize(HANDLE hConsole, DWORD font) +{ + COORD c; + c.X = 80; + c.Y = 24; + FIXME(": (%p, %d) stub!\n", hConsole, font); + return c; } +#endif /* defined(__i386__) */ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b263818..f9f8685 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -475,7 +475,7 @@ @ stub GetConsoleCursorMode @ stdcall GetConsoleDisplayMode(ptr) @ stub GetConsoleFontInfo -@ stub GetConsoleFontSize +@ stdcall GetConsoleFontSize(long long) @ stub GetConsoleHardwareState @ stdcall GetConsoleInputExeNameA(long ptr) @ stdcall GetConsoleInputExeNameW(long ptr) diff --git a/include/wincon.h b/include/wincon.h index 1cf9428..3418856 100644 --- a/include/wincon.h +++ b/include/wincon.h @@ -268,8 +268,21 @@ typedef struct tagINPUT_RECORD #ifdef __i386__ /* Note: this should return a COORD, but calling convention for returning * structures is different between Windows and gcc on i386. */ + +WINBASEAPI DWORD WINAPI GetConsoleFontSize(HANDLE, DWORD); WINBASEAPI DWORD WINAPI GetLargestConsoleWindowSize(HANDLE); +static inline COORD __wine_GetConsoleFontSize_wrapper(HANDLE h, DWORD d) +{ + union { + COORD c; + DWORD dw; + } u; + u.dw = GetConsoleFontSize(h, d); + return u.c; +} +#define GetConsoleFontSize(h, d) __wine_GetConsoleFontSize_wrapper(h, d) + static inline COORD __wine_GetLargestConsoleWindowSize_wrapper(HANDLE h) { union { @@ -282,6 +295,7 @@ static inline COORD __wine_GetLargestConsoleWindowSize_wrapper(HANDLE h) #define GetLargestConsoleWindowSize(h) __wine_GetLargestConsoleWindowSize_wrapper(h) #else /* __i386__ */ +WINBASEAPI COORD WINAPI GetConsoleFontSize(HANDLE, DWORD); WINBASEAPI COORD WINAPI GetLargestConsoleWindowSize(HANDLE); #endif /* __i386__ */ @@ -316,7 +330,6 @@ WINBASEAPI DWORD WINAPI GetConsoleAliasExesLengthW(VOID); WINBASEAPI UINT WINAPI GetConsoleCP(VOID); WINBASEAPI BOOL WINAPI GetConsoleCursorInfo( HANDLE,LPCONSOLE_CURSOR_INFO); WINBASEAPI BOOL WINAPI GetConsoleDisplayMode(LPDWORD); -WINBASEAPI COORD WINAPI GetConsoleFontSize(HANDLE,DWORD); WINBASEAPI BOOL WINAPI GetConsoleHistoryInfo(LPCONSOLE_HISTORY_INFO); WINBASEAPI BOOL WINAPI GetConsoleInputExeNameA(DWORD,LPSTR); WINBASEAPI BOOL WINAPI GetConsoleInputExeNameW(DWORD,LPWSTR);

1 0

André Hentschel : ntdll: Catch bad pointers in RtlWow64EnableFsRedirectionEx.
by Alexandre Julliard 22 Aug '12

22 Aug '12

Module: wine Branch: master Commit: aac478f51b993a56ec0c4deb5b051d60d80bf6e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aac478f51b993a56ec0c4deb5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Aug 21 21:58:17 2012 +0200 ntdll: Catch bad pointers in RtlWow64EnableFsRedirectionEx. --- dlls/ntdll/directory.c | 2 ++ dlls/ntdll/tests/directory.c | 5 +++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index c8fff6b..28b0ab3 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -3022,6 +3022,8 @@ NTSTATUS WINAPI RtlWow64EnableFsRedirection( BOOLEAN enable ) NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx( ULONG disable, ULONG *old_value ) { if (!is_wow64) return STATUS_NOT_IMPLEMENTED; + if (((ULONG_PTR)old_value >> 16) == 0) return STATUS_ACCESS_VIOLATION; + *old_value = !ntdll_get_thread_data()->wow64_redir; ntdll_get_thread_data()->wow64_redir = !disable; return STATUS_SUCCESS; diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index c74bf34..d6b886a 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -287,6 +287,11 @@ static void test_redirection(void) ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status ); ok( !cur, "RtlWow64EnableFsRedirectionEx got %u\n", cur ); + status = pRtlWow64EnableFsRedirectionEx( TRUE, NULL ); + ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %x\n", status ); + status = pRtlWow64EnableFsRedirectionEx( TRUE, (void*)1 ); + ok( status == STATUS_ACCESS_VIOLATION, "RtlWow64EnableFsRedirectionEx failed with status %x\n", status ); + status = pRtlWow64EnableFsRedirection( FALSE ); ok( !status, "RtlWow64EnableFsRedirectionEx failed status %x\n", status ); status = pRtlWow64EnableFsRedirectionEx( FALSE, &cur );

1 0

Roman Dadkov : oleaut32: Record DocString field in ITypeInfoImpl structure in function ITypeLib2_Constructor_SLTG .
by Alexandre Julliard 22 Aug '12

22 Aug '12

Module: wine Branch: master Commit: 3eab4f8d9649dfc8c04caa4b9a525a1d36fe24ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=3eab4f8d9649dfc8c04caa4b9… Author: Roman Dadkov <romand(a)etersoft.ru> Date: Tue Aug 21 18:00:38 2012 +0400 oleaut32: Record DocString field in ITypeInfoImpl structure in function ITypeLib2_Constructor_SLTG. --- dlls/oleaut32/typelib.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0fc7a6e..abde61b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4092,6 +4092,9 @@ static ITypeLib2* ITypeLib2_Constructor_SLTG(LPVOID pLib, DWORD dwTLBLength) pOtherTypeInfoBlks[i].name_offs + pNameTable); (*ppTypeInfoImpl)->dwHelpContext = pOtherTypeInfoBlks[i].helpcontext; + (*ppTypeInfoImpl)->DocString = TLB_MultiByteToBSTR( + pOtherTypeInfoBlks[i].helpcontext + + pNameTable); (*ppTypeInfoImpl)->TypeAttr.guid = pOtherTypeInfoBlks[i].uuid; (*ppTypeInfoImpl)->TypeAttr.typekind = pTIHeader->typekind; (*ppTypeInfoImpl)->TypeAttr.wMajorVerNum = pTIHeader->major_version;

1 0

Dmitry Timoshkov : gdiplus: Add a bunch of tests for GdipMeasureCharacterRanges.
by Alexandre Julliard 22 Aug '12

22 Aug '12

Module: wine Branch: master Commit: 32d37c832def54c9880c99812f42fe913e47f643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32d37c832def54c9880c99812… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 22 15:33:48 2012 +0900 gdiplus: Add a bunch of tests for GdipMeasureCharacterRanges. --- dlls/gdiplus/tests/graphics.c | 106 ++++++++++++++++++++++++++++++++++++++-- 1 files changed, 100 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index b007ddf..c95bf11 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2945,7 +2945,7 @@ static void test_string_functions(void) INT codepointsfitted, linesfilled; GpStringFormat *format; CharacterRange ranges[3] = {{0, 1}, {1, 3}, {5, 1}}; - GpRegion *regions[4] = {0}; + GpRegion *regions[4]; BOOL region_isempty[4]; int i; PointF position; @@ -3078,15 +3078,32 @@ static void test_string_functions(void) expect(6, codepointsfitted); todo_wine expect(4, linesfilled); + for (i = 0; i < 4; i++) + regions[i] = (GpRegion *)0xdeadbeef; + + status = GdipMeasureCharacterRanges(graphics, teststring, 6, font, &rc, format, 0, regions); + expect(Ok, status); + + for (i = 0; i < 4; i++) + ok(regions[i] == (GpRegion *)0xdeadbeef, "expected 0xdeadbeef, got %p\n", regions[i]); + + status = GdipMeasureCharacterRanges(graphics, teststring, 6, font, &rc, format, 3, regions); + expect(Ok, status); + + for (i = 0; i < 4; i++) + ok(regions[i] == (GpRegion *)0xdeadbeef, "expected 0xdeadbeef, got %p\n", regions[i]); + status = GdipSetStringFormatMeasurableCharacterRanges(format, 3, ranges); expect(Ok, status); - rc.Width = 100.0; + set_rect_empty(&rc); for (i=0; i<4; i++) { status = GdipCreateRegion(&regions[i]); expect(Ok, status); + status = GdipSetEmpty(regions[i]); + expect(Ok, status); } status = GdipMeasureCharacterRanges(NULL, teststring, 6, font, &rc, format, 3, regions); @@ -3114,6 +3131,26 @@ static void test_string_functions(void) status = GdipMeasureCharacterRanges(graphics, teststring, 6, font, &rc, format, 2, regions); expect(InvalidParameter, status); + status = GdipMeasureCharacterRanges(graphics, teststring, 6, font, &rc, format, 3, regions); + expect(Ok, status); + + for (i = 0; i < 4; i++) + { + status = GdipIsEmptyRegion(regions[i], graphics, &region_isempty[i]); + expect(Ok, status); + } + +todo_wine + ok(region_isempty[0], "region should be empty\n"); +todo_wine + ok(region_isempty[1], "region should be empty\n"); +todo_wine + ok(region_isempty[2], "region should be empty\n"); + ok(region_isempty[3], "region should be empty\n"); + + rc.Width = 100.0; + rc.Height = 100.0; + status = GdipMeasureCharacterRanges(graphics, teststring, 6, font, &rc, format, 4, regions); expect(Ok, status); @@ -3126,7 +3163,7 @@ static void test_string_functions(void) ok(!region_isempty[0], "region shouldn't be empty\n"); ok(!region_isempty[1], "region shouldn't be empty\n"); ok(!region_isempty[2], "region shouldn't be empty\n"); - ok(!region_isempty[3], "region shouldn't be empty\n"); + ok(region_isempty[3], "region should be empty\n"); /* Cut off everything after the first space, and the second line. */ rc.Width = char_bounds.Width + char_width * 2.1; @@ -3144,7 +3181,7 @@ static void test_string_functions(void) ok(!region_isempty[0], "region shouldn't be empty\n"); ok(!region_isempty[1], "region shouldn't be empty\n"); ok(region_isempty[2], "region should be empty\n"); - ok(!region_isempty[3], "region shouldn't be empty\n"); + ok(region_isempty[3], "region should be empty\n"); for (i=0; i<4; i++) GdipDeleteRegion(regions[i]); @@ -3692,6 +3729,8 @@ static void test_font_height_scaling(void) static const WCHAR string[] = { '1','2','3','4','5','6','7',0 }; HDC hdc; GpStringFormat *format; + CharacterRange range = { 0, 7 }; + GpRegion *region; GpGraphics *graphics; GpFontFamily *family; GpFont *font; @@ -3703,6 +3742,11 @@ static void test_font_height_scaling(void) status = GdipCreateStringFormat(0, LANG_NEUTRAL, &format); expect(Ok, status); + status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); + expect(Ok, status); + status = GdipCreateRegion(&region); + expect(Ok, status); + status = GdipCreateFontFamilyFromName(tahomaW, NULL, &family); expect(Ok, status); @@ -3731,19 +3775,22 @@ static void test_font_height_scaling(void) ptf.Y = 100.0; status = GdipTransformPoints(graphics, CoordinateSpaceWorld, CoordinateSpaceDevice, &ptf, 1); expect(Ok, status); - trace("100.0 pixels, %.1f dpi => %f points\n", dpi, ptf.Y); + /*trace("100.0 pixels, %.1f dpi => %f points\n", dpi, ptf.Y);*/ status = GdipSetPageUnit(graphics, font_unit); expect(Ok, status); status = GdipTransformPoints(graphics, CoordinateSpaceWorld, CoordinateSpaceDevice, &ptf, 1); expect(Ok, status); height = ptf.Y; - trace("height %f units\n", height); + /*trace("height %f units\n", height);*/ status = GdipCreateFont(family, height, FontStyleRegular, font_unit, &font); expect(Ok, status); /* UnitPixel = 2, UnitPoint = 3, UnitInch = 4, UnitDocument = 5, UnitMillimeter = 6 */ for (gfx_unit = 2; gfx_unit <= 6; gfx_unit++) { + static const WCHAR doubleW[2] = { 'W','W' }; + RectF bounds_1, bounds_2; + REAL margin; int match; status = GdipSetPageUnit(graphics, gfx_unit); @@ -3753,6 +3800,7 @@ static void test_font_height_scaling(void) set_rect_empty(&bounds); status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, NULL, NULL); expect(Ok, status); + /*trace("bounds: %f,%f,%f,%f\n", bounds.X, bounds.Y, bounds.Width, bounds.Height);*/ ptf.X = 0; ptf.Y = bounds.Height; @@ -3765,6 +3813,51 @@ static void test_font_height_scaling(void) ptf.Y = units_to_pixels(bounds.Height, gfx_unit, dpi); match = fabs(100.0 - ptf.Y) <= 1.1; ok(match || broken(!match) /* before win7 */, "Expected 100.0, got %f\n", ptf.Y); + + /* bounds.width of 1 glyph: [margin]+[width]+[margin] */ + set_rect_empty(&rect); + set_rect_empty(&bounds_1); + status = GdipMeasureString(graphics, doubleW, 1, font, &rect, format, &bounds_1, NULL, NULL); + expect(Ok, status); + /* bounds.width of 2 identical glyphs: [margin]+[width]+[width]+[margin] */ + set_rect_empty(&rect); + set_rect_empty(&bounds_2); + status = GdipMeasureString(graphics, doubleW, 2, font, &rect, format, &bounds_2, NULL, NULL); + expect(Ok, status); + + /* margin = [bounds.width of 1] - [bounds.width of 2] / 2*/ + margin = bounds_1.Width - bounds_2.Width / 2.0; + /*trace("margin %f\n", margin);*/ + + status = GdipGetFontHeight(font, graphics, &height); + expect(Ok, status); + + set_rect_empty(&rect); + rect.Width = 32000.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&rect); + status = GdipGetRegionBounds(region, graphics, &rect); + expect(Ok, status); + /*trace("region: %f,%f,%f,%f\n", rect.X, rect.Y, rect.Width, rect.Height);*/ + expectf(0.0, rect.Y); + /* before Win7 GdipMeasureCharacterRanges behaviour is completely broken */ + match = fabs(margin - rect.X) <= margin / 25.0; + ok(match || broken(!match) /* before win7 */, "Expected %f, got %f\n", margin, rect.X); + if (!match) + { + win_skip("GdipMeasureCharacterRanges ignores units before Win7\n"); + continue; + } + /* FIXME: remove once Wine is fixed */ + if (gfx_unit == UnitPixel) + expectf_(height, rect.Height, height / 15.0); + else +todo_wine + expectf_(height, rect.Height, height / 15.0); +todo_wine + expectf_(bounds.Width, rect.Width + margin * 2.0, bounds.Width / 25.0); } } @@ -3773,6 +3866,7 @@ static void test_font_height_scaling(void) DeleteDC(hdc); GdipDeleteFontFamily(family); + GdipDeleteRegion(region); GdipDeleteStringFormat(format); }

1 0

Dmitry Timoshkov : gdiplus: GdipMeasureCharacterRanges shouldn' t treat empty layout rectangle as infinite bounds.
by Alexandre Julliard 22 Aug '12

22 Aug '12

Module: wine Branch: master Commit: 1418cd796cf00636db3e75df25645e235a1a845d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1418cd796cf00636db3e75df2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 22 15:34:38 2012 +0900 gdiplus: GdipMeasureCharacterRanges shouldn't treat empty layout rectangle as infinite bounds. --- dlls/gdiplus/graphics.c | 9 ++++++--- dlls/gdiplus/tests/graphics.c | 3 --- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 28fc570..785c44e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4731,9 +4731,6 @@ GpStatus gdip_format_string(HDC hdc, nwidth = rect->Width; nheight = rect->Height; - if (rect->Width >= INT_MAX || rect->Width < 0.5) nwidth = INT_MAX; - if (rect->Height >= INT_MAX || rect->Height < 0.5) nheight = INT_MAX; - if (format) hkprefix = format->hkprefix; else @@ -5064,6 +5061,9 @@ GpStatus WINGDIPAPI GdipMeasureString(GpGraphics *graphics, scaled_rect.Width = rect->Width * args.rel_width; scaled_rect.Height = rect->Height * args.rel_height; + if (scaled_rect.Width >= INT_MAX || scaled_rect.Width < 0.5) scaled_rect.Width = (REAL)(1 << 23); + if (scaled_rect.Height >= INT_MAX || scaled_rect.Height < 0.5) scaled_rect.Height = (REAL)(1 << 23); + bounds->X = rect->X; bounds->Y = rect->Y; bounds->Width = 0.0; @@ -5214,6 +5214,9 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string scaled_rect.Width = rel_width * rect->Width; scaled_rect.Height = rel_height * rect->Height; + if (scaled_rect.Width >= INT_MAX || scaled_rect.Width < 0.5) scaled_rect.Width = (REAL)(1 << 23); + if (scaled_rect.Height >= INT_MAX || scaled_rect.Height < 0.5) scaled_rect.Height = (REAL)(1 << 23); + if (gdip_round(scaled_rect.Width) != 0 && gdip_round(scaled_rect.Height) != 0) { /* FIXME: If only the width or only the height is 0, we should probably still clip */ diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index c95bf11..b3509a2 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3140,11 +3140,8 @@ static void test_string_functions(void) expect(Ok, status); } -todo_wine ok(region_isempty[0], "region should be empty\n"); -todo_wine ok(region_isempty[1], "region should be empty\n"); -todo_wine ok(region_isempty[2], "region should be empty\n"); ok(region_isempty[3], "region should be empty\n");

1 0

Dmitry Timoshkov : gdiplus: GdipMeasureCharacterRanges should respect device units and transformations .
by Alexandre Julliard 22 Aug '12

22 Aug '12

Module: wine Branch: master Commit: c8055b5b7b749cc4d04345302add72ba0d857a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8055b5b7b749cc4d04345302… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 22 15:35:21 2012 +0900 gdiplus: GdipMeasureCharacterRanges should respect device units and transformations. --- dlls/gdiplus/graphics.c | 33 ++++++++++++++++++++++++++------- dlls/gdiplus/tests/graphics.c | 5 ----- 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 785c44e..9a9f092 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4874,6 +4874,7 @@ GpStatus gdip_format_string(HDC hdc, struct measure_ranges_args { GpRegion **regions; + REAL rel_width, rel_height; }; static GpStatus measure_ranges_callback(HDC hdc, @@ -4895,16 +4896,16 @@ static GpStatus measure_ranges_callback(HDC hdc, GpRectF range_rect; SIZE range_size; - range_rect.Y = bounds->Y; - range_rect.Height = bounds->Height; + range_rect.Y = bounds->Y / args->rel_height; + range_rect.Height = bounds->Height / args->rel_height; GetTextExtentExPointW(hdc, string + index, range_start - index, INT_MAX, NULL, NULL, &range_size); - range_rect.X = bounds->X + range_size.cx; + range_rect.X = (bounds->X + range_size.cx) / args->rel_width; GetTextExtentExPointW(hdc, string + index, range_end - index, INT_MAX, NULL, NULL, &range_size); - range_rect.Width = (bounds->X + range_size.cx) - range_rect.X; + range_rect.Width = (bounds->X + range_size.cx - range_rect.X) / args->rel_width; stat = GdipCombineRegionRect(args->regions[i], &range_rect, CombineModeUnion); if (stat != Ok) @@ -4926,6 +4927,8 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, HFONT oldfont; struct measure_ranges_args args; HDC hdc, temp_hdc=NULL; + GpPointF pt[3]; + RectF scaled_rect; TRACE("(%p %s %d %p %s %p %d %p)\n", graphics, debugstr_w(string), length, font, debugstr_rectf(layoutRect), stringFormat, regionCount, regions); @@ -4936,8 +4939,6 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, if (regionCount < stringFormat->range_count) return InvalidParameter; - get_log_fontW(font, graphics, &lfw); - if(!graphics->hdc) { hdc = temp_hdc = CreateCompatibleDC(0); @@ -4949,6 +4950,24 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, if (stringFormat->attr) TRACE("may be ignoring some format flags: attr %x\n", stringFormat->attr); + pt[0].X = 0.0; + pt[0].Y = 0.0; + pt[1].X = 1.0; + pt[1].Y = 0.0; + pt[2].X = 0.0; + pt[2].Y = 1.0; + GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); + args.rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ + (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); + args.rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ + (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); + + scaled_rect.X = layoutRect->X * args.rel_width; + scaled_rect.Y = layoutRect->Y * args.rel_height; + scaled_rect.Width = layoutRect->Width * args.rel_width; + scaled_rect.Height = layoutRect->Height * args.rel_height; + + get_log_fontW(font, graphics, &lfw); oldfont = SelectObject(hdc, CreateFontIndirectW(&lfw)); for (i=0; i<stringFormat->range_count; i++) @@ -4960,7 +4979,7 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, args.regions = regions; - stat = gdip_format_string(hdc, string, length, font, layoutRect, stringFormat, + stat = gdip_format_string(hdc, string, length, font, &scaled_rect, stringFormat, measure_ranges_callback, &args); DeleteObject(SelectObject(hdc, oldfont)); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index b3509a2..6765bce 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3847,11 +3847,6 @@ static void test_font_height_scaling(void) win_skip("GdipMeasureCharacterRanges ignores units before Win7\n"); continue; } - /* FIXME: remove once Wine is fixed */ - if (gfx_unit == UnitPixel) - expectf_(height, rect.Height, height / 15.0); - else -todo_wine expectf_(height, rect.Height, height / 15.0); todo_wine expectf_(bounds.Width, rect.Width + margin * 2.0, bounds.Width / 25.0);

1 0

Andrew Eikum : winealsa.drv: Special-case copying common sample sizes in a tight loop.
by Alexandre Julliard 22 Aug '12

22 Aug '12

Module: wine Branch: master Commit: 19e9de7ddec82035aa645cd8c55690b7b2ca36d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19e9de7ddec82035aa645cd8c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Aug 21 13:38:44 2012 -0500 winealsa.drv: Special-case copying common sample sizes in a tight loop. --- dlls/winealsa.drv/mmdevdrv.c | 57 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 51 insertions(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 3a6bf33..6b2bed5 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1828,22 +1828,67 @@ static BYTE *remap_channels(ACImpl *This, BYTE *buf, snd_pcm_uframes_t frames) if(!This->remapping_buf){ This->remapping_buf = HeapAlloc(GetProcessHeap(), 0, - (This->fmt->wBitsPerSample / 8) * This->alsa_channels * frames); + bytes_per_sample * This->alsa_channels * frames); This->remapping_buf_frames = frames; }else if(This->remapping_buf_frames < frames){ This->remapping_buf = HeapReAlloc(GetProcessHeap(), 0, This->remapping_buf, - (This->fmt->wBitsPerSample / 8) * This->alsa_channels * frames); + bytes_per_sample * This->alsa_channels * frames); This->remapping_buf_frames = frames; } snd_pcm_format_set_silence(This->alsa_format, This->remapping_buf, frames * This->alsa_channels); - for(i = 0; i < frames; ++i){ - for(c = 0; c < This->fmt->nChannels; ++c){ - memcpy(&This->remapping_buf[(i * This->alsa_channels + This->alsa_channel_map[c]) * bytes_per_sample], - &buf[(i * This->fmt->nChannels + c) * bytes_per_sample], bytes_per_sample); + switch(This->fmt->wBitsPerSample){ + case 8: { + UINT8 *tgt_buf, *src_buf; + tgt_buf = This->remapping_buf; + src_buf = buf; + for(i = 0; i < frames; ++i){ + for(c = 0; c < This->fmt->nChannels; ++c) + tgt_buf[This->alsa_channel_map[c]] = src_buf[c]; + tgt_buf += This->alsa_channels; + src_buf += This->fmt->nChannels; + } + break; + } + case 16: { + UINT16 *tgt_buf, *src_buf; + tgt_buf = (UINT16*)This->remapping_buf; + src_buf = (UINT16*)buf; + for(i = 0; i < frames; ++i){ + for(c = 0; c < This->fmt->nChannels; ++c) + tgt_buf[This->alsa_channel_map[c]] = src_buf[c]; + tgt_buf += This->alsa_channels; + src_buf += This->fmt->nChannels; + } } + break; + case 32: { + UINT32 *tgt_buf, *src_buf; + tgt_buf = (UINT32*)This->remapping_buf; + src_buf = (UINT32*)buf; + for(i = 0; i < frames; ++i){ + for(c = 0; c < This->fmt->nChannels; ++c) + tgt_buf[This->alsa_channel_map[c]] = src_buf[c]; + tgt_buf += This->alsa_channels; + src_buf += This->fmt->nChannels; + } + } + break; + default: { + BYTE *tgt_buf, *src_buf; + tgt_buf = This->remapping_buf; + src_buf = buf; + for(i = 0; i < frames; ++i){ + for(c = 0; c < This->fmt->nChannels; ++c) + memcpy(&tgt_buf[This->alsa_channel_map[c] * bytes_per_sample], + &src_buf[c * bytes_per_sample], bytes_per_sample); + tgt_buf += This->alsa_channels * bytes_per_sample; + src_buf += This->fmt->nChannels * bytes_per_sample; + } + } + break; } return This->remapping_buf;

1 0

Austin English : readme: Wine no longer supports Mac OS X 10.4.
by Alexandre Julliard 22 Aug '12

22 Aug '12

Module: wine Branch: master Commit: d71e94d109c81918ca914100829b1c4808f4676a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d71e94d109c81918ca9141008… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Aug 21 13:08:33 2012 -0700 readme: Wine no longer supports Mac OS X 10.4. --- README | 2 +- documentation/README.de | 2 +- documentation/README.es | 2 +- documentation/README.fi | 2 +- documentation/README.fr | 2 +- documentation/README.it | 2 +- documentation/README.ja | 2 +- documentation/README.ko | 2 +- documentation/README.no | 2 +- documentation/README.ru | 2 +- documentation/README.sv | 2 +- documentation/README.uk | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README b/README index 2b3e38f..783e798 100644 --- a/README +++ b/README @@ -32,7 +32,7 @@ To compile and run Wine, you must have one of the following: FreeBSD 7.0 or later Solaris x86 9 or later NetBSD-current - Mac OS X 10.4 or later + Mac OS X 10.5 or later As Wine requires kernel-level thread support to run, only the operating systems mentioned above are supported. Other operating systems which diff --git a/documentation/README.de b/documentation/README.de index 1c59315..8fae357 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -35,7 +35,7 @@ folgenden Betriebssysteme: FreeBSD 7.0 oder neuer Solaris x86 9 oder neuer NetBSD-current - Mac OS X 10.4 oder neuer + Mac OS X 10.5 oder neuer Da Wine Thread-Unterstützung auf Kernelebene benötigt, werden nur die oben aufgeführten Betriebssysteme unterstützt. diff --git a/documentation/README.es b/documentation/README.es index 3065eb7..9497855 100644 --- a/documentation/README.es +++ b/documentation/README.es @@ -33,7 +33,7 @@ Para compilar y ejecutar Wine, deberá tener uno de los siguientes: FreeBSD 7.0 o superior Solaris x86 9 o superior NetBSD-current - Mac OS X 10.4 o superior + Mac OS X 10.5 o superior Ya que Wine requiere soporte de hilos de ejecución a nivel de núcleo para ejecutarse, sólo se soportan los sistemas operativos ya mencionados. diff --git a/documentation/README.fi b/documentation/README.fi index 55188f9..780cf43 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -31,7 +31,7 @@ Winen kääntämiseen tarvitaan jokin seuraavista: FreeBSD 7.0 tai uudempi Solaris x86 9 tai uudempi NetBSD-current - Mac OS X 10.4 tai uudempi + Mac OS X 10.5 tai uudempi Wine vaatii kerneliltä tuen säikeille. Tämän takia toistaiseksi vain yllä mainittuja käyttöjärjestelmiä tuetaan; tulevaisuudessa saatetaan lisätä tuki diff --git a/documentation/README.fr b/documentation/README.fr index 68581cf..bc2bee8 100644 --- a/documentation/README.fr +++ b/documentation/README.fr @@ -33,7 +33,7 @@ d'exploitation suivants : FreeBSD 7.0 ou ultérieur Solaris x86 9 ou ultérieur NetBSD-current - Mac OS X 10.4 ou ultérieur + Mac OS X 10.5 ou ultérieur Étant donné que Wine nécessite une implémentation des « threads » (processus légers) au niveau du noyau, seuls les systèmes d'exploitation mentionnés diff --git a/documentation/README.it b/documentation/README.it index d3fe546..ad6b692 100644 --- a/documentation/README.it +++ b/documentation/README.it @@ -34,7 +34,7 @@ Per compilare ed eseguire Wine, è necessario avere uno dei seguenti sistemi: FreeBSD 7.0 o successiva Solaris x86 9 o successiva NetBSD-current - Mac OS X 10.4 o successiva + Mac OS X 10.5 o successiva Poiché Wine richiede il supporto dei thread a livello kernel per funzionare, solo i sistemi operativi sopra mentionati sono supportati. Altri sistemi diff --git a/documentation/README.ja b/documentation/README.ja index 04d5f91..ec0f893 100644 --- a/documentation/README.ja +++ b/documentation/README.ja @@ -33,7 +33,7 @@ Wineをコンパイルし実行するには、以下のうち一つを持って FreeBSD 7.0以降 Solaris x86 9以降 NetBSD-current - Mac OS X 10.4以降 + Mac OS X 10.5以降動作するためにWineにはカーネルレベルのスレッドのサポートが必要なので、以上で触れたオペレーティングシステムだけがサポートされます。 diff --git a/documentation/README.ko b/documentation/README.ko index 8452cab..899a024 100644 --- a/documentation/README.ko +++ b/documentation/README.ko @@ -31,7 +31,7 @@ Wine FreeBSD 5.3 �Ǵ� �� ̻� Solaris x86 2.5 �Ǵ� �� ̻� NetBSD-current - Mac OS X 10.4 �Ǵ� �� ̻� + Mac OS X 10.5 �Ǵ� �� ̻� Wine�� Ϸ�� Ŀ�� ʿ��ϱ� ��  ü�� մϴ�. diff --git a/documentation/README.no b/documentation/README.no index 46e4506..b6fdfe7 100644 --- a/documentation/README.no +++ b/documentation/README.no @@ -30,7 +30,7 @@ Følgende kreves for å bygge og kjøre Wine FreeBSD 6.3 eller nyere Solaris x86 9 eller nyere NetBSD-current - Mac OS X 10.4 eller nyere + Mac OS X 10.5 eller nyere Wine krever støtte for tråder på kjernenivå, og derfor er det bare operativsystemene ovenfor som støttes. Andre operativsystemer som diff --git a/documentation/README.ru b/documentation/README.ru index 3bc8572..742932d 100644 --- a/documentation/README.ru +++ b/documentation/README.ru @@ -32,7 +32,7 @@ Wine Installer для компоновки и установки Wine. В кат FreeBSD 7.0 или более новой Solaris x86 9 или более новой NetBSD-текущей версии - Mac OS X 10.4 или более новой + Mac OS X 10.5 или более новой Так как Wine требует для запуска поддержку потоков на уровне ядра, поддерживаются только операционные системы, перечисленные выше. Другие операционные системы, diff --git a/documentation/README.sv b/documentation/README.sv index fe62928..d5fe643 100644 --- a/documentation/README.sv +++ b/documentation/README.sv @@ -30,7 +30,7 @@ F FreeBSD 7.0 eller senare Solaris x86 9 eller senare NetBSD-current - Mac OS X 10.4 eller senare + Mac OS X 10.5 eller senare Wine kr�ver st�d f�r tr�dar p� kernelniv�, och d�rf�r �r det bara operativsystemen ovan som st�ds. Andra operativsystem som diff --git a/documentation/README.uk b/documentation/README.uk index 95fd5ff..04a525b 100644 --- a/documentation/README.uk +++ b/documentation/README.uk @@ -32,7 +32,7 @@ Wine Installer для компонування і встановлення Wine. FreeBSD 6.3 чи новіший Solaris x86 9 чи новіший NetBSD-поточна версія - Mac OS X 10.4 чи новіший + Mac OS X 10.5 чи новіший Оскільки Wine вимагає для запуску підтримку потоків на рівні ядра, підтримуються тільки операційні системи, перераховані вище. Інші операційні системи,

1 0

Francois Gouget : xcopy: Fix spelling and slightly reword the usage message .
by Alexandre Julliard 22 Aug '12

22 Aug '12

1 0