March 2021 - Wine-commits - list.winehq.org

Francois Gouget : testbot/LogUtils: Fix handling of subtest lines.
by Alexandre Julliard 05 Mar '21

05 Mar '21

Module: tools Branch: master Commit: 82887dfa34ed1d8ee3653955afef82ac5c39a863 URL: https://source.winehq.org/git/tools.git/?a=commit;h=82887dfa34ed1d8ee365395… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Mar 5 12:20:20 2021 +0100 testbot/LogUtils: Fix handling of subtest lines. Add support for garbled subtest lines. Let _CheckUnit() issue an error if they are misplaced. This also ensure the error message contains all the necessary information, such as the module name. Take the subtest line into account even if it looks like it is misplaced: the _CheckUnit() error is sufficient to indicate something is wrong. Tweak the _CheckUnit() message since subtest lines are not really "messages". Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/LogUtils.pm | 19 +++++++------------ testbot/src/reporttest/report.testwtbs | 8 ++++---- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 4e9b733..ed5dd74 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -381,7 +381,7 @@ sub _CheckUnit($$$$) # Only report the first misplaced message to avoid duplicate errors. if (!$Cur->{Units}->{$Unit} and $Cur->{Unit} ne "" and !$Cur->{IsBroken}) { - _AddExtra($LogInfo, "contains a misplaced $Type message for $Unit", $Cur); + _AddExtra($LogInfo, "contains a misplaced $Type line for $Unit", $Cur); $Cur->{IsBroken} = 1; } } @@ -557,19 +557,14 @@ sub ParseWineTestReport($$$) $Cur->{GroupLineNo} = $LineNo; $Cur->{Group} = undef; } - elsif ($Line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)$/) + elsif (($Cur->{Unit} ne "" and + $Line =~ /($Cur->{UnitsRE})\.c:\d+: Subtest ([_a-z0-9]+)/) or + $Line =~ /^([_a-z0-9]+)\.c:\d+: Subtest ([_a-z0-9]+)/) { my ($Unit, $SubUnit) = ($1, $2); - if ($Cur->{Units}->{$Unit}) - { - $Cur->{Units}->{$SubUnit} = 1; - $Cur->{UnitsRE} = join("|", keys %{$Cur->{Units}}); - } - else - { - _AddExtra($LogInfo, "$Unit has a misplaced $SubUnit subtest line"); - } - $LogInfo->{IsWineTest} = 1; + _CheckUnit($LogInfo, $Cur, $Unit, "$SubUnit subtest"); + $Cur->{Units}->{$SubUnit} = 1; + $Cur->{UnitsRE} = join("|", keys %{$Cur->{Units}}); } elsif (($Cur->{Unit} ne "" and $Line =~ /($Cur->{UnitsRE})\.c:\d+: Test (?:failed|succeeded inside todo block): /) or diff --git a/testbot/src/reporttest/report.testwtbs b/testbot/src/reporttest/report.testwtbs index 27ca12f..eefbbc0 100644 --- a/testbot/src/reporttest/report.testwtbs +++ b/testbot/src/reporttest/report.testwtbs @@ -80,7 +80,7 @@ n 0 advapi32:registry has no test summary line (early exit of the main process?) n 0 advapi32:service returned success despite having failures n 0 amstream:amstream has unaccounted for failure messages n 0 amstream:amstream returned success despite having failures -n 0 atl:registrar contains a misplaced test summary message for alien +n 0 atl:registrar contains a misplaced test summary line for alien n 0 browseui:progressdlg has unaccounted for skip messages n 0 cabinet:extract is missing some skip messages n 0 cmd.exe:batch has unaccounted for todo messages @@ -90,13 +90,13 @@ n 0 comctl32:dpa returned a non-zero exit code despite reporting no failures n 0 comctl32:header returned success despite having failures n 0 comctl32:ipaddress has no done line (or it is garbled) n 0 comctl32:misc had no start line (or it is garbled) -n 0 comctl32:monthcal contains a misplaced todo message for security +n 0 comctl32:monthcal contains a misplaced todo line for security n 0 comctl32:propsheet has no test summary line (early exit of the main process?) n 0 comctl32:rebar returned success despite having failures n 0 comctl32:toolbar has no done line (or it is garbled) n 0 comctl32:treeview returned success despite having failures -n 0 comctl32:updown contains a misplaced failure message for vorlon -n 0 shadow has a misplaced black subtest line +n 0 comctl32:updown contains a misplaced failure line for vorlon +n 0 comdlg32:filedlg contains a misplaced black subtest line for shadow n 0 xmllite:writer has unaccounted for failure messages n 0 xmllite:writer returned success despite having failures ----- TestWTBS -----

1 0

Zhiyi Zhang : comctl32/toolbar: Use correct state id for checked items.
by Alexandre Julliard 04 Mar '21

04 Mar '21

Module: wine Branch: master Commit: bde397d220861bf6d844121cc55b5b796d42e5c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bde397d220861bf6d844121c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 4 16:47:44 2021 +0800 comctl32/toolbar: Use correct state id for checked items. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/toolbar.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 248541aab2e..667a2f4c277 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1078,7 +1078,7 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, else if (tbcd.nmcd.uItemState & CDIS_SELECTED) stateId = TS_PRESSED; else if (tbcd.nmcd.uItemState & CDIS_CHECKED) - stateId = (tbcd.nmcd.uItemState & CDIS_HOT) ? TS_HOTCHECKED : TS_HOT; + stateId = (tbcd.nmcd.uItemState & CDIS_HOT) ? TS_HOTCHECKED : TS_CHECKED; else if ((tbcd.nmcd.uItemState & CDIS_HOT) || (drawSepDropDownArrow && btnPtr->bDropDownPressed)) stateId = TS_HOT; @@ -1099,7 +1099,7 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, else if (btnPtr->bDropDownPressed || (tbcd.nmcd.uItemState & CDIS_SELECTED)) stateId = TS_PRESSED; else if (tbcd.nmcd.uItemState & CDIS_CHECKED) - stateId = (tbcd.nmcd.uItemState & CDIS_HOT) ? TS_HOTCHECKED : TS_HOT; + stateId = (tbcd.nmcd.uItemState & CDIS_HOT) ? TS_HOTCHECKED : TS_CHECKED; else if (tbcd.nmcd.uItemState & CDIS_HOT) stateId = TS_HOT;

1 0

Zhiyi Zhang : comctl32/trackbar: Use correct state id for the focused thumb.
by Alexandre Julliard 04 Mar '21

04 Mar '21

Module: wine Branch: master Commit: 52cdd22b529e3e452f9396dfaea3001ec4827032 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52cdd22b529e3e452f9396df… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 4 16:47:53 2021 +0800 comctl32/trackbar: Use correct state id for the focused thumb. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/trackbar.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index 353e359111f..66522fd8582 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -717,6 +717,8 @@ TRACKBAR_DrawThumb (TRACKBAR_INFO *infoPtr, HDC hdc) stateId = TUS_PRESSED; else if (infoPtr->flags & TB_THUMB_HOT) stateId = TUS_HOT; + else if (infoPtr->flags & TB_IS_FOCUSED) + stateId = TUS_FOCUSED; else stateId = TUS_NORMAL;

1 0

Rémi Bernon : user32: Only get input codepage when needed.
by Alexandre Julliard 04 Mar '21

04 Mar '21

Module: wine Branch: master Commit: cd1b87cd6696451ca98393ac3eb4a214d0e8e9b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd1b87cd6696451ca98393ac… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 4 09:42:27 2021 +0100 user32: Only get input codepage when needed. Calling get_input_codepage involves doing quite a lot of things, and doing it for every message type, when it's not needed, is inefficient. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index f7ce262f90d..def59998a52 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -602,7 +602,7 @@ BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping { char ch[2]; WCHAR wch[2]; - DWORD cp = get_input_codepage(); + DWORD cp; wch[0] = wch[1] = 0; switch(message) @@ -616,6 +616,7 @@ BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping { struct wm_char_mapping_data *data = get_user_thread_info()->wmchar_data; BYTE low = LOBYTE(*wparam); + cp = get_input_codepage(); if (HIBYTE(*wparam)) { @@ -662,12 +663,14 @@ BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping case WM_SYSCHAR: case WM_SYSDEADCHAR: case WM_MENUCHAR: + cp = get_input_codepage(); ch[0] = LOBYTE(*wparam); ch[1] = HIBYTE(*wparam); MultiByteToWideChar( cp, 0, ch, 2, wch, 2 ); *wparam = MAKEWPARAM(wch[0], wch[1]); break; case WM_IME_CHAR: + cp = get_input_codepage(); ch[0] = HIBYTE(*wparam); ch[1] = LOBYTE(*wparam); if (ch[0]) MultiByteToWideChar( cp, 0, ch, 2, wch, 2 ); @@ -689,13 +692,14 @@ static void map_wparam_WtoA( MSG *msg, BOOL remove ) BYTE ch[4]; WCHAR wch[2]; DWORD len; - DWORD cp = get_input_codepage(); + DWORD cp; switch(msg->message) { case WM_CHAR: if (!HIWORD(msg->wParam)) { + cp = get_input_codepage(); wch[0] = LOWORD(msg->wParam); ch[0] = ch[1] = 0; len = WideCharToMultiByte( cp, 0, wch, 1, (LPSTR)ch, 2, NULL, NULL ); @@ -723,6 +727,7 @@ static void map_wparam_WtoA( MSG *msg, BOOL remove ) case WM_SYSCHAR: case WM_SYSDEADCHAR: case WM_MENUCHAR: + cp = get_input_codepage(); wch[0] = LOWORD(msg->wParam); wch[1] = HIWORD(msg->wParam); ch[0] = ch[1] = 0; @@ -730,6 +735,7 @@ static void map_wparam_WtoA( MSG *msg, BOOL remove ) msg->wParam = MAKEWPARAM( ch[0] | (ch[1] << 8), 0 ); break; case WM_IME_CHAR: + cp = get_input_codepage(); wch[0] = LOWORD(msg->wParam); ch[0] = ch[1] = 0; len = WideCharToMultiByte( cp, 0, wch, 1, (LPSTR)ch, 2, NULL, NULL );

1 0

Rémi Bernon : widl: Add support for WinRT regscript generation.
by Alexandre Julliard 04 Mar '21

04 Mar '21

Module: wine Branch: master Commit: 31af1aeb7895bddf59a73886b89759f76881bc9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=31af1aeb7895bddf59a73886… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Mar 4 15:02:56 2021 +0100 widl: Add support for WinRT regscript generation. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/register.c | 64 ++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 51 insertions(+), 13 deletions(-) diff --git a/tools/widl/register.c b/tools/widl/register.c index c03ab3c56b1..76bfc3c715c 100644 --- a/tools/widl/register.c +++ b/tools/widl/register.c @@ -185,6 +185,22 @@ static void write_coclasses( const statement_list_t *stmts, const typelib_t *typ } } +static void write_runtimeclasses_registry( const statement_list_t *stmts ) +{ + const statement_t *stmt; + const type_t *type; + + if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) + { + if (stmt->type != STMT_TYPE) continue; + if (type_get_type((type = stmt->u.type)) != TYPE_RUNTIMECLASS) continue; + put_str( indent, "ForceRemove %s\n", format_namespace( type->namespace, "", ".", type->name, NULL ) ); + put_str( indent++, "{\n" ); + put_str( indent, "val 'DllPath' = s '%%MODULE%%'\n" ); + put_str( --indent, "}\n" ); + } +} + static int write_progid( const type_t *class ) { const UUID *uuid = get_attrp( class->attrs, ATTR_UUID ); @@ -236,22 +252,44 @@ void write_regscript( const statement_list_t *stmts ) init_output_buffer(); - put_str( indent, "HKCR\n" ); - put_str( indent++, "{\n" ); + if (winrt_mode) + { + put_str( indent, "HKLM\n" ); + put_str( indent++, "{\n" ); + put_str( indent, "NoRemove Software\n" ); + put_str( indent++, "{\n" ); + put_str( indent, "NoRemove Microsoft\n" ); + put_str( indent++, "{\n" ); + put_str( indent, "NoRemove WindowsRuntime\n" ); + put_str( indent++, "{\n" ); + put_str( indent, "NoRemove ActivatableClassId\n" ); + put_str( indent++, "{\n" ); + write_runtimeclasses_registry( stmts ); + put_str( --indent, "}\n" ); + put_str( --indent, "}\n" ); + put_str( --indent, "}\n" ); + put_str( --indent, "}\n" ); + put_str( --indent, "}\n" ); + } + else + { + put_str( indent, "HKCR\n" ); + put_str( indent++, "{\n" ); - put_str( indent, "NoRemove Interface\n" ); - put_str( indent++, "{\n" ); - ps_factory = find_ps_factory( stmts ); - if (ps_factory) write_interfaces( stmts, ps_factory ); - put_str( --indent, "}\n" ); + put_str( indent, "NoRemove Interface\n" ); + put_str( indent++, "{\n" ); + ps_factory = find_ps_factory( stmts ); + if (ps_factory) write_interfaces( stmts, ps_factory ); + put_str( --indent, "}\n" ); - put_str( indent, "NoRemove CLSID\n" ); - put_str( indent++, "{\n" ); - write_coclasses( stmts, NULL ); - put_str( --indent, "}\n" ); + put_str( indent, "NoRemove CLSID\n" ); + put_str( indent++, "{\n" ); + write_coclasses( stmts, NULL ); + put_str( --indent, "}\n" ); - write_progids( stmts ); - put_str( --indent, "}\n" ); + write_progids( stmts ); + put_str( --indent, "}\n" ); + } if (strendswith( regscript_name, ".res" )) /* create a binary resource file */ {

1 0

Michael Müller : aclui: Add icons to the users list.
by Alexandre Julliard 04 Mar '21

04 Mar '21

Module: wine Branch: master Commit: fe7d44dfa38657bd9151a8b28592ac457e1a067a URL: https://source.winehq.org/git/wine.git/?a=commit;h=fe7d44dfa38657bd9151a8b2… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Feb 28 10:27:47 2021 -0600 aclui: Add icons to the users list. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/aclui/Makefile.in | 2 +- dlls/aclui/aclui.rc | 5 +++++ dlls/aclui/aclui_main.c | 34 +++++++++++++++++++++++++++++++++- dlls/aclui/user_icons.bmp | Bin 0 -> 2730 bytes 4 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/aclui/Makefile.in b/dlls/aclui/Makefile.in index f93e5da6c8d..1eac32f0700 100644 --- a/dlls/aclui/Makefile.in +++ b/dlls/aclui/Makefile.in @@ -1,6 +1,6 @@ MODULE = aclui.dll IMPORTLIB = aclui -IMPORTS = comctl32 user32 advapi32 +IMPORTS = comctl32 user32 advapi32 gdi32 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/aclui/aclui.rc b/dlls/aclui/aclui.rc index 5cc808811ca..1228c2ab15b 100644 --- a/dlls/aclui/aclui.rc +++ b/dlls/aclui/aclui.rc @@ -40,3 +40,8 @@ BEGIN | WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP, 5, 115, 230, 95, WS_EX_NOPARENTNOTIFY | WS_EX_CLIENTEDGE END + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +/* @makedep: user_icons.bmp */ +IDB_USER_ICONS BITMAP user_icons.bmp diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c index 199e7295adc..01e3476b97f 100644 --- a/dlls/aclui/aclui_main.c +++ b/dlls/aclui/aclui_main.c @@ -55,6 +55,7 @@ struct security_page unsigned int user_count; HWND dialog; + HIMAGELIST image_list; }; static HINSTANCE aclui_instance; @@ -110,11 +111,12 @@ static void add_user(struct security_page *page, PSID sid) user->name = name; user->sid = sid; - item.mask = LVIF_PARAM | LVIF_TEXT; + item.mask = LVIF_PARAM | LVIF_TEXT | LVIF_IMAGE; item.iItem = -1; item.iSubItem = 0; item.pszText = name; item.lParam = (LPARAM)user; + item.iImage = (sid_type == SidTypeGroup || sid_type == SidTypeWellKnownGroup) ? 0 : 1; SendMessageW(GetDlgItem(page->dialog, IDC_USERS), LVM_INSERTITEMW, 0, (LPARAM)&item); } @@ -160,6 +162,30 @@ static void init_users(struct security_page *page) } } +static HIMAGELIST create_image_list(UINT resource, UINT width, UINT height, UINT count, COLORREF mask_color) +{ + HIMAGELIST image_list; + HBITMAP image; + INT ret; + + if (!(image_list = ImageList_Create(width, height, ILC_COLOR32 | ILC_MASK, 0, count))) + return NULL; + if (!(image = LoadBitmapW(aclui_instance, MAKEINTRESOURCEW(resource)))) + { + ImageList_Destroy(image_list); + return NULL; + } + + ret = ImageList_AddMasked(image_list, image, mask_color); + DeleteObject(image); + if (ret == -1) + { + ImageList_Destroy(image_list); + return NULL; + } + return image_list; +} + static void security_page_free(struct security_page *page) { unsigned int i; @@ -169,6 +195,8 @@ static void security_page_free(struct security_page *page) free(page->users); LocalFree(page->sd); + if (page->image_list) + ImageList_Destroy(page->image_list); if (page->security) ISecurityInformation_Release(page->security); free(page); @@ -199,6 +227,10 @@ static void security_page_init_dlg(HWND hwnd, struct security_page *page) column.cx = rect.right - rect.left; SendMessageW(control, LVM_INSERTCOLUMNW, 0, (LPARAM)&column); + if (!(page->image_list = create_image_list(IDB_USER_ICONS, 18, 18, 2, RGB(255, 0, 255)))) + return; + SendMessageW(control, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)page->image_list); + init_users(page); if (page->user_count) diff --git a/dlls/aclui/user_icons.bmp b/dlls/aclui/user_icons.bmp new file mode 100644 index 00000000000..29259e2724c Binary files /dev/null and b/dlls/aclui/user_icons.bmp differ

1 0

Michael Müller : aclui: Populate the access list.
by Alexandre Julliard 04 Mar '21

04 Mar '21

1 0

Michael Müller : aclui: Implement EditSecurity().
by Alexandre Julliard 04 Mar '21

04 Mar '21

Module: wine Branch: master Commit: 7d2fb57725f396d584d477de3b5b94ada2e1ee5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d2fb57725f396d584d477de… Author: Michael Müller <michael(a)fds-team.de> Date: Sun Feb 28 10:27:49 2021 -0600 aclui: Implement EditSecurity(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/aclui/aclui_main.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/aclui/aclui_main.c b/dlls/aclui/aclui_main.c index 24fb32fdb8c..43171d70410 100644 --- a/dlls/aclui/aclui_main.c +++ b/dlls/aclui/aclui_main.c @@ -480,10 +480,32 @@ HPROPSHEETPAGE WINAPI CreateSecurityPage(ISecurityInformation *security) return ret; } -BOOL WINAPI EditSecurity(HWND owner, LPSECURITYINFO psi) +BOOL WINAPI EditSecurity(HWND owner, ISecurityInformation *security) { - FIXME("(%p, %p): stub\n", owner, psi); - return FALSE; + PROPSHEETHEADERW sheet = {0}; + HPROPSHEETPAGE pages[1]; + SI_OBJECT_INFO info; + BOOL ret; + + TRACE("(%p, %p)\n", owner, security); + + if (FAILED(ISecurityInformation_GetObjectInformation(security, &info))) + return FALSE; + if (!(pages[0] = CreateSecurityPage(security))) + return FALSE; + + sheet.dwSize = sizeof(sheet); + sheet.dwFlags = PSH_DEFAULT; + sheet.hwndParent = owner; + sheet.hInstance = aclui_instance; + sheet.pszCaption = load_formatstr(IDS_PERMISSION_FOR, info.pszObjectName); + sheet.nPages = 1; + sheet.nStartPage = 0; + sheet.phpage = pages; + + ret = PropertySheetW(&sheet) != -1; + LocalFree((void *)sheet.pszCaption); + return ret; } BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)

1 0

Paul Gofman : winex11.drv: Factor out describe_pixel_format() function.
by Alexandre Julliard 04 Mar '21

04 Mar '21

Module: wine Branch: master Commit: bfa3c9561161193424971cfbbeb4e915e96fffc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfa3c9561161193424971cfb… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Feb 24 17:04:52 2021 +0300 winex11.drv: Factor out describe_pixel_format() function. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 4a3ab31273a..373182dec44 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1533,8 +1533,7 @@ void destroy_gl_drawable( HWND hwnd ) * * Get the pixel-format descriptor associated to the given id */ -static int WINAPI glxdrv_wglDescribePixelFormat( HDC hdc, int iPixelFormat, - UINT nBytes, PIXELFORMATDESCRIPTOR *ppfd) +static int WINAPI describe_pixel_format( int iPixelFormat, PIXELFORMATDESCRIPTOR *ppfd, BOOL allow_offscreen ) { /*XVisualInfo *vis;*/ int value; @@ -1543,23 +1542,13 @@ static int WINAPI glxdrv_wglDescribePixelFormat( HDC hdc, int iPixelFormat, if (!has_opengl()) return 0; - TRACE("(%p,%d,%d,%p)\n", hdc, iPixelFormat, nBytes, ppfd); - - if (!ppfd) return nb_onscreen_formats; - /* Look for the iPixelFormat in our list of supported formats. If it is supported we get the index in the FBConfig table and the number of supported formats back */ - fmt = get_pixel_format(gdi_display, iPixelFormat, FALSE /* Offscreen */); + fmt = get_pixel_format(gdi_display, iPixelFormat, allow_offscreen); if (!fmt) { WARN("unexpected format %d\n", iPixelFormat); return 0; } - if (nBytes < sizeof(PIXELFORMATDESCRIPTOR)) { - ERR("Wrong structure size !\n"); - /* Should set error */ - return 0; - } - memset(ppfd, 0, sizeof(PIXELFORMATDESCRIPTOR)); ppfd->nSize = sizeof(PIXELFORMATDESCRIPTOR); ppfd->nVersion = 1; @@ -1662,6 +1651,28 @@ static int WINAPI glxdrv_wglDescribePixelFormat( HDC hdc, int iPixelFormat, return nb_onscreen_formats; } +/** + * glxdrv_DescribePixelFormat + * + * Get the pixel-format descriptor associated to the given id + */ +static int WINAPI glxdrv_wglDescribePixelFormat( HDC hdc, int iPixelFormat, + UINT nBytes, PIXELFORMATDESCRIPTOR *ppfd) +{ + TRACE("(%p,%d,%d,%p)\n", hdc, iPixelFormat, nBytes, ppfd); + + if (!ppfd) return nb_onscreen_formats; + + if (nBytes < sizeof(PIXELFORMATDESCRIPTOR)) + { + ERR("Wrong structure size !\n"); + /* Should set error */ + return 0; + } + + return describe_pixel_format(iPixelFormat, ppfd, FALSE); +} + /*********************************************************************** * glxdrv_wglGetPixelFormat */

1 0

Paul Gofman : winex11.drv: Prioritize smaller depth formats when zero depth is requested in X11DRV_wglChoosePixelFormatARB().
by Alexandre Julliard 04 Mar '21

04 Mar '21

Module: wine Branch: master Commit: e392e0ac2846edc25610723c19d6a796372017e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e392e0ac2846edc25610723c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Feb 24 17:04:53 2021 +0300 winex11.drv: Prioritize smaller depth formats when zero depth is requested in X11DRV_wglChoosePixelFormatARB(). Fixes Ancient Cities' black screen on Nvidia. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/opengl32/tests/opengl.c | 57 +++++++++++++++++++++ dlls/winex11.drv/opengl.c | 116 +++++++++++++++++++++++++++++++------------ 2 files changed, 142 insertions(+), 31 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index e93636ed75e..314fa11225d 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -1764,6 +1764,62 @@ static void test_swap_control(HDC oldhdc) wglMakeCurrent(oldhdc, oldctx); } +static void test_wglChoosePixelFormatARB(HDC hdc) +{ + static int attrib_list[] = + { + WGL_DRAW_TO_WINDOW_ARB, 1, + WGL_SUPPORT_OPENGL_ARB, 1, + 0 + }; + + PIXELFORMATDESCRIPTOR fmt, last_fmt; + BYTE depth, last_depth; + UINT format_count; + int formats[1024]; + unsigned int i; + int res; + + if (!pwglChoosePixelFormatARB) + { + skip("wglChoosePixelFormatARB is not available\n"); + return; + } + + format_count = 0; + res = pwglChoosePixelFormatARB(hdc, attrib_list, NULL, ARRAY_SIZE(formats), formats, &format_count); + ok(res, "Got unexpected result %d.\n", res); + + memset(&last_fmt, 0, sizeof(last_fmt)); + last_depth = 0; + + for (i = 0; i < format_count; ++i) + { + memset(&fmt, 0, sizeof(fmt)); + if (!DescribePixelFormat(hdc, formats[i], sizeof(fmt), &fmt) + || (fmt.dwFlags & PFD_GENERIC_FORMAT)) + { + memset(&fmt, 0, sizeof(fmt)); + continue; + } + + depth = fmt.cDepthBits; + fmt.cDepthBits = 0; + fmt.cStencilBits = 0; + + if (memcmp(&fmt, &last_fmt, sizeof(fmt))) + { + last_fmt = fmt; + last_depth = depth; + } + else + { + ok(last_depth <= depth, "Got unexpected depth %u, last_depth %u, i %u, format %u.\n", + depth, last_depth, i, formats[i]); + } + } +} + START_TEST(opengl) { HWND hwnd; @@ -1858,6 +1914,7 @@ START_TEST(opengl) } test_choosepixelformat(); + test_wglChoosePixelFormatARB(hdc); test_debug_message_callback(); test_setpixelformat(hdc); test_destroy(hdc); diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 373182dec44..c44c587bf14 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -40,6 +40,7 @@ #include "x11drv.h" #include "xcomposite.h" #include "winternl.h" +#include "wine/heap.h" #include "wine/debug.h" #ifdef SONAME_LIBGL @@ -2486,6 +2487,37 @@ static BOOL X11DRV_wglSetPbufferAttribARB( struct wgl_pbuffer *object, const int return ret; } +struct choose_pixel_format_arb_format +{ + int format; + int original_index; + PIXELFORMATDESCRIPTOR pfd; + int depth, stencil; +}; + +static int compare_formats(const void *a, const void *b) +{ + /* Order formats so that onscreen formats go first. Then, if no depth bits requested, + * prioritize formats with smaller depth within the original sort order with respect to + * other attributes. */ + const struct choose_pixel_format_arb_format *fmt_a = a, *fmt_b = b; + BOOL offscreen_a, offscreen_b; + + offscreen_a = fmt_a->format > nb_onscreen_formats; + offscreen_b = fmt_b->format > nb_onscreen_formats; + + if (offscreen_a != offscreen_b) + return offscreen_a - offscreen_b; + if (memcmp(&fmt_a->pfd, &fmt_b->pfd, sizeof(fmt_a->pfd))) + return fmt_a->original_index - fmt_b->original_index; + if (fmt_a->depth != fmt_b->depth) + return fmt_a->depth - fmt_b->depth; + if (fmt_a->stencil != fmt_b->stencil) + return fmt_a->stencil - fmt_b->stencil; + + return fmt_a->original_index - fmt_b->original_index; +} + /** * X11DRV_wglChoosePixelFormatARB * @@ -2494,17 +2526,15 @@ static BOOL X11DRV_wglSetPbufferAttribARB( struct wgl_pbuffer *object, const int static BOOL X11DRV_wglChoosePixelFormatARB( HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats ) { + struct choose_pixel_format_arb_format *formats; + int it, i, format_count; + BYTE depth_bits = 0; + GLXFBConfig* cfgs; + DWORD dwFlags = 0; int attribs[256]; int nAttribs = 0; - GLXFBConfig* cfgs; int nCfgs = 0; - int it; int fmt_id; - int start, end; - UINT pfmt_it = 0; - int run; - int i; - DWORD dwFlags = 0; TRACE("(%p, %p, %p, %d, %p, %p): hackish\n", hdc, piAttribIList, pfAttribFList, nMaxFormats, piFormats, nNumFormats); if (NULL != pfAttribFList) { @@ -2548,6 +2578,10 @@ static BOOL X11DRV_wglChoosePixelFormatARB( HDC hdc, const int *piAttribIList, c if(piAttribIList[i+1]) dwFlags |= PFD_SUPPORT_GDI; break; + case WGL_DEPTH_BITS_ARB: + depth_bits = piAttribIList[i+1]; + break; + } } @@ -2558,37 +2592,57 @@ static BOOL X11DRV_wglChoosePixelFormatARB( HDC hdc, const int *piAttribIList, c return GL_FALSE; } - /* Loop through all matching formats and check if they are suitable. - * Note that this function should at max return nMaxFormats different formats */ - for(run=0; run < 2; run++) + if (!(formats = heap_alloc(nCfgs * sizeof(*formats)))) + { + ERR("No memory.\n"); + XFree(cfgs); + return GL_FALSE; + } + + format_count = 0; + for (it = 0; it < nCfgs; ++it) { - for (it = 0; it < nCfgs && pfmt_it < nMaxFormats; ++it) + struct choose_pixel_format_arb_format *format; + + if (pglXGetFBConfigAttrib(gdi_display, cfgs[it], GLX_FBCONFIG_ID, &fmt_id)) { - if (pglXGetFBConfigAttrib(gdi_display, cfgs[it], GLX_FBCONFIG_ID, &fmt_id)) - { - ERR("Failed to retrieve FBCONFIG_ID from GLXFBConfig, expect problems.\n"); - continue; - } + ERR("Failed to retrieve FBCONFIG_ID from GLXFBConfig, expect problems.\n"); + continue; + } - /* During the first run we only want onscreen formats and during the second only offscreen */ - start = run == 1 ? nb_onscreen_formats : 0; - end = run == 1 ? nb_pixel_formats : nb_onscreen_formats; + for (i = 0; i < nb_pixel_formats; ++i) + if (pixel_formats[i].fmt_id == fmt_id) + break; - for (i = start; i < end; i++) - { - if (pixel_formats[i].fmt_id == fmt_id && (pixel_formats[i].dwFlags & dwFlags) == dwFlags) - { - piFormats[pfmt_it++] = i + 1; - TRACE("at %d/%d found FBCONFIG_ID 0x%x (%d)\n", - it + 1, nCfgs, fmt_id, i + 1); - break; - } - } + if (i == nb_pixel_formats) + continue; + + format = &formats[format_count]; + format->format = i + 1; + format->original_index = it; + + memset(&format->pfd, 0, sizeof(format->pfd)); + if (!describe_pixel_format(format->format, &format->pfd, TRUE)) + ERR("describe_pixel_format failed, format %d.\n", format->format); + + format->depth = format->pfd.cDepthBits; + format->stencil = format->pfd.cStencilBits; + if (!depth_bits && !(format->pfd.dwFlags & PFD_GENERIC_FORMAT)) + { + format->pfd.cDepthBits = 0; + format->pfd.cStencilBits = 0; } + + ++format_count; } - *nNumFormats = pfmt_it; - /** free list */ + qsort(formats, format_count, sizeof(*formats), compare_formats); + + *nNumFormats = min(nMaxFormats, format_count); + for (i = 0; i < *nNumFormats; ++i) + piFormats[i] = formats[i].format; + + heap_free(formats); XFree(cfgs); return GL_TRUE; }

1 0