summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
authorAlexander Wilms <f.alexander.wilms@gmail.com>2014-02-22 21:20:15 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-02-23 03:38:49 +0000
commit0ce0c369aa8880dff9fe874ba85ec6f52ee37ddf (patch)
tree5024cba9f9ea5e3b23ea26025323f6aef39488d0 /setup_native
parentb81ac16e65b311d6e43c05c22c65d2040c9d7e04 (diff)
Remove unneccessary comments
Change-Id: I939160ae72fecbe3d4a60ce755730bd4c38497fb Reviewed-on: https://gerrit.libreoffice.org/8182 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'setup_native')
-rw-r--r--setup_native/source/win32/customactions/regactivex/regactivex.cxx20
-rw-r--r--setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx8
-rw-r--r--setup_native/source/win32/customactions/shellextensions/checkpatches.cxx2
-rw-r--r--setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx2
-rw-r--r--setup_native/source/win32/customactions/tools/checkversion.cxx6
-rw-r--r--setup_native/source/win32/customactions/tools/seterror.cxx4
6 files changed, 21 insertions, 21 deletions
diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
index b25602db198a..c2f690fbf724 100644
--- a/setup_native/source/win32/customactions/regactivex/regactivex.cxx
+++ b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
@@ -54,7 +54,7 @@ BOOL UnicodeEquals( wchar_t* pStr1, wchar_t* pStr2 )
return ( *pStr1 == 0 && *pStr2 == 0 );
}
-//----------------------------------------------------------
+
char* UnicodeToAnsiString( wchar_t* pUniString )
{
int len = WideCharToMultiByte(
@@ -68,7 +68,7 @@ char* UnicodeToAnsiString( wchar_t* pUniString )
return buff;
}
-//----------------------------------------------------------
+
void RegisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallForAllUser, BOOL InstallFor64Bit )
{
HINSTANCE hModule = LoadLibraryExA( pActiveXPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH );
@@ -95,7 +95,7 @@ void RegisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallFor
}
}
-//----------------------------------------------------------
+
void UnregisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallForAllUser, BOOL InstallFor64Bit )
{
HINSTANCE hModule = LoadLibraryExA( pActiveXPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH );
@@ -109,7 +109,7 @@ void UnregisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallF
}
}
-//----------------------------------------------------------
+
BOOL GetMsiProp( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue )
{
DWORD sz = 0;
@@ -128,7 +128,7 @@ BOOL GetMsiProp( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue )
return FALSE;
}
-//----------------------------------------------------------
+
BOOL GetActiveXControlPath( MSIHANDLE hMSI, char** ppActiveXPath )
{
wchar_t* pProgPath = NULL;
@@ -155,7 +155,7 @@ BOOL GetActiveXControlPath( MSIHANDLE hMSI, char** ppActiveXPath )
return FALSE;
}
-//----------------------------------------------------------
+
BOOL GetDelta( MSIHANDLE hMSI, int& nOldInstallMode, int& nInstallMode, int& nDeinstallMode )
{
// for now the chart is always installed
@@ -254,7 +254,7 @@ BOOL GetDelta( MSIHANDLE hMSI, int& nOldInstallMode, int& nInstallMode, int& nDe
return TRUE;
}
-//----------------------------------------------------------
+
BOOL MakeInstallForAllUsers( MSIHANDLE hMSI )
{
BOOL bResult = FALSE;
@@ -268,7 +268,7 @@ BOOL MakeInstallForAllUsers( MSIHANDLE hMSI )
return bResult;
}
-//----------------------------------------------------------
+
BOOL MakeInstallFor64Bit( MSIHANDLE hMSI )
{
BOOL bResult = FALSE;
@@ -281,7 +281,7 @@ BOOL MakeInstallFor64Bit( MSIHANDLE hMSI )
return bResult;
}
-//----------------------------------------------------------
+
extern "C" UINT __stdcall InstallActiveXControl( MSIHANDLE hMSI )
{
INSTALLSTATE current_state;
@@ -328,7 +328,7 @@ extern "C" UINT __stdcall InstallActiveXControl( MSIHANDLE hMSI )
return ERROR_SUCCESS;
}
-//----------------------------------------------------------
+
extern "C" UINT __stdcall DeinstallActiveXControl( MSIHANDLE hMSI )
{
INSTALLSTATE current_state;
diff --git a/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx b/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx
index 0c51ccb8f97e..b8087af82deb 100644
--- a/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx
+++ b/setup_native/source/win32/customactions/regpatchactivex/regpatchactivex.cxx
@@ -32,7 +32,7 @@
#include <malloc.h>
#include <stdio.h>
-//----------------------------------------------------------
+
BOOL UnicodeEquals( wchar_t* pStr1, wchar_t* pStr2 )
{
if ( pStr1 == NULL && pStr2 == NULL )
@@ -46,7 +46,7 @@ BOOL UnicodeEquals( wchar_t* pStr1, wchar_t* pStr2 )
return ( *pStr1 == 0 && *pStr2 == 0 );
}
-//----------------------------------------------------------
+
BOOL GetMsiProp( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue )
{
DWORD sz = 0;
@@ -65,7 +65,7 @@ BOOL GetMsiProp( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue )
return FALSE;
}
-//----------------------------------------------------------
+
BOOL MakeInstallForAllUsers( MSIHANDLE hMSI )
{
BOOL bResult = FALSE;
@@ -79,7 +79,7 @@ BOOL MakeInstallForAllUsers( MSIHANDLE hMSI )
return bResult;
}
-//----------------------------------------------------------
+
extern "C" UINT __stdcall PatchActiveXControl( MSIHANDLE hMSI )
{
// MessageBox(NULL, L"PatchActiveXControl", L"Information", MB_OK | MB_ICONINFORMATION);
diff --git a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
index 4207837fead2..d76b7646b7db 100644
--- a/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/checkpatches.cxx
@@ -44,7 +44,7 @@
#include <systools/win32/uwinapi.h>
-//----------------------------------------------------------
+
#ifdef DEBUG
inline void OutputDebugStringFormat( LPCSTR pFormat, ... )
{
diff --git a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
index fb106d7cb8b5..5253b41f5cf2 100644
--- a/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/vistaspecial.cxx
@@ -45,7 +45,7 @@
#include <systools/win32/uwinapi.h>
#include <../tools/seterror.hxx>
-//----------------------------------------------------------
+
#ifdef DEBUG
inline void OutputDebugStringFormat( LPCSTR pFormat, ... )
{
diff --git a/setup_native/source/win32/customactions/tools/checkversion.cxx b/setup_native/source/win32/customactions/tools/checkversion.cxx
index 714894636bb2..526cc76d0839 100644
--- a/setup_native/source/win32/customactions/tools/checkversion.cxx
+++ b/setup_native/source/win32/customactions/tools/checkversion.cxx
@@ -35,7 +35,7 @@
#include <seterror.hxx>
-//----------------------------------------------------------
+
BOOL GetMsiProp( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue )
{
DWORD sz = 0;
@@ -54,7 +54,7 @@ BOOL GetMsiProp( MSIHANDLE hMSI, const wchar_t* pPropName, wchar_t** ppValue )
return FALSE;
}
-//----------------------------------------------------------
+
#ifdef DEBUG
inline void OutputDebugStringFormat( LPCTSTR pFormat, ... )
{
@@ -71,7 +71,7 @@ static inline void OutputDebugStringFormat( LPCTSTR, ... )
}
#endif
-//----------------------------------------------------------
+
extern "C" UINT __stdcall CheckVersions( MSIHANDLE hMSI )
{
// MessageBox(NULL, L"CheckVersions", L"Information", MB_OK | MB_ICONINFORMATION);
diff --git a/setup_native/source/win32/customactions/tools/seterror.cxx b/setup_native/source/win32/customactions/tools/seterror.cxx
index 8a60b8a8df30..c7de7b7a761a 100644
--- a/setup_native/source/win32/customactions/tools/seterror.cxx
+++ b/setup_native/source/win32/customactions/tools/seterror.cxx
@@ -34,7 +34,7 @@
#include <seterror.hxx>
-//----------------------------------------------------------
+
#ifdef DEBUG
inline void OutputDebugStringFormat( LPCTSTR pFormat, ... )
{
@@ -51,7 +51,7 @@ static inline void OutputDebugStringFormat( LPCTSTR, ... )
}
#endif
-//----------------------------------------------------------
+
void SetMsiErrorCode( int nErrorCode )
{
const TCHAR sMemMapName[] = TEXT( "Global\\MsiErrorObject" );