July 2018 - Wine-Commits - list.winehq.org

Alexandre Julliard : Wine release 3.12
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: website Branch: master Commit: 8633d247f40a09ca7e6d4f611c217b2636d910ce URL: https://source.winehq.org/git/website.git/?a=commit;h=8633d247f40a09ca7e6d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 9 23:01:07 2018 +0200 Wine release 3.12 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018070901.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2018070901.xml b/news/en/2018070901.xml new file mode 100644 index 0000000..28582b3 --- /dev/null +++ b/news/en/2018070901.xml @@ -0,0 +1,16 @@ +<news> +<date>July 9, 2018</date> +<title>Wine 3.12 Released</title> +<body> + The Wine development release 3.12 is now available. + <a href="{$root}/announce/3.12">What's new</a> in this release: +<ul> + <li>Unicode data updated to Unicode 11.0.0.</li> + <li>Proxy configuration dialog in the Internet control panel.</li> + <li>Syntax fixes in the Cmd.exe command intepreter.</li> + <li>Some more glyphs in the Wingdings font.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.12.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-3.12 : Alexandre Julliard : Release 3.12
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: refs/tags/wine-3.12 Tag: 49c531c4e78d5787496586062b3bebd263bb6ebe URL: https://source.winehq.org/git/wine.git/?a=tag;h=49c531c4e78d5787496586062b3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 9 22:58:16 2018 +0200 Release 3.12

1 0

Alexandre Julliard : Release 3.12.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 8ef224fa43869a8c977921d6bec08863382d6e11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ef224fa43869a8c977921d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 9 22:58:15 2018 +0200 Release 3.12. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 519 ++++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +-- 4 files changed, 294 insertions(+), 246 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8ef224fa43869a8c9779…

1 0

Michael Stefaniuc : oleview: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 4341c4495f1b21e8067d806989f41c8cf13c5e5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4341c4495f1b21e8067d8069… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jul 9 20:59:15 2018 +0200 oleview: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/oleview/details.c | 16 +++++++--------- programs/oleview/interface.c | 10 ++++------ programs/oleview/oleview.c | 21 ++++++++++----------- programs/oleview/tree.c | 25 +++++++++++-------------- programs/oleview/typelib.c | 16 +++++++--------- 5 files changed, 39 insertions(+), 49 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4341c4495f1b21e8067d…

1 0

Michael Stefaniuc : netapi32: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 2f4f1399d17318a8be5c449a25e4994c9e9cbc35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f4f1399d17318a8be5c449a… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jul 9 20:59:17 2018 +0200 netapi32: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/netapi32/nbt.c | 8 +++----- dlls/netapi32/netapi32.c | 12 ++++++------ dlls/netapi32/netbios.c | 2 +- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/netapi32/nbt.c b/dlls/netapi32/nbt.c index 207bd66..4816630 100644 --- a/dlls/netapi32/nbt.c +++ b/dlls/netapi32/nbt.c @@ -1095,8 +1095,7 @@ static UCHAR NetBTSend(void *adapt, void *sess, PNCB ncb) wsaBufs[1].len = ncb->ncb_length; wsaBufs[1].buf = (char*)ncb->ncb_buffer; - r = WSASend(session->fd, wsaBufs, sizeof(wsaBufs) / sizeof(wsaBufs[0]), - &bytesSent, 0, NULL, NULL); + r = WSASend(session->fd, wsaBufs, ARRAY_SIZE(wsaBufs), &bytesSent, 0, NULL, NULL); if (r == SOCKET_ERROR) { NetBIOSHangupSession(ncb); @@ -1523,10 +1522,9 @@ void NetBTInit(void) char nsString[16]; DWORD size, ndx; - for (ndx = 0; ndx < sizeof(nsValueNames) / sizeof(nsValueNames[0]); - ndx++) + for (ndx = 0; ndx < ARRAY_SIZE(nsValueNames); ndx++) { - size = sizeof(nsString) / sizeof(char); + size = ARRAY_SIZE(nsString); if (RegQueryValueExA(hKey, nsValueNames[ndx], NULL, NULL, (LPBYTE)nsString, &size) == ERROR_SUCCESS) { diff --git a/dlls/netapi32/netapi32.c b/dlls/netapi32/netapi32.c index ff57c22..afeada6 100644 --- a/dlls/netapi32/netapi32.c +++ b/dlls/netapi32/netapi32.c @@ -923,7 +923,7 @@ static NET_API_STATUS wksta_getinfo( LMSTR servername, DWORD level, LPBYTE *buf static BOOL NETAPI_IsLocalComputer( LMCSTR name ) { WCHAR buf[MAX_COMPUTERNAME_LENGTH + 1]; - DWORD size = sizeof(buf) / sizeof(buf[0]); + DWORD size = ARRAY_SIZE(buf); BOOL ret; if (!name || !name[0]) return TRUE; @@ -2360,7 +2360,7 @@ NetUserEnum(LPCWSTR servername, DWORD level, DWORD filter, LPBYTE* bufptr, { NET_API_STATUS status; WCHAR user[UNLEN + 1]; - DWORD size, len = sizeof(user)/sizeof(user[0]); + DWORD size, len = ARRAY_SIZE(user); TRACE("(%s, %u, 0x%x, %p, %u, %p, %p, %p)\n", debugstr_w(servername), level, filter, bufptr, prefmaxlen, entriesread, totalentries, resume_handle); @@ -3477,8 +3477,8 @@ DWORD WINAPI DavGetUNCFromHTTPPath(const WCHAR *http_path, WCHAR *buf, DWORD *bu TRACE("(%s %p %p)\n", debugstr_w(http_path), buf, buflen); while (*p && *p != ':') { p++; len++; }; - if (len == sizeof(httpW)/sizeof(httpW[0]) && !memicmpW( http_path, httpW, len )) ssl = FALSE; - else if (len == sizeof(httpsW)/sizeof(httpsW[0]) && !memicmpW( http_path, httpsW, len )) ssl = TRUE; + if (len == ARRAY_SIZE(httpW) && !memicmpW( http_path, httpW, len )) ssl = FALSE; + else if (len == ARRAY_SIZE(httpsW) && !memicmpW( http_path, httpsW, len )) ssl = TRUE; else return ERROR_INVALID_PARAMETER; if (p[0] != ':' || p[1] != '/' || p[2] != '/') return ERROR_INVALID_PARAMETER; @@ -3506,7 +3506,7 @@ DWORD WINAPI DavGetUNCFromHTTPPath(const WCHAR *http_path, WCHAR *buf, DWORD *bu len = len_server + 2; /* \\ */ if (ssl) len += 4; /* @SSL */ if (port) len += len_port + 1 /* @ */; - len += sizeof(davrootW)/sizeof(davrootW[0]); + len += ARRAY_SIZE(davrootW); len += len_path + 1; /* nul */ if (*buflen < len) @@ -3531,7 +3531,7 @@ DWORD WINAPI DavGetUNCFromHTTPPath(const WCHAR *http_path, WCHAR *buf, DWORD *bu buf += len_port; } memcpy( buf, davrootW, sizeof(davrootW) ); - buf += sizeof(davrootW)/sizeof(davrootW[0]); + buf += ARRAY_SIZE(davrootW); for (i = 0; i < len_path; i++) { if (path[i] == '/') *buf++ = '\\'; diff --git a/dlls/netapi32/netbios.c b/dlls/netapi32/netbios.c index e16c5dc..0d2bb0e 100644 --- a/dlls/netapi32/netbios.c +++ b/dlls/netapi32/netbios.c @@ -135,7 +135,7 @@ BOOL NetBIOSRegisterTransport(ULONG id, NetBIOSTransport *transport) TRACE(": transport 0x%08x, p %p\n", id, transport); if (!transport) ret = FALSE; - else if (gNumTransports >= sizeof(gTransports) / sizeof(gTransports[0])) + else if (gNumTransports >= ARRAY_SIZE(gTransports)) { FIXME("Too many transports %d\n", gNumTransports + 1); ret = FALSE;

1 0

Michael Stefaniuc : credui: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 973ac43d653e3bdfe51388ba0d414ae75f105f4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=973ac43d653e3bdfe51388ba… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jul 9 20:59:18 2018 +0200 credui: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/credui/credui_main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/credui/credui_main.c b/dlls/credui/credui_main.c index a4df9fe..bf9f7d1 100644 --- a/dlls/credui/credui_main.c +++ b/dlls/credui/credui_main.c @@ -206,7 +206,7 @@ static void CredDialogCreateBalloonTip(HWND hwndDlg, struct cred_dialog_params * SetWindowPos(params->hwndBalloonTip, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); - if (!LoadStringW(hinstCredUI, IDS_INCORRECTPASSWORD, wszText, sizeof(wszText)/sizeof(wszText[0]))) + if (!LoadStringW(hinstCredUI, IDS_INCORRECTPASSWORD, wszText, ARRAY_SIZE(wszText))) { ERR("failed to load IDS_INCORRECTPASSWORD\n"); return; @@ -223,7 +223,7 @@ static void CredDialogCreateBalloonTip(HWND hwndDlg, struct cred_dialog_params * toolinfo.lpReserved = NULL; SendMessageW(params->hwndBalloonTip, TTM_ADDTOOLW, 0, (LPARAM)&toolinfo); - if (!LoadStringW(hinstCredUI, IDS_CAPSLOCKON, wszText, sizeof(wszText)/sizeof(wszText[0]))) + if (!LoadStringW(hinstCredUI, IDS_CAPSLOCKON, wszText, ARRAY_SIZE(wszText))) { ERR("failed to load IDS_CAPSLOCKON\n"); return; @@ -251,7 +251,7 @@ static void CredDialogShowIncorrectPasswordBalloon(HWND hwndDlg, struct cred_dia if (params->fBalloonTipActive) return; - if (!LoadStringW(hinstCredUI, IDS_INCORRECTPASSWORDTITLE, wszTitle, sizeof(wszTitle)/sizeof(wszTitle[0]))) + if (!LoadStringW(hinstCredUI, IDS_INCORRECTPASSWORDTITLE, wszTitle, ARRAY_SIZE(wszTitle))) { ERR("failed to load IDS_INCORRECTPASSWORDTITLE\n"); return; @@ -289,7 +289,7 @@ static void CredDialogShowCapsLockBalloon(HWND hwndDlg, struct cred_dialog_param if (params->fBalloonTipActive) return; - if (!LoadStringW(hinstCredUI, IDS_CAPSLOCKONTITLE, wszTitle, sizeof(wszTitle)/sizeof(wszTitle[0]))) + if (!LoadStringW(hinstCredUI, IDS_CAPSLOCKONTITLE, wszTitle, ARRAY_SIZE(wszTitle))) { ERR("failed to load IDS_IDSCAPSLOCKONTITLE\n"); return; @@ -383,8 +383,8 @@ static BOOL CredDialogInit(HWND hwndDlg, struct cred_dialog_params *params) { WCHAR format[256]; WCHAR message[256]; - LoadStringW(hinstCredUI, IDS_MESSAGEFORMAT, format, sizeof(format)/sizeof(format[0])); - snprintfW(message, sizeof(message)/sizeof(message[0]), format, params->pszTargetName); + LoadStringW(hinstCredUI, IDS_MESSAGEFORMAT, format, ARRAY_SIZE(format)); + snprintfW(message, ARRAY_SIZE(message), format, params->pszTargetName); SetDlgItemTextW(hwndDlg, IDC_MESSAGE, message); } SetWindowTextW(hwndUsername, params->pszUsername); @@ -408,8 +408,8 @@ static BOOL CredDialogInit(HWND hwndDlg, struct cred_dialog_params *params) { WCHAR format[256]; WCHAR title[256]; - LoadStringW(hinstCredUI, IDS_TITLEFORMAT, format, sizeof(format)/sizeof(format[0])); - snprintfW(title, sizeof(title)/sizeof(title[0]), format, params->pszTargetName); + LoadStringW(hinstCredUI, IDS_TITLEFORMAT, format, ARRAY_SIZE(format)); + snprintfW(title, ARRAY_SIZE(title), format, params->pszTargetName); SetWindowTextW(hwndDlg, title); } @@ -867,8 +867,8 @@ ULONG SEC_ENTRY SspiPromptForCredentialsW( PCWSTR target, void *info, static const WCHAR negotiateW[] = {'N','e','g','o','t','i','a','t','e',0}; WCHAR username[CREDUI_MAX_USERNAME_LENGTH + 1] = {0}; WCHAR password[CREDUI_MAX_PASSWORD_LENGTH + 1] = {0}; - DWORD len_username = sizeof(username) / sizeof(username[0]); - DWORD len_password = sizeof(password) / sizeof(password[0]); + DWORD len_username = ARRAY_SIZE(username); + DWORD len_password = ARRAY_SIZE(password); DWORD ret, flags; CREDUI_INFOW *cred_info = info; SEC_WINNT_AUTH_IDENTITY_W *id = input_id;

1 0

Michael Stefaniuc : view: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: e9e96bc39afd3acaf9ca6bb0f5f68ad017de138f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9e96bc39afd3acaf9ca6bb0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jul 9 20:59:14 2018 +0200 view: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/view/view.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/view/view.c b/programs/view/view.c index 0adade7..3191529 100644 --- a/programs/view/view.c +++ b/programs/view/view.c @@ -214,12 +214,12 @@ static void UpdateWindowCaption(void) WCHAR szView[MAX_PATH]; static const WCHAR hyphenW[] = { ' ','-',' ',0 }; - LoadStringW(hInst, IDS_DESCRIPTION, szView, sizeof(szView)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_DESCRIPTION, szView, ARRAY_SIZE(szView)); if (szFileTitle[0] != '\0') { lstrcpyW(szCaption, szFileTitle); - LoadStringW(hInst, IDS_DESCRIPTION, szView, sizeof(szView)/sizeof(WCHAR)); + LoadStringW(hInst, IDS_DESCRIPTION, szView, ARRAY_SIZE(szView)); lstrcatW(szCaption, hyphenW); lstrcatW(szCaption, szView); } @@ -260,10 +260,10 @@ static LRESULT CALLBACK WndProc(HWND hwnd, UINT uMessage, WPARAM wparam, LPARAM case IDM_OPEN: { WCHAR filename[MAX_PATH]; - if (FileOpen(hwnd, filename, sizeof(filename)/sizeof(WCHAR))) + if (FileOpen(hwnd, filename, ARRAY_SIZE(filename))) { szFileTitle[0] = 0; - GetFileTitleW(filename, szFileTitle, sizeof(szFileTitle)/sizeof(WCHAR)); + GetFileTitleW(filename, szFileTitle, ARRAY_SIZE(szFileTitle)); DoOpenFile(filename); UpdateWindowCaption(); } @@ -323,7 +323,7 @@ static BOOL InitApplication(HINSTANCE hInstance) WNDCLASSEXW wc; /* Load the application description strings */ - LoadStringW(hInstance, IDS_DESCRIPTION, szTitle, sizeof(szTitle)/sizeof(WCHAR)); + LoadStringW(hInstance, IDS_DESCRIPTION, szTitle, ARRAY_SIZE(szTitle)); /* Fill in window class structure with parameters that describe the main window */ @@ -390,7 +390,7 @@ static void HandleCommandLine(LPWSTR cmdline) cmdline[lstrlenW(cmdline) - 1] = 0; } szFileTitle[0] = 0; - GetFileTitleW(cmdline, szFileTitle, sizeof(szFileTitle)/sizeof(WCHAR)); + GetFileTitleW(cmdline, szFileTitle, ARRAY_SIZE(szFileTitle)); DoOpenFile(cmdline); UpdateWindowCaption(); }

1 0

Nikolay Sivov : urlmon: Use ARRAY_SIZE() macro.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 8665a60680079e71d3ea63329f8d818b288d7494 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8665a60680079e71d3ea6332… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 5 18:22:32 2018 +0300 urlmon: Use ARRAY_SIZE() macro. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/axinstall.c | 24 ++++++++++++------------ dlls/urlmon/binding.c | 2 +- dlls/urlmon/file.c | 2 +- dlls/urlmon/http.c | 4 ++-- dlls/urlmon/internet.c | 2 +- dlls/urlmon/mimefilter.c | 14 +++++++------- dlls/urlmon/sec_mgr.c | 8 ++++---- dlls/urlmon/session.c | 10 ++++------ dlls/urlmon/umon.c | 4 ++-- dlls/urlmon/uri.c | 18 +++++++++--------- 10 files changed, 43 insertions(+), 45 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8665a60680079e71d3ea…

1 0

Michael Stefaniuc : cryptui: Use the ARRAY_SIZE() macro.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 56c4c7c57e74f2237b7d52c7d5f03996e96f66f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56c4c7c57e74f2237b7d52c7… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jul 9 20:59:13 2018 +0200 cryptui: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cryptui/main.c | 221 ++++++++++++++++++++-------------------------------- 1 file changed, 83 insertions(+), 138 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=56c4c7c57e74f2237b7d…

1 0

Michael Stefaniuc : msvcr100/test: Replace a macro with ARRAY_SIZE.
by Alexandre Julliard July 9, 2018

July 9, 2018

Module: wine Branch: master Commit: 47ba18d601b56a4026c53ecb33b3d436e7a430dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=47ba18d601b56a4026c53ecb… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 5 22:07:18 2018 +0200 msvcr100/test: Replace a macro with ARRAY_SIZE. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/tests/msvcr100.c | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index bd95991..db5a4cb 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -363,8 +363,6 @@ static BOOL init(void) return TRUE; } -#define NUMELMS(array) (sizeof(array)/sizeof((array)[0])) - #define okwchars(dst, b0, b1, b2, b3, b4, b5, b6, b7) \ ok(dst[0] == b0 && dst[1] == b1 && dst[2] == b2 && dst[3] == b3 && \ dst[4] == b4 && dst[5] == b5 && dst[6] == b6 && dst[7] == b7, \ @@ -384,7 +382,7 @@ static void test_wmemcpy_s(void) /* Normal */ memset(dest, 'X', sizeof(dest)); - ret = p_wmemcpy_s(dest, NUMELMS(dest), tiny, NUMELMS(tiny)); + ret = p_wmemcpy_s(dest, ARRAY_SIZE(dest), tiny, ARRAY_SIZE(tiny)); ok(ret == 0, "Copying a buffer into a big enough destination returned %d, expected 0\n", ret); okwchars(dest, tiny[0], tiny[1], tiny[2], tiny[3], tiny[4], tiny[5], XX, XX); @@ -392,7 +390,7 @@ static void test_wmemcpy_s(void) errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); memset(dest, 'X', sizeof(dest)); - ret = p_wmemcpy_s(dest, NUMELMS(dest), big, NUMELMS(big)); + ret = p_wmemcpy_s(dest, ARRAY_SIZE(dest), big, ARRAY_SIZE(big)); ok(errno == ERANGE, "Copying a big buffer to a small destination errno %d, expected ERANGE\n", errno); ok(ret == ERANGE, "Copying a big buffer to a small destination returned %d, expected ERANGE\n", ret); okwchars(dest, 0, 0, 0, 0, 0, 0, 0, 0); @@ -402,7 +400,7 @@ static void test_wmemcpy_s(void) errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); memset(dest, 'X', sizeof(dest)); - ret = p_wmemcpy_s(dest, NUMELMS(dest), NULL, NUMELMS(tiny)); + ret = p_wmemcpy_s(dest, ARRAY_SIZE(dest), NULL, ARRAY_SIZE(tiny)); ok(errno == EINVAL, "Copying a NULL source buffer errno %d, expected EINVAL\n", errno); ok(ret == EINVAL, "Copying a NULL source buffer returned %d, expected EINVAL\n", ret); okwchars(dest, 0, 0, 0, 0, 0, 0, 0, 0); @@ -412,7 +410,7 @@ static void test_wmemcpy_s(void) errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); memset(dest, 'X', sizeof(dest)); - ret = p_wmemcpy_s(dest, 0, tiny, NUMELMS(tiny)); + ret = p_wmemcpy_s(dest, 0, tiny, ARRAY_SIZE(tiny)); ok(errno == ERANGE, "Copying into a destination of size 0 errno %d, expected ERANGE\n", errno); ok(ret == ERANGE, "Copying into a destination of size 0 returned %d, expected ERANGE\n", ret); okwchars(dest, XX, XX, XX, XX, XX, XX, XX, XX); @@ -421,7 +419,7 @@ static void test_wmemcpy_s(void) /* Replace dest with NULL */ errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); - ret = p_wmemcpy_s(NULL, NUMELMS(dest), tiny, NUMELMS(tiny)); + ret = p_wmemcpy_s(NULL, ARRAY_SIZE(dest), tiny, ARRAY_SIZE(tiny)); ok(errno == EINVAL, "Copying a tiny buffer to a big NULL destination errno %d, expected EINVAL\n", errno); ok(ret == EINVAL, "Copying a tiny buffer to a big NULL destination returned %d, expected EINVAL\n", ret); CHECK_CALLED(invalid_parameter_handler); @@ -430,7 +428,7 @@ static void test_wmemcpy_s(void) errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); memset(dest, 'X', sizeof(dest)); - ret = p_wmemcpy_s(dest, 0, NULL, NUMELMS(tiny)); + ret = p_wmemcpy_s(dest, 0, NULL, ARRAY_SIZE(tiny)); ok(errno == EINVAL, "Copying a NULL buffer into a destination of size 0 errno %d, expected EINVAL\n", errno); ok(ret == EINVAL, "Copying a NULL buffer into a destination of size 0 returned %d, expected EINVAL\n", ret); okwchars(dest, XX, XX, XX, XX, XX, XX, XX, XX); @@ -453,13 +451,13 @@ static void test_wmemmove_s(void) /* Normal */ memset(dest, 'X', sizeof(dest)); - ret = p_wmemmove_s(dest, NUMELMS(dest), tiny, NUMELMS(tiny)); + ret = p_wmemmove_s(dest, ARRAY_SIZE(dest), tiny, ARRAY_SIZE(tiny)); ok(ret == 0, "Moving a buffer into a big enough destination returned %d, expected 0\n", ret); okwchars(dest, tiny[0], tiny[1], tiny[2], tiny[3], tiny[4], tiny[5], XX, XX); /* Overlapping */ memcpy(dest, big, sizeof(dest)); - ret = p_wmemmove_s(dest+1, NUMELMS(dest)-1, dest, NUMELMS(dest)-1); + ret = p_wmemmove_s(dest+1, ARRAY_SIZE(dest)-1, dest, ARRAY_SIZE(dest)-1); ok(ret == 0, "Moving a buffer up one char returned %d, expected 0\n", ret); okwchars(dest, big[0], big[0], big[1], big[2], big[3], big[4], big[5], big[6]); @@ -467,7 +465,7 @@ static void test_wmemmove_s(void) errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); memset(dest, 'X', sizeof(dest)); - ret = p_wmemmove_s(dest, NUMELMS(dest), big, NUMELMS(big)); + ret = p_wmemmove_s(dest, ARRAY_SIZE(dest), big, ARRAY_SIZE(big)); ok(errno == ERANGE, "Moving a big buffer to a small destination errno %d, expected ERANGE\n", errno); ok(ret == ERANGE, "Moving a big buffer to a small destination returned %d, expected ERANGE\n", ret); okwchars(dest, XX, XX, XX, XX, XX, XX, XX, XX); @@ -477,7 +475,7 @@ static void test_wmemmove_s(void) errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); memset(dest, 'X', sizeof(dest)); - ret = p_wmemmove_s(dest, NUMELMS(dest), NULL, NUMELMS(tiny)); + ret = p_wmemmove_s(dest, ARRAY_SIZE(dest), NULL, ARRAY_SIZE(tiny)); ok(errno == EINVAL, "Moving a NULL source buffer errno %d, expected EINVAL\n", errno); ok(ret == EINVAL, "Moving a NULL source buffer returned %d, expected EINVAL\n", ret); okwchars(dest, XX, XX, XX, XX, XX, XX, XX, XX); @@ -487,7 +485,7 @@ static void test_wmemmove_s(void) errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); memset(dest, 'X', sizeof(dest)); - ret = p_wmemmove_s(dest, 0, tiny, NUMELMS(tiny)); + ret = p_wmemmove_s(dest, 0, tiny, ARRAY_SIZE(tiny)); ok(errno == ERANGE, "Moving into a destination of size 0 errno %d, expected ERANGE\n", errno); ok(ret == ERANGE, "Moving into a destination of size 0 returned %d, expected ERANGE\n", ret); okwchars(dest, XX, XX, XX, XX, XX, XX, XX, XX); @@ -496,7 +494,7 @@ static void test_wmemmove_s(void) /* Replace dest with NULL */ errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); - ret = p_wmemmove_s(NULL, NUMELMS(dest), tiny, NUMELMS(tiny)); + ret = p_wmemmove_s(NULL, ARRAY_SIZE(dest), tiny, ARRAY_SIZE(tiny)); ok(errno == EINVAL, "Moving a tiny buffer to a big NULL destination errno %d, expected EINVAL\n", errno); ok(ret == EINVAL, "Moving a tiny buffer to a big NULL destination returned %d, expected EINVAL\n", ret); CHECK_CALLED(invalid_parameter_handler); @@ -505,7 +503,7 @@ static void test_wmemmove_s(void) errno = 0xdeadbeef; SET_EXPECT(invalid_parameter_handler); memset(dest, 'X', sizeof(dest)); - ret = p_wmemmove_s(dest, 0, NULL, NUMELMS(tiny)); + ret = p_wmemmove_s(dest, 0, NULL, ARRAY_SIZE(tiny)); ok(errno == EINVAL, "Moving a NULL buffer into a destination of size 0 errno %d, expected EINVAL\n", errno); ok(ret == EINVAL, "Moving a NULL buffer into a destination of size 0 returned %d, expected EINVAL\n", ret); okwchars(dest, XX, XX, XX, XX, XX, XX, XX, XX); @@ -824,7 +822,7 @@ static void test_event(void) event evt; event *evts[70]; HANDLE thread; - HANDLE threads[NUMELMS(evts)]; + HANDLE threads[ARRAY_SIZE(evts)]; call_func1(p_event_ctor, &evt); @@ -851,7 +849,7 @@ static void test_event(void) if (0) /* crashes on Windows */ p_event_wait_for_multiple(NULL, 10, TRUE, 0); - for (i = 0; i < NUMELMS(evts); i++) { + for (i = 0; i < ARRAY_SIZE(evts); i++) { evts[i] = malloc(sizeof(evt)); call_func1(p_event_ctor, evts[i]); } @@ -859,17 +857,17 @@ static void test_event(void) ret = p_event_wait_for_multiple(evts, 0, TRUE, 100); ok(!ret, "expected 0, got %d\n", ret); - ret = p_event_wait_for_multiple(evts, NUMELMS(evts), TRUE, 100); + ret = p_event_wait_for_multiple(evts, ARRAY_SIZE(evts), TRUE, 100); ok(ret == -1, "expected -1, got %d\n", ret); /* reset and test wait for multiple with all */ - for (i = 0; i < NUMELMS(evts); i++) + for (i = 0; i < ARRAY_SIZE(evts); i++) threads[i] = CreateThread(NULL, 0, test_event_thread, (void*)evts[i], 0, NULL); - ret = p_event_wait_for_multiple(evts, NUMELMS(evts), TRUE, 5000); + ret = p_event_wait_for_multiple(evts, ARRAY_SIZE(evts), TRUE, 5000); ok(ret != -1, "didn't expect -1\n"); - for (i = 0; i < NUMELMS(evts); i++) { + for (i = 0; i < ARRAY_SIZE(evts); i++) { WaitForSingleObject(threads[i], INFINITE); CloseHandle(threads[i]); } @@ -896,7 +894,7 @@ static void test_event(void) ret = p_event_wait_for_multiple(evts, 2, FALSE, 0); ok(ret == 1, "expected 1, got %d\n", ret); - for (i = 0; i < NUMELMS(evts); i++) { + for (i = 0; i < ARRAY_SIZE(evts); i++) { call_func1(p_event_dtor, evts[i]); free(evts[i]); }

1 0