Commit 2319999a authored by Joel Parker's avatar Joel Parker Committed by Alexandre Julliard

Remove redundant semicolons for ANSI compatibility.

parent 6ee85a61
......@@ -2161,7 +2161,7 @@ void WINAPI MapHInstSL16( CONTEXT86 *context )
__ASM_GLOBAL_FUNC( MapHInstLS,
"pushl %eax\n\t"
"call " __ASM_NAME("MapHModuleLS") "\n\t"
"ret" );
"ret" )
/***************************************************************************
* MapHInstSL (KERNEL32.@)
......@@ -2169,7 +2169,7 @@ __ASM_GLOBAL_FUNC( MapHInstLS,
__ASM_GLOBAL_FUNC( MapHInstSL,
"pushl %eax\n\t"
"call " __ASM_NAME("MapHModuleSL") "\n\t"
"ret" );
"ret" )
/***************************************************************************
* MapHInstLS_PN (KERNEL32.@)
......@@ -2179,7 +2179,7 @@ __ASM_GLOBAL_FUNC( MapHInstLS_PN,
"jz 1f\n\t"
"pushl %eax\n\t"
"call " __ASM_NAME("MapHModuleLS") "\n"
"1:\tret" );
"1:\tret" )
/***************************************************************************
* MapHInstSL_PN (KERNEL32.@)
......@@ -2189,6 +2189,6 @@ __ASM_GLOBAL_FUNC( MapHInstSL_PN,
"jz 1f\n\t"
"pushl %eax\n\t"
"call " __ASM_NAME("MapHModuleSL") "\n"
"1:\tret" );
"1:\tret" )
#endif /* __i386__ */
......@@ -302,7 +302,7 @@ __ASM_GLOBAL_FUNC( call_entry_point,
"\tpopl %edi\n"
"\tpopl %esi\n"
"\tpopl %ebp\n"
"\tret" );
"\tret" )
/***********************************************************************
......
......@@ -566,7 +566,7 @@ LPVOID WINAPI MapSLFix( SEGPTR sptr )
* Must not change EAX, hence defined as asm function.
*/
#ifdef __i386__
__ASM_GLOBAL_FUNC( UnMapSLFixArray, "ret $8" );
__ASM_GLOBAL_FUNC( UnMapSLFixArray, "ret $8" )
#endif
......@@ -603,7 +603,7 @@ __ASM_GLOBAL_FUNC( SMapLS,
"pushl %eax\n\t"
"call " __ASM_NAME("MapLS") "\n\t"
"movl %eax,%edx\n"
"1:\tret" );
"1:\tret" )
/***********************************************************************
* SUnMapLS (KERNEL32.@)
......@@ -613,7 +613,7 @@ __ASM_GLOBAL_FUNC( SUnMapLS,
"pushl %eax\n\t"
"call " __ASM_NAME("UnMapLS") "\n\t"
"popl %eax\n\t"
"ret" );
"ret" )
/***********************************************************************
* SMapLS_IP_EBP_8 (KERNEL32.@)
......@@ -636,17 +636,17 @@ __ASM_GLOBAL_FUNC( SUnMapLS,
"movl " #n "(%ebp),%eax\n\t" \
"call " __ASM_NAME("SMapLS") "\n\t" \
"movl %edx," #n "(%ebp)\n\t" \
"ret" );
"ret" )
DEFINE_SMapLS(8);
DEFINE_SMapLS(12);
DEFINE_SMapLS(16);
DEFINE_SMapLS(20);
DEFINE_SMapLS(24);
DEFINE_SMapLS(28);
DEFINE_SMapLS(32);
DEFINE_SMapLS(36);
DEFINE_SMapLS(40);
DEFINE_SMapLS(8)
DEFINE_SMapLS(12)
DEFINE_SMapLS(16)
DEFINE_SMapLS(20)
DEFINE_SMapLS(24)
DEFINE_SMapLS(28)
DEFINE_SMapLS(32)
DEFINE_SMapLS(36)
DEFINE_SMapLS(40)
/***********************************************************************
......@@ -670,14 +670,14 @@ DEFINE_SMapLS(40);
"popl %eax\n\t" \
"ret" )
DEFINE_SUnMapLS(8);
DEFINE_SUnMapLS(12);
DEFINE_SUnMapLS(16);
DEFINE_SUnMapLS(20);
DEFINE_SUnMapLS(24);
DEFINE_SUnMapLS(28);
DEFINE_SUnMapLS(32);
DEFINE_SUnMapLS(36);
DEFINE_SUnMapLS(40);
DEFINE_SUnMapLS(8)
DEFINE_SUnMapLS(12)
DEFINE_SUnMapLS(16)
DEFINE_SUnMapLS(20)
DEFINE_SUnMapLS(24)
DEFINE_SUnMapLS(28)
DEFINE_SUnMapLS(32)
DEFINE_SUnMapLS(36)
DEFINE_SUnMapLS(40)
#endif /* __i386__ */
......@@ -661,23 +661,23 @@ DEFINE_REGS_ENTRYPOINT( FT_Thunk, 0, 0 );
"leave\n\t"
#define DEFINE_FT_Exit(n) \
__ASM_GLOBAL_FUNC( FT_Exit ## n, FT_EXIT_RESTORE_REGS "ret $" #n );
DEFINE_FT_Exit(0);
DEFINE_FT_Exit(4);
DEFINE_FT_Exit(8);
DEFINE_FT_Exit(12);
DEFINE_FT_Exit(16);
DEFINE_FT_Exit(20);
DEFINE_FT_Exit(24);
DEFINE_FT_Exit(28);
DEFINE_FT_Exit(32);
DEFINE_FT_Exit(36);
DEFINE_FT_Exit(40);
DEFINE_FT_Exit(44);
DEFINE_FT_Exit(48);
DEFINE_FT_Exit(52);
DEFINE_FT_Exit(56);
__ASM_GLOBAL_FUNC( FT_Exit ## n, FT_EXIT_RESTORE_REGS "ret $" #n )
DEFINE_FT_Exit(0)
DEFINE_FT_Exit(4)
DEFINE_FT_Exit(8)
DEFINE_FT_Exit(12)
DEFINE_FT_Exit(16)
DEFINE_FT_Exit(20)
DEFINE_FT_Exit(24)
DEFINE_FT_Exit(28)
DEFINE_FT_Exit(32)
DEFINE_FT_Exit(36)
DEFINE_FT_Exit(40)
DEFINE_FT_Exit(44)
DEFINE_FT_Exit(48)
DEFINE_FT_Exit(52)
DEFINE_FT_Exit(56)
#endif /* __i386__ */
......
......@@ -154,7 +154,7 @@ static void WINAPI EXCEPTION_ctor(exception *_this, const char** name)
/******************************************************************
* ??0exception@@QAE@ABQBD@Z (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_exception_ctor);
DEFINE_THISCALL_WRAPPER(MSVCRT_exception_ctor)
exception * __stdcall MSVCRT_exception_ctor(exception * _this, const char ** name)
{
TRACE("(%p,%s)\n", _this, *name);
......@@ -165,7 +165,7 @@ exception * __stdcall MSVCRT_exception_ctor(exception * _this, const char ** nam
/******************************************************************
* ??0exception@@QAE@ABV0@@Z (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_exception_copy_ctor);
DEFINE_THISCALL_WRAPPER(MSVCRT_exception_copy_ctor)
exception * __stdcall MSVCRT_exception_copy_ctor(exception * _this, const exception * rhs)
{
TRACE("(%p,%p)\n", _this, rhs);
......@@ -185,7 +185,7 @@ exception * __stdcall MSVCRT_exception_copy_ctor(exception * _this, const except
/******************************************************************
* ??0exception@@QAE@XZ (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_exception_default_ctor);
DEFINE_THISCALL_WRAPPER(MSVCRT_exception_default_ctor)
exception * __stdcall MSVCRT_exception_default_ctor(exception * _this)
{
static const char* empty = NULL;
......@@ -198,7 +198,7 @@ exception * __stdcall MSVCRT_exception_default_ctor(exception * _this)
/******************************************************************
* ??1exception@@UAE@XZ (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_exception_dtor);
DEFINE_THISCALL_WRAPPER(MSVCRT_exception_dtor)
void __stdcall MSVCRT_exception_dtor(exception * _this)
{
TRACE("(%p)\n", _this);
......@@ -209,7 +209,7 @@ void __stdcall MSVCRT_exception_dtor(exception * _this)
/******************************************************************
* ??4exception@@QAEAAV0@ABV0@@Z (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_exception_opequals);
DEFINE_THISCALL_WRAPPER(MSVCRT_exception_opequals)
exception * __stdcall MSVCRT_exception_opequals(exception * _this, const exception * rhs)
{
TRACE("(%p %p)\n", _this, rhs);
......@@ -225,7 +225,7 @@ exception * __stdcall MSVCRT_exception_opequals(exception * _this, const excepti
/******************************************************************
* ??_Eexception@@UAEPAXI@Z (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_exception_vector_dtor);
DEFINE_THISCALL_WRAPPER(MSVCRT_exception_vector_dtor)
void * __stdcall MSVCRT_exception_vector_dtor(exception * _this, unsigned int flags)
{
TRACE("(%p %x)\n", _this, flags);
......@@ -248,7 +248,7 @@ void * __stdcall MSVCRT_exception_vector_dtor(exception * _this, unsigned int fl
/******************************************************************
* ??_Gexception@@UAEPAXI@Z (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_exception_scalar_dtor);
DEFINE_THISCALL_WRAPPER(MSVCRT_exception_scalar_dtor)
void * __stdcall MSVCRT_exception_scalar_dtor(exception * _this, unsigned int flags)
{
TRACE("(%p %x)\n", _this, flags);
......@@ -260,7 +260,7 @@ void * __stdcall MSVCRT_exception_scalar_dtor(exception * _this, unsigned int fl
/******************************************************************
* ?what@exception@@UBEPBDXZ (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_what_exception);
DEFINE_THISCALL_WRAPPER(MSVCRT_what_exception)
const char * __stdcall MSVCRT_what_exception(exception * _this)
{
TRACE("(%p) returning %s\n", _this, _this->name);
......@@ -270,7 +270,7 @@ const char * __stdcall MSVCRT_what_exception(exception * _this)
/******************************************************************
* ??0bad_typeid@@QAE@ABV0@@Z (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_copy_ctor);
DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_copy_ctor)
bad_typeid * __stdcall MSVCRT_bad_typeid_copy_ctor(bad_typeid * _this, const bad_typeid * rhs)
{
TRACE("(%p %p)\n", _this, rhs);
......@@ -282,7 +282,7 @@ bad_typeid * __stdcall MSVCRT_bad_typeid_copy_ctor(bad_typeid * _this, const bad
/******************************************************************
* ??0bad_typeid@@QAE@PBD@Z (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_ctor);
DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_ctor)
bad_typeid * __stdcall MSVCRT_bad_typeid_ctor(bad_typeid * _this, const char * name)
{
TRACE("(%p %s)\n", _this, name);
......@@ -294,7 +294,7 @@ bad_typeid * __stdcall MSVCRT_bad_typeid_ctor(bad_typeid * _this, const char * n
/******************************************************************
* ??1bad_typeid@@UAE@XZ (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_dtor);
DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_dtor)
void __stdcall MSVCRT_bad_typeid_dtor(bad_typeid * _this)
{
TRACE("(%p)\n", _this);
......@@ -304,7 +304,7 @@ void __stdcall MSVCRT_bad_typeid_dtor(bad_typeid * _this)
/******************************************************************
* ??4bad_typeid@@QAEAAV0@ABV0@@Z (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_opequals);
DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_opequals)
bad_typeid * __stdcall MSVCRT_bad_typeid_opequals(bad_typeid * _this, const bad_typeid * rhs)
{
TRACE("(%p %p)\n", _this, rhs);
......@@ -315,7 +315,7 @@ bad_typeid * __stdcall MSVCRT_bad_typeid_opequals(bad_typeid * _this, const bad_
/******************************************************************
* ??_Ebad_typeid@@UAEPAXI@Z (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_vector_dtor);
DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_vector_dtor)
void * __stdcall MSVCRT_bad_typeid_vector_dtor(bad_typeid * _this, unsigned int flags)
{
TRACE("(%p %x)\n", _this, flags);
......@@ -338,7 +338,7 @@ void * __stdcall MSVCRT_bad_typeid_vector_dtor(bad_typeid * _this, unsigned int
/******************************************************************
* ??_Gbad_typeid@@UAEPAXI@Z (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_scalar_dtor);
DEFINE_THISCALL_WRAPPER(MSVCRT_bad_typeid_scalar_dtor)
void * __stdcall MSVCRT_bad_typeid_scalar_dtor(bad_typeid * _this, unsigned int flags)
{
TRACE("(%p %x)\n", _this, flags);
......@@ -350,7 +350,7 @@ void * __stdcall MSVCRT_bad_typeid_scalar_dtor(bad_typeid * _this, unsigned int
/******************************************************************
* ??0__non_rtti_object@@QAE@ABV0@@Z (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_copy_ctor);
DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_copy_ctor)
__non_rtti_object * __stdcall MSVCRT___non_rtti_object_copy_ctor(__non_rtti_object * _this,
const __non_rtti_object * rhs)
{
......@@ -363,7 +363,7 @@ __non_rtti_object * __stdcall MSVCRT___non_rtti_object_copy_ctor(__non_rtti_obje
/******************************************************************
* ??0__non_rtti_object@@QAE@PBD@Z (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_ctor);
DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_ctor)
__non_rtti_object * __stdcall MSVCRT___non_rtti_object_ctor(__non_rtti_object * _this,
const char * name)
{
......@@ -376,7 +376,7 @@ __non_rtti_object * __stdcall MSVCRT___non_rtti_object_ctor(__non_rtti_object *
/******************************************************************
* ??1__non_rtti_object@@UAE@XZ (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_dtor);
DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_dtor)
void __stdcall MSVCRT___non_rtti_object_dtor(__non_rtti_object * _this)
{
TRACE("(%p)\n", _this);
......@@ -386,7 +386,7 @@ void __stdcall MSVCRT___non_rtti_object_dtor(__non_rtti_object * _this)
/******************************************************************
* ??4__non_rtti_object@@QAEAAV0@ABV0@@Z (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_opequals);
DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_opequals)
__non_rtti_object * __stdcall MSVCRT___non_rtti_object_opequals(__non_rtti_object * _this,
const __non_rtti_object *rhs)
{
......@@ -398,7 +398,7 @@ __non_rtti_object * __stdcall MSVCRT___non_rtti_object_opequals(__non_rtti_objec
/******************************************************************
* ??_E__non_rtti_object@@UAEPAXI@Z (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_vector_dtor);
DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_vector_dtor)
void * __stdcall MSVCRT___non_rtti_object_vector_dtor(__non_rtti_object * _this, unsigned int flags)
{
TRACE("(%p %x)\n", _this, flags);
......@@ -421,7 +421,7 @@ void * __stdcall MSVCRT___non_rtti_object_vector_dtor(__non_rtti_object * _this,
/******************************************************************
* ??_G__non_rtti_object@@UAEPAXI@Z (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_scalar_dtor);
DEFINE_THISCALL_WRAPPER(MSVCRT___non_rtti_object_scalar_dtor)
void * __stdcall MSVCRT___non_rtti_object_scalar_dtor(__non_rtti_object * _this, unsigned int flags)
{
TRACE("(%p %x)\n", _this, flags);
......@@ -433,7 +433,7 @@ void * __stdcall MSVCRT___non_rtti_object_scalar_dtor(__non_rtti_object * _this,
/******************************************************************
* ??0bad_cast@@QAE@ABQBD@Z (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_ctor);
DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_ctor)
bad_cast * __stdcall MSVCRT_bad_cast_ctor(bad_cast * _this, const char ** name)
{
TRACE("(%p %s)\n", _this, *name);
......@@ -445,7 +445,7 @@ bad_cast * __stdcall MSVCRT_bad_cast_ctor(bad_cast * _this, const char ** name)
/******************************************************************
* ??0bad_cast@@QAE@ABV0@@Z (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_copy_ctor);
DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_copy_ctor)
bad_cast * __stdcall MSVCRT_bad_cast_copy_ctor(bad_cast * _this, const bad_cast * rhs)
{
TRACE("(%p %p)\n", _this, rhs);
......@@ -457,7 +457,7 @@ bad_cast * __stdcall MSVCRT_bad_cast_copy_ctor(bad_cast * _this, const bad_cast
/******************************************************************
* ??1bad_cast@@UAE@XZ (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_dtor);
DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_dtor)
void __stdcall MSVCRT_bad_cast_dtor(bad_cast * _this)
{
TRACE("(%p)\n", _this);
......@@ -467,7 +467,7 @@ void __stdcall MSVCRT_bad_cast_dtor(bad_cast * _this)
/******************************************************************
* ??4bad_cast@@QAEAAV0@ABV0@@Z (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_opequals);
DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_opequals)
bad_cast * __stdcall MSVCRT_bad_cast_opequals(bad_cast * _this, const bad_cast * rhs)
{
TRACE("(%p %p)\n", _this, rhs);
......@@ -478,7 +478,7 @@ bad_cast * __stdcall MSVCRT_bad_cast_opequals(bad_cast * _this, const bad_cast *
/******************************************************************
* ??_Ebad_cast@@UAEPAXI@Z (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_vector_dtor);
DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_vector_dtor)
void * __stdcall MSVCRT_bad_cast_vector_dtor(bad_cast * _this, unsigned int flags)
{
TRACE("(%p %x)\n", _this, flags);
......@@ -501,7 +501,7 @@ void * __stdcall MSVCRT_bad_cast_vector_dtor(bad_cast * _this, unsigned int flag
/******************************************************************
* ??_Gbad_cast@@UAEPAXI@Z (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_scalar_dtor);
DEFINE_THISCALL_WRAPPER(MSVCRT_bad_cast_scalar_dtor)
void * __stdcall MSVCRT_bad_cast_scalar_dtor(bad_cast * _this, unsigned int flags)
{
TRACE("(%p %x)\n", _this, flags);
......@@ -513,7 +513,7 @@ void * __stdcall MSVCRT_bad_cast_scalar_dtor(bad_cast * _this, unsigned int flag
/******************************************************************
* ??8type_info@@QBEHABV0@@Z (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_opequals_equals);
DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_opequals_equals)
int __stdcall MSVCRT_type_info_opequals_equals(type_info * _this, const type_info * rhs)
{
int ret = !strcmp(_this->mangled + 1, rhs->mangled + 1);
......@@ -524,7 +524,7 @@ int __stdcall MSVCRT_type_info_opequals_equals(type_info * _this, const type_inf
/******************************************************************
* ??9type_info@@QBEHABV0@@Z (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_opnot_equals);
DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_opnot_equals)
int __stdcall MSVCRT_type_info_opnot_equals(type_info * _this, const type_info * rhs)
{
int ret = !!strcmp(_this->mangled + 1, rhs->mangled + 1);
......@@ -535,7 +535,7 @@ int __stdcall MSVCRT_type_info_opnot_equals(type_info * _this, const type_info *
/******************************************************************
* ?before@type_info@@QBEHABV1@@Z (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_before);
DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_before)
int __stdcall MSVCRT_type_info_before(type_info * _this, const type_info * rhs)
{
int ret = strcmp(_this->mangled + 1, rhs->mangled + 1) < 0;
......@@ -546,7 +546,7 @@ int __stdcall MSVCRT_type_info_before(type_info * _this, const type_info * rhs)
/******************************************************************
* ??1type_info@@UAE@XZ (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_dtor);
DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_dtor)
void __stdcall MSVCRT_type_info_dtor(type_info * _this)
{
TRACE("(%p)\n", _this);
......@@ -556,7 +556,7 @@ void __stdcall MSVCRT_type_info_dtor(type_info * _this)
/******************************************************************
* ?name@type_info@@QBEPBDXZ (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_name);
DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_name)
const char * __stdcall MSVCRT_type_info_name(type_info * _this)
{
if (!_this->name)
......@@ -597,7 +597,7 @@ const char * __stdcall MSVCRT_type_info_name(type_info * _this)
/******************************************************************
* ?raw_name@type_info@@QBEPBDXZ (MSVCRT.@)
*/
DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_raw_name);
DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_raw_name)
const char * __stdcall MSVCRT_type_info_raw_name(type_info * _this)
{
TRACE("(%p) returning %s\n", _this, _this->mangled);
......@@ -605,7 +605,7 @@ const char * __stdcall MSVCRT_type_info_raw_name(type_info * _this)
}
/* Unexported */
DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_vector_dtor);
DEFINE_THISCALL_WRAPPER(MSVCRT_type_info_vector_dtor)
void * __stdcall MSVCRT_type_info_vector_dtor(type_info * _this, unsigned int flags)
{
TRACE("(%p %x)\n", _this, flags);
......
......@@ -422,7 +422,7 @@ __ASM_GLOBAL_FUNC( __CxxFrameHandler,
"pushl 28(%esp)\n\t" /* rec */
"call " __ASM_NAME("cxx_frame_handler") "\n\t"
"add $28,%esp\n\t"
"ret" );
"ret" )
/*********************************************************************
......
......@@ -109,7 +109,7 @@ __ASM_GLOBAL_FUNC(_EH_prolog,
"movl %ebp, 12(%esp)\n\t"
"leal 12(%esp), %ebp\n\t"
"pushl %eax\n\t"
"ret");
"ret")
#endif
/*******************************************************************
......@@ -286,7 +286,7 @@ __ASM_GLOBAL_FUNC( longjmp_set_regs,
"movl 12(%ecx),%esi\n\t" /* jmp_buf.Esi */
"movl 16(%ecx),%esp\n\t" /* jmp_buf.Esp */
"addl $4,%esp\n\t" /* get rid of return address */
"jmp *20(%ecx)\n\t" /* jmp_buf.Eip */ );
"jmp *20(%ecx)\n\t" /* jmp_buf.Eip */ )
/*
* The signatures of the setjmp/longjmp functions do not match that
......@@ -297,7 +297,7 @@ __ASM_GLOBAL_FUNC( longjmp_set_regs,
/*******************************************************************
* _setjmp (MSVCRT.@)
*/
DEFINE_SETJMP_ENTRYPOINT(MSVCRT__setjmp);
DEFINE_SETJMP_ENTRYPOINT(MSVCRT__setjmp)
int CDECL __regs_MSVCRT__setjmp(struct MSVCRT___JUMP_BUFFER *jmp)
{
jmp->Registration = (unsigned long)NtCurrentTeb()->Tib.ExceptionList;
......@@ -314,7 +314,7 @@ int CDECL __regs_MSVCRT__setjmp(struct MSVCRT___JUMP_BUFFER *jmp)
/*******************************************************************
* _setjmp3 (MSVCRT.@)
*/
DEFINE_SETJMP_ENTRYPOINT( MSVCRT__setjmp3 );
DEFINE_SETJMP_ENTRYPOINT( MSVCRT__setjmp3 )
int CDECL __regs_MSVCRT__setjmp3(struct MSVCRT___JUMP_BUFFER *jmp, int nb_args, ...)
{
jmp->Cookie = MSVCRT_JMP_MAGIC;
......
......@@ -148,7 +148,7 @@ __ASM_GLOBAL_FUNC(_chkesp,
"popl %ecx\n\t"
"popl %eax\n\t"
"leave\n\t"
"ret");
"ret")
void CDECL MSVCRT_chkesp_fail(void)
{
......
......@@ -150,7 +150,7 @@ __ASM_GLOBAL_FUNC(call_dll_entry_point,
"leal -4(%ebp),%esp\n\t"
"popl %ebx\n\t"
"popl %ebp\n\t"
"ret" );
"ret" )
#else /* __i386__ */
static inline BOOL call_dll_entry_point( DLLENTRYPROC proc, void *module,
UINT reason, void *reserved )
......
......@@ -360,7 +360,7 @@ __ASM_GLOBAL_FUNC( call_entry_point,
"\tpopl %edi\n"
"\tpopl %esi\n"
"\tpopl %ebp\n"
"\tret" );
"\tret" )
/***********************************************************************
......
......@@ -371,7 +371,7 @@ __ASM_GLOBAL_FUNC( LdrAccessResource,
"call " __ASM_NAME("access_resource") "\n\t"
"leave\n\t"
"ret $16"
);
)
#else
NTSTATUS WINAPI LdrAccessResource( HMODULE hmod, const IMAGE_RESOURCE_DATA_ENTRY *entry,
void **ptr, ULONG *size )
......
......@@ -407,7 +407,7 @@ __ASM_GLOBAL_FUNC( _chkstk,
"xchgl %esp,%eax\n\t"
"movl 0(%eax),%eax\n\t" /* copy return address from old location */
"movl %eax,0(%esp)\n\t"
"ret" );
"ret" )
#endif
/**************************************************************************
......@@ -422,7 +422,7 @@ __ASM_GLOBAL_FUNC( _alloca_probe,
"xchgl %esp,%eax\n\t"
"movl 0(%eax),%eax\n\t" /* copy return address from old location */
"movl %eax,0(%esp)\n\t"
"ret" );
"ret" )
#endif
......@@ -627,7 +627,7 @@ ULONGLONG __cdecl RtlUlonglongByteSwap(ULONGLONG i)
__ASM_GLOBAL_FUNC(NTDLL_RtlUlongByteSwap,
"movl %ecx,%eax\n\t"
"bswap %eax\n\t"
"ret");
"ret")
#endif
/*************************************************************************
......@@ -642,7 +642,7 @@ __ASM_GLOBAL_FUNC(NTDLL_RtlUlongByteSwap,
__ASM_GLOBAL_FUNC(NTDLL_RtlUshortByteSwap,
"movb %ch,%al\n\t"
"movb %cl,%ah\n\t"
"ret");
"ret")
#endif
......
......@@ -130,7 +130,7 @@ __ASM_GLOBAL_FUNC(vm86_enter,
".globl " __ASM_NAME("vm86_return_end") "\n\t"
__ASM_FUNC("vm86_return_end") "\n"
__ASM_NAME("vm86_return_end") ":\n\t"
"ret" );
"ret" )
#ifdef HAVE_SYS_VM86_H
# define __HAVE_VM86
......@@ -1477,12 +1477,12 @@ void __wine_enter_vm86( CONTEXT *context )
/**********************************************************************
* DbgBreakPoint (NTDLL.@)
*/
__ASM_GLOBAL_FUNC( DbgBreakPoint, "int $3; ret");
__ASM_GLOBAL_FUNC( DbgBreakPoint, "int $3; ret")
/**********************************************************************
* DbgUserBreakPoint (NTDLL.@)
*/
__ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int $3; ret");
__ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int $3; ret")
/**********************************************************************
......@@ -1509,7 +1509,7 @@ __ASM_GLOBAL_FUNC( EXC_CallHandler,
" popl %ebx\n"
" leave\n"
" ret\n"
);
)
__ASM_GLOBAL_FUNC(call_exception_handler,
" pushl %ebp\n"
" movl %esp, %ebp\n"
......@@ -1533,5 +1533,5 @@ __ASM_GLOBAL_FUNC(call_exception_handler,
" movl %ebp, %esp\n" /* restore saved stack, in case it was corrupted */
" popl %ebp\n"
" ret $20\n" /* (*4) */
);
)
#endif /* __i386__ */
......@@ -520,11 +520,11 @@ void __wine_enter_vm86( CONTEXT *context )
/**********************************************************************
* DbgBreakPoint (NTDLL.@)
*/
__ASM_GLOBAL_FUNC( DbgBreakPoint, "int $3; ret");
__ASM_GLOBAL_FUNC( DbgBreakPoint, "int $3; ret")
/**********************************************************************
* DbgUserBreakPoint (NTDLL.@)
*/
__ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int $3; ret");
__ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int $3; ret")
#endif /* __x86_64__ */
......@@ -1309,7 +1309,7 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class,
*/
#if defined(__i386__) && defined(__GNUC__)
__ASM_GLOBAL_FUNC( NtCurrentTeb, ".byte 0x64\n\tmovl 0x18,%eax\n\tret" );
__ASM_GLOBAL_FUNC( NtCurrentTeb, ".byte 0x64\n\tmovl 0x18,%eax\n\tret" )
#elif defined(__i386__) && defined(_MSC_VER)
......
......@@ -346,24 +346,24 @@ HRESULT WINAPI fnTextSrv_TxGetCachedSize(ITextServices *iface,
return E_NOTIMPL;
}
DEFINE_THISCALL_WRAPPER(fnTextSrv_TxSendMessage);
DEFINE_THISCALL_WRAPPER(fnTextSrv_TxDraw);
DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetHScroll);
DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetVScroll);
DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxSetCursor);
DEFINE_THISCALL_WRAPPER(fnTextSrv_TxQueryHitPoint);
DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInplaceActivate);
DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInplaceDeactivate);
DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxUIActivate);
DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxUIDeactivate);
DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetText);
DEFINE_THISCALL_WRAPPER(fnTextSrv_TxSetText);
DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetCurrentTargetX);
DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetBaseLinePos);
DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetNaturalSize);
DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetDropTarget);
DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxPropertyBitsChange);
DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetCachedSize);
DEFINE_THISCALL_WRAPPER(fnTextSrv_TxSendMessage)
DEFINE_THISCALL_WRAPPER(fnTextSrv_TxDraw)
DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetHScroll)
DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetVScroll)
DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxSetCursor)
DEFINE_THISCALL_WRAPPER(fnTextSrv_TxQueryHitPoint)
DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInplaceActivate)
DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxInplaceDeactivate)
DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxUIActivate)
DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxUIDeactivate)
DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetText)
DEFINE_THISCALL_WRAPPER(fnTextSrv_TxSetText)
DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetCurrentTargetX)
DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetBaseLinePos)
DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetNaturalSize)
DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetDropTarget)
DEFINE_THISCALL_WRAPPER(fnTextSrv_OnTxPropertyBitsChange)
DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetCachedSize)
static const ITextServicesVtbl textservices_Vtbl =
{
......
......@@ -1036,7 +1036,7 @@ __ASM_GLOBAL_FUNC(call_server_func,
"popl %esi\n\t" /* Restore registers */
"popl %edi\n\t"
"popl %ebp\n\t"
"ret\n" );
"ret\n" )
#else
#warning call_server_func not implemented for your architecture
LONG_PTR __cdecl call_server_func(SERVER_ROUTINE func, unsigned char * args, unsigned short stack_size)
......
......@@ -278,7 +278,7 @@ __ASM_GLOBAL_FUNC( WINPROC_wrapper,
"popl %esi\n\t"
"popl %edi\n\t"
"leave\n\t"
"ret" );
"ret" )
#else
static inline LRESULT WINPROC_wrapper( WNDPROC proc, HWND hwnd, UINT msg,
WPARAM wParam, LPARAM lParam )
......
......@@ -30,28 +30,28 @@ __ASM_GLOBAL_FUNC(interlocked_cmpxchg,
"movl 8(%esp),%ecx\n\t"
"movl 4(%esp),%edx\n\t"
"lock; cmpxchgl %ecx,(%edx)\n\t"
"ret");
"ret")
__ASM_GLOBAL_FUNC(interlocked_cmpxchg_ptr,
"movl 12(%esp),%eax\n\t"
"movl 8(%esp),%ecx\n\t"
"movl 4(%esp),%edx\n\t"
"lock; cmpxchgl %ecx,(%edx)\n\t"
"ret");
"ret")
__ASM_GLOBAL_FUNC(interlocked_xchg,
"movl 8(%esp),%eax\n\t"
"movl 4(%esp),%edx\n\t"
"lock; xchgl %eax,(%edx)\n\t"
"ret");
"ret")
__ASM_GLOBAL_FUNC(interlocked_xchg_ptr,
"movl 8(%esp),%eax\n\t"
"movl 4(%esp),%edx\n\t"
"lock; xchgl %eax,(%edx)\n\t"
"ret");
"ret")
__ASM_GLOBAL_FUNC(interlocked_xchg_add,
"movl 8(%esp),%eax\n\t"
"movl 4(%esp),%edx\n\t"
"lock; xaddl %eax,(%edx)\n\t"
"ret");
"ret")
#elif defined(_MSC_VER)
......@@ -108,23 +108,23 @@ __declspec(naked) int interlocked_xchg_add( int *dest, int incr )
__ASM_GLOBAL_FUNC(interlocked_cmpxchg,
"mov %edx, %eax\n\t"
"lock cmpxchgl %esi,(%rdi)\n\t"
"ret");
"ret")
__ASM_GLOBAL_FUNC(interlocked_cmpxchg_ptr,
"mov %rdx, %rax\n\t"
"lock cmpxchgq %rsi,(%rdi)\n\t"
"ret");
"ret")
__ASM_GLOBAL_FUNC(interlocked_xchg,
"mov %esi, %eax\n\t"
"lock xchgl %eax, (%rdi)\n\t"
"ret");
"ret")
__ASM_GLOBAL_FUNC(interlocked_xchg_ptr,
"mov %rsi, %rax\n\t"
"lock xchgq %rax,(%rdi)\n\t"
"ret");
"ret")
__ASM_GLOBAL_FUNC(interlocked_xchg_add,
"mov %esi, %eax\n\t"
"lock xaddl %eax, (%rdi)\n\t"
"ret");
"ret")
#else
# error You must implement the interlocked* functions for your compiler
......@@ -286,7 +286,7 @@ __ASM_GLOBAL_FUNC(interlocked_cmpxchg,
"beq $0,L0cmpxchg\n\t"
"mov $18,$0\n"
"L1cmpxchg:\n\t"
"mb");
"mb")
__ASM_GLOBAL_FUNC(interlocked_cmpxchg_ptr,
"L0cmpxchg_ptr:\n\t"
......@@ -298,7 +298,7 @@ __ASM_GLOBAL_FUNC(interlocked_cmpxchg_ptr,
"beq $0,L0cmpxchg_ptr\n\t"
"mov $18,$0\n"
"L1cmpxchg_ptr:\n\t"
"mb");
"mb")
__ASM_GLOBAL_FUNC(interlocked_xchg,
"L0xchg:\n\t"
......@@ -306,7 +306,7 @@ __ASM_GLOBAL_FUNC(interlocked_xchg,
"mov $17,$1\n\t"
"stl_c $1,0($16)\n\t"
"beq $1,L0xchg\n\t"
"mb");
"mb")
__ASM_GLOBAL_FUNC(interlocked_xchg_ptr,
"L0xchg_ptr:\n\t"
......@@ -314,7 +314,7 @@ __ASM_GLOBAL_FUNC(interlocked_xchg_ptr,
"mov $17,$1\n\t"
"stq_c $1,0($16)\n\t"
"beq $1,L0xchg_ptr\n\t"
"mb");
"mb")
__ASM_GLOBAL_FUNC(interlocked_xchg_add,
"L0xchg_add:\n\t"
......@@ -322,7 +322,7 @@ __ASM_GLOBAL_FUNC(interlocked_xchg_add,
"addl $0,$17,$1\n\t"
"stl_c $1,0($16)\n\t"
"beq $1,L0xchg_add\n\t"
"mb");
"mb")
#else
# error You must implement the interlocked* functions for your CPU
......
......@@ -64,7 +64,7 @@ __ASM_GLOBAL_FUNC( wine_switch_to_stack,
"pushl %edx\n\t"
"xorl %ebp,%ebp\n\t"
"call *%ecx\n\t"
"int $3" /* we never return here */ );
"int $3" /* we never return here */ )
#elif defined(__i386__) && defined(_MSC_VER)
__declspec(naked) void wine_switch_to_stack( void (*func)(void *), void *arg, void *stack )
{
......@@ -83,7 +83,7 @@ __ASM_GLOBAL_FUNC( wine_switch_to_stack,
"sub %o2, 96, %sp\n\t" /* store stack */
"call %l0, 0\n\t" /* call func */
"mov %l1, %o0\n\t" /* delay slot: arg for func */
"ta 0x01"); /* breakpoint - we never get here */
"ta 0x01") /* breakpoint - we never get here */
#elif defined(__powerpc__) && defined(__APPLE__)
__ASM_GLOBAL_FUNC( wine_switch_to_stack,
"mtctr r3\n\t" /* func -> ctr */
......@@ -91,21 +91,21 @@ __ASM_GLOBAL_FUNC( wine_switch_to_stack,
"mr r1,r5\n\t" /* stack */
"subi r1,r1,0x100\n\t" /* adjust stack pointer */
"bctr\n" /* call ctr */
"1:\tb 1b"); /* loop */
"1:\tb 1b") /* loop */
#elif defined(__powerpc__) && defined(__GNUC__)
__ASM_GLOBAL_FUNC( wine_switch_to_stack,
"mtctr 3\n\t" /* func -> ctr */
"mr 3,4\n\t" /* args -> function param 1 (r3) */
"mr 1,5\n\t" /* stack */
"bctr\n\t" /* call ctr */
"1:\tb 1b"); /* loop */
"1:\tb 1b") /* loop */
#elif defined(__ALPHA__) && defined(__GNUC__)
__ASM_GLOBAL_FUNC( wine_switch_to_stack,
"mov $16,$0\n\t" /* func */
"mov $17,$16\n\t" /* arg */
"mov $18,$30\n\t" /* stack */
"jsr $31,($0),0\n\t" /* call func */
"L1:\tbr $31,L1"); /* loop */
"L1:\tbr $31,L1") /* loop */
#elif defined(__x86_64__) && defined(__GNUC__)
__ASM_GLOBAL_FUNC( wine_switch_to_stack,
"movq %rdi,%rax\n\t" /* func */
......@@ -114,7 +114,7 @@ __ASM_GLOBAL_FUNC( wine_switch_to_stack,
"movq %rdx,%rsp\n\t"
"xorq %rbp,%rbp\n\t"
"callq *%rax\n\t" /* call func */
"int $3");
"int $3")
#else
#error You must implement wine_switch_to_stack for your platform
#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