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

Zhiyi Zhang : ddraw/tests: Test cursor clipping.
by Alexandre Julliard April 9, 2020

April 9, 2020

Module: wine Branch: master Commit: 5a2e6f5e581b616bf6a24a13bb7d8be325a832d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a2e6f5e581b616bf6a24a13… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Apr 9 15:31:42 2020 +0800 ddraw/tests: Test cursor clipping. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 166 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 166 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 166 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 166 ++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddrawmodes.c | 13 +--- 5 files changed, 665 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5a2e6f5e581b616bf6a2…

1 0

Zhiyi Zhang : wined3d: Do not clip the cursor after changing display modes.
by Alexandre Julliard April 9, 2020

April 9, 2020

Module: wine Branch: master Commit: f91dd56ccd7ee980e8d867eb872f40f609f485f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f91dd56ccd7ee980e8d867eb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Apr 9 15:33:05 2020 +0800 wined3d: Do not clip the cursor after changing display modes. DirectDraw should clip the cursor to the primary monitor only when the cooperative level is DDSCL_EXCLUSIVE. For Direct3D 8, 9 and DXGI, changing display modes shouldn't clip the cursor as tests showed. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 2 -- dlls/d3d9/tests/device.c | 2 -- dlls/ddraw/ddraw.c | 31 +++++++++++++++++++++++++++---- dlls/ddraw/tests/ddraw1.c | 3 --- dlls/ddraw/tests/ddraw2.c | 3 --- dlls/ddraw/tests/ddraw4.c | 3 --- dlls/ddraw/tests/ddraw7.c | 3 --- dlls/dxgi/tests/dxgi.c | 2 -- dlls/wined3d/directx.c | 5 ----- dlls/wined3d/swapchain.c | 1 - 10 files changed, 27 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f91dd56ccd7ee980e8d8…

1 0

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard April 9, 2020

April 9, 2020

Module: wine Branch: master Commit: d5c5e7363838d8b9935cd269d314545a5c39a86c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5c5e7363838d8b9935cd269… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Apr 9 14:51:43 2020 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/po/fi.po b/po/fi.po index 85840fdc1c..3fc1de5e6e 100644 --- a/po/fi.po +++ b/po/fi.po @@ -8428,7 +8428,7 @@ msgstr "Valitse tarjoaja." msgid "" "Provider is no longer available. Ensure that the provider is installed " "properly." -msgstr "" +msgstr "Tarjoajaa ei ole enää saatavilla. Varmista, että se on asennettu." #: version.rc:36 msgid "Data Link Properties" @@ -9876,16 +9876,12 @@ msgid "Argentina Daylight Time" msgstr "Argentiinan kesäaika" #: tzres.rc:142 -#, fuzzy -#| msgid "Mauritius Standard Time" msgid "Marquesas Standard Time" -msgstr "Mauritiuksen normaaliaika" +msgstr "Marquesassaarten normaaliaika" #: tzres.rc:143 -#, fuzzy -#| msgid "Mauritius Daylight Time" msgid "Marquesas Daylight Time" -msgstr "Mauritiuksen kesäaika" +msgstr "Marquesassaarten kesäaika" #: tzres.rc:156 msgid "Myanmar Standard Time" @@ -10260,16 +10256,12 @@ msgid "Venezuela Daylight Time" msgstr "Venezuelan kesäaika" #: tzres.rc:60 -#, fuzzy -#| msgid "Mountain Standard Time" msgid "Bougainville Standard Time" -msgstr "Kalliovuorten normaaliaika" +msgstr "Bougainvillen normaaliaika" #: tzres.rc:61 -#, fuzzy -#| msgid "Mountain Daylight Time" msgid "Bougainville Daylight Time" -msgstr "Kalliovuorten kesäaika" +msgstr "Bougainvillen kesäaika" #: tzres.rc:122 msgid "Hawaiian Standard Time" @@ -10384,16 +10376,12 @@ msgid "Korea Daylight Time" msgstr "Korean kesäaika" #: tzres.rc:86 -#, fuzzy -#| msgid "Easter Island Standard Time" msgid "Chatham Islands Standard Time" -msgstr "Pääsiäissaarten normaaliaika" +msgstr "Chathamsaarten normaaliaika" #: tzres.rc:87 -#, fuzzy -#| msgid "Easter Island Daylight Time" msgid "Chatham Islands Daylight Time" -msgstr "Pääsiäissaarten kesäaika" +msgstr "Chathamsaarten kesäaika" #: tzres.rc:92 msgid "E. Africa Standard Time"

1 0

Piotr Caban : kernel32/tests: Test timeout behaviour on system clock change.
by Alexandre Julliard April 9, 2020

April 9, 2020

Module: wine Branch: master Commit: 2df67d56f3a36df754cd7a52d46c33981f07dbde URL: https://source.winehq.org/git/wine.git/?a=commit;h=2df67d56f3a36df754cd7a52… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 6 17:21:26 2020 +0200 kernel32/tests: Test timeout behaviour on system clock change. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/timer.c | 188 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 188 insertions(+) diff --git a/dlls/kernel32/tests/timer.c b/dlls/kernel32/tests/timer.c index d2a6138c97..5e4bab4789 100644 --- a/dlls/kernel32/tests/timer.c +++ b/dlls/kernel32/tests/timer.c @@ -20,6 +20,8 @@ #include "wine/test.h" #include "winbase.h" +#include "winternl.h" +#include "winuser.h" static void test_timer(void) @@ -66,7 +68,193 @@ static void test_timer(void) CloseHandle( handle ); } +#define TICKSPERSEC 10000000 + +static BOOL adjust_system_time(int sec) +{ + ULARGE_INTEGER uli; + SYSTEMTIME st; + FILETIME ft; + + GetSystemTimeAsFileTime(&ft); + uli.u.LowPart = ft.dwLowDateTime; + uli.u.HighPart = ft.dwHighDateTime; + uli.QuadPart += (LONGLONG)sec * TICKSPERSEC; + ft.dwLowDateTime = uli.u.LowPart; + ft.dwHighDateTime = uli.u.HighPart; + if (!FileTimeToSystemTime(&ft, &st)) + return FALSE; + return SetSystemTime(&st); +} + +static DWORD WINAPI thread_WaitForSingleObject(void *arg) +{ + HANDLE event; + DWORD t, r; + + event = CreateEventW(NULL, FALSE, FALSE, NULL); + ok(event != NULL, "CreateEvent failed\n"); + t = GetTickCount(); + r = WaitForSingleObject(event, 3000); + ok(r == WAIT_TIMEOUT, "WiatForSingleObject returned %x\n", r); + CloseHandle(event); + t = GetTickCount() - t; + ok(t > 2000, "t = %d\n", t); + return 0; +} + +static DWORD WINAPI thread_Sleep(void *arg) +{ + DWORD t = GetTickCount(); + + Sleep(3000); + t = GetTickCount() - t; + ok(t > 2000, "t = %d\n", t); + return 0; +} + +static DWORD WINAPI thread_SleepEx(void *arg) +{ + DWORD t = GetTickCount(); + + SleepEx(3000, TRUE); + t = GetTickCount() - t; + ok(t > 2000, "t = %d\n", t); + return 0; +} + +static DWORD WINAPI thread_WaitableTimer_rel(void *arg) +{ + LARGE_INTEGER li; + HANDLE timer; + DWORD t, r; + + li.QuadPart = -3 * TICKSPERSEC; + + timer = CreateWaitableTimerA(NULL, TRUE, NULL); + ok(timer != NULL, "CreateWaitableTimer failed\n"); + + t = GetTickCount(); + r = SetWaitableTimer(timer, &li, 0, NULL, NULL, FALSE); + ok(r, "SetWaitableTimer failed\n"); + + r = WaitForSingleObject(timer, INFINITE); + ok(r == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", r); + CloseHandle(timer); + t = GetTickCount() - t; + ok(t > 2000, "t = %d\n", t); + return 0; +} + +static DWORD WINAPI thread_WaitableTimer_abs(void *arg) +{ + LARGE_INTEGER li; + HANDLE timer; + FILETIME ft; + DWORD t, r; + + GetSystemTimeAsFileTime(&ft); + li.u.LowPart = ft.dwLowDateTime; + li.u.HighPart = ft.dwHighDateTime; + li.QuadPart += 3 * TICKSPERSEC; + + timer = CreateWaitableTimerA(NULL, TRUE, NULL); + ok(timer != NULL, "CreateWaitableTimer failed\n"); + + t = GetTickCount(); + r = SetWaitableTimer(timer, &li, 0, NULL, NULL, FALSE); + ok(r, "SetWaitableTimer failed\n"); + + r = WaitForSingleObject(timer, INFINITE); + ok(r == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", r); + CloseHandle(timer); + t = GetTickCount() - t; + ok(t < 2000, "t = %d\n", t); + return 0; +} + +static DWORD WINAPI thread_WaitableTimer_period(void *arg) +{ + LARGE_INTEGER li; + HANDLE timer; + DWORD t, r; + + li.QuadPart = -1; + + timer = CreateWaitableTimerA(NULL, FALSE, NULL); + ok(timer != NULL, "CreateWaitableTimer failed\n"); + + t = GetTickCount(); + r = SetWaitableTimer(timer, &li, 3000, NULL, NULL, FALSE); + ok(r, "SetWaitableTimer failed\n"); + + r = WaitForSingleObject(timer, INFINITE); + ok(r == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", r); + + r = WaitForSingleObject(timer, INFINITE); + ok(r == WAIT_OBJECT_0, "WaitForSingleObject returned %d\n", r); + CloseHandle(timer); + t = GetTickCount() - t; + ok(t > 2000, "t = %d\n", t); + return 0; +} + +static DWORD WINAPI thread_SetTimer(void *arg) +{ + DWORD t = GetTickCount(); + UINT_PTR timer; + MSG msg; + + timer = SetTimer(NULL, 0, 3000, NULL); + ok(timer, "SetTimer failed (%d)\n", GetLastError()); + + while (GetMessageW(&msg, NULL, 0, 0)) + { + DispatchMessageW(&msg); + if (msg.message == WM_TIMER) break; + } + + t = GetTickCount() - t; + ok(t > 2000, "t = %d\n", t); + KillTimer(NULL, timer); + return 0; +} + +static void test_timeouts(void) +{ + HANDLE threads[7]; + DWORD i; + + if (!adjust_system_time(1)) + { + skip("can't adjust system clock (%d)\n", GetLastError()); + return; + } + + + threads[0] = CreateThread(NULL, 0, thread_WaitForSingleObject, NULL, 0, NULL); + threads[1] = CreateThread(NULL, 0, thread_Sleep, NULL, 0, NULL); + threads[2] = CreateThread(NULL, 0, thread_SleepEx, NULL, 0, NULL); + threads[3] = CreateThread(NULL, 0, thread_WaitableTimer_rel, NULL, 0, NULL); + threads[4] = CreateThread(NULL, 0, thread_WaitableTimer_abs, NULL, 0, NULL); + threads[5] = CreateThread(NULL, 0, thread_WaitableTimer_period, NULL, 0, NULL); + threads[6] = CreateThread(NULL, 0, thread_SetTimer, NULL, 0, NULL); + for(i=0; i<ARRAY_SIZE(threads); i++) + ok(threads[i] != NULL, "CreateThread failed\n"); + + Sleep(500); + adjust_system_time(10); + + for (i=0; i<ARRAY_SIZE(threads); i++) + { + WaitForSingleObject(threads[i], INFINITE); + CloseHandle(threads[i]); + } + adjust_system_time(-11); +} + START_TEST(timer) { test_timer(); + test_timeouts(); }

1 0

Piotr Caban : server: Use monotonic clock for SetTimer timeouts.
by Alexandre Julliard April 9, 2020

April 9, 2020

Module: wine Branch: master Commit: af89b53cef4c0b8cff1ea39fd612c8d1116b020a URL: https://source.winehq.org/git/wine.git/?a=commit;h=af89b53cef4c0b8cff1ea39f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 6 17:21:07 2020 +0200 server: Use monotonic clock for SetTimer timeouts. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/file.h | 6 ++++++ server/queue.c | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/server/file.h b/server/file.h index 4f130e2cf7..7395814dad 100644 --- a/server/file.h +++ b/server/file.h @@ -140,6 +140,12 @@ static inline abstime_t timeout_to_abstime( timeout_t timeout ) return timeout > 0 ? timeout : timeout - monotonic_time; } +static inline timeout_t abstime_to_timeout( abstime_t abstime ) +{ + if (abstime > 0) return abstime; + return -abstime < monotonic_time ? 0 : abstime + monotonic_time; +} + extern void set_current_time( void ); extern struct timeout_user *add_timeout_user( timeout_t when, timeout_callback func, void *private ); extern void remove_timeout_user( struct timeout_user *user ); diff --git a/server/queue.c b/server/queue.c index b5e17be18f..84ee0f9a4e 100644 --- a/server/queue.c +++ b/server/queue.c @@ -89,7 +89,7 @@ struct message struct timer { struct list entry; /* entry in timer list */ - timeout_t when; /* next expiration */ + abstime_t when; /* next expiration */ unsigned int rate; /* timer rate in ms */ user_handle_t win; /* window handle */ unsigned int msg; /* message to post */ @@ -1154,7 +1154,7 @@ static void set_next_timer( struct msg_queue *queue ) if ((ptr = list_head( &queue->pending_timers ))) { struct timer *timer = LIST_ENTRY( ptr, struct timer, entry ); - queue->timeout = add_timeout_user( timer->when, timer_callback, queue ); + queue->timeout = add_timeout_user( abstime_to_timeout(timer->when), timer_callback, queue ); } /* set/clear QS_TIMER bit */ if (list_empty( &queue->expired_timers )) @@ -1206,7 +1206,7 @@ static void link_timer( struct msg_queue *queue, struct timer *timer ) for (ptr = queue->pending_timers.next; ptr != &queue->pending_timers; ptr = ptr->next) { struct timer *t = LIST_ENTRY( ptr, struct timer, entry ); - if (t->when >= timer->when) break; + if (t->when <= timer->when) break; } list_add_before( ptr, &timer->entry ); } @@ -1223,7 +1223,7 @@ static void free_timer( struct msg_queue *queue, struct timer *timer ) static void restart_timer( struct msg_queue *queue, struct timer *timer ) { list_remove( &timer->entry ); - while (timer->when <= current_time) timer->when += (timeout_t)timer->rate * 10000; + while (-timer->when <= monotonic_time) timer->when -= (timeout_t)timer->rate * 10000; link_timer( queue, timer ); set_next_timer( queue ); } @@ -1255,7 +1255,7 @@ static struct timer *set_timer( struct msg_queue *queue, unsigned int rate ) if (timer) { timer->rate = max( rate, 1 ); - timer->when = current_time + (timeout_t)timer->rate * 10000; + timer->when = -monotonic_time - (timeout_t)timer->rate * 10000; link_timer( queue, timer ); /* check if we replaced the next timer */ if (list_head( &queue->pending_timers ) == &timer->entry) set_next_timer( queue );

1 0

Piotr Caban : server: Use monotonic clock in waitable timers.
by Alexandre Julliard April 9, 2020

April 9, 2020

Module: wine Branch: master Commit: 6d2d3595c0ea08d915df5fef506fe3679ffa8051 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d2d3595c0ea08d915df5fef… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 6 17:21:15 2020 +0200 server: Use monotonic clock in waitable timers. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 11 +++++++++-- include/wine/server_protocol.h | 2 +- server/protocol.def | 2 +- server/timer.c | 14 ++++++++------ 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 2b5b6ce44a..4a7b461627 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -1025,8 +1025,15 @@ NTSTATUS WINAPI NtQueryTimer( } SERVER_END_REQ; - /* convert from absolute into relative time */ - NtQuerySystemTime(&now); + /* convert into relative time */ + if (basic_info->RemainingTime.QuadPart > 0) + NtQuerySystemTime(&now); + else + { + RtlQueryPerformanceCounter(&now); + basic_info->RemainingTime.QuadPart = -basic_info->RemainingTime.QuadPart; + } + if (now.QuadPart > basic_info->RemainingTime.QuadPart) basic_info->RemainingTime.QuadPart = 0; else diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index fa0b7ff406..cb3a073886 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -471,7 +471,7 @@ typedef union enum apc_type type; int __pad; client_ptr_t func; - timeout_t time; + abstime_t time; client_ptr_t arg; } timer; struct diff --git a/server/protocol.def b/server/protocol.def index e12e6fbdbf..cc23ee84db 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -487,7 +487,7 @@ typedef union enum apc_type type; /* APC_TIMER */ int __pad; client_ptr_t func; /* void (__stdcall *func)(void*, unsigned int, unsigned int); */ - timeout_t time; /* absolute time of expiration */ + abstime_t time; /* time of expiration */ client_ptr_t arg; /* user argument */ } timer; struct diff --git a/server/timer.c b/server/timer.c index 9cca85569f..c1269e0ff0 100644 --- a/server/timer.c +++ b/server/timer.c @@ -43,7 +43,7 @@ struct timer int manual; /* manual reset */ int signaled; /* current signaled state */ unsigned int period; /* timer period in ms */ - timeout_t when; /* next expiration */ + abstime_t when; /* next expiration */ struct timeout_user *timeout; /* timeout user */ struct thread *thread; /* thread that set the APC function */ client_ptr_t callback; /* callback APC function */ @@ -132,8 +132,9 @@ static void timer_callback( void *private ) if (timer->period) /* schedule the next expiration */ { - timer->when += (timeout_t)timer->period * 10000; - timer->timeout = add_timeout_user( timer->when, timer_callback, timer ); + if (timer->when > 0) timer->when = -monotonic_time; + timer->when -= (abstime_t)timer->period * 10000; + timer->timeout = add_timeout_user( abstime_to_timeout(timer->when), timer_callback, timer ); } else timer->timeout = NULL; @@ -171,21 +172,22 @@ static int set_timer( struct timer *timer, timeout_t expire, unsigned int period period = 0; /* period doesn't make any sense for a manual timer */ timer->signaled = 0; } - timer->when = (expire <= 0) ? current_time - expire : max( expire, current_time ); + timer->when = (expire <= 0) ? expire - monotonic_time : max( expire, current_time ); timer->period = period; timer->callback = callback; timer->arg = arg; if (callback) timer->thread = (struct thread *)grab_object( current ); - timer->timeout = add_timeout_user( timer->when, timer_callback, timer ); + timer->timeout = add_timeout_user( expire, timer_callback, timer ); return signaled; } static void timer_dump( struct object *obj, int verbose ) { struct timer *timer = (struct timer *)obj; + timeout_t timeout = abstime_to_timeout( timer->when ); assert( obj->ops == &timer_ops ); fprintf( stderr, "Timer manual=%d when=%s period=%u\n", - timer->manual, get_timeout_str(timer->when), timer->period ); + timer->manual, get_timeout_str(timeout), timer->period ); } static struct object_type *timer_get_type( struct object *obj )

1 0

Piotr Caban : server: Use monotonic clock for relative timeouts.
by Alexandre Julliard April 9, 2020

April 9, 2020

Module: wine Branch: master Commit: f016a9634545050bc016d589347b7097f2f48f81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f016a9634545050bc016d589… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 6 17:21:03 2020 +0200 server: Use monotonic clock for relative timeouts. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/server_protocol.h | 3 +++ server/fd.c | 55 ++++++++++++++++++++++++++++++++++-------- server/file.h | 6 +++++ server/protocol.def | 3 +++ server/request.c | 14 +++++------ server/request.h | 8 +++++- 6 files changed, 71 insertions(+), 18 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index ba70d13a39..fa0b7ff406 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -199,6 +199,9 @@ typedef __int64 timeout_t; #define TIMEOUT_INFINITE (((timeout_t)0x7fffffff) << 32 | 0xffffffff) +typedef __int64 abstime_t; + + typedef struct { unsigned int debug_flags; diff --git a/server/fd.c b/server/fd.c index c9ef8fde6d..39fb419f25 100644 --- a/server/fd.c +++ b/server/fd.c @@ -364,13 +364,15 @@ static file_pos_t max_unix_offset = OFF_T_MAX; struct timeout_user { struct list entry; /* entry in sorted timeout list */ - timeout_t when; /* timeout expiry (absolute time) */ + abstime_t when; /* timeout expiry */ timeout_callback callback; /* callback function */ void *private; /* callback private data */ }; -static struct list timeout_list = LIST_INIT(timeout_list); /* sorted timeouts list */ +static struct list abs_timeout_list = LIST_INIT(abs_timeout_list); /* sorted absolute timeouts list */ +static struct list rel_timeout_list = LIST_INIT(rel_timeout_list); /* sorted relative timeouts list */ timeout_t current_time; +timeout_t monotonic_time; void set_current_time(void) { @@ -378,6 +380,7 @@ void set_current_time(void) struct timeval now; gettimeofday( &now, NULL ); current_time = (timeout_t)now.tv_sec * TICKS_PER_SEC + now.tv_usec * 10 + ticks_1601_to_1970; + monotonic_time = monotonic_counter(); } /* add a timeout user */ @@ -387,16 +390,27 @@ struct timeout_user *add_timeout_user( timeout_t when, timeout_callback func, vo struct list *ptr; if (!(user = mem_alloc( sizeof(*user) ))) return NULL; - user->when = (when > 0) ? when : current_time - when; + user->when = timeout_to_abstime( when ); user->callback = func; user->private = private; /* Now insert it in the linked list */ - LIST_FOR_EACH( ptr, &timeout_list ) + if (user->when > 0) { - struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); - if (timeout->when >= user->when) break; + LIST_FOR_EACH( ptr, &abs_timeout_list ) + { + struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); + if (timeout->when >= user->when) break; + } + } + else + { + LIST_FOR_EACH( ptr, &rel_timeout_list ) + { + struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); + if (timeout->when <= user->when) break; + } } list_add_before( ptr, &user->entry ); return user; @@ -851,14 +865,15 @@ static void remove_poll_user( struct fd *fd, int user ) /* process pending timeouts and return the time until the next timeout, in milliseconds */ static int get_next_timeout(void) { - if (!list_empty( &timeout_list )) + if (!list_empty( &abs_timeout_list ) || !list_empty( &rel_timeout_list )) { struct list expired_list, *ptr; + int ret = -1; /* first remove all expired timers from the list */ list_init( &expired_list ); - while ((ptr = list_head( &timeout_list )) != NULL) + while ((ptr = list_head( &abs_timeout_list )) != NULL) { struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); @@ -869,6 +884,17 @@ static int get_next_timeout(void) } else break; } + while ((ptr = list_head( &rel_timeout_list )) != NULL) + { + struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); + + if (-timeout->when <= monotonic_time) + { + list_remove( &timeout->entry ); + list_add_tail( &expired_list, &timeout->entry ); + } + else break; + } /* now call the callback for all the removed timers */ @@ -880,13 +906,22 @@ static int get_next_timeout(void) free( timeout ); } - if ((ptr = list_head( &timeout_list )) != NULL) + if ((ptr = list_head( &abs_timeout_list )) != NULL) { struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); int diff = (timeout->when - current_time + 9999) / 10000; if (diff < 0) diff = 0; - return diff; + ret = diff; + } + + if ((ptr = list_head( &rel_timeout_list )) != NULL) + { + struct timeout_user *timeout = LIST_ENTRY( ptr, struct timeout_user, entry ); + int diff = (-timeout->when - monotonic_time + 9999) / 10000; + if (diff < 0) diff = 0; + if (ret == -1 || diff < ret) ret = diff; } + return ret; } return -1; /* no pending timeouts */ } diff --git a/server/file.h b/server/file.h index ea36cdb07d..4f130e2cf7 100644 --- a/server/file.h +++ b/server/file.h @@ -129,11 +129,17 @@ static inline struct fd *get_obj_fd( struct object *obj ) { return obj->ops->get struct timeout_user; extern timeout_t current_time; +extern timeout_t monotonic_time; #define TICKS_PER_SEC 10000000 typedef void (*timeout_callback)( void *private ); +static inline abstime_t timeout_to_abstime( timeout_t timeout ) +{ + return timeout > 0 ? timeout : timeout - monotonic_time; +} + extern void set_current_time( void ); extern struct timeout_user *add_timeout_user( timeout_t when, timeout_callback func, void *private ); extern void remove_timeout_user( struct timeout_user *user ); diff --git a/server/protocol.def b/server/protocol.def index 722993e59c..e12e6fbdbf 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -214,6 +214,9 @@ struct wake_up_reply typedef __int64 timeout_t; #define TIMEOUT_INFINITE (((timeout_t)0x7fffffff) << 32 | 0xffffffff) +/* absolute timeout, negative means that monotonic clock is used */ +typedef __int64 abstime_t; + /* structure for process startup info */ typedef struct { diff --git a/server/request.c b/server/request.c index 200c2697db..4c1f30a5fe 100644 --- a/server/request.c +++ b/server/request.c @@ -522,8 +522,8 @@ int send_client_fd( struct process *process, int fd, obj_handle_t handle ) return -1; } -/* get current tick count to return to client */ -unsigned int get_tick_count(void) +/* return a monotonic time counter */ +timeout_t monotonic_counter(void) { #ifdef __APPLE__ static mach_timebase_info_data_t timebase; @@ -531,19 +531,19 @@ unsigned int get_tick_count(void) if (!timebase.denom) mach_timebase_info( &timebase ); #ifdef HAVE_MACH_CONTINUOUS_TIME if (&mach_continuous_time != NULL) - return mach_continuous_time() * timebase.numer / timebase.denom / 1000000; + return mach_continuous_time() * timebase.numer / timebase.denom / 100; #endif - return mach_absolute_time() * timebase.numer / timebase.denom / 1000000; + return mach_absolute_time() * timebase.numer / timebase.denom / 100; #elif defined(HAVE_CLOCK_GETTIME) struct timespec ts; #ifdef CLOCK_MONOTONIC_RAW if (!clock_gettime( CLOCK_MONOTONIC_RAW, &ts )) - return ts.tv_sec * 1000 + ts.tv_nsec / 1000000; + return (timeout_t)ts.tv_sec * TICKS_PER_SEC + ts.tv_nsec / 100; #endif if (!clock_gettime( CLOCK_MONOTONIC, &ts )) - return ts.tv_sec * 1000 + ts.tv_nsec / 1000000; + return (timeout_t)ts.tv_sec * TICKS_PER_SEC + ts.tv_nsec / 100; #endif - return (current_time - server_start_time) / 10000; + return current_time - server_start_time; } static void master_socket_dump( struct object *obj, int verbose ) diff --git a/server/request.h b/server/request.h index a5472dd1c2..e7e05af0e4 100644 --- a/server/request.h +++ b/server/request.h @@ -54,7 +54,7 @@ extern int receive_fd( struct process *process ); extern int send_client_fd( struct process *process, int fd, obj_handle_t handle ); extern void read_request( struct thread *thread ); extern void write_reply( struct thread *thread ); -extern unsigned int get_tick_count(void); +extern timeout_t monotonic_counter(void); extern void open_master_socket(void); extern void close_master_socket( timeout_t timeout ); extern void shutdown_master_socket(void); @@ -66,6 +66,12 @@ extern int server_dir_fd, config_dir_fd; extern void trace_request(void); extern void trace_reply( enum request req, const union generic_reply *reply ); +/* get current tick count to return to client */ +static inline unsigned int get_tick_count(void) +{ + return monotonic_counter() / 10000; +} + /* get the request vararg data */ static inline const void *get_req_data(void) {

1 0

Chip Davis : configure: Make Clang fail optimization arguments it doesn't care about.
by Alexandre Julliard April 9, 2020

April 9, 2020

Module: wine Branch: master Commit: f3b9a4c82689edfc6395ecfd3b221bf0734e43ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3b9a4c82689edfc6395ecfd… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Wed Apr 8 23:02:25 2020 -0500 configure: Make Clang fail optimization arguments it doesn't care about. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 129 +++++++++++++++++++++++++++++++++++------------------------ configure.ac | 9 +++-- 2 files changed, 82 insertions(+), 56 deletions(-) diff --git a/configure b/configure index d40ebf82dc..7a47e0ff60 100755 --- a/configure +++ b/configure @@ -16869,7 +16869,83 @@ if test "x${GCC}" = "xyes" then EXTRACFLAGS="-Wall -pipe" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fcf-protection=none" >&5 + saved_CFLAGS=$CFLAGS + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror=unknown-warning-option" >&5 +$as_echo_n "checking whether the compiler supports -Werror=unknown-warning-option... " >&6; } +if ${ac_cv_cflags__Werror_unknown_warning_option+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Werror=unknown-warning-option" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Werror_unknown_warning_option=yes +else + ac_cv_cflags__Werror_unknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Werror_unknown_warning_option" >&5 +$as_echo "$ac_cv_cflags__Werror_unknown_warning_option" >&6; } +if test "x$ac_cv_cflags__Werror_unknown_warning_option" = xyes; then : + CFLAGS="$CFLAGS -Werror=unknown-warning-option" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror=unused-command-line-argument" >&5 +$as_echo_n "checking whether the compiler supports -Werror=unused-command-line-argument... " >&6; } +if ${ac_cv_cflags__Werror_unused_command_line_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Werror=unused-command-line-argument" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Werror_unused_command_line_argument=yes +else + ac_cv_cflags__Werror_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Werror_unused_command_line_argument" >&5 +$as_echo "$ac_cv_cflags__Werror_unused_command_line_argument" >&6; } +if test "x$ac_cv_cflags__Werror_unused_command_line_argument" = xyes; then : + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror=ignored-optimization-argument" >&5 +$as_echo_n "checking whether the compiler supports -Werror=ignored-optimization-argument... " >&6; } +if ${ac_cv_cflags__Werror_ignored_optimization_argument+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Werror=ignored-optimization-argument" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Werror_ignored_optimization_argument=yes +else + ac_cv_cflags__Werror_ignored_optimization_argument=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Werror_ignored_optimization_argument" >&5 +$as_echo "$ac_cv_cflags__Werror_ignored_optimization_argument" >&6; } +if test "x$ac_cv_cflags__Werror_ignored_optimization_argument" = xyes; then : + CFLAGS="$CFLAGS -Werror=ignored-optimization-argument" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fcf-protection=none" >&5 $as_echo_n "checking whether the compiler supports -fcf-protection=none... " >&6; } if ${ac_cv_cflags__fcf_protection_none+:} false; then : $as_echo_n "(cached) " >&6 @@ -16969,57 +17045,6 @@ $as_echo "$ac_cv_cflags__fexcess_precision_standard" >&6; } if test "x$ac_cv_cflags__fexcess_precision_standard" = xyes; then : EXCESS_PRECISION_CFLAGS="-fexcess-precision=standard" -fi - saved_CFLAGS=$CFLAGS - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror=unknown-warning-option" >&5 -$as_echo_n "checking whether the compiler supports -Werror=unknown-warning-option... " >&6; } -if ${ac_cv_cflags__Werror_unknown_warning_option+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Werror=unknown-warning-option" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(int argc, char **argv) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__Werror_unknown_warning_option=yes -else - ac_cv_cflags__Werror_unknown_warning_option=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Werror_unknown_warning_option" >&5 -$as_echo "$ac_cv_cflags__Werror_unknown_warning_option" >&6; } -if test "x$ac_cv_cflags__Werror_unknown_warning_option" = xyes; then : - CFLAGS="$CFLAGS -Werror=unknown-warning-option" -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Werror=unused-command-line-argument" >&5 -$as_echo_n "checking whether the compiler supports -Werror=unused-command-line-argument... " >&6; } -if ${ac_cv_cflags__Werror_unused_command_line_argument+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_wine_try_cflags_saved=$CFLAGS -CFLAGS="$CFLAGS -Werror=unused-command-line-argument" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int main(int argc, char **argv) { return 0; } -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_cflags__Werror_unused_command_line_argument=yes -else - ac_cv_cflags__Werror_unused_command_line_argument=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -CFLAGS=$ac_wine_try_cflags_saved -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Werror_unused_command_line_argument" >&5 -$as_echo "$ac_cv_cflags__Werror_unused_command_line_argument" >&6; } -if test "x$ac_cv_cflags__Werror_unused_command_line_argument" = xyes; then : - CFLAGS="$CFLAGS -Werror=unused-command-line-argument" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wdeclaration-after-statement" >&5 $as_echo_n "checking whether the compiler supports -Wdeclaration-after-statement... " >&6; } diff --git a/configure.ac b/configure.ac index 6d55f1a661..fb775d7a73 100644 --- a/configure.ac +++ b/configure.ac @@ -2004,14 +2004,15 @@ then EXTRACFLAGS="-Wall -pipe" dnl Check for some compiler flags - WINE_TRY_CFLAGS([-fcf-protection=none]) - WINE_TRY_CFLAGS([-fno-stack-protector]) - WINE_TRY_CFLAGS([-fno-strict-aliasing]) - WINE_TRY_CFLAGS([-fexcess-precision=standard],[AC_SUBST(EXCESS_PRECISION_CFLAGS,"-fexcess-precision=standard")]) dnl clang needs to be told to fail on unknown options saved_CFLAGS=$CFLAGS WINE_TRY_CFLAGS([-Werror=unknown-warning-option],[CFLAGS="$CFLAGS -Werror=unknown-warning-option"]) WINE_TRY_CFLAGS([-Werror=unused-command-line-argument],[CFLAGS="$CFLAGS -Werror=unused-command-line-argument"]) + WINE_TRY_CFLAGS([-Werror=ignored-optimization-argument],[CFLAGS="$CFLAGS -Werror=ignored-optimization-argument"]) + WINE_TRY_CFLAGS([-fcf-protection=none]) + WINE_TRY_CFLAGS([-fno-stack-protector]) + WINE_TRY_CFLAGS([-fno-strict-aliasing]) + WINE_TRY_CFLAGS([-fexcess-precision=standard],[AC_SUBST(EXCESS_PRECISION_CFLAGS,"-fexcess-precision=standard")]) WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wempty-body]) WINE_TRY_CFLAGS([-Wignored-qualifiers])

1 0

Alexandre Julliard : winedump: Get rid of a useless destructor.
by Alexandre Julliard April 9, 2020

April 9, 2020

Module: wine Branch: master Commit: 3d77dd10580207b78d426e01788e9303ffa108b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d77dd10580207b78d426e01… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 9 21:03:53 2020 +0200 winedump: Get rid of a useless destructor. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/search.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/tools/winedump/search.c b/tools/winedump/search.c index 49f83ca70f..716d2feb6f 100644 --- a/tools/winedump/search.c +++ b/tools/winedump/search.c @@ -337,18 +337,3 @@ static const char *get_type (parsed_symbol *sym, const char *proto, int arg) } return proto_str; } - - -#ifdef __GNUC__ -/******************************************************************* - * search_cleanup - * - * Free memory used while searching (a niceity) - */ -void search_cleanup (void) __attribute__ ((destructor)); -void search_cleanup (void) -{ - free (grep_buff); - free (fgrep_buff); -} -#endif

1 0

Dmitry Timoshkov : adsldp: Use correct format specifiers for SYSTEMTIME fields.
by Alexandre Julliard April 9, 2020

April 9, 2020

Module: wine Branch: master Commit: 3eaecb2854a111bc8eeb71d247378251031467dc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3eaecb2854a111bc8eeb71d2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 9 16:01:17 2020 +0800 adsldp: Use correct format specifiers for SYSTEMTIME fields. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/adsldp/adsldp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index c52f71b751..6d411430a0 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -1586,7 +1586,7 @@ static HRESULT add_column_values(LDAP_namespace *ldap, struct ldap_search_contex { col->pADsValues[i].dwType = type; if (values[i]->bv_len < 14 || - _snscanf_l(values[i]->bv_val, values[i]->bv_len, "%04u%02u%02u%02u%02u%02u", NULL, + _snscanf_l(values[i]->bv_val, values[i]->bv_len, "%04hu%02hu%02hu%02hu%02hu%02hu", NULL, &col->pADsValues[i].u.UTCTime.wYear, &col->pADsValues[i].u.UTCTime.wMonth, &col->pADsValues[i].u.UTCTime.wDay, &col->pADsValues[i].u.UTCTime.wHour, &col->pADsValues[i].u.UTCTime.wMinute, &col->pADsValues[i].u.UTCTime.wSecond) != 6)

1 0