November 2013 - Wine-commits

Saulius Krasuckas : comctl32/tests: Make status. c compile with -D__WINESRC__.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 529484603bbf7049e6aec8fea422c6911aaa00f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=529484603bbf7049e6aec8fea… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Sat Oct 19 21:30:47 2013 +0300 comctl32/tests: Make status.c compile with -D__WINESRC__. --- dlls/comctl32/tests/status.c | 196 +++++++++++++++++++++--------------------- 1 files changed, 98 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=529484603bbf7049e6aec…

1 0

Saulius Krasuckas : comctl32/tests: Make mru.c, pager.c and syslink. c compile with -D__WINESRC__.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 26ec350b73f490c2df8b0c87e8cff5545d8cb5bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=26ec350b73f490c2df8b0c87e… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Sat Oct 19 22:35:01 2013 +0300 comctl32/tests: Make mru.c, pager.c and syslink.c compile with -D__WINESRC__. --- dlls/comctl32/tests/mru.c | 8 ++++---- dlls/comctl32/tests/pager.c | 4 ++-- dlls/comctl32/tests/syslink.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index 1d8ad9a..5b5f98e 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -409,7 +409,7 @@ static void test_MRUListA(void) /* check entry 0 */ buffer[0] = 0; iRet = pEnumMRUListA(hMRU, 0, buffer, 255); - ok(iRet == lstrlen(checks[3]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[3]), iRet); + ok(iRet == lstrlenA(checks[3]), "EnumMRUList expected %d, got %d\n", lstrlenA(checks[3]), iRet); ok(strcmp(buffer, checks[3]) == 0, "EnumMRUList expected %s, got %s\n", checks[3], buffer); /* check entry 0 with a too small buffer */ @@ -418,7 +418,7 @@ static void test_MRUListA(void) buffer[2] = 'A'; /* unchanged */ buffer[3] = 0; /* unchanged */ iRet = pEnumMRUListA(hMRU, 0, buffer, 2); - ok(iRet == lstrlen(checks[3]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[3]), iRet); + ok(iRet == lstrlenA(checks[3]), "EnumMRUList expected %d, got %d\n", lstrlenA(checks[3]), iRet); ok(strcmp(buffer, "T") == 0, "EnumMRUList expected %s, got %s\n", "T", buffer); /* make sure space after buffer has old values */ ok(buffer[2] == 'A', "EnumMRUList expected %02x, got %02x\n", 'A', buffer[2]); @@ -426,13 +426,13 @@ static void test_MRUListA(void) /* check entry 1 */ buffer[0] = 0; iRet = pEnumMRUListA(hMRU, 1, buffer, 255); - ok(iRet == lstrlen(checks[1]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[1]), iRet); + ok(iRet == lstrlenA(checks[1]), "EnumMRUList expected %d, got %d\n", lstrlenA(checks[1]), iRet); ok(strcmp(buffer, checks[1]) == 0, "EnumMRUList expected %s, got %s\n", checks[1], buffer); /* check entry 2 */ buffer[0] = 0; iRet = pEnumMRUListA(hMRU, 2, buffer, 255); - ok(iRet == lstrlen(checks[2]), "EnumMRUList expected %d, got %d\n", lstrlen(checks[2]), iRet); + ok(iRet == lstrlenA(checks[2]), "EnumMRUList expected %d, got %d\n", lstrlenA(checks[2]), iRet); ok(strcmp(buffer, checks[2]) == 0, "EnumMRUList expected %s, got %s\n", checks[2], buffer); /* check out of bounds entry 3 */ diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 56cadaf..d352140 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -100,7 +100,7 @@ static BOOL register_parent_wnd_class(void) cls.cbWndExtra = 0; cls.hInstance = GetModuleHandleA(NULL); cls.hIcon = 0; - cls.hCursor = LoadCursorA(0, IDC_ARROW); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "Pager test parent class"; @@ -112,7 +112,7 @@ static HWND create_parent_window(void) if (!register_parent_wnd_class()) return NULL; - return CreateWindow("Pager test parent class", "Pager test parent window", + return CreateWindowA("Pager test parent class", "Pager test parent window", WS_OVERLAPPED | WS_VISIBLE, 0, 0, 200, 200, 0, NULL, GetModuleHandleA(NULL), NULL ); } diff --git a/dlls/comctl32/tests/syslink.c b/dlls/comctl32/tests/syslink.c index 26bd924..d493cb7 100644 --- a/dlls/comctl32/tests/syslink.c +++ b/dlls/comctl32/tests/syslink.c @@ -70,7 +70,7 @@ static void flush_events(void) while (diff > 0) { if (MsgWaitForMultipleObjects( 0, NULL, FALSE, min_timeout, QS_ALLINPUT ) == WAIT_TIMEOUT) break; - while (PeekMessage( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessage( &msg ); + while (PeekMessageA( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageA( &msg ); diff = time - GetTickCount(); } } @@ -245,8 +245,8 @@ START_TEST(syslink) /* Make the SysLink control visible */ flush_sequences(sequences, NUM_MSG_SEQUENCE); - oldstyle = GetWindowLong(hWndSysLink, GWL_STYLE); - SetWindowLong(hWndSysLink, GWL_STYLE, oldstyle | WS_VISIBLE); + oldstyle = GetWindowLongA(hWndSysLink, GWL_STYLE); + SetWindowLongA(hWndSysLink, GWL_STYLE, oldstyle | WS_VISIBLE); RedrawWindow(hWndSysLink, NULL, NULL, RDW_INVALIDATE); flush_events(); ok_sequence(sequences, SYSLINK_SEQ_INDEX, visible_syslink_wnd_seq, "visible SysLink", TRUE);

1 0

Saulius Krasuckas : comctl32/tests: Make tooltips. c compile with -D__WINESRC__.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 6d773fd979bd5c7e67b657c58e75a0a91e502982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d773fd979bd5c7e67b657c58… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Sat Oct 19 23:10:34 2013 +0300 comctl32/tests: Make tooltips.c compile with -D__WINESRC__. --- dlls/comctl32/tests/tooltips.c | 78 ++++++++++++++++++++-------------------- 1 files changed, 39 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6d773fd979bd5c7e67b65…

1 0

Saulius Krasuckas : comctl32/tests: Make updown. c compile with -D__WINESRC__.
by Alexandre Julliard 08 Nov '13

08 Nov '13

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

Saulius Krasuckas : comctl32/tests: Make propsheet. c compile with -D__WINESRC__.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 85aa34eea64a7a3f374ee8be4560fc252a1bfd93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85aa34eea64a7a3f374ee8be4… Author: Saulius Krasuckas <saulius2(a)ar.fi.lt> Date: Mon Nov 4 18:47:32 2013 +0200 comctl32/tests: Make propsheet.c compile with -D__WINESRC__. --- dlls/comctl32/tests/propsheet.c | 85 ++++++++++++++++++++------------------ 1 files changed, 45 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=85aa34eea64a7a3f374ee…

1 0

Frédéric Delanoy : comctl32/tests: Use BOOL type where appropriate.
by Alexandre Julliard 08 Nov '13

08 Nov '13

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

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

08 Nov '13

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

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

08 Nov '13

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

Frédéric Delanoy : d3drm/tests: Use BOOL type where appropriate.
by Alexandre Julliard 08 Nov '13

08 Nov '13

Module: wine Branch: master Commit: 464110b1cb088503fd19238c4f6e4bcb8b4bd4f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=464110b1cb088503fd19238c4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Nov 7 21:47:32 2013 +0100 d3drm/tests: Use BOOL type where appropriate. --- dlls/d3drm/tests/vector.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/tests/vector.c b/dlls/d3drm/tests/vector.c index c9e40fe..21a4695 100644 --- a/dlls/d3drm/tests/vector.c +++ b/dlls/d3drm/tests/vector.c @@ -28,14 +28,15 @@ #define expect_mat( expectedmat, gotmat)\ { \ - int i,j,equal=1; \ + int i,j; \ + BOOL equal = TRUE; \ for (i=0; i<4; i++)\ {\ for (j=0; j<4; j++)\ {\ if (fabs(expectedmat[i][j]-gotmat[i][j])>admit_error)\ {\ - equal=0;\ + equal = FALSE;\ }\ }\ }\

1 0

André Hentschel : ws2_32/tests: Enable compilation with -D__WINESRC__.
by Alexandre Julliard 08 Nov '13

08 Nov '13

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