Skip to content

W
wine-winehq
Commit eff57ac9 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

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

Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 6c4cddc4
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
dlls/msvcr100/Makefile.in
View file @ eff57ac9
...@@ -7,6 +7,7 @@ PARENTSRC = ../msvcrt ...@@ -7,6 +7,7 @@ PARENTSRC = ../msvcrt
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \ C_SRCS = \
concurrency.c \
console.c \ console.c \
cpp.c \ cpp.c \
ctype.c \ ctype.c \
...@@ -33,7 +34,6 @@ C_SRCS = \ ...@@ -33,7 +34,6 @@ C_SRCS = \
onexit.c \ onexit.c \
process.c \ process.c \
scanf.c \ scanf.c \
scheduler.c \
sincos.c \ sincos.c \
string.c \ string.c \
thread.c \ thread.c \
......
dlls/msvcr110/Makefile.in
View file @ eff57ac9
...@@ -7,6 +7,7 @@ PARENTSRC = ../msvcrt ...@@ -7,6 +7,7 @@ PARENTSRC = ../msvcrt
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \ C_SRCS = \
concurrency.c \
console.c \ console.c \
cpp.c \ cpp.c \
ctype.c \ ctype.c \
...@@ -33,7 +34,6 @@ C_SRCS = \ ...@@ -33,7 +34,6 @@ C_SRCS = \
onexit.c \ onexit.c \
process.c \ process.c \
scanf.c \ scanf.c \
scheduler.c \
sincos.c \ sincos.c \
string.c \ string.c \
thread.c \ thread.c \
......
dlls/msvcr120/Makefile.in
View file @ eff57ac9
...@@ -7,6 +7,7 @@ PARENTSRC = ../msvcrt ...@@ -7,6 +7,7 @@ PARENTSRC = ../msvcrt
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \ C_SRCS = \
concurrency.c \
console.c \ console.c \
cpp.c \ cpp.c \
ctype.c \ ctype.c \
...@@ -33,7 +34,6 @@ C_SRCS = \ ...@@ -33,7 +34,6 @@ C_SRCS = \
onexit.c \ onexit.c \
process.c \ process.c \
scanf.c \ scanf.c \
scheduler.c \
sincos.c \ sincos.c \
string.c \ string.c \
thread.c \ thread.c \
......
dlls/msvcrt/Makefile.in
View file @ eff57ac9
...@@ -6,6 +6,7 @@ DELAYIMPORTS = advapi32 user32 ...@@ -6,6 +6,7 @@ DELAYIMPORTS = advapi32 user32
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \ C_SRCS = \
concurrency.c \
console.c \ console.c \
cpp.c \ cpp.c \
crt_gccmain.c \ crt_gccmain.c \
...@@ -37,7 +38,6 @@ C_SRCS = \ ...@@ -37,7 +38,6 @@ C_SRCS = \
onexit.c \ onexit.c \
process.c \ process.c \
scanf.c \ scanf.c \
scheduler.c \
sincos.c \ sincos.c \
string.c \ string.c \
thread.c \ thread.c \
......
dlls/msvcrt/scheduler.c → dlls/msvcrt/concurrency.c
View file @ eff57ac9
/* /*
* msvcrt.dll C++ objects * Concurrency namespace implementation
* *
* Copyright 2017 Piotr Caban * Copyright 2017 Piotr Caban
* *
...@@ -1136,7 +1136,7 @@ __ASM_BLOCK_BEGIN(scheduler_vtables) ...@@ -1136,7 +1136,7 @@ __ASM_BLOCK_BEGIN(scheduler_vtables)
); );
__ASM_BLOCK_END __ASM_BLOCK_END
void msvcrt_init_scheduler(void *base) void msvcrt_init_concurrency(void *base)
{ {
#ifdef __x86_64__ #ifdef __x86_64__
init_Context_rtti(base); init_Context_rtti(base);
...@@ -1148,7 +1148,7 @@ void msvcrt_init_scheduler(void *base) ...@@ -1148,7 +1148,7 @@ void msvcrt_init_scheduler(void *base)
#endif #endif
} }
void msvcrt_free_scheduler(void) void msvcrt_free_concurrency(void)
{ {
if (context_tls_index != TLS_OUT_OF_INDEXES) if (context_tls_index != TLS_OUT_OF_INDEXES)
TlsFree(context_tls_index); TlsFree(context_tls_index);
......
dlls/msvcrt/main.c
View file @ eff57ac9
...@@ -116,7 +116,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) ...@@ -116,7 +116,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
msvcrt_init_args(); msvcrt_init_args();
msvcrt_init_signals(); msvcrt_init_signals();
#if _MSVCR_VER >= 100 && _MSVCR_VER <= 120 #if _MSVCR_VER >= 100 && _MSVCR_VER <= 120
msvcrt_init_scheduler(hinstDLL); msvcrt_init_concurrency(hinstDLL);
#endif #endif
#if _MSVCR_VER == 0 #if _MSVCR_VER == 0
/* don't allow unloading msvcrt, we can't setup file handles twice */ /* 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) ...@@ -143,7 +143,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
_free_locale(MSVCRT_locale); _free_locale(MSVCRT_locale);
#if _MSVCR_VER >= 100 && _MSVCR_VER <= 120 #if _MSVCR_VER >= 100 && _MSVCR_VER <= 120
msvcrt_free_scheduler_thread(); msvcrt_free_scheduler_thread();
msvcrt_free_scheduler(); msvcrt_free_concurrency();
#endif #endif
msvcrt_destroy_heap(); msvcrt_destroy_heap();
TRACE("finished process free\n"); TRACE("finished process free\n");
......
dlls/msvcrt/msvcrt.h
View file @ eff57ac9
...@@ -245,8 +245,8 @@ extern void msvcrt_destroy_heap(void) DECLSPEC_HIDDEN; ...@@ -245,8 +245,8 @@ extern void msvcrt_destroy_heap(void) DECLSPEC_HIDDEN;
extern void msvcrt_init_clock(void) DECLSPEC_HIDDEN; extern void msvcrt_init_clock(void) DECLSPEC_HIDDEN;
#if _MSVCR_VER >= 100 #if _MSVCR_VER >= 100
extern void msvcrt_init_scheduler(void*) DECLSPEC_HIDDEN; extern void msvcrt_init_concurrency(void*) DECLSPEC_HIDDEN;
extern void msvcrt_free_scheduler(void) DECLSPEC_HIDDEN; extern void msvcrt_free_concurrency(void) DECLSPEC_HIDDEN;
extern void msvcrt_free_scheduler_thread(void) DECLSPEC_HIDDEN; extern void msvcrt_free_scheduler_thread(void) DECLSPEC_HIDDEN;
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment