Remove OWN_DEBUG_PRINT

1 files changed, 0 insertions, 55 deletions

diff --git a/setup_native/source/win32/customactions/regactivex/regactivex.cxx b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
index fa4188b88..e3a14e89b 100644
--- a/setup_native/source/win32/customactions/regactivex/regactivex.cxx
+++ b/setup_native/source/win32/customactions/regactivex/regactivex.cxx
@@ -47,8 +47,6 @@
 #define WRITER_COMPONENT 16
 #define MATH_COMPONENT 32
 
-// #define OWN_DEBUG_PRINT
-
 typedef int ( __stdcall * DllNativeRegProc ) ( int, BOOL, BOOL, const char* );
 typedef int ( __stdcall * DllNativeUnregProc ) ( int, BOOL, BOOL );
 
@@ -79,22 +77,9 @@ char* UnicodeToAnsiString( wchar_t* pUniString )
     return buff;
 }
 
-#ifdef OWN_DEBUG_PRINT
-void WarningMessageInt( wchar_t* pWarning, unsigned int nValue )
-{
-    wchar_t pStr[5] = { nValue%10000/1000 + 48, nValue%1000/100 + 48, nValue%100/10 + 48, nValue%10 + 48, 0 };
-       MessageBox(NULL, pStr, pWarning, MB_OK | MB_ICONINFORMATION);
-}
-#endif
-
 //----------------------------------------------------------
 void RegisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallForAllUser, BOOL InstallFor64Bit )
 {
-#ifdef OWN_DEBUG_PRINT
-    MessageBoxW(NULL, L"RegisterActiveXNative", L"Information", MB_OK | MB_ICONINFORMATION);
-    MessageBoxA(NULL, pActiveXPath, "Library Path", MB_OK | MB_ICONINFORMATION);
-#endif
-
     // For Win98/WinME the values should be written to the local machine
     OSVERSIONINFO		aVerInfo;
     aVerInfo.dwOSVersionInfoSize = sizeof( aVerInfo );
@@ -107,9 +92,6 @@ void RegisterActiveXNative( const char* pActiveXPath, int nMode, BOOL InstallFor
         DllNativeRegProc pNativeProc = ( DllNativeRegProc )GetProcAddress( hModule, "DllRegisterServerNative" );
         if( pNativeProc!=NULL )
         {
-#ifdef OWN_DEBUG_PRINT
-            MessageBoxA(NULL, pActiveXPath, "Library Path", MB_OK | MB_ICONINFORMATION);
-#endif
             int nLen = strlen( pActiveXPath );
             int nRemoveLen = strlen( "\\so_activex.dll" );
             if ( nLen > nRemoveLen )
@@ -174,10 +156,6 @@ BOOL GetActiveXControlPath( MSIHANDLE hMSI, char** ppActiveXPath )
     if ( GetMsiProp( hMSI, L"INSTALLLOCATION", &pProgPath ) && pProgPath )
        {
         char* pCharProgPath = UnicodeToAnsiString( pProgPath );
-#ifdef OWN_DEBUG_PRINT
-        MessageBox(NULL, pProgPath, L"Basis Installation Path", MB_OK | MB_ICONINFORMATION);
-        MessageBoxA(NULL, pCharProgPath, "Basis Installation Path( char )", MB_OK | MB_ICONINFORMATION);
-#endif
 
         if ( pCharProgPath )
         {
@@ -211,11 +189,6 @@ BOOL GetDelta( MSIHANDLE hMSI, int& nOldInstallMode, int& nInstallMode, int& nDe
 
     if ( ERROR_SUCCESS == MsiGetFeatureState( hMSI, L"gm_p_Wrt_Bin", &current_state, &future_state ) )
     {
-#ifdef OWN_DEBUG_PRINT
-        WarningMessageInt( L"writer current_state = ", current_state );
-        WarningMessageInt( L"writer future_state = ", future_state );
-#endif
-
         // analyze writer installation mode
         if ( current_state == INSTALLSTATE_LOCAL )
             nOldInstallMode |= WRITER_COMPONENT;
@@ -233,11 +206,6 @@ BOOL GetDelta( MSIHANDLE hMSI, int& nOldInstallMode, int& nInstallMode, int& nDe
 
     if ( ERROR_SUCCESS == MsiGetFeatureState( hMSI, L"gm_p_Calc_Bin", &current_state, &future_state ) )
     {
-#ifdef OWN_DEBUG_PRINT
-        WarningMessageInt( L"calc current_state = ", current_state );
-        WarningMessageInt( L"calc future_state = ", future_state );
-#endif
-
         // analyze calc installation mode
         if ( current_state == INSTALLSTATE_LOCAL )
             nOldInstallMode |= CALC_COMPONENT;
@@ -341,19 +309,11 @@ extern "C" UINT __stdcall InstallActiveXControl( MSIHANDLE hMSI )
     int nInstallMode = 0;
     int nDeinstallMode = 0;
 
-#ifdef OWN_DEBUG_PRINT
-    MessageBox(NULL, L"InstallActiveXControl", L"Information", MB_OK | MB_ICONINFORMATION);
-#endif
-
     INSTALLSTATE current_state;
     INSTALLSTATE future_state;
 
     if ( ERROR_SUCCESS == MsiGetFeatureState( hMSI, L"gm_o_Activexcontrol", &current_state, &future_state ) )
     {
-#ifdef OWN_DEBUG_PRINT
-        MessageBox(NULL, L"InstallActiveXControl Step2", L"Information", MB_OK | MB_ICONINFORMATION);
-#endif
-
         BOOL bInstallForAllUser = MakeInstallForAllUsers( hMSI );
         BOOL bInstallFor64Bit = MakeInstallFor64Bit( hMSI );
 
@@ -361,17 +321,9 @@ extern "C" UINT __stdcall InstallActiveXControl( MSIHANDLE hMSI )
         if ( GetActiveXControlPath( hMSI, &pActiveXPath ) && pActiveXPath
         && GetDelta( hMSI, nOldInstallMode, nInstallMode, nDeinstallMode ) )
         {
-#ifdef OWN_DEBUG_PRINT
-            MessageBox(NULL, L"InstallActiveXControl Step3", L"Information", MB_OK | MB_ICONINFORMATION);
-#endif
-
             if ( future_state == INSTALLSTATE_LOCAL
               || ( current_state == INSTALLSTATE_LOCAL && future_state == INSTALLSTATE_UNKNOWN ) )
             {
-#ifdef OWN_DEBUG_PRINT
-                MessageBox(NULL, L"InstallActiveXControl, adjusting", L"Information", MB_OK | MB_ICONINFORMATION);
-                WarningMessageInt( L"nInstallMode = ", nInstallMode );
-#endif
                 // the control is installed in the new selected configuration
 
                 if ( current_state == INSTALLSTATE_LOCAL && nDeinstallMode )
@@ -382,9 +334,6 @@ extern "C" UINT __stdcall InstallActiveXControl( MSIHANDLE hMSI )
             }
             else if ( current_state == INSTALLSTATE_LOCAL && future_state == INSTALLSTATE_ABSENT )
             {
-#ifdef OWN_DEBUG_PRINT
-                MessageBox(NULL, L"InstallActiveXControl, removing", L"Information", MB_OK | MB_ICONINFORMATION);
-#endif
                 if ( nOldInstallMode )
                     UnregisterActiveXNative( pActiveXPath, nOldInstallMode, bInstallForAllUser, bInstallFor64Bit );
             }
@@ -407,10 +356,6 @@ extern "C" UINT __stdcall DeinstallActiveXControl( MSIHANDLE hMSI )
     INSTALLSTATE current_state;
     INSTALLSTATE future_state;
 
-#ifdef OWN_DEBUG_PRINT
-    MessageBox(NULL, L"DeinstallActiveXControl", L"Information", MB_OK | MB_ICONINFORMATION);
-#endif
-
     if ( ERROR_SUCCESS == MsiGetFeatureState( hMSI, L"gm_o_Activexcontrol", &current_state, &future_state ) )
     {
         char* pActiveXPath = NULL;