Skip to content

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

msvcrt: Remove MSVCRT_ prefix from cpp.c functions.

Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 6c4b7758
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 55 deletions
dlls/msvcrt/cppexcept.h
View file @ 772f0331
......@@ -163,7 +163,7 @@ static const cxx_type_info type ## _cxx_type_info = { \
& type ##_type_info, \
{ 0, -1, 0 }, \
sizeof(type), \
(cxx_copy_ctor)THISCALL(MSVCRT_ ## type ##_copy_ctor) \
(cxx_copy_ctor)THISCALL(type ##_copy_ctor) \
}; \
\
static const cxx_type_info_table type ## _type_info_table = { \
......@@ -177,7 +177,7 @@ static const cxx_type_info_table type ## _type_info_table = { \
\
static const cxx_exception_type type ## _exception_type = { \
0, \
(cxx_copy_ctor)THISCALL(MSVCRT_ ## type ## _dtor), \
(cxx_copy_ctor)THISCALL(type ## _dtor), \
NULL, \
& type ## _type_info_table \
};
......@@ -213,11 +213,11 @@ static cxx_exception_type type ##_exception_type = { \
static void init_ ## type ## _cxx(char *base) \
{ \
type ## _cxx_type_info.type_info = (char *)&type ## _type_info - base; \
type ## _cxx_type_info.copy_ctor = (char *)MSVCRT_ ## type ## _copy_ctor - base; \
type ## _cxx_type_info.copy_ctor = (char *)type ## _copy_ctor - base; \
type ## _type_info_table.info[0] = (char *)&type ## _cxx_type_info - base; \
type ## _type_info_table.info[1] = (char *)cl1 - base; \
type ## _type_info_table.info[2] = (char *)cl2 - base; \
type ## _exception_type.destructor = (char *)MSVCRT_ ## type ## _dtor - base; \
type ## _exception_type.destructor = (char *)type ## _dtor - base; \
type ## _exception_type.type_info_table = (char *)&type ## _type_info_table - base; \
}
#endif
......
dlls/msvcrt/cxx.h
View file @ 772f0331
......@@ -26,8 +26,8 @@
__asm__(".data\n" \
"\t.balign 8\n" \
"\t.quad " __ASM_NAME(#name "_rtti") "\n" \
"\t.globl " __ASM_NAME("MSVCRT_" #name "_vtable") "\n" \
__ASM_NAME("MSVCRT_" #name "_vtable") ":\n" \
"\t.globl " __ASM_NAME(#name "_vtable") "\n" \
__ASM_NAME(#name "_vtable") ":\n" \
funcs "\n\t.text")
#else
......@@ -38,8 +38,8 @@
__asm__(".data\n" \
"\t.balign 4\n" \
"\t.long " __ASM_NAME(#name "_rtti") "\n" \
"\t.globl " __ASM_NAME("MSVCRT_" #name "_vtable") "\n" \
__ASM_NAME("MSVCRT_" #name "_vtable") ":\n" \
"\t.globl " __ASM_NAME(#name "_vtable") "\n" \
__ASM_NAME(#name "_vtable") ":\n" \
funcs "\n\t.text")
#endif /* _WIN64 */
......@@ -48,7 +48,7 @@
#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \
static type_info name ## _type_info = { \
&MSVCRT_type_info_vtable, \
&type_info_vtable, \
NULL, \
mangled_name \
}; \
......@@ -94,7 +94,7 @@ const rtti_object_locator name ## _rtti = { \
#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \
static type_info name ## _type_info = { \
&MSVCRT_type_info_vtable, \
&type_info_vtable, \
NULL, \
mangled_name \
}; \
......@@ -264,4 +264,4 @@ extern void *vtbl_wrapper_48;
#endif
exception* __thiscall MSVCRT_exception_ctor(exception*, const char**);
exception* __thiscall exception_ctor(exception*, const char**);
dlls/msvcrt/except_i386.c
View file @ 772f0331
......@@ -326,7 +326,7 @@ static void cxx_local_unwind( cxx_exception_frame* frame, const cxx_function_des
if (trylevel < 0 || trylevel >= descr->unwind_count)
{
ERR( "invalid trylevel %d\n", trylevel );
MSVCRT_terminate();
terminate();
}
handler = descr->unwind_table[trylevel].handler;
if (handler)
......@@ -538,7 +538,7 @@ static LONG CALLBACK se_translation_filter( EXCEPTION_POINTERS *ep, void *c )
if (rec->ExceptionCode != CXX_EXCEPTION)
{
TRACE( "non-c++ exception thrown in SEH handler: %x\n", rec->ExceptionCode );
MSVCRT_terminate();
terminate();
}
exc_type = (cxx_exception_type *)rec->ExceptionInformation[2];
......@@ -557,7 +557,7 @@ static void check_noexcept( PEXCEPTION_RECORD rec,
(descr->flags & FUNC_DESCR_NOEXCEPT))
{
ERR("noexcept function propagating exception\n");
MSVCRT_terminate();
terminate();
}
}
......
dlls/msvcrt/except_x86_64.c
View file @ 772f0331
......@@ -289,7 +289,7 @@ static void cxx_local_unwind(ULONG64 frame, DISPATCHER_CONTEXT *dispatch,
if (trylevel<0 || trylevel>=descr->unwind_count)
{
ERR("invalid trylevel %d\n", trylevel);
MSVCRT_terminate();
terminate();
}
handler = rva_to_ptr(unwind_table[trylevel].handler, dispatch->ImageBase);
if (handler)
......@@ -486,7 +486,7 @@ static LONG CALLBACK se_translation_filter(EXCEPTION_POINTERS *ep, void *c)
if (rec->ExceptionCode != CXX_EXCEPTION)
{
TRACE("non-c++ exception thrown in SEH handler: %x\n", rec->ExceptionCode);
MSVCRT_terminate();
terminate();
}
exc_type = (cxx_exception_type *)rec->ExceptionInformation[2];
......@@ -505,7 +505,7 @@ static void check_noexcept( PEXCEPTION_RECORD rec,
(descr->flags & FUNC_DESCR_NOEXCEPT))
{
ERR("noexcept function propagating exception\n");
MSVCRT_terminate();
terminate();
}
}
......
dlls/msvcrt/msvcrt.h
View file @ 772f0331
......@@ -30,11 +30,11 @@
#define DBL80_MAX_10_EXP 4932
#define DBL80_MIN_10_EXP -4951
typedef void (__cdecl *MSVCRT_terminate_handler)(void);
typedef void (__cdecl *MSVCRT_terminate_function)(void);
typedef void (__cdecl *MSVCRT_unexpected_handler)(void);
typedef void (__cdecl *MSVCRT_unexpected_function)(void);
typedef void (__cdecl *MSVCRT__se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info);
typedef void (__cdecl *terminate_function)(void);
typedef void (__cdecl *unexpected_function)(void);
typedef void (__cdecl *_se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info);
void __cdecl terminate(void);
typedef void (__cdecl *MSVCRT__beginthread_start_routine_t)(void *);
typedef unsigned int (__stdcall *MSVCRT__beginthreadex_start_routine_t)(void *);
typedef int (__cdecl *MSVCRT__onexit_t)(void);
......@@ -153,9 +153,9 @@ struct __thread_data {
pthreadlocinfo locinfo;
int locale_flags;
int unk5[1];
MSVCRT_terminate_function terminate_handler;
MSVCRT_unexpected_function unexpected_handler;
MSVCRT__se_translator_function se_translator; /* preserve offset to exc_record and processing_throw */
terminate_function terminate_handler;
unexpected_function unexpected_handler;
_se_translator_function se_translator; /* preserve offset to exc_record and processing_throw */
void *unk6;
EXCEPTION_RECORD *exc_record;
CONTEXT *ctx_record;
......@@ -864,7 +864,6 @@ size_t __cdecl MSVCRT__fwrite_nolock(const void*,size_t,size_t,MSVCRT_FILE*);
int __cdecl MSVCRT_fclose(MSVCRT_FILE*);
int __cdecl MSVCRT__fclose_nolock(MSVCRT_FILE*);
int __cdecl MSVCRT__fflush_nolock(MSVCRT_FILE*);
void __cdecl MSVCRT_terminate(void);
MSVCRT_FILE* __cdecl MSVCRT__iob_func(void);
__time32_t __cdecl MSVCRT__time32(__time32_t*);
__time64_t __cdecl MSVCRT__time64(__time64_t*);
......
dlls/msvcrt/scheduler.c
View file @ 772f0331
......@@ -93,7 +93,7 @@ typedef struct {
unsigned int id;
union allocator_cache_entry *allocator_cache[8];
} ExternalContextBase;
extern const vtable_ptr MSVCRT_ExternalContextBase_vtable;
extern const vtable_ptr ExternalContextBase_vtable;
static void ExternalContextBase_ctor(ExternalContextBase*);
typedef struct Scheduler {
......@@ -134,7 +134,7 @@ typedef struct {
HANDLE *shutdown_events;
CRITICAL_SECTION cs;
} ThreadScheduler;
extern const vtable_ptr MSVCRT_ThreadScheduler_vtable;
extern const vtable_ptr ThreadScheduler_vtable;
typedef struct {
Scheduler *scheduler;
......@@ -199,7 +199,7 @@ static Scheduler* try_get_current_scheduler(void)
if (!context)
return NULL;
if (context->context.vtable != &MSVCRT_ExternalContextBase_vtable) {
if (context->context.vtable != &ExternalContextBase_vtable) {
ERR("unknown context set\n");
return NULL;
}
......@@ -210,7 +210,7 @@ static Scheduler* get_current_scheduler(void)
{
ExternalContextBase *context = (ExternalContextBase*)get_current_context();
if (context->context.vtable != &MSVCRT_ExternalContextBase_vtable) {
if (context->context.vtable != &ExternalContextBase_vtable) {
ERR("unknown context set\n");
return NULL;
}
......@@ -375,7 +375,7 @@ static void ExternalContextBase_ctor(ExternalContextBase *this)
TRACE("(%p)->()\n", this);
memset(this, 0, sizeof(*this));
this->context.vtable = &MSVCRT_ExternalContextBase_vtable;
this->context.vtable = &ExternalContextBase_vtable;
this->id = InterlockedIncrement(&context_id);
create_default_scheduler();
......@@ -394,7 +394,7 @@ void * CDECL Concurrency_Alloc(size_t size)
if (size < sizeof(*p))
size = sizeof(*p);
if (context->context.vtable != &MSVCRT_ExternalContextBase_vtable) {
if (context->context.vtable != &ExternalContextBase_vtable) {
p = MSVCRT_operator_new(size);
p->alloc.bucket = -1;
}else {
......@@ -431,7 +431,7 @@ void CDECL Concurrency_Free(void* mem)
TRACE("(%p)\n", mem);
if (context->context.vtable != &MSVCRT_ExternalContextBase_vtable) {
if (context->context.vtable != &ExternalContextBase_vtable) {
MSVCRT_operator_delete(p);
}else {
if(bucket >= 0 && bucket < ARRAY_SIZE(context->allocator_cache) &&
......@@ -698,7 +698,7 @@ void __thiscall ThreadScheduler_Attach(ThreadScheduler *this)
TRACE("(%p)\n", this);
if(context->context.vtable != &MSVCRT_ExternalContextBase_vtable) {
if(context->context.vtable != &ExternalContextBase_vtable) {
ERR("unknown context set\n");
return;
}
......@@ -779,7 +779,7 @@ static ThreadScheduler* ThreadScheduler_ctor(ThreadScheduler *this,
TRACE("(%p)->()\n", this);
this->scheduler.vtable = &MSVCRT_ThreadScheduler_vtable;
this->scheduler.vtable = &ThreadScheduler_vtable;
this->ref = 1;
this->id = InterlockedIncrement(&scheduler_id);
SchedulerPolicy_copy_ctor(&this->policy, policy);
......@@ -857,7 +857,7 @@ void __cdecl CurrentScheduler_Detach(void)
if(!context)
throw_exception(EXCEPTION_IMPROPER_SCHEDULER_DETACH, 0, NULL);
if(context->context.vtable != &MSVCRT_ExternalContextBase_vtable) {
if(context->context.vtable != &ExternalContextBase_vtable) {
ERR("unknown context set\n");
return;
}
......@@ -1097,7 +1097,7 @@ DEFINE_VTBL_WRAPPER(48);
#endif
extern const vtable_ptr MSVCRT_type_info_vtable;
extern const vtable_ptr type_info_vtable;
DEFINE_RTTI_DATA0(Context, 0, ".?AVContext@Concurrency@@")
DEFINE_RTTI_DATA1(ContextBase, 0, &Context_rtti_base_descriptor, ".?AVContextBase@details@Concurrency@@")
DEFINE_RTTI_DATA2(ExternalContextBase, 0, &ContextBase_rtti_base_descriptor,
......
dlls/ucrtbase/ucrtbase.spec
View file @ 772f0331
......@@ -63,9 +63,9 @@
@ stub __GetPlatformExceptionInfo
@ stub __NLG_Dispatch2
@ stub __NLG_Return2
@ cdecl __RTCastToVoid(ptr) MSVCRT___RTCastToVoid
@ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast
@ cdecl __RTtypeid(ptr) MSVCRT___RTtypeid
@ cdecl __RTCastToVoid(ptr)
@ cdecl __RTDynamicCast(ptr long ptr ptr long)
@ cdecl __RTtypeid(ptr)
@ stub __TypeMatch
@ cdecl ___lc_codepage_func()
@ cdecl ___lc_collate_cp_func()
......@@ -142,10 +142,10 @@
@ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr
@ cdecl __std_exception_copy(ptr ptr) MSVCRT___std_exception_copy
@ cdecl __std_exception_destroy(ptr) MSVCRT___std_exception_destroy
@ cdecl __std_type_info_compare(ptr ptr) MSVCRT_type_info_compare
@ cdecl __std_type_info_destroy_list(ptr) MSVCRT_type_info_destroy_list
@ cdecl __std_type_info_hash(ptr) MSVCRT_type_info_hash
@ cdecl __std_type_info_name(ptr ptr) MSVCRT_type_info_name_list
@ cdecl __std_type_info_compare(ptr ptr)
@ cdecl __std_type_info_destroy_list(ptr)
@ cdecl __std_type_info_hash(ptr)
@ cdecl __std_type_info_name(ptr ptr)
@ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf
@ stub __stdio_common_vfprintf_p
@ cdecl __stdio_common_vfprintf_s(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf_s
......@@ -374,11 +374,11 @@
@ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output
@ cdecl _get_purecall_handler()
@ cdecl _get_stream_buffer_pointers(ptr ptr ptr ptr) MSVCRT__get_stream_buffer_pointers
@ cdecl _get_terminate() MSVCRT__get_terminate
@ cdecl _get_terminate()
@ cdecl _get_thread_local_invalid_parameter_handler()
@ cdecl _get_timezone(ptr)
@ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname
@ cdecl _get_unexpected() MSVCRT__get_unexpected
@ cdecl _get_unexpected()
@ cdecl _get_wide_winmain_command_line()
@ cdecl _get_wpgmptr(ptr)
@ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock
......@@ -808,8 +808,8 @@
@ stub _o___pwctype_func
@ cdecl _o___std_exception_copy(ptr ptr) MSVCRT___std_exception_copy
@ cdecl _o___std_exception_destroy(ptr) MSVCRT___std_exception_destroy
@ cdecl _o___std_type_info_destroy_list(ptr) MSVCRT_type_info_destroy_list
@ cdecl _o___std_type_info_name(ptr ptr) MSVCRT_type_info_name_list
@ cdecl _o___std_type_info_destroy_list(ptr) __std_type_info_destroy_list
@ cdecl _o___std_type_info_name(ptr ptr) __std_type_info_name
@ cdecl _o___stdio_common_vfprintf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf
@ stub _o___stdio_common_vfprintf_p
@ cdecl _o___stdio_common_vfprintf_s(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf_s
......@@ -989,7 +989,7 @@
@ cdecl _o__get_osfhandle(long) MSVCRT__get_osfhandle
@ cdecl _o__get_pgmptr(ptr) _get_pgmptr
@ cdecl _o__get_stream_buffer_pointers(ptr ptr ptr ptr) MSVCRT__get_stream_buffer_pointers
@ cdecl _o__get_terminate() MSVCRT__get_terminate
@ cdecl _o__get_terminate() _get_terminate
@ cdecl _o__get_thread_local_invalid_parameter_handler() _get_thread_local_invalid_parameter_handler
@ cdecl _o__get_timezone(ptr) _get_timezone
@ cdecl _o__get_tzname(ptr str long long) MSVCRT__get_tzname
......@@ -1767,7 +1767,7 @@
@ cdecl _o_scalbn(double long) MSVCRT__scalb
@ cdecl _o_scalbnf(float long) MSVCRT__scalbf
@ cdecl _o_scalbnl(double long) MSVCR120_scalbnl
@ cdecl _o_set_terminate(ptr) MSVCRT_set_terminate
@ cdecl _o_set_terminate(ptr) set_terminate
@ cdecl _o_setbuf(ptr ptr) MSVCRT_setbuf
@ cdecl _o_setlocale(long str) MSVCRT_setlocale
@ cdecl _o_setvbuf(ptr str long long) MSVCRT_setvbuf
......@@ -1800,7 +1800,7 @@
@ cdecl -arch=!i386 _o_tanf(float) MSVCRT_tanf
@ cdecl _o_tanh(double) MSVCRT_tanh
@ cdecl -arch=!i386 _o_tanhf(float) MSVCRT_tanhf
@ cdecl _o_terminate() MSVCRT_terminate
@ cdecl _o_terminate() terminate
@ cdecl _o_tgamma(double) MSVCR120_tgamma
@ cdecl _o_tgammaf(float) MSVCR120_tgammaf
@ cdecl _o_tgammal(double) MSVCR120_tgamma
......@@ -1892,7 +1892,7 @@
@ cdecl _set_new_mode(long) MSVCRT__set_new_mode
@ cdecl _set_printf_count_output(long) MSVCRT__set_printf_count_output
@ cdecl _set_purecall_handler(ptr)
@ cdecl _set_se_translator(ptr) MSVCRT__set_se_translator
@ cdecl _set_se_translator(ptr)
@ cdecl _set_thread_local_invalid_parameter_handler(ptr)
@ cdecl _seterrormode(long)
@ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3
......@@ -2480,8 +2480,8 @@
@ cdecl scalbn(double long) MSVCRT__scalb
@ cdecl scalbnf(float long) MSVCRT__scalbf
@ cdecl scalbnl(double long) MSVCR120_scalbnl
@ cdecl set_terminate(ptr) MSVCRT_set_terminate
@ cdecl set_unexpected(ptr) MSVCRT_set_unexpected
@ cdecl set_terminate(ptr)
@ cdecl set_unexpected(ptr)
@ cdecl setbuf(ptr ptr) MSVCRT_setbuf
@ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp
@ cdecl setlocale(long str) MSVCRT_setlocale
......@@ -2533,7 +2533,7 @@
@ cdecl -arch=!i386 tanf(float) MSVCRT_tanf
@ cdecl tanh(double) MSVCRT_tanh
@ cdecl -arch=!i386 tanhf(float) MSVCRT_tanhf
@ cdecl terminate() MSVCRT_terminate
@ cdecl terminate()
@ cdecl tgamma(double) MSVCR120_tgamma
@ cdecl tgammaf(float) MSVCR120_tgammaf
@ cdecl tgammal(double) MSVCR120_tgamma
......
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