November 2020 - Wine-commits

Tag wine-5.0.3 : Alexandre Julliard : Release 5.0.3
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: refs/tags/wine-5.0.3 Tag: 9fe0c415c277e88623fb82e8406c37f092788aed URL: https://source.winehq.org/git/wine.git/?a=tag;h=9fe0c415c277e88623fb82e8406… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 10 20:43:43 2020 +0100 Release 5.0.3

1 0

Louis Lenders : where.exe: Add stub program.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 36d9aa31c1b5a8f9e415e9a12e5c754bbe1a397b URL: https://source.winehq.org/git/wine.git/?a=commit;h=36d9aa31c1b5a8f9e415e9a1… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Jul 1 13:58:01 2020 +0200 where.exe: Add stub program. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49460 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 10b17932fa829fac10a5e6717d96ed5d56de80fe) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + programs/where/Makefile.in | 6 ++++++ programs/where/main.c | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 42 insertions(+) diff --git a/configure b/configure index 454cf7b4d35..8ae79bf336d 100755 --- a/configure +++ b/configure @@ -1785,6 +1785,7 @@ enable_uninstaller enable_unlodctr enable_view enable_wevtutil +enable_where enable_whoami enable_wineboot enable_winebrowser @@ -21149,6 +21150,7 @@ wine_fn_config_makefile programs/uninstaller enable_uninstaller wine_fn_config_makefile programs/unlodctr enable_unlodctr wine_fn_config_makefile programs/view enable_view wine_fn_config_makefile programs/wevtutil enable_wevtutil +wine_fn_config_makefile programs/where enable_where wine_fn_config_makefile programs/whoami enable_whoami wine_fn_config_makefile programs/wineboot enable_wineboot wine_fn_config_makefile programs/winebrowser enable_winebrowser diff --git a/configure.ac b/configure.ac index abcaaa50f78..6a28988a542 100644 --- a/configure.ac +++ b/configure.ac @@ -3959,6 +3959,7 @@ WINE_CONFIG_MAKEFILE(programs/uninstaller) WINE_CONFIG_MAKEFILE(programs/unlodctr) WINE_CONFIG_MAKEFILE(programs/view) WINE_CONFIG_MAKEFILE(programs/wevtutil) +WINE_CONFIG_MAKEFILE(programs/where) WINE_CONFIG_MAKEFILE(programs/whoami) WINE_CONFIG_MAKEFILE(programs/wineboot) WINE_CONFIG_MAKEFILE(programs/winebrowser) diff --git a/programs/where/Makefile.in b/programs/where/Makefile.in new file mode 100644 index 00000000000..109261c379a --- /dev/null +++ b/programs/where/Makefile.in @@ -0,0 +1,6 @@ +MODULE = where.exe + +EXTRADLLFLAGS = -mconsole -municode -mno-cygwin + +C_SRCS = \ + main.c diff --git a/programs/where/main.c b/programs/where/main.c new file mode 100644 index 00000000000..6f90a222dce --- /dev/null +++ b/programs/where/main.c @@ -0,0 +1,33 @@ +/* + * Copyright 2020 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(where); + +int __cdecl wmain(int argc, WCHAR *argv[]) +{ + int i; + + WINE_FIXME("stub:"); + for (i = 0; i < argc; i++) + WINE_FIXME(" %s", wine_dbgstr_w(argv[i])); + WINE_FIXME("\n"); + + return 0; +}

1 0

Jefferson Carpenter : ntoskrnl.exe: Set reserved to 0 in pnp WM_DEVICECHANGE broadcast.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: c553517e08cdceccbc398ed547def8619935c57f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c553517e08cdceccbc398ed5… Author: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Date: Tue Jun 30 17:10:00 2020 +0000 ntoskrnl.exe: Set reserved to 0 in pnp WM_DEVICECHANGE broadcast. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49488 Signed-off-by: Jefferson Carpenter <jeffersoncarpenter2(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ab6f8ba0d1ad6d3f825f22b2153dc5969dbd97a2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ntoskrnl.exe/pnp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/pnp.c b/dlls/ntoskrnl.exe/pnp.c index 863e1d9d538..7ac351048ad 100644 --- a/dlls/ntoskrnl.exe/pnp.c +++ b/dlls/ntoskrnl.exe/pnp.c @@ -752,9 +752,10 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable if ((broadcast = heap_alloc( len ))) { - broadcast->dbcc_size = len; + broadcast->dbcc_size = len; broadcast->dbcc_devicetype = DBT_DEVTYP_DEVICEINTERFACE; - broadcast->dbcc_classguid = iface->interface_class; + broadcast->dbcc_reserved = 0; + broadcast->dbcc_classguid = iface->interface_class; lstrcpynW( broadcast->dbcc_name, name->Buffer, namelen + 1 ); BroadcastSystemMessageW( BSF_FORCEIFHUNG | BSF_QUERY, NULL, WM_DEVICECHANGE, enable ? DBT_DEVICEARRIVAL : DBT_DEVICEREMOVECOMPLETE, (LPARAM)broadcast );

1 0

Rémi Bernon : kernel32: Catch process creation breakpoint exceptions.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: cf293599e06c78607bacb547c93558f389a971b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf293599e06c78607bacb547… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 3 10:13:30 2020 +0200 kernel32: Catch process creation breakpoint exceptions. Metal Gear Solid V: Ground Zeroes attaches itself and continues this specific breakpoint with DBG_EXCEPTION_NOT_HANDLED. It crashes the child process and the game terminates. It is correct for old Windows versions, but more recent versions are apparently catching exceptions here, and the process should continue. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44127 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ceeb11d2a6545ae9db0c6825fb8d26b5cfe71889) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/kernel32/process.c | 9 +++++++++ dlls/kernel32/tests/debugger.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 58bbbac522a..ac9dd9c5b26 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -156,6 +156,15 @@ void CDECL __wine_start_process( LPTHREAD_START_ROUTINE entry, PEB *peb ) SetLastError( 0 ); /* clear error code */ if (being_debugged) DbgBreakPoint(); + } + __EXCEPT_ALL + { + /* do nothing */ + } + __ENDTRY + + __TRY + { ExitThread( call_process_entry( peb, entry )); } __EXCEPT(UnhandledExceptionFilter) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index a2b5d1f410e..d68a9e021b9 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -1059,15 +1059,46 @@ static void test_debug_children(const char *name, DWORD flag, BOOL debug_child, if (flag) { + DWORD last_thread; + next_event(&ctx, WAIT_EVENT_TIMEOUT); ok(ctx.ev.dwDebugEventCode == CREATE_PROCESS_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); ok(ctx.pid == pi.dwProcessId, "unexpected dwProcessId %x\n", ctx.ev.dwProcessId == ctx.pid); next_event(&ctx, WAIT_EVENT_TIMEOUT); ok(ctx.ev.dwDebugEventCode == LOAD_DLL_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + last_thread = ctx.ev.dwThreadId; wait_for_breakpoint(&ctx); ok(ctx.dll_cnt > 2, "dll_cnt = %d\n", ctx.dll_cnt); + + ok(ctx.ev.dwDebugEventCode == EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + ok(ctx.ev.dwThreadId == last_thread, "unexpected thread\n"); + ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionCode == EXCEPTION_BREAKPOINT, "ExceptionCode = %x\n", + ctx.ev.u.Exception.ExceptionRecord.ExceptionCode); + + /* Except for wxppro and w2008, the initial breakpoint is now somewhere else, possibly within LdrInitShimEngineDynamic, + * It's also catching exceptions and ContinueDebugEvent(DBG_EXCEPTION_NOT_HANDLED) should not crash the child now */ + if (broken(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress == pDbgBreakPoint)) + { + win_skip("Ignoring initial breakpoint address check\n"); + pass_exception = FALSE; + } + else + { + todo_wine + ok(ctx.ev.u.Exception.ExceptionRecord.ExceptionAddress != pDbgBreakPoint, "ExceptionAddress == pDbgBreakPoint\n"); + } + + if (pass_exception) + { + ret = ContinueDebugEvent(ctx.ev.dwProcessId, ctx.ev.dwThreadId, DBG_EXCEPTION_NOT_HANDLED); + ok(ret, "ContinueDebugEvent failed, last error %d.\n", GetLastError()); + ctx.ev.dwDebugEventCode = -1; + + next_event(&ctx, WAIT_EVENT_TIMEOUT); + ok(ctx.ev.dwDebugEventCode != EXCEPTION_DEBUG_EVENT, "dwDebugEventCode = %d\n", ctx.ev.dwDebugEventCode); + } } else { @@ -1478,6 +1509,7 @@ START_TEST(debugger) test_debug_children(myARGV[0], DEBUG_PROCESS|DEBUG_ONLY_THIS_PROCESS, FALSE, FALSE); test_debug_children(myARGV[0], 0, FALSE, FALSE); test_debug_children(myARGV[0], 0, FALSE, TRUE); + test_debug_children(myARGV[0], DEBUG_ONLY_THIS_PROCESS, FALSE, TRUE); test_debugger(myARGV[0]); } }

1 0

Nikolay Sivov : comctl32/listview: Rename helper argument.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: c0b3272553781c494a1267ac0922d641c2cb0c85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0b3272553781c494a1267ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 16 13:38:20 2020 +0300 comctl32/listview: Rename helper argument. Rpcndr.h defines "small" as char. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit f6802b7a318a749540e00ca4a68772cc2ac280e5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/listview.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index f1f09d201e0..1092a6ce9b0 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8740,7 +8740,7 @@ static DWORD LISTVIEW_SetIconSpacing(LISTVIEW_INFO *infoPtr, INT cx, INT cy) return oldspacing; } -static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL small) +static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL is_small) { INT cx, cy; @@ -8751,8 +8751,8 @@ static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL small) } else { - size->cx = GetSystemMetrics(small ? SM_CXSMICON : SM_CXICON); - size->cy = GetSystemMetrics(small ? SM_CYSMICON : SM_CYICON); + size->cx = GetSystemMetrics(is_small ? SM_CXSMICON : SM_CXICON); + size->cy = GetSystemMetrics(is_small ? SM_CYSMICON : SM_CYICON); } }

1 0

Nikolay Sivov : comctl32/listview: Use case-insensitive compare in LVM_FINDITEM.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: b86feadc3fd4ccf31317ab18c39b32271a4c0fd2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b86feadc3fd4ccf31317ab18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 16 13:38:21 2020 +0300 comctl32/listview: Use case-insensitive compare in LVM_FINDITEM. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ab81945d6568569ac23fad56b1bc895687feeb55) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/Makefile.in | 2 +- dlls/comctl32/listview.c | 10 +++++++--- dlls/comctl32/tests/listview.c | 13 +++++++++++++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/Makefile.in b/dlls/comctl32/Makefile.in index 9a56e36e137..9719302cde3 100644 --- a/dlls/comctl32/Makefile.in +++ b/dlls/comctl32/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_COMCTL32_ MODULE = comctl32.dll IMPORTLIB = comctl32 -IMPORTS = uuid user32 gdi32 advapi32 usp10 imm32 +IMPORTS = uuid user32 gdi32 advapi32 usp10 imm32 kernelbase DELAYIMPORTS = winmm uxtheme EXTRADLLFLAGS = -mno-cygwin diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 1092a6ce9b0..6cee291dd69 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -140,6 +140,7 @@ #include "commctrl.h" #include "comctl32.h" #include "uxtheme.h" +#include "shlwapi.h" #include "wine/debug.h" @@ -6313,6 +6314,7 @@ static INT LISTVIEW_FindItemW(const LISTVIEW_INFO *infoPtr, INT nStart, INT nItem = nStart + 1, nLast = infoPtr->nItemCount, nNearestItem = -1; ULONG xdist, ydist, dist, mindist = 0x7fffffff; POINT Position, Destination; + int search_len = 0; LVITEMW lvItem; /* Search in virtual listviews should be done by application, not by @@ -6378,6 +6380,9 @@ static INT LISTVIEW_FindItemW(const LISTVIEW_INFO *infoPtr, INT nStart, nItem = bNearest ? -1 : nStart + 1; + if (lpFindInfo->flags & (LVFI_PARTIAL | LVFI_SUBSTRING)) + search_len = lstrlenW(lpFindInfo->psz); + again: for (; nItem < nLast; nItem++) { @@ -6398,12 +6403,11 @@ again: { if (lpFindInfo->flags & (LVFI_PARTIAL | LVFI_SUBSTRING)) { - WCHAR *p = wcsstr(lvItem.pszText, lpFindInfo->psz); - if (!p || p != lvItem.pszText) continue; + if (StrCmpNIW(lvItem.pszText, lpFindInfo->psz, search_len)) continue; } else { - if (lstrcmpW(lvItem.pszText, lpFindInfo->psz) != 0) continue; + if (StrCmpIW(lvItem.pszText, lpFindInfo->psz)) continue; } } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 20b9873d30d..c19de7f03f9 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5366,6 +5366,19 @@ static void test_finditem(void) r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); expect(0, r); + /* Case sensitivity. */ + strcpy(f, "Foo"); + fi.flags = LVFI_STRING; + fi.psz = f; + r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); + ok(!r, "Unexpected item index %d.\n", r); + + strcpy(f, "F"); + fi.flags = LVFI_SUBSTRING; + fi.psz = f; + r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); + ok(!r, "Unexpected item index %d.\n", r); + DestroyWindow(hwnd); }

1 0

Nikolay Sivov : comctl32/listview: Do no alter custom draw text colors between notification stages.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 382627446a16e9ec0c6c7a00dc8854a4140f2f31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=382627446a16e9ec0c6c7a00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 21 15:00:18 2020 +0300 comctl32/listview: Do no alter custom draw text colors between notification stages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c32720349cd4a6f4c32fdcff6a4cce054fbfe33e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/listview.c | 23 +++++++++-------------- dlls/comctl32/tests/listview.c | 14 ++++---------- 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 6cee291dd69..dba16d13a4c 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1055,31 +1055,31 @@ static inline DWORD notify_customdraw (const LISTVIEW_INFO *infoPtr, DWORD dwDra return result; } -static void prepaint_setup (const LISTVIEW_INFO *infoPtr, HDC hdc, NMLVCUSTOMDRAW *lpnmlvcd, BOOL SubItem) +static void prepaint_setup (const LISTVIEW_INFO *infoPtr, HDC hdc, const NMLVCUSTOMDRAW *cd, BOOL SubItem) { COLORREF backcolor, textcolor; + backcolor = cd->clrTextBk; + textcolor = cd->clrText; + /* apparently, for selected items, we have to override the returned values */ if (!SubItem) { - if (lpnmlvcd->nmcd.uItemState & CDIS_SELECTED) + if (cd->nmcd.uItemState & CDIS_SELECTED) { if (infoPtr->bFocus) { - lpnmlvcd->clrTextBk = comctl32_color.clrHighlight; - lpnmlvcd->clrText = comctl32_color.clrHighlightText; + backcolor = comctl32_color.clrHighlight; + textcolor = comctl32_color.clrHighlightText; } else if (infoPtr->dwStyle & LVS_SHOWSELALWAYS) { - lpnmlvcd->clrTextBk = comctl32_color.clr3dFace; - lpnmlvcd->clrText = comctl32_color.clrBtnText; + backcolor = comctl32_color.clr3dFace; + textcolor = comctl32_color.clrBtnText; } } } - backcolor = lpnmlvcd->clrTextBk; - textcolor = lpnmlvcd->clrText; - if (backcolor == CLR_DEFAULT) backcolor = comctl32_color.clrWindow; if (textcolor == CLR_DEFAULT) @@ -4812,11 +4812,6 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, ITERAT if (cdsubitemmode & CDRF_NOTIFYSUBITEMDRAW) subitemstage = notify_customdraw(infoPtr, CDDS_SUBITEM | CDDS_ITEMPREPAINT, &nmlvcd); - else - { - nmlvcd.clrTextBk = infoPtr->clrTextBk; - nmlvcd.clrText = infoPtr->clrText; - } if (subitems->nItem == 0 || (cdmode & CDRF_NOTIFYITEMDRAW)) prepaint_setup(infoPtr, hdc, &nmlvcd, FALSE); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index c19de7f03f9..a9b853eda85 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1941,11 +1941,8 @@ static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT message, WPARAM wParam, LPARAM return CDRF_NOTIFYSUBITEMDRAW|CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPREPAINT | CDDS_SUBITEM: clr = GetBkColor(nmlvcd->nmcd.hdc); - todo_wine_if(showsel_always && is_selected && nmlvcd->iSubItem) - { - ok(nmlvcd->clrTextBk == CLR_DEFAULT, "Unexpected text background %#x.\n", nmlvcd->clrTextBk); - ok(nmlvcd->clrText == RGB(0, 255, 0), "Unexpected text color %#x.\n", nmlvcd->clrText); - } + ok(nmlvcd->clrTextBk == CLR_DEFAULT, "Unexpected text background %#x.\n", nmlvcd->clrTextBk); + ok(nmlvcd->clrText == RGB(0, 255, 0), "Unexpected text color %#x.\n", nmlvcd->clrText); if (showsel_always && is_selected && nmlvcd->iSubItem) ok(clr == GetSysColor(COLOR_3DFACE), "Unexpected background color %#x.\n", clr); else @@ -1962,11 +1959,8 @@ static LRESULT WINAPI cd_wndproc(HWND hwnd, UINT message, WPARAM wParam, LPARAM ok(clr == c0ffee, "Unexpected background color %#x.\n", clr); } - todo_wine_if(showsel_always) - { - ok(nmlvcd->clrTextBk == CLR_DEFAULT, "Unexpected text background color %#x.\n", nmlvcd->clrTextBk); - ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText); - } + ok(nmlvcd->clrTextBk == CLR_DEFAULT, "Unexpected text background color %#x.\n", nmlvcd->clrTextBk); + ok(nmlvcd->clrText == RGB(0, 255, 0), "got 0x%x\n", nmlvcd->clrText); return CDRF_DODEFAULT; } return CDRF_DODEFAULT;

1 0

Louis Lenders : sc.exe: Fake succes for the SdSet argument.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: cd9d439a8dea41f6555c9e4abdd78b320eaa78b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd9d439a8dea41f6555c9e4a… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Mon Jul 27 11:26:30 2020 +0200 sc.exe: Fake succes for the SdSet argument. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49620 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a22b295cc30d89e446038c4e677f8ea6fef159e1) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/sc/sc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/sc/sc.c b/programs/sc/sc.c index 1976c38a782..c9744afee36 100644 --- a/programs/sc/sc.c +++ b/programs/sc/sc.c @@ -220,6 +220,7 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) static const WCHAR deleteW[] = {'d','e','l','e','t','e',0}; static const WCHAR startW[] = {'s','t','a','r','t',0}; static const WCHAR stopW[] = {'s','t','o','p',0}; + static const WCHAR sdsetW[] = {'s','d','s','e','t',0}; SC_HANDLE manager, service; SERVICE_STATUS status; BOOL ret = FALSE; @@ -328,6 +329,11 @@ int __cdecl wmain( int argc, const WCHAR *argv[] ) } else WINE_TRACE("failed to open service %u\n", GetLastError()); } + else if (!wcsicmp( argv[1], sdsetW )) + { + WINE_FIXME("SdSet command not supported, faking success\n"); + ret = TRUE; + } else WINE_FIXME("command not supported\n");

1 0

Matteo Bruni : wined3d: Add GPU information for AMD Raven Ridge.
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 367ae2ac42b29c4d50c6717bebd1c7cb058c7716 URL: https://source.winehq.org/git/wine.git/?a=commit;h=367ae2ac42b29c4d50c6717b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 16 18:50:05 2020 +0200 wined3d: Add GPU information for AMD Raven Ridge. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 435f7fb2f2c511068b1e64c373fb0f1900ddd669) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f777a1635e7..8f21fe50c46 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -484,6 +484,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_480, "Radeon (TM) RX 480 Graphics", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_10, "Radeon RX Vega", DRIVER_AMD_RX, 8192}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_12, "Radeon Pro Vega 20", DRIVER_AMD_RX, 4096}, + {HW_VENDOR_AMD, CARD_AMD_RADEON_RAVEN, "AMD Radeon(TM) Vega 10 Mobile Graphics", DRIVER_AMD_RX, 1024}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_VEGA_20, "Radeon RX Vega 20", DRIVER_AMD_RX, 4096}, {HW_VENDOR_AMD, CARD_AMD_RADEON_RX_NAVI_10, "Radeon RX 5700 / 5700 XT", DRIVER_AMD_RX, 8192}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index acabc912bec..fb220a9b95f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2411,6 +2411,7 @@ enum wined3d_pci_device CARD_AMD_RADEON_RX_480 = 0x67df, CARD_AMD_RADEON_RX_VEGA_10 = 0x687f, CARD_AMD_RADEON_RX_VEGA_12 = 0x69af, + CARD_AMD_RADEON_RAVEN = 0x15dd, CARD_AMD_RADEON_RX_VEGA_20 = 0x66af, CARD_AMD_RADEON_RX_NAVI_10 = 0x731f,

1 0

Brendan Shanks : winevulkan: Don't initialize the Vulkan driver in DllMain().
by Alexandre Julliard 10 Nov '20

10 Nov '20

Module: wine Branch: stable Commit: 1f2416e842a25d8faf0efc3679e7348c219f5738 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f2416e842a25d8faf0efc36… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Jun 26 16:21:54 2020 -0700 winevulkan: Don't initialize the Vulkan driver in DllMain(). Fixes an issue where winevulkan would not be registered if no Vulkan driver was present during prefix creation (such as in a build VM). Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit aec196878875e92d0b404a6f982cea6667768696) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winevulkan/vulkan.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 59472bcef89..72fb622b347 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -298,7 +298,7 @@ static void wine_vk_device_free(struct VkDevice_T *device) heap_free(device); } -static BOOL wine_vk_init(void) +static BOOL WINAPI wine_vk_init(INIT_ONCE *once, void *param, void **context) { HDC hdc; @@ -306,16 +306,20 @@ static BOOL wine_vk_init(void) vk_funcs = __wine_get_vulkan_driver(hdc, WINE_VULKAN_DRIVER_VERSION); ReleaseDC(0, hdc); if (!vk_funcs) - { ERR("Failed to load Wine graphics driver supporting Vulkan.\n"); - return FALSE; - } - - p_vkEnumerateInstanceVersion = vk_funcs->p_vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"); + else + p_vkEnumerateInstanceVersion = vk_funcs->p_vkGetInstanceProcAddr(NULL, "vkEnumerateInstanceVersion"); return TRUE; } +static void wine_vk_init_once(void) +{ + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + + InitOnceExecuteOnce(&init_once, wine_vk_init, NULL, NULL); +} + /* Helper function for converting between win32 and host compatible VkInstanceCreateInfo. * This function takes care of extensions handled at winevulkan layer, a Wine graphics * driver is responsible for handling e.g. surface extensions. @@ -645,6 +649,10 @@ VkResult WINAPI wine_vkCreateInstance(const VkInstanceCreateInfo *create_info, TRACE("create_info %p, allocator %p, instance %p\n", create_info, allocator, instance); + wine_vk_init_once(); + if (!vk_funcs) + return VK_ERROR_INITIALIZATION_FAILED; + if (allocator) FIXME("Support for allocation callbacks not implemented yet\n"); @@ -771,6 +779,10 @@ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_na return VK_ERROR_LAYER_NOT_PRESENT; } + wine_vk_init_once(); + if (!vk_funcs) + return VK_ERROR_INITIALIZATION_FAILED; + res = vk_funcs->p_vkEnumerateInstanceExtensionProperties(NULL, &num_host_properties, NULL); if (res != VK_SUCCESS) return res; @@ -839,6 +851,8 @@ VkResult WINAPI wine_vkEnumerateInstanceVersion(uint32_t *version) TRACE("%p\n", version); + wine_vk_init_once(); + if (p_vkEnumerateInstanceVersion) { res = p_vkEnumerateInstanceVersion(version); @@ -1269,13 +1283,14 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved) { case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hinst); - return wine_vk_init(); + break; } return TRUE; } static const struct vulkan_func vk_global_dispatch_table[] = { + /* These functions must call wine_vk_init_once() before accessing vk_funcs. */ {"vkCreateInstance", &wine_vkCreateInstance}, {"vkEnumerateInstanceExtensionProperties", &wine_vkEnumerateInstanceExtensionProperties}, {"vkEnumerateInstanceLayerProperties", &wine_vkEnumerateInstanceLayerProperties},

1 0