November 2013 - Wine-Commits

Frédéric Delanoy : dinput: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 8, 2013

Nov. 8, 2013

Module: wine Branch: master Commit: 84fb23f476c9d88f68be123cc7ab42d4768b4d4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=84fb23f476c9d88f68be123cc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 7 21:47:31 2013 +0100 dinput: Use BOOL type where appropriate. --- dlls/dinput/effect_linuxinput.c | 2 +- dlls/dinput/joystick_linuxinput.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index da1fb85..3f17217 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -57,7 +57,7 @@ struct LinuxInputEffectImpl struct ff_effect effect; /* Effect data */ int gain; /* Effect gain */ - int first_axis_is_x; + BOOL first_axis_is_x; int* fd; /* Parent device */ struct list *entry; /* Entry into the parent's list of effects */ }; diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 559f181..951690d 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -184,7 +184,7 @@ static void find_joydevs(void) char buf[MAX_PATH]; struct JoyDev joydev = {0}; int fd; - int no_ff_check = 0; + BOOL no_ff_check = FALSE; int j; struct JoyDev *new_joydevs; struct input_id device_id = {0}; @@ -194,7 +194,7 @@ static void find_joydevs(void) if ((fd = open(buf, O_RDWR)) == -1) { fd = open(buf, O_RDONLY); - no_ff_check = 1; + no_ff_check = TRUE; } if (fd == -1)

1 0

Andrey Gusev : po: Update Ukrainian translation.
by Alexandre Julliard Nov. 8, 2013

Nov. 8, 2013

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

Frédéric Delanoy : comctl32/tests: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 8, 2013

Nov. 8, 2013

Module: wine Branch: master Commit: 5117af69a75bf201b47a1e617165a8de57916bd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5117af69a75bf201b47a1e617… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 7 21:47:29 2013 +0100 comctl32/tests: Use BOOL type where appropriate. --- dlls/comctl32/tests/ipaddress.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/ipaddress.c b/dlls/comctl32/tests/ipaddress.c index 4d81acf..093f649 100644 --- a/dlls/comctl32/tests/ipaddress.c +++ b/dlls/comctl32/tests/ipaddress.c @@ -61,7 +61,7 @@ static void test_get_set_text(void) DestroyWindow(hwnd); } -static int init(void) +static BOOL init(void) { HMODULE hComctl32; BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); @@ -72,7 +72,7 @@ static int init(void) if (!pInitCommonControlsEx) { win_skip("InitCommonControlsEx() is missing.\n"); - return 0; + return FALSE; } iccex.dwSize = sizeof(iccex); @@ -80,7 +80,7 @@ static int init(void) iccex.dwICC = ICC_INTERNET_CLASSES; pInitCommonControlsEx(&iccex); - return 1; + return TRUE; } START_TEST(ipaddress)

1 0

Dmitry Timoshkov : gdiplus/tests: Clean up the use of macros in the region tests.
by Alexandre Julliard Nov. 8, 2013

Nov. 8, 2013

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 Nov. 8, 2013

Nov. 8, 2013

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 Nov. 8, 2013

Nov. 8, 2013

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

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard Nov. 8, 2013

Nov. 8, 2013

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

André Hentschel : ws2_32/tests: Enable compilation with -D__WINESRC__.
by Alexandre Julliard Nov. 8, 2013

Nov. 8, 2013

Module: wine Branch: master Commit: f8c416b219e7d8b82600b0231873ab3722773a34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8c416b219e7d8b82600b0231… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Nov 7 22:45:51 2013 +0100 ws2_32/tests: Enable compilation with -D__WINESRC__. --- dlls/ws2_32/tests/Makefile.in | 1 - dlls/ws2_32/tests/sock.c | 58 +++++++++++++++++++++------------------- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/dlls/ws2_32/tests/Makefile.in b/dlls/ws2_32/tests/Makefile.in index a447137..6d473b3 100644 --- a/dlls/ws2_32/tests/Makefile.in +++ b/dlls/ws2_32/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = ws2_32.dll IMPORTS = ws2_32 user32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ protocol.c \ diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 9d209e1..ac6ee10 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -24,6 +24,7 @@ #define WIN32_NO_STATUS #include <winsock2.h> #include <windows.h> +#include <winternl.h> #include <ws2tcpip.h> #include <mswsock.h> #include <mstcpip.h> @@ -1005,7 +1006,7 @@ static void Init (void) { WORD ver = MAKEWORD (2, 2); WSADATA data; - HMODULE hws2_32 = GetModuleHandle("ws2_32.dll"); + HMODULE hws2_32 = GetModuleHandleA("ws2_32.dll"); pfreeaddrinfo = (void *)GetProcAddress(hws2_32, "freeaddrinfo"); pgetaddrinfo = (void *)GetProcAddress(hws2_32, "getaddrinfo"); @@ -1394,7 +1395,7 @@ static void test_ip_pktinfo(void) int i, err; memset(&ov, 0, sizeof(ov)); - ov.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + ov.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); if (ov.hEvent == INVALID_HANDLE_VALUE) { skip("Could not create event object, some tests will be skipped. errno = %d\n", GetLastError()); @@ -1756,7 +1757,7 @@ static void test_getservbyname(void) HANDLE starttest, thread[NUM_THREADS]; DWORD thread_id[NUM_THREADS]; - starttest = CreateEvent ( NULL, 1, 0, "test_getservbyname_starttest" ); + starttest = CreateEventA ( NULL, 1, 0, "test_getservbyname_starttest" ); /* create threads */ for ( i = 0; i < NUM_THREADS; i++ ) { @@ -3106,7 +3107,7 @@ static DWORD WINAPI AcceptKillThread(void *param) static int CALLBACK AlwaysDeferConditionFunc(LPWSABUF lpCallerId, LPWSABUF lpCallerData, LPQOS pQos, LPQOS lpGQOS, LPWSABUF lpCalleeId, LPWSABUF lpCalleeData, - GROUP FAR * g, DWORD_PTR dwCallbackData) + GROUP *g, DWORD_PTR dwCallbackData) { return CF_DEFER; } @@ -3919,7 +3920,7 @@ static void test_send(void) buf.buf = buffer; buf.len = buflen; - ov.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + ov.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); ok(ov.hEvent != NULL, "could not create event object, errno = %d\n", GetLastError()); if (!ov.hEvent) goto end; @@ -4015,7 +4016,7 @@ static LRESULT CALLBACK ws2_test_WndProc(HWND hwnd, UINT msg, WPARAM wparam, LPA return 0; } - return DefWindowProc(hwnd, msg, wparam, lparam); + return DefWindowProcA(hwnd, msg, wparam, lparam); } static void get_event_details(int event, int *bit, char *name) @@ -4271,7 +4272,7 @@ static void test_events(int useMessages) struct sockaddr_in addr; HANDLE hThread = NULL; HANDLE hEvent = INVALID_HANDLE_VALUE, hEvent2 = INVALID_HANDLE_VALUE; - WNDCLASSEX wndclass; + WNDCLASSEXA wndclass; HWND hWnd = NULL; char *buffer = NULL; int bufferSize = 1024*1024; @@ -4341,16 +4342,17 @@ static void test_events(int useMessages) wndclass.lpfnWndProc = ws2_test_WndProc; wndclass.cbClsExtra = 0; wndclass.cbWndExtra = 0; - wndclass.hInstance = GetModuleHandle(NULL); - wndclass.hIcon = LoadIcon(NULL, IDI_APPLICATION); - wndclass.hIconSm = LoadIcon(NULL, IDI_APPLICATION); - wndclass.hCursor = LoadCursor(NULL, IDC_ARROW); + wndclass.hInstance = GetModuleHandleA(NULL); + wndclass.hIcon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + wndclass.hIconSm = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + wndclass.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndclass.lpszClassName = szClassName; wndclass.lpszMenuName = NULL; - RegisterClassEx(&wndclass); + RegisterClassExA(&wndclass); - hWnd = CreateWindow(szClassName, "WS2Test", WS_OVERLAPPEDWINDOW, 0, 0, 500, 500, NULL, NULL, GetModuleHandle(NULL), NULL); + hWnd = CreateWindowA(szClassName, "WS2Test", WS_OVERLAPPEDWINDOW, + 0, 0, 500, 500, NULL, NULL, GetModuleHandleA(NULL), NULL); if (!hWnd) { ok(0, "failed to create window: %d\n", GetLastError()); @@ -4499,14 +4501,14 @@ static void test_events(int useMessages) goto end; } - ov.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + ov.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); if (ov.hEvent == NULL) { ok(0, "could not create event object, errno = %d\n", GetLastError()); goto end; } - ov2.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + ov2.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); if (ov2.hEvent == NULL) { ok(0, "could not create event object, errno = %d\n", GetLastError()); @@ -5128,7 +5130,7 @@ static void test_WSARecv(void) bufs.buf = buf; flags = 0; - ov.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + ov.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); ok(ov.hEvent != NULL, "could not create event object, errno = %d\n", GetLastError()); if (!ov.hEvent) goto end; @@ -5449,7 +5451,7 @@ static void test_ConnectEx(void) ok(bret == FALSE && WSAGetLastError() == ERROR_INVALID_PARAMETER, "ConnectEx on a NULL overlapped " "returned %d + errno %d\n", bret, WSAGetLastError()); - overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); if (overlapped.hEvent == NULL) { skip("could not create event object, errno = %d\n", GetLastError()); goto end; @@ -5708,7 +5710,7 @@ static void test_AcceptEx(void) goto end; } - overlapped.hEvent = CreateEvent(NULL, FALSE, FALSE, NULL); + overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); if (overlapped.hEvent == NULL) { skip("could not create event object, errno = %d\n", GetLastError()); goto end; @@ -6270,16 +6272,16 @@ static HWND create_async_message_window(void) wndclass.cbClsExtra = 0; wndclass.cbWndExtra = 0; wndclass.hInstance = GetModuleHandleA(NULL); - wndclass.hIcon = LoadIconA(NULL, IDI_APPLICATION); - wndclass.hIconSm = LoadIconA(NULL, IDI_APPLICATION); - wndclass.hCursor = LoadCursorA(NULL, IDC_ARROW); + wndclass.hIcon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + wndclass.hIconSm = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + wndclass.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); wndclass.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); wndclass.lpszClassName = class_name; wndclass.lpszMenuName = NULL; RegisterClassExA(&wndclass); - hWnd = CreateWindow(class_name, "ws2_32 async message window", WS_OVERLAPPEDWINDOW, + hWnd = CreateWindowA(class_name, "ws2_32 async message window", WS_OVERLAPPEDWINDOW, 0, 0, 500, 500, NULL, NULL, GetModuleHandleA(NULL), NULL); if (!hWnd) { @@ -6637,8 +6639,8 @@ static void test_completion_port(void) io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); - WSADuplicateSocket( src, GetCurrentProcessId(), &info ); - dup = WSASocket(AF_INET, SOCK_STREAM, 0, &info, 0, WSA_FLAG_OVERLAPPED); + WSADuplicateSocketA( src, GetCurrentProcessId(), &info ); + dup = WSASocketA(AF_INET, SOCK_STREAM, 0, &info, 0, WSA_FLAG_OVERLAPPED); ok(dup != INVALID_SOCKET, "failed to duplicate socket!\n"); bret = pAcceptEx(dup, dest, buf, sizeof(buf) - 2*(sizeof(struct sockaddr_in) + 16), @@ -6696,8 +6698,8 @@ static void test_completion_port(void) io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); - WSADuplicateSocket( src, GetCurrentProcessId(), &info ); - dup = WSASocket(AF_INET, SOCK_STREAM, 0, &info, 0, WSA_FLAG_OVERLAPPED); + WSADuplicateSocketA( src, GetCurrentProcessId(), &info ); + dup = WSASocketA(AF_INET, SOCK_STREAM, 0, &info, 0, WSA_FLAG_OVERLAPPED); ok(dup != INVALID_SOCKET, "failed to duplicate socket!\n"); bret = pAcceptEx(dup, dest, buf, sizeof(buf) - 2*(sizeof(struct sockaddr_in) + 16), @@ -6763,8 +6765,8 @@ static void test_completion_port(void) io_port = CreateIoCompletionPort((HANDLE)src, previous_port, 125, 0); ok(io_port != NULL, "failed to create completion port %u\n", GetLastError()); - WSADuplicateSocket( src, GetCurrentProcessId(), &info ); - dup = WSASocket(AF_INET, SOCK_STREAM, 0, &info, 0, WSA_FLAG_OVERLAPPED); + WSADuplicateSocketA( src, GetCurrentProcessId(), &info ); + dup = WSASocketA(AF_INET, SOCK_STREAM, 0, &info, 0, WSA_FLAG_OVERLAPPED); ok(dup != INVALID_SOCKET, "failed to duplicate socket!\n"); bret = pAcceptEx(dup, dest, buf, sizeof(buf) - 2*(sizeof(struct sockaddr_in) + 16),

1 0

Frédéric Delanoy : d3dcompiler_43: Use BOOL type where appropriate.
by Alexandre Julliard Nov. 8, 2013

Nov. 8, 2013

Module: wine Branch: master Commit: 27947d2662bf282f507a6bcb46182a5f704699d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27947d2662bf282f507a6bcb4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 7 21:47:30 2013 +0100 d3dcompiler_43: Use BOOL type where appropriate. --- dlls/d3dcompiler_43/reflection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index 97d4148..9d59ce4 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -661,7 +661,7 @@ static BOOL STDMETHODCALLTYPE d3dcompiler_shader_reflection_IsSampleFrequencySha { FIXME("iface %p stub!\n", iface); - return 0; + return FALSE; } static UINT STDMETHODCALLTYPE d3dcompiler_shader_reflection_GetNumInterfaceSlots(

1 0

Saulius Krasuckas : comctl32/tests: Make updown. c compile with -D__WINESRC__.
by Alexandre Julliard Nov. 8, 2013

Nov. 8, 2013

Module: wine Branch: master Commit: f44ceec023dbe7b5bf6f588ceb703fca13164022 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f44ceec023dbe7b5bf6f588ce… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Sat Oct 19 23:33:28 2013 +0300 comctl32/tests: Make updown.c compile with -D__WINESRC__. --- dlls/comctl32/tests/updown.c | 128 +++++++++++++++++++++--------------------- 1 files changed, 64 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f44ceec023dbe7b5bf6f5…

1 0