Piotr Caban : msvcrt: Rename scheduler.c file to concurrency.c.

Alexandre Julliard julliard at winehq.org
Wed Aug 18 16:22:10 CDT 2021


Module: wine
Branch: master
Commit: eff57ac9c6280751f5f51a66fcac05d6f842fecb
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=eff57ac9c6280751f5f51a66fcac05d6f842fecb

Author: Piotr Caban <piotr at codeweavers.com>
Date:   Wed Aug 18 16:09:09 2021 +0200

msvcrt: Rename scheduler.c file to concurrency.c.

Signed-off-by: Piotr Caban <piotr at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/msvcr100/Makefile.in                  | 2 +-
 dlls/msvcr110/Makefile.in                  | 2 +-
 dlls/msvcr120/Makefile.in                  | 2 +-
 dlls/msvcrt/Makefile.in                    | 2 +-
 dlls/msvcrt/{scheduler.c => concurrency.c} | 6 +++---
 dlls/msvcrt/main.c                         | 4 ++--
 dlls/msvcrt/msvcrt.h                       | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in
index 7a760a57e3b..7996a60718a 100644
--- a/dlls/msvcr100/Makefile.in
+++ b/dlls/msvcr100/Makefile.in
@@ -7,6 +7,7 @@ PARENTSRC = ../msvcrt
 EXTRADLLFLAGS = -mno-cygwin
 
 C_SRCS = \
+	concurrency.c \
 	console.c \
 	cpp.c \
 	ctype.c \
@@ -33,7 +34,6 @@ C_SRCS = \
 	onexit.c \
 	process.c \
 	scanf.c \
-	scheduler.c \
 	sincos.c \
 	string.c \
 	thread.c \
diff --git a/dlls/msvcr110/Makefile.in b/dlls/msvcr110/Makefile.in
index 0d0d73b3262..5ea8706a78c 100644
--- a/dlls/msvcr110/Makefile.in
+++ b/dlls/msvcr110/Makefile.in
@@ -7,6 +7,7 @@ PARENTSRC = ../msvcrt
 EXTRADLLFLAGS = -mno-cygwin
 
 C_SRCS = \
+	concurrency.c \
 	console.c \
 	cpp.c \
 	ctype.c \
@@ -33,7 +34,6 @@ C_SRCS = \
 	onexit.c \
 	process.c \
 	scanf.c \
-	scheduler.c \
 	sincos.c \
 	string.c \
 	thread.c \
diff --git a/dlls/msvcr120/Makefile.in b/dlls/msvcr120/Makefile.in
index aff77ba24ac..3a045483f6c 100644
--- a/dlls/msvcr120/Makefile.in
+++ b/dlls/msvcr120/Makefile.in
@@ -7,6 +7,7 @@ PARENTSRC = ../msvcrt
 EXTRADLLFLAGS = -mno-cygwin
 
 C_SRCS = \
+	concurrency.c \
 	console.c \
 	cpp.c \
 	ctype.c \
@@ -33,7 +34,6 @@ C_SRCS = \
 	onexit.c \
 	process.c \
 	scanf.c \
-	scheduler.c \
 	sincos.c \
 	string.c \
 	thread.c \
diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in
index 74d88088444..a2f62613296 100644
--- a/dlls/msvcrt/Makefile.in
+++ b/dlls/msvcrt/Makefile.in
@@ -6,6 +6,7 @@ DELAYIMPORTS = advapi32 user32
 EXTRADLLFLAGS = -mno-cygwin
 
 C_SRCS = \
+	concurrency.c \
 	console.c \
 	cpp.c \
 	crt_gccmain.c \
@@ -37,7 +38,6 @@ C_SRCS = \
 	onexit.c \
 	process.c \
 	scanf.c \
-	scheduler.c \
 	sincos.c \
 	string.c \
 	thread.c \
diff --git a/dlls/msvcrt/scheduler.c b/dlls/msvcrt/concurrency.c
similarity index 99%
rename from dlls/msvcrt/scheduler.c
rename to dlls/msvcrt/concurrency.c
index b8bff6119bf..ba3dc6be4ad 100644
--- a/dlls/msvcrt/scheduler.c
+++ b/dlls/msvcrt/concurrency.c
@@ -1,5 +1,5 @@
 /*
- * msvcrt.dll C++ objects
+ * Concurrency namespace implementation
  *
  * Copyright 2017 Piotr Caban
  *
@@ -1136,7 +1136,7 @@ __ASM_BLOCK_BEGIN(scheduler_vtables)
             );
 __ASM_BLOCK_END
 
-void msvcrt_init_scheduler(void *base)
+void msvcrt_init_concurrency(void *base)
 {
 #ifdef __x86_64__
     init_Context_rtti(base);
@@ -1148,7 +1148,7 @@ void msvcrt_init_scheduler(void *base)
 #endif
 }
 
-void msvcrt_free_scheduler(void)
+void msvcrt_free_concurrency(void)
 {
     if (context_tls_index != TLS_OUT_OF_INDEXES)
         TlsFree(context_tls_index);
diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c
index 61e8479bf90..23dfb24ac5d 100644
--- a/dlls/msvcrt/main.c
+++ b/dlls/msvcrt/main.c
@@ -116,7 +116,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
     msvcrt_init_args();
     msvcrt_init_signals();
 #if _MSVCR_VER >= 100 && _MSVCR_VER <= 120
-    msvcrt_init_scheduler(hinstDLL);
+    msvcrt_init_concurrency(hinstDLL);
 #endif
 #if _MSVCR_VER == 0
     /* don't allow unloading msvcrt, we can't setup file handles twice */
@@ -143,7 +143,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
     _free_locale(MSVCRT_locale);
 #if _MSVCR_VER >= 100 && _MSVCR_VER <= 120
     msvcrt_free_scheduler_thread();
-    msvcrt_free_scheduler();
+    msvcrt_free_concurrency();
 #endif
     msvcrt_destroy_heap();
     TRACE("finished process free\n");
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index ad366a74d86..51e9b9726db 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -245,8 +245,8 @@ extern void msvcrt_destroy_heap(void) DECLSPEC_HIDDEN;
 extern void msvcrt_init_clock(void) DECLSPEC_HIDDEN;
 
 #if _MSVCR_VER >= 100
-extern void msvcrt_init_scheduler(void*) DECLSPEC_HIDDEN;
-extern void msvcrt_free_scheduler(void) DECLSPEC_HIDDEN;
+extern void msvcrt_init_concurrency(void*) DECLSPEC_HIDDEN;
+extern void msvcrt_free_concurrency(void) DECLSPEC_HIDDEN;
 extern void msvcrt_free_scheduler_thread(void) DECLSPEC_HIDDEN;
 #endif
 




More information about the wine-cvs mailing list