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

Zebediah Figura : msi: Mark exported wine functions CDECL.
by Alexandre Julliard 19 Jun '18

19 Jun '18

Module: wine Branch: master Commit: d0451d57348c0a25290f9326ca150843cd7d4486 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0451d57348c0a25290f9326… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jun 15 18:19:02 2018 -0500 msi: Mark exported wine functions CDECL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 2 +- programs/msiexec/msiexec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 8deebe5..e68528f 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -484,7 +484,7 @@ static void handle_msi_break(LPCSTR target) static WCHAR ncalrpcW[] = {'n','c','a','l','r','p','c',0}; static WCHAR endpoint_lrpcW[] = {'m','s','i',0}; -UINT __wine_msi_call_dll_function(const GUID *guid) +UINT CDECL __wine_msi_call_dll_function(const GUID *guid) { MsiCustomActionEntryPoint fn; MSIHANDLE remote_package = 0; diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 2ed0557..5ebfea7 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -393,7 +393,7 @@ static DWORD DoUnregServer(void) return ret; } -extern UINT __wine_msi_call_dll_function(GUID *guid); +extern UINT CDECL __wine_msi_call_dll_function(GUID *guid); static int DoEmbedding(LPCWSTR key) {

1 0

Zebediah Figura : vbscript: Treat \r as a newline separator.
by Alexandre Julliard 19 Jun '18

19 Jun '18

Module: wine Branch: master Commit: 5800c9ed23a5c720843445d91c8547925493df8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5800c9ed23a5c720843445d9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 16 19:05:30 2018 -0500 vbscript: Treat \r as a newline separator. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/lex.c | 6 ++++-- dlls/vbscript/tests/run.c | 12 ++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index 98b4cbb..b0fac48 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -383,13 +383,14 @@ static int parse_hex_literal(parser_ctx_t *ctx, LONG *ret) static void skip_spaces(parser_ctx_t *ctx) { - while(*ctx->ptr == ' ' || *ctx->ptr == '\t' || *ctx->ptr == '\r') + while(*ctx->ptr == ' ' || *ctx->ptr == '\t') ctx->ptr++; } static int comment_line(parser_ctx_t *ctx) { - ctx->ptr = strchrW(ctx->ptr, '\n'); + static const WCHAR newlineW[] = {'\n','\r',0}; + ctx->ptr = strpbrkW(ctx->ptr, newlineW); if(ctx->ptr) ctx->ptr++; else @@ -421,6 +422,7 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) switch(c) { case '\n': + case '\r': ctx->ptr++; return tNL; case '\'': diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 6b57540..191f5a7 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2394,6 +2394,18 @@ static void run_tests(void) ok(FAILED(hres), "script didn't fail\n"); todo_wine CHECK_CALLED(OnScriptError); + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + parse_script_a("' comment\r" + "Sub testsub(arg)\r" + "If arg = 1 Then\r\r" + "Call reportSuccess()\n\n" + "End If\r\n" + "End Sub\n\r" + "Call testsub(1)"); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + run_from_res("lang.vbs"); run_from_res("api.vbs"); run_from_res("regexp.vbs");

1 0

Hua Meng : msvcp120: Add test for Concurrent_vector_assign.
by Alexandre Julliard 19 Jun '18

19 Jun '18

Module: wine Branch: master Commit: d8f6a1c0d77cc6ba7b502d76b4fa2b0d24923945 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8f6a1c0d77cc6ba7b502d76… Author: Hua Meng <161220092(a)smail.nju.edu.cn> Date: Sun Jun 17 11:50:22 2018 +0800 msvcp120: Add test for Concurrent_vector_assign. Signed-off-by: Hua Meng <161220092(a)smail.nju.edu.cn> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 56 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index c34bd65..895ab36 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -40,6 +40,7 @@ struct expect_struct { DEFINE_EXPECT(concurrent_vector_int_alloc); DEFINE_EXPECT(concurrent_vector_int_destroy); DEFINE_EXPECT(concurrent_vector_int_copy); + DEFINE_EXPECT(concurrent_vector_int_assign); }; #define SET_EXPECT(func) \ @@ -114,6 +115,8 @@ static void * (WINAPI *call_thiscall_func3)( void *func, void *this, const void const void *b ); static void * (WINAPI *call_thiscall_func4)( void *func, void *this, const void *a, const void *b, const void *c ); +static void * (WINAPI *call_thiscall_func6)( void *func, void *this, const void *a, + const void *b, const void *c, const void *d, const void *e ); static void init_thiscall_thunk(void) { @@ -128,6 +131,7 @@ static void init_thiscall_thunk(void) call_thiscall_func2 = (void *)thunk; call_thiscall_func3 = (void *)thunk; call_thiscall_func4 = (void *)thunk; + call_thiscall_func6 = (void *)thunk; } #define call_func1(func,_this) call_thiscall_func1(func,_this) @@ -136,6 +140,8 @@ static void init_thiscall_thunk(void) (const void*)(b)) #define call_func4(func,_this,a,b,c) call_thiscall_func4(func,_this,(const void*)(a),\ (const void*)(b),(const void*)(c)) +#define call_func6(func,_this,a,b,c,d,e) call_thiscall_func6(func,_this,(const void*)(a),\ + (const void*)(b),(const void*)(c),(const void*)(d),(const void*)(e)) #else #define init_thiscall_thunk() @@ -143,6 +149,7 @@ static void init_thiscall_thunk(void) #define call_func2(func,_this,a) func(_this,a) #define call_func3(func,_this,a,b) func(_this,a,b) #define call_func4(func,_this,a,b,c) func(_this,a,b,c) +#define call_func6(func,_this,a,b,c,d,e) func(_this,a,b,c,d,e) #endif /* __i386__ */ static inline float __port_infinity(void) @@ -392,6 +399,9 @@ static size_t (__thiscall *p_vector_base_v4__Internal_clear)( vector_base_v4*, void (__cdecl*)(void*, size_t)); static void (__thiscall *p_vector_base_v4__Internal_copy)( vector_base_v4*, vector_base_v4*, size_t, void (__cdecl*)(void*, const void*, size_t)); +static void (__thiscall *p_vector_base_v4__Internal_assign)( + vector_base_v4*, vector_base_v4*, size_t, void (__cdecl*)(void*, size_t), + void (__cdecl*)(void*, const void*, size_t), void (__cdecl*)(void*, const void*, size_t)); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -536,6 +546,8 @@ static BOOL init(void) "?_Internal_clear(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAA_KP6AXPEAX_K(a)Z@Z"); SET(p_vector_base_v4__Internal_copy, "?_Internal_copy(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAXAEBV123(a)_KP6AXPEAXPEBX1@Z(a)Z"); + SET(p_vector_base_v4__Internal_assign, + "?_Internal_assign(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAXAEBV123(a)_KP6AXPEAX1@ZP6AX2PEBX1(a)Z5@Z"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); @@ -649,6 +661,8 @@ static BOOL init(void) "?_Internal_clear(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEIP6AXPAXI(a)Z@Z"); SET(p_vector_base_v4__Internal_copy, "?_Internal_copy(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXABV123(a)IP6AXPAXPBXI@Z(a)Z"); + SET(p_vector_base_v4__Internal_assign, + "?_Internal_assign(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXABV123(a)IP6AXPAXI@ZP6AX1PBXI(a)Z4@Z"); #else SET(p__Thrd_current, "_Thrd_current"); @@ -690,6 +704,8 @@ static BOOL init(void) "?_Internal_clear(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAIP6AXPAXI(a)Z@Z"); SET(p_vector_base_v4__Internal_copy, "?_Internal_copy(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAXABV123(a)IP6AXPAXPBXI@Z(a)Z"); + SET(p_vector_base_v4__Internal_assign, + "?_Internal_assign(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAXABV123(a)IP6AXPAXI@ZP6AX1PBXI(a)Z4@Z"); #endif } SET(p__Thrd_equal, @@ -2509,6 +2525,12 @@ static void __cdecl concurrent_vector_int_copy(void *dst, const void *src, size_ memcpy(dst, src, n*sizeof(int)); } +static void __cdecl concurrent_vector_int_assign(void *dst, const void *src, size_t n) +{ + CHECK_EXPECT2(concurrent_vector_int_assign); + memcpy(dst, src, n*sizeof(int)); +} + static void test_queue_base_v4(void) { queue_base_v4 queue; @@ -2793,6 +2815,40 @@ static void test_vector_base_v4(void) SET_EXPECT(concurrent_vector_int_destroy); size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &v2, concurrent_vector_int_destroy); + CHECK_CALLED(concurrent_vector_int_destroy); + concurrent_vector_int_dtor(&v2); + + concurrent_vector_int_ctor(&v2); + SET_EXPECT(concurrent_vector_int_alloc); + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + CHECK_CALLED(concurrent_vector_int_alloc); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + SET_EXPECT(concurrent_vector_int_alloc); + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + CHECK_CALLED(concurrent_vector_int_alloc); + vector_elem_count += 3; + ok(idx == 2, "idx got %ld expected 2\n", (long)idx); + SET_EXPECT(concurrent_vector_int_assign); + SET_EXPECT(concurrent_vector_int_copy); + SET_EXPECT(concurrent_vector_int_alloc); + call_func6(p_vector_base_v4__Internal_assign, &v2, &vector, sizeof(int), + concurrent_vector_int_destroy, concurrent_vector_int_assign, + concurrent_vector_int_copy); + CHECK_CALLED(concurrent_vector_int_assign); + CHECK_CALLED(concurrent_vector_int_copy); + CHECK_CALLED(concurrent_vector_int_alloc); + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", + (long)v2.first_block); + ok(v2.early_size == 5, "v2.early_size got %ld expected 5\n", + (long)v2.early_size); + + SET_EXPECT(concurrent_vector_int_destroy); + size = (size_t)call_func2(p_vector_base_v4__Internal_clear, + &v2, concurrent_vector_int_destroy); + CHECK_CALLED(concurrent_vector_int_destroy); concurrent_vector_int_dtor(&v2); SET_EXPECT(concurrent_vector_int_destroy);

1 0

Hua Meng : msvcp120/tests: Add test for Concurrent_vector_swap.
by Alexandre Julliard 19 Jun '18

19 Jun '18

Module: wine Branch: master Commit: 364496714ddb7022121f6ce838a5b8c2a32cd173 URL: https://source.winehq.org/git/wine.git/?a=commit;h=364496714ddb7022121f6ce8… Author: Hua Meng <161220092(a)smail.nju.edu.cn> Date: Sun Jun 17 11:50:43 2018 +0800 msvcp120/tests: Add test for Concurrent_vector_swap. Signed-off-by: Hua Meng <161220092(a)smail.nju.edu.cn> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/tests/msvcp120.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 895ab36..aec66fb 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -402,6 +402,8 @@ static void (__thiscall *p_vector_base_v4__Internal_copy)( static void (__thiscall *p_vector_base_v4__Internal_assign)( vector_base_v4*, vector_base_v4*, size_t, void (__cdecl*)(void*, size_t), void (__cdecl*)(void*, const void*, size_t), void (__cdecl*)(void*, const void*, size_t)); +static void (__thiscall *p_vector_base_v4__Internal_swap)( + vector_base_v4*, const vector_base_v4*); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -548,6 +550,8 @@ static BOOL init(void) "?_Internal_copy(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAXAEBV123(a)_KP6AXPEAXPEBX1@Z(a)Z"); SET(p_vector_base_v4__Internal_assign, "?_Internal_assign(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAXAEBV123(a)_KP6AXPEAX1@ZP6AX2PEBX1(a)Z5@Z"); + SET(p_vector_base_v4__Internal_swap, + "?_Internal_swap(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IEAAXAEAV123@@Z"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); @@ -663,6 +667,8 @@ static BOOL init(void) "?_Internal_copy(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXABV123(a)IP6AXPAXPBXI@Z(a)Z"); SET(p_vector_base_v4__Internal_assign, "?_Internal_assign(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXABV123(a)IP6AXPAXI@ZP6AX1PBXI(a)Z4@Z"); + SET(p_vector_base_v4__Internal_swap, + "?_Internal_swap(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAEXAAV123@@Z"); #else SET(p__Thrd_current, "_Thrd_current"); @@ -706,6 +712,8 @@ static BOOL init(void) "?_Internal_copy(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAXABV123(a)IP6AXPAXPBXI@Z(a)Z"); SET(p_vector_base_v4__Internal_assign, "?_Internal_assign(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAXABV123(a)IP6AXPAXI@ZP6AX1PBXI(a)Z4@Z"); + SET(p_vector_base_v4__Internal_swap, + "?_Internal_swap(a)_Concurrent_vector_base_v4@details(a)Concurrency@@IAAXAAV123@@Z"); #endif } SET(p__Thrd_equal, @@ -2851,6 +2859,39 @@ static void test_vector_base_v4(void) CHECK_CALLED(concurrent_vector_int_destroy); concurrent_vector_int_dtor(&v2); + concurrent_vector_int_ctor(&v2); + SET_EXPECT(concurrent_vector_int_alloc); + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + CHECK_CALLED(concurrent_vector_int_alloc); + SET_EXPECT(concurrent_vector_int_alloc); + data = call_func3(p_vector_base_v4__Internal_push_back, &v2, sizeof(int), &idx); + ok(data != NULL, "_Internal_push_back returned NULL\n"); + CHECK_CALLED(concurrent_vector_int_alloc); + vector_elem_count += 3; + ok(idx == 2, "idx got %ld expected 2\n", (long)idx); + call_func2(p_vector_base_v4__Internal_swap, + &v2, &vector); + ok(v2.first_block == 1, "v2.first_block got %ld expected 1\n", + (long)v2.first_block); + ok(v2.early_size == 5, "v2.early_size got %ld expected 5\n", + (long)v2.early_size); + ok(vector.early_size == 3, "vector.early_size got %ld expected 3\n", + (long)vector.early_size); + call_func2(p_vector_base_v4__Internal_swap, + &v2, &vector); + ok(v2.early_size == 3, "v2.early_size got %ld expected 3\n", + (long)v2.early_size); + ok(vector.early_size == 5, "vector.early_size got %ld expected 5\n", + (long)vector.early_size); + SET_EXPECT(concurrent_vector_int_destroy); + size = (size_t)call_func2(p_vector_base_v4__Internal_clear, + &v2, concurrent_vector_int_destroy); + CHECK_CALLED(concurrent_vector_int_destroy); + concurrent_vector_int_dtor(&v2); + SET_EXPECT(concurrent_vector_int_destroy); size = (size_t)call_func2(p_vector_base_v4__Internal_clear, &vector, concurrent_vector_int_destroy);

1 0

Michael Stefaniuc : winedbg: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 19 Jun '18

19 Jun '18

Module: wine Branch: master Commit: 0c8e555e4ce2105f5a1faefe38cbb71b685956ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c8e555e4ce2105f5a1faefe… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jun 18 00:09:29 2018 +0200 winedbg: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/crashdlg.c | 13 ++++++------- programs/winedbg/gdbproxy.c | 12 ++++++------ programs/winedbg/tgt_active.c | 6 +++--- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/programs/winedbg/crashdlg.c b/programs/winedbg/crashdlg.c index 4e02a4b..5c913ff 100644 --- a/programs/winedbg/crashdlg.c +++ b/programs/winedbg/crashdlg.c @@ -38,8 +38,8 @@ int msgbox_res_id(HWND hwnd, UINT textId, UINT captionId, UINT uType) { WCHAR caption[256]; WCHAR text[256]; - LoadStringW(GetModuleHandleW(NULL), captionId, caption, sizeof(caption)/sizeof(caption[0])); - LoadStringW(GetModuleHandleW(NULL), textId, text, sizeof(text)/sizeof(text[0])); + LoadStringW(GetModuleHandleW(NULL), captionId, caption, ARRAY_SIZE(caption)); + LoadStringW(GetModuleHandleW(NULL), textId, text, ARRAY_SIZE(text)); return MessageBoxW(hwnd, text, caption, uType); } @@ -116,8 +116,7 @@ static void set_message_with_filename(HWND hDlg) WCHAR originalText[1000]; WCHAR newText[1000 + MAX_PROGRAM_NAME_LENGTH]; - GetDlgItemTextW(hDlg, IDC_STATIC_TXT1, originalText, - sizeof(originalText)/sizeof(originalText[0])); + GetDlgItemTextW(hDlg, IDC_STATIC_TXT1, originalText, ARRAY_SIZE(originalText)); wsprintfW(newText, originalText, g_ProgramName); SetDlgItemTextW(hDlg, IDC_STATIC_TXT1, newText); } @@ -150,11 +149,11 @@ static void save_crash_log( HWND hwnd ) memset( &save, 0, sizeof(save) ); lstrcpyW( path, default_name ); - LoadStringW( GetModuleHandleW(0), IDS_TEXT_FILES, buffer, sizeof(buffer)/sizeof(buffer[0]) ); + LoadStringW( GetModuleHandleW(0), IDS_TEXT_FILES, buffer, ARRAY_SIZE(buffer)); p = buffer + lstrlenW(buffer) + 1; lstrcpyW(p, txt_files); p += lstrlenW(p) + 1; - LoadStringW( GetModuleHandleW(0), IDS_ALL_FILES, p, sizeof(buffer)/sizeof(buffer[0]) - (p - buffer) ); + LoadStringW( GetModuleHandleW(0), IDS_ALL_FILES, p, ARRAY_SIZE(buffer) - (p - buffer) ); p += lstrlenW(p) + 1; lstrcpyW(p, all_files); p += lstrlenW(p) + 1; @@ -189,7 +188,7 @@ static void save_crash_log( HWND hwnd ) } else err = GetLastError(); - LoadStringW( GetModuleHandleW(0), IDS_SAVE_ERROR, buffer, sizeof(buffer)/sizeof(WCHAR) ); + LoadStringW( GetModuleHandleW(0), IDS_SAVE_ERROR, buffer, ARRAY_SIZE(buffer)); FormatMessageW( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, err, 0, (LPWSTR)&p, 0, NULL); MessageBoxW( 0, p, buffer, MB_OK | MB_ICONERROR); diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 7f59ce1..b8387fe 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -391,7 +391,7 @@ static void handle_debug_event(struct gdb_context* gdbctx, DEBUG_EVENT* de) memory_get_string_indirect(gdbctx->process, de->u.CreateProcessInfo.lpImageName, de->u.CreateProcessInfo.fUnicode, - u.buffer, sizeof(u.buffer) / sizeof(WCHAR)); + u.buffer, ARRAY_SIZE(u.buffer)); dbg_set_process_name(gdbctx->process, u.buffer); if (gdbctx->trace & GDBPXY_TRC_WIN32_EVENT) @@ -423,7 +423,7 @@ static void handle_debug_event(struct gdb_context* gdbctx, DEBUG_EVENT* de) memory_get_string_indirect(gdbctx->process, de->u.LoadDll.lpImageName, de->u.LoadDll.fUnicode, - u.buffer, sizeof(u.buffer) / sizeof(WCHAR)); + u.buffer, ARRAY_SIZE(u.buffer)); if (gdbctx->trace & GDBPXY_TRC_WIN32_EVENT) fprintf(stderr, "%04x:%04x: loads DLL %s @%p (%u<%u>)\n", de->dwProcessId, de->dwThreadId, @@ -1146,7 +1146,7 @@ static enum packet_return packet_verbose(struct gdb_context* gdbctx) if (gdbctx->trace & GDBPXY_TRC_COMMAND) fprintf(stderr, "trying to process a verbose packet %*.*s\n", gdbctx->in_packet_len, gdbctx->in_packet_len, gdbctx->in_packet); - for (i = 0; i < sizeof(verbose_details)/sizeof(verbose_details[0]); i++) + for (i = 0; i < ARRAY_SIZE(verbose_details); i++) { if (klen == verbose_details[i].len && !memcmp(gdbctx->in_packet, verbose_details[i].name, verbose_details[i].len)) @@ -1934,11 +1934,11 @@ static BOOL extract_packets(struct gdb_context* gdbctx) assert(plen); /* FIXME: should use bsearch if packet_entries was sorted */ - for (i = 0; i < sizeof(packet_entries)/sizeof(packet_entries[0]); i++) + for (i = 0; i < ARRAY_SIZE(packet_entries); i++) { if (packet_entries[i].key == gdbctx->in_buf[1]) break; } - if (i == sizeof(packet_entries)/sizeof(packet_entries[0])) + if (i == ARRAY_SIZE(packet_entries)) { if (gdbctx->trace & GDBPXY_TRC_COMMAND_ERROR) fprintf(stderr, "Unknown packet request %*.*s\n", @@ -2178,7 +2178,7 @@ static BOOL gdb_init_context(struct gdb_context* gdbctx, unsigned flags, unsigne gdbctx->in_trap = FALSE; gdbctx->trace = /*GDBPXY_TRC_PACKET | GDBPXY_TRC_COMMAND |*/ GDBPXY_TRC_COMMAND_ERROR | GDBPXY_TRC_COMMAND_FIXME | GDBPXY_TRC_WIN32_EVENT; gdbctx->process = NULL; - for (i = 0; i < sizeof(gdbctx->wine_segs) / sizeof(gdbctx->wine_segs[0]); i++) + for (i = 0; i < ARRAY_SIZE(gdbctx->wine_segs); i++) gdbctx->wine_segs[i] = 0; /* wait for first trap */ diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index e5fd07d..c5569e6 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -360,7 +360,7 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) fetch_module_name(de->u.CreateProcessInfo.lpImageName, de->u.CreateProcessInfo.fUnicode, de->u.CreateProcessInfo.lpBaseOfImage, - u.buffer, sizeof(u.buffer) / sizeof(WCHAR), TRUE); + u.buffer, ARRAY_SIZE(u.buffer), TRUE); WINE_TRACE("%04x:%04x: create process '%s'/%p @%p (%u<%u>)\n", de->dwProcessId, de->dwThreadId, @@ -455,7 +455,7 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de) fetch_module_name(de->u.LoadDll.lpImageName, de->u.LoadDll.fUnicode, de->u.LoadDll.lpBaseOfDll, - u.buffer, sizeof(u.buffer) / sizeof(WCHAR), FALSE); + u.buffer, ARRAY_SIZE(u.buffer), FALSE); WINE_TRACE("%04x:%04x: loads DLL %s @%p (%u<%u>)\n", de->dwProcessId, de->dwThreadId, @@ -708,7 +708,7 @@ static const char *get_windows_version(void) GetVersionExW( (OSVERSIONINFOW *)&info ); - for (i = 0; i < sizeof(version_table) / sizeof(version_table[0]); i++) + for (i = 0; i < ARRAY_SIZE(version_table); i++) { if (version_table[i].type == info.wProductType && version_table[i].platform == info.dwPlatformId &&

1 0

Michael Stefaniuc : oleaut32/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 19 Jun '18

19 Jun '18

Module: wine Branch: master Commit: 050edeb4200f18565c6aa164c53f7de9a570c1cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=050edeb4200f18565c6aa164… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jun 18 00:09:30 2018 +0200 oleaut32/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/oleaut32/tests/olefont.c | 2 +- dlls/oleaut32/tests/olepicture.c | 8 +++--- dlls/oleaut32/tests/safearray.c | 8 +++--- dlls/oleaut32/tests/tmarshal.c | 2 +- dlls/oleaut32/tests/typelib.c | 26 ++++++++--------- dlls/oleaut32/tests/usrmarshal.c | 4 +-- dlls/oleaut32/tests/varformat.c | 16 +++++------ dlls/oleaut32/tests/vartest.c | 62 ++++++++++++++++++++-------------------- dlls/oleaut32/tests/vartype.c | 24 +++++++--------- 9 files changed, 75 insertions(+), 77 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=050edeb4200f18565c6a…

1 0

Michael Stefaniuc : oleaut32/tests: Avoid an ARRAY_SIZE-like macro.
by Alexandre Julliard 19 Jun '18

19 Jun '18

Module: wine Branch: master Commit: db48640a51e546945556f2de379f1fd74952b5c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db48640a51e546945556f2de… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jun 18 00:09:31 2018 +0200 oleaut32/tests: Avoid an ARRAY_SIZE-like macro. Also use a better type for the dimension variable. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/safearray.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 56e01fd..5dd1c1d 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -828,11 +828,9 @@ static void test_SafeArrayCreateLockDestroy(void) SAFEARRAY *sa; HRESULT hres; VARTYPE vt; - int dimension; - -#define NUM_DIMENSIONS (int)(sizeof(sab) / sizeof(sab[0])) + UINT dimension; - for (dimension = 0; dimension < NUM_DIMENSIONS; dimension++) + for (dimension = 0; dimension < ARRAY_SIZE(sab); dimension++) { sab[dimension].lLbound = 0; sab[dimension].cElements = 8; @@ -850,7 +848,7 @@ static void test_SafeArrayCreateLockDestroy(void) /* Don't test 0 sized dimensions, as Windows has a bug which allows this */ - for (dimension = 0; dimension < NUM_DIMENSIONS; dimension++) + for (dimension = 0; dimension < ARRAY_SIZE(sab); dimension++) sab[dimension].cElements = 8; /* Test all VARTYPES in 1-4 dimensions */ @@ -870,7 +868,7 @@ static void test_SafeArrayCreateLockDestroy(void) if (sa) { - ok(SafeArrayGetDim(sa) == (UINT)dimension, + ok(SafeArrayGetDim(sa) == dimension, "VARTYPE %d (@%d dimensions) cDims is %d, expected %d\n", vt, dimension, SafeArrayGetDim(sa), dimension); ok(SafeArrayGetElemsize(sa) == dwLen || vt == VT_R8, @@ -1007,13 +1005,13 @@ static void test_LockUnlock(void) hres = SafeArrayUnlock(NULL); ok(hres == E_INVALIDARG, "Lock NULL array hres 0x%x\n", hres); - for (dimension = 0; dimension < NUM_DIMENSIONS; dimension++) + for (dimension = 0; dimension < ARRAY_SIZE(sab); dimension++) { sab[dimension].lLbound = 0; sab[dimension].cElements = 8; } - sa = SafeArrayCreate(VT_UI1, NUM_DIMENSIONS, sab); + sa = SafeArrayCreate(VT_UI1, ARRAY_SIZE(sab), sab); /* Test maximum locks */ test_LockUnlock_Vector: @@ -1054,27 +1052,27 @@ test_LockUnlock_Vector: static void test_SafeArrayGetPutElement(void) { SAFEARRAYBOUND sab[4]; - LONG indices[NUM_DIMENSIONS], index; + LONG indices[ARRAY_SIZE(sab)], index; SAFEARRAY *sa; HRESULT hres; int value = 0, gotvalue, dimension; IRecordInfoImpl *irec; unsigned int x,y,z,a; - for (dimension = 0; dimension < NUM_DIMENSIONS; dimension++) + for (dimension = 0; dimension < ARRAY_SIZE(sab); dimension++) { sab[dimension].lLbound = dimension * 2 + 1; sab[dimension].cElements = dimension * 3 + 1; } - sa = SafeArrayCreate(VT_INT, NUM_DIMENSIONS, sab); + sa = SafeArrayCreate(VT_INT, ARRAY_SIZE(sab), sab); if (!sa) return; /* Some early versions can't handle > 3 dims */ ok(sa->cbElements == sizeof(value), "int size mismatch\n"); /* Failure cases */ - for (x = 0; x < NUM_DIMENSIONS; x++) + for (x = 0; x < ARRAY_SIZE(sab); x++) { indices[0] = sab[0].lLbound; indices[1] = sab[1].lLbound; @@ -1384,16 +1382,16 @@ static void test_SafeArrayCopyData(void) return; } - for (dimension = 0; dimension < NUM_DIMENSIONS; dimension++) + for (dimension = 0; dimension < ARRAY_SIZE(sab); dimension++) { sab[dimension].lLbound = dimension * 2 + 2; sab[dimension].cElements = dimension * 3 + 1; size *= sab[dimension].cElements; } - sa = SafeArrayCreate(VT_INT, NUM_DIMENSIONS, sab); + sa = SafeArrayCreate(VT_INT, ARRAY_SIZE(sab), sab); ok(sa != NULL, "Copy test couldn't create array\n"); - sacopy = SafeArrayCreate(VT_INT, NUM_DIMENSIONS, sab); + sacopy = SafeArrayCreate(VT_INT, ARRAY_SIZE(sab), sab); ok(sacopy != NULL, "Copy test couldn't create copy array\n"); if (!sa || !sacopy) @@ -1453,7 +1451,7 @@ static void test_SafeArrayCopyData(void) hres = SafeArrayDestroy(sacopy); ok(hres == S_OK, "got 0x%08x\n", hres); - sacopy = SafeArrayCreate(VT_INT, NUM_DIMENSIONS, sab); + sacopy = SafeArrayCreate(VT_INT, ARRAY_SIZE(sab), sab); ok(sacopy != NULL, "Copy test couldn't create copy array\n"); ok(sacopy->fFeatures == FADF_HAVEVARTYPE, "0x%04x\n", sacopy->fFeatures); @@ -1491,7 +1489,7 @@ static void test_SafeArrayCopyData(void) "got 0x%04x\n", sacopy->fFeatures); SafeArrayDestroy(sacopy); - sacopy = SafeArrayCreate(VT_UI1, NUM_DIMENSIONS, sab); + sacopy = SafeArrayCreate(VT_UI1, ARRAY_SIZE(sab), sab); ok(sacopy != NULL, "Copy test couldn't create copy array\n"); ok(sacopy->fFeatures == FADF_HAVEVARTYPE, "0x%04x\n", sacopy->fFeatures); hres = SafeArrayCopyData(sa, sacopy); @@ -1507,7 +1505,7 @@ static void test_SafeArrayCreateEx(void) SAFEARRAYBOUND sab[4]; SAFEARRAY *sa; HRESULT hres; - int dimension; + UINT dimension; if (!pSafeArrayCreateEx) { @@ -1515,7 +1513,7 @@ static void test_SafeArrayCreateEx(void) return; } - for (dimension = 0; dimension < NUM_DIMENSIONS; dimension++) + for (dimension = 0; dimension < ARRAY_SIZE(sab); dimension++) { sab[dimension].lLbound = 0; sab[dimension].cElements = 8;

1 0

Michael Stefaniuc : oleaut32/tests: Use a better type to avoid a cast.
by Alexandre Julliard 19 Jun '18

19 Jun '18

Module: wine Branch: master Commit: 2441e9417c4d33b3a04bde8901b276bcae4f53b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2441e9417c4d33b3a04bde89… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jun 18 00:09:32 2018 +0200 oleaut32/tests: Use a better type to avoid a cast. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/safearray.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 5dd1c1d..5d54146 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -765,7 +765,7 @@ static void test_SafeArrayAllocDestroyDescriptor(void) { SAFEARRAY *sa; HRESULT hres; - int i; + UINT i; /* Failure cases */ hres = SafeArrayAllocDescriptor(0, &sa); @@ -789,7 +789,7 @@ static void test_SafeArrayAllocDestroyDescriptor(void) if (hres == S_OK) { - ok(SafeArrayGetDim(sa) == (UINT)i, "Dimension is %d; should be %d\n", + ok(SafeArrayGetDim(sa) == i, "Dimension is %d; should be %d\n", SafeArrayGetDim(sa), i); hres = SafeArrayDestroyDescriptor(sa);

1 0

Michael Stefaniuc : riched32/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 19 Jun '18

19 Jun '18

Module: wine Branch: master Commit: ebfe62fc7f14edba050bd06b17694ab6c9552398 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebfe62fc7f14edba050bd06b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jun 18 00:09:33 2018 +0200 riched32/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched32/tests/editor.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 6fe4005..7751d2b 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -104,7 +104,7 @@ static void test_WM_SETTEXT(void) * for line breaking (only \n adds a line break) */ - for (i = 0; i < sizeof(testitems)/sizeof(testitems[0]); i++) { + for (i = 0; i < ARRAY_SIZE(testitems); i++) { char buf[1024] = {0}; LRESULT result; @@ -410,7 +410,7 @@ static void test_EM_GETLINE(void) } memset(origdest, 0xBB, nBuf); - for (i = 0; i < sizeof(gl)/sizeof(struct getline_s); i++) + for (i = 0; i < ARRAY_SIZE(gl); i++) { int nCopied, expected_nCopied, expected_bytes_written; char gl_text[1024]; @@ -504,7 +504,7 @@ static void test_EM_LINELENGTH(void) } ok(result == 9, "Incorrect line count of %ld\n", result); - for (i = 0; i < sizeof(offset_test)/sizeof(offset_test[0]); i++) { + for (i = 0; i < ARRAY_SIZE(offset_test); i++) { result = SendMessageA(hwndRichEdit, EM_LINELENGTH, offset_test[i][0], 0); ok(result == offset_test[i][1], "Length of line at offset %d is %ld, expected %d\n", offset_test[i][0], result, offset_test[i][1]); @@ -525,7 +525,7 @@ static void test_EM_LINELENGTH(void) {16, 4}, /* Line 3: |wine */ }; SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)text1); - for (i = 0; i < sizeof(offset_test1)/sizeof(offset_test1[0]); i++) { + for (i = 0; i < ARRAY_SIZE(offset_test1); i++) { result = SendMessageA(hwndRichEdit, EM_LINELENGTH, offset_test1[i][0], 0); todo_wine_if (offset_test1[i][2]) ok(result == offset_test1[i][1], "Length of line at offset %d is %ld, expected %d\n", @@ -781,20 +781,17 @@ static void test_EM_FINDTEXT(void) HWND hwndRichEdit = new_richedit(NULL); /* Empty rich edit control */ - run_tests_EM_FINDTEXT(hwndRichEdit, "1", find_tests, - sizeof(find_tests)/sizeof(struct find_s)); + run_tests_EM_FINDTEXT(hwndRichEdit, "1", find_tests, ARRAY_SIZE(find_tests)); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)haystack); /* Haystack text */ - run_tests_EM_FINDTEXT(hwndRichEdit, "2", find_tests2, - sizeof(find_tests2)/sizeof(struct find_s)); + run_tests_EM_FINDTEXT(hwndRichEdit, "2", find_tests2, ARRAY_SIZE(find_tests2)); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)haystack2); /* Haystack text 2 (with EOL characters) */ - run_tests_EM_FINDTEXT(hwndRichEdit, "3", find_tests3, - sizeof(find_tests3)/sizeof(struct find_s)); + run_tests_EM_FINDTEXT(hwndRichEdit, "3", find_tests3, ARRAY_SIZE(find_tests3)); DestroyWindow(hwndRichEdit); } @@ -1178,7 +1175,7 @@ static void test_enter(void) HWND hwndRichEdit = new_richedit(NULL); UINT i,j; - for (i = 0; i < sizeof(testenteritems)/sizeof(testenteritems[0]); i++) { + for (i = 0; i < ARRAY_SIZE(testenteritems); i++) { char buf[1024] = {0}; LRESULT result; @@ -1321,7 +1318,7 @@ static void test_EM_EXSETSEL(void) { HWND hwndRichEdit = new_richedit(NULL); int i; - const int num_tests = sizeof(exsetsel_tests)/sizeof(struct exsetsel_s); + const int num_tests = ARRAY_SIZE(exsetsel_tests); /* sending some text to the window */ SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"testing selection"); @@ -1378,7 +1375,7 @@ static void test_EM_SETSEL(void) char buffA[32] = {0}; HWND hwndRichEdit = new_richedit(NULL); int i; - const int num_tests = sizeof(exsetsel_tests)/sizeof(struct exsetsel_s); + const int num_tests = ARRAY_SIZE(exsetsel_tests); /* sending some text to the window */ SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"testing selection");

1 0

Michael Stefaniuc : riched20/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 19 Jun '18

19 Jun '18

Module: wine Branch: master Commit: ecd16fed38186307972ff84b60409822521e244f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecd16fed38186307972ff84b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jun 18 00:09:34 2018 +0200 riched20/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 62 ++++++++++++++++++++----------------------- dlls/riched20/tests/richole.c | 4 +-- 2 files changed, 31 insertions(+), 35 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ecd16fed38186307972f…

1 0