diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2012-10-22 10:42:44 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-10-22 12:54:38 +0200 |
commit | a8af2ffb0c36e96ca2dc11b25c64e3268a278906 (patch) | |
tree | d289b8ebf37c962cff30f04fd56335e285850451 | |
parent | 4740100e2bd0817994a11cdfac77bfb1d45015a1 (diff) | |
download | msitools-a8af2ffb0c36e96ca2dc11b25c64e3268a278906.tar.gz msitools-a8af2ffb0c36e96ca2dc11b25c64e3268a278906.tar.xz msitools-a8af2ffb0c36e96ca2dc11b25c64e3268a278906.zip |
make custom.c compile (will die anyway)
-rw-r--r-- | libmsi/custom.c | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/libmsi/custom.c b/libmsi/custom.c index 8f32e59..f874e12 100644 --- a/libmsi/custom.c +++ b/libmsi/custom.c @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #define COBJMACROS @@ -28,6 +27,7 @@ #include "winbase.h" #include "winerror.h" #include "msidefs.h" +#include "wingdi.h" #include "winuser.h" #include "objbase.h" #include "oleauto.h" @@ -36,7 +36,6 @@ #include "msiserver.h" #include "wine/debug.h" #include "wine/unicode.h" -#include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(msi); @@ -520,27 +519,10 @@ static UINT get_action_info( const GUID *guid, INT *type, MSIHANDLE *handle, return ERROR_SUCCESS; } -#ifdef __i386__ -extern UINT CUSTOMPROC_wrapper( MsiCustomActionEntryPoint proc, MSIHANDLE handle ); -__ASM_GLOBAL_FUNC( CUSTOMPROC_wrapper, - "pushl %ebp\n\t" - __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") - __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") - "movl %esp,%ebp\n\t" - __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") - "pushl 12(%ebp)\n\t" - "movl 8(%ebp),%eax\n\t" - "call *%eax\n\t" - "leave\n\t" - __ASM_CFI(".cfi_def_cfa %esp,4\n\t") - __ASM_CFI(".cfi_same_value %ebp\n\t") - "ret" ) -#else static inline UINT CUSTOMPROC_wrapper( MsiCustomActionEntryPoint proc, MSIHANDLE handle ) { return proc(handle); } -#endif static DWORD ACTION_CallDllFunction( const GUID *guid ) { @@ -578,17 +560,7 @@ static DWORD ACTION_CallDllFunction( const GUID *guid ) TRACE("calling %s\n", debugstr_w( function ) ); handle_msi_break( function ); - __TRY - { - r = CUSTOMPROC_wrapper( fn, hPackage ); - } - __EXCEPT_PAGE_FAULT - { - ERR("Custom action (%s:%s) caused a page fault: %08x\n", - debugstr_w(dll), debugstr_w(function), GetExceptionCode()); - r = ERROR_SUCCESS; - } - __ENDTRY; + r = CUSTOMPROC_wrapper( fn, hPackage ); MsiCloseHandle( hPackage ); } |