diff options
| author | Gerd Weiss <gm@openoffice.org> | 2007-05-10 10:08:40 +0000 |
|---|---|---|
| committer | Gerd Weiss <gm@openoffice.org> | 2007-05-10 10:08:40 +0000 |
| commit | e782ae490d61a963281d294b2cb1371e39e4e10d (patch) | |
| tree | 9194c02b875e473aa3cbd5bacd4979f684775655 | |
| parent | 2023f4c105227ef26098cdc66600d9c1ae98c51e (diff) | |
INTEGRATION: CWS native82 (1.8.364); FILE MERGED
2007/03/27 07:31:53 dv 1.8.364.1: #i75394# Use memory mapped file to transfer error codes from msi to setup loader
| -rw-r--r-- | desktop/win32/source/setup/setup.hxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/desktop/win32/source/setup/setup.hxx b/desktop/win32/source/setup/setup.hxx index 87b3c62538cf..d802729fca4c 100644 --- a/desktop/win32/source/setup/setup.hxx +++ b/desktop/win32/source/setup/setup.hxx @@ -4,9 +4,9 @@ * * $RCSfile: setup.hxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: rt $ $Date: 2005-09-08 17:53:57 $ + * last change: $Author: gm $ $Date: 2007-05-10 11:08:40 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -76,6 +76,7 @@ struct LanguageDataX class SetupAppX : public SetupApp { HINSTANCE m_hInst; + HANDLE m_hMapFile; LPTSTR m_pAppTitle; LPTSTR m_pCmdLine; LPTSTR m_pDatabase; @@ -87,6 +88,7 @@ class SetupAppX : public SetupApp LPTSTR m_pTmpName; LPTSTR m_pErrorText; LPTSTR m_pModuleFile; + int *m_pMSIErrorCode; boolean m_bQuiet : 1; boolean m_bAdministrative : 1; @@ -135,6 +137,7 @@ public: virtual boolean CheckVersion(); virtual boolean Install( long nLanguage ); + virtual UINT GetError() const; virtual void DisplayError( UINT nErr ) const; void Log( LPCTSTR pMessage, LPCTSTR pText = NULL ) const; |