Index: triggers/bug_trigger/bug_trigger.vc170.vcxproj =================================================================== RCS file: /scotty/triggers/bug_trigger/bug_trigger.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 bug_trigger.vc170.vcxproj *** triggers/bug_trigger/bug_trigger.vc170.vcxproj 10 Aug 2024 06:41:09 -0000 1.1.2.1 --- triggers/bug_trigger/bug_trigger.vc170.vcxproj 12 Aug 2024 02:07:06 -0000 *************** *** 115,121 **** ! {ef09b439-d916-4bd2-8eb6-0ce76a105cf2} false --- 115,121 ---- ! {ef09b439-d916-4bd2-8eb6-0ce76a105cf2} false Index: cvsproxy/CvsProxy.vc170.vcxproj =================================================================== RCS file: /scotty/cvsproxy/CvsProxy.vc170.vcxproj,v retrieving revision 1.2 diff -c -r1.2 CvsProxy.vc170.vcxproj *** cvsproxy/CvsProxy.vc170.vcxproj 11 Aug 2024 10:53:58 -0000 1.2 --- cvsproxy/CvsProxy.vc170.vcxproj 19 Aug 2024 00:57:46 -0000 *************** *** 46,58 **** $(SolutionDir)/WinDebug\ ! $(SolutionDir)/WinDebug\ true $(SolutionDir)/WinRel\ ! ./Release\ false --- 46,60 ---- $(SolutionDir)/WinDebug\ ! $(SolutionDir)/WinDebug\cvsproxy\ true + false $(SolutionDir)/WinRel\ ! ./Release\cvsproxy\ false + false *************** *** 126,140 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false ! {b94d88fc-69ab-488e-bc7f-aaa565aa8074} false --- 128,142 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false ! {b94d88fc-69ab-488e-bc7f-aaa565aa8074} false Index: cvsproxy/CvsProxyWin32.cpp =================================================================== RCS file: /scotty/cvsproxy/CvsProxyWin32.cpp,v retrieving revision 1.21 diff -c -r1.21 CvsProxyWin32.cpp *** cvsproxy/CvsProxyWin32.cpp 17 Jun 2020 05:21:54 -0000 1.21 --- cvsproxy/CvsProxyWin32.cpp 17 Aug 2024 07:39:30 -0000 *************** *** 255,261 **** CServerIo::trace(3,"Proxy was compiled with MSVC C/C++ %d", _MSC_VER); #endif ! CServerIo::trace(3,"Proxy: CVSNT "CVSNT_PRODUCTVERSION_STRING); CServerIo::trace(3,"wmain 2, is this server or client?"); if(argc>=2 && !wcscmp(argv[1],L"server")) --- 255,261 ---- CServerIo::trace(3,"Proxy was compiled with MSVC C/C++ %d", _MSC_VER); #endif ! CServerIo::trace(3,"Proxy: CVSNT " CVSNT_PRODUCTVERSION_STRING); CServerIo::trace(3,"wmain 2, is this server or client?"); if(argc>=2 && !wcscmp(argv[1],L"server")) *************** *** 520,526 **** { if(lic.type==licExpired) printf("License for this product has expired\n"); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==1) && (CVSNT_PRODUCT_BUILD>=7350)) else if (is64bit() && lic.osType!=licInvalidBadOS && lic.osType!=licWindows64) printf("Invalid license (not for x64)\n"); #endif --- 520,526 ---- { if(lic.type==licExpired) printf("License for this product has expired\n"); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && ((CVSNT_PRODUCT_PATCHLEVEL==1)||(CVSNT_PRODUCT_PATCHLEVEL==3)) && (CVSNT_PRODUCT_BUILD>=7350)) else if (is64bit() && lic.osType!=licInvalidBadOS && lic.osType!=licWindows64) printf("Invalid license (not for x64)\n"); #endif *************** *** 528,534 **** printf("Invalid license key\n"); return -1; } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) if((lic.type!=licTrial)&&(lic.type!=licUnlimited)&&(lic.type!=licISV)&&(lic.type!=licMulti)) #else if((lic.type!=licTrial)&&(lic.type!=licFull)) --- 528,534 ---- printf("Invalid license key\n"); return -1; } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) if((lic.type!=licTrial)&&(lic.type!=licUnlimited)&&(lic.type!=licISV)&&(lic.type!=licMulti)) #else if((lic.type!=licTrial)&&(lic.type!=licFull)) *************** *** 660,666 **** delete[] encbuf; delete[] name; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==1) && (CVSNT_PRODUCT_BUILD>=7347)) if(sock.recv((char*)&len,sizeof(len))!=sizeof(len)) { CServerIo::log(CServerIo::logError,"proxy couldn't rev from preloaded server! [sok.recv(len)]"); --- 660,666 ---- delete[] encbuf; delete[] name; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && ((CVSNT_PRODUCT_PATCHLEVEL==1)||(CVSNT_PRODUCT_PATCHLEVEL==3)) && (CVSNT_PRODUCT_BUILD>=7347)) if(sock.recv((char*)&len,sizeof(len))!=sizeof(len)) { CServerIo::log(CServerIo::logError,"proxy couldn't rev from preloaded server! [sok.recv(len)]"); Index: licenselib/MHLicense.h =================================================================== RCS file: /scotty/licenselib/MHLicense.h,v retrieving revision 1.16.2.68 diff -c -r1.16.2.68 MHLicense.h *** licenselib/MHLicense.h 5 Jul 2024 13:37:05 -0000 1.16.2.68 --- licenselib/MHLicense.h 17 Aug 2024 04:21:28 -0000 *************** *** 3,11 **** #ifndef LICENSE_REG_KEY_CURRENT ! #if (CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==01) && (CVSNT_PRODUCT_BUILD>=3906) ! #if (CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==01) && (CVSNT_PRODUCT_BUILD>=7561) ! #if (CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL==01) && (CVSNT_PRODUCT_BUILD>=8668) #define LICENSE_REG_KEY_CURRENT "2512331DAEBF" #else #define LICENSE_REG_KEY_CURRENT "338627F5B9DD" --- 3,11 ---- #ifndef LICENSE_REG_KEY_CURRENT ! #if (CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && ((CVSNT_PRODUCT_PATCHLEVEL==1)||(CVSNT_PRODUCT_PATCHLEVEL==3)) && (CVSNT_PRODUCT_BUILD>=3906) ! #if (CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && ((CVSNT_PRODUCT_PATCHLEVEL==1)||(CVSNT_PRODUCT_PATCHLEVEL==3)) && (CVSNT_PRODUCT_BUILD>=7561) ! #if (CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && ((CVSNT_PRODUCT_PATCHLEVEL==1)||(CVSNT_PRODUCT_PATCHLEVEL==3)) && (CVSNT_PRODUCT_BUILD>=8668) #define LICENSE_REG_KEY_CURRENT "2512331DAEBF" #else #define LICENSE_REG_KEY_CURRENT "338627F5B9DD" *************** *** 16,22 **** #else #define LICENSE_REG_KEY_CURRENT "addb0176bc63" #endif ! #if (CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=02) && (CVSNT_PRODUCT_BUILD>=4566) #define LICENSE_REG_KEY_CURRENT "D02D8666B2E9" #endif #endif --- 16,22 ---- #else #define LICENSE_REG_KEY_CURRENT "addb0176bc63" #endif ! #if (CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=02) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>=4566) #define LICENSE_REG_KEY_CURRENT "D02D8666B2E9" #endif #endif Index: cvsmanager/CvsManager.cpp =================================================================== RCS file: /scotty/cvsmanager/CvsManager.cpp,v retrieving revision 1.98 diff -c -r1.98 CvsManager.cpp *** cvsmanager/CvsManager.cpp 13 Dec 2023 03:16:17 -0000 1.98 --- cvsmanager/CvsManager.cpp 17 Aug 2024 07:39:30 -0000 *************** *** 30,36 **** #define USHORT ushort #include /* strerror */ #include /* semget and semop */ ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2)) #include /* dirname */ #endif #endif --- 30,36 ---- #define USHORT ushort #include /* strerror */ #include /* semget and semop */ ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3)) #include /* dirname */ #endif #endif *************** *** 62,68 **** #define MHMAXARRYSTR 99999 #endif #include "version.h" ! #if defined(_WIN32) && ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>=4657)) #include "cvsflt.h" #endif #include "CvsManager.h" --- 62,68 ---- #define MHMAXARRYSTR 99999 #endif #include "version.h" ! #if defined(_WIN32) && ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>=4657)) #include "cvsflt.h" #endif #include "CvsManager.h" *************** *** 77,83 **** #include #endif ! #if !((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) #define hwinfo_t void #endif --- 77,83 ---- #include #endif ! #if !((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) #define hwinfo_t void #endif *************** *** 1064,1070 **** { CSocketIO& cvs = *pcvs; CSocketIO& proxy = *pproxy; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) hwinfo_t& hwinfo = *phwinfo; #endif License_t license; --- 1064,1070 ---- { CSocketIO& cvs = *pcvs; CSocketIO& proxy = *pproxy; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) hwinfo_t& hwinfo = *phwinfo; #endif License_t license; *************** *** 1076,1082 **** hSemClnt = NULL; #endif ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) if(!CheckLicense(license,hwinfo)) #else if(!CheckLicense(license)) --- 1076,1082 ---- hSemClnt = NULL; #endif ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) if(!CheckLicense(license,hwinfo)) #else if(!CheckLicense(license)) *************** *** 1127,1133 **** #endif } } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) else if((license.type==licMulti)&&(license.activateId==0)) { if (license.daysLeft<0) --- 1127,1133 ---- #endif } } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) else if((license.type==licMulti)&&(license.activateId==0)) { if (license.daysLeft<0) *************** *** 1165,1171 **** #ifdef _WIN32 CGlobalSettings::SetGlobalValue("cvsnt","License","NumberLicenses",license.maxUsers); CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseName",license.company.c_str()); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseEmail",license.email.c_str()); CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseRspLine",license.rspline.c_str()); //CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseCPU",license.cpuline.c_str()); --- 1165,1171 ---- #ifdef _WIN32 CGlobalSettings::SetGlobalValue("cvsnt","License","NumberLicenses",license.maxUsers); CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseName",license.company.c_str()); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseEmail",license.email.c_str()); CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseRspLine",license.rspline.c_str()); //CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseCPU",license.cpuline.c_str()); *************** *** 1195,1201 **** { switch (license.type) { ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) case licUnlimited: printf("Full version -- unlimited\n"); break; --- 1195,1201 ---- { switch (license.type) { ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) case licUnlimited: printf("Full version -- unlimited\n"); break; *************** *** 1268,1274 **** rf.addArg(tmp.c_str()); } } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) if (1) // this must ALWAYS come before RSP_LINE { rf.addArg("+"); --- 1268,1274 ---- rf.addArg(tmp.c_str()); } } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) if (1) // this must ALWAYS come before RSP_LINE { rf.addArg("+"); *************** *** 1300,1306 **** time_t rft = time(NULL); ! #if !defined(_WIN32) && ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2)) char base_pathbuf[PATH_MAX + 1], pathbuf[PATH_MAX + 1], real_pathbuf[PATH_MAX + 1]; uint32_t pathbufsize = sizeof(pathbuf); --- 1300,1306 ---- time_t rft = time(NULL); ! #if !defined(_WIN32) && ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3)) char base_pathbuf[PATH_MAX + 1], pathbuf[PATH_MAX + 1], real_pathbuf[PATH_MAX + 1]; uint32_t pathbufsize = sizeof(pathbuf); *************** *** 1487,1493 **** CServerIo::trace(4,"Failed to resume because it's not implemented on linux/unix/mac"); printf("Failed to resume because it's not implemented on linux/unix/mac\n"); } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2)) //if(semid >= 0) // semctl(semid, 1, IPC_RMID , ignored_argument); //return; --- 1487,1493 ---- CServerIo::trace(4,"Failed to resume because it's not implemented on linux/unix/mac"); printf("Failed to resume because it's not implemented on linux/unix/mac\n"); } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3)) //if(semid >= 0) // semctl(semid, 1, IPC_RMID , ignored_argument); //return; *************** *** 1530,1536 **** CServerIo::trace(3,"FAILED to Close Client Terminate Semaphore (CVSNT_client_proxy_%d) Thread cvsmanager.exe(%lu): %lu.",rfpid,mypid,mytid); } #else ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2)) if(semid >= 0) { int semclosed; --- 1530,1536 ---- CServerIo::trace(3,"FAILED to Close Client Terminate Semaphore (CVSNT_client_proxy_%d) Thread cvsmanager.exe(%lu): %lu.",rfpid,mypid,mytid); } #else ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3)) if(semid >= 0) { int semclosed; *************** *** 1675,1681 **** static void _license_thread_proc(int daysleft, hwinfo_t *phwinfo) { ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) hwinfo_t& hwinfo = *phwinfo; #endif License_t license; --- 1675,1681 ---- static void _license_thread_proc(int daysleft, hwinfo_t *phwinfo) { ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) hwinfo_t& hwinfo = *phwinfo; #endif License_t license; *************** *** 1693,1705 **** // GlobalFindAtom is win32 specific if(timeSinceLastCheck>=licenseCheckTime*60) { ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) if(CheckLicense(license,hwinfo)) #else if(CheckLicense(license)) #endif { ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) if((license.type==licTrial)||(license.type==licMulti && license.activateId==0)) #else if(license.type==licTrial) --- 1693,1705 ---- // GlobalFindAtom is win32 specific if(timeSinceLastCheck>=licenseCheckTime*60) { ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) if(CheckLicense(license,hwinfo)) #else if(CheckLicense(license)) #endif { ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) if((license.type==licTrial)||(license.type==licMulti && license.activateId==0)) #else if(license.type==licTrial) *************** *** 1772,1778 **** #endif } ! #if defined (_WIN32) && ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>=4657)) void add_to_ci_directory_list(const char *repos_str,const char *repos_dir, const char *repos_name) { DWORD fa = GetFileAttributesA(repos_dir); --- 1772,1778 ---- #endif } ! #if defined (_WIN32) && ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>=4657)) void add_to_ci_directory_list(const char *repos_str,const char *repos_dir, const char *repos_name) { DWORD fa = GetFileAttributesA(repos_dir); *************** *** 1945,1951 **** CServerIo::trace(3,"Server build platform is %s-%s-%s", CVSNT_TARGET_VENDOR, CVSNT_TARGET_OS, CVSNT_TARGET_CPU); ! CServerIo::trace(3,"Server: CVSMANAGER "CVSNT_PRODUCTVERSION_STRING); #ifdef _WIN32 CServerIo::trace(3,"Server running on \"%S\"",get_os_version()); --- 1945,1951 ---- CServerIo::trace(3,"Server build platform is %s-%s-%s", CVSNT_TARGET_VENDOR, CVSNT_TARGET_OS, CVSNT_TARGET_CPU); ! CServerIo::trace(3,"Server: CVSMANAGER " CVSNT_PRODUCTVERSION_STRING); #ifdef _WIN32 CServerIo::trace(3,"Server running on \"%S\"",get_os_version()); *************** *** 1956,1962 **** int run_server() { ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) #ifdef _WIN32 BSTR hwcpuname = SysAllocString(L"Uninitialized");; unsigned int hwiddsig; --- 1956,1962 ---- int run_server() { ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) #ifdef _WIN32 BSTR hwcpuname = SysAllocString(L"Uninitialized");; unsigned int hwiddsig; *************** *** 1974,1980 **** time_t global_session_time_t; const char *global_session_time; int server_count=10; ! #if defined(_WIN32) && ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>=4657)) int case_insensitive_server=0; #endif License_t license; --- 1974,1980 ---- time_t global_session_time_t; const char *global_session_time; int server_count=10; ! #if defined(_WIN32) && ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>=4657)) int case_insensitive_server=0; #endif License_t license; *************** *** 1990,1996 **** srand((unsigned int)global_session_time_t); ! #if (defined (_WIN32) && (CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) if (get_hw_info(hwcpuname, hwiddsig, swosver, hwspeed) == 0) { hwinfo.osVerId=swosver; --- 1990,1996 ---- srand((unsigned int)global_session_time_t); ! #if (defined (_WIN32) && (CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) if (get_hw_info(hwcpuname, hwiddsig, swosver, hwspeed) == 0) { hwinfo.osVerId=swosver; *************** *** 2003,2009 **** do_log_version_info(); char *errmsg=(char *)malloc(sizeof(char)*32764); *errmsg='\0'; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) if(!CheckLicense(license,hwinfo,errmsg)) #else if(!CheckLicense(license,errmsg)) --- 2003,2009 ---- do_log_version_info(); char *errmsg=(char *)malloc(sizeof(char)*32764); *errmsg='\0'; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) if(!CheckLicense(license,hwinfo,errmsg)) #else if(!CheckLicense(license,errmsg)) *************** *** 2028,2034 **** } free(errmsg); errmsg=NULL; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) if((license.type==licTrial)||(license.type==licMulti && license.activateId==0)) #else if(license.type==licTrial) --- 2028,2034 ---- } free(errmsg); errmsg=NULL; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) if((license.type==licTrial)||(license.type==licMulti && license.activateId==0)) #else if(license.type==licTrial) *************** *** 2059,2065 **** return -1; } } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) else if((license.type==licUnlimited)||(license.type==licMulti)||(license.type==licISV)) #else else if(license.type==licFull) --- 2059,2065 ---- return -1; } } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) else if((license.type==licUnlimited)||(license.type==licMulti)||(license.type==licISV)) #else else if(license.type==licFull) *************** *** 2072,2078 **** #endif CGlobalSettings::SetGlobalValue("cvsnt","License","NumberLicenses",license.maxUsers); CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseName",license.company.c_str()); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseEmail",license.email.c_str()); CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseRspLine",license.rspline.c_str()); #endif --- 2072,2078 ---- #endif CGlobalSettings::SetGlobalValue("cvsnt","License","NumberLicenses",license.maxUsers); CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseName",license.company.c_str()); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseEmail",license.email.c_str()); CGlobalSettings::SetGlobalValue("cvsnt","License","LicenseRspLine",license.rspline.c_str()); #endif *************** *** 2080,2086 **** { switch (license.type) { ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) case licUnlimited: printf("Full version -- unlimited\n"); break; --- 2080,2086 ---- { switch (license.type) { ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) case licUnlimited: printf("Full version -- unlimited\n"); break; *************** *** 2266,2272 **** if (cvs_port_num_mgr==0) cvs_port_num_mgr=2401; cvs_port_num=cvs_port_num_mgr; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) if((license.type==licUnlimited)||(license.type==licMulti)||(license.type==licISV)) #else if(license.type==licFull) --- 2266,2272 ---- if (cvs_port_num_mgr==0) cvs_port_num_mgr=2401; cvs_port_num=cvs_port_num_mgr; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) if((license.type==licUnlimited)||(license.type==licMulti)||(license.type==licISV)) #else if(license.type==licFull) *************** *** 2292,2298 **** sprintf(cvs_port,"%d",cvs_port_num); ! #if defined(_WIN32) && ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>=4657)) /* register each repository directory as case insensitive */ if(CGlobalSettings::GetGlobalValue("cvsnt","PServer","CaseSensitive",case_insensitive_server)) case_insensitive_server=0; --- 2292,2298 ---- sprintf(cvs_port,"%d",cvs_port_num); ! #if defined(_WIN32) && ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>=4657)) /* register each repository directory as case insensitive */ if(CGlobalSettings::GetGlobalValue("cvsnt","PServer","CaseSensitive",case_insensitive_server)) case_insensitive_server=0; *************** *** 2506,2512 **** if(g_bTestMode) printf("Temporary folder set to %s\n",szTmp); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>=4657)) if ((case_insensitive_server)&&(strlen(szTmp)>0)) { if(CvsOpenFilter()) --- 2506,2512 ---- if(g_bTestMode) printf("Temporary folder set to %s\n",szTmp); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>=4657)) if ((case_insensitive_server)&&(strlen(szTmp)>0)) { if(CvsOpenFilter()) *************** *** 2556,2562 **** #endif #ifdef _WIN32 ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) if((license.type==licTrial)||(license.type==licMulti && license.activateId==0)) #else if(license.type==licTrial) --- 2556,2562 ---- #endif #ifdef _WIN32 ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) if((license.type==licTrial)||(license.type==licMulti && license.activateId==0)) #else if(license.type==licTrial) *************** *** 2564,2570 **** { if(g_bTestMode) printf("Start license check thread\n"); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) start_license_thread(license.daysLeft,&hwinfo); #else start_license_thread(license.daysLeft,NULL); --- 2564,2570 ---- { if(g_bTestMode) printf("Start license check thread\n"); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) start_license_thread(license.daysLeft,&hwinfo); #else start_license_thread(license.daysLeft,NULL); *************** *** 2582,2588 **** g_running_servers = 0; for(int n=0; n=2) && (CVSNT_PRODUCT_BUILD>4135)) start_cvs_thread(&cvs_sock,&proxy_sock,&hwinfo); #else start_cvs_thread(&cvs_sock,&proxy_sock,NULL); --- 2582,2588 ---- g_running_servers = 0; for(int n=0; n=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) start_cvs_thread(&cvs_sock,&proxy_sock,&hwinfo); #else start_cvs_thread(&cvs_sock,&proxy_sock,NULL); *************** *** 2725,2731 **** { // If any servers have quit, replace them. This doesn't need to be too exact, provided we just don't run out of them for(int n=g_running_servers; n=2) && (CVSNT_PRODUCT_BUILD>4135)) start_cvs_thread(&cvs_sock, &proxy_sock, &hwinfo); #else start_cvs_thread(&cvs_sock, &proxy_sock, NULL); --- 2725,2731 ---- { // If any servers have quit, replace them. This doesn't need to be too exact, provided we just don't run out of them for(int n=g_running_servers; n=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) start_cvs_thread(&cvs_sock, &proxy_sock, &hwinfo); #else start_cvs_thread(&cvs_sock, &proxy_sock, NULL); Index: cvsmanager/CvsManager.vc170.vcxproj =================================================================== RCS file: /scotty/cvsmanager/CvsManager.vc170.vcxproj,v retrieving revision 1.1 diff -c -r1.1 CvsManager.vc170.vcxproj *** cvsmanager/CvsManager.vc170.vcxproj 10 Aug 2024 06:41:09 -0000 1.1 --- cvsmanager/CvsManager.vc170.vcxproj 19 Aug 2024 00:57:46 -0000 *************** *** 46,57 **** $(SolutionDir)/WinDebug\ ! $(SolutionDir)/WinDebug\ true $(SolutionDir)\WinRel\ ! $(SolutionDir)\WinRel\ false --- 46,57 ---- $(SolutionDir)/WinDebug\ ! $(SolutionDir)/WinDebug\cvsmgr\ true $(SolutionDir)\WinRel\ ! $(SolutionDir)\WinRel\cvsmgr\ false *************** *** 141,155 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false ! {b94d88fc-69ab-488e-bc7f-aaa565aa8074} false --- 141,155 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false ! {b94d88fc-69ab-488e-bc7f-aaa565aa8074} false Index: cvsmanager/CvsMgrMsg.h =================================================================== RCS file: /scotty/cvsmanager/CvsMgrMsg.h,v retrieving revision 1.2 diff -c -r1.2 CvsMgrMsg.h *** cvsmanager/CvsMgrMsg.h 16 Sep 2015 11:28:49 -0000 1.2 --- cvsmanager/CvsMgrMsg.h 18 Aug 2024 12:42:53 -0000 *************** *** 1,5 **** // ! // Values are 32 bit values layed out as follows: // // 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 // 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 --- 1,5 ---- // ! // Values are 32 bit values laid out as follows: // // 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 // 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 *************** *** 39,45 **** // // MessageText: // ! // %1 // #define MSG_ISTRING 0x40000001L --- 39,45 ---- // // MessageText: // ! // %1 // #define MSG_ISTRING 0x40000001L *************** *** 48,54 **** // // MessageText: // ! // %1 // #define MSG_ESTRING 0xC0000002L --- 48,54 ---- // // MessageText: // ! // %1 // #define MSG_ESTRING 0xC0000002L *************** *** 57,63 **** // // MessageText: // ! // %1 // #define MSG_WSTRING 0x80000003L --- 57,63 ---- // // MessageText: // ! // %1 // #define MSG_WSTRING 0x80000003L *************** *** 66,72 **** // // MessageText: // ! // %1 // #define MSG_SSTRING 0x00000004L --- 66,72 ---- // // MessageText: // ! // %1 // #define MSG_SSTRING 0x00000004L Index: cvsmanager/CvsMgrMsg.rc =================================================================== RCS file: /scotty/cvsmanager/CvsMgrMsg.rc,v retrieving revision 1.1 diff -c -r1.1 CvsMgrMsg.rc *** cvsmanager/CvsMgrMsg.rc 17 May 2012 05:54:47 -0000 1.1 --- cvsmanager/CvsMgrMsg.rc 18 Aug 2024 12:42:53 -0000 *************** *** 1,2 **** LANGUAGE 0x9,0x1 ! 1 11 MSG00001.bin --- 1,2 ---- LANGUAGE 0x9,0x1 ! 1 11 "MSG00001.bin" Index: cvsmanager/CvsMgrService.cpp =================================================================== RCS file: /scotty/cvsmanager/CvsMgrService.cpp,v retrieving revision 1.33 diff -c -r1.33 CvsMgrService.cpp *** cvsmanager/CvsMgrService.cpp 17 Nov 2023 00:17:03 -0000 1.33 --- cvsmanager/CvsMgrService.cpp 18 Aug 2024 04:05:07 -0000 *************** *** 183,189 **** lic.maxUsers2 = TRIAL_MAXUSERS2; lic.osType = licAny; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) lic.type = licISV; lic.rspline = "SuiteClient2010"; GenerateLicense(lic, licString); --- 183,189 ---- lic.maxUsers2 = TRIAL_MAXUSERS2; lic.osType = licAny; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) lic.type = licISV; lic.rspline = "SuiteClient2010"; GenerateLicense(lic, licString); *************** *** 205,211 **** lic.type = licTrial; GenerateLicense(lic, licString); printf("Trial Windows %s\n",licString.c_str()); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) lic.type = licMulti; lic.maxUsers = 1; GenerateLicense(lic, licString); --- 205,211 ---- lic.type = licTrial; GenerateLicense(lic, licString); printf("Trial Windows %s\n",licString.c_str()); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) lic.type = licMulti; lic.maxUsers = 1; GenerateLicense(lic, licString); *************** *** 236,242 **** printf("Unlimited Windows %s\n",licString.c_str()); #endif ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) lic.osType=licMacOSX; lic.type = licTrial; --- 236,242 ---- printf("Unlimited Windows %s\n",licString.c_str()); #endif ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) lic.osType=licMacOSX; lic.type = licTrial; *************** *** 269,275 **** lic.type = licTrial; GenerateLicense(lic, licString); printf("Trial Linux %s\n",licString.c_str()); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) lic.type = licMulti; lic.maxUsers = TRIAL_MAXUSERS1; GenerateLicense(lic, licString); --- 269,275 ---- lic.type = licTrial; GenerateLicense(lic, licString); printf("Trial Linux %s\n",licString.c_str()); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) lic.type = licMulti; lic.maxUsers = TRIAL_MAXUSERS1; GenerateLicense(lic, licString); *************** *** 288,294 **** lic.type = licTrial; GenerateLicense(lic, licString); printf("Trial Linux s390 System Z %s\n",licString.c_str()); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) lic.type = licMulti; lic.maxUsers = TRIAL_MAXUSERS1; GenerateLicense(lic, licString); --- 288,294 ---- lic.type = licTrial; GenerateLicense(lic, licString); printf("Trial Linux s390 System Z %s\n",licString.c_str()); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) lic.type = licMulti; lic.maxUsers = TRIAL_MAXUSERS1; GenerateLicense(lic, licString); *************** *** 356,362 **** char *errmsg=(char *)malloc(sizeof(char)*32764); *errmsg='\0'; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) hwinfo_t hwinfo; if(!CheckLicense(license,hwinfo,errmsg)) #else --- 356,362 ---- char *errmsg=(char *)malloc(sizeof(char)*32764); *errmsg='\0'; ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) hwinfo_t hwinfo; if(!CheckLicense(license,hwinfo,errmsg)) #else *************** *** 413,419 **** { printf("Evaluation\n"); } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) else if(license.type==licUnlimited) #else else if(license.type==licFull) --- 413,419 ---- { printf("Evaluation\n"); } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) else if(license.type==licUnlimited) #else else if(license.type==licFull) *************** *** 421,427 **** { printf("Unlimited\n"); } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) else if(license.type==licISV) { printf("ISV\n"); --- 421,427 ---- { printf("Unlimited\n"); } ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) else if(license.type==licISV) { printf("ISV\n"); *************** *** 444,450 **** printf("License days until renewal: %d\n",license.daysLeft); if(license.maxUsers) printf("Licensed users: %d\n",license.maxUsers); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) if(license.rspline.size()) printf("Licensed ISV client: %s\n",license.rspline.c_str()); if(license.email.size()) --- 444,450 ---- printf("License days until renewal: %d\n",license.daysLeft); if(license.maxUsers) printf("Licensed users: %d\n",license.maxUsers); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) if(license.rspline.size()) printf("Licensed ISV client: %s\n",license.rspline.c_str()); if(license.email.size()) *************** *** 454,460 **** printf("Licensed owner: %s\n",license.user.c_str()); if(license.company.size()) printf("Licensed company: %s\n",license.company.c_str()); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_BUILD>4135)) if(license.customerId!=0) printf("Licensed customer id: %d\n",license.customerId); if(license.vendorId!=0) --- 454,460 ---- printf("Licensed owner: %s\n",license.user.c_str()); if(license.company.size()) printf("Licensed company: %s\n",license.company.c_str()); ! #if ((CVSNT_PRODUCT_MAJOR==2) && (CVSNT_PRODUCT_MINOR==8) && (CVSNT_PRODUCT_PATCHLEVEL>=2) && (CVSNT_PRODUCT_PATCHLEVEL!=3) && (CVSNT_PRODUCT_BUILD>4135)) if(license.customerId!=0) printf("Licensed customer id: %d\n",license.customerId); if(license.vendorId!=0) *************** *** 673,680 **** --- 673,685 ---- WCHAR spns[2][256]; LPCWSTR spnList[2] = { spns[0], spns[1] }; + #if _MSC_VER < 1930 snwprintf(spns[0],256,L"cvs/%s",shortName); snwprintf(spns[1],256,L"cvs/%s",longName); + #else + _snwprintf(spns[0], 256, L"cvs/%s", shortName); + _snwprintf(spns[1], 256, L"cvs/%s", longName); + #endif if(g_bTestMode) { *************** *** 718,724 **** { if (!(g_hService = RegisterServiceCtrlHandler(SERVICE_NAME1,ServiceHandler))) { ! CServerIo::log(CServerIo::logError,"Unable to start "DISPLAY_NAMEA" - RegisterServiceCtrlHandler failed"); return; } NotifySCM(SERVICE_START_PENDING, 0); --- 723,729 ---- { if (!(g_hService = RegisterServiceCtrlHandler(SERVICE_NAME1,ServiceHandler))) { ! CServerIo::log(CServerIo::logError,"Unable to start " DISPLAY_NAMEA " - RegisterServiceCtrlHandler failed"); return; } NotifySCM(SERVICE_START_PENDING, 0); *************** *** 729,735 **** if(dwArgc==999) { g_bTestMode=true; ! printf(DISPLAY_NAMEA" " CVSNT_PRODUCTVERSION_STRING " ("__DATE__") starting in test mode.\n"); } } --- 734,740 ---- if(dwArgc==999) { g_bTestMode=true; ! printf(DISPLAY_NAMEA" " CVSNT_PRODUCTVERSION_STRING " (" __DATE__ ") starting in test mode.\n"); } } Index: WorkspaceManager/WorkspaceManager.vc170.vcxproj =================================================================== RCS file: /scotty/WorkspaceManager/WorkspaceManager.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 WorkspaceManager.vc170.vcxproj *** WorkspaceManager/WorkspaceManager.vc170.vcxproj 10 Aug 2024 06:41:09 -0000 1.1.2.1 --- WorkspaceManager/WorkspaceManager.vc170.vcxproj 12 Aug 2024 02:07:11 -0000 *************** *** 216,266 **** ! {b94d88fc-69ab-488e-bc7f-aaa565aa8074} false ! {210ff246-209d-41fe-a6ea-6638dc8a41d0} false ! {2cb853ab-4d5e-4a0b-a8f4-e52f7969d134} false ! {c26f1694-55c3-44a7-935a-32e40d693626} false ! {0a5e049b-149a-4927-8a57-07aa8dbfd07f} false ! {5470edfa-10e7-44c4-b6a5-4c4cb1cef628} false ! {6df1f526-5dfa-4e57-91f6-8c1b99149a90} false ! {52df4768-7fee-4f05-9b97-ec093506aefa} false ! {22d3dcad-11b4-43b7-8d24-2bbe84d8ea05} false ! {95b9b0a6-6ad7-4b7e-8134-27dee6db8c4a} false ! {76b8afb2-7cb9-4798-8cc9-34d70dc27090} false ! {59f1f839-853d-4a41-adba-2aaa7a2958ab} false --- 216,266 ---- ! {b94d88fc-69ab-488e-bc7f-aaa565aa8074} false ! {210ff246-209d-41fe-a6ea-6638dc8a41d0} false ! {2cb853ab-4d5e-4a0b-a8f4-e52f7969d134} false ! {c26f1694-55c3-44a7-935a-32e40d693626} false ! {0a5e049b-149a-4927-8a57-07aa8dbfd07f} false ! {5470edfa-10e7-44c4-b6a5-4c4cb1cef628} false ! {6df1f526-5dfa-4e57-91f6-8c1b99149a90} false ! {52df4768-7fee-4f05-9b97-ec093506aefa} false ! {22d3dcad-11b4-43b7-8d24-2bbe84d8ea05} false ! {95b9b0a6-6ad7-4b7e-8134-27dee6db8c4a} false ! {76b8afb2-7cb9-4798-8cc9-34d70dc27090} false ! {59f1f839-853d-4a41-adba-2aaa7a2958ab} false Index: releasemanager/ReleaseManager.vc170.vcxproj =================================================================== RCS file: /scotty/releasemanager/ReleaseManager.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 ReleaseManager.vc170.vcxproj *** releasemanager/ReleaseManager.vc170.vcxproj 10 Aug 2024 06:41:09 -0000 1.1.2.1 --- releasemanager/ReleaseManager.vc170.vcxproj 12 Aug 2024 02:07:03 -0000 *************** *** 174,180 **** ! {b94d88fc-69ab-488e-bc7f-aaa565aa8074} false --- 174,180 ---- ! {b94d88fc-69ab-488e-bc7f-aaa565aa8074} false Index: vs.net/cvsscci.vc170.vcxproj =================================================================== RCS file: /scotty/vs.net/cvsscci.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 cvsscci.vc170.vcxproj *** vs.net/cvsscci.vc170.vcxproj 10 Aug 2024 06:41:09 -0000 1.1.2.1 --- vs.net/cvsscci.vc170.vcxproj 12 Aug 2024 02:07:07 -0000 *************** *** 200,206 **** ! {b94d88fc-69ab-488e-bc7f-aaa565aa8074} false --- 200,206 ---- ! {b94d88fc-69ab-488e-bc7f-aaa565aa8074} false Index: wizard/wizard.vc170.vcxproj =================================================================== RCS file: /scotty/wizard/wizard.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 wizard.vc170.vcxproj *** wizard/wizard.vc170.vcxproj 10 Aug 2024 06:41:09 -0000 1.1.2.1 --- wizard/wizard.vc170.vcxproj 12 Aug 2024 02:07:09 -0000 *************** *** 167,173 **** ! {b94d88fc-69ab-488e-bc7f-aaa565aa8074} false --- 167,173 ---- ! {b94d88fc-69ab-488e-bc7f-aaa565aa8074} false Index: wizard/wizcfg.vc170.vcxproj =================================================================== RCS file: /scotty/wizard/wizcfg.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 wizcfg.vc170.vcxproj *** wizard/wizcfg.vc170.vcxproj 10 Aug 2024 06:41:09 -0000 1.1.2.1 --- wizard/wizcfg.vc170.vcxproj 12 Aug 2024 02:07:09 -0000 *************** *** 150,164 **** ! {b94d88fc-69ab-488e-bc7f-aaa565aa8074} false ! {59f1f839-853d-4a41-adba-2aaa7a2958ab} false ! {0bef4ffd-fbda-47b2-9282-c24e5308c180} false --- 150,164 ---- ! {b94d88fc-69ab-488e-bc7f-aaa565aa8074} false ! {59f1f839-853d-4a41-adba-2aaa7a2958ab} false ! {0bef4ffd-fbda-47b2-9282-c24e5308c180} false Index: genlic/genlic.vc170.vcxproj =================================================================== RCS file: /scotty/genlic/genlic.vc170.vcxproj,v retrieving revision 1.1 diff -c -r1.1 genlic.vc170.vcxproj *** genlic/genlic.vc170.vcxproj 10 Aug 2024 06:41:09 -0000 1.1 --- genlic/genlic.vc170.vcxproj 12 Aug 2024 02:06:50 -0000 *************** *** 107,113 **** ! {b94d88fc-69ab-488e-bc7f-aaa565aa8074} false --- 107,113 ---- ! {b94d88fc-69ab-488e-bc7f-aaa565aa8074} false