December 2018 - Wine-devel - list.winehq.org

[PATCH 1/2] ntoskrnl.exe: Avoid loading a driver multiple times in ZwLoadDriver().
by Zebediah Figura 21 Dec '18

21 Dec '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45805 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/tests/driver.c | 3 +++ 2 files changed, 10 insertions(+) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2b3b2ec0ef..d0112f4904 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3520,6 +3520,13 @@ NTSTATUS WINAPI ZwLoadDriver( const UNICODE_STRING *service_name ) return STATUS_NO_MEMORY; } + if (wine_rb_get( &wine_drivers, &drv_name )) + { + TRACE( "driver %s already loaded\n", debugstr_us(&drv_name) ); + RtlFreeUnicodeString( &drv_name ); + return STATUS_IMAGE_ALREADY_LOADED; + } + set_service_status( service_handle, SERVICE_START_PENDING, 0 ); status = IoCreateDriver( &drv_name, init_driver ); diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 17e54cd508..6ab5c3e054 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -206,6 +206,9 @@ static void test_load_driver(void) ret = ZwLoadDriver(&name); ok(!ret, "got %#x\n", ret); + ret = ZwLoadDriver(&name); + ok(ret == STATUS_IMAGE_ALREADY_LOADED, "got %#x\n", ret); + ret = ZwUnloadDriver(&name); ok(!ret, "got %#x\n", ret); } -- 2.14.1

1 1

[PATCH] ntdll: Use correct PC for instruction decoding on ARM64
by André Hentschel 21 Dec '18

21 Dec '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46194 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/ntdll/signal_arm64.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index c976884ff01..e1958890af2 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -611,9 +611,9 @@ static NTSTATUS raise_exception( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL f return STATUS_SUCCESS; } -static inline DWORD is_write_fault( ucontext_t *context ) +static inline DWORD is_write_fault( DWORD *pc ) { - DWORD inst = *(DWORD *)PC_sig(context); + DWORD inst = *pc; if ((inst & 0xbfff0000) == 0x0c000000 /* C3.3.1 */ || (inst & 0xbfe00000) == 0x0c800000 /* C3.3.2 */ || (inst & 0xbfdf0000) == 0x0d000000 /* C3.3.3 */ || @@ -637,6 +637,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) { EXCEPTION_RECORD *rec; ucontext_t *context = ucontext; + DWORD *orig_pc = PC_sig(context); /* check for page fault inside the thread stack */ if (signal == SIGSEGV && @@ -664,7 +665,7 @@ static void segv_handler( int signal, siginfo_t *info, void *ucontext ) case SIGSEGV: /* Segmentation fault */ rec->ExceptionCode = EXCEPTION_ACCESS_VIOLATION; rec->NumberParameters = 2; - rec->ExceptionInformation[0] = is_write_fault(context); + rec->ExceptionInformation[0] = is_write_fault(orig_pc); rec->ExceptionInformation[1] = (ULONG_PTR)info->si_addr; break; case SIGBUS: /* Alignment check exception */ -- 2.17.1

1 0

[PATCH] riched20: Mask out extended flags introduced by CHARFORMAT2 when converting to CHARFORMAT.
by Sergio Gómez Del Real 21 Dec '18

21 Dec '18

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/riched20/style.c | 4 ++++ dlls/riched20/tests/editor.c | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index c3f3fc3f9a..3b9d7717eb 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -85,6 +85,8 @@ BOOL cf2w_to_cfany(CHARFORMAT2W *to, const CHARFORMAT2W *from) CopyMemory(t, from, FIELD_OFFSET(CHARFORMATA, szFaceName)); WideCharToMultiByte(CP_ACP, 0, from->szFaceName, -1, t->szFaceName, sizeof(t->szFaceName), NULL, NULL); t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ + t->dwMask &= CFM_ALL; + t->dwEffects &= CFM_EFFECTS; return TRUE; } if (to->cbSize == sizeof(CHARFORMATW)) @@ -92,6 +94,8 @@ BOOL cf2w_to_cfany(CHARFORMAT2W *to, const CHARFORMAT2W *from) CHARFORMATW *t = (CHARFORMATW *)to; CopyMemory(t, from, sizeof(*t)); t->cbSize = sizeof(*t); /* it was overwritten by CopyMemory */ + t->dwMask &= CFM_ALL; + t->dwEffects &= CFM_EFFECTS; return TRUE; } if (to->cbSize == sizeof(CHARFORMAT2A)) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 035869e134..410960bd3c 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -751,6 +751,8 @@ static void test_EM_SETCHARFORMAT(void) HWND hwndRichEdit = new_richedit(NULL); CHARFORMAT2A cf2; CHARFORMAT2W cfW; + CHARFORMATA cf1a; + CHARFORMATW cf1w; int rc = 0; int tested_effects[] = { CFE_BOLD, @@ -1338,6 +1340,23 @@ static void test_EM_SETCHARFORMAT(void) ok(cf2.dwEffects & CFE_UNDERLINE, "got %08x\n", cf2.dwEffects); ok(cf2.bUnderlineType == CFU_UNDERLINEDOUBLE, "got %x\n", cf2.bUnderlineType); + /* Wine converts between CHARFORMAT(A/W) and CHARFORMAT2W internally. Test that. */ + memset(&cf1a, 0, sizeof(CHARFORMATA)); + memset(&cf1w, 0, sizeof(CHARFORMATW)); + cf1a.cbSize = sizeof(CHARFORMATA); + cf1w.cbSize = sizeof(CHARFORMATW); + cf1a.dwMask = cf1w.dwMask = CFM_ALL2; + cf1a.dwEffects = cf1w.dwEffects = CFM_EFFECTS2; + SendMessageA(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf1a); + SendMessageA(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf1a); + /* flags only valid for CHARFORMAT2 should be masked out */ + ok((cf1a.dwMask & (CFM_ALL2&~CFM_ALL)) == 0, "flags were not masked out\n"); + ok((cf1a.dwEffects & (CFM_EFFECTS2&~CFM_EFFECTS)) == 0, "flags were not masked out\n"); + SendMessageA(hwndRichEdit, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf1w); + SendMessageA(hwndRichEdit, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf1w); + ok((cf1w.dwMask & (CFM_ALL2&~CFM_ALL)) == 0, "flags were not masked out\n"); + ok((cf1w.dwEffects & (CFM_EFFECTS2&~CFM_EFFECTS)) == 0, "flags were not masked out\n"); + DestroyWindow(hwndRichEdit); } -- 2.17.1

1 0

[PATCH 2/2 v2] msvcrt: Use GetDaylightFlag() to set dstflag value in _ftime64.
by Piotr Caban 21 Dec '18

21 Dec '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/time.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

2 3

[PATCH] ping: Add Ctrl+C event handling
by Isira Seneviratne 21 Dec '18

21 Dec '18

1 0

[PATCH] ping: Add SIGINT signal handling
by Isira Seneviratne 21 Dec '18

21 Dec '18

2 1

recent fontconfig changes
by wylda＠volny.cz 21 Dec '18

21 Dec '18

Hi Akihiro & Huw, after testing retesting https://bugs.winehq.org/show_bug.cgi?id=46285 my system gone nuts. Listing CD of DOOM3 ;c) Is that related to your work?? DOOM3_2$ ls -alF total 621 dr-x------ 1 wylda wylda 2048 Jul 14 2004 ./ drwxr-x---+ 3 root root 4096 Dec 21 12:27 ../ -r-------- 1 wylda wylda 703 Jul 7 2004 䠰?䝉䘻 -r-------- 1 wylda wylda 717 Jul 7 2004 䠰㈮䝉䘻 -r-------- 1 wylda wylda 1295 Jul 7 2004 䠰㌮䝉䘻 -r-------- 1 wylda wylda 901 Jul 7 2004 䠰㐮䝉䘻 -r-------- 1 wylda wylda 516 Jul 7 2004 䠰㔮䝉䘻 -r-------- 1 wylda wylda 1043 Jul 7 2004 䠰㘮䝉䘻 -r-------- 1 wylda wylda 1637 Jul 7 2004 䠰㜮䝉䘻 -r-------- 1 wylda wylda 706 Jul 7 2004 䠰㠮䝉䘻 -r-------- 1 wylda wylda 1142 Jul 7 2004 䠰㤮䝉䘻 -r-------- 1 wylda wylda 781 Jul 7 2004 䠱ÿ䝉䘻 -r-------- 1 wylda wylda 1932 Jul 7 2004 䠱?䝉䘻 -r-------- 1 wylda wylda 561 Jul 7 2004 䠱㈮䝉䘻 -r-------- 1 wylda wylda 1217 Jul 7 2004 䠱㌮䝉䘻 -r-------- 1 wylda wylda 1943 Jul 7 2004 䠱㐮䝉䘻 -r-------- 1 wylda wylda 1733 Jul 8 2004 䠱㑁?䥆㬱 -r-------- 1 wylda wylda 717 Jul 8 2004 䡟䑅䘮䝉䘻 -r-------- 1 wylda wylda 3482 Jul 7 2004 䱉久?䝉䘻 -r-------- 1 wylda wylda 3806 Jul 7 2004 䱉久㈮䝉䘻 -r-------- 1 wylda wylda 3482 Jul 8 2004 䱉久ㅟ䈮䝉䘻 -r-------- 1 wylda wylda 3806 Jul 8 2004 䱉久㉟䈮䝉䘻 -r-------- 1 wylda wylda 3178 Jul 7 2004 䡍倮䝉䘻 -r-------- 1 wylda wylda 49 Nov 13 2001 偁䐮䝉䘻 -r-------- 1 wylda wylda 90960 Jul 8 2004 偄䄱?乇㬱 -r-------- 1 wylda wylda 81713 Jul 8 2004 偄䄲?乇㬱 -r-------- 1 wylda wylda 4548 Jul 8 2004 偉協佌?乇㬱 -r-------- 1 wylda wylda 13808 Jul 8 2004 䱏剅?偎䜻 -r-------- 1 wylda wylda 7650 Jul 7 2004 䱏剅㈮偎䜻 -r-------- 1 wylda wylda 22645 Jul 8 2004 䱏剅㌮偎䜻 -r-------- 1 wylda wylda 22458 Jul 8 2004 䱏剅㐮偎䜻 -r-------- 1 wylda wylda 19916 Jul 8 2004 䱏剅㘮偎䜻 -r-------- 1 wylda wylda 87048 Jul 8 2004 十噅?乇㬱 -r-------- 1 wylda wylda 4401 Jul 8 2004 午佔䝕丮偎䜻 -r-------- 1 wylda wylda 8883 Jul 8 2004 协啌䍕䉅?乇㬱 -r-------- 1 wylda wylda 1176 Jul 8 2004 䡟单倮䝉䘻 -r-------- 1 wylda wylda 1312 Jun 16 2004 卙䵂佌〱?假㬱 -r-------- 1 wylda wylda 651 Jul 8 2004 䡟呅䌮䝉䘻 -r-------- 1 wylda wylda 789 Jul 8 2004 䡟呏倮䝉䘻 -r-------- 1 wylda wylda 6391 Nov 13 2001 䅔噉卍縱?假㬱 -r-------- 1 wylda wylda 16969 Jun 15 2004 䐳彌佇縱?假㬱 -r-------- 1 wylda wylda 3573 Jun 17 2004 䥄彌佇縱?假㬱 -r-------- 1 wylda wylda 2998 Jul 8 2004 䙌䅓䡌縱?乇㬱 -r-------- 1 wylda wylda 109223 Jul 8 2004 䥎䝁䵅縱?乇㬱 -r-------- 1 wylda wylda 6017 Jul 8 2004 䵁䍈䥎縱?乇㬱 -r-------- 1 wylda wylda 70053 Jul 8 2004 䵕䱔䥐縱?乇㬱

1 0

[PATCH 1/2 v2] msvcrt: Use _timezone in _ftime64.
by Piotr Caban 21 Dec '18

21 Dec '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- v2: - use GetDaylightFlag as suggested by Alistair. dlls/msvcrt/time.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)

1 0

[PATCH 2/2] msvcrt: Cache dstflag value in _ftime64.
by Piotr Caban 21 Dec '18

21 Dec '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/time.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-)

2 1

[PATCH] msvcrt: Use RtlQueryTimeZoneInformation when MUI not required.
by Alistair Leslie-Hughes 21 Dec '18

21 Dec '18

TIME_ZoneID copied from dlls/kernel32/time.c Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46266 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- If we dont care about an invalid TIME_ZONE then we have the possiblity to use GetDaylightFlag to reduce the amount of code. MSVCRT__ftime64 .... buf->timezone = tzinfo.Bias + ( tzid == TIME_ZONE_ID_STANDARD ? tzinfo.StandardBias : ( tzid == TIME_ZONE_ID_DAYLIGHT ? tzinfo.DaylightBias : 0 )); dlls/msvcrt/time.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 143 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 861b2ed..521c6c8 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -760,6 +760,146 @@ double CDECL MSVCRT_difftime(MSVCRT___time32_t time1, MSVCRT___time32_t time2) } #endif +#define LL2FILETIME( ll, pft )\ + (pft)->dwLowDateTime = (UINT)(ll); \ + (pft)->dwHighDateTime = (UINT)((ll) >> 32); +#define FILETIME2LL( pft, ll) \ + ll = (((LONGLONG)((pft)->dwHighDateTime))<<32) + (pft)-> dwLowDateTime ; + +static int TIME_DayLightCompareDate( const SYSTEMTIME *date, + const SYSTEMTIME *compareDate ) +{ + int limit_day, dayinsecs; + + if (date->wMonth < compareDate->wMonth) + return -1; /* We are in a month before the date limit. */ + + if (date->wMonth > compareDate->wMonth) + return 1; /* We are in a month after the date limit. */ + + /* if year is 0 then date is in day-of-week format, otherwise + * it's absolute date. + */ + if (compareDate->wYear == 0) + { + WORD First; + /* compareDate->wDay is interpreted as number of the week in the month + * 5 means: the last week in the month */ + int weekofmonth = compareDate->wDay; + /* calculate the day of the first DayOfWeek in the month */ + First = ( 6 + compareDate->wDayOfWeek - date->wDayOfWeek + date->wDay + ) % 7 + 1; + limit_day = First + 7 * (weekofmonth - 1); + /* check needed for the 5th weekday of the month */ + if(limit_day > MonthLengths[date->wMonth==2 && IsLeapYear(date->wYear)] + [date->wMonth - 1]) + limit_day -= 7; + } + else + { + limit_day = compareDate->wDay; + } + + /* convert to seconds */ + limit_day = ((limit_day * 24 + compareDate->wHour) * 60 + + compareDate->wMinute ) * 60; + dayinsecs = ((date->wDay * 24 + date->wHour) * 60 + + date->wMinute ) * 60 + date->wSecond; + /* and compare */ + return dayinsecs < limit_day ? -1 : + dayinsecs > limit_day ? 1 : + 0; /* date is equal to the date limit. */ +} + +static DWORD TIME_CompTimeZoneID ( const TIME_ZONE_INFORMATION *pTZinfo, + FILETIME *lpFileTime, BOOL islocal ) +{ + int ret, year; + BOOL beforeStandardDate, afterDaylightDate; + DWORD retval = TIME_ZONE_ID_INVALID; + LONGLONG llTime = 0; /* initialized to prevent gcc complaining */ + SYSTEMTIME SysTime; + FILETIME ftTemp; + + if (pTZinfo->DaylightDate.wMonth != 0) + { + /* if year is 0 then date is in day-of-week format, otherwise + * it's absolute date. + */ + if (pTZinfo->StandardDate.wMonth == 0 || + (pTZinfo->StandardDate.wYear == 0 && + (pTZinfo->StandardDate.wDay<1 || + pTZinfo->StandardDate.wDay>5 || + pTZinfo->DaylightDate.wDay<1 || + pTZinfo->DaylightDate.wDay>5))) + { + SetLastError(ERROR_INVALID_PARAMETER); + return TIME_ZONE_ID_INVALID; + } + + if (!islocal) { + FILETIME2LL( lpFileTime, llTime ); + llTime -= pTZinfo->Bias * (LONGLONG)600000000; + LL2FILETIME( llTime, &ftTemp) + lpFileTime = &ftTemp; + } + + FileTimeToSystemTime(lpFileTime, &SysTime); + year = SysTime.wYear; + + if (!islocal) { + llTime -= pTZinfo->DaylightBias * (LONGLONG)600000000; + LL2FILETIME( llTime, &ftTemp) + FileTimeToSystemTime(lpFileTime, &SysTime); + } + + if(year == SysTime.wYear) { + ret = TIME_DayLightCompareDate( &SysTime, &pTZinfo->StandardDate); + if (ret == -2) + return TIME_ZONE_ID_INVALID; + + beforeStandardDate = ret < 0; + } else + beforeStandardDate = SysTime.wYear < year; + + if (!islocal) { + llTime -= ( pTZinfo->StandardBias - pTZinfo->DaylightBias ) + * (LONGLONG)600000000; + LL2FILETIME( llTime, &ftTemp) + FileTimeToSystemTime(lpFileTime, &SysTime); + } + + if(year == SysTime.wYear) { + ret = TIME_DayLightCompareDate( &SysTime, &pTZinfo->DaylightDate); + if (ret == -2) + return TIME_ZONE_ID_INVALID; + + afterDaylightDate = ret >= 0; + } else + afterDaylightDate = SysTime.wYear > year; + + retval = TIME_ZONE_ID_STANDARD; + if( pTZinfo->DaylightDate.wMonth < pTZinfo->StandardDate.wMonth ) { + /* Northern hemisphere */ + if( beforeStandardDate && afterDaylightDate ) + retval = TIME_ZONE_ID_DAYLIGHT; + } else /* Down south */ + if( beforeStandardDate || afterDaylightDate ) + retval = TIME_ZONE_ID_DAYLIGHT; + } else + /* No transition date */ + retval = TIME_ZONE_ID_UNKNOWN; + + return retval; +} + + +static DWORD TIME_ZoneID( const TIME_ZONE_INFORMATION *pTzi ) +{ + FILETIME ftTime; + GetSystemTimeAsFileTime( &ftTime); + return TIME_CompTimeZoneID( pTzi, &ftTime, FALSE); +} /********************************************************************* * _ftime64 (MSVCRT.@) */ @@ -768,8 +908,10 @@ void CDECL MSVCRT__ftime64(struct MSVCRT___timeb64 *buf) TIME_ZONE_INFORMATION tzinfo; FILETIME ft; ULONGLONG time; + DWORD tzid; - DWORD tzid = GetTimeZoneInformation(&tzinfo); + RtlQueryTimeZoneInformation((RTL_TIME_ZONE_INFORMATION *)&tzinfo); + tzid = TIME_ZoneID(&tzinfo); GetSystemTimeAsFileTime(&ft); time = ((ULONGLONG)ft.dwHighDateTime << 32) | ft.dwLowDateTime; -- 1.9.1

4 3