Menu
▾
▴
[Firebird-checkins] CVS: firebird2/src/utilities/fbcpl ctrlpan.h,1.2.2.1,1.2.2.2 fbdialog.cpp,1.3.2.1,1.3.2.2 fbdialog.h,1.3.2.1,1.3.2.2 fbpanel.cpp,1.3.2.1,1.3.2.2 fbpanel.h,1.3.2.1,1.3.2.2
|
From: Adriano d. S. F. <asf...@us...> - 2005-05-07 19:30:51
|
Update of /cvsroot/firebird/firebird2/src/utilities/fbcpl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8054/src/utilities/fbcpl Modified Files: Tag: B2_0_intl ctrlpan.h fbdialog.cpp fbdialog.h fbpanel.cpp fbpanel.h Log Message: Merge HEAD changes from Alpha1 to 2005-05-07 into B2_0_intl branch Index: ctrlpan.h =================================================================== RCS file: /cvsroot/firebird/firebird2/src/utilities/fbcpl/ctrlpan.h,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -b -U3 -r1.2.2.1 -r1.2.2.2 --- ctrlpan.h 19 Mar 2005 18:05:06 -0000 1.2.2.1 +++ ctrlpan.h 7 May 2005 19:29:33 -0000 1.2.2.2 @@ -1,7 +1,7 @@ // CtrlPan.h -#if !defined(_CTRLPAN_H_) -#define _CTRLPAN_H_ +#if !defined(UTILITIES_CTRLPAN_H) +#define UTILITIES_CTRLPAN_H #include <cpl.h> // control panel definitions @@ -28,4 +28,5 @@ static CControlPanel* m_pThis; // nasty hack to get object ptr }; -#endif // _CTRLPAN_H_ +#endif // UTILITIES_CTRLPAN_H + Index: fbdialog.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/utilities/fbcpl/fbdialog.cpp,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -b -U3 -r1.3.2.1 -r1.3.2.2 --- fbdialog.cpp 19 Mar 2005 18:05:07 -0000 1.3.2.1 +++ fbdialog.cpp 7 May 2005 19:29:33 -0000 1.3.2.2 @@ -71,17 +71,17 @@ m_CS_Server_Name = REMOTE_CS_EXECUTABLE; #endif - fb_status.AutoStart = 0; - fb_status.ServicesAvailable = 0; + fb_status.AutoStart = false; + fb_status.ServicesAvailable = false; fb_status.ServerStatus = 0; - fb_status.UseGuardian = 0; - fb_status.UseService = 0; - fb_status.WasRunning = 0; + fb_status.UseGuardian = false; + fb_status.UseService = false; + fb_status.WasRunning = false; #ifdef MANAGE_CLASSIC - fb_status.UseClassic = 0; + fb_status.UseClassic = false; #endif - fb_status.SystemLogin = 1; - fb_status.SufficientUserRights = 1; + fb_status.SystemLogin = true; + fb_status.SufficientUserRights = true; fb_status.ServerName = ""; new_settings = fb_status; @@ -193,7 +193,7 @@ #ifdef MANAGE_CLASSIC - if ((fb_status.WasRunning) && (!fb_status.UseService)) + if (fb_status.WasRunning && !fb_status.UseService) { fb_status.UseClassic = (bool) GetClassicServerHandle(); } @@ -258,12 +258,9 @@ bool CFBDialog::CheckServiceInstalled( LPCTSTR service ) { - SC_HANDLE hService = NULL; - bool result; - OpenServiceManager( GENERIC_READ ); - hService = OpenService (hScManager, service, GENERIC_READ ); - result = hService; + SC_HANDLE hService = OpenService (hScManager, service, GENERIC_READ ); + bool result = (bool) hService; if (hService) CloseServiceHandle( hService ); CloseServiceManager(); @@ -279,7 +276,7 @@ fb_status.UseService = CheckServiceInstalled(REMOTE_SERVICE); fb_status.UseGuardian = CheckServiceInstalled(ISCGUARD_SERVICE); - if ((!fb_status.UseService) && (fb_status.UseGuardian)) + if (!fb_status.UseService && fb_status.UseGuardian) return false; else return true; @@ -303,51 +300,36 @@ if ( fb_status.UseService ) { - SC_HANDLE hService = NULL; OpenServiceManager( GENERIC_READ ); - hService = OpenService (hScManager, REMOTE_SERVICE, GENERIC_READ ); + SC_HANDLE hService = OpenService (hScManager, REMOTE_SERVICE, GENERIC_READ ); QueryServiceStatus( hService, &service_status ); CloseServiceHandle ( hService ); CloseServiceManager(); switch ( service_status.dwCurrentState ) { case SERVICE_STOPPED : - { result = IDS_SERVICE_STOPPED; break; - } case SERVICE_START_PENDING : - { result = IDS_SERVICE_START_PENDING; break; - } case SERVICE_STOP_PENDING : - { result = IDS_SERVICE_STOP_PENDING; break; - } case SERVICE_RUNNING : - { result = IDS_SERVICE_RUNNING; break; - } case SERVICE_CONTINUE_PENDING : - { result = IDS_SERVICE_CONTINUE_PENDING; break; - } case SERVICE_PAUSE_PENDING : - { result = IDS_SERVICE_PAUSE_PENDING; break; - } case SERVICE_PAUSED : - { result = IDS_SERVICE_PAUSED; break; } } - } else { //Is Firebird running as an application... @@ -366,7 +348,7 @@ // If running as an application and not set to run automatically on start up // we still don't know if we the guardian is running. - if ((fb_status.WasRunning) && (!fb_status.UseService) ) + if (fb_status.WasRunning && !fb_status.UseService) { fb_status.UseGuardian = (bool) GetGuardianHandle(); } @@ -387,35 +369,31 @@ // fb_status.ServerName { - fb_status.AutoStart = 0; + fb_status.AutoStart = false; fb_status.UseService = CheckServiceInstalled(REMOTE_SERVICE); if ( fb_status.UseService ) { - LPQUERY_SERVICE_CONFIG status_info; - SC_HANDLE hService = 0; - DWORD dwBytesNeeded; OpenServiceManager( GENERIC_READ ); - const char * service = ""; - const char * display_name = ""; - service = ISCGUARD_SERVICE; - display_name = ISCGUARD_DISPLAY_NAME; - hService = OpenService (hScManager, service, SERVICE_QUERY_CONFIG); + const char* service = ISCGUARD_SERVICE; + const char* display_name = ISCGUARD_DISPLAY_NAME; + SC_HANDLE hService = OpenService (hScManager, service, SERVICE_QUERY_CONFIG); fb_status.UseGuardian = hService; if (hService != NULL) // then we are running as a Service { - status_info = (LPQUERY_SERVICE_CONFIG) LocalAlloc(LPTR, 4096); - if (!QueryServiceConfig(hService,status_info,4096,&dwBytesNeeded)) + DWORD dwBytesNeeded; + LPQUERY_SERVICE_CONFIG status_info = (LPQUERY_SERVICE_CONFIG) LocalAlloc(LPTR, 4096); + if (!QueryServiceConfig(hService, status_info, 4096, &dwBytesNeeded)) { LocalFree( status_info ); - HandleError(0, "ViewRegistryEntries - Cannot query Guardian service."); + HandleError(false, "ViewRegistryEntries - Cannot query Guardian service."); } else { if (status_info->dwStartType == SERVICE_AUTO_START ) { - fb_status.AutoStart = 1; + fb_status.AutoStart = true; } } CloseServiceHandle (hService); @@ -430,11 +408,12 @@ CloseServiceManager(); if (hService != NULL) // then we are running as a Service { - status_info = (LPQUERY_SERVICE_CONFIG) LocalAlloc(LPTR, 4096); - if (!QueryServiceConfig(hService,status_info,4096,&dwBytesNeeded)) + DWORD dwBytesNeeded; + LPQUERY_SERVICE_CONFIG status_info = (LPQUERY_SERVICE_CONFIG) LocalAlloc(LPTR, 4096); + if (!QueryServiceConfig(hService, status_info, 4096, &dwBytesNeeded)) { LocalFree( status_info ); - HandleError(0, "ViewRegistryEntries - Cannot query server service."); + HandleError(false, "ViewRegistryEntries - Cannot query server service."); } else { @@ -464,8 +443,9 @@ DWORD dwType; DWORD dwSize = MAX_PATH; fb_status.AutoStart = (RegQueryValueEx(hkey, "Firebird", NULL, - &dwType, (LPBYTE) fb_status.ServerName.GetBuffer(dwSize/sizeof(TCHAR)), + &dwType, (LPBYTE) fb_status.ServerName.GetBuffer(dwSize / sizeof(TCHAR)), &dwSize) == ERROR_SUCCESS ); + fb_status.ServerName.ReleaseBuffer(-1); if (fb_status.AutoStart) fb_status.UseGuardian = ( fb_status.ServerName.Find("fbguard") == ERROR_SUCCESS ); @@ -488,7 +468,7 @@ { // Nothing is stored in the registry so we must look to see if // Firebird.conf has a preference - fb_status.UseClassic = GetPreferredArchitecture(); + fb_status.UseClassic = (bool) GetPreferredArchitecture(); } #endif } @@ -532,7 +512,7 @@ else { //If we can't stop the server we should give up. - HandleError(0,"Failed to stop server. New settings will not be applied."); + HandleError(false, "Failed to stop server. New settings will not be applied."); throw; } } @@ -541,9 +521,8 @@ //Stage 2 - Gather details of changes to make //Manage change to startup - from/to manual or auto - bool ChangeStartType = false; - ChangeStartType = ( ( (bool) fb_status.AutoStart && m_Manual_Start.GetCheck() ) || - ((bool) !fb_status.AutoStart && m_Auto_Start.GetCheck() ) ); + bool ChangeStartType = ( ( fb_status.AutoStart && m_Manual_Start.GetCheck() ) || + ( !fb_status.AutoStart && m_Auto_Start.GetCheck() ) ); if ( ChangeStartType ) new_settings.AutoStart = !fb_status.AutoStart; @@ -552,9 +531,8 @@ #ifdef MANAGE_CLASSIC //Do we use Super Server or Classic - bool ChangeServerArchitecture = false; - ChangeServerArchitecture = ( ( (bool) !fb_status.UseClassic && m_Classic_Server.GetCheck() ) || - ( (bool) fb_status.UseClassic && m_Super_Server.GetCheck() ) ); + bool ChangeServerArchitecture = ( ( !fb_status.UseClassic && m_Classic_Server.GetCheck() ) || + ( fb_status.UseClassic && m_Super_Server.GetCheck() ) ); if ( ChangeServerArchitecture ) new_settings.UseClassic = !fb_status.UseClassic; else @@ -571,18 +549,16 @@ #endif //Do we change Guardian Usage? - bool ChangeGuardianUse = false; - ChangeGuardianUse = ( ( (bool) !fb_status.UseGuardian && m_Use_Guardian.GetCheck() ) || - ( (bool) fb_status.UseGuardian && !m_Use_Guardian.GetCheck() ) ); + bool ChangeGuardianUse = ( ( !fb_status.UseGuardian && m_Use_Guardian.GetCheck() ) || + ( fb_status.UseGuardian && !m_Use_Guardian.GetCheck() ) ); if ( ChangeGuardianUse ) new_settings.UseGuardian = !fb_status.UseGuardian; else new_settings.UseGuardian = fb_status.UseGuardian; //Finally, test for change between service and application usage. - bool ChangeRunStyle = false; - ChangeRunStyle = ( ( (bool) fb_status.UseService && m_Run_As_Application.GetCheck() ) || - ( !(bool) fb_status.UseService && m_Run_As_Service.GetCheck() ) ); + bool ChangeRunStyle = ( ( fb_status.UseService && m_Run_As_Application.GetCheck() ) || + ( !fb_status.UseService && m_Run_As_Service.GetCheck() ) ); if (ChangeRunStyle) new_settings.UseService = !fb_status.UseService; else @@ -658,7 +634,7 @@ DisableApplyButton(); // Update fb_status if we are running as an application - if (( !new_settings.UseService ) && (ChangeGuardianUse)) + if (!new_settings.UseService && ChangeGuardianUse) fb_status.UseGuardian = !fb_status.UseGuardian; //And finally reset the m_error_status to zero; @@ -712,7 +688,7 @@ m_Use_Guardian.SetCheck(status.UseGuardian); #ifdef MANAGE_CLASSIC - if ((status.UseClassic) ) + if (status.UseClassic) { m_Classic_Server.SetCheck(1); m_Super_Server.SetCheck(0); @@ -804,13 +780,17 @@ sa.lpSecurityDescriptor = NULL; sa.bInheritHandle = TRUE; - char full_name[MAX_PATH] = ""; + char full_name[MAX_PATH + 15] = ""; GetFullAppPath( status, full_name ); if (!CreateProcess (NULL, full_name, &sa, NULL, FALSE, 0, NULL, NULL, &si, &pi)) - HandleError(0,"Application Start"); + HandleError(false, "Application Start"); else + { result = true; + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + } } catch( ... ) { @@ -821,7 +801,7 @@ EndWaitCursor(); #endif -return result; + return result; } @@ -908,12 +888,11 @@ bool CFBDialog::ServiceInstall( CFBDialog::STATUS status ) { - char * ServerPath = const_cast<char *> ((LPCTSTR)m_Root_Path); - OpenServiceManager( GENERIC_READ | GENERIC_EXECUTE | GENERIC_WRITE ); if (hScManager) { + const char* ServerPath = m_Root_Path; if (new_settings.UseGuardian) { m_Error_Status = SERVICES_install (hScManager, ISCGUARD_SERVICE, @@ -933,7 +912,7 @@ /* do the install of server */ m_Error_Status = SERVICES_install (hScManager, REMOTE_SERVICE, REMOTE_DISPLAY_NAME, REMOTE_DISPLAY_DESCR, - const_cast<char *> ((LPCTSTR) status.ServiceExecutable), + (LPCTSTR) status.ServiceExecutable, ServerPath, NULL, status.AutoStart, NULL, NULL, svc_error); if (m_Error_Status != FB_SUCCESS) @@ -1010,17 +989,17 @@ 0, KEY_WRITE, &hkey) == ERROR_SUCCESS) { - char full_name[MAX_PATH] = ""; + char full_name[MAX_PATH + 15] = ""; GetFullAppPath( status, full_name); - if (!RegSetValueEx (hkey, "Firebird", 0,REG_SZ, (unsigned char *) full_name, sizeof(full_name) ) == ERROR_SUCCESS) + if (!RegSetValueEx (hkey, "Firebird", 0,REG_SZ, (CONST BYTE*) full_name, sizeof(full_name) ) == ERROR_SUCCESS) { - HandleError(0, "AppInstall"); + HandleError(false, "AppInstall"); return false; } } else { - HandleError(0, "AppInstall"); + HandleError(false, "AppInstall"); return false; } } @@ -1040,7 +1019,7 @@ return true; else { - HandleError(0, "Removing registry entry to stop autorun failed."); + HandleError(false, "Removing registry entry to stop autorun failed."); return false; } } @@ -1054,7 +1033,7 @@ else { //Things are really bad - perhaps user has screwed up their registry? - HandleError(0, "Could not find HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\Run in the registry."); + HandleError(false, "Could not find HKLM\\Software\\Microsoft\\Windows\\CurrentVersion\\Run in the registry."); return false; } } @@ -1079,12 +1058,15 @@ { case ERROR_SERVICE_CANNOT_ACCEPT_CTRL: RaiseError = false; + break; case ERROR_SERVICE_ALREADY_RUNNING: RaiseError = false; + break; case ERROR_SERVICE_DOES_NOT_EXIST: RaiseError = false; + break; } if (RaiseError) @@ -1124,11 +1106,10 @@ if (!error_status) error_status = GetLastError(); - LPTSTR lpMsgBuf; - DWORD Size; + LPTSTR lpMsgBuf = 0; CString error_title = ""; - Size = FormatMessage( + const DWORD Size = FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, @@ -1137,15 +1118,18 @@ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language (LPTSTR) &lpMsgBuf, 0, NULL ); - error_title.Format("Error Code %d raised in %s",error_status, (LPCTSTR) string ); + if (Size) + error_title.Format("Error '%s' raised in %s", lpMsgBuf, string); + else + error_title.Format("Error Code %d raised in %s", error_status, string ); ::MessageBox( NULL, lpMsgBuf, (LPCTSTR) error_title, MB_OK | MB_ICONINFORMATION ); LocalFree( lpMsgBuf ); } -void CFBDialog::HandleError(bool silent, TEXT *string ) +void CFBDialog::HandleError(bool silent, const TEXT *string ) { - DWORD error_code = GetLastError(); + const DWORD error_code = GetLastError(); if (error_code == m_Error_Status) { //Always be silent if error has not already been thrown. @@ -1162,11 +1146,10 @@ } else { - LPTSTR lpMsgBuf; - DWORD Size; + LPTSTR lpMsgBuf = 0; CString error_title = ""; - Size = FormatMessage( + const DWORD Size = FormatMessage( FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, @@ -1175,7 +1158,10 @@ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language (LPTSTR) &lpMsgBuf, 0, NULL ); - error_title.Format("Error Code %d raised in %s",error_code, (LPCTSTR) string ); + if (Size) + error_title.Format("Error '%s' raised in %s", lpMsgBuf, string); + else + error_title.Format("Error Code %d raised in %s", error_code, string ); ShowError(lpMsgBuf, error_title); @@ -1313,7 +1299,7 @@ } else { - HandleError(0,"SetGuardianUseInConf"); + HandleError(false, "SetGuardianUseInConf"); return; } } @@ -1340,7 +1326,7 @@ } else { - HandleError(0,"SetPreferredArchitectureInConf"); + HandleError(false, "SetPreferredArchitectureInConf"); return; } } @@ -1348,25 +1334,22 @@ bool CFBDialog::UpdateFirebirdConf(CString option, CString value) { - bool result = false; - CStdioFile FbConfFile, FbConfFileNew; CString FirebirdConfFilename = m_Root_Path + "firebird.conf"; CString FirebirdConfNewname = FirebirdConfFilename + ".new"; CString FirebirdConfOldname = FirebirdConfFilename + ".old"; CString FirebirdConfLine = ""; - bool res; + if (!FbConfFile.Open(FirebirdConfFilename, CFile::modeReadWrite)) + return false; + if (!FbConfFileNew.Open(FirebirdConfNewname, CFile::modeCreate | + CFile::shareExclusive | CFile::modeWrite)) + { + return false; + } - res = FbConfFile.Open(FirebirdConfFilename, CFile::modeReadWrite); - res = FbConfFileNew.Open(FirebirdConfNewname, CFile::modeCreate | - CFile::shareExclusive | CFile::modeWrite); try { - - bool Found = false; - int i = 0; - while (FbConfFile.ReadString(FirebirdConfLine) != NULL) { @@ -1388,14 +1371,14 @@ } + bool result = false; FbConfFile.Close(); FbConfFileNew.Close(); - CFile::Rename(FirebirdConfFilename, FirebirdConfFilename + ".old"); - try { - CFile::Rename(FirebirdConfNewname, FirebirdConfFilename ); + CFile::Rename(FirebirdConfFilename, FirebirdConfOldname); + CFile::Rename(FirebirdConfNewname, FirebirdConfFilename); //If we get this far then all is well and we can return good news result = true; @@ -1417,27 +1400,23 @@ { if (status.UseService) { - SC_LOCK sclLock; - DWORD dwStartType; - SC_HANDLE hService; - OpenServiceManager( GENERIC_READ | GENERIC_EXECUTE | GENERIC_WRITE ); // Need to acquire database lock before reconfiguring. if (hScManager) { - sclLock = LockServiceDatabase(hScManager); + SC_LOCK sclLock = LockServiceDatabase(hScManager); // If the database cannot be locked, report the details. if (sclLock == NULL) { - HandleError(NULL,"SetAutoStart - Could not lock service database"); + HandleError(false, "SetAutoStart - Could not lock service database"); return; } // The database is locked, so it is safe to make changes. - const char * service = ""; - const char * display_name = ""; + const char* service = ""; + const char* display_name = ""; if ( status.UseGuardian ) { @@ -1451,13 +1430,13 @@ } // Open a handle to the service. - hService = OpenService( + SC_HANDLE hService = OpenService( hScManager, // SCManager database service, // name of service SERVICE_CHANGE_CONFIG); // need CHANGE access if (hService) { - dwStartType = ( status.AutoStart ) ? SERVICE_AUTO_START : SERVICE_DEMAND_START; + DWORD dwStartType = status.AutoStart ? SERVICE_AUTO_START : SERVICE_DEMAND_START; if (! ChangeServiceConfig( hService, // handle of service @@ -1472,11 +1451,11 @@ NULL, // password: no change display_name ) ) { - HandleError(0,"ChangeServiceConfig in SetAutoStart"); + HandleError(false, "ChangeServiceConfig in SetAutoStart"); } } else - HandleError(0,"OpenService in SetAutoStart"); + HandleError(false, "OpenService in SetAutoStart"); // Release the database lock. UnlockServiceDatabase(sclLock); @@ -1503,17 +1482,16 @@ bool result = (bool) GetFirebirdHandle(); bool guardian_running = (bool) GetGuardianHandle();; - if ((result) && ( guardian_running )) + if (result && guardian_running) fb_status.UseGuardian = guardian_running; return result; } -HWND CFBDialog::GetFirebirdHandle() +HWND CFBDialog::GetFirebirdHandle() const { - HWND result = NULL; - result = GetSuperServerHandle(); + HWND result = GetSuperServerHandle(); #ifdef MANAGE_CLASSIC if ( !result ) { @@ -1524,14 +1502,14 @@ } -HWND CFBDialog::GetSuperServerHandle() +HWND CFBDialog::GetSuperServerHandle() const { return ::FindWindow(szClassName, szWindowName); } #ifdef MANAGE_CLASSIC -HWND CFBDialog::GetClassicServerHandle() +HWND CFBDialog::GetClassicServerHandle() const { // oops - hard-coded string that is liable to change // Plus, the original definition is hidden locally @@ -1540,20 +1518,20 @@ } #endif -HWND CFBDialog::GetGuardianHandle() +HWND CFBDialog::GetGuardianHandle() const { return ::FindWindow(GUARDIAN_CLASS_NAME, GUARDIAN_APP_LABEL); } -bool CFBDialog::ServiceSupportAvailable() +bool CFBDialog::ServiceSupportAvailable() const { OSVERSIONINFO OsVersionInfo; /* need to set the sizeof this structure for NT to work */ OsVersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - GetVersionEx ((LPOSVERSIONINFO) &OsVersionInfo); + GetVersionEx (&OsVersionInfo); /* true for NT family, false for 95 family */ return (OsVersionInfo.dwPlatformId == VER_PLATFORM_WIN32_NT); @@ -1565,9 +1543,12 @@ if (!fb_status.ServicesAvailable) return false; - if (DesiredAccess == NULL) + if (DesiredAccess == 0) DesiredAccess = GENERIC_READ | GENERIC_EXECUTE | GENERIC_WRITE; + // If the svc mgr is already opened, this function will return true since + // it has no way to know if the new access is the same that opened the svc mgr + // previously. if (hScManager == NULL) hScManager = OpenSCManager (NULL, SERVICES_ACTIVE_DATABASE, DesiredAccess ); @@ -1622,11 +1603,11 @@ GetServerName( status, AppName ); } - ::strcat(app,AppName); + ::strcat(app, AppName); } -void CFBDialog::GetServerName( CFBDialog::STATUS status, CString& AppName) +void CFBDialog::GetServerName( CFBDialog::STATUS status, CString& AppName) const { #ifdef MANAGE_CLASSIC if ( status.UseClassic ) @@ -1650,7 +1631,7 @@ if (!initialised) option = Config::getPreferredArchitecture(); else - if ((new_settings.UseClassic) != (fb_status.UseClassic)) + if (new_settings.UseClassic != fb_status.UseClassic) option = new_settings.UseClassic; else option = fb_status.UseClassic; @@ -1662,7 +1643,7 @@ bool CFBDialog::UserHasSufficientRights() { - bool HasRights = OpenServiceManager( NULL ); + bool HasRights = OpenServiceManager(0); CloseServiceManager(); return HasRights; } Index: fbdialog.h =================================================================== RCS file: /cvsroot/firebird/firebird2/src/utilities/fbcpl/fbdialog.h,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -b -U3 -r1.3.2.1 -r1.3.2.2 --- fbdialog.h 19 Mar 2005 18:05:07 -0000 1.3.2.1 +++ fbdialog.h 7 May 2005 19:29:33 -0000 1.3.2.2 @@ -30,8 +30,8 @@ ///////////////////////////////////////////////////////////////////////////// // CFBDialog dialog -#if !defined(_FBDialog_) -#define _FBDialog_ +#if !defined(UTILITIES_FBDIALOG_H) +#define UTILITIES_FBDIALOG_H //#pragma once @@ -172,19 +172,19 @@ //Get Stuff - HWND GetSuperServerHandle(); + HWND GetSuperServerHandle() const; #ifdef MANAGE_CLASSIC - HWND GetClassicServerHandle(); + HWND GetClassicServerHandle() const; #endif - HWND GetFirebirdHandle(); - void GetFullAppPath( CFBDialog::STATUS status, char * app); - HWND GetGuardianHandle(); + HWND GetFirebirdHandle() const; + void GetFullAppPath( CFBDialog::STATUS status, char* app); + HWND GetGuardianHandle() const; // bool GetGuardianUseSpecified(); bool GetPreferredArchitecture(); - void GetServerName( CFBDialog::STATUS status, CString& AppName); + void GetServerName( CFBDialog::STATUS status, CString& AppName) const; int GetServerStatus(); - bool ServiceSupportAvailable(); + bool ServiceSupportAvailable() const; void ViewRegistryEntries(); //Set stuff @@ -217,7 +217,7 @@ bool ServiceInstall( CFBDialog::STATUS status ); bool ServiceRemove(); static void HandleSvcError(SLONG status, const TEXT* string); - void HandleError(bool silent, TEXT *string ); + void HandleError(bool silent, const TEXT* string ); void ShowError( LPTSTR lpMsgBuf, CString error_title ); void UpdateServerStatus(); bool UserHasSufficientRights(); @@ -225,4 +225,5 @@ }; -#endif +#endif // UTILITIES_FBDIALOG_H + Index: fbpanel.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/utilities/fbcpl/fbpanel.cpp,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -b -U3 -r1.3.2.1 -r1.3.2.2 --- fbpanel.cpp 19 Mar 2005 18:05:07 -0000 1.3.2.1 +++ fbpanel.cpp 7 May 2005 19:29:33 -0000 1.3.2.2 @@ -78,9 +78,9 @@ if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, REG_KEY_ROOT_INSTANCES, 0, KEY_QUERY_VALUE, &hkey) == ERROR_SUCCESS) { - char rootpath[MAX_PATH-2]; + char rootpath[MAX_PATH - 2]; DWORD buffer_size = sizeof(rootpath); - if (RegQueryValueEx(hkey, "DefaultInstance",NULL, NULL, (unsigned char *)rootpath, &buffer_size) + if (RegQueryValueEx(hkey, "DefaultInstance", NULL, NULL, LPBYTE(rootpath), &buffer_size) == ERROR_SUCCESS) { PathAddBackslash(rootpath); @@ -92,11 +92,11 @@ dlg.m_FB_Version = "not known"; CString afilename = dlg.m_Root_Path + "bin\\gbak.exe"; buffer_size = GetFileVersionInfoSize( const_cast<char *> ((LPCTSTR) afilename), 0); - void * VersionInfo = new char [buffer_size]; - void * ProductVersion = new char [32]; - void * SpecialBuild = new char [127]; - void * PrivateBuild = new char [127]; - unsigned int ValueSize; + void* VersionInfo = new char [buffer_size]; + void* ProductVersion = 0; + void* SpecialBuild = 0; + void* PrivateBuild = 0; + UINT ValueSize; if ( GetFileVersionInfo( const_cast<char *> ((LPCTSTR) afilename), 0, buffer_size, VersionInfo) ) { VerQueryValue( VersionInfo, "\\StringFileInfo\\040904E4\\ProductVersion", &ProductVersion, &ValueSize); @@ -119,15 +119,17 @@ } /**/ } + delete[] VersionInfo; // Show the dialog box - if (dlg.DoModal() != IDOK) return 0; + if (dlg.DoModal() != IDOK) + return 0; } } catch ( ... ) { //raise an error - dlg.MessageBox("Firebird does not appear to be installed correctly.","Installation Error",MB_OK); + dlg.MessageBox("Firebird does not appear to be installed correctly.", "Installation Error", MB_OK); } return 0; } Index: fbpanel.h =================================================================== RCS file: /cvsroot/firebird/firebird2/src/utilities/fbcpl/fbpanel.h,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -b -U3 -r1.3.2.1 -r1.3.2.2 --- fbpanel.h 19 Mar 2005 18:05:09 -0000 1.3.2.1 +++ fbpanel.h 7 May 2005 19:29:33 -0000 1.3.2.2 @@ -25,8 +25,8 @@ */ -#if !defined(_FBPanel_) -#define _FBPanel_ +#if !defined(UTILITIES_FBPANEL_H) +#define UTILITIES_FBPANEL_H #include "ctrlpan.h" @@ -38,4 +38,5 @@ }; -#endif +#endif // UTILITIES_FBPANEL_H + |