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

Michael Stefaniuc : ieframe/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 11, 2018

June 11, 2018

Module: wine Branch: master Commit: 41623d621657b238dbb61cf8a619b89a22bcd5d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41623d621657b238dbb61cf8… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jun 7 23:44:37 2018 +0200 ieframe/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/tests/intshcut.c | 2 +- dlls/ieframe/tests/webbrowser.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ieframe/tests/intshcut.c b/dlls/ieframe/tests/intshcut.c index 0959a61..803e7ec 100644 --- a/dlls/ieframe/tests/intshcut.c +++ b/dlls/ieframe/tests/intshcut.c @@ -331,7 +331,7 @@ static void test_Load(void) GetTempPathW(MAX_PATH, file_path); lstrcatW(file_path, test_urlW); - for(test = load_tests; test < load_tests + sizeof(load_tests)/sizeof(*load_tests); test++) { + for(test = load_tests; test < load_tests + ARRAY_SIZE(load_tests); test++) { IPropertySetStorage *propsetstorage; IPropertyStorage *propstorage; PROPVARIANT v; diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index ca2a131..706d507 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -2167,7 +2167,7 @@ static void test_EnumVerbs(IWebBrowser2 *wb) fetched = 0xdeadbeef; memset(verbs, 0xa, sizeof(verbs)); verbs[1].lVerb = 0xdeadbeef; - hres = IEnumOLEVERB_Next(enum_verbs, sizeof(verbs)/sizeof(*verbs), verbs, &fetched); + hres = IEnumOLEVERB_Next(enum_verbs, ARRAY_SIZE(verbs), verbs, &fetched); ok(hres == S_OK, "Next failed: %08x\n", hres); ok(!fetched, "fetched = %d\n", fetched); /* Although fetched==0, an element is returned. */ @@ -2184,12 +2184,12 @@ static void test_EnumVerbs(IWebBrowser2 *wb) fetched = 0xdeadbeef; memset(verbs, 0xa, sizeof(verbs)); verbs[0].lVerb = 0xdeadbeef; - hres = IEnumOLEVERB_Next(enum_verbs, sizeof(verbs)/sizeof(*verbs), verbs, &fetched); + hres = IEnumOLEVERB_Next(enum_verbs, ARRAY_SIZE(verbs), verbs, &fetched); todo_wine ok(hres == S_OK, "Next failed: %08x\n", hres); todo_wine ok(fetched == 1, "fetched = %d\n", fetched); todo_wine ok(verbs[0].lVerb != 0xdeadbeef, "verbs[0].lVerb = %x\n", verbs[0].lVerb); - hres = IEnumOLEVERB_Next(enum_verbs, sizeof(verbs)/sizeof(*verbs), verbs, &fetched); + hres = IEnumOLEVERB_Next(enum_verbs, ARRAY_SIZE(verbs), verbs, &fetched); ok(hres == S_FALSE, "Next failed: %08x\n", hres); ok(!fetched, "fetched = %d\n", fetched);

1 0

Michael Stefaniuc : msvcr120/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 11, 2018

June 11, 2018

Module: wine Branch: master Commit: dd8a9897effa3f0b2fe67c5586e300bea2e02530 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd8a9897effa3f0b2fe67c55… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Jun 6 00:38:35 2018 +0200 msvcr120/tests: Use the available ARRAY_SIZE() macro. 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/msvcr120/tests/msvcr120.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 152bfdf..85e83a6 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -408,7 +408,7 @@ static void test_lconv(void) "Japanese", "Korean", "Spanish" }; - for(i = 0; i < sizeof(locstrs) / sizeof(char *); i ++) + for(i = 0; i < ARRAY_SIZE(locstrs); i ++) test_lconv_helper(locstrs[i]); } @@ -445,7 +445,7 @@ static void test__dpcomp(void) }; int i, ret; - for(i=0; i<sizeof(tests)/sizeof(*tests); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { ret = p__dpcomp(tests[i].x, tests[i].y); ok(ret == tests[i].ret, "%d) dpcomp(%f, %f) = %x\n", i, tests[i].x, tests[i].y, ret); } @@ -473,7 +473,7 @@ static void test____lc_locale_name_func(void) int i, j; wchar_t **lc_names; - for(i=0; i<sizeof(tests)/sizeof(*tests); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { if(!p_setlocale(LC_ALL, tests[i].locale)) continue; @@ -536,12 +536,11 @@ static void test__W_Gettnames(void) else ok(size==0x164, "structure size: %x\n", size); - for(i=0; i<sizeof(str)/sizeof(*str); i++) { + for(i=0; i<ARRAY_SIZE(str); i++) { ok(!strcmp(ret->str[i], str[i]), "ret->str[%d] = %s, expected %s\n", i, ret->str[i], str[i]); - MultiByteToWideChar(CP_ACP, 0, str[i], strlen(str[i])+1, - buf, sizeof(buf)/sizeof(*buf)); + MultiByteToWideChar(CP_ACP, 0, str[i], strlen(str[i])+1, buf, ARRAY_SIZE(buf)); ok(!lstrcmpW(ret->wstr[i], buf), "ret->wstr[%d] = %s, expected %s\n", i, wine_dbgstr_w(ret->wstr[i]), wine_dbgstr_w(buf)); } @@ -640,7 +639,7 @@ static void test_remainder(void) if(sizeof(void*) != 8) /* errno handling slightly different on 32-bit */ return; - for(i=0; i<sizeof(tests)/sizeof(*tests); i++) { + for(i=0; i<ARRAY_SIZE(tests); i++) { errno = -1; r = p_remainder(tests[i].x, tests[i].y); e = errno; @@ -907,7 +906,7 @@ static void test_wctype(void) }; int i, ret; - for(i=0; i<sizeof(properties)/sizeof(properties[0]); i++) { + for(i=0; i<ARRAY_SIZE(properties); i++) { ret = p_wctype(properties[i].name); ok(properties[i].mask == ret, "%d - Expected %x, got %x\n", i, properties[i].mask, ret); }

1 0

Dmitry Timoshkov : mstask/tests: Add more tests for IEnumWorkItems interface.
by Alexandre Julliard June 11, 2018

June 11, 2018

Module: wine Branch: master Commit: 74cc9b6741960a1765ec73091e645c942ca7d0d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74cc9b6741960a1765ec7309… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 11 17:24:38 2018 +0800 mstask/tests: Add more tests for IEnumWorkItems interface. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/tests/task_scheduler.c | 75 +++++++++++++++++++++++++++++++++++--- 1 file changed, 70 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index d476638..f610225 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -212,23 +212,88 @@ done: static void test_Enum(void) { + static const WCHAR Task1[] = { 'w','i','n','e','t','a','s','k','1',0 }; ITaskScheduler *scheduler; + ITask *task; IEnumWorkItems *tasks; + WCHAR **names; + ULONG fetched; HRESULT hr; hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskScheduler, (void **)&scheduler); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got %#x\n", hr); + + /* cleanup after previous runs */ + ITaskScheduler_Delete(scheduler, Task1); + + hr = ITaskScheduler_NewWorkItem(scheduler, Task1, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "got %#x\n", hr); + hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); + ok(hr == S_OK, "got %#x\n", hr); + + ITask_Release(task); -if (0) { /* crashes on win2k */ hr = ITaskScheduler_Enum(scheduler, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); -} + ok(hr == E_INVALIDARG, "got %#x\n", hr); hr = ITaskScheduler_Enum(scheduler, &tasks); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "got %#x\n", hr); + + names = (void *)0xdeadbeef; + fetched = 0xdeadbeef; + hr = IEnumWorkItems_Next(tasks, 0, &names, &fetched); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + ok(names == (void *)0xdeadbeef, "got %p\n", names); + ok(fetched == 0xdeadbeef, "got %#x\n", fetched); + + hr = IEnumWorkItems_Next(tasks, 1, NULL, NULL); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + + names = NULL; + hr = IEnumWorkItems_Next(tasks, 1, &names, NULL); + ok(hr == S_OK, "got %#x\n", hr); + ok(names != NULL, "got NULL\n"); + ok(names[0] != NULL, "got NULL\n"); + CoTaskMemFree(names[0]); + CoTaskMemFree(names); + + names = (void *)0xdeadbeef; + hr = IEnumWorkItems_Next(tasks, 2, &names, NULL); + ok(hr == E_INVALIDARG, "got %#x\n", hr); + ok(names == (void *)0xdeadbeef, "got %p\n", names); + + hr = IEnumWorkItems_Reset(tasks); + ok(hr == S_OK, "got %#x\n", hr); + + names = NULL; + fetched = 0xdeadbeef; + hr = IEnumWorkItems_Next(tasks, 1, &names, &fetched); + ok(hr == S_OK, "got %#x\n", hr); + ok(names != NULL, "got NULL\n"); + ok(names[0] != NULL, "got NULL\n"); + ok(fetched == 1, "got %u\n", fetched); + CoTaskMemFree(names[0]); + CoTaskMemFree(names); + + while (IEnumWorkItems_Skip(tasks, 1) == S_OK) + /* do nothing*/; + + hr = IEnumWorkItems_Skip(tasks, 1); + ok(hr == S_FALSE, "got %#x\n", hr); + + names = (void *)0xdeadbeef; + fetched = 0xdeadbeef; + hr = IEnumWorkItems_Next(tasks, 1, &names, &fetched); + ok(hr == S_FALSE, "got %#x\n", hr); + ok(names == NULL, "got %p\n", names); + ok(fetched == 0, "got %u\n", fetched); + IEnumWorkItems_Release(tasks); + hr = ITaskScheduler_Delete(scheduler, Task1); + ok(hr == S_OK, "got %#x\n", hr); + ITaskScheduler_Release(scheduler); }

1 0

Dmitry Timoshkov : mstask: Implement ITask::GetExitCode().
by Alexandre Julliard June 11, 2018

June 11, 2018

Module: wine Branch: master Commit: 9eca94fc1227a21dca5450929c71d4242369a9ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=9eca94fc1227a21dca545092… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 11 17:24:27 2018 +0800 mstask: Implement ITask::GetExitCode(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 266029a..7499826 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -685,8 +685,14 @@ static HRESULT WINAPI MSTASK_ITask_GetExitCode(ITask *iface, DWORD *exit_code) TRACE("(%p, %p)\n", iface, exit_code); + if (This->status == SCHED_S_TASK_NOT_SCHEDULED) + { + *exit_code = 0; + return SCHED_S_TASK_HAS_NOT_RUN; + } + *exit_code = This->exit_code; - return SCHED_S_TASK_HAS_NOT_RUN; /* FIXME */ + return S_OK; } static HRESULT WINAPI MSTASK_ITask_SetComment(ITask *iface, LPCWSTR comment)

1 0

Michael Stefaniuc : oleacc/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 11, 2018

June 11, 2018

Module: wine Branch: master Commit: 1144f0922973cf5ef95fdf7bbee7f096d722224c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1144f0922973cf5ef95fdf7b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jun 8 22:19:06 2018 +0200 oleacc/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleacc/tests/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 7a0737c..c62fa79 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -410,7 +410,7 @@ static void test_getroletext(void) memset(buff2W, 0, sizeof(buff2W)); ret = GetRoleTextW(role, NULL, 0); - GetRoleTextW(role, buff2W, sizeof(buff2W)/sizeof(WCHAR)); + GetRoleTextW(role, buff2W, ARRAY_SIZE(buff2W)); ok(ret == lstrlenW(buff2W), "GetRoleTextW: returned length doesn't match returned buffer for role %d\n", role); }

1 0

Nikolay Sivov : server: Use additional atom to keep base class name.
by Alexandre Julliard June 11, 2018

June 11, 2018

Module: wine Branch: master Commit: e7243523cbe7fc2c3512cdcf60290aa440cc6658 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7243523cbe7fc2c3512cdcf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 11 10:42:34 2018 +0300 server: Use additional atom to keep base class name. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 1 + include/wine/server_protocol.h | 4 +++- server/class.c | 27 +++++++++++++++++++++++++-- server/protocol.def | 1 + server/request.h | 3 ++- server/trace.c | 1 + 6 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index ce2830f..2b2d07f 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -487,6 +487,7 @@ static CLASS *CLASS_RegisterClass( LPCWSTR name, UINT basename_offset, HINSTANCE req->win_extra = winExtra; req->client_ptr = wine_server_client_ptr( classPtr ); req->atom = classPtr->atomName; + req->name_offset = basename_offset; if (!req->atom && name) wine_server_add_data( req, name, strlenW(name) * sizeof(WCHAR) ); ret = !wine_server_call_err( req ); classPtr->atomName = reply->atom; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 98dbcb7..e4c2d92 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4480,7 +4480,9 @@ struct create_class_request int extra; int win_extra; client_ptr_t client_ptr; + data_size_t name_offset; /* VARARG(name,unicode_str); */ + char __pad_52[4]; }; struct create_class_reply { @@ -6510,6 +6512,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 553 +#define SERVER_PROTOCOL_VERSION 554 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/class.c b/server/class.c index cc6e52d..d5f6712 100644 --- a/server/class.c +++ b/server/class.c @@ -46,6 +46,7 @@ struct window_class int count; /* reference count */ int local; /* local class? */ atom_t atom; /* class atom */ + atom_t base_atom; /* base class atom for versioned class */ mod_handle_t instance; /* module instance */ unsigned int style; /* class style */ int win_extra; /* number of window extra bytes */ @@ -151,17 +152,35 @@ DECL_HANDLER(create_class) { struct window_class *class; struct unicode_str name = get_req_unicode_str(); - atom_t atom; + atom_t atom, base_atom; if (name.len) { atom = add_global_atom( NULL, &name ); if (!atom) return; + if (req->name_offset && req->name_offset < name.len / sizeof(WCHAR)) + { + name.str += req->name_offset; + name.len -= req->name_offset * sizeof(WCHAR); + + base_atom = add_global_atom( NULL, &name ); + if (!base_atom) + { + release_global_atom( NULL, atom ); + return; + } + } + else + { + base_atom = atom; + grab_global_atom( NULL, atom ); + } } else { - atom = req->atom; + base_atom = atom = req->atom; if (!grab_global_atom( NULL, atom )) return; + grab_global_atom( NULL, base_atom ); } class = find_class( current->process, atom, req->instance ); @@ -169,6 +188,7 @@ DECL_HANDLER(create_class) { set_win32_error( ERROR_CLASS_ALREADY_EXISTS ); release_global_atom( NULL, atom ); + release_global_atom( NULL, base_atom ); return; } if (req->extra < 0 || req->extra > 4096 || req->win_extra < 0 || req->win_extra > 4096) @@ -176,15 +196,18 @@ DECL_HANDLER(create_class) /* don't allow stupid values here */ set_error( STATUS_INVALID_PARAMETER ); release_global_atom( NULL, atom ); + release_global_atom( NULL, base_atom ); return; } if (!(class = create_class( current->process, req->extra, req->local ))) { release_global_atom( NULL, atom ); + release_global_atom( NULL, base_atom ); return; } class->atom = atom; + class->base_atom = base_atom; class->instance = req->instance; class->style = req->style; class->win_extra = req->win_extra; diff --git a/server/protocol.def b/server/protocol.def index 99e7221..c533f1b 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3149,6 +3149,7 @@ enum caret_state int extra; /* number of extra class bytes */ int win_extra; /* number of window extra bytes */ client_ptr_t client_ptr; /* pointer to class in client address space */ + data_size_t name_offset; /* base class name offset for specified atom */ VARARG(name,unicode_str); /* class name */ @REPLY atom_t atom; /* resulting class atom */ diff --git a/server/request.h b/server/request.h index 2d55dfb..8b823ba 100644 --- a/server/request.h +++ b/server/request.h @@ -2036,7 +2036,8 @@ C_ASSERT( FIELD_OFFSET(struct create_class_request, instance) == 24 ); C_ASSERT( FIELD_OFFSET(struct create_class_request, extra) == 32 ); C_ASSERT( FIELD_OFFSET(struct create_class_request, win_extra) == 36 ); C_ASSERT( FIELD_OFFSET(struct create_class_request, client_ptr) == 40 ); -C_ASSERT( sizeof(struct create_class_request) == 48 ); +C_ASSERT( FIELD_OFFSET(struct create_class_request, name_offset) == 48 ); +C_ASSERT( sizeof(struct create_class_request) == 56 ); C_ASSERT( FIELD_OFFSET(struct create_class_reply, atom) == 8 ); C_ASSERT( sizeof(struct create_class_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct destroy_class_request, atom) == 12 ); diff --git a/server/trace.c b/server/trace.c index e2980a3..c602043 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3758,6 +3758,7 @@ static void dump_create_class_request( const struct create_class_request *req ) fprintf( stderr, ", extra=%d", req->extra ); fprintf( stderr, ", win_extra=%d", req->win_extra ); dump_uint64( ", client_ptr=", &req->client_ptr ); + fprintf( stderr, ", name_offset=%u", req->name_offset ); dump_varargs_unicode_str( ", name=", cur_size ); }

1 0

Michael Stefaniuc : psapi/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 11, 2018

June 11, 2018

Module: wine Branch: master Commit: 707882a6f2d032aa9686e249e48573a1b34fa8e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=707882a6f2d032aa9686e249… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jun 8 22:19:05 2018 +0200 psapi/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 4adc826..0ff212c 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -536,12 +536,12 @@ todo_wine { } SetLastError(0xdeadbeef); - ret = pGetMappedFileNameW(GetCurrentProcess(), base, map_nameW, sizeof(map_nameW)/sizeof(map_nameW[0])); + ret = pGetMappedFileNameW(GetCurrentProcess(), base, map_nameW, ARRAY_SIZE(map_nameW)); todo_wine { ok(ret, "GetMappedFileNameW error %d\n", GetLastError()); ok(ret > strlen(device_name), "map_name should be longer than device_name\n"); } - if (nt_get_mapped_file_name(GetCurrentProcess(), base, nt_map_name, sizeof(nt_map_name)/sizeof(nt_map_name[0]))) + if (nt_get_mapped_file_name(GetCurrentProcess(), base, nt_map_name, ARRAY_SIZE(nt_map_name))) { ok(memcmp(map_nameW, nt_map_name, lstrlenW(map_nameW)) == 0, "map name does not start with a device name: %s\n", map_name); WideCharToMultiByte(CP_ACP, 0, map_nameW, -1, map_name, MAX_PATH, NULL, NULL); @@ -658,7 +658,7 @@ static void test_GetProcessImageFileName(void) /* correct call */ memset(szImgPathW, 0xff, sizeof(szImgPathW)); - ret = pGetProcessImageFileNameW(hpQI, szImgPathW, sizeof(szImgPathW)/sizeof(WCHAR)); + ret = pGetProcessImageFileNameW(hpQI, szImgPathW, ARRAY_SIZE(szImgPathW)); ok(ret > 0, "GetProcessImageFileNameW should have succeeded.\n"); ok(szImgPathW[0] == '\\', "GetProcessImageFileNameW should have returned an NT path.\n"); ok(lstrlenW(szImgPathW) == ret, "Expected length to be %d, got %d\n", ret, lstrlenW(szImgPathW));

1 0

Michael Stefaniuc : quartz/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 11, 2018

June 11, 2018

Module: wine Branch: master Commit: 091c771582bc24f7b712f8fec33d25b415fc5eca URL: https://source.winehq.org/git/wine.git/?a=commit;h=091c771582bc24f7b712f8fe… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jun 8 22:19:04 2018 +0200 quartz/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplitter.c | 4 ++-- dlls/quartz/tests/filtergraph.c | 6 +++--- dlls/quartz/tests/misc.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 8bafb14..bc933d1 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -210,7 +210,7 @@ static void test_filesourcefilter(void) ret = GetTempFileNameW(temp, prefix, 0, path); ok(ret, "GetTempFileNameW failed with error %u\n", GetLastError()); - for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(tests); i++) { trace("Running test for %s\n", tests[i].label); @@ -280,7 +280,7 @@ static WCHAR *load_resource(const WCHAR *name) HRSRC res; void *ptr; - GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + GetTempPathW(ARRAY_SIZE(pathW), pathW); lstrcatW(pathW, name); file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index a1ece94..85079d9 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -50,7 +50,7 @@ static WCHAR *load_resource(const WCHAR *name) HRSRC res; void *ptr; - GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + GetTempPathW(ARRAY_SIZE(pathW), pathW); lstrcatW(pathW, name); file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); @@ -1500,14 +1500,14 @@ static HRESULT createtestfilter(const CLSID* pClsid, const TestFilterPinData *pi pinInfo.pFilter = &pTestFilter->IBaseFilter_iface; if (pinInfo.dir == PINDIR_INPUT) { - lstrcpynW(pinInfo.achName, wcsInputPinName, sizeof(pinInfo.achName) / sizeof(pinInfo.achName[0])); + lstrcpynW(pinInfo.achName, wcsInputPinName, ARRAY_SIZE(pinInfo.achName)); hr = TestFilter_Pin_Construct(&TestFilter_InputPin_Vtbl, &pinInfo, &mt, &pTestFilter->csFilter, &pTestFilter->ppPins[i]); } else { - lstrcpynW(pinInfo.achName, wcsOutputPinName, sizeof(pinInfo.achName) / sizeof(pinInfo.achName[0])); + lstrcpynW(pinInfo.achName, wcsOutputPinName, ARRAY_SIZE(pinInfo.achName)); hr = TestFilter_Pin_Construct(&TestFilter_OutputPin_Vtbl, &pinInfo, &mt, &pTestFilter->csFilter, &pTestFilter->ppPins[i]); } diff --git a/dlls/quartz/tests/misc.c b/dlls/quartz/tests/misc.c index 748c0f2..16b6d40 100644 --- a/dlls/quartz/tests/misc.c +++ b/dlls/quartz/tests/misc.c @@ -169,7 +169,7 @@ static void test_null_renderer_aggregations(void) }; int i; - for (i = 0; i < sizeof(iids) / sizeof(iids[0]); i++) + for (i = 0; i < ARRAY_SIZE(iids); i++) { test_aggregation(CLSID_SystemClock, CLSID_NullRenderer, IID_IReferenceClock, *iids[i]); } @@ -182,7 +182,7 @@ static void test_video_renderer_aggregations(void) }; int i; - for (i = 0; i < sizeof(iids) / sizeof(iids[0]); i++) + for (i = 0; i < ARRAY_SIZE(iids); i++) { test_aggregation(CLSID_SystemClock, CLSID_VideoRenderer, IID_IReferenceClock, *iids[i]); @@ -199,7 +199,7 @@ static void test_filter_graph_aggregations(void) }; int i; - for (i = 0; i < sizeof(iids) / sizeof(iids[0]); i++) + for (i = 0; i < ARRAY_SIZE(iids); i++) { test_aggregation(CLSID_SystemClock, CLSID_FilterGraph, IID_IReferenceClock, *iids[i]); @@ -213,7 +213,7 @@ static void test_filter_mapper_aggregations(void) }; int i; - for (i = 0; i < sizeof(iids) / sizeof(iids[0]); i++) + for (i = 0; i < ARRAY_SIZE(iids); i++) { test_aggregation(CLSID_SystemClock, CLSID_FilterMapper2, IID_IReferenceClock, *iids[i]);

1 0

Michael Stefaniuc : rpcrt4/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 11, 2018

June 11, 2018

Module: wine Branch: master Commit: cc906096c3969980eed8195f6eedcff1ff0a1103 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc906096c3969980eed8195f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jun 8 22:19:03 2018 +0200 rpcrt4/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/cstub.c | 2 +- dlls/rpcrt4/tests/rpc.c | 6 ++---- dlls/rpcrt4/tests/server.c | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 606107f..7bed308 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -596,7 +596,7 @@ static IPSFactoryBuffer *test_NdrDllGetClassObject(void) #undef VTBL_PROXY_TEST #undef VTBL_PROXY_TEST_NOT_ZERO - for (i = 0; i < sizeof(interfaces)/sizeof(interfaces[0]); i++) + for (i = 0; i < ARRAY_SIZE(interfaces); i++) ok( proxy_vtbl[i]->header.piid == interfaces[i], "wrong proxy %u iid %p/%p\n", i, proxy_vtbl[i]->header.piid, interfaces[i] ); diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index f026e99..c9f2a4b 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -149,10 +149,8 @@ static void TestDceErrorInqText (void) */ DWORD dwCount; - dwCount = FormatMessageA (FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, RPC_S_NOT_RPC_ERROR, 0, bufferInvalid, - sizeof(bufferInvalid)/sizeof(bufferInvalid[0]), NULL); + dwCount = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, + RPC_S_NOT_RPC_ERROR, 0, bufferInvalid, ARRAY_SIZE(bufferInvalid), NULL); /* A random sample of DceErrorInqText */ /* 0 is success */ diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index dfad1ed..b35b71b 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -313,7 +313,7 @@ void __cdecl s_get_number_array(int x[20], int *n) { int c[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; memcpy(x, c, sizeof(c)); - *n = sizeof(c)/sizeof(c[0]); + *n = ARRAY_SIZE(c); } int __cdecl s_sum_cs(cs_t *cs)

1 0

Michael Stefaniuc : gdiplus/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard June 11, 2018

June 11, 2018

Module: wine Branch: master Commit: 741037ca4bf3805fa4193cca7c40a807a0ef979d URL: https://source.winehq.org/git/wine.git/?a=commit;h=741037ca4bf3805fa4193cca… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jun 7 23:44:36 2018 +0200 gdiplus/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 10 +++---- dlls/gdiplus/tests/graphicspath.c | 58 +++++++++++++++++++-------------------- dlls/gdiplus/tests/image.c | 40 +++++++++++++-------------- 3 files changed, 54 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=741037ca4bf3805fa419…

1 0