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

Nikolay Sivov : msxml3: Use characters callback helper in one more place.
by Alexandre Julliard 14 Mar '13

14 Mar '13

Module: wine Branch: master Commit: 81ffe0432e474d83a8a4d88421c18e47c09e3708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81ffe0432e474d83a8a4d8842… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 14 08:27:57 2013 +0400 msxml3: Use characters callback helper in one more place. --- dlls/msxml3/saxreader.c | 36 ++++++++++++++++-------------------- 1 files changed, 16 insertions(+), 20 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 5475e1a..5a0b1c2 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -349,6 +349,21 @@ static inline int saxreader_has_handler(const saxlocator *locator, enum saxhandl return (locator->vbInterface && iface->vbhandler) || (!locator->vbInterface && iface->handler); } +static HRESULT saxreader_saxcharacters(saxlocator *locator, BSTR chars) +{ + struct saxcontenthandler_iface *content = saxreader_get_contenthandler(locator->saxreader); + HRESULT hr; + + if (!saxreader_has_handler(locator, SAXContentHandler)) return S_OK; + + if (locator->vbInterface) + hr = IVBSAXContentHandler_characters(content->vbhandler, &chars); + else + hr = ISAXContentHandler_characters(content->handler, chars, SysStringLen(chars)); + + return hr; +} + /* property names */ static const WCHAR PropertyCharsetW[] = { 'c','h','a','r','s','e','t',0 @@ -1565,7 +1580,6 @@ static void libxmlCharacters( int len) { saxlocator *This = ctx; - struct saxcontenthandler_iface *handler = saxreader_get_contenthandler(This->saxreader); BSTR Chars; HRESULT hr; xmlChar *cur, *end; @@ -1624,10 +1638,7 @@ static void libxmlCharacters( } Chars = pooled_bstr_from_xmlCharN(&This->saxreader->pool, cur, end-cur); - if(This->vbInterface) - hr = IVBSAXContentHandler_characters(handler->vbhandler, &Chars); - else - hr = ISAXContentHandler_characters(handler->handler, Chars, SysStringLen(Chars)); + hr = saxreader_saxcharacters(This, Chars); if (sax_callback_failed(This, hr)) { @@ -1799,21 +1810,6 @@ static BSTR saxreader_get_cdata_chunk(const xmlChar *str, int len) return ret; } -static HRESULT saxreader_saxcharacters(saxlocator *locator, BSTR chars) -{ - struct saxcontenthandler_iface *content = saxreader_get_contenthandler(locator->saxreader); - HRESULT hr; - - if (!saxreader_has_handler(locator, SAXContentHandler)) return S_OK; - - if (locator->vbInterface) - hr = IVBSAXContentHandler_characters(content->vbhandler, &chars); - else - hr = ISAXContentHandler_characters(content->handler, chars, SysStringLen(chars)); - - return hr; -} - static void libxml_cdatablock(void *ctx, const xmlChar *value, int len) { const xmlChar *start, *end;

1 0

Dmitry Timoshkov : gdiplus: Add more GdipMeasureString/ GdipMeasureCharacterRanges clipping and alignment tests.
by Alexandre Julliard 14 Mar '13

14 Mar '13

Module: wine Branch: master Commit: 4b19b618f5e202ed8a0ea121869a3bb3a2d2f20f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b19b618f5e202ed8a0ea1218… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 14 16:35:11 2013 +0900 gdiplus: Add more GdipMeasureString/GdipMeasureCharacterRanges clipping and alignment tests. --- dlls/gdiplus/tests/graphics.c | 201 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 193 insertions(+), 8 deletions(-) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index e41751a..fe525b6 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3909,7 +3909,7 @@ static void test_measure_string(void) static const WCHAR string[] = { 'A','0','1',0 }; HDC hdc; GpStringFormat *format; - CharacterRange range = { 0, 3 }; + CharacterRange range; GpRegion *region; GpGraphics *graphics; GpFontFamily *family; @@ -3923,8 +3923,7 @@ static void test_measure_string(void) status = GdipCreateStringFormat(StringFormatFlagsNoWrap, LANG_NEUTRAL, &format); expect(Ok, status); expect(Ok, status); - status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); - expect(Ok, status); + status = GdipCreateRegion(&region); expect(Ok, status); @@ -3964,8 +3963,123 @@ static void test_measure_string(void) todo_wine expectf(height / 2.0, bounds.Height); + range.First = 0; + range.Length = lstrlenW(string); + status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); + expect(Ok, status); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 32000.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf_(5.0 + margin_x, bounds.X, 1.0); + expectf(5.0, bounds.Y); + expectf_(width - margin_x*2.0, bounds.Width, 1.0); +todo_wine + expectf_(height - margin_y, bounds.Height, 1.0); + + width_rgn = bounds.Width; + height_rgn = bounds.Height; + + range.First = 0; + range.Length = 1; + status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); + 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(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf_(margin_x, bounds.X, 1.0); + expectf(0.0, bounds.Y); + ok(bounds.Width < width_rgn / 2.0, "width of 1 glyph is wrong\n"); + expectf(height_rgn, bounds.Height); + width_1 = bounds.Width; + + range.First = 0; + range.Length = lstrlenW(string); + status = GdipSetStringFormatMeasurableCharacterRanges(format, 1, &range); + expect(Ok, status); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); + expectf(0.0, bounds.X); + expectf(0.0, bounds.Y); + expectf(0.0, bounds.Width); + expectf(0.0, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width_rgn / 2.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); +todo_wine + expectf_(5.0 + margin_x, bounds.X, 1.0); +todo_wine + expectf(5.0, bounds.Y); +todo_wine + expectf_(width_1, bounds.Width, 1.0); +todo_wine + expectf_(height - margin_y, bounds.Height, 1.0); + status = GdipSetStringFormatFlags(format, StringFormatFlagsNoWrap | StringFormatFlagsNoClip); + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); +todo_wine + expectf_(5.0 + margin_x, bounds.X, 1.0); +todo_wine + expectf(5.0, bounds.Y); +todo_wine + expectf(width_rgn, bounds.Width); +todo_wine + expectf(height_rgn, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = width_rgn / 2.0; + rect.Height = 32000.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); +todo_wine + expectf_(5.0 + margin_x, bounds.X, 1.0); +todo_wine + expectf(5.0, bounds.Y); +todo_wine + expectf_(width_1, bounds.Width, 1.0); +todo_wine + expectf(height_rgn, bounds.Height); + set_rect_empty(&rect); rect.Height = height / 2.0; set_rect_empty(&bounds); @@ -3975,7 +4089,7 @@ todo_wine expect(1, lines); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); - expectf(width, bounds.Width); + expectf_(width, bounds.Width, 0.01); todo_wine expectf(height, bounds.Height); @@ -4042,6 +4156,7 @@ todo_wine expectf_(width_1, bounds.Width, 0.01); expectf(height, bounds.Height); + /* Default (Near) alignment */ rect.X = 5.0; rect.Y = 5.0; rect.Width = width * 2.0; @@ -4053,7 +4168,7 @@ todo_wine expect(1, lines); expectf(5.0, bounds.X); expectf(5.0, bounds.Y); - expectf(width, bounds.Width); + expectf_(width, bounds.Width, 0.01); expectf(height, bounds.Height); rect.X = 5.0; @@ -4074,6 +4189,7 @@ todo_wine width_rgn = bounds.Width; height_rgn = bounds.Height; + /* Center alignment */ GdipSetStringFormatAlign(format, StringAlignmentCenter); GdipSetStringFormatLineAlign(format, StringAlignmentCenter); @@ -4090,7 +4206,23 @@ todo_wine expectf_(5.0 + width/2.0, bounds.X, 0.01); todo_wine expectf(5.0 + height/2.0, bounds.Y); - expectf(width, bounds.Width); + expectf_(width, bounds.Width, 0.01); + expectf(height, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); +todo_wine + expectf_(5.0 - width/2.0, bounds.X, 0.01); +todo_wine + expectf(5.0 - height/2.0, bounds.Y); + expectf_(width, bounds.Width, 0.01); expectf(height, bounds.Height); rect.X = 5.0; @@ -4108,6 +4240,25 @@ todo_wine expectf_(width_rgn, bounds.Width, 1.0); expectf_(height_rgn, bounds.Height, 1.0); + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); +todo_wine + expectf_(5.0 - width_rgn/2.0, bounds.X, 1.0); +todo_wine + expectf_(5.0 - height_rgn/2.0, bounds.Y, 1.0); +todo_wine + expectf_(width_rgn, bounds.Width, 1.0); +todo_wine + expectf_(height_rgn, bounds.Height, 1.0); + + /* Far alignment */ GdipSetStringFormatAlign(format, StringAlignmentFar); GdipSetStringFormatLineAlign(format, StringAlignmentFar); @@ -4121,10 +4272,26 @@ todo_wine expect(3, glyphs); expect(1, lines); todo_wine - expectf(5.0 + width, bounds.X); + expectf_(5.0 + width, bounds.X, 0.01); todo_wine expectf(5.0 + height, bounds.Y); - expectf(width, bounds.Width); + expectf_(width, bounds.Width, 0.01); + expectf(height, bounds.Height); + + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + set_rect_empty(&bounds); + status = GdipMeasureString(graphics, string, -1, font, &rect, format, &bounds, &glyphs, &lines); + expect(Ok, status); + expect(3, glyphs); + expect(1, lines); +todo_wine + expectf_(5.0 - width, bounds.X, 0.01); +todo_wine + expectf(5.0 - height, bounds.Y); + expectf_(width, bounds.Width, 0.01); expectf(height, bounds.Height); rect.X = 5.0; @@ -4143,6 +4310,24 @@ todo_wine expectf_(width_rgn, bounds.Width, 1.0); expectf_(height_rgn, bounds.Height, 1.0); + rect.X = 5.0; + rect.Y = 5.0; + rect.Width = 0.0; + rect.Height = 0.0; + status = GdipMeasureCharacterRanges(graphics, string, -1, font, &rect, format, 1, &region); + expect(Ok, status); + set_rect_empty(&bounds); + status = GdipGetRegionBounds(region, graphics, &bounds); + expect(Ok, status); +todo_wine + expectf_(5.0 - width_rgn, bounds.X, 2.0); +todo_wine + expectf_(5.0 - height_rgn, bounds.Y, 1.0); +todo_wine + expectf_(width_rgn, bounds.Width, 1.0); +todo_wine + expectf_(height_rgn, bounds.Height, 1.0); + status = GdipDeleteFont(font); expect(Ok, status);

1 0

André Hentschel : msvcrt: Add setjmp for ARM in spec file.
by Alexandre Julliard 14 Mar '13

14 Mar '13

Module: wine Branch: master Commit: b29e56f205727d0f9f79636e1e50efeb47527376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b29e56f205727d0f9f79636e1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Mar 13 20:06:44 2013 +0100 msvcrt: Add setjmp for ARM in spec file. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 019a41a..b558b06 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1769,7 +1769,7 @@ @ varargs scanf(str) msvcrt.scanf @ varargs scanf_s(str) msvcrt.scanf_s @ cdecl setbuf(ptr ptr) msvcrt.setbuf -@ cdecl -arch=x86_64 -norelay -private setjmp(ptr) msvcrt.setjmp +@ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) msvcrt.setjmp @ cdecl setlocale(long str) msvcrt.setlocale @ cdecl setvbuf(ptr str long long) msvcrt.setvbuf @ cdecl signal(long long) msvcrt.signal diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 720c056..209cc80 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1422,7 +1422,7 @@ @ varargs scanf(str) msvcrt.scanf @ varargs scanf_s(str) msvcrt.scanf_s @ cdecl setbuf(ptr ptr) msvcrt.setbuf -@ cdecl -arch=x86_64 -norelay -private setjmp(ptr) msvcrt.setjmp +@ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) msvcrt.setjmp @ cdecl setlocale(long str) msvcrt.setlocale @ cdecl setvbuf(ptr str long long) msvcrt.setvbuf @ cdecl signal(long long) msvcrt.signal diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 2b01fc3..8e5cc9b 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1368,7 +1368,7 @@ @ varargs scanf(str) MSVCRT_scanf @ varargs scanf_s(str) MSVCRT_scanf_s @ cdecl setbuf(ptr ptr) MSVCRT_setbuf -@ cdecl -arch=x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp +@ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp @ cdecl setlocale(long str) MSVCRT_setlocale @ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf @ cdecl signal(long long) MSVCRT_signal

1 0

Alexandre Julliard : msvcrt: Export the ARM version of some mangled names.
by Alexandre Julliard 14 Mar '13

14 Mar '13

Module: wine Branch: master Commit: 5c4bce668ca0290db6ed89ca8d7eb854f4377214 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4bce668ca0290db6ed89ca8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 12:41:47 2013 +0100 msvcrt: Export the ARM version of some mangled names. --- dlls/msvcr100/msvcr100.spec | 3 +- dlls/msvcr110/msvcr110.spec | 54 +++++++++++++++--------------- dlls/msvcrt/msvcrt.spec | 78 ++++++++++++++++++++++++++++-------------- 3 files changed, 81 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c4bce668ca0290db6ed8…

1 0

Alexandre Julliard : msvcrt: Export the float math functions on ARM.
by Alexandre Julliard 14 Mar '13

14 Mar '13

Module: wine Branch: master Commit: 599d080220bd40a8a076a2a08cb08e64b87f54c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=599d080220bd40a8a076a2a08… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 13:06:25 2013 +0100 msvcrt: Export the float math functions on ARM. --- dlls/msvcrt/math.c | 2 +- dlls/msvcrt/msvcrt.spec | 54 +++++++++++++++++++++++----------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 4570da0..a55ecb6 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -68,7 +68,7 @@ int CDECL MSVCRT__set_SSE2_enable(int flag) return sse2_enabled; } -#ifdef __x86_64__ +#if defined(__x86_64__) || defined(__arm__) /********************************************************************* * _chgsignf (MSVCRT.@) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0bf5ab2..d5cc428 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -351,7 +351,7 @@ @ cdecl _chdir(str) MSVCRT__chdir @ cdecl _chdrive(long) MSVCRT__chdrive @ cdecl _chgsign(double) MSVCRT__chgsign -@ cdecl -arch=x86_64 _chgsignf(float) MSVCRT__chgsignf +@ cdecl -arch=arm,x86_64 _chgsignf(float) MSVCRT__chgsignf @ cdecl -i386 -norelay _chkesp() @ cdecl _chmod(str long) MSVCRT__chmod @ cdecl _chsize(long long) MSVCRT__chsize @@ -366,7 +366,7 @@ @ cdecl _controlfp(long long) @ cdecl _controlfp_s(ptr long long) @ cdecl _copysign(double double) MSVCRT__copysign -@ cdecl -arch=x86_64 _copysignf(float float) MSVCRT__copysignf +@ cdecl -arch=arm,x86_64 _copysignf(float float) MSVCRT__copysignf @ varargs _cprintf(str) # stub _cprintf_l(str ptr) # stub _cprintf_p(str) @@ -449,7 +449,7 @@ @ cdecl _findnext64i32(long ptr) MSVCRT__findnext64i32 @ cdecl _findnexti64(long ptr) MSVCRT__findnexti64 @ cdecl _finite(double) MSVCRT__finite -@ cdecl -arch=x86_64 _finitef(float) MSVCRT__finitef +@ cdecl -arch=arm,x86_64 _finitef(float) MSVCRT__finitef @ cdecl _flsbuf(long ptr) MSVCRT__flsbuf @ cdecl _flushall() MSVCRT__flushall @ extern _fmode MSVCRT__fmode @@ -625,7 +625,7 @@ @ cdecl _ismbstrail(ptr ptr) # stub _ismbstrail_l(long ptr) @ cdecl _isnan(double) MSVCRT__isnan -@ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf +@ cdecl -arch=arm,x86_64 _isnanf(float) MSVCRT__isnanf @ cdecl _isprint_l(long ptr) MSVCRT__isprint_l @ cdecl _isspace_l(long ptr) MSVCRT__isspace_l @ cdecl _isupper_l(long ptr) MSVCRT__isupper_l @@ -664,7 +664,7 @@ @ cdecl _lock_file(ptr) MSVCRT__lock_file @ cdecl _locking(long long long) MSVCRT__locking @ cdecl _logb(double) MSVCRT__logb -@ cdecl -arch=x86_64 _logbf(float) MSVCRT__logbf +@ cdecl -arch=arm,x86_64 _logbf(float) MSVCRT__logbf @ cdecl -i386 _longjmpex(ptr long) MSVCRT_longjmp @ cdecl _lrotl(long long) MSVCRT__lrotl @ cdecl _lrotr(long long) MSVCRT__lrotr @@ -834,7 +834,7 @@ # stub -arch=win32 _msize_debug(ptr long) # stub -arch=win64 _msize_dbg(ptr long) @ cdecl _nextafter(double double) MSVCRT__nextafter -@ cdecl -arch=x86_64 _nextafterf(float float) MSVCRT__nextafterf +@ cdecl -arch=arm,x86_64 _nextafterf(float float) MSVCRT__nextafterf @ cdecl _onexit(ptr) MSVCRT__onexit @ varargs _open(str long) MSVCRT__open @ cdecl _open_osfhandle(long long) MSVCRT__open_osfhandle @@ -874,7 +874,7 @@ @ cdecl -arch=i386 _safe_fprem() @ cdecl -arch=i386 _safe_fprem1() @ cdecl _scalb(double long) MSVCRT__scalb -@ cdecl -arch=x86_64 _scalbf(float long) MSVCRT__scalbf +@ cdecl -arch=arm,x86_64 _scalbf(float long) MSVCRT__scalbf @ varargs _scanf_l(str ptr) MSVCRT__scanf_l @ varargs _scanf_s_l(str ptr) MSVCRT__scanf_s_l @ varargs _scprintf(str) MSVCRT__scprintf @@ -1238,15 +1238,15 @@ @ cdecl abort() MSVCRT_abort @ cdecl abs(long) MSVCRT_abs @ cdecl acos(double) MSVCRT_acos -@ cdecl -arch=x86_64 acosf(float) MSVCRT_acosf +@ cdecl -arch=arm,x86_64 acosf(float) MSVCRT_acosf @ cdecl asctime(ptr) MSVCRT_asctime @ cdecl asctime_s(ptr long ptr) MSVCRT_asctime_s @ cdecl asin(double) MSVCRT_asin @ cdecl atan(double) MSVCRT_atan @ cdecl atan2(double double) MSVCRT_atan2 -@ cdecl -arch=x86_64 asinf(float) MSVCRT_asinf -@ cdecl -arch=x86_64 atanf(float) MSVCRT_atanf -@ cdecl -arch=x86_64 atan2f(float float) MSVCRT_atan2f +@ cdecl -arch=arm,x86_64 asinf(float) MSVCRT_asinf +@ cdecl -arch=arm,x86_64 atanf(float) MSVCRT_atanf +@ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f @ cdecl atexit(ptr) MSVCRT_atexit @ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) ntdll.atoi @@ -1256,20 +1256,20 @@ @ cdecl btowc(long) MSVCRT_btowc @ cdecl calloc(long long) MSVCRT_calloc @ cdecl ceil(double) MSVCRT_ceil -@ cdecl -arch=x86_64 ceilf(float) MSVCRT_ceilf +@ cdecl -arch=arm,x86_64 ceilf(float) MSVCRT_ceilf @ cdecl clearerr(ptr) MSVCRT_clearerr # stub clearerr_s(ptr) @ cdecl clock() MSVCRT_clock @ cdecl cos(double) MSVCRT_cos @ cdecl cosh(double) MSVCRT_cosh -@ cdecl -arch=x86_64 cosf(float) MSVCRT_cosf -@ cdecl -arch=x86_64 coshf(float) MSVCRT_coshf +@ cdecl -arch=arm,x86_64 cosf(float) MSVCRT_cosf +@ cdecl -arch=arm,x86_64 coshf(float) MSVCRT_coshf @ cdecl ctime(ptr) MSVCRT_ctime @ cdecl difftime(long long) MSVCRT_difftime @ cdecl -ret64 div(long long) MSVCRT_div @ cdecl exit(long) MSVCRT_exit @ cdecl exp(double) MSVCRT_exp -@ cdecl -arch=x86_64 expf(float) MSVCRT_expf +@ cdecl -arch=arm,x86_64 expf(float) MSVCRT_expf @ cdecl fabs(double) MSVCRT_fabs @ cdecl fclose(ptr) MSVCRT_fclose @ cdecl feof(ptr) MSVCRT_feof @@ -1281,9 +1281,9 @@ @ cdecl fgetwc(ptr) MSVCRT_fgetwc @ cdecl fgetws(ptr long ptr) MSVCRT_fgetws @ cdecl floor(double) MSVCRT_floor -@ cdecl -arch=x86_64 floorf(float) MSVCRT_floorf +@ cdecl -arch=arm,x86_64 floorf(float) MSVCRT_floorf @ cdecl fmod(double double) MSVCRT_fmod -@ cdecl -arch=x86_64 fmodf(float float) MSVCRT_fmodf +@ cdecl -arch=arm,x86_64 fmodf(float float) MSVCRT_fmodf @ cdecl fopen(str str) MSVCRT_fopen @ cdecl fopen_s(ptr str str) MSVCRT_fopen_s @ varargs fprintf(ptr str) MSVCRT_fprintf @@ -1297,7 +1297,7 @@ @ cdecl freopen(str str ptr) MSVCRT_freopen @ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s @ cdecl frexp(double ptr) MSVCRT_frexp -@ cdecl -arch=x86_64 frexpf(float ptr) MSVCRT_frexpf +@ cdecl -arch=arm,x86_64 frexpf(float ptr) MSVCRT_frexpf @ varargs fscanf(ptr str) MSVCRT_fscanf @ varargs fscanf_s(ptr str) MSVCRT_fscanf_s @ cdecl fseek(ptr long long) MSVCRT_fseek @@ -1349,8 +1349,8 @@ @ cdecl localtime(ptr) MSVCRT_localtime @ cdecl log(double) MSVCRT_log @ cdecl log10(double) MSVCRT_log10 -@ cdecl -arch=x86_64 logf(float) MSVCRT_logf -@ cdecl -arch=x86_64 log10f(float) MSVCRT_log10f +@ cdecl -arch=arm,x86_64 logf(float) MSVCRT_logf +@ cdecl -arch=arm,x86_64 log10f(float) MSVCRT_log10f @ cdecl -arch=i386,x86_64,arm longjmp(ptr long) MSVCRT_longjmp @ cdecl malloc(long) MSVCRT_malloc @ cdecl mblen(ptr long) MSVCRT_mblen @@ -1371,10 +1371,10 @@ @ cdecl memset(ptr long long) ntdll.memset @ cdecl mktime(ptr) MSVCRT_mktime @ cdecl modf(double ptr) MSVCRT_modf -@ cdecl -arch=x86_64 modff(float ptr) MSVCRT_modff +@ cdecl -arch=arm,x86_64 modff(float ptr) MSVCRT_modff @ cdecl perror(str) MSVCRT_perror @ cdecl pow(double double) MSVCRT_pow -@ cdecl -arch=x86_64 powf(float float) MSVCRT_powf +@ cdecl -arch=arm,x86_64 powf(float float) MSVCRT_powf @ varargs printf(str) MSVCRT_printf @ varargs printf_s(str) MSVCRT_printf_s @ cdecl putc(long ptr) MSVCRT_putc @@ -1400,12 +1400,12 @@ @ cdecl signal(long long) MSVCRT_signal @ cdecl sin(double) MSVCRT_sin @ cdecl sinh(double) MSVCRT_sinh -@ cdecl -arch=x86_64 sinf(float) MSVCRT_sinf -@ cdecl -arch=x86_64 sinhf(float) MSVCRT_sinhf +@ cdecl -arch=arm,x86_64 sinf(float) MSVCRT_sinf +@ cdecl -arch=arm,x86_64 sinhf(float) MSVCRT_sinhf @ varargs sprintf(ptr str) MSVCRT_sprintf @ varargs sprintf_s(ptr long str) MSVCRT_sprintf_s @ cdecl sqrt(double) MSVCRT_sqrt -@ cdecl -arch=x86_64 sqrtf(float) MSVCRT_sqrtf +@ cdecl -arch=arm,x86_64 sqrtf(float) MSVCRT_sqrtf @ cdecl srand(long) MSVCRT_srand @ varargs sscanf(str str) MSVCRT_sscanf @ varargs sscanf_s(str str) MSVCRT_sscanf_s @@ -1444,8 +1444,8 @@ @ cdecl system(str) MSVCRT_system @ cdecl tan(double) MSVCRT_tan @ cdecl tanh(double) MSVCRT_tanh -@ cdecl -arch=x86_64 tanf(float) MSVCRT_tanf -@ cdecl -arch=x86_64 tanhf(float) MSVCRT_tanhf +@ cdecl -arch=arm,x86_64 tanf(float) MSVCRT_tanf +@ cdecl -arch=arm,x86_64 tanhf(float) MSVCRT_tanhf @ cdecl time(ptr) MSVCRT_time @ cdecl tmpfile() MSVCRT_tmpfile @ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s

1 0

Alexandre Julliard : msvcrt: Use -arch=i386 everywhere for consistency.
by Alexandre Julliard 14 Mar '13

14 Mar '13

Module: wine Branch: master Commit: 866034c1ef16b8b2eb52c2d03d4a088bbc07b93b URL: http://source.winehq.org/git/wine.git/?a=commit;h=866034c1ef16b8b2eb52c2d03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 14 13:17:52 2013 +0100 msvcrt: Use -arch=i386 everywhere for consistency. --- dlls/msvcrt/msvcrt.spec | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d5cc428..b6ae261 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -164,7 +164,7 @@ # stub _CrtSetReportHook2 # stub _CrtSetReportMode @ stdcall _CxxThrowException(long long) -@ cdecl -i386 -norelay _EH_prolog() +@ cdecl -arch=i386 -norelay _EH_prolog() @ cdecl _Getdays() @ cdecl _Getmonths() @ cdecl _Gettnames() @@ -181,7 +181,7 @@ @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler(ptr ptr ptr ptr) @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler -@ stdcall -i386 __CxxLongjmpUnwind(ptr) +@ stdcall -arch=i386 __CxxLongjmpUnwind(ptr) @ cdecl -arch=i386,x86_64,arm __CxxQueryExceptionSize() # stub __CxxRegisterExceptionObject # stub __CxxUnregisterExceptionObject @@ -352,7 +352,7 @@ @ cdecl _chdrive(long) MSVCRT__chdrive @ cdecl _chgsign(double) MSVCRT__chgsign @ cdecl -arch=arm,x86_64 _chgsignf(float) MSVCRT__chgsignf -@ cdecl -i386 -norelay _chkesp() +@ cdecl -arch=i386 -norelay _chkesp() @ cdecl _chmod(str long) MSVCRT__chmod @ cdecl _chsize(long long) MSVCRT__chsize # stub _chsize_s(long int64) @@ -412,9 +412,9 @@ @ extern _environ MSVCRT__environ @ cdecl _eof(long) MSVCRT__eof @ cdecl _errno() MSVCRT__errno -@ cdecl -i386 _except_handler2(ptr ptr ptr ptr) -@ cdecl -i386 _except_handler3(ptr ptr ptr ptr) -@ cdecl -i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) +@ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) +@ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) +@ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) @ varargs _execl(str str) @ varargs _execle(str str) @ varargs _execlp(str str) @@ -532,7 +532,7 @@ # stub _getwch() # stub _getwche() @ cdecl _getws(ptr) MSVCRT__getws -@ cdecl -i386 _global_unwind2(ptr) +@ cdecl -arch=i386 _global_unwind2(ptr) @ cdecl _gmtime32(ptr) MSVCRT__gmtime32 @ cdecl _gmtime32_s(ptr ptr) MSVCRT__gmtime32_s @ cdecl _gmtime64(ptr) MSVCRT__gmtime64 @@ -654,8 +654,8 @@ # stub _lfind_s(ptr ptr ptr long ptr ptr) @ cdecl _loaddll(str) @ cdecl -arch=x86_64 _local_unwind(ptr ptr) -@ cdecl -i386 _local_unwind2(ptr long) -@ cdecl -i386 _local_unwind4(ptr ptr long) +@ cdecl -arch=i386 _local_unwind2(ptr long) +@ cdecl -arch=i386 _local_unwind4(ptr ptr long) @ cdecl _localtime32(ptr) MSVCRT__localtime32 @ cdecl _localtime32_s(ptr ptr) @ cdecl _localtime64(ptr) MSVCRT__localtime64 @@ -665,7 +665,7 @@ @ cdecl _locking(long long long) MSVCRT__locking @ cdecl _logb(double) MSVCRT__logb @ cdecl -arch=arm,x86_64 _logbf(float) MSVCRT__logbf -@ cdecl -i386 _longjmpex(ptr long) MSVCRT_longjmp +@ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp @ cdecl _lrotl(long long) MSVCRT__lrotl @ cdecl _lrotr(long long) MSVCRT__lrotr @ cdecl _lsearch(ptr ptr ptr long ptr) @@ -885,8 +885,8 @@ # stub _scwprintf_p_l(wstr ptr) @ cdecl _searchenv(str str ptr) MSVCRT__searchenv @ cdecl _searchenv_s(str str ptr long) -@ stdcall -i386 _seh_longjmp_unwind4(ptr) -@ stdcall -i386 _seh_longjmp_unwind(ptr) +@ stdcall -arch=i386 _seh_longjmp_unwind4(ptr) +@ stdcall -arch=i386 _seh_longjmp_unwind(ptr) @ cdecl _set_SSE2_enable(long) MSVCRT__set_SSE2_enable @ cdecl _set_controlfp(long long) @ cdecl _set_doserrno(long)

1 0

Francois Gouget : testbot: Integrate the WineTestBot with the patches website.
by Alexandre Julliard 14 Mar '13

14 Mar '13

Module: tools Branch: master Commit: 62142e91529892c3d7a70b842c31158d2ca00203 URL: http://source.winehq.org/git/tools.git/?a=commit;h=62142e91529892c3d7a70b84… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 13 16:03:36 2013 +0100 testbot: Integrate the WineTestBot with the patches website. This lets the WineTestBot create jobs for each patch sent to wine-patches. However for now the part that sends the results back to the patches website is disabled to preserve compatibility with the old WineTestBot (see WineSendLog.pl). --- testbot/bin/Engine.pl | 65 -------------- testbot/bin/WinePatchesWebGet.pl | 108 ------------------------ testbot/bin/WinePatchesWebNotify.pl | 55 ------------ testbot/bin/WinePatchesWebSubmit.pl | 92 ++++++++++++++++++++ testbot/bin/WineSendLog.pl | 92 ++++++++++---------- testbot/doc/INSTALL.txt | 21 +---- testbot/lib/WineTestBot/Config.pm | 4 +- testbot/lib/WineTestBot/ConfigLocalTemplate.pl | 4 - testbot/lib/WineTestBot/Engine/Notify.pm | 20 +---- 9 files changed, 146 insertions(+), 315 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=62142e91529892c3d7a7…

1 0

Vincent Povirk : gdiplus: Correct EMF record size calculation.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: wine Branch: master Commit: a424968482d10356a5987bc08c66061dca5402e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a424968482d10356a5987bc08… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 12 15:54:41 2013 -0500 gdiplus: Correct EMF record size calculation. --- dlls/gdiplus/metafile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index ae905fc..f03557b 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -410,7 +410,7 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, if (record) { record->iType = recordType; - record->nSize = dataSize; + record->nSize = dataSize + 8; memcpy(record->dParm, data, dataSize); PlayEnhMetaFileRecord(metafile->playback_dc, metafile->handle_table,

1 0

Andrew Talbot : wininet: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: wine Branch: master Commit: ae77b3d368519b5518dbe485dfac2e8123b5a477 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae77b3d368519b5518dbe485d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Mar 12 22:28:49 2013 +0000 wininet: Avoid signed-unsigned integer comparisons. --- dlls/wininet/http.c | 4 ++-- dlls/wininet/internet.c | 6 +++--- dlls/wininet/netconnection.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 498e848..a019095 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4050,7 +4050,7 @@ static WORD HTTP_ParseWkday(LPCWSTR day) { 't','h','u',0 }, { 'f','r','i',0 }, { 's','a','t',0 }}; - int i; + unsigned int i; for (i = 0; i < sizeof(days)/sizeof(*days); i++) if (!strcmpiW(day, days[i])) return i; @@ -4313,7 +4313,7 @@ static WORD HTTP_ParseWeekday(LPCWSTR day) { 't','h','u','r','s','d','a','y',0 }, { 'f','r','i','d','a','y',0 }, { 's','a','t','u','r','d','a','y',0 }}; - int i; + unsigned int i; for (i = 0; i < sizeof(days)/sizeof(*days); i++) if (!strcmpiW(day, days[i])) return i; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 384516c..b6e6948 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2836,7 +2836,7 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, case INTERNET_OPTION_PER_CONNECTION_OPTION: { INTERNET_PER_CONN_OPTION_LISTW *con = lpBuffer; LONG res; - int i; + unsigned int i; proxyinfo_t pi; INTERNET_LoadProxySettings(&pi); @@ -2950,7 +2950,7 @@ BOOL WINAPI InternetSetOptionA(HINTERNET hInternet, DWORD dwOption, wbuffer, wlen ); break; case INTERNET_OPTION_PER_CONNECTION_OPTION: { - int i; + unsigned int i; INTERNET_PER_CONN_OPTION_LISTW *listW; INTERNET_PER_CONN_OPTION_LISTA *listA = lpBuffer; wlen = sizeof(INTERNET_PER_CONN_OPTION_LISTW); @@ -3019,7 +3019,7 @@ BOOL WINAPI InternetSetOptionA(HINTERNET hInternet, DWORD dwOption, if (dwOption == INTERNET_OPTION_PER_CONNECTION_OPTION) { INTERNET_PER_CONN_OPTION_LISTW *list = wbuffer; - int i; + unsigned int i; for (i = 0; i < list->dwOptionCount; ++i) { INTERNET_PER_CONN_OPTIONW *opt = list->pOptions + i; switch (opt->dwOption) { diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 3564282..c33f45a 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -477,7 +477,7 @@ static CRITICAL_SECTION init_ssl_cs = { &init_ssl_cs_debug, -1, 0, 0, 0, 0 }; static DWORD init_openssl(void) { #ifdef SONAME_LIBCRYPTO - int i; + unsigned int i; if(OpenSSL_ssl_handle) return ERROR_SUCCESS; @@ -730,7 +730,7 @@ void NETCON_unload(void) } if (ssl_locks) { - int i; + unsigned int i; for (i = 0; i < num_ssl_locks; i++) { ssl_locks[i].DebugInfo->Spare[0] = 0;

1 0

Dmitry Timoshkov : gdiplus: Ignore gdiplus page and world transformations when creating a gdi32 clipping region .
by Alexandre Julliard 13 Mar '13

13 Mar '13

Module: wine Branch: master Commit: 61dafbb7012061fda7a737daf24340ce927ce2cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=61dafbb7012061fda7a737daf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 13 16:30:45 2013 +0900 gdiplus: Ignore gdiplus page and world transformations when creating a gdi32 clipping region. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index a450ded..eb3f228 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -349,7 +349,7 @@ static void gdi_alpha_blend(GpGraphics *graphics, INT dst_x, INT dst_y, INT dst_ static GpStatus get_clip_hrgn(GpGraphics *graphics, HRGN *hrgn) { - return GdipGetRegionHRgn(graphics->clip, graphics, hrgn); + return GdipGetRegionHRgn(graphics->clip, NULL, hrgn); } /* Draw non-premultiplied ARGB data to the given graphics object */

1 0