From a8af2ffb0c36e96ca2dc11b25c64e3268a278906 Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 22 Oct 2012 10:42:44 +0200
Subject: make custom.c compile (will die anyway)

---
 libmsi/custom.c | 32 ++------------------------------
 1 file 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 );
         }
-- 
cgit