July 2020 - Wine-Commits - list.winehq.org

Nikolay Sivov : comctl32/listview: Do no alter custom draw text colors between notification stages.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: c32720349cd4a6f4c32fdcff6a4cce054fbfe33e URL: https://source.winehq.org/git/wine.git/?a=commit;h=c32720349cd4a6f4c32fdcff… 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> --- 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 6cee291dd6..dba16d13a4 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 c19de7f03f..a9b853eda8 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

Piotr Caban : msvcrt: Copy wcschr implementation from ntdll.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: 5d9d0b84655c8a400a9f7339c404842b194aa9f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d9d0b84655c8a400a9f7339… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 21 12:21:45 2020 +0200 msvcrt: Copy wcschr implementation from ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 31ec0dd33f..e193c08593 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2663,7 +2663,8 @@ int CDECL MSVCRT_towupper(MSVCRT_wint_t c) */ MSVCRT_wchar_t* CDECL MSVCRT_wcschr(const MSVCRT_wchar_t *str, MSVCRT_wchar_t ch) { - return strchrW(str, ch); + do { if (*str == ch) return (WCHAR *)(ULONG_PTR)str; } while (*str++); + return NULL; } /*********************************************************************

1 0

Nikolay Sivov : sxs/tests: Use wide string literal constants.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: 077e2a8e70aa2aecc69bd79b03d5e0e3c9f4a967 URL: https://source.winehq.org/git/wine.git/?a=commit;h=077e2a8e70aa2aecc69bd79b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 21 15:03:27 2020 +0300 sxs/tests: Use wide string literal constants. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/sxs/tests/sxs.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/sxs/tests/sxs.c b/dlls/sxs/tests/sxs.c index 6b1a9952f3..4215c5045b 100644 --- a/dlls/sxs/tests/sxs.c +++ b/dlls/sxs/tests/sxs.c @@ -85,9 +85,6 @@ static void run_test(void) SIZE_T buffer_size; BOOL ret; SXS_GUID_INFORMATION_CLR *info; - WCHAR expected_type_name[] = {'D','L','L','.','T','e','s','t',0}; - WCHAR expected_runtime_version[] = {'v','4','.','0','.','0','.','0',0}; - WCHAR expected_assembly_identity[] = {'c','o','m','t','e','s','t',',','t','y','p','e','=','"','w','i','n','3','2','"',',','v','e','r','s','i','o','n','=','"','1','.','0','.','0','.','0','"',0}; ret = SxsLookupClrGuid(SXS_LOOKUP_CLR_GUID_FIND_CLR_CLASS, (GUID*)&CLSID_Test, NULL, NULL, 0, &buffer_size); ok(ret == FALSE, "Got %d\n", ret); @@ -99,12 +96,11 @@ static void run_test(void) ok(GetLastError() == 0, "Got %d\n", GetLastError()); ok(info->dwFlags == SXS_GUID_INFORMATION_CLR_FLAG_IS_CLASS, "Got %d\n", info->dwFlags); - ok(lstrcmpW(info->pcwszTypeName, expected_type_name) == 0, "Got %s\n", - wine_dbgstr_w(info->pcwszTypeName)); - ok(lstrcmpW(info->pcwszAssemblyIdentity, expected_assembly_identity) == 0, "Got %s\n", - wine_dbgstr_w(info->pcwszAssemblyIdentity)); - ok(lstrcmpW(info->pcwszRuntimeVersion, expected_runtime_version) == 0, "Got %s\n", - wine_dbgstr_w(info->pcwszRuntimeVersion)); + ok(!lstrcmpW(info->pcwszTypeName, L"DLL.Test"), "Unexpected typename %s.\n", wine_dbgstr_w(info->pcwszTypeName)); + ok(!lstrcmpW(info->pcwszAssemblyIdentity, L"comtest,type=\"win32\",version=\"1.0.0.0\""), + "Unexpected assembly identity %s.\n", wine_dbgstr_w(info->pcwszAssemblyIdentity)); + ok(!lstrcmpW(info->pcwszRuntimeVersion, L"v4.0.0.0"), "Unexpected runtime version %s.\n", + wine_dbgstr_w(info->pcwszRuntimeVersion)); heap_free(info); }

1 0

Jacek Caban : wineconsole: Use IOCTL_CONDRV_SET_TITLE ioctl.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: dc1483c179d8e6e8ac1efe1fb54d8f1f2395077d URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc1483c179d8e6e8ac1efe1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 21 14:56:48 2020 +0200 wineconsole: Use IOCTL_CONDRV_SET_TITLE ioctl. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index eaf67f8875..be6ddf2000 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -728,14 +728,8 @@ static struct inner_data* WINECON_Init(HINSTANCE hInst, DWORD pid, LPCWSTR appna NULL, 0, NULL, NULL); if (!ret) goto error; - SERVER_START_REQ( set_console_input_info ) - { - req->handle = wine_server_obj_handle( data->hConIn ); - req->mask = SET_CONSOLE_INPUT_INFO_TITLE; - wine_server_add_data( req, appname, lstrlenW(appname) * sizeof(WCHAR) ); - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; + ret = DeviceIoControl(data->hConIn, IOCTL_CONDRV_SET_TITLE, (void *)appname, + lstrlenW(appname) * sizeof(WCHAR), NULL, 0, NULL, NULL); if (!ret) goto error; return data;

1 0

Alexandre Julliard : ntdll: Map errno to a status also in directory functions.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: 688799b1f7b2750b938f8da771480d2c16d1ae1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=688799b1f7b2750b938f8da7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 21 18:18:17 2020 +0200 ntdll: Map errno to a status also in directory functions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49523 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/file.c | 25 +++++++++++++++++++++++++ dlls/ntdll/unix/file.c | 13 +++++-------- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 6164b0c4bd..2fa12410c9 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -401,6 +401,31 @@ static void open_file_test(void) CloseHandle( handle ); CloseHandle( dir ); + attr.RootDirectory = 0; + wcscat( path, L"\\cmd.exe" ); + pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); + status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); + ok( status == STATUS_NOT_A_DIRECTORY, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + CloseHandle( handle ); + status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_NON_DIRECTORY_FILE ); + ok( !status, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + CloseHandle( handle ); + pRtlFreeUnicodeString( &nameW ); + + wcscat( path, L"\\cmd.exe" ); + pRtlDosPathNameToNtPathName_U( path, &nameW, NULL, NULL ); + status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_DIRECTORY_FILE ); + todo_wine + ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + status = pNtOpenFile( &handle, GENERIC_READ, &attr, &io, + FILE_SHARE_READ|FILE_SHARE_WRITE, FILE_NON_DIRECTORY_FILE ); + todo_wine + ok( status == STATUS_OBJECT_PATH_NOT_FOUND, "open %s failed %x\n", wine_dbgstr_w(nameW.Buffer), status ); + pRtlFreeUnicodeString( &nameW ); + GetTempPathW( MAX_PATH, path ); lstrcatW( path, testdirW ); CreateDirectoryW( path, NULL ); diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 20eb6a0592..8356e08289 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -2454,7 +2454,7 @@ NTSTATUS WINAPI NtQueryDirectoryFile( HANDLE handle, HANDLE event, PIO_APC_ROUTI } if (cwd == -1 || fchdir( cwd ) == -1) chdir( "/" ); } - else status = STATUS_ACCESS_DENIED; + else status = errno_to_status( errno ); pthread_mutex_unlock( &dir_mutex ); @@ -2557,11 +2557,8 @@ static NTSTATUS find_file_in_dir( char *unix_name, int pos, const WCHAR *name, i } #endif /* VFAT_IOCTL_READDIR_BOTH */ - if (!(dir = opendir( unix_name ))) - { - if (errno == ENOENT) return STATUS_OBJECT_PATH_NOT_FOUND; - else return STATUS_ACCESS_DENIED; - } + if (!(dir = opendir( unix_name ))) return errno_to_status( errno ); + unix_name[pos - 1] = '/'; while ((de = readdir( dir ))) { @@ -3038,7 +3035,7 @@ static NTSTATUS file_id_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char * } if (fchdir( old_cwd ) == -1) chdir( "/" ); } - else status = STATUS_ACCESS_DENIED; + else status = errno_to_status( errno ); pthread_mutex_unlock( &dir_mutex ); if (old_cwd != -1) close( old_cwd ); @@ -3217,7 +3214,7 @@ static NTSTATUS nt_to_unix_file_name_attr( const OBJECT_ATTRIBUTES *attr, char * disposition, FALSE ); if (fchdir( old_cwd ) == -1) chdir( "/" ); } - else status = STATUS_ACCESS_DENIED; + else status = errno_to_status( errno ); pthread_mutex_unlock( &dir_mutex ); if (old_cwd != -1) close( old_cwd ); if (needs_close) close( root_fd );

1 0

Alexandre Julliard : ntdll: Use a syscall thunk for NtClose().
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: 4752e252ea6ee084b679a9b9551a1c55f8744451 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4752e252ea6ee084b679a9b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 21 15:50:36 2020 +0200 ntdll: Use a syscall thunk for NtClose(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 - dlls/ntdll/ntdll.spec | 4 +-- dlls/ntdll/ntdll_misc.h | 2 -- dlls/ntdll/om.c | 90 ------------------------------------------------ dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/server.c | 9 +++++ dlls/ntdll/unixlib.h | 3 +- 7 files changed, 12 insertions(+), 98 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index eed8d10f0b..bc8215b6bf 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -24,7 +24,6 @@ C_SRCS = \ locale.c \ misc.c \ nt.c \ - om.c \ path.c \ printf.c \ process.c \ diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 0bfe3d3545..ff1433be40 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -150,7 +150,7 @@ @ stdcall -syscall NtCancelTimer(long ptr) @ stdcall -syscall NtClearEvent(long) @ stdcall -syscall NtClearPowerRequest(long long) -@ stdcall NtClose(long) +@ stdcall -syscall NtClose(long) @ stub NtCloseObjectAuditAlarm # @ stub NtCompactKeys # @ stub NtCompareTokens @@ -1139,7 +1139,7 @@ @ stdcall -private -syscall ZwCancelTimer(long ptr) NtCancelTimer @ stdcall -private -syscall ZwClearEvent(long) NtClearEvent @ stdcall -private -syscall ZwClearPowerRequest(long long) NtClearPowerRequest -@ stdcall -private ZwClose(long) NtClose +@ stdcall -private -syscall ZwClose(long) NtClose @ stub ZwCloseObjectAuditAlarm # @ stub ZwCompactKeys # @ stub ZwCompareTokens diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 1f27cd100a..d845416e95 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -44,8 +44,6 @@ static const UINT_PTR page_size = 0x1000; extern UINT_PTR page_size DECLSPEC_HIDDEN; #endif -extern NTSTATUS close_handle( HANDLE ) DECLSPEC_HIDDEN; - /* exceptions */ extern LONG call_vectored_handlers( EXCEPTION_RECORD *rec, CONTEXT *context ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN raise_status( NTSTATUS status, EXCEPTION_RECORD *rec ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c deleted file mode 100644 index 8c8f2a4297..0000000000 --- a/dlls/ntdll/om.c +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Object management functions - * - * Copyright 1999, 2000 Juergen Schmied - * Copyright 2005 Vitaliy Margolen - * - * 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 <stdarg.h> -#include <stdlib.h> -#include <string.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "wine/debug.h" -#include "windef.h" -#include "winternl.h" -#include "ntdll_misc.h" -#include "wine/server.h" -#include "wine/exception.h" - - -/* - * Generic object functions - */ - -static LONG WINAPI invalid_handle_exception_handler( EXCEPTION_POINTERS *eptr ) -{ - EXCEPTION_RECORD *rec = eptr->ExceptionRecord; - return (rec->ExceptionCode == EXCEPTION_INVALID_HANDLE) ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH; -} - -/* Everquest 2 / Pirates of the Burning Sea hooks NtClose, so we need a wrapper */ -NTSTATUS close_handle( HANDLE handle ) -{ - DWORD_PTR debug_port; - NTSTATUS ret = unix_funcs->NtClose( handle ); - - if (ret == STATUS_INVALID_HANDLE && handle && NtCurrentTeb()->Peb->BeingDebugged && - !NtQueryInformationProcess( NtCurrentProcess(), ProcessDebugPort, &debug_port, - sizeof(debug_port), NULL) && debug_port) - { - __TRY - { - EXCEPTION_RECORD record; - record.ExceptionCode = EXCEPTION_INVALID_HANDLE; - record.ExceptionFlags = 0; - record.ExceptionRecord = NULL; - record.ExceptionAddress = NULL; - record.NumberParameters = 0; - RtlRaiseException( &record ); - } - __EXCEPT(invalid_handle_exception_handler) - { - } - __ENDTRY - } - - return ret; -} - -/************************************************************************** - * NtClose [NTDLL.@] - * - * Close a handle reference to an object. - * - * PARAMS - * Handle [I] handle to close - * - * RETURNS - * Success: ERROR_SUCCESS. - * Failure: An NTSTATUS error code. - */ -NTSTATUS WINAPI NtClose( HANDLE Handle ) -{ - return close_handle( Handle ); -} diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index fba785c2b6..99c70b400a 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1360,7 +1360,6 @@ static double CDECL ntdll_tan( double d ) { return tan( d ); } */ static struct unix_funcs unix_funcs = { - NtClose, NtCurrentTeb, NtGetContextThread, NtQueryPerformanceCounter, diff --git a/dlls/ntdll/unix/server.c b/dlls/ntdll/unix/server.c index 452094ff5d..21817ad159 100644 --- a/dlls/ntdll/unix/server.c +++ b/dlls/ntdll/unix/server.c @@ -1629,6 +1629,7 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source, HANDLE */ NTSTATUS WINAPI NtClose( HANDLE handle ) { + HANDLE port; NTSTATUS ret; int fd = remove_fd_from_cache( handle ); @@ -1639,5 +1640,13 @@ NTSTATUS WINAPI NtClose( HANDLE handle ) } SERVER_END_REQ; if (fd != -1) close( fd ); + + if (ret != STATUS_INVALID_HANDLE || !handle) return ret; + if (!NtCurrentTeb()->Peb->BeingDebugged) return ret; + if (!NtQueryInformationProcess( NtCurrentProcess(), ProcessDebugPort, &port, sizeof(port), NULL) && port) + { + NtCurrentTeb()->ExceptionCode = ret; + pKiRaiseUserExceptionDispatcher(); + } return ret; } diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index e4206762b1..d7487feafc 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,12 +28,11 @@ struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 88 +#define NTDLL_UNIXLIB_VERSION 89 struct unix_funcs { /* Nt* functions */ - NTSTATUS (WINAPI *NtClose)( HANDLE handle ); TEB * (WINAPI *NtCurrentTeb)(void); NTSTATUS (WINAPI *NtGetContextThread)( HANDLE handle, CONTEXT *context ); NTSTATUS (WINAPI *NtQueryPerformanceCounter)( LARGE_INTEGER *counter, LARGE_INTEGER *frequency );

1 0

Alexandre Julliard : ntdll: Use a syscall thunk for NtQueryPerformanceCounter().
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: 78c772e9d802d13522855fa3c8e2257c4933214a URL: https://source.winehq.org/git/wine.git/?a=commit;h=78c772e9d802d13522855fa3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 21 15:51:38 2020 +0200 ntdll: Use a syscall thunk for NtQueryPerformanceCounter(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 ++-- dlls/ntdll/time.c | 21 +-------------------- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/sync.c | 13 +++++++++++-- dlls/ntdll/unixlib.h | 3 +-- 5 files changed, 15 insertions(+), 27 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ff1433be40..aea9174068 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -307,7 +307,7 @@ @ stdcall -syscall NtQueryMutant(long long ptr long ptr) @ stdcall -syscall NtQueryObject(long long ptr long ptr) @ stub NtQueryOpenSubKeys -@ stdcall NtQueryPerformanceCounter(ptr ptr) +@ stdcall -syscall NtQueryPerformanceCounter(ptr ptr) # @ stub NtQueryPortInformationProcess # @ stub NtQueryQuotaInformationFile @ stdcall -syscall NtQuerySection(long long ptr long ptr) @@ -1295,7 +1295,7 @@ @ stdcall -private -syscall ZwQueryMutant(long long ptr long ptr) NtQueryMutant @ stdcall -private -syscall ZwQueryObject(long long ptr long ptr) NtQueryObject @ stub ZwQueryOpenSubKeys -@ stdcall -private ZwQueryPerformanceCounter(ptr ptr) NtQueryPerformanceCounter +@ stdcall -private -syscall ZwQueryPerformanceCounter(ptr ptr) NtQueryPerformanceCounter # @ stub ZwQueryPortInformationProcess # @ stub ZwQueryQuotaInformationFile @ stdcall -private -syscall ZwQuerySection(long long ptr long ptr) NtQuerySection diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 15d100d10e..f92443500d 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -375,31 +375,12 @@ LONGLONG WINAPI RtlGetSystemTimePrecise( void ) return unix_funcs->RtlGetSystemTimePrecise(); } -/****************************************************************************** - * NtQueryPerformanceCounter [NTDLL.@] - */ -NTSTATUS WINAPI NtQueryPerformanceCounter( LARGE_INTEGER *counter, LARGE_INTEGER *frequency ) -{ - NTSTATUS status; - - __TRY - { - status = unix_funcs->NtQueryPerformanceCounter( counter, frequency ); - } - __EXCEPT_PAGE_FAULT - { - return STATUS_ACCESS_VIOLATION; - } - __ENDTRY - return status; -} - /****************************************************************************** * RtlQueryPerformanceCounter [NTDLL.@] */ BOOL WINAPI DECLSPEC_HOTPATCH RtlQueryPerformanceCounter( LARGE_INTEGER *counter ) { - unix_funcs->NtQueryPerformanceCounter( counter, NULL ); + NtQueryPerformanceCounter( counter, NULL ); return TRUE; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 99c70b400a..3f3a10155d 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1362,7 +1362,6 @@ static struct unix_funcs unix_funcs = { NtCurrentTeb, NtGetContextThread, - NtQueryPerformanceCounter, DbgUiIssueRemoteBreakin, RtlGetSystemTimePrecise, RtlWaitOnAddress, diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index b7b9fa3443..2dc1a7c2aa 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -69,6 +69,7 @@ #include "winternl.h" #include "ddk/wdm.h" #include "wine/server.h" +#include "wine/exception.h" #include "wine/debug.h" #include "unix_private.h" @@ -1361,8 +1362,16 @@ NTSTATUS WINAPI NtDelayExecution( BOOLEAN alertable, const LARGE_INTEGER *timeou */ NTSTATUS WINAPI NtQueryPerformanceCounter( LARGE_INTEGER *counter, LARGE_INTEGER *frequency ) { - counter->QuadPart = monotonic_counter(); - if (frequency) frequency->QuadPart = TICKSPERSEC; + __TRY + { + counter->QuadPart = monotonic_counter(); + if (frequency) frequency->QuadPart = TICKSPERSEC; + } + __EXCEPT_PAGE_FAULT + { + return STATUS_ACCESS_VIOLATION; + } + __ENDTRY return STATUS_SUCCESS; } diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index d7487feafc..84e1a27977 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -28,14 +28,13 @@ struct msghdr; struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 89 +#define NTDLL_UNIXLIB_VERSION 90 struct unix_funcs { /* Nt* functions */ TEB * (WINAPI *NtCurrentTeb)(void); NTSTATUS (WINAPI *NtGetContextThread)( HANDLE handle, CONTEXT *context ); - NTSTATUS (WINAPI *NtQueryPerformanceCounter)( LARGE_INTEGER *counter, LARGE_INTEGER *frequency ); /* other Win32 API functions */ NTSTATUS (WINAPI *DbgUiIssueRemoteBreakin)( HANDLE process );

1 0

Anton Baskanov : amstream/tests: Fix AMMultiMediaStream::OpenFile test.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: 6a1109f3cd0ba0953c02509e9fdb2a84a9549e7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a1109f3cd0ba0953c02509e… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Jul 21 10:50:02 2020 -0500 amstream/tests: Fix AMMultiMediaStream::OpenFile test. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/tests/amstream.c | 47 +++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a81cdba3f3..c47f11f1f6 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -231,35 +231,44 @@ static void test_interfaces(void) static void test_openfile(void) { - IAMMultiMediaStream *pams; + IAMMultiMediaStream *mmstream = create_ammultimediastream(); + IMediaStreamFilter *filter; + IGraphBuilder *graph; HRESULT hr; - IGraphBuilder* pgraph; + ULONG ref; - if (!(pams = create_ammultimediastream())) - return; + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!graph, "Expected NULL graph.\n"); - hr = IAMMultiMediaStream_GetFilterGraph(pams, &pgraph); - ok(hr==S_OK, "IAMMultiMediaStream_GetFilterGraph returned: %x\n", hr); - ok(pgraph==NULL, "Filtergraph should not be created yet\n"); + hr = IAMMultiMediaStream_OpenFile(mmstream, L"test.avi", AMMSF_NORENDER); + ok(hr == S_OK, "Got hr %#x.\n", hr); - if (pgraph) - IGraphBuilder_Release(pgraph); + hr = IAMMultiMediaStream_GetFilterGraph(mmstream, &graph); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!graph, "Expected non-NULL graph.\n"); + IGraphBuilder_Release(graph); - check_interface(pams, &IID_IMediaSeeking, FALSE); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); - hr = IAMMultiMediaStream_OpenFile(pams, L"test.avi", 0); - ok(hr==S_OK, "IAMMultiMediaStream_OpenFile returned: %x\n", hr); + mmstream = create_ammultimediastream(); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryAudio, 0, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IAMMultiMediaStream_GetFilter(mmstream, &filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); - check_interface(pams, &IID_IMediaSeeking, TRUE); + check_interface(filter, &IID_IMediaSeeking, FALSE); - hr = IAMMultiMediaStream_GetFilterGraph(pams, &pgraph); - ok(hr==S_OK, "IAMMultiMediaStream_GetFilterGraph returned: %x\n", hr); - ok(pgraph!=NULL, "Filtergraph should be created\n"); + hr = IAMMultiMediaStream_OpenFile(mmstream, L"test.avi", 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); - if (pgraph) - IGraphBuilder_Release(pgraph); + check_interface(filter, &IID_IMediaSeeking, TRUE); - IAMMultiMediaStream_Release(pams); + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IMediaStreamFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); } static void test_renderfile(void)

1 0

Piotr Caban : msvcrt: Copy wcsrchr implementation from ntdll.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: b34b7e171e086a54f47b327bfaad2bb29b560d05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b34b7e171e086a54f47b327b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 21 12:21:51 2020 +0200 msvcrt: Copy wcsrchr implementation from ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/wcs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index e193c08593..bce1e89aeb 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2672,7 +2672,9 @@ MSVCRT_wchar_t* CDECL MSVCRT_wcschr(const MSVCRT_wchar_t *str, MSVCRT_wchar_t ch */ MSVCRT_wchar_t* CDECL MSVCRT_wcsrchr(const MSVCRT_wchar_t *str, MSVCRT_wchar_t ch) { - return strrchrW(str, ch); + WCHAR *ret = NULL; + do { if (*str == ch) ret = (WCHAR *)(ULONG_PTR)str; } while (*str++); + return ret; } /***********************************************************************

1 0

Piotr Caban : msvcrt: Don't use wine/unicode.h header.
by Alexandre Julliard July 21, 2020

July 21, 2020

Module: wine Branch: master Commit: 536be09b8449537925ad4635a06ae45283075c2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=536be09b8449537925ad4635… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 21 12:21:59 2020 +0200 msvcrt: Don't use wine/unicode.h header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/console.c | 2 +- dlls/msvcrt/ctype.c | 1 - dlls/msvcrt/data.c | 16 ++++++++-------- dlls/msvcrt/dir.c | 33 ++++++++++++++++----------------- dlls/msvcrt/environ.c | 15 +++++++-------- dlls/msvcrt/errno.c | 4 ++-- dlls/msvcrt/file.c | 9 ++++----- dlls/msvcrt/locale.c | 17 ++++++++--------- dlls/msvcrt/mbcs.c | 2 +- dlls/msvcrt/msvcrt.h | 3 +++ dlls/msvcrt/printf.h | 2 +- dlls/msvcrt/process.c | 45 +++++++++++++++++++++++---------------------- dlls/msvcrt/time.c | 1 - dlls/msvcrt/wcs.c | 19 +++++++++---------- 14 files changed, 83 insertions(+), 86 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=536be09b8449537925ad…

1 0