wine-commits November 2013

wine-commits@winehq.org

2 participants
566 discussions

Alexandre Julliard : Release 1.7.6.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 9b5e6ce0f234027f8014aa0d3081ffd80a1085f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b5e6ce0f234027f8014aa0d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 8 19:23:34 2013 +0100 Release 1.7.6. --- .mailmap | 1 + ANNOUNCE | 825 ++++++++++++++++++++++++++++--------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 5 files changed, 388 insertions(+), 462 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b5e6ce0f234027f8014a…

1 0

Qian Hong : user32: Implement OpenInputDesktop.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: f7835dea2ddbd3aa8fb53fb4b83ccaf16f5efde9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7835dea2ddbd3aa8fb53fb4b… Author: Qian Hong <qhong(a)codeweavers.com> Date: Fri Nov 8 17:10:24 2013 +0800 user32: Implement OpenInputDesktop. --- dlls/user32/tests/winstation.c | 22 ---------------------- dlls/user32/winstation.c | 20 +++++++++++++++++--- include/wine/server_protocol.h | 21 ++++++++++++++++++++- server/protocol.def | 10 ++++++++++ server/request.h | 8 ++++++++ server/trace.c | 15 +++++++++++++++ server/winstation.c | 22 ++++++++++++++++++++++ 7 files changed, 92 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7835dea2ddbd3aa8fb53…

1 0

Daniel Lehman : kernel32: Use ANSI code page if current thread locale has no code page.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 37dad12971ba08df39f54dcde833a5ce70a98eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=37dad12971ba08df39f54dcde… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Oct 31 11:03:18 2013 -0700 kernel32: Use ANSI code page if current thread locale has no code page. --- dlls/kernel32/locale.c | 1 + dlls/kernel32/tests/codepage.c | 156 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 157 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 9ddf078..22903d5 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -215,6 +215,7 @@ static const union cptable *get_codepage_table( unsigned int codepage ) case CP_THREAD_ACP: if (NtCurrentTeb()->CurrentLocale == GetUserDefaultLCID()) return ansi_cptable; codepage = get_lcid_codepage( NtCurrentTeb()->CurrentLocale ); + if (!codepage) return ansi_cptable; /* fall through */ default: if (codepage == ansi_cptable->info.codepage) return ansi_cptable; diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 36ea66d..a269c7e 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -462,6 +462,161 @@ static void test_undefined_byte_char(void) } } +static void test_threadcp(void) +{ + static const LCID ENGLISH = MAKELCID(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US), SORT_DEFAULT); + static const LCID HINDI = MAKELCID(MAKELANGID(LANG_HINDI, SUBLANG_HINDI_INDIA), SORT_DEFAULT); + static const LCID GEORGIAN = MAKELCID(MAKELANGID(LANG_GEORGIAN, SUBLANG_GEORGIAN_GEORGIA), SORT_DEFAULT); + static const LCID RUSSIAN = MAKELCID(MAKELANGID(LANG_RUSSIAN, SUBLANG_RUSSIAN_RUSSIA), SORT_DEFAULT); + static const LCID JAPANESE = MAKELCID(MAKELANGID(LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN), SORT_DEFAULT); + static const LCID CHINESE = MAKELCID(MAKELANGID(LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED), SORT_DEFAULT); + + BOOL islead, islead_acp; + CPINFOEXA cpi; + UINT cp, acp; + int i, num; + LCID last; + BOOL ret; + + struct test { + LCID lcid; + UINT threadcp; + } lcids[] = { + { HINDI, 0 }, + { GEORGIAN, 0 }, + { ENGLISH, 1252 }, + { RUSSIAN, 1251 }, + { JAPANESE, 932 }, + { CHINESE, 936 } + }; + + struct test_islead_nocp { + LCID lcid; + BYTE testchar; + } isleads_nocp[] = { + { HINDI, 0x00 }, + { HINDI, 0x81 }, + { HINDI, 0xa0 }, + { HINDI, 0xe0 }, + + { GEORGIAN, 0x00 }, + { GEORGIAN, 0x81 }, + { GEORGIAN, 0xa0 }, + { GEORGIAN, 0xe0 }, + }; + + struct test_islead { + LCID lcid; + BYTE testchar; + BOOL islead; + } isleads[] = { + { ENGLISH, 0x00, FALSE }, + { ENGLISH, 0x81, FALSE }, + { ENGLISH, 0xa0, FALSE }, + { ENGLISH, 0xe0, FALSE }, + + { RUSSIAN, 0x00, FALSE }, + { RUSSIAN, 0x81, FALSE }, + { RUSSIAN, 0xa0, FALSE }, + { RUSSIAN, 0xe0, FALSE }, + + { JAPANESE, 0x00, FALSE }, + { JAPANESE, 0x81, TRUE }, + { JAPANESE, 0xa0, FALSE }, + { JAPANESE, 0xe0, TRUE }, + + { CHINESE, 0x00, FALSE }, + { CHINESE, 0x81, TRUE }, + { CHINESE, 0xa0, TRUE }, + { CHINESE, 0xe0, TRUE }, + }; + + last = GetThreadLocale(); + acp = GetACP(); + + for (i = 0; i < sizeof(lcids)/sizeof(lcids[0]); i++) + { + SetThreadLocale(lcids[i].lcid); + + cp = 0xdeadbeef; + GetLocaleInfoA(lcids[i].lcid, LOCALE_IDEFAULTANSICODEPAGE|LOCALE_RETURN_NUMBER, (LPSTR)&cp, sizeof(cp)); + ok(cp == lcids[i].threadcp, "wrong codepage %u for lcid %04x, should be %u\n", cp, lcids[i].threadcp, cp); + + /* GetCPInfoEx/GetCPInfo - CP_ACP */ + SetLastError(0xdeadbeef); + memset(&cpi, 0, sizeof(cpi)); + ret = GetCPInfoExA(CP_ACP, 0, &cpi); + ok(ret, "GetCPInfoExA failed for lcid %04x\n", lcids[i].lcid); + ok(GetLastError() == 0xdeadbeef || + broken(GetLastError() == ERROR_RESOURCE_LANG_NOT_FOUND), /* win2k */ + "GetLastError() is %u for lcid %04x\n", GetLastError(), lcids[i].lcid); + ok(cpi.CodePage == acp, "wrong codepage %u for lcid %04x, should be %u\n", cpi.CodePage, lcids[i].lcid, acp); + + /* WideCharToMultiByte - CP_ACP */ + SetLastError(0xdeadbeef); + num = WideCharToMultiByte(CP_ACP, 0, foobarW, -1, NULL, 0, NULL, NULL); + ok(num == 7, "ret is %d (%04x)\n", num, lcids[i].lcid); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u (%04x)\n", GetLastError(), lcids[i].lcid); + + /* MultiByteToWideChar - CP_ACP */ + SetLastError(0xdeadbeef); + num = MultiByteToWideChar(CP_ACP, 0, "foobar", -1, NULL, 0); + ok(num == 7, "ret is %d (%04x)\n", num, lcids[i].lcid); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u (%04x)\n", GetLastError(), lcids[i].lcid); + + /* GetCPInfoEx/GetCPInfo - CP_THREAD_ACP */ + SetLastError(0xdeadbeef); + memset(&cpi, 0, sizeof(cpi)); + ret = GetCPInfoExA(CP_THREAD_ACP, 0, &cpi); + ok(ret, "GetCPInfoExA failed for lcid %04x\n", lcids[i].lcid); + ok(GetLastError() == 0xdeadbeef || + broken(GetLastError() == ERROR_RESOURCE_LANG_NOT_FOUND), /* win2k */ + "GetLastError() is %u for lcid %04x\n", GetLastError(), lcids[i].lcid); + if (lcids[i].threadcp) + ok(cpi.CodePage == lcids[i].threadcp, "wrong codepage %u for lcid %04x, should be %u\n", + cpi.CodePage, lcids[i].lcid, lcids[i].threadcp); + else + ok(cpi.CodePage == acp, "wrong codepage %u for lcid %04x, should be %u\n", + cpi.CodePage, lcids[i].lcid, acp); + + /* WideCharToMultiByte - CP_THREAD_ACP */ + SetLastError(0xdeadbeef); + num = WideCharToMultiByte(CP_THREAD_ACP, 0, foobarW, -1, NULL, 0, NULL, NULL); + ok(num == 7, "ret is %d (%04x)\n", num, lcids[i].lcid); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u (%04x)\n", GetLastError(), lcids[i].lcid); + + /* MultiByteToWideChar - CP_THREAD_ACP */ + SetLastError(0xdeadbeef); + num = MultiByteToWideChar(CP_THREAD_ACP, 0, "foobar", -1, NULL, 0); + ok(num == 7, "ret is %d (%04x)\n", num, lcids[i].lcid); + ok(GetLastError() == 0xdeadbeef, "GetLastError() is %u (%04x)\n", GetLastError(), lcids[i].lcid); + } + + /* IsDBCSLeadByteEx - locales without codepage */ + for (i = 0; i < sizeof(isleads_nocp)/sizeof(isleads_nocp[0]); i++) + { + SetThreadLocale(isleads_nocp[i].lcid); + + islead_acp = IsDBCSLeadByteEx(CP_ACP, isleads_nocp[i].testchar); + islead = IsDBCSLeadByteEx(CP_THREAD_ACP, isleads_nocp[i].testchar); + + ok(islead == islead_acp, "wrong islead %i for test char %x in lcid %04x. should be %i\n", + islead, isleads_nocp[i].testchar, isleads_nocp[i].lcid, islead_acp); + } + + /* IsDBCSLeadByteEx - locales with codepage */ + for (i = 0; i < sizeof(isleads)/sizeof(isleads[0]); i++) + { + SetThreadLocale(isleads[i].lcid); + + islead = IsDBCSLeadByteEx(CP_THREAD_ACP, isleads[i].testchar); + ok(islead == isleads[i].islead, "wrong islead %i for test char %x in lcid %04x. should be %i\n", + islead, isleads[i].testchar, isleads[i].lcid, isleads[i].islead); + } + + SetThreadLocale(last); +} + START_TEST(codepage) { BOOL bUsedDefaultChar; @@ -478,4 +633,5 @@ START_TEST(codepage) test_string_conversion(&bUsedDefaultChar); test_undefined_byte_char(); + test_threadcp(); }

1 0

Alexandre Julliard : shlwapi/tests: Test if SHCreateStreamOnFileEx is present before using it.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: ec7c250450628cbf835533f8383f4c27278f1cb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec7c250450628cbf835533f83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 8 12:57:14 2013 +0100 shlwapi/tests: Test if SHCreateStreamOnFileEx is present before using it. --- dlls/shlwapi/tests/istream.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 760b847..9ea3def 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -759,5 +759,5 @@ START_TEST(istream) } } - test_SHCreateStreamOnFileEx_CopyTo(); + if (pSHCreateStreamOnFileEx) test_SHCreateStreamOnFileEx_CopyTo(); }

1 0

Dmitry Timoshkov : gdiplus: Add test for data returned by GdipGetRegionData for a translated integer region .
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 2bbd179ea4a2d6bad054175710e9df03a11267ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bbd179ea4a2d6bad05417571… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 8 16:33:42 2013 +0900 gdiplus: Add test for data returned by GdipGetRegionData for a translated integer region. --- dlls/gdiplus/tests/region.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 3e6f902..f509204 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -2,6 +2,7 @@ * Unit test suite for gdiplus regions * * Copyright (C) 2008 Huw Davies + * Copyright (C) 2013 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -420,6 +421,45 @@ static void test_getregiondata(void) expect(6, point[3].Y); expect_dword(buf + 13, 0x81010100); /* 0x01010100 if we don't close the path */ + status = GdipTranslateRegion(region, 0.6, 0.8); + expect(Ok, status); + memset(buf, 0, sizeof(buf)); + needed = 0; + status = GdipGetRegionData(region, (BYTE*)buf, sizeof(buf), &needed); + expect(Ok, status); +todo_wine + expect(72, needed); +todo_wine + expect_dword(buf, 64); + expect_magic(buf + 2); + expect_dword(buf + 3 , 0); + expect_dword(buf + 4 , RGNDATA_PATH); +todo_wine + expect_dword(buf + 5, 48); + expect_magic(buf + 6); + expect_dword(buf + 7, 4); + /* flags 0 means that a path is an array of FLOATs */ +todo_wine + expect_dword(buf + 8, 0); +todo_wine + expect_float(buf + 9, 5.6); +todo_wine + expect_float(buf + 10, 6.8); +todo_wine + expect_float(buf + 11, 7.6); +todo_wine + expect_float(buf + 12, 8.8); +todo_wine + expect_float(buf + 13, 8.6); +todo_wine + expect_float(buf + 14, 1.8); +todo_wine + expect_float(buf + 15, 5.6); +todo_wine + expect_float(buf + 16, 6.8); +todo_wine + expect_dword(buf + 17, 0x81010100); /* 0x01010100 if we don't close the path */ + status = GdipDeletePath(path); expect(Ok, status); status = GdipDeleteRegion(region);

1 0

Dmitry Timoshkov : gdiplus: Use flags 0 for an empty path in region to follow Windows7+ behaviour.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 108a63367731d5b59a7280e8f32fc4a135d30332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=108a63367731d5b59a7280e8f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 8 16:33:46 2013 +0900 gdiplus: Use flags 0 for an empty path in region to follow Windows7+ behaviour. --- dlls/gdiplus/region.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 9ac3124..4cd9636 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -426,7 +426,7 @@ GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *path, GpRegion **region) { region_element* element; GpStatus stat; - DWORD flags = FLAGS_INTPATH; + DWORD flags; INT count, i; TRACE("%p, %p\n", path, region); @@ -446,6 +446,8 @@ GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *path, GpRegion **region) element = &(*region)->node; count = path->pathdata.Count; + flags = count ? FLAGS_INTPATH : FLAGS_NOFLAGS; + /* Test to see if the path is an Integer path */ for (i = 0; i < count; i++) {

1 0

Dmitry Timoshkov : gdiplus/tests: Fix the test for flags of an empty region .
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 9797afd0031b5b4bc7df576960616c3fa410a8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9797afd0031b5b4bc7df57696… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 8 16:33:39 2013 +0900 gdiplus/tests: Fix the test for flags of an empty region. --- dlls/gdiplus/tests/region.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index d19d919..3e6f902 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -370,8 +370,8 @@ static void test_getregiondata(void) expect_magic(buf + 6); expect_dword(buf + 7, 0); /* flags 0 means that a path is an array of FLOATs */ - ok((*(buf + 8) & (~ 0x00004000)) == 0x00000000, - "expected 00000000 got %08x\n", *(buf + 8) & (~ 0x00004000)); + ok(*(buf + 8) == 0x4000 /* before win7 */ || *(buf + 8) == 0, + "expected 0x4000 or 0, got %08x\n", *(buf + 8)); /* Transform an empty region */ status = GdipCreateMatrix(&matrix);

1 0

Dmitry Timoshkov : gdiplus/tests: Clean up the use of macros in the region tests.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 7dfbadec6799b6958862d567ee63334e1fe9e0bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=7dfbadec6799b6958862d567e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 8 16:33:35 2013 +0900 gdiplus/tests: Clean up the use of macros in the region tests. --- dlls/gdiplus/tests/region.c | 74 ++++++++++++++++++++---------------------- 1 files changed, 35 insertions(+), 39 deletions(-) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index c9da573..d19d919 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -32,19 +32,17 @@ #define RGNDATA_MAGIC 0xdbc01001 #define RGNDATA_MAGIC2 0xdbc01002 -#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +#define expect(expected, got) ok((got) == (expected), "Expected %.8x, got %.8x\n", (expected), (got)) +#define expectf_(expected, got, precision) ok(fabs((expected) - (got)) < (precision), "Expected %f, got %f\n", (expected), (got)) +#define expectf(expected, got) expectf_((expected), (got), 0.0001) -#define expectf_(expected, got, precision) ok(fabs(expected - got) < precision, "Expected %.2f, got %.2f\n", expected, got) -#define expectf(expected, got) expectf_(expected, got, 0.0001) - -#define expect_magic(value) ok(*value == RGNDATA_MAGIC || *value == RGNDATA_MAGIC2, "Expected a known magic value, got %8x\n", *value) - -#define expect_dword(value, expected) ok(*(value) == expected, "expected %08x got %08x\n", expected, *(value)) +#define expect_magic(value) ok(*(value) == RGNDATA_MAGIC || *(value) == RGNDATA_MAGIC2, "Expected a known magic value, got %8x\n", *(value)) +#define expect_dword(value, expected) expect(expected, *(value)) static inline void expect_float(DWORD *value, FLOAT expected) { FLOAT valuef = *(FLOAT*)value; - ok(valuef == expected, "expected %f got %f\n", expected, valuef); + expectf(expected, valuef); } /* We get shorts back, not INTs like a GpPoint */ @@ -132,7 +130,7 @@ static void test_getregiondata(void) expect(20, needed); expect_dword(buf, 12); trace("buf[1] = %08x\n", buf[1]); - expect_magic((DWORD*)(buf + 2)); + expect_magic(buf + 2); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_INFINITE_RECT); @@ -146,7 +144,7 @@ static void test_getregiondata(void) expect(20, needed); expect_dword(buf, 12); trace("buf[1] = %08x\n", buf[1]); - expect_magic((DWORD*)(buf + 2)); + expect_magic(buf + 2); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_EMPTY_RECT); @@ -160,7 +158,7 @@ static void test_getregiondata(void) expect(20, needed); expect_dword(buf, 12); trace("buf[1] = %08x\n", buf[1]); - expect_magic((DWORD*)(buf + 2)); + expect_magic(buf + 2); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_INFINITE_RECT); @@ -181,7 +179,7 @@ static void test_getregiondata(void) expect(36, needed); expect_dword(buf, 28); trace("buf[1] = %08x\n", buf[1]); - expect_magic((DWORD*)(buf + 2)); + expect_magic(buf + 2); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_RECT); expect_float(buf + 5, 10.0); @@ -233,7 +231,7 @@ static void test_getregiondata(void) expect(156, needed); expect_dword(buf, 148); trace("buf[1] = %08x\n", buf[1]); - expect_magic((DWORD*)(buf + 2)); + expect_magic(buf + 2); expect_dword(buf + 3, 10); expect_dword(buf + 4, CombineModeExclude); expect_dword(buf + 5, CombineModeComplement); @@ -292,11 +290,11 @@ static void test_getregiondata(void) expect(72, needed); expect_dword(buf, 64); trace("buf[1] = %08x\n", buf[1]); - expect_magic((DWORD*)(buf + 2)); + expect_magic(buf + 2); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_PATH); expect_dword(buf + 5, 0x00000030); - expect_magic((DWORD*)(buf + 6)); + expect_magic(buf + 6); expect_dword(buf + 7, 0x00000004); expect_dword(buf + 8, 0x00000000); expect_float(buf + 9, 12.5); @@ -309,7 +307,6 @@ static void test_getregiondata(void) expect_float(buf + 16, 28.0); expect_dword(buf + 17, 0x81010100); - rect.X = 50; rect.Y = 30; rect.Width = 10; @@ -324,12 +321,12 @@ static void test_getregiondata(void) expect(96, needed); expect_dword(buf, 88); trace("buf[1] = %08x\n", buf[1]); - expect_magic((DWORD*)(buf + 2)); + expect_magic(buf + 2); expect_dword(buf + 3, 2); expect_dword(buf + 4, CombineModeIntersect); expect_dword(buf + 5, RGNDATA_PATH); expect_dword(buf + 6, 0x00000030); - expect_magic((DWORD*)(buf + 7)); + expect_magic(buf + 7); expect_dword(buf + 8, 0x00000004); expect_dword(buf + 9, 0x00000000); expect_float(buf + 10, 12.5); @@ -365,15 +362,14 @@ static void test_getregiondata(void) expect(36, needed); expect_dword(buf, 28); trace("buf[1] = %08x\n", buf[1]); - expect_magic((DWORD*)(buf + 2)); + expect_magic(buf + 2); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_PATH); - /* Second signature for pathdata */ expect_dword(buf + 5, 12); - expect_magic((DWORD*)(buf + 6)); + expect_magic(buf + 6); expect_dword(buf + 7, 0); - /* flags 0x4000 means its a path of shorts instead of FLOAT */ + /* flags 0 means that a path is an array of FLOATs */ ok((*(buf + 8) & (~ 0x00004000)) == 0x00000000, "expected 00000000 got %08x\n", *(buf + 8) & (~ 0x00004000)); @@ -404,16 +400,16 @@ static void test_getregiondata(void) expect(56, needed); expect_dword(buf, 48); trace("buf[1] = %08x\n", buf[1]); - expect_magic((DWORD*)(buf + 2)); + expect_magic(buf + 2); expect_dword(buf + 3 , 0); expect_dword(buf + 4 , RGNDATA_PATH); - expect_dword(buf + 5, 32); - expect_magic((DWORD*)(buf + 6)); + expect_magic(buf + 6); expect_dword(buf + 7, 4); - expect_dword(buf + 8, 0x00004000); /* ?? */ + /* flags 0x4000 means that a path is an array of shorts instead of FLOATs */ + expect_dword(buf + 8, 0x4000); - point = (RegionDataPoint*)buf + 9; + point = (RegionDataPoint*)(buf + 9); expect(5, point[0].X); expect(6, point[0].Y); expect(7, point[1].X); /* buf + 10 */ @@ -446,12 +442,12 @@ static void test_getregiondata(void) expect(72, needed); expect_dword(buf, 64); trace("buf[1] = %08x\n", buf[1]); - expect_magic((DWORD*)(buf + 2)); + expect_magic(buf + 2); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_PATH); expect_dword(buf + 5, 48); - expect_magic((DWORD*)(buf + 6)); + expect_magic(buf + 6); expect_dword(buf + 7, 4); expect_dword(buf + 8, 0); expect_float(buf + 9, 5.6); @@ -493,7 +489,7 @@ static void test_getregiondata(void) expect(116, needed); expect_dword(buf, 108); trace("buf[1] = %08x\n", buf[1]); - expect_magic((DWORD*)(buf + 2)); + expect_magic(buf + 2); expect_dword(buf + 3, 2); expect_dword(buf + 4, CombineModeUnion); expect_dword(buf + 5, RGNDATA_RECT); @@ -504,7 +500,7 @@ static void test_getregiondata(void) expect_dword(buf + 10, RGNDATA_PATH); expect_dword(buf + 11, 68); - expect_magic((DWORD*)(buf + 12)); + expect_magic(buf + 12); expect_dword(buf + 13, 6); expect_float(buf + 14, 0x0); @@ -647,7 +643,7 @@ static void test_combinereplace(void) expect(36, needed); expect_dword(buf, 28); trace("buf[1] = %08x\n", buf[1]); - expect_magic((DWORD*)(buf + 2)); + expect_magic(buf + 2); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_RECT); @@ -667,7 +663,7 @@ static void test_combinereplace(void) expect(156, needed); expect_dword(buf, 148); trace("buf[1] = %08x\n", buf[1]); - expect_magic((DWORD*)(buf + 2)); + expect_magic(buf + 2); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_PATH); GdipDeletePath(path); @@ -686,7 +682,7 @@ static void test_combinereplace(void) expect(20, needed); expect_dword(buf, 12); trace("buf[1] = %08x\n", buf[1]); - expect_magic((DWORD*)(buf + 2)); + expect_magic(buf + 2); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_INFINITE_RECT); GdipDeleteRegion(region2); @@ -713,7 +709,7 @@ static void test_combinereplace(void) expect(180, needed); expect_dword(buf, 172); trace("buf[1] = %08x\n", buf[1]); - expect_magic((DWORD*)(buf + 2)); + expect_magic(buf + 2); expect_dword(buf + 3, 2); expect_dword(buf + 4, CombineModeUnion); @@ -777,11 +773,11 @@ static void test_fromhrgn(void) expect(56, needed); expect_dword(buf, 48); - expect_magic((DWORD*)(buf + 2)); + expect_magic(buf + 2); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_PATH); expect_dword(buf + 5, 0x00000020); - expect_magic((DWORD*)(buf + 6)); + expect_magic(buf + 6); expect_dword(buf + 7, 0x00000004); todo_wine expect_dword(buf + 8, 0x00006000); /* ?? */ @@ -824,11 +820,11 @@ static void test_fromhrgn(void) expect(Ok, status); expect(216, needed); expect_dword(buf, 208); - expect_magic((DWORD*)(buf + 2)); + expect_magic(buf + 2); expect_dword(buf + 3, 0); expect_dword(buf + 4, RGNDATA_PATH); expect_dword(buf + 5, 0x000000C0); - expect_magic((DWORD*)(buf + 6)); + expect_magic(buf + 6); expect_dword(buf + 7, 0x00000024); todo_wine expect_dword(buf + 8, 0x00006000); /* ?? */ }

1 0

Dmitry Timoshkov : gdiplus: Avoid not necessary memory allocations in GdipCreateRegionPath.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 394d4b07e65635fed76779c495f94ba90369a6c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=394d4b07e65635fed76779c49… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 8 16:33:31 2013 +0900 gdiplus: Avoid not necessary memory allocations in GdipCreateRegionPath. --- dlls/gdiplus/region.c | 41 +++++------------------------------------ 1 files changed, 5 insertions(+), 36 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 3e718ef..9ac3124 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -425,9 +425,6 @@ GpStatus WINGDIPAPI GdipCreateRegion(GpRegion **region) GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *path, GpRegion **region) { region_element* element; - GpPoint *pointsi; - GpPointF *pointsf; - GpStatus stat; DWORD flags = FLAGS_INTPATH; INT count, i; @@ -450,42 +447,14 @@ GpStatus WINGDIPAPI GdipCreateRegionPath(GpPath *path, GpRegion **region) count = path->pathdata.Count; /* Test to see if the path is an Integer path */ - if (count) + for (i = 0; i < count; i++) { - pointsi = GdipAlloc(sizeof(GpPoint) * count); - pointsf = GdipAlloc(sizeof(GpPointF) * count); - if (!(pointsi && pointsf)) + if (path->pathdata.Points[i].X != gdip_round(path->pathdata.Points[i].X) || + path->pathdata.Points[i].Y != gdip_round(path->pathdata.Points[i].Y)) { - GdipFree(pointsi); - GdipFree(pointsf); - GdipDeleteRegion(*region); - return OutOfMemory; - } - - stat = GdipGetPathPointsI(path, pointsi, count); - if (stat != Ok) - { - GdipDeleteRegion(*region); - return stat; - } - stat = GdipGetPathPoints(path, pointsf, count); - if (stat != Ok) - { - GdipDeleteRegion(*region); - return stat; - } - - for (i = 0; i < count; i++) - { - if (!(pointsi[i].X == pointsf[i].X && - pointsi[i].Y == pointsf[i].Y )) - { - flags = FLAGS_NOFLAGS; - break; - } + flags = FLAGS_NOFLAGS; + break; } - GdipFree(pointsi); - GdipFree(pointsf); } stat = GdipClonePath(path, &element->elementdata.pathdata.path);

1 0

Dmitry Timoshkov : gdiplus: Use same rounding formula that is used to decide whether a path should be stored as an array integers .
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: f204aab17f9310a1bb04ea099b95098f67b6458e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f204aab17f9310a1bb04ea099… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Nov 8 16:33:26 2013 +0900 gdiplus: Use same rounding formula that is used to decide whether a path should be stored as an array integers. --- dlls/gdiplus/region.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 7186518..3e718ef 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -739,11 +739,9 @@ static inline void write_float(DWORD* location, INT* offset, const FLOAT write) static inline void write_packed_point(DWORD* location, INT* offset, const GpPointF* write) { - packed_point point; - - point.X = write->X; - point.Y = write->Y; - memcpy(location + *offset, &point, sizeof(packed_point)); + packed_point *point = (packed_point *)(location + *offset); + point->X = gdip_round(write->X); + point->Y = gdip_round(write->Y); (*offset)++; }

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
57
Older →

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 November 2013