Piotr Caban : server: Initialize current_time before it's used in init_registry.
Alexandre Julliard
julliard at winehq.org
Thu Apr 9 16:04:46 CDT 2020
Module: wine
Branch: master
Commit: 9bfbb4866231f9c2e6e22e23037c54c5702dd634
URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bfbb4866231f9c2e6e22e23037c54c5702dd634
Author: Piotr Caban <piotr at codeweavers.com>
Date: Mon Apr 6 17:20:58 2020 +0200
server: Initialize current_time before it's used in init_registry.
Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
server/fd.c | 2 +-
server/file.h | 1 +
server/main.c | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/server/fd.c b/server/fd.c
index d4584f7326..c9ef8fde6d 100644
--- a/server/fd.c
+++ b/server/fd.c
@@ -372,7 +372,7 @@ struct timeout_user
static struct list timeout_list = LIST_INIT(timeout_list); /* sorted timeouts list */
timeout_t current_time;
-static inline void set_current_time(void)
+void set_current_time(void)
{
static const timeout_t ticks_1601_to_1970 = (timeout_t)86400 * (369 * 365 + 89) * TICKS_PER_SEC;
struct timeval now;
diff --git a/server/file.h b/server/file.h
index 0df4c17716..ea36cdb07d 100644
--- a/server/file.h
+++ b/server/file.h
@@ -134,6 +134,7 @@ extern timeout_t current_time;
typedef void (*timeout_callback)( void *private );
+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 );
extern const char *get_timeout_str( timeout_t timeout );
diff --git a/server/main.c b/server/main.c
index 26986d34b3..efb205f529 100644
--- a/server/main.c
+++ b/server/main.c
@@ -141,6 +141,7 @@ int main( int argc, char *argv[] )
open_master_socket();
if (debug_level) fprintf( stderr, "wineserver: starting (pid=%ld)\n", (long) getpid() );
+ set_current_time();
init_signals();
init_directories();
init_registry();
More information about the wine-cvs
mailing list