diff options
| author | Tino Rachui <tra@openoffice.org> | 2004-05-26 16:02:51 +0000 |
|---|---|---|
| committer | Tino Rachui <tra@openoffice.org> | 2004-05-26 16:02:51 +0000 |
| commit | d028b0cdfc1e4a5a65597eefee1b7076b0e3b647 (patch) | |
| tree | 2966bb166a76d5ec284a6f1827190caa51fc1574 | |
| parent | a43401310cba82296baa70315b6e40fe328150f7 (diff) | |
#i28277#force standard calling convention using __stdcall
| -rw-r--r-- | setup_native/source/win32/customactions/regactivex/makefile.mk | 5 | ||||
| -rw-r--r-- | setup_native/source/win32/customactions/regactivex/regactivex.cxx | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/setup_native/source/win32/customactions/regactivex/makefile.mk b/setup_native/source/win32/customactions/regactivex/makefile.mk index 77d3a35a741a..60b3ab7263c0 100644 --- a/setup_native/source/win32/customactions/regactivex/makefile.mk +++ b/setup_native/source/win32/customactions/regactivex/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.1 $ +# $Revision: 1.2 $ # -# last change: $Author: mav $ $Date: 2004-05-25 15:44:32 $ +# last change: $Author: tra $ $Date: 2004-05-26 17:02:51 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -63,6 +63,7 @@ PRJ=..$/..$/..$/.. PRJNAME=setup2 TARGET=regactivex +USE_DEFFILE=TRUE .IF "$(GUI)"=="WNT" diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx b/setup_native/source/win32/customactions/regactivex/regactivex.cxx index c94dfbc7ad31..ae3fcb2b02c9 100644 --- a/setup_native/source/win32/customactions/regactivex/regactivex.cxx +++ b/setup_native/source/win32/customactions/regactivex/regactivex.cxx @@ -2,9 +2,9 @@ * * $RCSfile: regactivex.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mav $ $Date: 2004-05-25 16:17:29 $ + * last change: $Author: tra $ $Date: 2004-05-26 17:02:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -267,7 +267,7 @@ BOOL MakeInstallForAllUsers( MSIHANDLE hMSI ) } //---------------------------------------------------------- -extern "C" UINT InstallActiveXControl( MSIHANDLE hMSI ) +extern "C" UINT __stdcall InstallActiveXControl( MSIHANDLE hMSI ) { int nOldInstallMode = 0; int nInstallMode = 0; @@ -314,7 +314,7 @@ extern "C" UINT InstallActiveXControl( MSIHANDLE hMSI ) } //---------------------------------------------------------- -extern "C" UINT DeinstallActiveXControl( MSIHANDLE hMSI ) +extern "C" __stdcall UINT DeinstallActiveXControl( MSIHANDLE hMSI ) { INSTALLSTATE current_state; INSTALLSTATE future_state; |