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

[PATCH] vbscript: Use the ARRAY_SIZE() macro
by Michael Stefaniuc July 20, 2018

July 20, 2018

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/vbscript/global.c | 6 +++--- dlls/vbscript/lex.c | 2 +- dlls/vbscript/vbdisp.c | 4 ++-- dlls/vbscript/vbscript_main.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index a5df54acad..87adeca9bc 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -334,7 +334,7 @@ static HRESULT show_msgbox(script_ctx_t *ctx, BSTR prompt, unsigned type, BSTR o return E_OUTOFMEMORY; memcpy(title_buf, vbscriptW, sizeof(vbscriptW)); - ptr = title_buf + sizeof(vbscriptW)/sizeof(WCHAR)-1; + ptr = title_buf + ARRAY_SIZE(vbscriptW)-1; *ptr++ = ':'; *ptr++ = ' '; @@ -2446,7 +2446,7 @@ HRESULT init_global(script_ctx_t *ctx) HRESULT hres; ctx->global_desc.ctx = ctx; - ctx->global_desc.builtin_prop_cnt = sizeof(global_props)/sizeof(*global_props); + ctx->global_desc.builtin_prop_cnt = ARRAY_SIZE(global_props); ctx->global_desc.builtin_props = global_props; hres = get_typeinfo(GlobalObj_tid, &ctx->global_desc.typeinfo); @@ -2462,7 +2462,7 @@ HRESULT init_global(script_ctx_t *ctx) return hres; ctx->err_desc.ctx = ctx; - ctx->err_desc.builtin_prop_cnt = sizeof(err_props)/sizeof(*err_props); + ctx->err_desc.builtin_prop_cnt = ARRAY_SIZE(err_props); ctx->err_desc.builtin_props = err_props; hres = get_typeinfo(ErrObj_tid, &ctx->err_desc.typeinfo); diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index b0fac48cad..571854db58 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -179,7 +179,7 @@ static int check_keyword(parser_ctx_t *ctx, const WCHAR *word) static int check_keywords(parser_ctx_t *ctx) { - 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/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c index 9c0c4c1d9a..e72eadf13d 100644 --- a/dlls/vbscript/vbdisp.c +++ b/dlls/vbscript/vbdisp.c @@ -236,7 +236,7 @@ static HRESULT invoke_builtin(vbdisp_t *This, const builtin_prop_t *prop, WORD f return E_FAIL; } - assert(argn < sizeof(args)/sizeof(*args)); + assert(argn < ARRAY_SIZE(args)); for(i=0; i < argn; i++) { if(V_VT(dp->rgvarg+dp->cArgs-i-1) == (VT_BYREF|VT_VARIANT)) @@ -647,7 +647,7 @@ HRESULT create_procedure_disp(script_ctx_t *ctx, vbscode_t *code, IDispatch **re return E_OUTOFMEMORY; desc->ctx = ctx; - desc->builtin_prop_cnt = sizeof(procedure_props)/sizeof(*procedure_props); + desc->builtin_prop_cnt = ARRAY_SIZE(procedure_props); desc->builtin_props = procedure_props; desc->value_func = &code->main_code; diff --git a/dlls/vbscript/vbscript_main.c b/dlls/vbscript/vbscript_main.c index 7b7161c21e..786b7fb898 100644 --- a/dlls/vbscript/vbscript_main.c +++ b/dlls/vbscript/vbscript_main.c @@ -87,7 +87,7 @@ static void release_typelib(void) if(!typelib) return; - for(i=0; i < sizeof(typeinfos)/sizeof(*typeinfos); i++) { + for(i = 0; i < ARRAY_SIZE(typeinfos); i++) { if(typeinfos[i]) ITypeInfo_Release(typeinfos[i]); } -- 2.14.4

2 1

[PATCH] kernel32: Don't clear WINEDEBUG in the debugger process.
by Zebediah Figura July 20, 2018

July 20, 2018

While this does avoid usually undesired debug output, it also makes debugging winedbg.exe itself practically impossible. --- dlls/kernel32/except.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/except.c b/dlls/kernel32/except.c index bff8ce2..03fb46d 100644 --- a/dlls/kernel32/except.c +++ b/dlls/kernel32/except.c @@ -173,7 +173,7 @@ static BOOL start_debugger(PEXCEPTION_POINTERS epointers, HANDLE hEvent) { OBJECT_ATTRIBUTES attr; UNICODE_STRING nameW; - char *cmdline, *env, *p; + char *cmdline; HANDLE hDbgConf; DWORD bAuto = TRUE; PROCESS_INFORMATION info; @@ -287,27 +287,12 @@ static BOOL start_debugger(PEXCEPTION_POINTERS epointers, HANDLE hEvent) } } - /* make WINEDEBUG empty in the environment */ - env = GetEnvironmentStringsA(); - for (p = env; *p; p += strlen(p) + 1) - { - if (!memcmp( p, "WINEDEBUG=", sizeof("WINEDEBUG=")-1 )) - { - char *next = p + strlen(p); - char *end = next + 1; - while (*end) end += strlen(end) + 1; - memmove( p + sizeof("WINEDEBUG=") - 1, next, end + 1 - next ); - break; - } - } - TRACE("Starting debugger %s\n", debugstr_a(cmdline)); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); startup.dwFlags = STARTF_USESHOWWINDOW; startup.wShowWindow = SW_SHOWNORMAL; - ret = CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, 0, env, NULL, &startup, &info); - FreeEnvironmentStringsA( env ); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, TRUE, 0, NULL, NULL, &startup, &info); if (ret) { -- 2.7.4

1 0

[PATCH] user32: Create a mask from alpha channel when loading a 32 bpp icon. (v2)
by Dmitry Timoshkov July 20, 2018

July 20, 2018

This patch fixes an application that draws 32 bpp icons manually. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/cursoricon.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 0adb73bf56..62576a341a 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1296,6 +1296,36 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE 0, 0, bmi_width, bmi_height, mask_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); } + else + { + if (bmi_has_alpha( bmi, color_bits )) + { + unsigned char *alpha_mask_bits = HeapAlloc( GetProcessHeap(), 0, bmi_width * bmi_height * 4 ); + if (alpha_mask_bits) + { + const unsigned char *src; + unsigned char *dst; + LONG i; + + for (i = 0, src = color_bits, dst = alpha_mask_bits; i < bmi_width * bmi_height; i++, src += 4, dst += 4) + { + if (src[3] == 0xff) + dst[0] = dst[1] = dst[2] = 0; + else + dst[0] = dst[1] = dst[2] = 0xff; + + dst[3] = 0; + } + + SelectObject( hdc, mask ); + StretchDIBits( hdc, 0, 0, width, height, + 0, 0, bmi_width, bmi_height, + alpha_mask_bits, bmi, DIB_RGB_COLORS, SRCCOPY ); + + HeapFree( GetProcessHeap(), 0, alpha_mask_bits ); + } + } + } ret = TRUE; done: -- 2.17.1

1 0

[PATCH] user32: Create a mask from alpha channel when loading a 32 bpp icon.
by Dmitry Timoshkov July 20, 2018

July 20, 2018

This patch fixes an application that draws user32 icons manually: hicon = LoadImage(NULL, "oic_ques.ico", IMAGE_ICON, 256, 256, LR_LOADFROMFILE); GetIconInfo(hicon, &info); GetObject(info.hbmMask, sizeof(bm), &bm); hMemDC = CreateCompatibleDC(hdc); SelectObject(hMemDC, info.hbmColor); StretchBlt(hdc, 200, 0, 200, 200, hMemDC, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); SelectObject(hMemDC, info.hbmMask); StretchBlt(hdc, 400, 0, 200, 200, hMemDC, 0, 0, bm.bmWidth, bm.bmHeight, SRCAND); SelectObject(hMemDC, info.hbmColor); StretchBlt(hdc, 400, 0, 200, 200, hMemDC, 0, 0, bm.bmWidth, bm.bmHeight, SRCINVERT); For testing purposes I edited dlls/user32/resources/oic_ques.ico and removed everything except the 256x256 32 bpp PNG image. Then I created a test app that draws separately mask and color bitmaps from the icon info and then draws an icon using the code above. With this patch under Wine the mask and the final icon visually look similar to what I see under Windows. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/cursoricon.c | 97 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 97 insertions(+) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 0adb73bf56..c561c70364 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1131,6 +1131,93 @@ done: return alpha; } +static HBITMAP create_alpha_mask( HBITMAP color ) +{ + HBITMAP alpha; + char info_buf[sizeof(BITMAPINFO) + 256 * sizeof(RGBQUAD)]; + BITMAPINFO *info = (BITMAPINFO *)info_buf; + BITMAP bm; + HDC hdc; + void *bits; + unsigned char *ptr; + int i; + + if (!GetObjectW( color, sizeof(bm), &bm )) return 0; + if (bm.bmBitsPixel != 32) return 0; + + if (!(hdc = CreateCompatibleDC( 0 ))) return 0; + + info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + info->bmiHeader.biWidth = bm.bmWidth; + info->bmiHeader.biHeight = -bm.bmHeight; + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 32; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biSizeImage = bm.bmWidth * bm.bmHeight * 4; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + if (!(alpha = CreateDIBSection( hdc, info, DIB_RGB_COLORS, &bits, NULL, 0 ))) goto done; + + GetDIBits( hdc, color, 0, bm.bmHeight, bits, info, DIB_RGB_COLORS ); + if (!bmi_has_alpha( info, bits )) + { + DeleteObject( alpha ); + alpha = 0; + goto done; + } + + for (i = 0, ptr = bits; i < bm.bmWidth * bm.bmHeight; i++, ptr += 4) + { + if (ptr[3] == 0xff) + ptr[0] = ptr[1] = ptr[2] = 0; + else + ptr[0] = ptr[1] = ptr[2] = 0xff; + + ptr[3] = 0; + } + +done: + DeleteDC( hdc ); + return alpha; +} + +static HBITMAP create_mask_from_alpha( HBITMAP color ) +{ + BITMAP bm; + HBITMAP alpha, mask; + HDC hdc_dst, hdc_src; + + alpha = create_alpha_mask( color ); + if (!alpha) return 0; + + GetObjectW( alpha, sizeof(bm), &bm ); + + mask = CreateBitmap( bm.bmWidth, bm.bmHeight, 1, 1, NULL ); + if (!mask) return 0; + + hdc_src = CreateCompatibleDC( 0 ); + hdc_dst = CreateCompatibleDC( 0 ); + if (hdc_src && hdc_dst) + { + SelectObject( hdc_src, alpha ); + SelectObject( hdc_dst, mask ); + BitBlt( hdc_dst, 0, 0, bm.bmWidth, bm.bmHeight, hdc_src, 0, 0, SRCCOPY ); + } + else + { + DeleteObject( mask ); + mask = 0; + } + + DeleteDC( hdc_src ); + DeleteDC( hdc_dst ); + DeleteObject( alpha ); + + return mask; +} + /*********************************************************************** * create_icon_from_bmi @@ -1296,6 +1383,16 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE 0, 0, bmi_width, bmi_height, mask_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); } + else + { + HBITMAP alpha_mask = create_mask_from_alpha( color ); + + if (alpha_mask) + { + DeleteObject( mask ); + mask = alpha_mask; + } + } ret = TRUE; done: -- 2.17.1

2 1

[PATCH 1/2] testbot/WineSendLog: Replace completed with a more explicit status.
by Francois Gouget July 20, 2018

July 20, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 8885e20f3..537778a20 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -258,17 +258,18 @@ MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline -VM Status Number of test failures +VM Status Number of test failures EOF foreach my $Key (@SortedKeys) { my $StepTask = $StepsTasks->GetItem($Key); + my $TestFailures = $StepTask->TestFailures; - if (! defined($TestFailures)) - { - $TestFailures = ""; - } - printf $Sendmail "%-20s %-9s %s\n", $StepTask->VM->Name, $StepTask->Status, + $TestFailures = "" if (!defined $TestFailures); + my $Status = $StepTask->Status; + $Status = $TestFailures ? "failed" : "success" if ($Status eq "completed"); + + printf $Sendmail "%-20s %-8s %s\n", $StepTask->VM->Name, $Status, $TestFailures; } -- 2.18.0

1 1

[PATCH] testbot/WineSendLog: Sort the tasks in numeric order.
by Francois Gouget July 20, 2018

July 20, 2018

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index e2c823a91..8885e20f3 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -214,7 +214,7 @@ sub SendLog($) } my $StepsTasks = CreateStepsTasks(undef, $Job); - my @SortedKeys = sort @{$StepsTasks->GetKeys()}; + my @SortedKeys = sort { $a <=> $b } @{$StepsTasks->GetKeys()}; my $JobURL = ($UseSSL ? "https://" : "http://") . "$WebHostName/JobDetails.pl?Key=". $Job->GetKey(); -- 2.18.0

1 0

[PATCH] po: Update Russian translation.
by Nikolay Sivov July 20, 2018

July 20, 2018

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/po/ru.po b/po/ru.po index 5f9e85c44b..ad07594730 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2018-07-12 16:25+0300\n" +"PO-Revision-Date: 2018-07-20 09:26+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.0.8\n" +"X-Generator: Poedit 2.0.9\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -406,16 +406,12 @@ msgid "&Retry" msgstr "По&втор" #: comctl32.rc:62 -#, fuzzy -#| msgid "Hide &Tabs" msgid "Hide details" -msgstr "Скрыть &вкладки" +msgstr "Скрыть подробности" #: comctl32.rc:63 -#, fuzzy -#| msgid "Details" msgid "See details" -msgstr "Подробности" +msgstr "Показать подробности" #: comctl32.rc:31 cryptui.rc:230 regedit.rc:286 taskmgr.rc:434 winedbg.rc:61 #: winedbg.rc:76 wordpad.rc:180 -- 2.18.0

1 0

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras July 20, 2018

July 20, 2018

1 0

[PATCH] kerberos: SpInstanceInit() doesn't need a special implementation.
by Dmitry Timoshkov July 20, 2018

July 20, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 7d532e5e58..70895c999a 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1331,7 +1331,7 @@ NTSTATUS NTAPI SpLsaModeInitialize(ULONG lsa_version, PULONG package_version, static NTSTATUS NTAPI kerberos_SpInstanceInit(ULONG version, SECPKG_DLL_FUNCTIONS *dll_function_table, void **user_functions) { - FIXME("%u,%p,%p: stub\n", version, dll_function_table, user_functions); + TRACE("%#x,%p,%p\n", version, dll_function_table, user_functions); return STATUS_SUCCESS; } -- 2.17.1

1 0

[PATCH 8/8] comctl32/taskdialog: Fix center positioning.
by Zhiyi Zhang July 20, 2018

July 20, 2018

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 4f478d3eec..97ad825a0d 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -2,6 +2,7 @@ * Task dialog control * * Copyright 2017 Fabian Maurer + * Copyright 2018 Zhiyi Zhang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1104,8 +1105,8 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) if (first_time) { - x = (ref_rect.left + ref_rect.right + dialog_width) / 2; - y = (ref_rect.top + ref_rect.bottom + dialog_height) / 2; + x = (ref_rect.left + ref_rect.right - dialog_width) / 2; + y = (ref_rect.top + ref_rect.bottom - dialog_height) / 2; SetWindowPos(dialog_info->hwnd, 0, x, y, dialog_width, dialog_height, SWP_NOZORDER); first_time = FALSE; } -- 2.18.0

1 0