November 2013 - Wine-commits

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 195e5a722b26498c834af9f225a9538a9069c522 URL: http://source.winehq.org/git/wine.git/?a=commit;h=195e5a722b26498c834af9f22… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 8 07:51:50 2013 +0400 po: Update Russian translation. --- po/ru.po | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/po/ru.po b/po/ru.po index d890788..945db12 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4702,8 +4702,6 @@ msgid "No Unicode translation.\n" msgstr "Нет преобразования в Unicode.\n" #: winerror.mc:1366 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" msgstr "Инициализация DLL не удалась.\n"

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: b7389a873dac367b075b7f44f81405c1fbc84561 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7389a873dac367b075b7f44f… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Nov 8 16:48:13 2013 +0200 po: Update Ukrainian translation. --- po/uk.po | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/po/uk.po b/po/uk.po index c5b9884..ac6d271 100644 --- a/po/uk.po +++ b/po/uk.po @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-03-08 23:51+0300\n" -"Last-Translator: Igor Paliychuk <mansonigor(a)gmail.com>\n" +"PO-Revision-Date: 2013-11-08 16:34+0300\n" +"Last-Translator: Andrey Gusev <andrey.goosev(a)gmail.com>\n" "Language-Team: none\n" "Language: Ukrainian\n" "MIME-Version: 1.0\n" @@ -4700,8 +4700,6 @@ msgid "No Unicode translation.\n" msgstr "" #: winerror.mc:1366 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" msgstr "Ініціалізація DLL не вдалась.\n"

1 0

Jacek Caban : urlmon: Compile tests with -D__WINESRC__.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: a808f23cbaa210efe668c65e5b2364b61f92f0f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a808f23cbaa210efe668c65e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 8 11:18:45 2013 +0100 urlmon: Compile tests with -D__WINESRC__. --- dlls/urlmon/tests/Makefile.in | 1 - dlls/urlmon/tests/uri.c | 74 ++++++++++++++++++++++------------------- 2 files changed, 40 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a808f23cbaa210efe668c…

1 0

Jacek Caban : rpcrt4: Compile tests with -D__WINESRC__.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 06246aff9017d94626ad997b87c8613a011dc721 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06246aff9017d94626ad997b8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 8 11:50:20 2013 +0100 rpcrt4: Compile tests with -D__WINESRC__. --- dlls/rpcrt4/tests/Makefile.in | 1 - dlls/rpcrt4/tests/cstub.c | 2 +- dlls/rpcrt4/tests/generated.c | 1 + dlls/rpcrt4/tests/ndr_marshall.c | 11 +++++---- dlls/rpcrt4/tests/rpc.c | 44 +++++++++++++++++++------------------ dlls/rpcrt4/tests/rpc_async.c | 2 +- dlls/rpcrt4/tests/rpc_protseq.c | 24 ++++++++++---------- dlls/rpcrt4/tests/server.c | 39 +++++++++++++++++---------------- tools/winapi/tests.dat | 1 + 9 files changed, 65 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06246aff9017d94626ad9…

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

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

Frédéric Delanoy : ctapi32: Use BOOL type where appropriate.
by Alexandre Julliard 07 Nov '13

07 Nov '13

Module: wine Branch: master Commit: c710a50b249bd1e5282ac36bb2d8d7d68a839f73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c710a50b249bd1e5282ac36bb… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 6 21:21:06 2013 +0100 ctapi32: Use BOOL type where appropriate. --- dlls/ctapi32/ctapi32.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ctapi32/ctapi32.c b/dlls/ctapi32/ctapi32.c index 089e0ab..a2dc5bc 100644 --- a/dlls/ctapi32/ctapi32.c +++ b/dlls/ctapi32/ctapi32.c @@ -42,13 +42,13 @@ static IS8 (*pCT_close)(IU16 ctn) = NULL; static void *ctapi_handle = NULL; -static int load_functions(void) { +static BOOL load_functions(void) { char soname[MAX_PATH] = FALLBACK_LIBCTAPI, buffer[MAX_PATH]; LONG result; HKEY key_handle; if (pCT_init) /* loaded already */ - return 0; + return TRUE; /* Try to get name of low level library from registry */ /* @@ Wine registry key: HKCU\Software\Wine\ctapi32 */ @@ -80,16 +80,16 @@ static int load_functions(void) { MESSAGE("Wine cannot find any usable hardware library, ctapi32.dll not working.\n"); MESSAGE("Please create the key \"HKEY_CURRENT_USER\\Software\\Wine\\ctapi32\" in your registry\n"); MESSAGE("and set the value \"library\" to your library name (e.g. \"libctapi-cyberjack.so.1\" or \"/usr/lib/readers/libctapi.so\").\n"); - return 1; + return FALSE; } -#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(ctapi_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); return 1;} +#define LOAD_FUNCPTR(f) if((p##f = wine_dlsym(ctapi_handle, #f, NULL, 0)) == NULL){WARN("Can't find symbol %s\n", #f); return FALSE;} LOAD_FUNCPTR(CT_init); LOAD_FUNCPTR(CT_data); LOAD_FUNCPTR(CT_close); #undef LOAD_FUNCPTR - return 0; + return TRUE; } /* @@ -129,7 +129,7 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinstDLL); /* Try to load low-level library */ - if (load_functions() != 0) + if (!load_functions()) return FALSE; /* error */ break; case DLL_PROCESS_DETACH:

1 0

Frédéric Delanoy : gdi32/tests: Align return type from SetVirtualResolution prototype with its definition.
by Alexandre Julliard 07 Nov '13

07 Nov '13

Module: wine Branch: master Commit: 4da17dbf5d5747dcc2741b7f322353379b4cbe55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4da17dbf5d5747dcc2741b7f3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 6 21:21:07 2013 +0100 gdi32/tests: Align return type from SetVirtualResolution prototype with its definition. --- dlls/gdi32/tests/mapping.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index 4850c29..573a97f 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -32,7 +32,7 @@ static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); static DWORD (WINAPI *pGetLayout)(HDC hdc); static INT (WINAPI *pGetRandomRgn)(HDC hDC, HRGN hRgn, INT iCode); static BOOL (WINAPI *pGetTransform)(HDC, DWORD, XFORM *); -static DWORD (WINAPI *pSetVirtualResolution)(HDC, DWORD, DWORD, DWORD, DWORD); +static BOOL (WINAPI *pSetVirtualResolution)(HDC, DWORD, DWORD, DWORD, DWORD); #define rough_match(got, expected) (abs( MulDiv( (got) - (expected), 1000, (expected) )) <= 5)

1 0

Frédéric Delanoy : gdi32: Use BOOL type where appropriate.
by Alexandre Julliard 07 Nov '13

07 Nov '13

Module: wine Branch: master Commit: adee328a508b5e2dc17fd2d6d833a75d26b2bb85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adee328a508b5e2dc17fd2d6d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Nov 6 21:21:08 2013 +0100 gdi32: Use BOOL type where appropriate. --- dlls/gdi32/dibdrv/objects.c | 6 +++--- dlls/gdi32/enhmfdrv/objects.c | 2 +- dlls/gdi32/metafile.c | 2 +- dlls/gdi32/opengl.c | 4 ++-- dlls/gdi32/palette.c | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 5ff9d1a..1f05ab0 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1362,7 +1362,7 @@ static void add_join( dibdrv_physdev *pdev, HRGN region, HRGN round_cap, const P return; } -static int wide_line_segment( dibdrv_physdev *pdev, HRGN total, +static BOOL wide_line_segment( dibdrv_physdev *pdev, HRGN total, const POINT *pt_1, const POINT *pt_2, int dx, int dy, BOOL need_cap_1, BOOL need_cap_2, struct face *face_1, struct face *face_2 ) { @@ -1370,7 +1370,7 @@ static int wide_line_segment( dibdrv_physdev *pdev, HRGN total, BOOL sq_cap_1 = need_cap_1 && (pdev->pen_endcap == PS_ENDCAP_SQUARE); BOOL sq_cap_2 = need_cap_2 && (pdev->pen_endcap == PS_ENDCAP_SQUARE); - if (dx == 0 && dy == 0) return 0; + if (dx == 0 && dy == 0) return FALSE; if (dy == 0) { @@ -1487,7 +1487,7 @@ static int wide_line_segment( dibdrv_physdev *pdev, HRGN total, face_1->dx = face_2->dx = dx; face_1->dy = face_2->dy = dy; - return 1; + return TRUE; } static void wide_line_segments( dibdrv_physdev *pdev, int num, const POINT *pts, BOOL close, diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index 4e1f3b1..60414a3 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -81,7 +81,7 @@ BOOL EMFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj ) UINT index; BOOL ret = TRUE; - if(!(index = EMFDRV_FindObject(dev, obj))) return 0; + if(!(index = EMFDRV_FindObject(dev, obj))) return FALSE; emr.emr.iType = EMR_DELETEOBJECT; emr.emr.nSize = sizeof(emr); diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 406728e..0cb36af 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -471,7 +471,7 @@ BOOL WINAPI EnumMetaFile(HDC hdc, HMETAFILE hmf, MFENUMPROC lpEnumFunc, LPARAM l TRACE("(%p,%p,%p,%lx)\n", hdc, hmf, lpEnumFunc, lpData); - if (!mh) return 0; + if (!mh) return FALSE; /* save the current pen, brush and font */ hPen = GetCurrentObject(hdc, OBJ_PEN); diff --git a/dlls/gdi32/opengl.c b/dlls/gdi32/opengl.c index 925a283..5787379 100644 --- a/dlls/gdi32/opengl.c +++ b/dlls/gdi32/opengl.c @@ -112,7 +112,7 @@ BOOL WINAPI SetPixelFormat( HDC hdc, INT fmt, const PIXELFORMATDESCRIPTOR *pfd ) { if (!opengl32) opengl32 = LoadLibraryW( opengl32W ); if (!(wglSetPixelFormat = (void *)GetProcAddress( opengl32, "wglSetPixelFormat" ))) - return 0; + return FALSE; } return wglSetPixelFormat( hdc, fmt, pfd ); } @@ -126,7 +126,7 @@ BOOL WINAPI SwapBuffers( HDC hdc ) { if (!opengl32) opengl32 = LoadLibraryW( opengl32W ); if (!(wglSwapBuffers = (void *)GetProcAddress( opengl32, "wglSwapBuffers" ))) - return 0; + return FALSE; } return wglSwapBuffers( hdc ); } diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c index 81f0aa5..fb27f4f 100644 --- a/dlls/gdi32/palette.c +++ b/dlls/gdi32/palette.c @@ -319,13 +319,13 @@ BOOL WINAPI AnimatePalette( const PALETTEENTRY *pptr = PaletteColors; palPtr = GDI_GetObjPtr( hPal, OBJ_PAL ); - if (!palPtr) return 0; + if (!palPtr) return FALSE; pal_entries = palPtr->count; if (StartIndex >= pal_entries) { GDI_ReleaseObj( hPal ); - return 0; + return FALSE; } if (StartIndex+NumEntries > pal_entries) NumEntries = pal_entries - StartIndex;

1 0