- wine-devel - winehq.org

[PATCH] jscript: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Jul '18

10 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/jscript/array.c | 8 ++++---- dlls/jscript/bool.c | 2 +- dlls/jscript/date.c | 26 +++++++++++++------------- dlls/jscript/decode.c | 10 +++++----- dlls/jscript/dispex.c | 2 +- dlls/jscript/error.c | 6 +++--- dlls/jscript/function.c | 14 +++++++------- dlls/jscript/global.c | 2 +- dlls/jscript/json.c | 2 +- dlls/jscript/jsregexp.c | 10 +++++----- dlls/jscript/jsutils.c | 6 +++--- dlls/jscript/lex.c | 2 +- dlls/jscript/math.c | 4 ++-- dlls/jscript/number.c | 2 +- dlls/jscript/object.c | 4 ++-- dlls/jscript/string.c | 8 ++++---- dlls/jscript/vbarray.c | 2 +- 17 files changed, 55 insertions(+), 55 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 9c287c9901..e74ca7fe5f 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -1020,7 +1020,7 @@ static HRESULT Array_unshift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsi return hres; if(argc) { - buf_end = buf + sizeof(buf)/sizeof(WCHAR)-1; + buf_end = buf + ARRAY_SIZE(buf)-1; *buf_end-- = 0; i = length; @@ -1118,7 +1118,7 @@ static const builtin_prop_t Array_props[] = { static const builtin_info_t Array_info = { JSCLASS_ARRAY, {NULL, NULL,0, Array_get_value}, - sizeof(Array_props)/sizeof(*Array_props), + ARRAY_SIZE(Array_props), Array_props, Array_destructor, Array_on_put @@ -1131,7 +1131,7 @@ static const builtin_prop_t ArrayInst_props[] = { static const builtin_info_t ArrayInst_info = { JSCLASS_ARRAY, {NULL, NULL,0, Array_get_value}, - sizeof(ArrayInst_props)/sizeof(*ArrayInst_props), + ARRAY_SIZE(ArrayInst_props), ArrayInst_props, Array_destructor, Array_on_put @@ -1238,7 +1238,7 @@ static const builtin_prop_t ArrayConstr_props[] = { static const builtin_info_t ArrayConstr_info = { JSCLASS_FUNCTION, DEFAULT_FUNCTION_VALUE, - sizeof(ArrayConstr_props)/sizeof(*ArrayConstr_props), + ARRAY_SIZE(ArrayConstr_props), ArrayConstr_props, NULL, NULL diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index 75c98c2403..2d0b9d0c1b 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -121,7 +121,7 @@ static const builtin_prop_t Bool_props[] = { static const builtin_info_t Bool_info = { JSCLASS_BOOLEAN, {NULL, Bool_value, 0}, - sizeof(Bool_props)/sizeof(*Bool_props), + ARRAY_SIZE(Bool_props), Bool_props, NULL, NULL diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index 28ad23d644..2676cd1cb1 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -523,10 +523,10 @@ static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset, lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); week[0] = 0; - GetLocaleInfoW(lcid_en, week_ids[(int)week_day(time)], week, sizeof(week)/sizeof(*week)); + GetLocaleInfoW(lcid_en, week_ids[(int)week_day(time)], week, ARRAY_SIZE(week)); month[0] = 0; - GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(time)], month, sizeof(month)/sizeof(*month)); + GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(time)], month, ARRAY_SIZE(month)); year = year_from_time(time); if(year<0) { @@ -732,10 +732,10 @@ static inline HRESULT create_utc_string(script_ctx_t *ctx, vdisp_t *jsthis, jsva lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); week[0] = 0; - GetLocaleInfoW(lcid_en, week_ids[(int)week_day(date->time)], week, sizeof(week)/sizeof(*week)); + GetLocaleInfoW(lcid_en, week_ids[(int)week_day(date->time)], week, ARRAY_SIZE(week)); month[0] = 0; - GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(date->time)], month, sizeof(month)/sizeof(*month)); + GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(date->time)], month, ARRAY_SIZE(month)); year = year_from_time(date->time); if(year<0) { @@ -809,10 +809,10 @@ static HRESULT dateobj_to_date_string(DateInstance *date, jsval_t *r) lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); week[0] = 0; - GetLocaleInfoW(lcid_en, week_ids[(int)week_day(time)], week, sizeof(week)/sizeof(*week)); + GetLocaleInfoW(lcid_en, week_ids[(int)week_day(time)], week, ARRAY_SIZE(week)); month[0] = 0; - GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(time)], month, sizeof(month)/sizeof(*month)); + GetLocaleInfoW(lcid_en, month_ids[(int)month_from_time(time)], month, ARRAY_SIZE(month)); year = year_from_time(time); if(year<0) { @@ -1983,7 +1983,7 @@ static const builtin_prop_t Date_props[] = { static const builtin_info_t Date_info = { JSCLASS_DATE, {NULL, NULL,0, Date_get_value}, - sizeof(Date_props)/sizeof(*Date_props), + ARRAY_SIZE(Date_props), Date_props, NULL, NULL @@ -2037,7 +2037,7 @@ static inline HRESULT date_parse(jsstr_t *input_str, double *ret) { LOCALE_SMONTHNAME1, LOCALE_SDAYNAME7, LOCALE_SDAYNAME1, LOCALE_SDAYNAME2, LOCALE_SDAYNAME3, LOCALE_SDAYNAME4, LOCALE_SDAYNAME5, LOCALE_SDAYNAME6 }; - WCHAR *strings[sizeof(string_ids)/sizeof(DWORD)]; + WCHAR *strings[ARRAY_SIZE(string_ids)]; WCHAR *parse; int input_len, parse_len = 0, nest_level = 0, i, size; int year = 0, month = 0, day = 0, hour = 0, min = 0, sec = 0; @@ -2088,7 +2088,7 @@ static inline HRESULT date_parse(jsstr_t *input_str, double *ret) { /* FIXME: Cache strings */ lcid_en = MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT); - for(i=0; i<sizeof(string_ids)/sizeof(DWORD); i++) { + for(i=0; i<ARRAY_SIZE(string_ids); i++) { size = GetLocaleInfoW(lcid_en, string_ids[i], NULL, 0); strings[i] = heap_alloc((size+1)*sizeof(WCHAR)); if(!strings[i]) { @@ -2269,7 +2269,7 @@ static inline HRESULT date_parse(jsstr_t *input_str, double *ret) { for(size=i; parse[size]>='A' && parse[size]<='Z'; size++); size -= i; - for(j=0; j<sizeof(string_ids)/sizeof(DWORD); j++) + for(j=0; j<ARRAY_SIZE(string_ids); j++) if(!strncmpiW(&parse[i], strings[j], size)) break; if(j < 12) { @@ -2277,7 +2277,7 @@ static inline HRESULT date_parse(jsstr_t *input_str, double *ret) { set_month = TRUE; month = 11-j; } - else if(j == sizeof(string_ids)/sizeof(DWORD)) break; + else if(j == ARRAY_SIZE(string_ids)) break; i += size; } @@ -2302,7 +2302,7 @@ static inline HRESULT date_parse(jsstr_t *input_str, double *ret) { *ret = NAN; } - for(i=0; i<sizeof(string_ids)/sizeof(DWORD); i++) + for(i=0; i<ARRAY_SIZE(string_ids); i++) heap_free(strings[i]); heap_free(parse); @@ -2522,7 +2522,7 @@ static const builtin_prop_t DateConstr_props[] = { static const builtin_info_t DateConstr_info = { JSCLASS_FUNCTION, DEFAULT_FUNCTION_VALUE, - sizeof(DateConstr_props)/sizeof(*DateConstr_props), + ARRAY_SIZE(DateConstr_props), DateConstr_props, NULL, NULL diff --git a/dlls/jscript/decode.c b/dlls/jscript/decode.c index d402d7c961..ccbd04c05b 100644 --- a/dlls/jscript/decode.c +++ b/dlls/jscript/decode.c @@ -91,7 +91,7 @@ static BOOL decode_dword(const WCHAR *p, DWORD *ret) DWORD i; for(i=0; i<6; i++) { - if(p[i] >= sizeof(digits)/sizeof(*digits) || digits[p[i]] == 0xff) + if(p[i] >= ARRAY_SIZE(digits) || digits[p[i]] == 0xff) return FALSE; } if(p[6] != '=' || p[7] != '=') @@ -117,10 +117,10 @@ HRESULT decode_source(WCHAR *code) static const WCHAR decode_endW[] = {'^','#','~','@'}; while(*src) { - if(!strncmpW(src, decode_beginW, sizeof(decode_beginW)/sizeof(*decode_beginW))) { + if(!strncmpW(src, decode_beginW, ARRAY_SIZE(decode_beginW))) { DWORD len, i, j=0, csum, s=0; - src += sizeof(decode_beginW)/sizeof(*decode_beginW); + src += ARRAY_SIZE(decode_beginW); if(!decode_dword(src, &len)) return JS_E_INVALID_CHAR; @@ -165,9 +165,9 @@ HRESULT decode_source(WCHAR *code) return JS_E_INVALID_CHAR; src += 8; - if(strncmpW(src, decode_endW, sizeof(decode_endW)/sizeof(*decode_endW))) + if(strncmpW(src, decode_endW, ARRAY_SIZE(decode_endW))) return JS_E_INVALID_CHAR; - src += sizeof(decode_endW)/sizeof(*decode_endW); + src += ARRAY_SIZE(decode_endW); }else { *dst++ = *src++; } diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 65ca47a515..bc02aa4d67 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1290,7 +1290,7 @@ HRESULT disp_call_value(script_ctx_t *ctx, IDispatch *disp, IDispatch *jsthis, W dp.rgdispidNamedArgs = NULL; } - if(dp.cArgs > sizeof(buf)/sizeof(*buf)) { + if(dp.cArgs > ARRAY_SIZE(buf)) { dp.rgvarg = heap_alloc(dp.cArgs*sizeof(VARIANT)); if(!dp.rgvarg) { if(dispex) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 8cf52f00eb..ef855dce30 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -144,7 +144,7 @@ static const builtin_prop_t Error_props[] = { static const builtin_info_t Error_info = { JSCLASS_ERROR, {NULL, Error_value, 0}, - sizeof(Error_props)/sizeof(*Error_props), + ARRAY_SIZE(Error_props), Error_props, NULL, NULL @@ -348,7 +348,7 @@ HRESULT init_error_constr(script_ctx_t *ctx, jsdisp_t *object_prototype) jsstr_t *str; HRESULT hres; - for(i=0; i < sizeof(names)/sizeof(names[0]); i++) { + for(i=0; i < ARRAY_SIZE(names); i++) { hres = alloc_error(ctx, i==0 ? object_prototype : NULL, NULL, &err); if(FAILED(hres)) return hres; @@ -385,7 +385,7 @@ static HRESULT throw_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str, j return error; buf[0] = '\0'; - LoadStringW(jscript_hinstance, HRESULT_CODE(error), buf, sizeof(buf)/sizeof(WCHAR)); + LoadStringW(jscript_hinstance, HRESULT_CODE(error), buf, ARRAY_SIZE(buf)); if(str) pos = strchrW(buf, '|'); if(pos) { diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 0aae300d01..9795f77e90 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -304,12 +304,12 @@ static HRESULT function_to_string(FunctionInstance *function, jsstr_t **ret) WCHAR *ptr; name_len = strlenW(function->name); - str = jsstr_alloc_buf((sizeof(native_prefixW)+sizeof(native_suffixW))/sizeof(WCHAR) + name_len, &ptr); + str = jsstr_alloc_buf(ARRAY_SIZE(native_prefixW) + ARRAY_SIZE(native_suffixW) + name_len, &ptr); if(!str) return E_OUTOFMEMORY; memcpy(ptr, native_prefixW, sizeof(native_prefixW)); - memcpy(ptr += sizeof(native_prefixW)/sizeof(WCHAR), function->name, name_len*sizeof(WCHAR)); + memcpy(ptr += ARRAY_SIZE(native_prefixW), function->name, name_len*sizeof(WCHAR)); memcpy(ptr + name_len, native_suffixW, sizeof(native_suffixW)); }else { str = jsstr_alloc_len(function->func_code->source, function->func_code->source_len); @@ -593,7 +593,7 @@ static const builtin_prop_t Function_props[] = { static const builtin_info_t Function_info = { JSCLASS_FUNCTION, DEFAULT_FUNCTION_VALUE, - sizeof(Function_props)/sizeof(*Function_props), + ARRAY_SIZE(Function_props), Function_props, Function_destructor, NULL @@ -607,7 +607,7 @@ static const builtin_prop_t FunctionInst_props[] = { static const builtin_info_t FunctionInst_info = { JSCLASS_FUNCTION, DEFAULT_FUNCTION_VALUE, - sizeof(FunctionInst_props)/sizeof(*FunctionInst_props), + ARRAY_SIZE(FunctionInst_props), FunctionInst_props, Function_destructor, NULL @@ -764,11 +764,11 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg } if(SUCCEEDED(hres)) { - len += (sizeof(function_anonymousW) + sizeof(function_beginW) + sizeof(function_endW)) / sizeof(WCHAR); + len += ARRAY_SIZE(function_anonymousW) + ARRAY_SIZE(function_beginW) + ARRAY_SIZE(function_endW); str = heap_alloc(len*sizeof(WCHAR)); if(str) { memcpy(str, function_anonymousW, sizeof(function_anonymousW)); - ptr = str + sizeof(function_anonymousW)/sizeof(WCHAR); + ptr = str + ARRAY_SIZE(function_anonymousW); if(argc > 1) { while(1) { ptr += jsstr_flush(params[j], ptr); @@ -779,7 +779,7 @@ static HRESULT construct_function(script_ctx_t *ctx, unsigned argc, jsval_t *arg } } memcpy(ptr, function_beginW, sizeof(function_beginW)); - ptr += sizeof(function_beginW)/sizeof(WCHAR); + ptr += ARRAY_SIZE(function_beginW); if(argc) ptr += jsstr_flush(params[argc-1], ptr); memcpy(ptr, function_endW, sizeof(function_endW)); diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index cc2c3c1ef4..33de641483 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -964,7 +964,7 @@ static const builtin_prop_t JSGlobal_props[] = { static const builtin_info_t JSGlobal_info = { JSCLASS_GLOBAL, {NULL, NULL, 0}, - sizeof(JSGlobal_props)/sizeof(*JSGlobal_props), + ARRAY_SIZE(JSGlobal_props), JSGlobal_props, NULL, NULL diff --git a/dlls/jscript/json.c b/dlls/jscript/json.c index 0430d415ba..0267340ca4 100644 --- a/dlls/jscript/json.c +++ b/dlls/jscript/json.c @@ -836,7 +836,7 @@ static const builtin_prop_t JSON_props[] = { static const builtin_info_t JSON_info = { JSCLASS_JSON, {NULL, NULL, 0}, - sizeof(JSON_props)/sizeof(*JSON_props), + ARRAY_SIZE(JSON_props), JSON_props, NULL, NULL diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 821c0164eb..84360694ee 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -96,7 +96,7 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, } if(!(rem_flags & REM_NO_CTX_UPDATE)) { - DWORD i, n = min(sizeof(ctx->match_parens)/sizeof(ctx->match_parens[0]), ret->paren_count); + DWORD i, n = min(ARRAY_SIZE(ctx->match_parens), ret->paren_count); for(i=0; i < n; i++) { if(ret->parens[i].index == -1) { @@ -108,7 +108,7 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, } } - if(n < sizeof(ctx->match_parens)/sizeof(ctx->match_parens[0])) + if(n < ARRAY_SIZE(ctx->match_parens)) memset(ctx->match_parens+n, 0, sizeof(ctx->match_parens) - n*sizeof(ctx->match_parens[0])); } @@ -595,7 +595,7 @@ static const builtin_prop_t RegExp_props[] = { static const builtin_info_t RegExp_info = { JSCLASS_REGEXP, {NULL, RegExp_value, 0}, - sizeof(RegExp_props)/sizeof(*RegExp_props), + ARRAY_SIZE(RegExp_props), RegExp_props, RegExp_destructor, NULL @@ -612,7 +612,7 @@ static const builtin_prop_t RegExpInst_props[] = { static const builtin_info_t RegExpInst_info = { JSCLASS_REGEXP, {NULL, RegExp_value, 0}, - sizeof(RegExpInst_props)/sizeof(*RegExpInst_props), + ARRAY_SIZE(RegExpInst_props), RegExpInst_props, RegExp_destructor, NULL @@ -995,7 +995,7 @@ static const builtin_prop_t RegExpConstr_props[] = { static const builtin_info_t RegExpConstr_info = { JSCLASS_FUNCTION, DEFAULT_FUNCTION_VALUE, - sizeof(RegExpConstr_props)/sizeof(*RegExpConstr_props), + ARRAY_SIZE(RegExpConstr_props), RegExpConstr_props, NULL, NULL diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 90206113a2..72dd4dbe9c 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -526,8 +526,8 @@ static HRESULT str_to_number(jsstr_t *str, double *ret) ptr++; } - if(!strncmpW(ptr, infinityW, sizeof(infinityW)/sizeof(WCHAR))) { - ptr += sizeof(infinityW)/sizeof(WCHAR); + if(!strncmpW(ptr, infinityW, ARRAY_SIZE(infinityW))) { + ptr += ARRAY_SIZE(infinityW); while(*ptr && isspaceW(*ptr)) ptr++; @@ -701,7 +701,7 @@ static jsstr_t *int_to_string(int i) i = -i; } - p = buf + sizeof(buf)/sizeof(*buf)-1; + p = buf + ARRAY_SIZE(buf)-1; *p-- = 0; while(i) { *p-- = i%10 + '0'; diff --git a/dlls/jscript/lex.c b/dlls/jscript/lex.c index b4cc82a259..7ef2112dc8 100644 --- a/dlls/jscript/lex.c +++ b/dlls/jscript/lex.c @@ -162,7 +162,7 @@ static int hex_to_int(WCHAR c) static int check_keywords(parser_ctx_t *ctx, const WCHAR **lval) { - int min = 0, max = sizeof(keywords)/sizeof(keywords[0])-1, r, i; + int min = 0, max = ARRAY_SIZE(keywords)-1, r, i; while(min <= max) { i = (min+max)/2; diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 109df9d321..dc07a97758 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -522,7 +522,7 @@ static const builtin_prop_t Math_props[] = { static const builtin_info_t Math_info = { JSCLASS_MATH, {NULL, NULL, 0}, - sizeof(Math_props)/sizeof(*Math_props), + ARRAY_SIZE(Math_props), Math_props, NULL, NULL @@ -558,7 +558,7 @@ HRESULT create_math(script_ctx_t *ctx, jsdisp_t **ret) return hres; } - for(i=0; i < sizeof(constants)/sizeof(*constants); i++) { + for(i=0; i < ARRAY_SIZE(constants); i++) { hres = jsdisp_define_data_property(math, constants[i].name, 0, jsval_number(constants[i].val)); if(FAILED(hres)) { diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 94c8cc4e07..3d9890b36a 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -524,7 +524,7 @@ static const builtin_prop_t Number_props[] = { static const builtin_info_t Number_info = { JSCLASS_NUMBER, {NULL, NULL,0, Number_get_value}, - sizeof(Number_props)/sizeof(*Number_props), + ARRAY_SIZE(Number_props), Number_props, NULL, NULL diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 9428931525..487eb5f14b 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -252,7 +252,7 @@ static const builtin_prop_t Object_props[] = { static const builtin_info_t Object_info = { JSCLASS_OBJECT, {NULL, NULL,0, Object_get_value}, - sizeof(Object_props)/sizeof(*Object_props), + ARRAY_SIZE(Object_props), Object_props, Object_destructor, NULL @@ -528,7 +528,7 @@ static const builtin_prop_t ObjectConstr_props[] = { static const builtin_info_t ObjectConstr_info = { JSCLASS_FUNCTION, DEFAULT_FUNCTION_VALUE, - sizeof(ObjectConstr_props)/sizeof(*ObjectConstr_props), + ARRAY_SIZE(ObjectConstr_props), ObjectConstr_props, NULL, NULL diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index e6e4997e3e..7a6133dbcf 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -943,7 +943,7 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un }else { static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d'}; - hres = strbuf_append(&ret, undefinedW, sizeof(undefinedW)/sizeof(WCHAR)); + hres = strbuf_append(&ret, undefinedW, ARRAY_SIZE(undefinedW)); if(FAILED(hres)) break; } @@ -1595,7 +1595,7 @@ static const builtin_prop_t String_props[] = { static const builtin_info_t String_info = { JSCLASS_STRING, {NULL, NULL,0, String_get_value}, - sizeof(String_props)/sizeof(*String_props), + ARRAY_SIZE(String_props), String_props, String_destructor, NULL @@ -1608,7 +1608,7 @@ static const builtin_prop_t StringInst_props[] = { static const builtin_info_t StringInst_info = { JSCLASS_STRING, {NULL, NULL,0, String_get_value}, - sizeof(StringInst_props)/sizeof(*StringInst_props), + ARRAY_SIZE(StringInst_props), StringInst_props, String_destructor, NULL, @@ -1726,7 +1726,7 @@ static const builtin_prop_t StringConstr_props[] = { static const builtin_info_t StringConstr_info = { JSCLASS_FUNCTION, DEFAULT_FUNCTION_VALUE, - sizeof(StringConstr_props)/sizeof(*StringConstr_props), + ARRAY_SIZE(StringConstr_props), StringConstr_props, NULL, NULL diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index 23122282e7..4bed5fb076 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -258,7 +258,7 @@ static const builtin_prop_t VBArray_props[] = { static const builtin_info_t VBArray_info = { JSCLASS_VBARRAY, {NULL, VBArray_value, 0}, - sizeof(VBArray_props)/sizeof(*VBArray_props), + ARRAY_SIZE(VBArray_props), VBArray_props, VBArray_destructor, NULL -- 2.14.4

2 1

[PATCH] comctl32: Remove redundant NULL checks before Free()
by Michael Stefaniuc 10 Jul '18

10 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/taskdialog.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index ee3b27325f..463189954e 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -429,7 +429,7 @@ static HWND taskdialog_create_label(struct taskdialog_info *dialog_info, const W if (syslink) style |= WS_TABSTOP; textW = taskdialog_gettext(dialog_info, TRUE, text); hwnd = CreateWindowW(class, textW, style, 0, 0, 0, 0, dialog_info->hwnd, NULL, 0, NULL); - if (textW) Free(textW); + Free(textW); SendMessageW(hwnd, WM_SETFONT, (WPARAM)font, 0); return hwnd; @@ -825,9 +825,9 @@ static void taskdialog_destroy(struct taskdialog_info *dialog_info) if (dialog_info->taskconfig->dwFlags & TDF_CALLBACK_TIMER) KillTimer(dialog_info->hwnd, ID_TIMER); if (dialog_info->font) DeleteObject(dialog_info->font); if (dialog_info->main_instruction_font) DeleteObject(dialog_info->main_instruction_font); - if (dialog_info->buttons) Free(dialog_info->buttons); - if (dialog_info->radio_buttons) Free(dialog_info->radio_buttons); - if (dialog_info->command_links) Free(dialog_info->command_links); + Free(dialog_info->buttons); + Free(dialog_info->radio_buttons); + Free(dialog_info->command_links); } static INT_PTR CALLBACK taskdialog_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) -- 2.14.4

2 1

[PATCH] po: Update German translation.
by Julian Rüger 10 Jul '18

10 Jul '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 3.12
by Julian Rüger 10 Jul '18

10 Jul '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[website] German translation for release 3.0.2
by Julian Rüger 10 Jul '18

10 Jul '18

Signed-off-by: Julian Rüger <jr98(a)gmx.net>

1 0

[PATCH] winmm: Avoid an ARRAY_SIZE-like macro
by Michael Stefaniuc 10 Jul '18

10 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winmm/lolvldrv.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c index 3f63e5f0c9..35bd6a0b5f 100644 --- a/dlls/winmm/lolvldrv.c +++ b/dlls/winmm/lolvldrv.c @@ -68,7 +68,6 @@ static BOOL drivers_loaded; static int MMDrvsHi; static WINE_MM_DRIVER MMDrvs[8]; static LPWINE_MLD MM_MLDrvs[40]; -#define MAX_MM_MLDRVS (sizeof(MM_MLDrvs) / sizeof(MM_MLDrvs[0])) static void MMDRV_Init(void); @@ -146,9 +145,9 @@ LPWINE_MLD MMDRV_Alloc(UINT size, UINT type, LPHANDLE hndl, DWORD* dwFlags, if (!mld) return NULL; /* find an empty slot in MM_MLDrvs table */ - for (i = 0; i < MAX_MM_MLDRVS; i++) if (!MM_MLDrvs[i]) break; + for (i = 0; i < ARRAY_SIZE(MM_MLDrvs); i++) if (!MM_MLDrvs[i]) break; - if (i == MAX_MM_MLDRVS) { + if (i == ARRAY_SIZE(MM_MLDrvs)) { /* the MM_MLDrvs table could be made growable in the future if needed */ ERR("Too many open drivers\n"); HeapFree(GetProcessHeap(), 0, mld); -- 2.14.4

2 1

[PATCH] imaadp32.acm: Avoid ARRAY_SIZE-like macros
by Michael Stefaniuc 10 Jul '18

10 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/imaadp32.acm/imaadp32.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index 474f548582..2b47f093d2 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -79,9 +79,6 @@ static const Format ADPCM_Formats[] = {1, 4, 22050}, {2, 4, 22050}, {1, 4, 44100}, {2, 4, 44100}, }; -#define NUM_PCM_FORMATS (sizeof(PCM_Formats) / sizeof(PCM_Formats[0])) -#define NUM_ADPCM_FORMATS (sizeof(ADPCM_Formats) / sizeof(ADPCM_Formats[0])) - /*********************************************************************** * ADPCM_GetFormatIndex */ @@ -93,11 +90,11 @@ static DWORD ADPCM_GetFormatIndex(const WAVEFORMATEX *wfx) switch (wfx->wFormatTag) { case WAVE_FORMAT_PCM: - hi = NUM_PCM_FORMATS; + hi = ARRAY_SIZE(PCM_Formats); fmts = PCM_Formats; break; case WAVE_FORMAT_IMA_ADPCM: - hi = NUM_ADPCM_FORMATS; + hi = ARRAY_SIZE(ADPCM_Formats); fmts = ADPCM_Formats; break; default: @@ -585,13 +582,13 @@ static LRESULT ADPCM_FormatTagDetails(PACMFORMATTAGDETAILSW aftd, DWORD dwQuery) case 0: aftd->dwFormatTag = WAVE_FORMAT_PCM; aftd->cbFormatSize = sizeof(PCMWAVEFORMAT); - aftd->cStandardFormats = NUM_PCM_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(PCM_Formats); lstrcpyW(aftd->szFormatTag, szPcm); break; case 1: aftd->dwFormatTag = WAVE_FORMAT_IMA_ADPCM; aftd->cbFormatSize = sizeof(IMAADPCMWAVEFORMAT); - aftd->cStandardFormats = NUM_ADPCM_FORMATS; + aftd->cStandardFormats = ARRAY_SIZE(ADPCM_Formats); lstrcpyW(aftd->szFormatTag, szImaAdPcm); break; } @@ -614,7 +611,7 @@ static LRESULT ADPCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) switch (afd->dwFormatTag) { case WAVE_FORMAT_PCM: - if (afd->dwFormatIndex >= NUM_PCM_FORMATS) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(PCM_Formats)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = PCM_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = PCM_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = PCM_Formats[afd->dwFormatIndex].nBits; @@ -627,7 +624,7 @@ static LRESULT ADPCM_FormatDetails(PACMFORMATDETAILSW afd, DWORD dwQuery) afd->pwfx->nSamplesPerSec * afd->pwfx->nBlockAlign; break; case WAVE_FORMAT_IMA_ADPCM: - if (afd->dwFormatIndex >= NUM_ADPCM_FORMATS) return ACMERR_NOTPOSSIBLE; + if (afd->dwFormatIndex >= ARRAY_SIZE(ADPCM_Formats)) return ACMERR_NOTPOSSIBLE; afd->pwfx->nChannels = ADPCM_Formats[afd->dwFormatIndex].nChannels; afd->pwfx->nSamplesPerSec = ADPCM_Formats[afd->dwFormatIndex].rate; afd->pwfx->wBitsPerSample = ADPCM_Formats[afd->dwFormatIndex].nBits; -- 2.14.4

2 3

[PATCH v4] ole32: Return IUnknown from GITCF_CreateInstance if requested
by Alex Henrie 10 Jul '18

10 Jul '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Without this patch, ArcMap.exe (part of ArcGIS Desktop 10.6) crashes shortly after starting. --- dlls/ole32/git.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index f7a0460154..8683f3592a 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -122,9 +122,14 @@ StdGlobalInterfaceTable_QueryInterface(IGlobalInterfaceTable* iface, /* Do we implement that interface? */ if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IGlobalInterfaceTable, riid)) + { *ppvObject = iface; + } else + { + FIXME("(%s), not supported.\n", debugstr_guid(riid)); return E_NOINTERFACE; + } /* Now inc the refcount */ IGlobalInterfaceTable_AddRef(iface); @@ -314,13 +319,10 @@ static HRESULT WINAPI GITCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) { - if (IsEqualIID(riid,&IID_IGlobalInterfaceTable)) { - IGlobalInterfaceTable *git = get_std_git(); - return IGlobalInterfaceTable_QueryInterface(git, riid, ppv); - } - - FIXME("(%s), not supported.\n",debugstr_guid(riid)); - return E_NOINTERFACE; + IGlobalInterfaceTable *git = get_std_git(); + HRESULT hr = IGlobalInterfaceTable_QueryInterface(git, riid, ppv); + IGlobalInterfaceTable_Release(git); + return hr; } static HRESULT WINAPI GITCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) -- 2.18.0

2 1

[PATCH v3] ole32: Return IUnknown from GITCF_CreateInstance if requested
by Alex Henrie 10 Jul '18

10 Jul '18

From: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Without this patch, ArcMap.exe (part of ArcGIS Desktop 10.6) crashes shortly after starting. --- dlls/ole32/git.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index f7a0460154..8683f3592a 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -122,9 +122,14 @@ StdGlobalInterfaceTable_QueryInterface(IGlobalInterfaceTable* iface, /* Do we implement that interface? */ if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IGlobalInterfaceTable, riid)) + { *ppvObject = iface; + } else + { + FIXME("(%s), not supported.\n", debugstr_guid(riid)); return E_NOINTERFACE; + } /* Now inc the refcount */ IGlobalInterfaceTable_AddRef(iface); @@ -314,13 +319,10 @@ static HRESULT WINAPI GITCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) { - if (IsEqualIID(riid,&IID_IGlobalInterfaceTable)) { - IGlobalInterfaceTable *git = get_std_git(); - return IGlobalInterfaceTable_QueryInterface(git, riid, ppv); - } - - FIXME("(%s), not supported.\n",debugstr_guid(riid)); - return E_NOINTERFACE; + IGlobalInterfaceTable *git = get_std_git(); + HRESULT hr = IGlobalInterfaceTable_QueryInterface(git, riid, ppv); + IGlobalInterfaceTable_Release(git); + return hr; } static HRESULT WINAPI GITCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) -- 2.18.0

2 1

[PATCH] riched20: Avoid an ARRAY_SIZE-like macro
by Michael Stefaniuc 10 Jul '18

10 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/riched20/reader.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 03101090b3..df131ec20f 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -2175,14 +2175,13 @@ static RTFKey rtfKey[] = { 0, -1, NULL, 0 } }; -#define RTF_KEY_COUNT (sizeof(rtfKey) / sizeof(RTFKey)) typedef struct tagRTFHashTableEntry { int count; RTFKey **value; } RTFHashTableEntry; -static RTFHashTableEntry rtfHashTable[RTF_KEY_COUNT * 2]; +static RTFHashTableEntry rtfHashTable[ARRAY_SIZE(rtfKey) * 2]; /* @@ -2199,7 +2198,7 @@ void LookupInit(void) int index; rp->rtfKHash = Hash (rp->rtfKStr); - index = rp->rtfKHash % (RTF_KEY_COUNT * 2); + index = rp->rtfKHash % (ARRAY_SIZE(rtfKey) * 2); if (!rtfHashTable[index].count) rtfHashTable[index].value = heap_alloc(sizeof(RTFKey *)); else @@ -2212,7 +2211,7 @@ void LookupCleanup(void) { unsigned int i; - for (i=0; i<RTF_KEY_COUNT*2; i++) + for (i=0; i<ARRAY_SIZE(rtfKey)*2; i++) { heap_free( rtfHashTable[i].value ); rtfHashTable[i].value = NULL; @@ -2235,7 +2234,7 @@ static void Lookup(RTF_Info *info, char *s) ++s; /* skip over the leading \ character */ hash = Hash (s); - entry = &rtfHashTable[hash % (RTF_KEY_COUNT * 2)]; + entry = &rtfHashTable[hash % (ARRAY_SIZE(rtfKey) * 2)]; for (i = 0; i < entry->count; i++) { rp = entry->value[i]; -- 2.14.4

2 3

[PATCH] testbot/web: Tweak the 'Show full log' link labels.
by Francois Gouget 10 Jul '18

10 Jul '18

Parts of the log may already be shown so make it clearer that this is to show all of it. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 3a5b3072f..28601d082 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -300,7 +300,7 @@ sub GenerateMoreInfoLink($$$;$) my $Url = $ENV{"SCRIPT_NAME"} ."?Key=". uri_escape($self->{JobId}); - my $Action = "Show"; + my $Action = "Show". ($Set eq "Full" and $Label !~ /old/ ? " full" : ""); foreach my $Key (sort keys %{$self->{More}}) { my $MoreInfo = $self->{More}->{$Key}; -- 2.18.0

1 0

[PATCH] testbot/web: Also highlight the 'unknown target' make errors.
by Francois Gouget 10 Jul '18

10 Jul '18

In case a makefile patch gets things wrong (or there is a TestBot bug). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 1 + 1 file changed, 1 insertion(+) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index bccf30db3..e18ad3242 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -423,6 +423,7 @@ sub GetLogLineCategory($) $Line =~ /^error: corrupt patch / or # Build errors $Line =~ /: error: / or + $Line =~ /^make: [*]{3} No rule to make target / or $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or $Line =~ /^(?:Build|Reconfig|Task): (?!ok)/ or # Typical perl errors -- 2.18.0

1 0

[PATCH] testbot/web: Also detect and highlight the TestBot error messages.
by Francois Gouget 10 Jul '18

10 Jul '18

This means calling GetHtmlLine() to highlight and escape the error messages. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/LogUtils.pm | 4 ++++ testbot/web/JobDetails.pl | 4 ++-- testbot/web/WineTestBot.css | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index e18ad3242..0ef9609e7 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -431,6 +431,10 @@ sub GetLogLineCategory($) { return "error"; } + if ($Line =~ /^BotError:/) + { + return "boterror"; + } if ($Line =~ /^\+ \S/ or $Line =~ /^[_.a-z0-9-]+:[_a-z0-9]* start / or # Build messages diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index e7e53d208..54e8b7ff1 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -250,7 +250,7 @@ sub GetHtmlLine($$$) my ($self, $FullLog, $Line) = @_; my $Category = GetLogLineCategory($Line); - return undef if ($Category ne "error" and !$FullLog); + return undef if ($Category !~ /error/ and !$FullLog); my $Html = $self->escapeHTML($Line); if (!$FullLog and $Html =~ m/^[^:]+:([^:]*)(?::[0-9a-f]+)? done $258$/) @@ -477,7 +477,7 @@ sub GenerateBody($) print "<pre><code>"; $ErrFirst = 0; } - print $self->escapeHTML($Line), "\n"; + print $self->GetHtmlLine(1, $Line), "\n"; } close($ErrFile); diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index 593c38f44..adbfa749e 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -371,6 +371,7 @@ pre .log-skip { color: blue; } .log-todo { color: #d08000; } .log-error { color: red; } +.log-boterror { color: #cc0052; } a.title { color:inherit; text-decoration: none; } -- 2.18.0

1 0

[PATCH] testbot/web: Add a border around the link to hide the current log.
by Francois Gouget 10 Jul '18

10 Jul '18

This helps make it clearer which log is being shown. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/JobDetails.pl | 8 ++++++-- testbot/web/WineTestBot.css | 6 ++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 54e8b7ff1..3a5b3072f 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -338,8 +338,12 @@ sub GenerateMoreInfoLink($$$;$) } $Url .= "#k" . uri_escape($LinkKey); - print "<div class='TaskMoreInfoLink'><a href='", - $self->CGI->escapeHTML($Url), "'>$Action $Label</a></div>\n"; + my $Html = "<a href='". $self->CGI->escapeHTML($Url) ."'>$Action $Label</a>"; + if ($Action eq "Hide") + { + $Html = "<span class='TaskMoreInfoSelected'>$Html</span>"; + } + print "<div class='TaskMoreInfoLink'>$Html</div>\n"; } sub GenerateBody($) diff --git a/testbot/web/WineTestBot.css b/testbot/web/WineTestBot.css index adbfa749e..ae2038290 100644 --- a/testbot/web/WineTestBot.css +++ b/testbot/web/WineTestBot.css @@ -310,6 +310,12 @@ h2 margin-right: 2em; } +.TaskMoreInfoSelected +{ + border: 1px solid #a50d0d; + padding: 2px; +} + .LogDllName { font-weight: bold; -- 2.18.0

1 0

[PATCH] testbot/build: Avoid an undefined $Action error in WineTest.pl.
by Francois Gouget 10 Jul '18

10 Jul '18

This would only happen if running WineTest.pl from the command line, to get the usage message for instance. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/WineTest.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 2b2ea2b54..5ef8e614e 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -315,9 +315,9 @@ if (!defined $Usage) $Usage = 2; } - if (!defined $FileName and $Action eq "build") + if (!defined $FileName and ($Action || "") eq "build") { - Error "you must provide a patch file\n"; + Error "you must provide a patch to test\n"; $Usage = 2; } } -- 2.18.0

1 0

[PATCH] testbot/build: Remove support for the old Build.pl parameters.
by Francois Gouget 10 Jul '18

10 Jul '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 1a69669a2..da145837b 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -193,19 +193,10 @@ my %AllTargets; map { $AllTargets{$_} = 1 } qw(exe32 exe64); my ($Usage, $PatchFile, $TargetList); -my $IgnoreNext = 0; # FIXME Backward compatibility while (@ARGV) { my $Arg = shift @ARGV; - if ($Arg =~ /^patch(?:dlls|programs)$/) - { - $IgnoreNext ||= 1; # Ignore this legacy parameter - } - elsif ($IgnoreNext == 1) - { - $IgnoreNext = 2; # Ignore this legacy parameter - } - elsif ($Arg =~ /^(?:-\?|-h|--help)$/) + if ($Arg =~ /^(?:-\?|-h|--help)$/) { $Usage = 0; last; -- 2.18.0

1 0

[PATCH] testbot/web: Use IsValidFileName() to validate executable filenames.
by Francois Gouget 10 Jul '18

10 Jul '18

Submit.pl should not have its own way to check that the executable filename is a valid Windows filename. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 38aa75fcb..cb6a1246f 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -484,7 +484,7 @@ sub Validate($) { if (($self->GetParam("FileType") eq "patchdlls" && $self->GetParam("TestExecutable") !~ m/^[\w_.]+_test\.exe$/) || - ($self->GetParam("TestExecutable") =~ m=(?:[a-z]:|[/\\])=i)) + !IsValidFileName($self->GetParam("TestExecutable"))) { $self->{ErrField} = "TestExecutable"; $self->{ErrMessage} = "Invalid test executable filename"; -- 2.18.0

1 0

[PATCH] testbot/build: Standardize some Build.pl and WineTest.pl messages.
by Francois Gouget 10 Jul '18

10 Jul '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 4 ++-- testbot/bin/build/WineTest.pl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index a3cb170a0..1a69669a2 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -223,13 +223,13 @@ while (@ARGV) $PatchFile = "$DataDir/staging/$Arg"; if (!-r $PatchFile) { - Error "patch file '$Arg' is not readable\n"; + Error "'$Arg' is not readable\n"; $Usage = 2; } } else { - Error "the patch filename '$Arg' contains invalid characters\n"; + Error "the '$Arg' filename contains invalid characters\n"; $Usage = 2; last; } diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 1c43a9b89..2b2ea2b54 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -252,7 +252,7 @@ while (@ARGV) } else { - Error "invalid file name '$Arg'\n"; + Error "the '$Arg' filename contains invalid characters\n"; $Usage = 2; last; } -- 2.18.0

1 0

[PATCH v2] ole32: Return IUnknown from GITCF_CreateInstance if requested
by Alex Henrie 10 Jul '18

10 Jul '18

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Without this patch, ArcMap.exe (part of ArcGIS Desktop 10.6) crashes shortly after starting. v2: Move the error message to the QueryInterface function and clean up that function a bit. --- dlls/ole32/git.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index f7a0460154..e2ed8be91d 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -117,18 +117,18 @@ StdGlobalInterfaceTable_QueryInterface(IGlobalInterfaceTable* iface, /* Make sure silly coders can't crash us */ if (ppvObject == 0) return E_INVALIDARG; - *ppvObject = 0; /* assume we don't have the interface */ - /* Do we implement that interface? */ if (IsEqualIID(&IID_IUnknown, riid) || IsEqualIID(&IID_IGlobalInterfaceTable, riid)) + { + IGlobalInterfaceTable_AddRef(iface); *ppvObject = iface; - else - return E_NOINTERFACE; + return S_OK; + } - /* Now inc the refcount */ - IGlobalInterfaceTable_AddRef(iface); - return S_OK; + *ppvObject = NULL; + ERR("(%s), not supported.\n", debugstr_guid(riid)); + return E_NOINTERFACE; } static ULONG WINAPI @@ -314,13 +314,7 @@ static HRESULT WINAPI GITCF_CreateInstance(LPCLASSFACTORY iface, LPUNKNOWN pUnk, REFIID riid, LPVOID *ppv) { - if (IsEqualIID(riid,&IID_IGlobalInterfaceTable)) { - IGlobalInterfaceTable *git = get_std_git(); - return IGlobalInterfaceTable_QueryInterface(git, riid, ppv); - } - - FIXME("(%s), not supported.\n",debugstr_guid(riid)); - return E_NOINTERFACE; + return IGlobalInterfaceTable_QueryInterface(get_std_git(), riid, ppv); } static HRESULT WINAPI GITCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) -- 2.18.0

2 1

[PATCH v2] riched20: Avoid an ARRAY_SIZE-like macro
by Huw Davies 10 Jul '18

10 Jul '18

From: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/reader.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/reader.c b/dlls/riched20/reader.c index 03101090b3..339ca04949 100644 --- a/dlls/riched20/reader.c +++ b/dlls/riched20/reader.c @@ -2175,14 +2175,13 @@ static RTFKey rtfKey[] = { 0, -1, NULL, 0 } }; -#define RTF_KEY_COUNT (sizeof(rtfKey) / sizeof(RTFKey)) typedef struct tagRTFHashTableEntry { int count; RTFKey **value; } RTFHashTableEntry; -static RTFHashTableEntry rtfHashTable[RTF_KEY_COUNT * 2]; +static RTFHashTableEntry rtfHashTable[ARRAY_SIZE(rtfKey) * 2]; /* @@ -2199,7 +2198,7 @@ void LookupInit(void) int index; rp->rtfKHash = Hash (rp->rtfKStr); - index = rp->rtfKHash % (RTF_KEY_COUNT * 2); + index = rp->rtfKHash % (ARRAY_SIZE(rtfKey) * 2); if (!rtfHashTable[index].count) rtfHashTable[index].value = heap_alloc(sizeof(RTFKey *)); else @@ -2212,7 +2211,7 @@ void LookupCleanup(void) { unsigned int i; - for (i=0; i<RTF_KEY_COUNT*2; i++) + for (i = 0; i < ARRAY_SIZE(rtfKey) * 2; i++) { heap_free( rtfHashTable[i].value ); rtfHashTable[i].value = NULL; @@ -2235,7 +2234,7 @@ static void Lookup(RTF_Info *info, char *s) ++s; /* skip over the leading \ character */ hash = Hash (s); - entry = &rtfHashTable[hash % (RTF_KEY_COUNT * 2)]; + entry = &rtfHashTable[hash % (ARRAY_SIZE(rtfKey) * 2)]; for (i = 0; i < entry->count; i++) { rp = entry->value[i]; -- 2.16.2

1 0

[v2 1/2] kernel32/tests: resource: Replicate muirct.exe behavior
by Jon Doron 10 Jul '18

10 Jul '18

For some reason muirct.exe is aware of the opaque structure used by BeginUpdateResource, it access the filename field of the opaque structure during it's processing. MS documentation for the muirct utility: https://docs.microsoft.com/en-us/windows/desktop/intl/resource-utilities Sample execution: MUIRCT.EXE -c "ui.exe" -e "de-DE\ui.exe.mui" Signed-off-by: Jon Doron <arilou(a)gmail.com> --- dlls/kernel32/tests/resource.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index 74066cfba3..6db9655833 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -24,6 +24,7 @@ #include "wine/test.h" static const char filename[] = "test_.exe"; +static const wchar_t filenameW[] = L"test_.exe"; static DWORD GLE; enum constants { @@ -463,6 +464,28 @@ static void test_find_resource(void) ok( GetLastError() == ERROR_RESOURCE_LANG_NOT_FOUND, "wrong error %u\n", GetLastError() ); } +static void test_muirct_compatiblity(void) +{ + HANDLE res = NULL; + PVOID res_data; + PWCHAR res_filename; + + res = BeginUpdateResourceW( (PWCHAR)filenameW, FALSE ); + ok( res != NULL, "BeginUpdateResourceW failed\n" ); + res_data = GlobalLock(res); + ok( res_data != NULL, "GlobalLock failed\n" ); +#ifdef _WIN64 + res_filename = (PWCHAR)GlobalLock( *(HGLOBAL*)((ULONG_PTR)res_data + 0x30) ); +#else + res_filename = (PWCHAR)GlobalLock( *(HGLOBAL*)((ULONG_PTR)res_data + 0x18) ); +#endif + ok( res_filename != NULL, "GlobalLock for res_filename failed\n" ); + ok( !lstrcmpW(res_filename, (PWCHAR)filenameW), "Filename fields do not match\n" ); + ok( GlobalUnlock( res_filename ), "GlobalUnlock res_filenamed failed\n" ); + ok( GlobalUnlock( res_data ), "GlobalUnlock res_data failed\n" ); + ok( EndUpdateResourceW( res, TRUE ), "EndUpdateResourceW failed\n"); +} + START_TEST(resource) { DWORD i; @@ -482,6 +505,7 @@ START_TEST(resource) { const struct _sec_variants *sec = &sec_variants[i]; build_exe( &sec->build ); + test_muirct_compatiblity(); update_resources_none(); check_exe( &sec->chk_none ); update_resources_delete(); -- 2.17.1

2 3

[PATCH] ntdll/tests: Tests for RtlIpv6StringToAddressEx
by Alistair Leslie-Hughes 10 Jul '18

10 Jul '18

From: Mark Jansen <learn0more+wine(a)gmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ntdll/tests/rtl.c | 269 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 268 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index ec12ea2..e13c139 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -91,6 +91,8 @@ static NTSTATUS (WINAPI *pRtlIpv4AddressToStringExA)(const IN_ADDR *, USHORT, L static NTSTATUS (WINAPI *pRtlIpv4StringToAddressA)(PCSTR, BOOLEAN, PCSTR *, IN_ADDR *); static NTSTATUS (WINAPI *pRtlIpv6StringToAddressA)(PCSTR, PCSTR *, struct in6_addr *); static NTSTATUS (WINAPI *pRtlIpv6StringToAddressW)(PCWSTR, PCWSTR *, struct in6_addr *); +static NTSTATUS (WINAPI *pRtlIpv6StringToAddressExA)(PCSTR, struct in6_addr *, PULONG, PUSHORT); +static NTSTATUS (WINAPI *pRtlIpv6StringToAddressExW)(PCWSTR, struct in6_addr *, PULONG, PUSHORT); static NTSTATUS (WINAPI *pLdrAddRefDll)(ULONG, HMODULE); static NTSTATUS (WINAPI *pLdrLockLoaderLock)(ULONG, ULONG*, ULONG_PTR*); static NTSTATUS (WINAPI *pLdrUnlockLoaderLock)(ULONG, ULONG_PTR); @@ -157,6 +159,8 @@ static void InitFunctionPtrs(void) pRtlIpv4StringToAddressA = (void *)GetProcAddress(hntdll, "RtlIpv4StringToAddressA"); pRtlIpv6StringToAddressA = (void *)GetProcAddress(hntdll, "RtlIpv6StringToAddressA"); pRtlIpv6StringToAddressW = (void *)GetProcAddress(hntdll, "RtlIpv6StringToAddressW"); + pRtlIpv6StringToAddressExA = (void *)GetProcAddress(hntdll, "RtlIpv6StringToAddressExA"); + pRtlIpv6StringToAddressExW = (void *)GetProcAddress(hntdll, "RtlIpv6StringToAddressExW"); pLdrAddRefDll = (void *)GetProcAddress(hntdll, "LdrAddRefDll"); pLdrLockLoaderLock = (void *)GetProcAddress(hntdll, "LdrLockLoaderLock"); pLdrUnlockLoaderLock = (void *)GetProcAddress(hntdll, "LdrUnlockLoaderLock"); @@ -1598,7 +1602,6 @@ static const struct }; const unsigned int ipv6_testcount = sizeof(ipv6_tests) / sizeof(ipv6_tests[0]); - static void init_ip6(IN6_ADDR* addr, const int src[8]) { unsigned int j; @@ -1744,6 +1747,269 @@ static void test_RtlIpv6StringToAddress(void) } } +static void compare_RtlIpv6StringToAddressExW(PCSTR name_a, const struct in6_addr *addr_a, HRESULT res_a, ULONG scope_a, USHORT port_a) +{ + WCHAR name[512]; + NTSTATUS res; + IN6_ADDR ip; + ULONG scope = 0xbadf00d; + USHORT port = 0xbeef; + + if (!pRtlIpv6StringToAddressExW) + return; + + pRtlMultiByteToUnicodeN(name, sizeof(name), NULL, name_a, strlen(name_a) + 1); + + init_ip6(&ip, NULL); + res = pRtlIpv6StringToAddressExW(name, &ip, &scope, &port); + + ok(res == res_a, "[W:%s] res = 0x%08x, expected 0x%08x\n", name_a, res, res_a); + ok(scope == scope_a, "[W:%s] scope = 0x%08x, expected 0x%08x\n", name_a, scope, scope_a); + ok(port == port_a, "[W:%s] port = 0x%08x, expected 0x%08x\n", name_a, port, port_a); + + ok(!memcmp(&ip, addr_a, sizeof(ip)), + "[W:%s] ip = %x:%x:%x:%x:%x:%x:%x:%x, expected %x:%x:%x:%x:%x:%x:%x:%x\n", + name_a, + ip.s6_words[0], ip.s6_words[1], ip.s6_words[2], ip.s6_words[3], + ip.s6_words[4], ip.s6_words[5], ip.s6_words[6], ip.s6_words[7], + addr_a->s6_words[0], addr_a->s6_words[1], addr_a->s6_words[2], addr_a->s6_words[3], + addr_a->s6_words[4], addr_a->s6_words[5], addr_a->s6_words[6], addr_a->s6_words[7]); +} + +static void test_RtlIpv6StringToAddressEx(void) +{ + NTSTATUS res; + IN6_ADDR ip, expected_ip; + ULONG scope; + USHORT port; + static const struct + { + PCSTR address; + NTSTATUS res; + ULONG scope; + USHORT port; + int ip[8]; + } ipv6_ex_tests[] = + { + { "[::]", STATUS_SUCCESS, 0, 0, + { 0, 0, 0, 0, 0, 0, 0, 0 } }, + { "[::1]:8080", STATUS_SUCCESS, 0, 0x901f, + { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, + { "[::1]:0x80", STATUS_SUCCESS, 0, 0x8000, + { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, + { "[::1]:0X80", STATUS_SUCCESS, 0, 0x8000, + { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, + { "[::1]:080", STATUS_INVALID_PARAMETER, 0xbadf00d, 0xbeef, + { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, + { "[::1]:800000000080", STATUS_INVALID_PARAMETER, 0xbadf00d, 0xbeef, + { 0, 0, 0, 0, 0, 0, 0, 0x100 } }, + { "[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80", STATUS_SUCCESS, 0, 0x5000, + { 0xdcfe, 0x98ba, 0x5476, 0x1032, 0xdcfe, 0x98ba, 0x5476, 0x1032 } }, + { "[1080:0:0:0:8:800:200C:417A]:1234", STATUS_SUCCESS, 0, 0xd204, + { 0x8010, 0, 0, 0, 0x800, 8, 0xc20, 0x7a41 } }, + { "[3ffe:2a00:100:7031::1]:8080", STATUS_SUCCESS, 0, 0x901f, + { 0xfe3f, 0x2a, 1, 0x3170, 0, 0, 0, 0x100 } }, + { "[ 3ffe:2a00:100:7031::1]:8080", STATUS_INVALID_PARAMETER, 0xbadf00d, 0xbeef, + { -1 } }, + { "[3ffe:2a00:100:7031::1 ]:8080", STATUS_INVALID_PARAMETER, 0xbadf00d, 0xbeef, + { 0xfe3f, 0x2a, 1, 0x3170, 0, 0, 0, 0x100 } }, + { "[3ffe:2a00:100:7031::1].8080", STATUS_INVALID_PARAMETER, 0xbadf00d, 0xbeef, + { 0xfe3f, 0x2a, 1, 0x3170, 0, 0, 0, 0x100 } }, + { "[1080::8:800:200C:417A]:8080", STATUS_SUCCESS, 0, 0x901f, + { 0x8010, 0, 0, 0, 0x800, 8, 0xc20, 0x7a41 } }, + { "[1080::8:800:200C:417A]!8080", STATUS_INVALID_PARAMETER, 0xbadf00d, 0xbeef, + { 0x8010, 0, 0, 0, 0x800, 8, 0xc20, 0x7a41 } }, + { "[::FFFF:129.144.52.38]:80", STATUS_SUCCESS, 0, 0x5000, + { 0, 0, 0, 0, 0, 0xffff, 0x9081, 0x2634 } }, + { "[::FFFF:129.144.52.38]:-80", STATUS_INVALID_PARAMETER, 0xbadf00d, 0xbeef, + { 0, 0, 0, 0, 0, 0xffff, 0x9081, 0x2634 } }, + { "[::FFFF:129.144.52.38]:999999999999", STATUS_INVALID_PARAMETER, 0xbadf00d, 0xbeef, + { 0, 0, 0, 0, 0, 0xffff, 0x9081, 0x2634 } }, + { "[::FFFF:129.144.52.38%-8]:80", STATUS_INVALID_PARAMETER, 0xbadf00d, 0xbeef, + { 0, 0, 0, 0, 0, 0xffff, 0x9081, 0x2634 } }, + { "[::FFFF:129.144.52.38]:80", STATUS_SUCCESS, 0, 0x5000, + { 0, 0, 0, 0, 0, 0xffff, 0x9081, 0x2634 } }, + { "[12345::6:7:8]:80", STATUS_INVALID_PARAMETER, 0xbadf00d, 0xbeef, + { -1 } }, + { "[ff01::8:800:200C:417A%16]:8080", STATUS_SUCCESS, 16, 0x901f, + { 0x1ff, 0, 0, 0, 0x800, 8, 0xc20, 0x7a41 } }, + { "[ff01::8:800:200C:417A%100]:8080", STATUS_SUCCESS, 100, 0x901f, + { 0x1ff, 0, 0, 0, 0x800, 8, 0xc20, 0x7a41 } }, + { "[ff01::8:800:200C:417A%1000]:8080", STATUS_SUCCESS, 1000, 0x901f, + { 0x1ff, 0, 0, 0, 0x800, 8, 0xc20, 0x7a41 } }, + { "[ff01::8:800:200C:417A%10000]:8080", STATUS_SUCCESS, 10000, 0x901f, + { 0x1ff, 0, 0, 0, 0x800, 8, 0xc20, 0x7a41 } }, + { "[ff01::8:800:200C:417A%1000000]:8080", STATUS_SUCCESS, 1000000, 0x901f, + { 0x1ff, 0, 0, 0, 0x800, 8, 0xc20, 0x7a41 } }, + { "[ff01::8:800:200C:417A%4294967295]:8080", STATUS_SUCCESS, 0xffffffff, 0x901f, + { 0x1ff, 0, 0, 0, 0x800, 8, 0xc20, 0x7a41 } }, + { "[ff01::8:800:200C:417A%4294967296]:8080", STATUS_INVALID_PARAMETER, 0xbadf00d, 0xbeef, + { 0x1ff, 0, 0, 0, 0x800, 8, 0xc20, 0x7a41 } }, + { "[ff01::8:800:200C:417A%-1]:8080", STATUS_INVALID_PARAMETER, 0xbadf00d, 0xbeef, + { 0x1ff, 0, 0, 0, 0x800, 8, 0xc20, 0x7a41 } }, + { "[ff01::8:800:200C:417A%0]:8080", STATUS_SUCCESS, 0, 0x901f, + { 0x1ff, 0, 0, 0, 0x800, 8, 0xc20, 0x7a41 } }, + { "[ff01::8:800:200C:417A%1", STATUS_INVALID_PARAMETER, 0xbadf00d, 0xbeef, + { 0x1ff, 0, 0, 0, 0x800, 8, 0xc20, 0x7a41 } }, + { "[ff01::8:800:200C:417A%0x1000]:8080", STATUS_INVALID_PARAMETER, 0xbadf00d, 0xbeef, + { 0x1ff, 0, 0, 0, 0x800, 8, 0xc20, 0x7a41 } }, + { "[ff01::8:800:200C:417A/16]:8080", STATUS_INVALID_PARAMETER, 0xbadf00d, 0xbeef, + { 0x1ff, 0, 0, 0, 0x800, 8, 0xc20, 0x7a41 } }, + }; + const unsigned int ipv6_ex_testcount = sizeof(ipv6_ex_tests) / sizeof(ipv6_ex_tests[0]); + const char *simple_ip = "::"; + unsigned int i; + + if (!pRtlIpv6StringToAddressExW) + { + skip("RtlIpv6StringToAddressExW not available\n"); + /* we can continue, just not test W */ + } + + if (!pRtlIpv6StringToAddressExA) + { + skip("RtlIpv6StringToAddressExA not available\n"); + return; + } + + res = pRtlIpv6StringToAddressExA(simple_ip, &ip, &scope, &port); + ok(res == STATUS_SUCCESS, "[validate] res = 0x%08x, expected STATUS_SUCCESS\n", res); + + init_ip6(&ip, NULL); + init_ip6(&expected_ip, NULL); + scope = 0xbadf00d; + port = 0xbeef; + res = pRtlIpv6StringToAddressExA(NULL, &ip, &scope, &port); + ok(res == STATUS_INVALID_PARAMETER, + "[null string] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); + ok(scope == 0xbadf00d, "[null string] scope = 0x%08x, expected 0xbadf00d\n", scope); + ok(port == 0xbeef, "[null string] port = 0x%08x, expected 0xbeef\n", port); + ok(!memcmp(&ip, &expected_ip, sizeof(ip)), + "[null string] ip is changed, expected it not to change\n"); + + + init_ip6(&ip, NULL); + scope = 0xbadf00d; + port = 0xbeef; + res = pRtlIpv6StringToAddressExA(simple_ip, NULL, &scope, &port); + ok(res == STATUS_INVALID_PARAMETER, + "[null result] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); + ok(scope == 0xbadf00d, "[null result] scope = 0x%08x, expected 0xbadf00d\n", scope); + ok(port == 0xbeef, "[null result] port = 0x%08x, expected 0xbeef\n", port); + ok(!memcmp(&ip, &expected_ip, sizeof(ip)), + "[null result] ip is changed, expected it not to change\n"); + + init_ip6(&ip, NULL); + scope = 0xbadf00d; + port = 0xbeef; + res = pRtlIpv6StringToAddressExA(simple_ip, &ip, NULL, &port); + ok(res == STATUS_INVALID_PARAMETER, + "[null scope] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); + ok(scope == 0xbadf00d, "[null scope] scope = 0x%08x, expected 0xbadf00d\n", scope); + ok(port == 0xbeef, "[null scope] port = 0x%08x, expected 0xbeef\n", port); + ok(!memcmp(&ip, &expected_ip, sizeof(ip)), + "[null scope] ip is changed, expected it not to change\n"); + + init_ip6(&ip, NULL); + scope = 0xbadf00d; + port = 0xbeef; + res = pRtlIpv6StringToAddressExA(simple_ip, &ip, &scope, NULL); + ok(res == STATUS_INVALID_PARAMETER, + "[null port] res = 0x%08x, expected STATUS_INVALID_PARAMETER\n", res); + ok(scope == 0xbadf00d, "[null port] scope = 0x%08x, expected 0xbadf00d\n", scope); + ok(port == 0xbeef, "[null port] port = 0x%08x, expected 0xbeef\n", port); + ok(!memcmp(&ip, &expected_ip, sizeof(ip)), + "[null port] ip is changed, expected it not to change\n"); + + /* sanity check */ + ok(sizeof(ip) == sizeof(USHORT)* 8, "sizeof(ip)\n"); + + /* first we run all ip related tests, to make sure someone didnt accidentally reimplement instead of re-use. */ + for (i = 0; i < ipv6_testcount; i++) + { + ULONG scope = 0xbadf00d; + USHORT port = 0xbeef; + NTSTATUS expect_ret = (ipv6_tests[i].flags & ex_fail_6) ? STATUS_INVALID_PARAMETER : ipv6_tests[i].res; + + if (ipv6_tests[i].flags & ex_skip_6) + continue; + + init_ip6(&ip, NULL); + res = pRtlIpv6StringToAddressExA(ipv6_tests[i].address, &ip, &scope, &port); + compare_RtlIpv6StringToAddressExW(ipv6_tests[i].address, &ip, res, scope, port); + + /* make sure nothing was changed if this function fails. */ + if (res == STATUS_INVALID_PARAMETER) + { + ok(scope == 0xbadf00d, "[%s] scope = 0x%08x, expected 0xbadf00d\n", + ipv6_tests[i].address, scope); + ok(port == 0xbeef, "[%s] port = 0x%08x, expected 0xbeef\n", + ipv6_tests[i].address, port); + } + else + { + ok(scope != 0xbadf00d, "[%s] scope = 0x%08x, not expected 0xbadf00d\n", + ipv6_tests[i].address, scope); + ok(port != 0xbeef, "[%s] port = 0x%08x, not expected 0xbeef\n", + ipv6_tests[i].address, port); + } + + if (ipv6_tests[i].flags & win_broken_6) + { + ok(res == expect_ret || broken(res == STATUS_INVALID_PARAMETER), + "[%s] res = 0x%08x, expected 0x%08x\n", ipv6_tests[i].address, res, expect_ret); + + if (res == STATUS_INVALID_PARAMETER) + continue; + } + else + { + ok(res == expect_ret, "[%s] res = 0x%08x, expected 0x%08x\n", + ipv6_tests[i].address, res, expect_ret); + } + + /* If ex fails but non-ex does not we cannot check if the part that is converted + before it failed was correct, since there is no data for it in the table. */ + if (res == expect_ret) + { + init_ip6(&expected_ip, ipv6_tests[i].ip); + ok(!memcmp(&ip, &expected_ip, sizeof(ip)), + "[%s] ip = %x:%x:%x:%x:%x:%x:%x:%x, expected %x:%x:%x:%x:%x:%x:%x:%x\n", + ipv6_tests[i].address, + ip.s6_words[0], ip.s6_words[1], ip.s6_words[2], ip.s6_words[3], + ip.s6_words[4], ip.s6_words[5], ip.s6_words[6], ip.s6_words[7], + expected_ip.s6_words[0], expected_ip.s6_words[1], expected_ip.s6_words[2], expected_ip.s6_words[3], + expected_ip.s6_words[4], expected_ip.s6_words[5], expected_ip.s6_words[6], expected_ip.s6_words[7]); + } + } + + /* now we run scope / port related tests */ + for (i = 0; i < ipv6_ex_testcount; i++) + { + scope = 0xbadf00d; + port = 0xbeef; + init_ip6(&ip, NULL); + res = pRtlIpv6StringToAddressExA(ipv6_ex_tests[i].address, &ip, &scope, &port); + compare_RtlIpv6StringToAddressExW(ipv6_ex_tests[i].address, &ip, res, scope, port); + + ok(res == ipv6_ex_tests[i].res, "[%s] res = 0x%08x, expected 0x%08x\n", + ipv6_ex_tests[i].address, res, ipv6_ex_tests[i].res); + ok(scope == ipv6_ex_tests[i].scope, "[%s] scope = 0x%08x, expected 0x%08x\n", + ipv6_ex_tests[i].address, scope, ipv6_ex_tests[i].scope); + ok(port == ipv6_ex_tests[i].port, "[%s] port = 0x%08x, expected 0x%08x\n", + ipv6_ex_tests[i].address, port, ipv6_ex_tests[i].port); + + init_ip6(&expected_ip, ipv6_ex_tests[i].ip); + ok(!memcmp(&ip, &expected_ip, sizeof(ip)), + "[%s] ip = %x:%x:%x:%x:%x:%x:%x:%x, expected %x:%x:%x:%x:%x:%x:%x:%x\n", + ipv6_ex_tests[i].address, + ip.s6_words[0], ip.s6_words[1], ip.s6_words[2], ip.s6_words[3], + ip.s6_words[4], ip.s6_words[5], ip.s6_words[6], ip.s6_words[7], + expected_ip.s6_words[0], expected_ip.s6_words[1], expected_ip.s6_words[2], expected_ip.s6_words[3], + expected_ip.s6_words[4], expected_ip.s6_words[5], expected_ip.s6_words[6], expected_ip.s6_words[7]); + } +} + static void test_LdrAddRefDll(void) { HMODULE mod, mod2; @@ -2971,6 +3237,7 @@ START_TEST(rtl) test_RtlIpv4AddressToStringEx(); test_RtlIpv4StringToAddress(); test_RtlIpv6StringToAddress(); + test_RtlIpv6StringToAddressEx(); test_LdrAddRefDll(); test_LdrLockLoaderLock(); test_RtlCompressBuffer(); -- 1.9.1

1 0

[PATCH 8/8] winedump: Add support for SLTG typelibs.
by Dmitry Timoshkov 10 Jul '18

10 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- tools/winedump/dump.c | 2 +- tools/winedump/tlb.c | 1145 ++++++++++++++++++++++++++++++++++++- tools/winedump/winedump.h | 6 +- 3 files changed, 1136 insertions(+), 17 deletions(-) diff --git a/tools/winedump/dump.c b/tools/winedump/dump.c index e84e473ea7..f608075d7b 100644 --- a/tools/winedump/dump.c +++ b/tools/winedump/dump.c @@ -241,7 +241,7 @@ dumpers[] = {SIG_LNK, get_kind_lnk, lnk_dump}, {SIG_EMF, get_kind_emf, emf_dump}, {SIG_FNT, get_kind_fnt, fnt_dump}, - {SIG_MSFT, get_kind_msft, msft_dump}, + {SIG_TLB, get_kind_tlb, tlb_dump}, {SIG_UNKNOWN, NULL, NULL} /* sentinel */ }; diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index 5d009fcedb..e7301688df 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -2,6 +2,7 @@ * Dump a typelib (tlb) file * * Copyright 2006 Jacek Caban + * Copyright 2015 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -30,6 +31,7 @@ #include "winedump.h" #define MSFT_MAGIC 0x5446534d +#define SLTG_MAGIC 0x47544c53 #define HELPDLLFLAG 0x0100 enum TYPEKIND { @@ -141,6 +143,12 @@ static int msft_typeinfo_impltypes[1000]; static int msft_typeinfo_elemcnt[1000]; static int msft_typeinfo_cnt = 0; +static const char * const tkind[TKIND_MAX] = { + "TKIND_ENUM", "TKIND_RECORD", "TKIND_MODULE", + "TKIND_INTERFACE", "TKIND_DISPATCH", "TKIND_COCLASS", + "TKIND_ALIAS", "TKIND_UNION" +}; + static const void *tlb_read(int size) { const void *ret = PRD(offset, size); @@ -196,8 +204,14 @@ static void print_end_block(void) indent--; print_offset(); printf("}\n"); +} + +static int print_byte(const char *name) +{ + unsigned char ret; print_offset(); - printf("\n"); + printf("%s = %02xh\n", name, ret=tlb_read_byte()); + return ret; } static int print_hex(const char *name) @@ -223,6 +237,14 @@ static int print_short_hex(const char *name) return ret; } +static int print_short_dec(const char *name) +{ + int ret; + print_offset(); + printf("%s = %d\n", name, ret=tlb_read_short()); + return ret; +} + static int print_dec(const char *name) { int ret; @@ -380,11 +402,6 @@ static void dump_msft_header(void) static int dump_msft_typekind(void) { - static const char *tkind[TKIND_MAX] = { - "TKIND_ENUM", "TKIND_RECORD", "TKIND_MODULE", - "TKIND_INTERFACE", "TKIND_DISPATCH", "TKIND_COCLASS", - "TKIND_ALIAS", "TKIND_UNION" - }; int ret, typekind; print_offset(); @@ -539,6 +556,25 @@ static BOOL dump_msft_namehashtab(seg_t *seg) return TRUE; } +static void print_string0(void) +{ + unsigned char c; + + printf("\""); + while ((c = tlb_read_byte()) != 0) + { + if (isprint(c)) + fwrite(&c, 1, 1, stdout); + else + { + char buf[16]; + sprintf(buf, "\\%u", c); + fwrite(buf, 1, strlen(buf), stdout); + } + } + printf("\""); +} + static void print_string(int len) { printf("\""); @@ -985,13 +1021,7 @@ static BOOL dump_offset(void) return FALSE; } -enum FileSig get_kind_msft(void) -{ - const DWORD *sig = PRD(0, sizeof(DWORD)); - return sig && *sig == MSFT_MAGIC ? SIG_MSFT : SIG_UNKNOWN; -} - -void msft_dump(void) +static void msft_dump(void) { int i; @@ -1012,3 +1042,1092 @@ void msft_dump(void) print_hex("unknown"); } } + +/****************************** SLTG Typelibs ******************************/ + +struct block_entry +{ + DWORD len; + WORD index_string; + WORD next; +}; + +struct bitstream +{ + const BYTE *buffer; + DWORD length; + WORD current; +}; + +#include "pshpack1.h" +struct sltg_typeinfo_header +{ + short magic; + int href_table; + int res06; + int elem_table; + int res0e; + int version; + int res16; + struct + { + unsigned unknown1 : 3; + unsigned flags : 16; + unsigned unknown2 : 5; + unsigned typekind : 8; + } misc; + int res1e; +}; + +struct sltg_member_header +{ + short res00; + short res02; + char res04; + int extra; +}; + +struct sltg_tail +{ + unsigned short cFuncs; + unsigned short cVars; + unsigned short cImplTypes; + unsigned short res06; /* always 0000 */ + unsigned short funcs_off; /* offset to functions (starting from the member header) */ + unsigned short vars_off; /* offset to vars (starting from the member header) */ + unsigned short impls_off; /* offset to implemented types (starting from the member header) */ + unsigned short funcs_bytes; /* bytes used by function data */ + unsigned short vars_bytes; /* bytes used by var data */ + unsigned short impls_bytes; /* bytes used by implemented type data */ + unsigned short tdescalias_vt; /* for TKIND_ALIAS */ + unsigned short res16; /* always ffff */ + unsigned short res18; /* always 0000 */ + unsigned short res1a; /* always 0000 */ + unsigned short simple_alias; /* tdescalias_vt is a vt rather than an offset? */ + unsigned short res1e; /* always 0000 */ + unsigned short cbSizeInstance; + unsigned short cbAlignment; + unsigned short res24; + unsigned short res26; + unsigned short cbSizeVft; + unsigned short res2a; /* always ffff */ + unsigned short res2c; /* always ffff */ + unsigned short res2e; /* always ffff */ + unsigned short res30; /* always ffff */ + unsigned short res32; + unsigned short res34; +}; + +struct sltg_variable +{ + char magic; /* 0x0a */ + char flags; + short next; + short name; + short byte_offs; /* pos in struct, or offset to const type or const data (if flags & 0x08) */ + short type; /* if flags & 0x02 this is the type, else offset to type */ + int memid; + short helpcontext; /* ?? */ + short helpstring; /* ?? */ +#if 0 + short varflags; /* only present if magic & 0x20 */ +#endif +}; +#include "poppack.h" + +static const char *lookup_code(const BYTE *table, DWORD table_size, struct bitstream *bits) +{ + const BYTE *p = table; + + while (p < table + table_size && *p == 0x80) + { + if (p + 2 >= table + table_size) return NULL; + + if (!(bits->current & 0xff)) + { + if (!bits->length) return NULL; + bits->current = (*bits->buffer << 8) | 1; + bits->buffer++; + bits->length--; + } + + if (bits->current & 0x8000) + { + p += 3; + } + else + { + p = table + (*(p + 2) | (*(p + 1) << 8)); + } + + bits->current <<= 1; + } + + if (p + 1 < table + table_size && *(p + 1)) + { + /* FIXME: Whats the meaning of *p? */ + const BYTE *q = p + 1; + while (q < table + table_size && *q) q++; + return (q < table + table_size) ? (const char *)(p + 1) : NULL; + } + + return NULL; +} + +static const char *decode_string(const BYTE *table, const char *stream, DWORD stream_length, DWORD *read_bytes) +{ + char *buf; + DWORD buf_size, table_size; + const char *p; + struct bitstream bits; + + bits.buffer = (const BYTE *)stream; + bits.length = stream_length; + bits.current = 0; + + buf_size = *(const WORD *)table; + table += sizeof(WORD); + table_size = *(const DWORD *)table; + table += sizeof(DWORD); + + buf = malloc(buf_size); + buf[0] = 0; + + while ((p = lookup_code(table, table_size, &bits))) + { + if (buf[0]) strcat(buf, " "); + assert(strlen(buf) + strlen(p) + 1 <= buf_size); + strcat(buf, p); + } + + if (read_bytes) *read_bytes = stream_length - bits.length; + + return buf; +} + +static void print_sltg_name(const char *name) +{ + unsigned short len = tlb_read_short(); + print_offset(); + printf("%s = %#x (", name, len); + if (len != 0xffff) print_string(len); + printf(")\n"); +} + +static int dump_sltg_header(int *sltg_first_blk, int *size_of_index) +{ + int n_file_blocks; + + print_begin_block("Header"); + + print_hex("magic"); + n_file_blocks = print_short_dec("# file blocks"); + print_short_hex("res06"); + *size_of_index = print_short_hex("size of index"); + *sltg_first_blk = print_short_dec("first block"); + print_guid("guid"); + print_hex("res1c"); + print_hex("res20"); + + print_end_block(); + + return n_file_blocks; +} + +static void dump_sltg_index(int count) +{ + int i; + + printf("index:\n"); + + print_string0(); + printf("\n"); + print_string0(); + printf("\n"); + + for (i = 0; i < count - 2; i++) + { + print_string0(); + printf("\n"); + } + + printf("\n"); +} + +static void dump_sltg_pad9(void) +{ + printf("pad9:\n"); + dump_binary(9); + printf("\n"); +} + +static void dump_sltg_block_entry(int idx, const char *index) +{ + char name[32]; + short index_offset; + + sprintf(name, "Block entry %d", idx); + print_begin_block(name); + + print_hex("len"); + index_offset = tlb_read_short(); + print_offset(); + printf("index string = %xh \"%s\"\n", index_offset, index + index_offset); + print_short_hex("next"); + + print_end_block(); +} + +static void dump_sltg_library_block(void) +{ + print_begin_block("Library block entry"); + + print_short_hex("magic"); + print_short_hex("res02"); + print_sltg_name("name"); + print_short_hex("res06"); + print_sltg_name("helpstring"); + print_sltg_name("helpfile"); + print_hex("helpcontext"); + print_short_hex("syskind"); + print_short_hex("lcid"); + print_hex("res12"); + print_short_hex("libflags"); + dump_msft_version(); + print_guid("uuid"); + + print_end_block(); +} + +static void skip_sltg_library_block(void) +{ + unsigned short skip; + + tlb_read_short(); + tlb_read_short(); + skip = tlb_read_short(); + if (skip != 0xffff) tlb_read(skip); + tlb_read_short(); + skip = tlb_read_short(); + if (skip != 0xffff) tlb_read(skip); + skip = tlb_read_short(); + if (skip != 0xffff) tlb_read(skip); + tlb_read_int(); + tlb_read_short(); + tlb_read_short(); + tlb_read_int(); + tlb_read_short(); + tlb_read_int(); + tlb_read(sizeof(GUID)); +} + +static void dump_sltg_other_typeinfo(int idx, const char *hlp_strings) +{ + int hlpstr_len, saved_offset; + char name[32]; + + sprintf(name, "Other typeinfo %d", idx); + print_begin_block(name); + + print_sltg_name("index name"); + print_sltg_name("other name"); + print_short_hex("res1a"); + print_short_hex("name offset"); + + print_offset(); + hlpstr_len = tlb_read_short(); + if (hlpstr_len) + { + const char *str; + + saved_offset = offset; + str = tlb_read(hlpstr_len); + str = decode_string((const BYTE *)hlp_strings, str, hlpstr_len, NULL); + printf("helpstring: \"%s\"\n", str); + + offset = saved_offset; + print_offset(); + printf("helpstring encoded bits: %d bytes\n", hlpstr_len); + dump_binary(hlpstr_len); + } + else + printf("helpstring: \"\"\n"); + + print_short_hex("res20"); + print_hex("helpcontext"); + print_short_hex("res26"); + print_guid("uuid"); + print_short_dec("typekind"); + + print_end_block(); +} + +static void skip_sltg_other_typeinfo(void) +{ + unsigned short skip; + + skip = tlb_read_short(); + if (skip != 0xffff) tlb_read(skip); + skip = tlb_read_short(); + if (skip != 0xffff) tlb_read(skip); + tlb_read_short(); + tlb_read_short(); + skip = tlb_read_short(); + if (skip) tlb_read(skip); + tlb_read_short(); + tlb_read_int(); + tlb_read_short(); + tlb_read(sizeof(GUID)); + tlb_read_short(); +} + +static void sltg_print_simple_type(short type) +{ + print_offset(); + if ((type & 0x0f00) == 0x0e00) + printf("*"); + printf("%04x | (%d)\n", type & 0xff80, type & 0x7f); +} + +static void dump_safe_array(int array_offset) +{ + int i, cDims, saved_offset = offset; + + offset = array_offset; + + print_offset(); + printf("safe array starts at %#x\n", offset); + + cDims = print_short_dec("cDims"); + print_short_hex("fFeatures"); + print_dec("cbElements"); + print_dec("cLocks"); + print_hex("pvData"); + + for (i = 0; i < cDims; i++) + dump_binary(8); /* sizeof(SAFEARRAYBOUND) */ + + print_offset(); + printf("safe array ends at %#x\n", offset); + offset = saved_offset; +} + +static int sltg_print_compound_type(int vars_start_offset, int type_offset) +{ + short type, vt; + int type_bytes, saved_offset = offset; + + offset = vars_start_offset + type_offset; + print_offset(); + printf("type description starts at %#x\n", offset); + + for (;;) + { + do + { + type = tlb_read_short(); + vt = type & 0x7f; + + if (vt == VT_PTR) + { + print_offset(); + printf("%04x | VT_PTR\n", type & 0xff80); + } + } while (vt == VT_PTR); + + if (vt == VT_USERDEFINED) + { + short href = tlb_read_short(); + print_offset(); + if ((type & 0x0f00) == 0x0e00) + printf("*"); + printf("%04x | VT_USERDEFINED (href %d)\n", type & 0xff80, href); + break; + } + else if (vt == VT_CARRAY) + { + short off; + + off = tlb_read_short(); + print_offset(); + printf("VT_CARRAY: offset %#x (+%#x=%#x)\n", + off, vars_start_offset, off + vars_start_offset); + dump_safe_array(vars_start_offset + off); + + /* type description follows */ + print_offset(); + printf("array element type:\n"); + continue; + } + else if (vt == VT_SAFEARRAY) + { + short off; + + off = tlb_read_short(); + print_offset(); + printf("VT_SAFEARRAY: offset %#x (+%#x=%#x)\n", + off, vars_start_offset, off + vars_start_offset); + dump_safe_array(vars_start_offset + off); + break; + } + else + { + sltg_print_simple_type(type); + break; + } + } + + print_offset(); + printf("type description ends at %#x\n", offset); + type_bytes = offset - saved_offset; + offset = saved_offset; + + return type_bytes; +} + +static void dump_type(int len, const char *hlp_strings) +{ + union + { + struct + { + unsigned unknown1 : 3; + unsigned flags : 13; + unsigned unknown2 : 8; + unsigned typekind : 8; + } s; + unsigned flags; + } misc; + int typeinfo_start_offset, extra, member_offset, href_offset, i; + int vars_header_bytes = 0, vars_bytes = 0, saved_offset; + const void *block; + const struct sltg_typeinfo_header *ti; + const struct sltg_member_header *mem; + const struct sltg_tail *tail; + + typeinfo_start_offset = offset; + block = tlb_read(len); + offset = typeinfo_start_offset; + + ti = block; + mem = (const struct sltg_member_header *)((char *)block + ti->elem_table); + tail = (const struct sltg_tail *)((char *)(mem + 1) + mem->extra); + + typeinfo_start_offset = offset; + + print_short_hex("magic"); + href_offset = tlb_read_int(); + print_offset(); + if (href_offset != -1) + printf("href offset = %#x (+%#x=%#x)\n", + href_offset, typeinfo_start_offset, href_offset + typeinfo_start_offset); + else + printf("href offset = ffffffffh\n"); + print_hex("res06"); + member_offset = tlb_read_int(); + print_offset(); + printf("member offset = %#x (+%#x=%#x)\n", + member_offset, typeinfo_start_offset, member_offset + typeinfo_start_offset); + print_hex("res0e"); + print_hex("version"); + print_hex("res16"); + misc.flags = print_hex("misc"); + print_offset(); + printf("misc: unknown1 %02x, flags %04x, unknown2 %02x, typekind %u (%s)\n", + misc.s.unknown1, misc.s.flags, misc.s.unknown2, misc.s.typekind, + misc.s.typekind < TKIND_MAX ? tkind[misc.s.typekind] : "unknown"); + print_hex("res1e"); + + if (href_offset != -1) + { + int i, number; + + print_begin_block("href_table"); + + print_short_hex("magic"); + print_hex("res02"); + print_hex("res06"); + print_hex("res0a"); + print_hex("res0e"); + print_hex("res12"); + print_hex("res16"); + print_hex("res1a"); + print_hex("res1e"); + print_hex("res22"); + print_hex("res26"); + print_hex("res2a"); + print_hex("res2e"); + print_hex("res32"); + print_hex("res36"); + print_hex("res3a"); + print_hex("res3e"); + print_short_hex("res42"); + number = print_hex("number"); + + for (i = 0; i < number; i += 8) + dump_binary(8); + + print_short_hex("res50"); + print_byte("res52"); + print_hex("res53"); + + for (i = 0; i < number/8; i++) + print_sltg_name("name"); + + print_byte("resxx"); + + print_end_block(); + } + + print_offset(); + printf("member_header starts at %#x, current offset = %#x\n", typeinfo_start_offset + member_offset, offset); + member_offset = offset; + print_short_hex("res00"); + print_short_hex("res02"); + print_byte("res04"); + extra = print_hex("extra"); + + if (misc.s.typekind == TKIND_RECORD || misc.s.typekind == TKIND_ENUM) + { + int vars_start_offset = offset; + + for (i = 0; i < tail->cVars; i++) + { + char name[32]; + int saved_off; + char magic, flags; + short next, value; + + sprintf(name, "variable %d", i); + print_begin_block(name); + + saved_off = offset; + dump_binary(sizeof(struct sltg_variable)); + offset = saved_off; + + magic = print_byte("magic"); + flags = print_byte("flags"); + next = tlb_read_short(); + print_offset(); + if (next != -1) + printf("next offset = %#x (+%#x=%#x)\n", + next, vars_start_offset, next + vars_start_offset); + else + printf("next offset = ffffh\n"); + print_short_hex("name"); + + if (flags & 0x40) + print_short_hex("dispatch"); + else if (flags & 0x10) + { + if (flags & 0x08) + print_short_hex("const value"); + else + { + value = tlb_read_short(); + print_offset(); + printf("byte offset = %#x (+%#x=%#x)\n", + value, vars_start_offset, value + vars_start_offset); + } + } + else + print_short_hex("oInst"); + + value = tlb_read_short(); + if (!(flags & 0x02)) + { + print_offset(); + printf("type offset = %#x (+%#x=%#x)\n", + value, vars_start_offset, value + vars_start_offset); + print_offset(); + printf("type:\n"); + vars_bytes += sltg_print_compound_type(vars_start_offset, value); + } + else + { + print_offset(); + printf("type:\n"); + sltg_print_simple_type(value); + } + + print_hex("memid"); + print_short_hex("helpcontext"); + + value = tlb_read_short(); + print_offset(); + if (value != -1) + { + const char *str; + DWORD hlpstr_maxlen; + + printf("helpstring offset = %#x (+%#x=%#x)\n", + value, vars_start_offset, value + vars_start_offset); + + saved_offset = offset; + + offset = value + vars_start_offset; + + hlpstr_maxlen = member_offset + sizeof(struct sltg_member_header) + mem->extra - offset; + + str = tlb_read(hlpstr_maxlen); + str = decode_string((const BYTE *)hlp_strings, str, hlpstr_maxlen, &hlpstr_maxlen); + print_offset(); + printf("helpstring: \"%s\"\n", str); + + offset = value + vars_start_offset; + print_offset(); + printf("helpstring encoded bits: %d bytes\n", hlpstr_maxlen); + dump_binary(hlpstr_maxlen); + + offset = saved_offset; + } + else + printf("helpstring offset = ffffh\n"); + + if (magic & 0x20) + { + print_short_hex("varflags"); + vars_header_bytes += 2; + } + + vars_header_bytes += sizeof(struct sltg_variable); + + if (next != -1) + { + if (offset != vars_start_offset + next) + dump_binary(vars_start_offset + next - offset); + } + + print_end_block(); + } + } + else if (misc.s.typekind == TKIND_INTERFACE || misc.s.typekind == TKIND_COCLASS) + { + short next, i; + int funcs_start_offset = offset; + + for (i = 0; i < tail->cImplTypes; i++) + { + char name[32]; + + sprintf(name, "impl.type %d (current offset %#x)", i, offset); + print_begin_block(name); + + print_short_hex("res00"); + next = tlb_read_short(); + print_offset(); + if (next != -1) + printf("next offset = %#x (+%#x=%#x)\n", + next, funcs_start_offset, next + funcs_start_offset); + else + printf("next offset = ffffh\n"); + print_short_hex("res04"); + print_byte("impltypeflags"); + print_byte("res07"); + print_short_hex("res08"); + print_short_hex("ref"); + print_short_hex("res0c"); + print_short_hex("res0e"); + print_short_hex("res10"); + print_short_hex("res12"); + print_short_hex("pos in table"); + + print_end_block(); + } + + for (i = 0; i < tail->cFuncs; i++) + { + char name[32]; + BYTE magic, flags; + short args_off, value, n_params, j; + + sprintf(name, "function %d (current offset %#x)", i, offset); + print_begin_block(name); + + magic = print_byte("magic"); + flags = tlb_read_byte(); + print_offset(); + printf("invoke_kind = %u\n", flags >> 4); + next = tlb_read_short(); + print_offset(); + if (next != -1) + printf("next offset = %#x (+%#x=%#x)\n", + next, funcs_start_offset, next + funcs_start_offset); + else + printf("next offset = ffffh\n"); + print_short_hex("name"); + print_hex("dispid"); + print_short_hex("helpcontext"); + + value = tlb_read_short(); + print_offset(); + if (value != -1) + { + const char *str; + DWORD hlpstr_maxlen; + + printf("helpstring offset = %#x (+%#x=%#x)\n", + value, funcs_start_offset, value + funcs_start_offset); + + saved_offset = offset; + + offset = value + funcs_start_offset; + + hlpstr_maxlen = member_offset + sizeof(struct sltg_member_header) + mem->extra - offset; + + str = tlb_read(hlpstr_maxlen); + str = decode_string((const BYTE *)hlp_strings, str, hlpstr_maxlen, &hlpstr_maxlen); + print_offset(); + printf("helpstring: \"%s\"\n", str); + + offset = value + funcs_start_offset; + print_offset(); + printf("helpstring encoded bits: %d bytes\n", hlpstr_maxlen); + dump_binary(hlpstr_maxlen); + + offset = saved_offset; + } + else + printf("helpstring offset = ffffh\n"); + + args_off = tlb_read_short(); + print_offset(); + if (args_off != -1) + printf("args off = %#x (+%#x=%#x)\n", + args_off, funcs_start_offset, args_off + funcs_start_offset); + else + printf("args off = ffffh\n"); + flags = tlb_read_byte(); + n_params = flags >> 3; + print_offset(); + printf("callconv %u, cParams %u\n", flags & 0x7, n_params); + + flags = tlb_read_byte(); + print_offset(); + printf("retnextop %02x, cParamsOpt %u\n", flags, (flags & 0x7e) >> 1); + + value = print_short_hex("rettype"); + if (!(flags & 0x80)) + { + print_offset(); + printf("rettype offset = %#x (+%#x=%#x)\n", + value, funcs_start_offset, value + funcs_start_offset); + print_offset(); + printf("rettype:\n"); + sltg_print_compound_type(funcs_start_offset, value); + } + else + { + print_offset(); + printf("rettype:\n"); + sltg_print_simple_type(value); + } + + print_short_hex("vtblpos"); + if (magic & 0x20) + print_short_hex("funcflags"); + + if (n_params) + { + offset = args_off + funcs_start_offset; + print_offset(); + printf("arguments start at %#x\n", offset); + } + + for (j = 0; j < n_params; j++) + { + char name[32]; + unsigned short name_offset; + + sprintf(name, "arg %d", j); + print_begin_block(name); + + name_offset = tlb_read_short(); + print_offset(); + printf("name: %04xh\n", name_offset); + + value = tlb_read_short(); + print_offset(); + printf("type/offset %04xh\n", value); + if (name_offset & 1) /* type follows */ + { + print_offset(); + printf("type follows, using current offset for type\n"); + offset -= 2; + value = offset - funcs_start_offset; + } + + print_offset(); + printf("arg[%d] off = %#x (+%#x=%#x)\n", + j, value, funcs_start_offset, value + funcs_start_offset); + print_offset(); + printf("type:\n"); + value = sltg_print_compound_type(funcs_start_offset, value); + if (name_offset & 1) + offset += value; + + print_end_block(); + } + + if (n_params) + { + print_offset(); + printf("arguments end at %#x\n", offset); + } + + if (next != -1) + { + if (offset != funcs_start_offset + next) + dump_binary(funcs_start_offset + next - offset); + } + + print_end_block(); + } + } + else + { + printf("skipping %#x bytes\n", extra); + dump_binary(extra); + } + + if (offset < member_offset + sizeof(struct sltg_member_header) + mem->extra) + { + print_offset(); + printf("skipping %d bytes\n", member_offset + (int)sizeof(struct sltg_member_header) + mem->extra - offset); + dump_binary(member_offset + sizeof(struct sltg_member_header) + mem->extra - offset); + } + + print_offset(); + printf("dumped %d (%#x) bytes\n", offset - typeinfo_start_offset, offset - typeinfo_start_offset); + len -= offset - typeinfo_start_offset; + print_offset(); + printf("sltg_tail %d (%#x) bytes:\n", len, len); + saved_offset = offset; + dump_binary(len); + offset = saved_offset; + print_short_hex("cFuncs"); + print_short_hex("cVars"); + print_short_hex("cImplTypes"); + print_short_hex("res06"); + print_short_hex("funcs_off"); + print_short_hex("vars_off"); + print_short_hex("impls_off"); + print_short_hex("funcs_bytes"); + print_short_hex("vars_bytes"); + print_short_hex("impls_bytes"); + print_short_hex("tdescalias_vt"); + print_short_hex("res16"); + print_short_hex("res18"); + print_short_hex("res1a"); + print_short_hex("simple_alias"); + print_short_hex("res1e"); + print_short_hex("cbSizeInstance"); + print_short_hex("cbAlignment"); + print_short_hex("res24"); + print_short_hex("res26"); + print_short_hex("cbSizeVft"); + print_short_hex("res2a"); + print_short_hex("res2c"); + print_short_hex("res2e"); + print_short_hex("res30"); + print_short_hex("res32"); + print_short_hex("res34"); + offset = saved_offset + len; +} + +static void sltg_dump(void) +{ + int i, n_file_blocks, n_first_blk, size_of_index; + int name_table_start, name_table_size, saved_offset; + int libblk_start, libblk_len, hlpstr_len, len; + const char *index, *hlp_strings; + const struct block_entry *entry; + + n_file_blocks = dump_sltg_header(&n_first_blk, &size_of_index); + + saved_offset = offset; + entry = tlb_read((n_file_blocks - 1) * sizeof(*entry)); + if (!entry) return; + index = tlb_read(size_of_index); + if (!index) return; + offset = saved_offset; + + for (i = 0; i < n_file_blocks - 1; i++) + dump_sltg_block_entry(i, index); + + saved_offset = offset; + dump_sltg_index(n_file_blocks); + assert(offset - saved_offset == size_of_index); + + dump_sltg_pad9(); + + /* read the helpstrings for later decoding */ + saved_offset = offset; + + for (i = n_first_blk - 1; entry[i].next != 0; i = entry[i].next - 1) + tlb_read(entry[i].len); + + libblk_start = offset; + skip_sltg_library_block(); + tlb_read(0x40); + typeinfo_cnt = tlb_read_short(); + + for (i = 0; i < typeinfo_cnt; i++) + skip_sltg_other_typeinfo(); + + len = tlb_read_int(); + hlpstr_len = (libblk_start + len) - offset; + hlp_strings = tlb_read(hlpstr_len); + assert(hlp_strings != NULL); + /* check the helpstrings header values */ + len = *(int *)(hlp_strings + 2); + assert(hlpstr_len == len + 6); + + offset = saved_offset; + + for (i = n_first_blk - 1; entry[i].next != 0; i = entry[i].next - 1) + { + short magic; + char name[32]; + + saved_offset = offset; + + sprintf(name, "Block %d", i); + print_begin_block(name); + magic = tlb_read_short(); + assert(magic == 0x0501); + offset -= 2; + dump_binary(entry[i].len); + print_end_block(); + + offset = saved_offset; + + print_begin_block(name); + dump_type(entry[i].len, hlp_strings); + print_end_block(); + + offset = saved_offset + entry[i].len; + } + + libblk_len = entry[i].len; + + libblk_start = offset; + dump_sltg_library_block(); + + printf("skipping 0x40 bytes\n"); + dump_binary(0x40); + printf("\n"); + typeinfo_cnt = print_short_dec("typeinfo count"); + printf("\n"); + + for (i = 0; i < typeinfo_cnt; i++) + dump_sltg_other_typeinfo(i, hlp_strings); + + len = print_hex("offset from start of library block to name table"); + printf("%#x + %#x = %#x\n", libblk_start, len, libblk_start + len); + len = (libblk_start + len) - offset; + printf("skipping %#x bytes (encoded/compressed helpstrings)\n", len); + printf("max string length: %#x, strings length %#x\n", *(short *)hlp_strings, *(int *)(hlp_strings + 2)); + dump_binary(len); + printf("\n"); + + len = print_short_hex("name table jump"); + if (len == 0xffff) + { + printf("skipping 0x000a bytes\n"); + dump_binary(0x000a); + printf("\n"); + } + else if (len == 0x0200) + { + printf("skipping 0x002a bytes\n"); + dump_binary(0x002a); + printf("\n"); + } + else + { + printf("FIXME: please report! (%#x)\n", len); + assert(0); + } + + printf("skipping 0x200 bytes\n"); + dump_binary(0x200); + printf("\n"); + + name_table_size = print_hex("name table size"); + + name_table_start = offset; + printf("name table offset = %#x\n\n", offset); + + while (offset < name_table_start + name_table_size) + { + int aligned_len; + + dump_binary(8); + print_string0(); + printf("\n"); + + len = offset - name_table_start; + aligned_len = (len + 0x1f) & ~0x1f; + if (aligned_len - len < 4) + dump_binary(aligned_len - len); + else + dump_binary(len & 1); + printf("\n"); + } + + print_hex("01ffff01"); + len = print_hex("length"); + printf("skipping %#x bytes\n", len); + dump_binary(len); + printf("\n"); + + len = (libblk_start + libblk_len) - offset; + printf("skipping libblk remainder %#x bytes\n", len); + dump_binary(len); + printf("\n"); + + /* FIXME: msodumper/olestream.py parses this block differently + print_short_hex("unknown"); + print_short_hex("byte order mark"); + i = tlb_read_short(); + printf("version = %u.%u\n", i & 0xff, i >> 8); + print_short_hex("system identifier"); + print_hex("unknown"); + printf("\n"); + */ + printf("skipping 12 bytes\n"); + dump_binary(12); + printf("\n"); + + print_guid("uuid"); + printf("\n"); + + /* 0x0008,"TYPELIB",0 */ + dump_binary(12); + printf("\n"); + + printf("skipping 12 bytes\n"); + dump_binary(12); + printf("\n"); + + printf("skipping remainder 0x10 bytes\n"); + dump_binary(0x10); + printf("\n"); +} + +void tlb_dump(void) +{ + const DWORD *sig = PRD(0, sizeof(DWORD)); + if (*sig == MSFT_MAGIC) + msft_dump(); + else + sltg_dump(); +} + +enum FileSig get_kind_tlb(void) +{ + const DWORD *sig = PRD(0, sizeof(DWORD)); + if (sig && (*sig == MSFT_MAGIC || *sig == SLTG_MAGIC)) return SIG_TLB; + return SIG_UNKNOWN; +} diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index 339cee32f0..ea95b27b09 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -214,7 +214,7 @@ const char *get_machine_str(int mach); /* file dumping functions */ enum FileSig {SIG_UNKNOWN, SIG_DOS, SIG_PE, SIG_DBG, SIG_PDB, SIG_NE, SIG_LE, SIG_MDMP, SIG_COFFLIB, SIG_LNK, - SIG_EMF, SIG_FNT, SIG_MSFT}; + SIG_EMF, SIG_FNT, SIG_TLB}; const void* PRD(unsigned long prd, unsigned long len); unsigned long Offset(const void* ptr); @@ -251,8 +251,8 @@ enum FileSig get_kind_pdb(void); void pdb_dump(void); enum FileSig get_kind_fnt(void); void fnt_dump( void ); -enum FileSig get_kind_msft(void); -void msft_dump(void); +enum FileSig get_kind_tlb(void); +void tlb_dump(void); BOOL codeview_dump_symbols(const void* root, unsigned long size); BOOL codeview_dump_types_from_offsets(const void* table, const DWORD* offsets, unsigned num_types); -- 2.17.1

1 0

[PATCH v3] browseui: Implement IProgressDialog::SetAnimation.
by Alistair Leslie-Hughes 10 Jul '18

10 Jul '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/browseui/browseui.rc | 2 +- dlls/browseui/progressdlg.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/browseui/browseui.rc b/dlls/browseui/browseui.rc index 833b139..4c612e9 100644 --- a/dlls/browseui/browseui.rc +++ b/dlls/browseui/browseui.rc @@ -32,7 +32,7 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CLIPCHILDREN | WS_C CAPTION "" FONT 8, "MS Shell Dlg" { - CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, 0, 12, 10, 236, 25 /* TODO: style */ + CONTROL "", IDC_ANIMATION, ANIMATE_CLASSA, ACS_TRANSPARENT | ACS_AUTOPLAY, 12, 10, 236, 25 LTEXT "", IDC_TEXT_LINE, 7, 45, 250, 10, SS_LEFT|SS_NOPREFIX LTEXT "", IDC_TEXT_LINE + 1, 7, 55, 250, 10, SS_LEFT|SS_NOPREFIX CONTROL "", IDC_PROGRESS_BAR, PROGRESS_CLASSA, WS_BORDER, 7, 65, 190, 8 diff --git a/dlls/browseui/progressdlg.c b/dlls/browseui/progressdlg.c index 09c1996..7cba7d6 100644 --- a/dlls/browseui/progressdlg.c +++ b/dlls/browseui/progressdlg.c @@ -403,7 +403,16 @@ static HRESULT WINAPI ProgressDialog_SetTitle(IProgressDialog *iface, LPCWSTR pw static HRESULT WINAPI ProgressDialog_SetAnimation(IProgressDialog *iface, HINSTANCE hInstance, UINT uiResourceId) { - FIXME("(%p, %p, %d) - stub\n", iface, hInstance, uiResourceId); + ProgressDialog *This = impl_from_IProgressDialog(iface); + + TRACE("(%p, %p, %u)\n", iface, hInstance, uiResourceId); + + if (IS_INTRESOURCE(uiResourceId)) + { + if (!SendDlgItemMessageW(This->hwnd, IDC_ANIMATION, ACM_OPENW, (WPARAM)hInstance, uiResourceId)) + WARN("Failed to load animation\n"); + } + return S_OK; } -- 1.9.1

1 0

[v4 0/2] DXTn 3D Texture support
by Connor McAdams 09 Jul '18

09 Jul '18

This patch series adds support for DXTn volume textures by using the CPU to decompress and convert them before upload. It also adds tests to make sure that the decompression functions are working properly. Connor McAdams (2): wined3d: convert 3D DXTn textures d3d9/tests: Add new test for DXTn volume textures. dlls/d3d9/tests/visual.c | 183 ++++++++++++++++++++++++------------ dlls/wined3d/texture.c | 41 ++++++++ dlls/wined3d/utils.c | 240 +++++++++++++++++++++++++++++++++++++++++------ 3 files changed, 373 insertions(+), 91 deletions(-) -- 2.7.4

2 3

[PATCH 1/2] mscoree: add stub for CorIsLatestSvc to hint user at broken .NET installation
by Louis Lenders 09 Jul '18

09 Jul '18

This function can be called in case of a broken .NET installation. See also https://bugs.winehq.org/show_bug.cgi?id=31688 Hopefully this stub will reduce amount of invalid bugreports in bugzilla about this issue Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/mscoree/mscoree.spec | 2 +- dlls/mscoree/mscoree_main.c | 6 ++++++ dlls/mscoree/tests/mscoree.c | 11 ++++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/mscoree.spec b/dlls/mscoree/mscoree.spec index 3715b7c79d..ec4668bc3c 100644 --- a/dlls/mscoree/mscoree.spec +++ b/dlls/mscoree/mscoree.spec @@ -25,7 +25,7 @@ @ stub CorDllMainWorker @ stdcall CorExitProcess(long) @ stub CorGetSvc -@ stub CorIsLatestSvc +@ stdcall CorIsLatestSvc(ptr ptr) @ stub CorMarkThreadInThreadPool @ stub CorTickleSvc @ stdcall CreateConfigStream(wstr ptr) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 9561405608..519f918223 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -309,6 +309,12 @@ HRESULT WINAPI GetCORVersion(LPWSTR pbuffer, DWORD cchBuffer, DWORD *dwLength) return ret; } +HRESULT WINAPI CorIsLatestSvc(int *unk1, int *unk2) +{ + FIXME("%p, %p stub: If this function is called, it is likely the result of a broken .NET installation!\n", unk1, unk2); + return S_OK; +} + HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWSTR pConfigurationFile, DWORD startupFlags, DWORD runtimeInfoFlags, LPWSTR pDirectory, DWORD dwDirectory, DWORD *dwDirectoryLength, LPWSTR pVersion, DWORD cchBuffer, DWORD *dwlength) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 63517dc79b..b45c814904 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -35,6 +35,7 @@ static const WCHAR v4_0[] = {'v','4','.','0','.','3','0','3','1','9',0}; static HMODULE hmscoree; static HRESULT (WINAPI *pGetCORVersion)(LPWSTR, DWORD, DWORD*); +static HRESULT (WINAPI *pCorIsLatestSvc)(INT*, INT*); static HRESULT (WINAPI *pGetCORSystemDirectory)(LPWSTR, DWORD, DWORD*); static HRESULT (WINAPI *pGetRequestedRuntimeInfo)(LPCWSTR, LPCWSTR, LPCWSTR, DWORD, DWORD, LPWSTR, DWORD, DWORD*, LPWSTR, DWORD, DWORD*); static HRESULT (WINAPI *pLoadLibraryShim)(LPCWSTR, LPCWSTR, LPVOID, HMODULE*); @@ -55,6 +56,7 @@ static BOOL init_functionpointers(void) } pGetCORVersion = (void *)GetProcAddress(hmscoree, "GetCORVersion"); + pCorIsLatestSvc = (void *)GetProcAddress(hmscoree, "CorIsLatestSvc"); pGetCORSystemDirectory = (void *)GetProcAddress(hmscoree, "GetCORSystemDirectory"); pGetRequestedRuntimeInfo = (void *)GetProcAddress(hmscoree, "GetRequestedRuntimeInfo"); pLoadLibraryShim = (void *)GetProcAddress(hmscoree, "LoadLibraryShim"); @@ -63,7 +65,7 @@ static BOOL init_functionpointers(void) pCLRCreateInstance = (void *)GetProcAddress(hmscoree, "CLRCreateInstance"); if (!pGetCORVersion || !pGetCORSystemDirectory || !pGetRequestedRuntimeInfo || !pLoadLibraryShim || - !pCreateInterface || !pCLRCreateInstance + !pCreateInterface || !pCLRCreateInstance || !pCorIsLatestSvc ) { win_skip("functions not available\n"); @@ -175,6 +177,7 @@ static void test_versioninfo(void) WCHAR path[MAX_PATH]; DWORD size, path_len; HRESULT hr; + int unk1,unk2; if (0) /* crashes on <= w2k3 */ { @@ -289,6 +292,12 @@ static void test_versioninfo(void) hr = pGetRequestedRuntimeInfo( NULL, v2_0_0, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + + hr = pCorIsLatestSvc(NULL, NULL); + ok(hr == E_POINTER, "CorIsLatestSvc returned %08x\n", hr); + + hr = pCorIsLatestSvc(&unk1, &unk2); + ok(hr == S_OK, "CorIsLatestSvc returned %08x\n", hr); } static void test_loadlibraryshim(void) -- 2.17.1

2 2

[PATCH 3/3] d3d11/tests: Add test for unorm/snorm immediate constants.
by Józef Kucia 09 Jul '18

09 Jul '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index ee8d465cb4e4..be7c90768c98 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -18542,10 +18542,13 @@ static void test_uav_store_immediate_constant(void) { D3D11_UNORDERED_ACCESS_VIEW_DESC uav_desc; struct d3d11_test_context test_context; + D3D11_TEXTURE2D_DESC texture_desc; ID3D11UnorderedAccessView *uav; ID3D11DeviceContext *context; struct resource_readback rb; + ID3D11Texture2D *texture; ID3D11ComputeShader *cs; + unsigned int uint_data; ID3D11Device *device; ID3D11Buffer *buffer; float float_data; @@ -18588,6 +18591,42 @@ static void test_uav_store_immediate_constant(void) 0x0d0000a4, 0x0011e0f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00004002, 0x3f800000, 0x3f800000, 0x3f800000, 0x3f800000, 0x0100003e, }; + static const DWORD cs_store_unorm_code[] = + { +#if 0 + RWTexture2D<unorm float> u; + + [numthreads(1, 1, 1)] + void main() + { + u[uint2(0, 0)] = 0.5f; + } +#endif + 0x43425844, 0x3623f1de, 0xe847109e, 0x8e3da13f, 0xb6787b06, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000064, 0x00050050, 0x00000019, 0x0100086a, + 0x0400189c, 0x0011e000, 0x00000000, 0x00001111, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, + 0x0d0000a4, 0x0011e0f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00004002, 0x3f000000, 0x3f000000, 0x3f000000, 0x3f000000, 0x0100003e, + }; + static const DWORD cs_store_snorm_code[] = + { +#if 0 + RWTexture2D<snorm float> u; + + [numthreads(1, 1, 1)] + void main() + { + u[uint2(0, 0)] = -0.5f; + } +#endif + 0x43425844, 0xce5397fc, 0x7464bc06, 0xc79aa56c, 0x881bd7ef, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000064, 0x00050050, 0x00000019, 0x0100086a, + 0x0400189c, 0x0011e000, 0x00000000, 0x00002222, 0x0400009b, 0x00000001, 0x00000001, 0x00000001, + 0x0d0000a4, 0x0011e0f2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00004002, 0xbf000000, 0xbf000000, 0xbf000000, 0xbf000000, 0x0100003e, + }; static const D3D_FEATURE_LEVEL feature_level = D3D_FEATURE_LEVEL_11_0; static const unsigned int zero[4] = {0}; @@ -18635,7 +18674,57 @@ static void test_uav_store_immediate_constant(void) ok(float_data == 1.0f, "Got unexpected value %.8e.\n", float_data); release_resource_readback(&rb); + texture_desc.Width = 64; + texture_desc.Height = 64; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D11_USAGE_DEFAULT; + texture_desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + ID3D11UnorderedAccessView_Release(uav); + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)texture, NULL, &uav); + ok(hr == S_OK, "Failed to create unordered access view, hr %#x.\n", hr); + + ID3D11ComputeShader_Release(cs); + hr = ID3D11Device_CreateComputeShader(device, cs_store_unorm_code, sizeof(cs_store_unorm_code), NULL, &cs); + ok(hr == S_OK, "Failed to create compute shader, hr %#x.\n", hr); + ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, zero); + ID3D11DeviceContext_CSSetShader(context, cs, NULL, 0); + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &uav, NULL); + ID3D11DeviceContext_Dispatch(context, 1, 1, 1); + get_texture_readback(texture, 0, &rb); + uint_data = get_readback_color(&rb, 0, 0, 0); + ok(compare_color(uint_data, 0x80808080, 1), "Got unexpected color 0x%08x.\n", uint_data); + release_resource_readback(&rb); + + ID3D11Texture2D_Release(texture); + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_SNORM; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(hr == S_OK, "Failed to create texture, hr %#x.\n", hr); + ID3D11UnorderedAccessView_Release(uav); + hr = ID3D11Device_CreateUnorderedAccessView(device, (ID3D11Resource *)texture, NULL, &uav); + ok(hr == S_OK, "Failed to create unordered access view, hr %#x.\n", hr); + + ID3D11ComputeShader_Release(cs); + hr = ID3D11Device_CreateComputeShader(device, cs_store_snorm_code, sizeof(cs_store_snorm_code), NULL, &cs); + ok(hr == S_OK, "Failed to create compute shader, hr %#x.\n", hr); + ID3D11DeviceContext_ClearUnorderedAccessViewUint(context, uav, zero); + ID3D11DeviceContext_CSSetShader(context, cs, NULL, 0); + ID3D11DeviceContext_CSSetUnorderedAccessViews(context, 0, 1, &uav, NULL); + ID3D11DeviceContext_Dispatch(context, 1, 1, 1); + get_texture_readback(texture, 0, &rb); + uint_data = get_readback_color(&rb, 0, 0, 0); + ok(compare_color(uint_data, 0xc0c0c0c0, 1), "Got unexpected color 0x%08x.\n", uint_data); + release_resource_readback(&rb); + ID3D11Buffer_Release(buffer); + ID3D11Texture2D_Release(texture); ID3D11ComputeShader_Release(cs); ID3D11UnorderedAccessView_Release(uav); release_test_context(&test_context); -- 2.16.4

3 2

[PATCH 2/3] wined3d: Fix snorm/unorm immediate values for UAV writes.
by Józef Kucia 09 Jul '18

09 Jul '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45067 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index af50c8b17a26..1e922c80dff7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3094,6 +3094,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3D_IMMCONST_SCALAR: switch (data_type) { + case WINED3D_DATA_UNORM: + case WINED3D_DATA_SNORM: case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) sprintf(register_name, "uintBitsToFloat(%#xu)", reg->u.immconst_data[0]); @@ -3117,6 +3119,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3D_IMMCONST_VEC4: switch (data_type) { + case WINED3D_DATA_UNORM: + case WINED3D_DATA_SNORM: case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) { -- 2.16.4

2 1

[PATCH 1/3] dxgi: Avoid possible NULL pointer access in d3d11_swapchain_SetFullscreenState().
by Józef Kucia 09 Jul '18

09 Jul '18

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index fb91eec9d9a1..ae7bde73995c 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -252,12 +252,11 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d11_swapchain_SetFullscreen if (swapchain->target) IDXGIOutput_Release(swapchain->target); swapchain->target = target; - } - else - { - IDXGIOutput_Release(target); + return S_OK; } + if (target) + IDXGIOutput_Release(target); return hr; } -- 2.16.4

2 1

[PATCH] d3d9: expand rectangles in debug strings
by Rafał Mużyło 09 Jul '18

09 Jul '18

Most debug lines - except these three - expand the rectangles; so this puts things simply in sync with the rest. Signed-off-by: Rafał Mużyło <galtgendo(a)o2.pl>

2 1

[PATCH] credui: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 09 Jul '18

09 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(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 a4df9fe433..bf9f7d186e 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; -- 2.14.4

1 0

[PATCH] netapi32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 09 Jul '18

09 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(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 207bd66425..4816630334 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 ff57c223b4..afeada6f1e 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 e16c5dcc4f..0d2bb0e012 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; -- 2.14.4

1 0

[PATCH] oleview: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 09 Jul '18

09 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(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 --git a/programs/oleview/details.c b/programs/oleview/details.c index fda9b7ce12..2ea5e293a2 100644 --- a/programs/oleview/details.c +++ b/programs/oleview/details.c @@ -51,7 +51,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad while(TRUE) { - lenName = sizeof(wszName)/sizeof(WCHAR); + lenName = ARRAY_SIZE(wszName); lenData = sizeof(wszData); retEnum = RegEnumValueW(hKey, i, wszName, &lenName, @@ -120,7 +120,7 @@ static void CreateRegRec(HKEY hKey, HTREEITEM parent, WCHAR *wszKeyName, BOOL ad { i++; - if(RegEnumKeyW(hKey, i, wszName, sizeof(wszName)/sizeof(WCHAR)) != ERROR_SUCCESS) break; + if(RegEnumKeyW(hKey, i, wszName, ARRAY_SIZE(wszName)) != ERROR_SUCCESS) break; if(RegOpenKeyW(hKey, wszName, &hCurKey) != ERROR_SUCCESS) continue; @@ -296,14 +296,12 @@ void RefreshDetails(HTREEITEM item) memset(&tci, 0, sizeof(TCITEMW)); tci.mask = TCIF_TEXT; tci.pszText = wszBuf; - tci.cchTextMax = sizeof(wszBuf)/sizeof(wszBuf[0]); + tci.cchTextMax = ARRAY_SIZE(wszBuf); - LoadStringW(globals.hMainInst, IDS_TAB_IMPL, - wszBuf, sizeof(wszBuf)/sizeof(wszBuf[0])); + LoadStringW(globals.hMainInst, IDS_TAB_IMPL, wszBuf, ARRAY_SIZE(wszBuf)); SendMessageW(details.hTab, TCM_INSERTITEMW, 1, (LPARAM)&tci); - LoadStringW(globals.hMainInst, IDS_TAB_ACTIV, - wszBuf, sizeof(wszBuf)/sizeof(wszBuf[0])); + LoadStringW(globals.hMainInst, IDS_TAB_ACTIV, wszBuf, ARRAY_SIZE(wszBuf)); SendMessageW(details.hTab, TCM_INSERTITEMW, 2, (LPARAM)&tci); } } @@ -331,13 +329,13 @@ static void CreateTabCtrl(HWND hWnd) memset(&tci, 0, sizeof(TCITEMW)); tci.mask = TCIF_TEXT; tci.pszText = buffer; - tci.cchTextMax = sizeof(buffer)/sizeof(buffer[0]); + tci.cchTextMax = ARRAY_SIZE(buffer); details.hTab = CreateWindowW(WC_TABCONTROLW, NULL, WS_CHILD|WS_VISIBLE, 0, 0, 0, 0, hWnd, (HMENU)TAB_WINDOW, globals.hMainInst, NULL); ShowWindow(details.hTab, SW_HIDE); - LoadStringW(globals.hMainInst, IDS_TAB_REG, buffer, sizeof(buffer)/sizeof(buffer[0])); + LoadStringW(globals.hMainInst, IDS_TAB_REG, buffer, ARRAY_SIZE(buffer)); SendMessageW(details.hTab, TCM_INSERTITEMW, 0, (LPARAM)&tci); details.hReg = CreateWindowExW(WS_EX_CLIENTEDGE, WC_TREEVIEWW, NULL, diff --git a/programs/oleview/interface.c b/programs/oleview/interface.c index fbbd478b16..88007d127e 100644 --- a/programs/oleview/interface.c +++ b/programs/oleview/interface.c @@ -96,10 +96,9 @@ static INT_PTR CALLBACK InterfaceViewerProc(HWND hDlgWnd, UINT uMsg, hRes = IPersistStream_IsDirty((IPersistStream *)unk); IUnknown_Release(unk); if(hRes == S_OK) - LoadStringW(globals.hMainInst, IDS_FALSE, wszBuf, - sizeof(wszBuf)/sizeof(wszBuf[0])); - else LoadStringW(globals.hMainInst, IDS_TRUE, wszBuf, - sizeof(wszBuf)/sizeof(wszBuf[0])); + LoadStringW(globals.hMainInst, IDS_FALSE, wszBuf, ARRAY_SIZE(wszBuf)); + else + LoadStringW(globals.hMainInst, IDS_TRUE, wszBuf, ARRAY_SIZE(wszBuf)); hObject = GetDlgItem(hDlgWnd, IDC_ISDIRTY); SetWindowTextW(hObject, wszBuf); return TRUE; @@ -107,8 +106,7 @@ static INT_PTR CALLBACK InterfaceViewerProc(HWND hDlgWnd, UINT uMsg, unk = GetInterface(); IPersistStream_GetSizeMax((IPersistStream *)unk, &size); IUnknown_Release(unk); - LoadStringW(globals.hMainInst, IDS_BYTES, wszBuf, - sizeof(wszBuf)/sizeof(wszBuf[0])); + LoadStringW(globals.hMainInst, IDS_BYTES, wszBuf, ARRAY_SIZE(wszBuf)); wsprintfW(wszSize, wszFormat, U(size).LowPart, wszBuf); hObject = GetDlgItem(hDlgWnd, IDC_GETSIZEMAX); SetWindowTextW(hObject, wszSize); diff --git a/programs/oleview/oleview.c b/programs/oleview/oleview.c index 43f3a2ec06..ca4710ee04 100644 --- a/programs/oleview/oleview.c +++ b/programs/oleview/oleview.c @@ -286,8 +286,7 @@ static int MenuCommand(WPARAM wParam, HWND hWnd) switch(wParam) { case IDM_ABOUT: - LoadStringW(globals.hMainInst, IDS_ABOUT, wszAbout, - sizeof(wszAbout)/sizeof(wszAbout[0])); + LoadStringW(globals.hMainInst, IDS_ABOUT, wszAbout, ARRAY_SIZE(wszAbout)); ShellAboutW(hWnd, wszAbout, NULL, NULL); break; case IDM_COPYCLSID: @@ -380,7 +379,7 @@ static int MenuCommand(WPARAM wParam, HWND hWnd) PROCESS_INFORMATION pi; WCHAR app[MAX_PATH]; - GetWindowsDirectoryW( app, MAX_PATH - sizeof(wszRegEdit)/sizeof(WCHAR) ); + GetWindowsDirectoryW(app, MAX_PATH - ARRAY_SIZE(wszRegEdit)); lstrcatW( app, wszRegEdit ); memset(&si, 0, sizeof(si)); si.cb = sizeof(si); @@ -416,9 +415,9 @@ static int MenuCommand(WPARAM wParam, HWND hWnd) static WCHAR wszName[MAX_LOAD_STRING]; WCHAR filter_typelib[MAX_LOAD_STRING], filter_all[MAX_LOAD_STRING], filter[MAX_PATH]; - LoadStringW(globals.hMainInst, IDS_OPEN, wszTitle, sizeof(wszTitle)/sizeof(wszTitle[0])); - LoadStringW(globals.hMainInst, IDS_OPEN_FILTER_TYPELIB, filter_typelib, sizeof(filter_typelib)/sizeof(WCHAR)); - LoadStringW(globals.hMainInst, IDS_OPEN_FILTER_ALL, filter_all, sizeof(filter_all)/sizeof(WCHAR)); + LoadStringW(globals.hMainInst, IDS_OPEN, wszTitle, ARRAY_SIZE(wszTitle)); + LoadStringW(globals.hMainInst, IDS_OPEN_FILTER_TYPELIB, filter_typelib, ARRAY_SIZE(filter_typelib)); + LoadStringW(globals.hMainInst, IDS_OPEN_FILTER_ALL, filter_all, ARRAY_SIZE(filter_all)); wsprintfW( filter, filterW, filter_typelib, 0, 0, filter_all, 0, 0 ); InitOpenFileName(hWnd, &ofn, filter, wszTitle, wszName); if(GetOpenFileNameW(&ofn)) CreateTypeLibWindow(globals.hMainInst, wszName); @@ -441,8 +440,8 @@ static void UpdateStatusBar(int itemID) { WCHAR info[MAX_LOAD_STRING]; - if(!LoadStringW(globals.hMainInst, itemID, info, sizeof(info)/sizeof(info[0]))) - LoadStringW(globals.hMainInst, IDS_READY, info, sizeof(info)/sizeof(info[0])); + if(!LoadStringW(globals.hMainInst, itemID, info, ARRAY_SIZE(info))) + LoadStringW(globals.hMainInst, IDS_READY, info, ARRAY_SIZE(info)); SendMessageW(globals.hStatusBar, SB_SETTEXTW, 0, (LPARAM)info); } @@ -491,7 +490,7 @@ static BOOL InitApplication(HINSTANCE hInst) WNDCLASSW wc; WCHAR wszAppName[MAX_LOAD_STRING]; - LoadStringW(hInst, IDS_APPNAME, wszAppName, sizeof(wszAppName)/sizeof(wszAppName[0])); + LoadStringW(hInst, IDS_APPNAME, wszAppName, ARRAY_SIZE(wszAppName)); memset(&wc, 0, sizeof(WNDCLASSW)); wc.lpfnWndProc = WndProc; @@ -524,8 +523,8 @@ static BOOL InitInstance(HINSTANCE hInst, int nCmdShow) {5, IDM_VIEW, TBSTATE_ENABLED, BTNS_BUTTON, {0, 0}, 0, 0} }; - LoadStringW(hInst, IDS_APPNAME, wszAppName, sizeof(wszAppName)/sizeof(wszAppName[0])); - LoadStringW(hInst, IDS_APPTITLE, wszTitle, sizeof(wszTitle)/sizeof(wszTitle[0])); + LoadStringW(hInst, IDS_APPNAME, wszAppName, ARRAY_SIZE(wszAppName)); + LoadStringW(hInst, IDS_APPTITLE, wszTitle, ARRAY_SIZE(wszTitle)); hWnd = CreateWindowW(wszAppName, wszTitle, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, CW_USEDEFAULT, 0, NULL, NULL, hInst, NULL); diff --git a/programs/oleview/tree.c b/programs/oleview/tree.c index 2a4ca6590c..1530c951ba 100644 --- a/programs/oleview/tree.c +++ b/programs/oleview/tree.c @@ -108,10 +108,8 @@ void CreateInst(HTREEITEM item, WCHAR *wszMachineName) if(FAILED(hRes)) { - LoadStringW(globals.hMainInst, IDS_CGCOFAIL, wszMessage, - sizeof(wszMessage)/sizeof(wszMessage[0])); - LoadStringW(globals.hMainInst, IDS_ABOUT, wszTitle, - sizeof(wszTitle)/sizeof(wszTitle[0])); + LoadStringW(globals.hMainInst, IDS_CGCOFAIL, wszMessage, ARRAY_SIZE(wszMessage)); + LoadStringW(globals.hMainInst, IDS_ABOUT, wszTitle, ARRAY_SIZE(wszTitle)); #define CASE_ERR(i) case i: \ MultiByteToWideChar(CP_ACP, 0, #i, -1, wszFlagName, MAX_LOAD_STRING); \ @@ -130,7 +128,7 @@ void CreateInst(HTREEITEM item, WCHAR *wszMachineName) CASE_ERR(CO_E_APPDIDNTREG); CASE_ERR(CLASS_E_CLASSNOTAVAILABLE); default: - LoadStringW(globals.hMainInst, IDS_ERROR_UNKN, wszFlagName, sizeof(wszFlagName)/sizeof(wszFlagName[0])); + LoadStringW(globals.hMainInst, IDS_ERROR_UNKN, wszFlagName, ARRAY_SIZE(wszFlagName)); } wsprintfW(&wszMessage[lstrlenW(wszMessage)], wszFormat, @@ -273,7 +271,7 @@ static void AddCOMandAll(void) { i++; - if(RegEnumKeyW(hKey, i, valName, sizeof(valName)/sizeof(valName[0])) != ERROR_SUCCESS) break; + if(RegEnumKeyW(hKey, i, valName, ARRAY_SIZE(valName)) != ERROR_SUCCESS) break; if(RegOpenKeyW(hKey, valName, &hCurKey) != ERROR_SUCCESS) continue; @@ -302,7 +300,7 @@ static void AddCOMandAll(void) if(RegOpenKeyW(hCurKey, wszImplementedCategories, &hInfo) == ERROR_SUCCESS) { - if(RegEnumKeyW(hInfo, 0, wszComp, sizeof(wszComp)/sizeof(wszComp[0])) != ERROR_SUCCESS) break; + if(RegEnumKeyW(hInfo, 0, wszComp, ARRAY_SIZE(wszComp)) != ERROR_SUCCESS) break; RegCloseKey(hInfo); @@ -360,7 +358,7 @@ static void AddApplicationID(void) { i++; - if(RegEnumKeyW(hKey, i, valName, sizeof(valName)/sizeof(valName[0])) != ERROR_SUCCESS) break; + if(RegEnumKeyW(hKey, i, valName, ARRAY_SIZE(valName)) != ERROR_SUCCESS) break; if(RegOpenKeyW(hKey, valName, &hCurKey) != ERROR_SUCCESS) continue; @@ -405,7 +403,7 @@ static void AddTypeLib(void) { i++; - if(RegEnumKeyW(hKey, i, valParent, sizeof(valParent)/sizeof(valParent[0])) != ERROR_SUCCESS) break; + if(RegEnumKeyW(hKey, i, valParent, ARRAY_SIZE(valParent)) != ERROR_SUCCESS) break; if(RegOpenKeyW(hKey, valParent, &hCurKey) != ERROR_SUCCESS) continue; @@ -414,7 +412,7 @@ static void AddTypeLib(void) { j++; - if(RegEnumKeyW(hCurKey, j, valName, sizeof(valName)/sizeof(valName[0])) != ERROR_SUCCESS) break; + if(RegEnumKeyW(hCurKey, j, valName, ARRAY_SIZE(valName)) != ERROR_SUCCESS) break; if(RegOpenKeyW(hCurKey, valName, &hInfoKey) != ERROR_SUCCESS) continue; @@ -423,8 +421,7 @@ static void AddTypeLib(void) if(RegQueryValueW(hInfoKey, NULL, buffer, &lenBuffer) == ERROR_SUCCESS && *buffer) { - LoadStringW(globals.hMainInst, IDS_TL_VER, wszVer, - sizeof(wszVer)/sizeof(wszVer[0])); + LoadStringW(globals.hMainInst, IDS_TL_VER, wszVer, ARRAY_SIZE(wszVer)); wsprintfW(&buffer[lstrlenW(buffer)], wszFormat, wszVer, valName); U(tvis).item.pszText = buffer; @@ -471,7 +468,7 @@ static void AddInterfaces(void) { i++; - if(RegEnumKeyW(hKey, i, valName, sizeof(valName)/sizeof(valName[0])) != ERROR_SUCCESS) break; + if(RegEnumKeyW(hKey, i, valName, ARRAY_SIZE(valName)) != ERROR_SUCCESS) break; if(RegOpenKeyW(hKey, valName, &hCurKey) != ERROR_SUCCESS) continue; @@ -518,7 +515,7 @@ static void AddComponentCategories(void) { i++; - if(RegEnumKeyW(hKey, i, keyName, sizeof(keyName)/sizeof(keyName[0])) != ERROR_SUCCESS) break; + if(RegEnumKeyW(hKey, i, keyName, ARRAY_SIZE(keyName)) != ERROR_SUCCESS) break; if(RegOpenKeyW(hKey, keyName, &hCurKey) != ERROR_SUCCESS) continue; diff --git a/programs/oleview/typelib.c b/programs/oleview/typelib.c index cbf6ab1f6d..4912a5fb00 100644 --- a/programs/oleview/typelib.c +++ b/programs/oleview/typelib.c @@ -104,8 +104,7 @@ static void ShowLastError(void) LPWSTR lpMsgBuf; WCHAR wszTitle[MAX_LOAD_STRING]; - LoadStringW(globals.hMainInst, IDS_TYPELIBTITLE, wszTitle, - sizeof(wszTitle)/sizeof(wszTitle[0])); + LoadStringW(globals.hMainInst, IDS_TYPELIBTITLE, wszTitle, ARRAY_SIZE(wszTitle)); FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, error, 0, (LPWSTR)&lpMsgBuf, 0, NULL); MessageBoxW(NULL, lpMsgBuf, wszTitle, MB_OK | MB_ICONERROR); @@ -737,7 +736,7 @@ static int EnumImplTypes(ITypeInfo *pTypeInfo, int cImplTypes, HTREEITEM hParent if(!cImplTypes) return 0; LoadStringW(globals.hMainInst, IDS_INHERITINTERFACES, wszInheritedInterfaces, - sizeof(wszInheritedInterfaces)/sizeof(wszInheritedInterfaces[0])); + ARRAY_SIZE(wszInheritedInterfaces)); U(tvis).item.mask = TVIF_TEXT; U(tvis).item.cchTextMax = MAX_LOAD_STRING; @@ -1200,12 +1199,11 @@ static int PopulateTree(void) WCHAR wszError[MAX_LOAD_STRING]; DWORD_PTR args[2]; - LoadStringW(globals.hMainInst, IDS_ERROR_LOADTYPELIB, - wszError, sizeof(wszError)/sizeof(wszError[0])); + LoadStringW(globals.hMainInst, IDS_ERROR_LOADTYPELIB, wszError, ARRAY_SIZE(wszError)); args[0] = (DWORD_PTR)typelib.wszFileName; args[1] = hRes; FormatMessageW(FORMAT_MESSAGE_FROM_STRING|FORMAT_MESSAGE_ARGUMENT_ARRAY, - wszError, 0, 0, wszMessage, sizeof(wszMessage)/sizeof(*wszMessage), (__ms_va_list*)args); + wszError, 0, 0, wszMessage, ARRAY_SIZE(wszMessage), (__ms_va_list*)args); MessageBoxW(globals.hMainWnd, wszMessage, NULL, MB_OK|MB_ICONEXCLAMATION); return 1; } @@ -1535,8 +1533,8 @@ static void UpdateTypeLibStatusBar(int itemID) { WCHAR info[MAX_LOAD_STRING]; - if(!LoadStringW(globals.hMainInst, itemID, info, sizeof(info)/sizeof(info[0]))) - LoadStringW(globals.hMainInst, IDS_READY, info, sizeof(info)/sizeof(info[0])); + if(!LoadStringW(globals.hMainInst, itemID, info, ARRAY_SIZE(info))) + LoadStringW(globals.hMainInst, IDS_READY, info, ARRAY_SIZE(info)); SendMessageW(typelib.hStatusBar, SB_SETTEXTW, 0, (LPARAM)info); } @@ -1639,7 +1637,7 @@ BOOL TypeLibRegisterClassW(void) BOOL CreateTypeLibWindow(HINSTANCE hInst, WCHAR *wszFileName) { WCHAR wszTitle[MAX_LOAD_STRING]; - LoadStringW(hInst, IDS_TYPELIBTITLE, wszTitle, sizeof(wszTitle)/sizeof(wszTitle[0])); + LoadStringW(hInst, IDS_TYPELIBTITLE, wszTitle, ARRAY_SIZE(wszTitle)); if(wszFileName) lstrcpyW(typelib.wszFileName, wszFileName); else -- 2.14.4

1 0

[PATCH] view: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 09 Jul '18

09 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(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 0adade7111..319152957e 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(); } -- 2.14.4

1 0

[PATCH] cryptui: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 09 Jul '18

09 Jul '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/cryptui/main.c | 221 ++++++++++++++++++++-------------------------------- 1 file changed, 83 insertions(+), 138 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index a652239bb3..4ac37c96df 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -73,22 +73,18 @@ static void add_cert_columns(HWND hwnd) SendMessageW(lv, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); GetWindowRect(lv, &rc); - LoadStringW(hInstance, IDS_SUBJECT_COLUMN, buf, - sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_SUBJECT_COLUMN, buf, ARRAY_SIZE(buf)); column.mask = LVCF_WIDTH | LVCF_TEXT; column.cx = (rc.right - rc.left) * 29 / 100 - 2; column.pszText = buf; SendMessageW(lv, LVM_INSERTCOLUMNW, 0, (LPARAM)&column); - LoadStringW(hInstance, IDS_ISSUER_COLUMN, buf, - sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_ISSUER_COLUMN, buf, ARRAY_SIZE(buf)); SendMessageW(lv, LVM_INSERTCOLUMNW, 1, (LPARAM)&column); column.cx = (rc.right - rc.left) * 16 / 100 - 2; - LoadStringW(hInstance, IDS_EXPIRATION_COLUMN, buf, - sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_EXPIRATION_COLUMN, buf, ARRAY_SIZE(buf)); SendMessageW(lv, LVM_INSERTCOLUMNW, 2, (LPARAM)&column); column.cx = (rc.right - rc.left) * 23 / 100 - 1; - LoadStringW(hInstance, IDS_FRIENDLY_NAME_COLUMN, buf, - sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_FRIENDLY_NAME_COLUMN, buf, ARRAY_SIZE(buf)); SendMessageW(lv, LVM_INSERTCOLUMNW, 3, (LPARAM)&column); } @@ -143,11 +139,9 @@ static void add_cert_to_view(HWND lv, PCCERT_CONTEXT cert, DWORD *allocatedLen, SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); } - GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, - sizeof(dateFmt) / sizeof(dateFmt[0])); + GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, ARRAY_SIZE(dateFmt)); FileTimeToSystemTime(&cert->pCertInfo->NotAfter, &sysTime); - GetDateFormatW(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, date, - sizeof(date) / sizeof(date[0])); + GetDateFormatW(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, date, ARRAY_SIZE(date)); item.pszText = date; item.iSubItem = 2; SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); @@ -222,12 +216,10 @@ static void initialize_purpose_selection(HWND hwnd) LPSTR usages; int index; - LoadStringW(hInstance, IDS_PURPOSE_ALL, buf, - sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_PURPOSE_ALL, buf, ARRAY_SIZE(buf)); index = SendMessageW(cb, CB_INSERTSTRING, -1, (LPARAM)buf); SendMessageW(cb, CB_SETITEMDATA, index, (LPARAM)PurposeFilterShowAll); - LoadStringW(hInstance, IDS_PURPOSE_ADVANCED, buf, - sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_PURPOSE_ADVANCED, buf, ARRAY_SIZE(buf)); index = SendMessageW(cb, CB_INSERTSTRING, -1, (LPARAM)buf); SendMessageW(cb, CB_SETITEMDATA, index, (LPARAM)PurposeFilterShowAdvanced); SendMessageW(cb, CB_SETCURSEL, 0, 0); @@ -500,12 +492,12 @@ static void show_cert_stores(HWND hwnd, DWORD dwFlags, struct CertMgrData *data) if (dwFlags & CRYPTUI_CERT_MGR_PUBLISHER_TAB) { storeList = publisherStoreList; - cStores = sizeof(publisherStoreList) / sizeof(publisherStoreList[0]); + cStores = ARRAY_SIZE(publisherStoreList); } else { storeList = defaultStoreList; - cStores = sizeof(defaultStoreList) / sizeof(defaultStoreList[0]); + cStores = ARRAY_SIZE(defaultStoreList); } if (dwFlags & CRYPTUI_CERT_MGR_SINGLE_TAB_FLAG) cStores = 1; @@ -942,8 +934,7 @@ static void cert_mgr_show_cert_usages(HWND hwnd, int index) { WCHAR buf[MAX_STRING_LEN]; - LoadStringW(hInstance, IDS_ALLOWED_PURPOSE_NONE, buf, - sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_ALLOWED_PURPOSE_NONE, buf, ARRAY_SIZE(buf)); SendMessageW(text, WM_SETTEXT, 0, (LPARAM)buf); } } @@ -951,8 +942,7 @@ static void cert_mgr_show_cert_usages(HWND hwnd, int index) { WCHAR buf[MAX_STRING_LEN]; - LoadStringW(hInstance, IDS_ALLOWED_PURPOSE_ALL, buf, - sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_ALLOWED_PURPOSE_ALL, buf, ARRAY_SIZE(buf)); SendMessageW(text, WM_SETTEXT, 0, (LPARAM)buf); } } @@ -979,12 +969,10 @@ static void cert_mgr_do_remove(HWND hwnd) pTitle = data->title; else { - LoadStringW(hInstance, IDS_CERT_MGR, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_CERT_MGR, title, ARRAY_SIZE(title)); pTitle = title; } - LoadStringW(hInstance, warningID, warning, - sizeof(warning) / sizeof(warning[0])); + LoadStringW(hInstance, warningID, warning, ARRAY_SIZE(warning)); if (MessageBoxW(hwnd, warning, pTitle, MB_YESNO) == IDYES) { int selection = -1; @@ -1072,7 +1060,7 @@ static int cert_mgr_sort_by_text(HWND lv, int col, int index1, int index2) WCHAR buf1[MAX_STRING_LEN]; WCHAR buf2[MAX_STRING_LEN]; - item.cchTextMax = sizeof(buf1) / sizeof(buf1[0]); + item.cchTextMax = ARRAY_SIZE(buf1); item.mask = LVIF_TEXT; item.pszText = buf1; item.iItem = index1; @@ -1490,7 +1478,7 @@ static HCERTSTORE selected_item_to_store(HWND tree, HTREEITEM hItem) memset(&item, 0, sizeof(item)); item.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_TEXT; item.hItem = hItem; - item.cchTextMax = sizeof(buf) / sizeof(buf[0]); + item.cchTextMax = ARRAY_SIZE(buf); item.pszText = buf; SendMessageW(tree, TVM_GETITEMW, 0, (LPARAM)&item); if (item.lParam) @@ -1558,12 +1546,10 @@ static LRESULT CALLBACK select_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, pTitle = selectInfo->info->pwszTitle; else { - LoadStringW(hInstance, IDS_SELECT_STORE_TITLE, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_SELECT_STORE_TITLE, title, ARRAY_SIZE(title)); pTitle = title; } - LoadStringW(hInstance, IDS_SELECT_STORE, error, - sizeof(error) / sizeof(error[0])); + LoadStringW(hInstance, IDS_SELECT_STORE, error, ARRAY_SIZE(error)); MessageBoxW(hwnd, error, pTitle, MB_ICONEXCLAMATION | MB_OK); } else @@ -1958,7 +1944,7 @@ static struct OIDToString oidMap[] = { static struct OIDToString *findSupportedOID(LPCSTR oid) { - int indexHigh = sizeof(oidMap) / sizeof(oidMap[0]) - 1, indexLow = 0; + int indexHigh = ARRAY_SIZE(oidMap) - 1, indexLow = 0; while (indexLow <= indexHigh) { @@ -2397,11 +2383,9 @@ static void add_date_string_to_control(HWND hwnd, const FILETIME *fileTime) WCHAR date[80]; SYSTEMTIME sysTime; - GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, - sizeof(dateFmt) / sizeof(dateFmt[0])); + GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SSHORTDATE, dateFmt, ARRAY_SIZE(dateFmt)); FileTimeToSystemTime(fileTime, &sysTime); - GetDateFormatW(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, date, - sizeof(date) / sizeof(date[0])); + GetDateFormatW(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, date, ARRAY_SIZE(date)); add_unformatted_text_to_control(hwnd, date, lstrlenW(date)); } @@ -2658,8 +2642,7 @@ static WCHAR *format_long_date(const FILETIME *fileTime) SYSTEMTIME sysTime; /* FIXME: format isn't quite right, want time too */ - GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SLONGDATE, dateFmt, - sizeof(dateFmt) / sizeof(dateFmt[0])); + GetLocaleInfoW(LOCALE_SYSTEM_DEFAULT, LOCALE_SLONGDATE, dateFmt, ARRAY_SIZE(dateFmt)); FileTimeToSystemTime(fileTime, &sysTime); len = GetDateFormatW(LOCALE_SYSTEM_DEFAULT, 0, &sysTime, dateFmt, NULL, 0); if (len) @@ -2693,8 +2676,7 @@ static WCHAR *field_format_public_key(PCCERT_CONTEXT cert) { WCHAR fmt[MAX_STRING_LEN]; - if (LoadStringW(hInstance, IDS_FIELD_PUBLIC_KEY_FORMAT, fmt, - sizeof(fmt) / sizeof(fmt[0]))) + if (LoadStringW(hInstance, IDS_FIELD_PUBLIC_KEY_FORMAT, fmt, ARRAY_SIZE(fmt))) { DWORD len; @@ -2795,7 +2777,7 @@ static void add_string_id_and_value_to_list(HWND hwnd, struct detail_data *data, { WCHAR buf[MAX_STRING_LEN]; - LoadStringW(hInstance, id, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, id, buf, ARRAY_SIZE(buf)); add_field_and_value_to_list(hwnd, data, buf, value, create, param); } @@ -2838,7 +2820,7 @@ static void add_v1_fields(HWND hwnd, struct detail_data *data) /* The last item in v1_fields is the public key, which is not in the loop * because it's a special case. */ - for (i = 0; i < sizeof(v1_fields) / sizeof(v1_fields[0]) - 1; i++) + for (i = 0; i < ARRAY_SIZE(v1_fields) - 1; i++) add_v1_field(hwnd, data, &v1_fields[i]); if (cert->pCertInfo->SubjectPublicKeyInfo.PublicKey.cbData) add_v1_field(hwnd, data, &v1_fields[i]); @@ -2905,7 +2887,7 @@ static WCHAR *field_format_extension_hex_with_ascii(const CERT_EXTENSION *ext) { static const WCHAR pad[] = { ' ',' ',' ' }; - for (; j % 8; j++, ptr += sizeof(pad) / sizeof(pad[0])) + for (; j % 8; j++, ptr += ARRAY_SIZE(pad)) memcpy(ptr, pad, sizeof(pad)); } /* The last sprintfW included a space, so just insert one @@ -3026,7 +3008,7 @@ static void add_properties(HWND hwnd, struct detail_data *data) DWORD i; PCCERT_CONTEXT cert = data->pCertViewInfo->pCertContext; - for (i = 0; i < sizeof(prop_id_map) / sizeof(prop_id_map[0]); i++) + for (i = 0; i < ARRAY_SIZE(prop_id_map); i++) { DWORD cb; @@ -3089,12 +3071,11 @@ static void create_show_list(HWND hwnd, struct detail_data *data) WCHAR buf[MAX_STRING_LEN]; int i; - for (i = 0; i < sizeof(listItems) / sizeof(listItems[0]); i++) + for (i = 0; i < ARRAY_SIZE(listItems); i++) { int index; - LoadStringW(hInstance, listItems[i].id, buf, - sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, listItems[i].id, buf, ARRAY_SIZE(buf)); index = SendMessageW(cb, CB_INSERTSTRING, -1, (LPARAM)buf); SendMessageW(cb, CB_SETITEMDATA, index, (LPARAM)data); } @@ -3110,12 +3091,12 @@ static void create_listview_columns(HWND hwnd) SendMessageW(lv, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); GetWindowRect(lv, &rc); - LoadStringW(hInstance, IDS_FIELD, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_FIELD, buf, ARRAY_SIZE(buf)); column.mask = LVCF_WIDTH | LVCF_TEXT; column.cx = (rc.right - rc.left) / 2 - 2; column.pszText = buf; SendMessageW(lv, LVM_INSERTCOLUMNW, 0, (LPARAM)&column); - LoadStringW(hInstance, IDS_VALUE, buf, sizeof(buf) / sizeof(buf[0])); + LoadStringW(hInstance, IDS_VALUE, buf, ARRAY_SIZE(buf)); SendMessageW(lv, LVM_INSERTCOLUMNW, 1, (LPARAM)&column); } @@ -3123,7 +3104,7 @@ static void set_fields_selection(HWND hwnd, struct detail_data *data, int sel) { HWND list = GetDlgItem(hwnd, IDC_DETAIL_LIST); - if (sel >= 0 && sel < sizeof(listItems) / sizeof(listItems[0])) + if (sel >= 0 && sel < ARRAY_SIZE(listItems)) { SendMessageW(list, LVM_DELETEALLITEMS, 0, 0); listItems[sel].add(list, data); @@ -3247,8 +3228,8 @@ static LRESULT CALLBACK add_purpose_dlg_proc(HWND hwnd, UINT msg, switch (LOWORD(wp)) { case IDOK: - SendMessageA(GetDlgItem(hwnd, IDC_NEW_PURPOSE), WM_GETTEXT, - sizeof(buf) / sizeof(buf[0]), (LPARAM)buf); + SendMessageA(GetDlgItem(hwnd, IDC_NEW_PURPOSE), WM_GETTEXT, ARRAY_SIZE(buf), + (LPARAM)buf); if (!buf[0]) { /* An empty purpose is the same as cancelling */ @@ -3259,10 +3240,8 @@ static LRESULT CALLBACK add_purpose_dlg_proc(HWND hwnd, UINT msg, { WCHAR title[MAX_STRING_LEN], error[MAX_STRING_LEN]; - LoadStringW(hInstance, IDS_CERTIFICATE_PURPOSE_ERROR, error, - sizeof(error) / sizeof(error[0])); - LoadStringW(hInstance, IDS_CERTIFICATE_PROPERTIES, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_CERTIFICATE_PURPOSE_ERROR, error, ARRAY_SIZE(error)); + LoadStringW(hInstance, IDS_CERTIFICATE_PROPERTIES, title, ARRAY_SIZE(title)); MessageBoxW(hwnd, error, title, MB_ICONERROR | MB_OK); } else if (is_oid_in_list( @@ -3270,10 +3249,9 @@ static LRESULT CALLBACK add_purpose_dlg_proc(HWND hwnd, UINT msg, { WCHAR title[MAX_STRING_LEN], error[MAX_STRING_LEN]; - LoadStringW(hInstance, IDS_CERTIFICATE_PURPOSE_EXISTS, - error, sizeof(error) / sizeof(error[0])); - LoadStringW(hInstance, IDS_CERTIFICATE_PROPERTIES, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_CERTIFICATE_PURPOSE_EXISTS, error, + ARRAY_SIZE(error)); + LoadStringW(hInstance, IDS_CERTIFICATE_PROPERTIES, title, ARRAY_SIZE(title)); MessageBoxW(hwnd, error, title, MB_ICONEXCLAMATION | MB_OK); } else @@ -3532,11 +3510,9 @@ static void apply_general_changes(HWND hwnd) struct edit_cert_data *data = (struct edit_cert_data *)GetWindowLongPtrW(hwnd, DWLP_USER); - SendMessageW(GetDlgItem(hwnd, IDC_FRIENDLY_NAME), WM_GETTEXT, - sizeof(buf) / sizeof(buf[0]), (LPARAM)buf); + SendMessageW(GetDlgItem(hwnd, IDC_FRIENDLY_NAME), WM_GETTEXT, ARRAY_SIZE(buf), (LPARAM)buf); set_cert_string_property(data->cert, CERT_FRIENDLY_NAME_PROP_ID, buf); - SendMessageW(GetDlgItem(hwnd, IDC_DESCRIPTION), WM_GETTEXT, - sizeof(buf) / sizeof(buf[0]), (LPARAM)buf); + SendMessageW(GetDlgItem(hwnd, IDC_DESCRIPTION), WM_GETTEXT, ARRAY_SIZE(buf), (LPARAM)buf); set_cert_string_property(data->cert, CERT_DESCRIPTION_PROP_ID, buf); if (IsDlgButtonChecked(hwnd, IDC_ENABLE_ALL_PURPOSES)) { @@ -3829,7 +3805,7 @@ static LRESULT CALLBACK detail_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, LVITEMW item; int res; - item.cchTextMax = sizeof(buf) / sizeof(buf[0]); + item.cchTextMax = ARRAY_SIZE(buf); item.mask = LVIF_TEXT; item.pszText = buf; item.iItem = nm->iItem; @@ -4695,12 +4671,10 @@ static void import_warning(DWORD dwFlags, HWND hwnd, LPCWSTR szTitle, pTitle = szTitle; else { - LoadStringW(hInstance, IDS_IMPORT_WIZARD, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_IMPORT_WIZARD, title, ARRAY_SIZE(title)); pTitle = title; } - LoadStringW(hInstance, warningID, error, - sizeof(error) / sizeof(error[0])); + LoadStringW(hInstance, warningID, error, ARRAY_SIZE(error)); MessageBoxW(hwnd, error, pTitle, MB_ICONERROR | MB_OK); } } @@ -4875,8 +4849,7 @@ static LRESULT CALLBACK import_welcome_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, int height; data = (struct ImportWizData *)page->lParam; - LoadStringW(hInstance, IDS_WIZARD_TITLE_FONT, fontFace, - sizeof(fontFace) / sizeof(fontFace[0])); + LoadStringW(hInstance, IDS_WIZARD_TITLE_FONT, fontFace, ARRAY_SIZE(fontFace)); height = -MulDiv(12, GetDeviceCaps(hDC, LOGPIXELSY), 72); data->titleFont = CreateFontW(height, 0, 0, 0, FW_BOLD, 0, 0, 0, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, @@ -4935,7 +4908,7 @@ static WCHAR *make_import_file_filter(DWORD dwFlags) int len, totalLen = 2; LPWSTR filter = NULL, str; - for (i = 0; i < sizeof(import_filters) / sizeof(import_filters[0]); i++) + for (i = 0; i < ARRAY_SIZE(import_filters); i++) { if (!import_filters[i].allowFlags || !dwFlags || (dwFlags & import_filters[i].allowFlags)) @@ -4950,7 +4923,7 @@ static WCHAR *make_import_file_filter(DWORD dwFlags) LPWSTR ptr; ptr = filter; - for (i = 0; i < sizeof(import_filters) / sizeof(import_filters[0]); i++) + for (i = 0; i < ARRAY_SIZE(import_filters); i++) { if (!import_filters[i].allowFlags || !dwFlags || (dwFlags & import_filters[i].allowFlags)) @@ -5012,12 +4985,10 @@ static BOOL import_validate_filename(HWND hwnd, struct ImportWizData *data, pTitle = data->pwszWizardTitle; else { - LoadStringW(hInstance, IDS_IMPORT_WIZARD, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_IMPORT_WIZARD, title, ARRAY_SIZE(title)); pTitle = title; } - LoadStringW(hInstance, IDS_IMPORT_OPEN_FAILED, error, - sizeof(error) / sizeof(error[0])); + LoadStringW(hInstance, IDS_IMPORT_OPEN_FAILED, error, ARRAY_SIZE(error)); FormatMessageW( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), 0, (LPWSTR) &msgBuf, 0, NULL); @@ -5127,7 +5098,7 @@ static LRESULT CALLBACK import_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, ofn.hwndOwner = hwnd; ofn.lpstrFilter = make_import_file_filter(data->dwFlags); ofn.lpstrFile = fileBuf; - ofn.nMaxFile = sizeof(fileBuf) / sizeof(fileBuf[0]); + ofn.nMaxFile = ARRAY_SIZE(fileBuf); fileBuf[0] = 0; if (GetOpenFileNameW(&ofn)) SendMessageW(GetDlgItem(hwnd, IDC_IMPORT_FILENAME), WM_SETTEXT, @@ -5173,8 +5144,7 @@ static LRESULT CALLBACK import_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, EnableWindow(GetDlgItem(hwnd, IDC_IMPORT_BROWSE_STORE), TRUE); EnableWindow(GetDlgItem(hwnd, IDC_IMPORT_SPECIFY_STORE), !(data->dwFlags & CRYPTUI_WIZ_IMPORT_NO_CHANGE_DEST_STORE)); - LoadStringW(hInstance, IDS_IMPORT_DEST_DETERMINED, - storeTitle, sizeof(storeTitle) / sizeof(storeTitle[0])); + LoadStringW(hInstance, IDS_IMPORT_DEST_DETERMINED, storeTitle, ARRAY_SIZE(storeTitle)); SendMessageW(GetDlgItem(hwnd, IDC_IMPORT_STORE), WM_SETTEXT, 0, (LPARAM)storeTitle); } @@ -5242,8 +5212,8 @@ static LRESULT CALLBACK import_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, { WCHAR storeTitle[MAX_STRING_LEN]; - LoadStringW(hInstance, IDS_IMPORT_DEST_DETERMINED, - storeTitle, sizeof(storeTitle) / sizeof(storeTitle[0])); + LoadStringW(hInstance, IDS_IMPORT_DEST_DETERMINED, storeTitle, + ARRAY_SIZE(storeTitle)); SendMessageW(GetDlgItem(hwnd, IDC_IMPORT_STORE), WM_SETTEXT, 0, (LPARAM)storeTitle); data->hDestCertStore = store; @@ -5266,22 +5236,18 @@ static void show_import_details(HWND lv, struct ImportWizData *data) item.mask = LVIF_TEXT; item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); item.iSubItem = 0; - LoadStringW(hInstance, IDS_IMPORT_STORE_SELECTION, text, - sizeof(text)/ sizeof(text[0])); + LoadStringW(hInstance, IDS_IMPORT_STORE_SELECTION, text, ARRAY_SIZE(text)); item.pszText = text; SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); item.iSubItem = 1; if (data->autoDest) - LoadStringW(hInstance, IDS_IMPORT_DEST_AUTOMATIC, text, - sizeof(text)/ sizeof(text[0])); + LoadStringW(hInstance, IDS_IMPORT_DEST_AUTOMATIC, text, ARRAY_SIZE(text)); else - LoadStringW(hInstance, IDS_IMPORT_DEST_DETERMINED, text, - sizeof(text)/ sizeof(text[0])); + LoadStringW(hInstance, IDS_IMPORT_DEST_DETERMINED, text, ARRAY_SIZE(text)); SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); item.iSubItem = 0; - LoadStringW(hInstance, IDS_IMPORT_CONTENT, text, - sizeof(text)/ sizeof(text[0])); + LoadStringW(hInstance, IDS_IMPORT_CONTENT, text, ARRAY_SIZE(text)); SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); switch (data->contentType) { @@ -5307,15 +5273,14 @@ static void show_import_details(HWND lv, struct ImportWizData *data) contentID = IDS_IMPORT_CONTENT_STORE; break; } - LoadStringW(hInstance, contentID, text, sizeof(text)/ sizeof(text[0])); + LoadStringW(hInstance, contentID, text, ARRAY_SIZE(text)); item.iSubItem = 1; SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); if (data->fileName) { item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); item.iSubItem = 0; - LoadStringW(hInstance, IDS_IMPORT_FILE, text, - sizeof(text)/ sizeof(text[0])); + LoadStringW(hInstance, IDS_IMPORT_FILE, text, ARRAY_SIZE(text)); SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); item.iSubItem = 1; item.pszText = data->fileName; @@ -5422,12 +5387,10 @@ static LRESULT CALLBACK import_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, pTitle = data->pwszWizardTitle; else { - LoadStringW(hInstance, IDS_IMPORT_WIZARD, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_IMPORT_WIZARD, title, ARRAY_SIZE(title)); pTitle = title; } - LoadStringW(hInstance, IDS_IMPORT_SUCCEEDED, message, - sizeof(message) / sizeof(message[0])); + LoadStringW(hInstance, IDS_IMPORT_SUCCEEDED, message, ARRAY_SIZE(message)); MessageBoxW(hwnd, message, pTitle, MB_OK); } else @@ -5617,8 +5580,7 @@ static LRESULT CALLBACK export_welcome_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, int height; data = (struct ExportWizData *)page->lParam; - LoadStringW(hInstance, IDS_WIZARD_TITLE_FONT, fontFace, - sizeof(fontFace) / sizeof(fontFace[0])); + LoadStringW(hInstance, IDS_WIZARD_TITLE_FONT, fontFace, ARRAY_SIZE(fontFace)); height = -MulDiv(12, GetDeviceCaps(hDC, LOGPIXELSY), 72); data->titleFont = CreateFontW(height, 0, 0, 0, FW_BOLD, 0, 0, 0, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, @@ -5733,8 +5695,7 @@ static LRESULT CALLBACK export_private_key_dlg_proc(HWND hwnd, UINT msg, { WCHAR error[MAX_STRING_LEN]; - LoadStringW(hInstance, errorID, error, - sizeof(error) / sizeof(error[0])); + LoadStringW(hInstance, errorID, error, ARRAY_SIZE(error)); SendMessageW(GetDlgItem(hwnd, IDC_EXPORT_PRIVATE_KEY_UNAVAILABLE), WM_SETTEXT, 0, (LPARAM)error); EnableWindow(GetDlgItem(hwnd, IDC_EXPORT_PRIVATE_KEY_YES), FALSE); @@ -5948,12 +5909,10 @@ static void export_password_mismatch(HWND hwnd, const struct ExportWizData *data pTitle = data->pwszWizardTitle; else { - LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, ARRAY_SIZE(title)); pTitle = title; } - LoadStringW(hInstance, IDS_EXPORT_PASSWORD_MISMATCH, error, - sizeof(error) / sizeof(error[0])); + LoadStringW(hInstance, IDS_EXPORT_PASSWORD_MISMATCH, error, ARRAY_SIZE(error)); MessageBoxW(hwnd, error, pTitle, MB_ICONERROR | MB_OK); SetFocus(GetDlgItem(hwnd, IDC_EXPORT_PASSWORD)); } @@ -6113,12 +6072,10 @@ static BOOL export_validate_filename(HWND hwnd, struct ExportWizData *data, pTitle = data->pwszWizardTitle; else { - LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, ARRAY_SIZE(title)); pTitle = title; } - LoadStringW(hInstance, IDS_EXPORT_FILE_EXISTS, warning, - sizeof(warning) / sizeof(warning[0])); + LoadStringW(hInstance, IDS_EXPORT_FILE_EXISTS, warning, ARRAY_SIZE(warning)); if (MessageBoxW(hwnd, warning, pTitle, MB_YESNO) == IDYES) forceCreate = TRUE; else @@ -6146,12 +6103,10 @@ static BOOL export_validate_filename(HWND hwnd, struct ExportWizData *data, pTitle = data->pwszWizardTitle; else { - LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, ARRAY_SIZE(title)); pTitle = title; } - LoadStringW(hInstance, IDS_IMPORT_OPEN_FAILED, error, - sizeof(error) / sizeof(error[0])); + LoadStringW(hInstance, IDS_IMPORT_OPEN_FAILED, error, ARRAY_SIZE(error)); FormatMessageW( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), 0, (LPWSTR) &msgBuf, 0, NULL); @@ -6300,12 +6255,10 @@ static LRESULT CALLBACK export_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, pTitle = data->pwszWizardTitle; else { - LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, ARRAY_SIZE(title)); pTitle = title; } - LoadStringW(hInstance, IDS_IMPORT_EMPTY_FILE, error, - sizeof(error) / sizeof(error[0])); + LoadStringW(hInstance, IDS_IMPORT_EMPTY_FILE, error, ARRAY_SIZE(error)); MessageBoxW(hwnd, error, pTitle, MB_ICONERROR | MB_OK); SetWindowLongPtrW(hwnd, DWLP_MSGRESULT, 1); ret = 1; @@ -6356,7 +6309,7 @@ static LRESULT CALLBACK export_file_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, data->contextInfo.dwExportFormat, data->exportInfo.dwSubjectChoice); ofn.lpstrFile = fileBuf; - ofn.nMaxFile = sizeof(fileBuf) / sizeof(fileBuf[0]); + ofn.nMaxFile = ARRAY_SIZE(fileBuf); fileBuf[0] = 0; if (GetSaveFileNameW(&ofn)) SendMessageW(GetDlgItem(hwnd, IDC_EXPORT_FILENAME), WM_SETTEXT, @@ -6381,8 +6334,7 @@ static void show_export_details(HWND lv, const struct ExportWizData *data) { item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); item.iSubItem = 0; - LoadStringW(hInstance, IDS_IMPORT_FILE, text, - sizeof(text)/ sizeof(text[0])); + LoadStringW(hInstance, IDS_IMPORT_FILE, text, ARRAY_SIZE(text)); item.pszText = text; SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); item.iSubItem = 1; @@ -6403,32 +6355,27 @@ static void show_export_details(HWND lv, const struct ExportWizData *data) { item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); item.iSubItem = 0; - LoadStringW(hInstance, IDS_EXPORT_INCLUDE_CHAIN, text, - sizeof(text) / sizeof(text[0])); + LoadStringW(hInstance, IDS_EXPORT_INCLUDE_CHAIN, text, ARRAY_SIZE(text)); SendMessageW(lv, LVM_INSERTITEMW, item.iItem, (LPARAM)&item); item.iSubItem = 1; - LoadStringW(hInstance, - data->contextInfo.fExportChain ? IDS_YES : IDS_NO, text, - sizeof(text) / sizeof(text[0])); + LoadStringW(hInstance, data->contextInfo.fExportChain ? IDS_YES : IDS_NO, text, + ARRAY_SIZE(text)); SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); item.iSubItem = 0; - LoadStringW(hInstance, IDS_EXPORT_KEYS, text, - sizeof(text) / sizeof(text[0])); + LoadStringW(hInstance, IDS_EXPORT_KEYS, text, ARRAY_SIZE(text)); SendMessageW(lv, LVM_INSERTITEMW, item.iItem, (LPARAM)&item); item.iSubItem = 1; - LoadStringW(hInstance, - data->contextInfo.fExportPrivateKeys ? IDS_YES : IDS_NO, text, - sizeof(text) / sizeof(text[0])); + LoadStringW(hInstance, data->contextInfo.fExportPrivateKeys ? IDS_YES : IDS_NO, text, + ARRAY_SIZE(text)); SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); } } item.iItem = SendMessageW(lv, LVM_GETITEMCOUNT, 0, 0); item.iSubItem = 0; - LoadStringW(hInstance, IDS_EXPORT_FORMAT, text, - sizeof(text)/ sizeof(text[0])); + LoadStringW(hInstance, IDS_EXPORT_FORMAT, text, ARRAY_SIZE(text)); SendMessageW(lv, LVM_INSERTITEMW, 0, (LPARAM)&item); item.iSubItem = 1; @@ -6459,7 +6406,7 @@ static void show_export_details(HWND lv, const struct ExportWizData *data) contentID = IDS_EXPORT_FILTER_CERT; } } - LoadStringW(hInstance, contentID, text, sizeof(text) / sizeof(text[0])); + LoadStringW(hInstance, contentID, text, ARRAY_SIZE(text)); SendMessageW(lv, LVM_SETITEMTEXTW, item.iItem, (LPARAM)&item); } @@ -6831,12 +6778,10 @@ static LRESULT CALLBACK export_finish_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, pTitle = data->pwszWizardTitle; else { - LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, - sizeof(title) / sizeof(title[0])); + LoadStringW(hInstance, IDS_EXPORT_WIZARD, title, ARRAY_SIZE(title)); pTitle = title; } - LoadStringW(hInstance, messageID, message, - sizeof(message) / sizeof(message[0])); + LoadStringW(hInstance, messageID, message, ARRAY_SIZE(message)); MessageBoxW(hwnd, message, pTitle, mbFlags); break; } -- 2.14.4

1 0

[PATCH 6/6 v2] ucrtbase: Implement quick_exit and _crt_at_quick_exit
by Piotr Caban 09 Jul '18

09 Jul '18

From: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/exit.c | 12 +++++-- dlls/ucrtbase/tests/misc.c | 85 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 93 insertions(+), 4 deletions(-)

1 0

[PATCH 5/6 v2] ucrtbase: Add quick_exit.
by Piotr Caban 09 Jul '18

09 Jul '18

From: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcrt/exit.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-)

1 0

[PATCH 4/6 v2] ucrtbase: Add _crt_at_quick_exit stub.
by Piotr Caban 09 Jul '18

09 Jul '18

From: Fabian Maurer <dark.shadow4(a)web.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45295 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcrt/exit.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-)

1 0

[PATCH 3/6 v2] msvcrt: Use cdecl calling convention for atexit callback.
by Piotr Caban 09 Jul '18

09 Jul '18

From: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/exit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 2/6 v2] ucrtbase: Report child process test failures in exit() tests.
by Piotr Caban 09 Jul '18

09 Jul '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ucrtbase/tests/misc.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-)

1 0

[PATCH 1/6 v2] ucrtbase: Test child process exit code.
by Piotr Caban 09 Jul '18

09 Jul '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - removed _crt_at_quick_exit(NULL) test because its behavior is inconsistent dlls/ucrtbase/tests/misc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)

1 0

[PATCH 6/6] ucrtbase: Implement quick_exit and _crt_at_quick_exit
by Piotr Caban 09 Jul '18

09 Jul '18

From: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/exit.c | 16 +++++++-- dlls/ucrtbase/tests/misc.c | 86 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 98 insertions(+), 4 deletions(-)

2 1

[PATCH 5/6] ucrtbase: Add quick_exit.
by Piotr Caban 09 Jul '18

09 Jul '18

From: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcrt/exit.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-)

1 0

[PATCH 4/6] ucrtbase: Add _crt_at_quick_exit stub.
by Piotr Caban 09 Jul '18

09 Jul '18

From: Fabian Maurer <dark.shadow4(a)web.de> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45295 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 2 +- dlls/msvcrt/exit.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-)

1 0

[PATCH 3/6] msvcrt: Use cdecl calling convention for atexit callback.
by Piotr Caban 09 Jul '18

09 Jul '18

From: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/exit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 2/6] ucrtbase: Report child process test failures in exit() tests.
by Piotr Caban 09 Jul '18

09 Jul '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ucrtbase/tests/misc.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-)

1 0

[PATCH 1/6] ucrtbase: Test child process exit code.
by Piotr Caban 09 Jul '18

09 Jul '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ucrtbase/tests/misc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)

1 0

[PATCH 4/4] oleaut32/tests: Add tests for IPicture::get_hPal() and IPicture::set_hPal().
by Dmitry Timoshkov 09 Jul '18

09 Jul '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/oleaut32/tests/olepicture.c | 109 +++++++++++++++++++++++++++---- 1 file changed, 97 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index 50ba7652d8..f3bef5850d 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -539,12 +539,61 @@ static void test_Invoke(void) IPictureDisp_Release(picdisp); } +static HRESULT create_picture(short type, IPicture **pict) +{ + PICTDESC desc; + + desc.cbSizeofstruct = sizeof(desc); + desc.picType = type; + + switch (type) + { + case PICTYPE_UNINITIALIZED: + return OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void **)pict); + + case PICTYPE_NONE: + break; + + case PICTYPE_BITMAP: + desc.u.bmp.hbitmap = CreateBitmap(1, 1, 1, 1, NULL); + desc.u.bmp.hpal = (HPALETTE)0xbeefdead; + break; + + case PICTYPE_ICON: + desc.u.icon.hicon = LoadIconA(NULL, (LPCSTR)IDI_APPLICATION); + break; + + case PICTYPE_METAFILE: + { + HDC hdc = CreateMetaFileA(NULL); + desc.u.wmf.hmeta = CloseMetaFile(hdc); + desc.u.wmf.xExt = 1; + desc.u.wmf.yExt = 1; + break; + } + + case PICTYPE_ENHMETAFILE: + { + HDC hdc = CreateEnhMetaFileA(0, NULL, NULL, NULL); + desc.u.emf.hemf = CloseEnhMetaFile(hdc); + break; + } + + default: + ok(0, "picture type %d is not supported\n", type); + return E_NOTIMPL; + } + + return OleCreatePictureIndirect(&desc, &IID_IPicture, TRUE, (void **)pict); +} + static void test_OleCreatePictureIndirect(void) { + PICTDESC desc; OLE_HANDLE handle; IPicture *pict; HRESULT hr; - short type; + short type, i; if (0) { @@ -552,20 +601,56 @@ if (0) OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, NULL); } - hr = OleCreatePictureIndirect(NULL, &IID_IPicture, TRUE, (void**)&pict); - ok(hr == S_OK, "hr %08x\n", hr); + desc.cbSizeofstruct = sizeof(desc); + desc.picType = PICTYPE_UNINITIALIZED; + pict = (void *)0xdeadbeef; + hr = OleCreatePictureIndirect(&desc, &IID_IPicture, TRUE, (void **)&pict); + ok(hr == E_UNEXPECTED, "got %#x\n", hr); + ok(pict == NULL, "got %p\n", pict); - type = PICTYPE_NONE; - hr = IPicture_get_Type(pict, &type); - ok(hr == S_OK, "hr %08x\n", hr); - ok(type == PICTYPE_UNINITIALIZED, "type %d\n", type); + for (i = PICTYPE_UNINITIALIZED; i <= PICTYPE_ENHMETAFILE; i++) + { + hr = create_picture(i, &pict); + ok(hr == S_OK, "%d: got %#x\n", i, hr); + + type = 0xdead; + hr = IPicture_get_Type(pict, &type); + ok(hr == S_OK, "%d: got %#x\n", i, hr); + ok(type == i, "%d: got %d\n", i, type); + + handle = 0xdeadbeef; + hr = IPicture_get_Handle(pict, &handle); + ok(hr == S_OK, "%d: got %#x\n", i, hr); + if (type == PICTYPE_UNINITIALIZED || type == PICTYPE_NONE) + ok(handle == 0, "%d: got %#x\n", i, handle); + else + ok(handle != 0 && handle != 0xdeadbeef, "%d: got %#x\n", i, handle); + + handle = 0xdeadbeef; + hr = IPicture_get_hPal(pict, &handle); + if (type == PICTYPE_BITMAP) + { + ok(hr == S_OK, "%d: got %#x\n", i, hr); + ok(handle == 0xbeefdead, "%d: got %#x\n", i, handle); + } + else + { + ok(hr == E_FAIL, "%d: got %#x\n", i, hr); +#ifdef _WIN64 + ok(handle == 0, "%d: got %#x\n", i, handle); +#else + ok(handle == 0xdeadbeef, "%d: got %#x\n", i, handle); +#endif + } - handle = 0xdeadbeef; - hr = IPicture_get_Handle(pict, &handle); - ok(hr == S_OK, "hr %08x\n", hr); - ok(handle == 0, "handle %08x\n", handle); + hr = IPicture_set_hPal(pict, (OLE_HANDLE)GetStockObject(DEFAULT_PALETTE)); + if (type == PICTYPE_BITMAP) + ok(hr == S_OK, "%d: got %#x\n", i, hr); + else + ok(hr == E_FAIL, "%d: got %#x\n", i, hr); - IPicture_Release(pict); + IPicture_Release(pict); + } } static void test_apm(void) -- 2.17.1

2 3

[PATCH 5/5] winmm: Support TIME_MIDI position in MIDI stream.
by Akihiro Sagawa 09 Jul '18

09 Jul '18

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/midi.c | 4 ++-- dlls/winmm/winmm.c | 19 ++++++++++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-)

2 1

[PATCH 2/5] winmm: Preserve fractions in microseconds to compensate rounding errors.
by Akihiro Sagawa 09 Jul '18

09 Jul '18

Otherwise, a song is played faster than expected in some cases. For instance, we assume that 40 pan control change (CC#10) messages are expressed in 12.5ms each, * Prior art omits fractions, i.e. 12ms + 12ms + ... = 480ms. * Proposal technique saves fractions, i.e. 12ms + 13ms + ... = 500ms. Ideal duration is 500ms. So, the proposed method is better than prior one. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/winmm.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel