Skip to content

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

msvcp90: Remove MSVCP_bool type.

Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 1990a5e0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 44 deletions
dlls/msvcp90/exception.c
View file @ af5f928e
...@@ -940,7 +940,7 @@ void __cdecl _Xruntime_error(const char *str) ...@@ -940,7 +940,7 @@ void __cdecl _Xruntime_error(const char *str)
} }
/* ?uncaught_exception@std@@YA_NXZ */ /* ?uncaught_exception@std@@YA_NXZ */
MSVCP_bool __cdecl MSVCP__uncaught_exception(void) bool __cdecl MSVCP__uncaught_exception(void)
{ {
return __uncaught_exception(); return __uncaught_exception();
} }
......
dlls/msvcp90/math.c
View file @ af5f928e
...@@ -1000,42 +1000,42 @@ complex_float* __thiscall complex_float_ctor_def(complex_float *this) ...@@ -1000,42 +1000,42 @@ complex_float* __thiscall complex_float_ctor_def(complex_float *this)
/* ??$?8M@std@@YA_NABMABV?$complex@M@0@@Z */ /* ??$?8M@std@@YA_NABMABV?$complex@M@0@@Z */
/* ??$?8M@std@@YA_NAEBMAEBV?$complex@M@0@@Z */ /* ??$?8M@std@@YA_NAEBMAEBV?$complex@M@0@@Z */
MSVCP_bool __cdecl complex_float_equal_fc(const float *l, const complex_float *r) bool __cdecl complex_float_equal_fc(const float *l, const complex_float *r)
{ {
return *l==r->real && r->imag==0; return *l==r->real && r->imag==0;
} }
/* ??$?8M@std@@YA_NABV?$complex@M@0@0@Z */ /* ??$?8M@std@@YA_NABV?$complex@M@0@0@Z */
/* ??$?8M@std@@YA_NAEBV?$complex@M@0@0@Z */ /* ??$?8M@std@@YA_NAEBV?$complex@M@0@0@Z */
MSVCP_bool __cdecl complex_float_equal(const complex_float *l, const complex_float *r) bool __cdecl complex_float_equal(const complex_float *l, const complex_float *r)
{ {
return l->real==r->real && l->imag==r->imag; return l->real==r->real && l->imag==r->imag;
} }
/* ??$?8M@std@@YA_NABV?$complex@M@0@ABM@Z */ /* ??$?8M@std@@YA_NABV?$complex@M@0@ABM@Z */
/* ??$?8M@std@@YA_NAEBV?$complex@M@0@AEBM@Z */ /* ??$?8M@std@@YA_NAEBV?$complex@M@0@AEBM@Z */
MSVCP_bool __cdecl complex_float_equal_cf(const complex_float *l, const float *r) bool __cdecl complex_float_equal_cf(const complex_float *l, const float *r)
{ {
return l->real==*r && l->imag==0; return l->real==*r && l->imag==0;
} }
/* ??$?9M@std@@YA_NABMABV?$complex@M@0@@Z */ /* ??$?9M@std@@YA_NABMABV?$complex@M@0@@Z */
/* ??$?9M@std@@YA_NAEBMAEBV?$complex@M@0@@Z */ /* ??$?9M@std@@YA_NAEBMAEBV?$complex@M@0@@Z */
MSVCP_bool __cdecl complex_float_not_equal_fc(const float *l, const complex_float *r) bool __cdecl complex_float_not_equal_fc(const float *l, const complex_float *r)
{ {
return !complex_float_equal_fc(l, r); return !complex_float_equal_fc(l, r);
} }
/* ??$?9M@std@@YA_NABV?$complex@M@0@0@Z */ /* ??$?9M@std@@YA_NABV?$complex@M@0@0@Z */
/* ??$?9M@std@@YA_NAEBV?$complex@M@0@0@Z */ /* ??$?9M@std@@YA_NAEBV?$complex@M@0@0@Z */
MSVCP_bool __cdecl complex_float_not_equal(const complex_float *l, const complex_float *r) bool __cdecl complex_float_not_equal(const complex_float *l, const complex_float *r)
{ {
return !complex_float_equal(l, r); return !complex_float_equal(l, r);
} }
/* ??$?9M@std@@YA_NABV?$complex@M@0@ABM@Z */ /* ??$?9M@std@@YA_NABV?$complex@M@0@ABM@Z */
/* ??$?9M@std@@YA_NAEBV?$complex@M@0@AEBM@Z */ /* ??$?9M@std@@YA_NAEBV?$complex@M@0@AEBM@Z */
MSVCP_bool __cdecl complex_float_not_equal_cf(const complex_float *l, const float *r) bool __cdecl complex_float_not_equal_cf(const complex_float *l, const float *r)
{ {
return !complex_float_equal_cf(l, r); return !complex_float_equal_cf(l, r);
} }
...@@ -1610,7 +1610,7 @@ complex_double* __thiscall complex_double_ctor_def(complex_double *this) ...@@ -1610,7 +1610,7 @@ complex_double* __thiscall complex_double_ctor_def(complex_double *this)
/* ??$?8N@std@@YA_NAEBNAEBV?$complex@N@0@@Z */ /* ??$?8N@std@@YA_NAEBNAEBV?$complex@N@0@@Z */
/* ??$?8O@std@@YA_NABOABV?$complex@O@0@@Z */ /* ??$?8O@std@@YA_NABOABV?$complex@O@0@@Z */
/* ??$?8O@std@@YA_NAEBOAEBV?$complex@O@0@@Z */ /* ??$?8O@std@@YA_NAEBOAEBV?$complex@O@0@@Z */
MSVCP_bool __cdecl complex_double_equal_dc(const double *l, const complex_double *r) bool __cdecl complex_double_equal_dc(const double *l, const complex_double *r)
{ {
return *l==r->real && r->imag==0; return *l==r->real && r->imag==0;
} }
...@@ -1619,7 +1619,7 @@ MSVCP_bool __cdecl complex_double_equal_dc(const double *l, const complex_double ...@@ -1619,7 +1619,7 @@ MSVCP_bool __cdecl complex_double_equal_dc(const double *l, const complex_double
/* ??$?8N@std@@YA_NAEBV?$complex@N@0@0@Z */ /* ??$?8N@std@@YA_NAEBV?$complex@N@0@0@Z */
/* ??$?8O@std@@YA_NABV?$complex@O@0@0@Z */ /* ??$?8O@std@@YA_NABV?$complex@O@0@0@Z */
/* ??$?8O@std@@YA_NAEBV?$complex@O@0@0@Z */ /* ??$?8O@std@@YA_NAEBV?$complex@O@0@0@Z */
MSVCP_bool __cdecl complex_double_equal(const complex_double *l, const complex_double *r) bool __cdecl complex_double_equal(const complex_double *l, const complex_double *r)
{ {
return l->real==r->real && l->imag==r->imag; return l->real==r->real && l->imag==r->imag;
} }
...@@ -1628,7 +1628,7 @@ MSVCP_bool __cdecl complex_double_equal(const complex_double *l, const complex_d ...@@ -1628,7 +1628,7 @@ MSVCP_bool __cdecl complex_double_equal(const complex_double *l, const complex_d
/* ??$?8N@std@@YA_NAEBV?$complex@N@0@AEBN@Z */ /* ??$?8N@std@@YA_NAEBV?$complex@N@0@AEBN@Z */
/* ??$?8O@std@@YA_NABV?$complex@O@0@ABO@Z */ /* ??$?8O@std@@YA_NABV?$complex@O@0@ABO@Z */
/* ??$?8O@std@@YA_NAEBV?$complex@O@0@AEBO@Z */ /* ??$?8O@std@@YA_NAEBV?$complex@O@0@AEBO@Z */
MSVCP_bool __cdecl complex_double_equal_cd(const complex_double *l, double *r) bool __cdecl complex_double_equal_cd(const complex_double *l, double *r)
{ {
return l->real==*r && l->imag==0; return l->real==*r && l->imag==0;
} }
...@@ -1637,7 +1637,7 @@ MSVCP_bool __cdecl complex_double_equal_cd(const complex_double *l, double *r) ...@@ -1637,7 +1637,7 @@ MSVCP_bool __cdecl complex_double_equal_cd(const complex_double *l, double *r)
/* ??$?9N@std@@YA_NAEBNAEBV?$complex@N@0@@Z */ /* ??$?9N@std@@YA_NAEBNAEBV?$complex@N@0@@Z */
/* ??$?9O@std@@YA_NABOABV?$complex@O@0@@Z */ /* ??$?9O@std@@YA_NABOABV?$complex@O@0@@Z */
/* ??$?9O@std@@YA_NAEBOAEBV?$complex@O@0@@Z */ /* ??$?9O@std@@YA_NAEBOAEBV?$complex@O@0@@Z */
MSVCP_bool __cdecl complex_double_not_equal_dc(const double *l, const complex_double *r) bool __cdecl complex_double_not_equal_dc(const double *l, const complex_double *r)
{ {
return !complex_double_equal_dc(l, r); return !complex_double_equal_dc(l, r);
} }
...@@ -1646,7 +1646,7 @@ MSVCP_bool __cdecl complex_double_not_equal_dc(const double *l, const complex_do ...@@ -1646,7 +1646,7 @@ MSVCP_bool __cdecl complex_double_not_equal_dc(const double *l, const complex_do
/* ??$?9N@std@@YA_NAEBV?$complex@N@0@0@Z */ /* ??$?9N@std@@YA_NAEBV?$complex@N@0@0@Z */
/* ??$?9O@std@@YA_NABV?$complex@O@0@0@Z */ /* ??$?9O@std@@YA_NABV?$complex@O@0@0@Z */
/* ??$?9O@std@@YA_NAEBV?$complex@O@0@0@Z */ /* ??$?9O@std@@YA_NAEBV?$complex@O@0@0@Z */
MSVCP_bool __cdecl complex_double_not_equal(const complex_double *l, const complex_double *r) bool __cdecl complex_double_not_equal(const complex_double *l, const complex_double *r)
{ {
return !complex_double_equal(l, r); return !complex_double_equal(l, r);
} }
...@@ -1655,7 +1655,7 @@ MSVCP_bool __cdecl complex_double_not_equal(const complex_double *l, const compl ...@@ -1655,7 +1655,7 @@ MSVCP_bool __cdecl complex_double_not_equal(const complex_double *l, const compl
/* ??$?9N@std@@YA_NAEBV?$complex@N@0@AEBN@Z */ /* ??$?9N@std@@YA_NAEBV?$complex@N@0@AEBN@Z */
/* ??$?9O@std@@YA_NABV?$complex@O@0@ABO@Z */ /* ??$?9O@std@@YA_NABV?$complex@O@0@ABO@Z */
/* ??$?9O@std@@YA_NAEBV?$complex@O@0@AEBO@Z */ /* ??$?9O@std@@YA_NAEBV?$complex@O@0@AEBO@Z */
MSVCP_bool __cdecl complex_double_not_equal_cd(const complex_double *l, double *r) bool __cdecl complex_double_not_equal_cd(const complex_double *l, double *r)
{ {
return !complex_double_equal_cd(l, r); return !complex_double_equal_cd(l, r);
} }
......
dlls/msvcp90/misc.c
View file @ af5f928e
...@@ -1106,7 +1106,7 @@ DEFINE_THISCALL_WRAPPER(custom_category_default_error_condition, 12) ...@@ -1106,7 +1106,7 @@ DEFINE_THISCALL_WRAPPER(custom_category_default_error_condition, 12)
} }
DEFINE_THISCALL_WRAPPER(custom_category_equivalent, 12) DEFINE_THISCALL_WRAPPER(custom_category_equivalent, 12)
MSVCP_bool __thiscall custom_category_equivalent(const custom_category *this, bool __thiscall custom_category_equivalent(const custom_category *this,
int code, const /*error_condition*/void *condition) int code, const /*error_condition*/void *condition)
{ {
FIXME("(%p %x %p) stub\n", this, code, condition); FIXME("(%p %x %p) stub\n", this, code, condition);
...@@ -1114,7 +1114,7 @@ MSVCP_bool __thiscall custom_category_equivalent(const custom_category *this, ...@@ -1114,7 +1114,7 @@ MSVCP_bool __thiscall custom_category_equivalent(const custom_category *this,
} }
DEFINE_THISCALL_WRAPPER(custom_category_equivalent_code, 12) DEFINE_THISCALL_WRAPPER(custom_category_equivalent_code, 12)
MSVCP_bool __thiscall custom_category_equivalent_code(custom_category *this, bool __thiscall custom_category_equivalent_code(custom_category *this,
const /*error_code*/void *code, int condition) const /*error_code*/void *code, int condition)
{ {
FIXME("(%p %p %x) stub\n", this, code, condition); FIXME("(%p %p %x) stub\n", this, code, condition);
...@@ -1348,7 +1348,7 @@ typedef struct ...@@ -1348,7 +1348,7 @@ typedef struct
const vtable_ptr *vtable; const vtable_ptr *vtable;
_Cnd_t cnd; _Cnd_t cnd;
_Mtx_t mtx; _Mtx_t mtx;
MSVCP_bool launched; bool launched;
} _Pad; } _Pad;
DEFINE_RTTI_DATA0(_Pad, 0, ".?AV_Pad@std@@") DEFINE_RTTI_DATA0(_Pad, 0, ".?AV_Pad@std@@")
...@@ -1609,7 +1609,7 @@ void __thiscall _Concurrent_queue_base_v4__Internal_finish_clear( ...@@ -1609,7 +1609,7 @@ void __thiscall _Concurrent_queue_base_v4__Internal_finish_clear(
/* ?_Internal_empty@_Concurrent_queue_base_v4@details@Concurrency@@IBE_NXZ */ /* ?_Internal_empty@_Concurrent_queue_base_v4@details@Concurrency@@IBE_NXZ */
/* ?_Internal_empty@_Concurrent_queue_base_v4@details@Concurrency@@IEBA_NXZ */ /* ?_Internal_empty@_Concurrent_queue_base_v4@details@Concurrency@@IEBA_NXZ */
DEFINE_THISCALL_WRAPPER(_Concurrent_queue_base_v4__Internal_empty, 4) DEFINE_THISCALL_WRAPPER(_Concurrent_queue_base_v4__Internal_empty, 4)
MSVCP_bool __thiscall _Concurrent_queue_base_v4__Internal_empty( bool __thiscall _Concurrent_queue_base_v4__Internal_empty(
const _Concurrent_queue_base_v4 *this) const _Concurrent_queue_base_v4 *this)
{ {
TRACE("(%p)\n", this); TRACE("(%p)\n", this);
...@@ -1789,7 +1789,7 @@ void __thiscall _Concurrent_queue_base_v4__Internal_move_push( ...@@ -1789,7 +1789,7 @@ void __thiscall _Concurrent_queue_base_v4__Internal_move_push(
/* ?_Internal_pop_if_present@_Concurrent_queue_base_v4@details@Concurrency@@IAE_NPAX@Z */ /* ?_Internal_pop_if_present@_Concurrent_queue_base_v4@details@Concurrency@@IAE_NPAX@Z */
/* ?_Internal_pop_if_present@_Concurrent_queue_base_v4@details@Concurrency@@IEAA_NPEAX@Z */ /* ?_Internal_pop_if_present@_Concurrent_queue_base_v4@details@Concurrency@@IEAA_NPEAX@Z */
DEFINE_THISCALL_WRAPPER(_Concurrent_queue_base_v4__Internal_pop_if_present, 8) DEFINE_THISCALL_WRAPPER(_Concurrent_queue_base_v4__Internal_pop_if_present, 8)
MSVCP_bool __thiscall _Concurrent_queue_base_v4__Internal_pop_if_present( bool __thiscall _Concurrent_queue_base_v4__Internal_pop_if_present(
_Concurrent_queue_base_v4 *this, void *e) _Concurrent_queue_base_v4 *this, void *e)
{ {
size_t id; size_t id;
...@@ -2643,7 +2643,7 @@ void __cdecl _Unlock_shared_ptr_spin_lock(void) ...@@ -2643,7 +2643,7 @@ void __cdecl _Unlock_shared_ptr_spin_lock(void)
#if _MSVCP_VER >= 100 #if _MSVCP_VER >= 100
/* ?is_current_task_group_canceling@Concurrency@@YA_NXZ */ /* ?is_current_task_group_canceling@Concurrency@@YA_NXZ */
MSVCP_bool __cdecl is_current_task_group_canceling(void) bool __cdecl is_current_task_group_canceling(void)
{ {
return Context_IsCurrentTaskCollectionCanceling(); return Context_IsCurrentTaskCollectionCanceling();
} }
...@@ -2690,11 +2690,11 @@ void __thiscall _ContextCallback__Assign(void *this, void *v) ...@@ -2690,11 +2690,11 @@ void __thiscall _ContextCallback__Assign(void *this, void *v)
} }
#define call_function_do_call(this) CALL_VTBL_FUNC(this, 8, void, (function_void_cdecl_void*), (this)) #define call_function_do_call(this) CALL_VTBL_FUNC(this, 8, void, (function_void_cdecl_void*), (this))
#define call_function_do_clean(this,b) CALL_VTBL_FUNC(this, 16, void, (function_void_cdecl_void*,MSVCP_bool), (this, b)) #define call_function_do_clean(this,b) CALL_VTBL_FUNC(this, 16, void, (function_void_cdecl_void*,bool), (this, b))
/* ?_CallInContext@_ContextCallback@details@Concurrency@@QBEXV?$function@$$A6AXXZ@std@@_N@Z */ /* ?_CallInContext@_ContextCallback@details@Concurrency@@QBEXV?$function@$$A6AXXZ@std@@_N@Z */
/* ?_CallInContext@_ContextCallback@details@Concurrency@@QEBAXV?$function@$$A6AXXZ@std@@_N@Z */ /* ?_CallInContext@_ContextCallback@details@Concurrency@@QEBAXV?$function@$$A6AXXZ@std@@_N@Z */
DEFINE_THISCALL_WRAPPER(_ContextCallback__CallInContext, 48) DEFINE_THISCALL_WRAPPER(_ContextCallback__CallInContext, 48)
void __thiscall _ContextCallback__CallInContext(const void *this, function_void_cdecl_void func, MSVCP_bool b) void __thiscall _ContextCallback__CallInContext(const void *this, function_void_cdecl_void func, bool b)
{ {
TRACE("(%p %p %x)\n", this, func.func, b); TRACE("(%p %p %x)\n", this, func.func, b);
call_function_do_call(func.this); call_function_do_call(func.this);
...@@ -2718,7 +2718,7 @@ void __thiscall _ContextCallback__Reset(void *this) ...@@ -2718,7 +2718,7 @@ void __thiscall _ContextCallback__Reset(void *this)
} }
/* ?_IsCurrentOriginSTA@_ContextCallback@details@Concurrency@@CA_NXZ */ /* ?_IsCurrentOriginSTA@_ContextCallback@details@Concurrency@@CA_NXZ */
MSVCP_bool __cdecl _ContextCallback__IsCurrentOriginSTA(void *this) bool __cdecl _ContextCallback__IsCurrentOriginSTA(void *this)
{ {
TRACE("(%p)\n", this); TRACE("(%p)\n", this);
return FALSE; return FALSE;
...@@ -2726,8 +2726,8 @@ MSVCP_bool __cdecl _ContextCallback__IsCurrentOriginSTA(void *this) ...@@ -2726,8 +2726,8 @@ MSVCP_bool __cdecl _ContextCallback__IsCurrentOriginSTA(void *this)
typedef struct { typedef struct {
/*_Task_impl_base*/void *task; /*_Task_impl_base*/void *task;
MSVCP_bool scheduled; bool scheduled;
MSVCP_bool started; bool started;
} _TaskEventLogger; } _TaskEventLogger;
/* ?_LogCancelTask@_TaskEventLogger@details@Concurrency@@QAEXXZ */ /* ?_LogCancelTask@_TaskEventLogger@details@Concurrency@@QAEXXZ */
...@@ -2741,7 +2741,7 @@ void __thiscall _TaskEventLogger__LogCancelTask(_TaskEventLogger *this) ...@@ -2741,7 +2741,7 @@ void __thiscall _TaskEventLogger__LogCancelTask(_TaskEventLogger *this)
/* ?_LogScheduleTask@_TaskEventLogger@details@Concurrency@@QAEX_N@Z */ /* ?_LogScheduleTask@_TaskEventLogger@details@Concurrency@@QAEX_N@Z */
/* ?_LogScheduleTask@_TaskEventLogger@details@Concurrency@@QEAAX_N@Z */ /* ?_LogScheduleTask@_TaskEventLogger@details@Concurrency@@QEAAX_N@Z */
DEFINE_THISCALL_WRAPPER(_TaskEventLogger__LogScheduleTask, 8) DEFINE_THISCALL_WRAPPER(_TaskEventLogger__LogScheduleTask, 8)
void __thiscall _TaskEventLogger__LogScheduleTask(_TaskEventLogger *this, MSVCP_bool continuation) void __thiscall _TaskEventLogger__LogScheduleTask(_TaskEventLogger *this, bool continuation)
{ {
TRACE("(%p %x)\n", this, continuation); TRACE("(%p %x)\n", this, continuation);
} }
...@@ -2843,7 +2843,7 @@ _Ph _Ph_16 = {0}, _Ph_17 = {0}, _Ph_18 = {0}, _Ph_19 = {0}, _Ph_20 = {0}; ...@@ -2843,7 +2843,7 @@ _Ph _Ph_16 = {0}, _Ph_17 = {0}, _Ph_18 = {0}, _Ph_19 = {0}, _Ph_20 = {0};
#if _MSVCP_VER >= 140 #if _MSVCP_VER >= 140
/* ?_IsNonBlockingThread@_Task_impl_base@details@Concurrency@@SA_NXZ */ /* ?_IsNonBlockingThread@_Task_impl_base@details@Concurrency@@SA_NXZ */
MSVCP_bool __cdecl _Task_impl_base__IsNonBlockingThread(void) bool __cdecl _Task_impl_base__IsNonBlockingThread(void)
{ {
FIXME("() stub\n"); FIXME("() stub\n");
return FALSE; return FALSE;
......
dlls/msvcp90/msvcp90.h
View file @ af5f928e
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "stdbool.h"
#include "stdlib.h" #include "stdlib.h"
#include "windef.h" #include "windef.h"
#include "cxx.h" #include "cxx.h"
...@@ -23,8 +24,6 @@ ...@@ -23,8 +24,6 @@
#define CXX_EXCEPTION 0xe06d7363 #define CXX_EXCEPTION 0xe06d7363
#define ALIGNED_SIZE(size, alignment) (((size)+((alignment)-1))/(alignment)*(alignment)) #define ALIGNED_SIZE(size, alignment) (((size)+((alignment)-1))/(alignment)*(alignment))
typedef unsigned char MSVCP_bool;
#define MSVCP_SIZE_T_MAX (~(size_t)0) #define MSVCP_SIZE_T_MAX (~(size_t)0)
#if _MSVCP_VER >= 100 #if _MSVCP_VER >= 100
typedef __int64 DECLSPEC_ALIGN(8) streamoff; typedef __int64 DECLSPEC_ALIGN(8) streamoff;
...@@ -68,11 +67,11 @@ extern critical_section* (__thiscall *critical_section_ctor)(critical_section*); ...@@ -68,11 +67,11 @@ extern critical_section* (__thiscall *critical_section_ctor)(critical_section*);
extern void (__thiscall *critical_section_dtor)(critical_section*); extern void (__thiscall *critical_section_dtor)(critical_section*);
extern void (__thiscall *critical_section_lock)(critical_section*); extern void (__thiscall *critical_section_lock)(critical_section*);
extern void (__thiscall *critical_section_unlock)(critical_section*); extern void (__thiscall *critical_section_unlock)(critical_section*);
extern MSVCP_bool (__thiscall *critical_section_trylock)(critical_section*); extern bool (__thiscall *critical_section_trylock)(critical_section*);
#endif #endif
#if _MSVCP_VER >= 100 #if _MSVCP_VER >= 100
extern MSVCP_bool (__cdecl *Context_IsCurrentTaskCollectionCanceling)(void); extern bool (__cdecl *Context_IsCurrentTaskCollectionCanceling)(void);
#endif #endif
/* basic_string<char, char_traits<char>, allocator<char>> */ /* basic_string<char, char_traits<char>, allocator<char>> */
...@@ -211,7 +210,7 @@ typedef struct { ...@@ -211,7 +210,7 @@ typedef struct {
codecvt_base base; codecvt_base base;
} codecvt_char; } codecvt_char;
MSVCP_bool __thiscall codecvt_base_always_noconv(const codecvt_base*); bool __thiscall codecvt_base_always_noconv(const codecvt_base*);
int __thiscall codecvt_char_unshift(const codecvt_char*, _Mbstatet*, char*, char*, char**); int __thiscall codecvt_char_unshift(const codecvt_char*, _Mbstatet*, char*, char*, char**);
int __thiscall codecvt_char_out(const codecvt_char*, _Mbstatet*, const char*, int __thiscall codecvt_char_out(const codecvt_char*, _Mbstatet*, const char*,
const char*, const char**, char*, char*, char**); const char*, const char**, char*, char*, char**);
...@@ -254,7 +253,7 @@ typedef struct { ...@@ -254,7 +253,7 @@ typedef struct {
_Ctypevec ctype; _Ctypevec ctype;
} ctype_char; } ctype_char;
MSVCP_bool __thiscall ctype_char_is_ch(const ctype_char*, short, char); bool __thiscall ctype_char_is_ch(const ctype_char*, short, char);
char __thiscall ctype_char_narrow_ch(const ctype_char*, char, char); char __thiscall ctype_char_narrow_ch(const ctype_char*, char, char);
char __thiscall ctype_char_widen_ch(const ctype_char*, char); char __thiscall ctype_char_widen_ch(const ctype_char*, char);
...@@ -265,7 +264,7 @@ typedef struct { ...@@ -265,7 +264,7 @@ typedef struct {
_Cvtvec cvt; _Cvtvec cvt;
} ctype_wchar; } ctype_wchar;
MSVCP_bool __thiscall ctype_wchar_is_ch(const ctype_wchar*, short, wchar_t); bool __thiscall ctype_wchar_is_ch(const ctype_wchar*, short, wchar_t);
char __thiscall ctype_wchar_narrow_ch(const ctype_wchar*, wchar_t, char); char __thiscall ctype_wchar_narrow_ch(const ctype_wchar*, wchar_t, char);
wchar_t __thiscall ctype_wchar_widen_ch(const ctype_wchar*, char); wchar_t __thiscall ctype_wchar_widen_ch(const ctype_wchar*, char);
...@@ -451,15 +450,15 @@ typedef struct { ...@@ -451,15 +450,15 @@ typedef struct {
typedef struct { typedef struct {
basic_streambuf_char *strbuf; basic_streambuf_char *strbuf;
MSVCP_bool got; bool got;
char val; char val;
} istreambuf_iterator_char; } istreambuf_iterator_char;
typedef struct { typedef struct {
#if _MSVCP_VER == 80 #if _MSVCP_VER == 80
void *iter_container; void *iter_container;
#endif #endif
MSVCP_bool failed; bool failed;
basic_streambuf_char *strbuf; basic_streambuf_char *strbuf;
} ostreambuf_iterator_char; } ostreambuf_iterator_char;
...@@ -494,7 +493,7 @@ typedef struct { ...@@ -494,7 +493,7 @@ typedef struct {
typedef struct { typedef struct {
basic_streambuf_wchar *strbuf; basic_streambuf_wchar *strbuf;
MSVCP_bool got; bool got;
wchar_t val; wchar_t val;
} istreambuf_iterator_wchar; } istreambuf_iterator_wchar;
...@@ -502,7 +501,7 @@ typedef struct { ...@@ -502,7 +501,7 @@ typedef struct {
#if _MSVCP_VER == 80 #if _MSVCP_VER == 80
void *iter_container; void *iter_container;
#endif #endif
MSVCP_bool failed; bool failed;
basic_streambuf_wchar *strbuf; basic_streambuf_wchar *strbuf;
} ostreambuf_iterator_wchar; } ostreambuf_iterator_wchar;
...@@ -546,7 +545,7 @@ istreambuf_iterator_char *__thiscall num_get_char_get_int64(const num_get*, istr ...@@ -546,7 +545,7 @@ istreambuf_iterator_char *__thiscall num_get_char_get_int64(const num_get*, istr
istreambuf_iterator_char *__thiscall num_get_char_get_uint64(const num_get*, istreambuf_iterator_char*, istreambuf_iterator_char *__thiscall num_get_char_get_uint64(const num_get*, istreambuf_iterator_char*,
istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, ULONGLONG*); istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, ULONGLONG*);
istreambuf_iterator_char *__thiscall num_get_char_get_bool(const num_get*, istreambuf_iterator_char*, istreambuf_iterator_char *__thiscall num_get_char_get_bool(const num_get*, istreambuf_iterator_char*,
istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, MSVCP_bool*); istreambuf_iterator_char, istreambuf_iterator_char, ios_base*, int*, bool*);
num_get* num_get_wchar_use_facet(const locale*); num_get* num_get_wchar_use_facet(const locale*);
num_get* num_get_short_use_facet(const locale*); num_get* num_get_short_use_facet(const locale*);
...@@ -571,7 +570,7 @@ istreambuf_iterator_wchar *__thiscall num_get_wchar_get_int64(const num_get*, is ...@@ -571,7 +570,7 @@ istreambuf_iterator_wchar *__thiscall num_get_wchar_get_int64(const num_get*, is
istreambuf_iterator_wchar *__thiscall num_get_wchar_get_uint64(const num_get*, istreambuf_iterator_wchar*, istreambuf_iterator_wchar *__thiscall num_get_wchar_get_uint64(const num_get*, istreambuf_iterator_wchar*,
istreambuf_iterator_wchar, istreambuf_iterator_wchar, ios_base*, int*, ULONGLONG*); istreambuf_iterator_wchar, istreambuf_iterator_wchar, ios_base*, int*, ULONGLONG*);
istreambuf_iterator_wchar *__thiscall num_get_wchar_get_bool(const num_get*, istreambuf_iterator_wchar*, istreambuf_iterator_wchar *__thiscall num_get_wchar_get_bool(const num_get*, istreambuf_iterator_wchar*,
istreambuf_iterator_wchar, istreambuf_iterator_wchar, ios_base*, int*, MSVCP_bool*); istreambuf_iterator_wchar, istreambuf_iterator_wchar, ios_base*, int*, bool*);
/* class num_put<char> */ /* class num_put<char> */
/* class num_put<wchar> */ /* class num_put<wchar> */
...@@ -598,7 +597,7 @@ ostreambuf_iterator_char* __thiscall num_put_char_put_int64(const num_put*, ostr ...@@ -598,7 +597,7 @@ ostreambuf_iterator_char* __thiscall num_put_char_put_int64(const num_put*, ostr
ostreambuf_iterator_char* __thiscall num_put_char_put_uint64(const num_put*, ostreambuf_iterator_char*, ostreambuf_iterator_char* __thiscall num_put_char_put_uint64(const num_put*, ostreambuf_iterator_char*,
ostreambuf_iterator_char, ios_base*, char, unsigned __int64); ostreambuf_iterator_char, ios_base*, char, unsigned __int64);
ostreambuf_iterator_char* __thiscall num_put_char_put_bool(const num_put*, ostreambuf_iterator_char*, ostreambuf_iterator_char* __thiscall num_put_char_put_bool(const num_put*, ostreambuf_iterator_char*,
ostreambuf_iterator_char, ios_base*, char, MSVCP_bool); ostreambuf_iterator_char, ios_base*, char, bool);
num_put* num_put_wchar_use_facet(const locale*); num_put* num_put_wchar_use_facet(const locale*);
num_put* num_put_short_use_facet(const locale*); num_put* num_put_short_use_facet(const locale*);
...@@ -617,7 +616,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_int64(const num_put*, os ...@@ -617,7 +616,7 @@ ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_int64(const num_put*, os
ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_uint64(const num_put*, ostreambuf_iterator_wchar*, ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_uint64(const num_put*, ostreambuf_iterator_wchar*,
ostreambuf_iterator_wchar, ios_base*, wchar_t, unsigned __int64); ostreambuf_iterator_wchar, ios_base*, wchar_t, unsigned __int64);
ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_bool(const num_put*, ostreambuf_iterator_wchar*, ostreambuf_iterator_wchar* __thiscall num_put_wchar_put_bool(const num_put*, ostreambuf_iterator_wchar*,
ostreambuf_iterator_wchar, ios_base*, wchar_t, MSVCP_bool); ostreambuf_iterator_wchar, ios_base*, wchar_t, bool);
void init_exception(void*); void init_exception(void*);
void init_locale(void*); void init_locale(void*);
......
dlls/msvcp90/msvcp_main.c
View file @ af5f928e
...@@ -63,11 +63,11 @@ critical_section* (__thiscall *critical_section_ctor)(critical_section*); ...@@ -63,11 +63,11 @@ critical_section* (__thiscall *critical_section_ctor)(critical_section*);
void (__thiscall *critical_section_dtor)(critical_section*); void (__thiscall *critical_section_dtor)(critical_section*);
void (__thiscall *critical_section_lock)(critical_section*); void (__thiscall *critical_section_lock)(critical_section*);
void (__thiscall *critical_section_unlock)(critical_section*); void (__thiscall *critical_section_unlock)(critical_section*);
MSVCP_bool (__thiscall *critical_section_trylock)(critical_section*); bool (__thiscall *critical_section_trylock)(critical_section*);
#endif #endif
#if _MSVCP_VER >= 100 #if _MSVCP_VER >= 100
MSVCP_bool (__cdecl *Context_IsCurrentTaskCollectionCanceling)(void); bool (__cdecl *Context_IsCurrentTaskCollectionCanceling)(void);
#endif #endif
#define VERSION_STRING(ver) #ver #define VERSION_STRING(ver) #ver
......
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