Index: cvsnt.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsnt.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 cvsnt.vc170.vcxproj *** cvsnt.vc170.vcxproj 10 Aug 2024 00:35:48 -0000 1.1.2.1 --- cvsnt.vc170.vcxproj 18 Aug 2024 12:37:11 -0000 *************** *** 46,60 **** .\WinRel/tmp\ ! .\WinRel/tmp\ false true .\WinDebug/tmp\ ! .\WinDebug/tmp\ true true --- 46,62 ---- .\WinRel/tmp\ ! .\WinRel/tmp\cvsnt\ false true + false .\WinDebug/tmp\ ! .\WinDebug/tmp\cvsnt\ true true + false *************** *** 67,73 **** Speed true \march-hare\certs;.\doc;.\windows-NT;.\src;.\lib;.\diff;.\zlib;.\cvsgui;.\expat\lib;.\xmlapi;.\cvsapi\lib;.\cvsapi;.\cvstools;%(AdditionalIncludeDirectories) ! NDEBUG;_CONSOLE;WIN32;HAVE_CONFIG_H;POSIX;CVSGUI_PIPE;%(PreprocessorDefinitions) true MultiThreadedDLL false --- 69,75 ---- Speed true \march-hare\certs;.\doc;.\windows-NT;.\src;.\lib;.\diff;.\zlib;.\cvsgui;.\expat\lib;.\xmlapi;.\cvsapi\lib;.\cvsapi;.\cvstools;%(AdditionalIncludeDirectories) ! _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;WIN32;HAVE_CONFIG_H;POSIX;CVSGUI_PIPE;%(PreprocessorDefinitions) true MultiThreadedDLL false *************** *** 124,130 **** Disabled false \march-hare\certs;.\doc;.\windows-NT;.\src;.\lib;.\diff;.\zlib;.\cvsgui;.\expat\lib;.\xmlapi;.\cvsapi\lib;.\cvsapi;.\cvstools;%(AdditionalIncludeDirectories) ! _DEBUG;_CONSOLE;WIN32;HAVE_CONFIG_H;POSIX;CVSGUI_PIPE;%(PreprocessorDefinitions) true EnableFastChecks false --- 126,132 ---- Disabled false \march-hare\certs;.\doc;.\windows-NT;.\src;.\lib;.\diff;.\zlib;.\cvsgui;.\expat\lib;.\xmlapi;.\cvsapi\lib;.\cvsapi;.\cvstools;%(AdditionalIncludeDirectories) ! _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;WIN32;HAVE_CONFIG_H;POSIX;CVSGUI_PIPE;%(PreprocessorDefinitions) true EnableFastChecks false *************** *** 481,723 **** ! {ec9c11ae-2862-4e33-817c-008d9dc1b477} false ! {eeeb0dfe-0278-4e6f-948c-9c9caa8ea8aa} false ! {b94d88fc-69ab-488e-bc7f-aaa565aa8074} false ! {03c78f20-271d-4e1b-8440-255e4b2939f3} false ! {a6bb2070-e9a8-442c-bc75-577eee7382ba} false ! {d0305221-49f5-4cd3-af96-e0c5cd04f440} false ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {6674b4db-2a9a-4d36-b1b6-38796b6d4689} false ! {edf87796-6f09-4c8a-8202-77addb81284b} false ! {ec35c4f3-4dc4-4b87-b884-9daaa8398bd8} false ! {fbc41ecc-0abc-4742-b224-5fd3b5ffcafe} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false ! {5cd43033-b004-4886-8e4d-3a622a7ad677} false ! {7e59bceb-4fd9-42df-951e-c196f709bab8} false ! {adc6aa27-c931-4c72-934b-7c3e81929f07} false ! {e634de84-6c6c-4111-90af-cc9ee0be9ec9} false ! {c2cd3641-0f72-4c10-852b-caa694d28e86} false ! {15e9dc1b-8890-431c-96a3-095273dcfb05} false ! {2b05202e-5dd0-4543-99b9-188a23e8139d} false ! {44f87a6b-b243-4961-9236-2498e4695331} false ! {3623b3b4-90a1-4fc4-b0c3-98580c2a69da} false ! {61d75468-3718-47ee-bf14-7b1ca51bbad6} false ! {fe571818-1b67-41fb-b49d-850d650cf661} false ! {e55f4833-f513-4f88-89ab-bcc2e39f81d8} false ! {2f90c820-cd6e-4ba2-a6a1-339147e508aa} false ! {00725064-bf63-4724-9fb4-740eabe62cec} false ! {5d695560-5dd9-4ef5-9b2e-d609d1a05324} false ! {c05bd8f3-7197-4b4b-9dfe-eb014490f51c} false ! {68d18485-174e-46bb-a1fc-132ddccc2ee0} false ! {6fed639c-5fe8-4fdf-abe8-f720947ac9a1} false ! {7b67f987-4bbb-4fd4-b537-77bf79abd04f} false ! {a8630794-5c8b-4b7f-af1b-df12fd6c397f} false ! {aff96908-cc5e-40d2-94fc-78090d420832} false ! {3ed9e859-7f8b-4fbe-8589-5b7c4886471d} false ! {433007aa-2c03-481d-b56b-5fa6840d343d} false ! {94d92688-852d-4608-bfb7-574ad2448805} false ! {45866ba8-03b2-40fc-9ca5-1bb7a17b10a1} false ! {9e7b849c-cb9c-499b-b2b2-eca70c5784d2} false ! {543e4395-6ba3-47fe-862d-7d5d27b83d2a} false ! {a23ec62c-e9c4-4145-b953-90d533cdf47b} false ! {3c61dd27-f69a-4444-a848-a3d98f22dca8} false ! {530ec8e4-2422-45ee-9289-0091a4e8e083} false ! {32f96195-e679-4de4-8b8b-27d2a3ce1014} false ! {ce1bf5e4-822e-49bb-acd6-3251ce7d0b67} false ! {b927591e-977e-41e9-a2a1-c701f39e426a} false ! {a5eff26a-60fc-42d4-ab5c-e4159e5672ae} false ! {79cee0ba-cdfc-4cd6-9875-599a91c7b2dc} false ! {84e063f1-80ef-432b-93a3-90c3159f16de} false ! {74405eae-394c-433a-acd7-27b1b90cf26c} false ! {cce61c64-ac44-40e2-8e75-034c8f60834f} false ! {44d20481-5119-4d1b-a194-a7b5aef9c23c} false ! {c8427d06-c1a9-4b23-83fd-27d93938de37} false ! {86c5205d-21bc-4cde-86be-7ac921d0c6a5} false ! {6083baff-695f-456b-8531-dbdd03c9702c} false ! {c69895b2-28e6-4e13-bc48-d4baed3dcc5a} false ! {e066ef1f-0dd5-4338-abc9-c413a556ab0f} false ! {f41bc1ac-4da3-4d02-999c-6e4db0d74420} false ! {4ad8ab20-d822-44e2-aec1-e870140d254a} false ! {d8fdb582-57e3-40de-9f35-9764eb1e4148} false ! {2c1a99cd-4854-4064-9484-f1eb57f366e5} false --- 483,725 ---- ! {ec9c11ae-2862-4e33-817c-008d9dc1b477} false ! {eeeb0dfe-0278-4e6f-948c-9c9caa8ea8aa} false ! {b94d88fc-69ab-488e-bc7f-aaa565aa8074} false ! {03c78f20-271d-4e1b-8440-255e4b2939f3} false ! {a6bb2070-e9a8-442c-bc75-577eee7382ba} false ! {d0305221-49f5-4cd3-af96-e0c5cd04f440} false ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {6674b4db-2a9a-4d36-b1b6-38796b6d4689} false ! {edf87796-6f09-4c8a-8202-77addb81284b} false ! {ec35c4f3-4dc4-4b87-b884-9daaa8398bd8} false ! {fbc41ecc-0abc-4742-b224-5fd3b5ffcafe} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false ! {5cd43033-b004-4886-8e4d-3a622a7ad677} false ! {7e59bceb-4fd9-42df-951e-c196f709bab8} false ! {adc6aa27-c931-4c72-934b-7c3e81929f07} false ! {e634de84-6c6c-4111-90af-cc9ee0be9ec9} false ! {c2cd3641-0f72-4c10-852b-caa694d28e86} false ! {15e9dc1b-8890-431c-96a3-095273dcfb05} false ! {2b05202e-5dd0-4543-99b9-188a23e8139d} false ! {44f87a6b-b243-4961-9236-2498e4695331} false ! {3623b3b4-90a1-4fc4-b0c3-98580c2a69da} false ! {61d75468-3718-47ee-bf14-7b1ca51bbad6} false ! {fe571818-1b67-41fb-b49d-850d650cf661} false ! {e55f4833-f513-4f88-89ab-bcc2e39f81d8} false ! {2f90c820-cd6e-4ba2-a6a1-339147e508aa} false ! {00725064-bf63-4724-9fb4-740eabe62cec} false ! {5d695560-5dd9-4ef5-9b2e-d609d1a05324} false ! {c05bd8f3-7197-4b4b-9dfe-eb014490f51c} false ! {68d18485-174e-46bb-a1fc-132ddccc2ee0} false ! {6fed639c-5fe8-4fdf-abe8-f720947ac9a1} false ! {7b67f987-4bbb-4fd4-b537-77bf79abd04f} false ! {a8630794-5c8b-4b7f-af1b-df12fd6c397f} false ! {aff96908-cc5e-40d2-94fc-78090d420832} false ! {3ed9e859-7f8b-4fbe-8589-5b7c4886471d} false ! {433007aa-2c03-481d-b56b-5fa6840d343d} false ! {94d92688-852d-4608-bfb7-574ad2448805} false ! {45866ba8-03b2-40fc-9ca5-1bb7a17b10a1} false ! {9e7b849c-cb9c-499b-b2b2-eca70c5784d2} false ! {543e4395-6ba3-47fe-862d-7d5d27b83d2a} false ! {a23ec62c-e9c4-4145-b953-90d533cdf47b} false ! {3c61dd27-f69a-4444-a848-a3d98f22dca8} false ! {530ec8e4-2422-45ee-9289-0091a4e8e083} false ! {32f96195-e679-4de4-8b8b-27d2a3ce1014} false ! {ce1bf5e4-822e-49bb-acd6-3251ce7d0b67} false ! {b927591e-977e-41e9-a2a1-c701f39e426a} false ! {a5eff26a-60fc-42d4-ab5c-e4159e5672ae} false ! {79cee0ba-cdfc-4cd6-9875-599a91c7b2dc} false ! {84e063f1-80ef-432b-93a3-90c3159f16de} false ! {74405eae-394c-433a-acd7-27b1b90cf26c} false ! {cce61c64-ac44-40e2-8e75-034c8f60834f} false ! {44d20481-5119-4d1b-a194-a7b5aef9c23c} false ! {c8427d06-c1a9-4b23-83fd-27d93938de37} false ! {86c5205d-21bc-4cde-86be-7ac921d0c6a5} false ! {6083baff-695f-456b-8531-dbdd03c9702c} false ! {c69895b2-28e6-4e13-bc48-d4baed3dcc5a} false ! {e066ef1f-0dd5-4338-abc9-c413a556ab0f} false ! {f41bc1ac-4da3-4d02-999c-6e4db0d74420} false ! {4ad8ab20-d822-44e2-aec1-e870140d254a} false ! {d8fdb582-57e3-40de-9f35-9764eb1e4148} false ! {2c1a99cd-4854-4064-9484-f1eb57f366e5} false Index: cvsntsrv.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsntsrv.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 cvsntsrv.vc170.vcxproj *** cvsntsrv.vc170.vcxproj 10 Aug 2024 00:35:48 -0000 1.1.2.1 --- cvsntsrv.vc170.vcxproj 18 Aug 2024 12:37:11 -0000 *************** *** 46,60 **** .\WinRel/tmp\ ! .\WinRel/tmp\ false true .\WinDebug/tmp\ ! .\WinDebug/tmp\ true true --- 46,62 ---- .\WinRel/tmp\ ! .\WinRel/tmp\cvsntsrv\ false true + false .\WinDebug/tmp\ ! .\WinDebug/tmp\cvsntsrv\ true true + false *************** *** 67,73 **** Speed true \march-hare\certs;.\doc;.\windows-NT;.\src;.\lib;.\diff;.\zlib;.\cvsgui;.\expat\lib;.\xmlapi;.\cvsapi\lib;.\cvsapi;.\cvstools;%(AdditionalIncludeDirectories) ! NDEBUG;_CONSOLE;WIN32;HAVE_CONFIG_H;POSIX;CVSGUI_PIPE;%(PreprocessorDefinitions) true MultiThreadedDLL false --- 69,75 ---- Speed true \march-hare\certs;.\doc;.\windows-NT;.\src;.\lib;.\diff;.\zlib;.\cvsgui;.\expat\lib;.\xmlapi;.\cvsapi\lib;.\cvsapi;.\cvstools;%(AdditionalIncludeDirectories) ! _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;WIN32;HAVE_CONFIG_H;POSIX;CVSGUI_PIPE;%(PreprocessorDefinitions) true MultiThreadedDLL false *************** *** 121,127 **** Disabled false \march-hare\certs;.\doc;.\windows-NT;.\src;.\lib;.\diff;.\zlib;.\cvsgui;.\expat\lib;.\xmlapi;.\cvsapi\lib;.\cvsapi;.\cvstools;%(AdditionalIncludeDirectories) ! _DEBUG;_CONSOLE;WIN32;HAVE_CONFIG_H;CVSGUI_PIPE;%(PreprocessorDefinitions) true EnableFastChecks false --- 123,129 ---- Disabled false \march-hare\certs;.\doc;.\windows-NT;.\src;.\lib;.\diff;.\zlib;.\cvsgui;.\expat\lib;.\xmlapi;.\cvsapi\lib;.\cvsapi;.\cvstools;%(AdditionalIncludeDirectories) ! _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;WIN32;HAVE_CONFIG_H;CVSGUI_PIPE;%(PreprocessorDefinitions) true EnableFastChecks false *************** *** 478,696 **** ! {eeeb0dfe-0278-4e6f-948c-9c9caa8ea8aa} false ! {b94d88fc-69ab-488e-bc7f-aaa565aa8074} false ! {a6bb2070-e9a8-442c-bc75-577eee7382ba} false ! {d0305221-49f5-4cd3-af96-e0c5cd04f440} false ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {6674b4db-2a9a-4d36-b1b6-38796b6d4689} false ! {edf87796-6f09-4c8a-8202-77addb81284b} false ! {ec35c4f3-4dc4-4b87-b884-9daaa8398bd8} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false ! {5cd43033-b004-4886-8e4d-3a622a7ad677} false ! {7e59bceb-4fd9-42df-951e-c196f709bab8} false ! {e634de84-6c6c-4111-90af-cc9ee0be9ec9} false ! {c2cd3641-0f72-4c10-852b-caa694d28e86} false ! {15e9dc1b-8890-431c-96a3-095273dcfb05} false ! {2b05202e-5dd0-4543-99b9-188a23e8139d} false ! {44f87a6b-b243-4961-9236-2498e4695331} false ! {3623b3b4-90a1-4fc4-b0c3-98580c2a69da} false ! {61d75468-3718-47ee-bf14-7b1ca51bbad6} false ! {fe571818-1b67-41fb-b49d-850d650cf661} false ! {e55f4833-f513-4f88-89ab-bcc2e39f81d8} false ! {2f90c820-cd6e-4ba2-a6a1-339147e508aa} false ! {00725064-bf63-4724-9fb4-740eabe62cec} false ! {5d695560-5dd9-4ef5-9b2e-d609d1a05324} false ! {c05bd8f3-7197-4b4b-9dfe-eb014490f51c} false ! {68d18485-174e-46bb-a1fc-132ddccc2ee0} false ! {6fed639c-5fe8-4fdf-abe8-f720947ac9a1} false ! {7b67f987-4bbb-4fd4-b537-77bf79abd04f} false ! {a8630794-5c8b-4b7f-af1b-df12fd6c397f} false ! {aff96908-cc5e-40d2-94fc-78090d420832} false ! {3ed9e859-7f8b-4fbe-8589-5b7c4886471d} false ! {433007aa-2c03-481d-b56b-5fa6840d343d} false ! {45866ba8-03b2-40fc-9ca5-1bb7a17b10a1} false ! {9e7b849c-cb9c-499b-b2b2-eca70c5784d2} false ! {543e4395-6ba3-47fe-862d-7d5d27b83d2a} false ! {a23ec62c-e9c4-4145-b953-90d533cdf47b} false ! {3c61dd27-f69a-4444-a848-a3d98f22dca8} false ! {530ec8e4-2422-45ee-9289-0091a4e8e083} false ! {32f96195-e679-4de4-8b8b-27d2a3ce1014} false ! {ce1bf5e4-822e-49bb-acd6-3251ce7d0b67} false ! {b927591e-977e-41e9-a2a1-c701f39e426a} false ! {a5eff26a-60fc-42d4-ab5c-e4159e5672ae} false ! {79cee0ba-cdfc-4cd6-9875-599a91c7b2dc} false ! {84e063f1-80ef-432b-93a3-90c3159f16de} false ! {74405eae-394c-433a-acd7-27b1b90cf26c} false ! {cce61c64-ac44-40e2-8e75-034c8f60834f} false ! {44d20481-5119-4d1b-a194-a7b5aef9c23c} false ! {86c5205d-21bc-4cde-86be-7ac921d0c6a5} false ! {6083baff-695f-456b-8531-dbdd03c9702c} false ! {c69895b2-28e6-4e13-bc48-d4baed3dcc5a} false ! {e066ef1f-0dd5-4338-abc9-c413a556ab0f} false ! {f41bc1ac-4da3-4d02-999c-6e4db0d74420} false ! {4ad8ab20-d822-44e2-aec1-e870140d254a} false ! {d8fdb582-57e3-40de-9f35-9764eb1e4148} false ! {2c1a99cd-4854-4064-9484-f1eb57f366e5} false --- 480,698 ---- ! {eeeb0dfe-0278-4e6f-948c-9c9caa8ea8aa} false ! {b94d88fc-69ab-488e-bc7f-aaa565aa8074} false ! {a6bb2070-e9a8-442c-bc75-577eee7382ba} false ! {d0305221-49f5-4cd3-af96-e0c5cd04f440} false ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {6674b4db-2a9a-4d36-b1b6-38796b6d4689} false ! {edf87796-6f09-4c8a-8202-77addb81284b} false ! {ec35c4f3-4dc4-4b87-b884-9daaa8398bd8} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false ! {5cd43033-b004-4886-8e4d-3a622a7ad677} false ! {7e59bceb-4fd9-42df-951e-c196f709bab8} false ! {e634de84-6c6c-4111-90af-cc9ee0be9ec9} false ! {c2cd3641-0f72-4c10-852b-caa694d28e86} false ! {15e9dc1b-8890-431c-96a3-095273dcfb05} false ! {2b05202e-5dd0-4543-99b9-188a23e8139d} false ! {44f87a6b-b243-4961-9236-2498e4695331} false ! {3623b3b4-90a1-4fc4-b0c3-98580c2a69da} false ! {61d75468-3718-47ee-bf14-7b1ca51bbad6} false ! {fe571818-1b67-41fb-b49d-850d650cf661} false ! {e55f4833-f513-4f88-89ab-bcc2e39f81d8} false ! {2f90c820-cd6e-4ba2-a6a1-339147e508aa} false ! {00725064-bf63-4724-9fb4-740eabe62cec} false ! {5d695560-5dd9-4ef5-9b2e-d609d1a05324} false ! {c05bd8f3-7197-4b4b-9dfe-eb014490f51c} false ! {68d18485-174e-46bb-a1fc-132ddccc2ee0} false ! {6fed639c-5fe8-4fdf-abe8-f720947ac9a1} false ! {7b67f987-4bbb-4fd4-b537-77bf79abd04f} false ! {a8630794-5c8b-4b7f-af1b-df12fd6c397f} false ! {aff96908-cc5e-40d2-94fc-78090d420832} false ! {3ed9e859-7f8b-4fbe-8589-5b7c4886471d} false ! {433007aa-2c03-481d-b56b-5fa6840d343d} false ! {45866ba8-03b2-40fc-9ca5-1bb7a17b10a1} false ! {9e7b849c-cb9c-499b-b2b2-eca70c5784d2} false ! {543e4395-6ba3-47fe-862d-7d5d27b83d2a} false ! {a23ec62c-e9c4-4145-b953-90d533cdf47b} false ! {3c61dd27-f69a-4444-a848-a3d98f22dca8} false ! {530ec8e4-2422-45ee-9289-0091a4e8e083} false ! {32f96195-e679-4de4-8b8b-27d2a3ce1014} false ! {ce1bf5e4-822e-49bb-acd6-3251ce7d0b67} false ! {b927591e-977e-41e9-a2a1-c701f39e426a} false ! {a5eff26a-60fc-42d4-ab5c-e4159e5672ae} false ! {79cee0ba-cdfc-4cd6-9875-599a91c7b2dc} false ! {84e063f1-80ef-432b-93a3-90c3159f16de} false ! {74405eae-394c-433a-acd7-27b1b90cf26c} false ! {cce61c64-ac44-40e2-8e75-034c8f60834f} false ! {44d20481-5119-4d1b-a194-a7b5aef9c23c} false ! {86c5205d-21bc-4cde-86be-7ac921d0c6a5} false ! {6083baff-695f-456b-8531-dbdd03c9702c} false ! {c69895b2-28e6-4e13-bc48-d4baed3dcc5a} false ! {e066ef1f-0dd5-4338-abc9-c413a556ab0f} false ! {f41bc1ac-4da3-4d02-999c-6e4db0d74420} false ! {4ad8ab20-d822-44e2-aec1-e870140d254a} false ! {d8fdb582-57e3-40de-9f35-9764eb1e4148} false ! {2c1a99cd-4854-4064-9484-f1eb57f366e5} false Index: WorkspaceViewer/WorkspaceViewer.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/WorkspaceViewer/WorkspaceViewer.cpp,v retrieving revision 1.1.2.3 diff -c -r1.1.2.3 WorkspaceViewer.cpp *** WorkspaceViewer/WorkspaceViewer.cpp 26 May 2006 10:59:00 -0000 1.1.2.3 --- WorkspaceViewer/WorkspaceViewer.cpp 17 Aug 2024 07:39:30 -0000 *************** *** 159,165 **** { TCHAR tmp[64]; CDialog::OnInitDialog(); ! SetDlgItemTextA(m_hWnd,IDC_WMVERSION,"Workspace Viewer "CVSNT_PRODUCTVERSION_STRING); m_stMoreInfo.m_link="http://march-hare.com/cvsnt/features/workmgr/"; m_stBuyNow.m_link="http://store.march-hare.com/s.nl?sc=2&category=2"; if(g_splash) --- 159,165 ---- { TCHAR tmp[64]; CDialog::OnInitDialog(); ! SetDlgItemTextA(m_hWnd,IDC_WMVERSION,"Workspace Viewer " CVSNT_PRODUCTVERSION_STRING); m_stMoreInfo.m_link="http://march-hare.com/cvsnt/features/workmgr/"; m_stBuyNow.m_link="http://store.march-hare.com/s.nl?sc=2&category=2"; if(g_splash) Index: WorkspaceViewer/WorkspaceViewer.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/WorkspaceViewer/WorkspaceViewer.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 WorkspaceViewer.vc170.vcxproj *** WorkspaceViewer/WorkspaceViewer.vc170.vcxproj 10 Aug 2024 00:35:48 -0000 1.1.2.1 --- WorkspaceViewer/WorkspaceViewer.vc170.vcxproj 16 Aug 2024 03:30:27 -0000 *************** *** 64,70 **** Disabled ../cvsapi;../cvstools;%(AdditionalIncludeDirectories) ! WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL --- 64,70 ---- Disabled ../cvsapi;../cvstools;%(AdditionalIncludeDirectories) ! _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL *************** *** 93,99 **** ../cvsapi;../cvstools;%(AdditionalIncludeDirectories) ! WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) false MultiThreadedDLL true --- 93,99 ---- ../cvsapi;../cvstools;%(AdditionalIncludeDirectories) ! _CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) false MultiThreadedDLL true *************** *** 162,172 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false --- 162,172 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false Index: WorkspaceViewer/stdafx.h =================================================================== RCS file: /usr/local/cvs/cvsnt/WorkspaceViewer/stdafx.h,v retrieving revision 1.1.2.3 diff -c -r1.1.2.3 stdafx.h *** WorkspaceViewer/stdafx.h 26 May 2006 10:59:00 -0000 1.1.2.3 --- WorkspaceViewer/stdafx.h 11 Aug 2024 11:38:14 -0000 *************** *** 20,27 **** --- 20,33 ---- #pragma once + #if _MSC_VER < 1930 #define WINVER 0x0501 #define WIN32_WINNT 0x0501 + #else + // VS2022, then this is for Windows 10 and 11 only + #define WINVER 0x0A00 + #define _WIN32_WINNT 0x0A00 + #endif #define ISOLATION_AWARE_ENABLED 1 #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit Index: control-panel/ControlService.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/control-panel/ControlService.cpp,v retrieving revision 1.1.2.6.4.1.4.1 diff -c -r1.1.2.6.4.1.4.1 ControlService.cpp *** control-panel/ControlService.cpp 18 Sep 2015 06:59:06 -0000 1.1.2.6.4.1.4.1 --- control-panel/ControlService.cpp 17 Aug 2024 01:00:39 -0000 *************** *** 299,311 **** if(dwArgc!=999) { ! if (!(g_hService = RegisterServiceCtrlHandler(SERVICE_NAME,ServiceHandler))) { ReportError(TRUE,"Unable to start "SERVICE_NAME" - RegisterServiceCtrlHandler failed"); return; } NotifySCM(SERVICE_START_PENDING, 0, seq++); } else { g_bTestMode=TRUE; ! printf(SERVICE_NAME" " CVSNT_PRODUCTVERSION_STRING " ("__DATE__") starting in test mode.\n"); } // Initialisation --- 299,311 ---- if(dwArgc!=999) { ! if (!(g_hService = RegisterServiceCtrlHandler(SERVICE_NAME,ServiceHandler))) { ReportError(TRUE,"Unable to start " SERVICE_NAME " - RegisterServiceCtrlHandler failed"); return; } NotifySCM(SERVICE_START_PENDING, 0, seq++); } else { g_bTestMode=TRUE; ! printf(SERVICE_NAME" " CVSNT_PRODUCTVERSION_STRING " (" __DATE__ ") starting in test mode.\n"); } // Initialisation Index: control-panel/cvscontrol.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/control-panel/cvscontrol.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 cvscontrol.vc170.vcxproj *** control-panel/cvscontrol.vc170.vcxproj 10 Aug 2024 00:35:48 -0000 1.1.2.1 --- control-panel/cvscontrol.vc170.vcxproj 12 Aug 2024 02:04:39 -0000 *************** *** 153,159 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false --- 153,159 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false Index: cvsagent/win32/AboutDialog.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsagent/win32/AboutDialog.cpp,v retrieving revision 1.1.2.4 diff -c -r1.1.2.4 AboutDialog.cpp *** cvsagent/win32/AboutDialog.cpp 10 Nov 2005 07:07:59 -0000 1.1.2.4 --- cvsagent/win32/AboutDialog.cpp 16 Aug 2024 11:36:24 -0000 *************** *** 50,56 **** { CDialog::OnInitDialog(); ! ::SetDlgItemTextA(GetSafeHwnd(),IDC_VERSION,"Version "CVSNT_PRODUCTVERSION_STRING); return TRUE; } --- 50,56 ---- { CDialog::OnInitDialog(); ! ::SetDlgItemTextA(GetSafeHwnd(),IDC_VERSION,"Version " CVSNT_PRODUCTVERSION_STRING); return TRUE; } Index: cvsagent/win32/cvsagent.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsagent/win32/cvsagent.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 cvsagent.vc170.vcxproj *** cvsagent/win32/cvsagent.vc170.vcxproj 10 Aug 2024 00:35:48 -0000 1.1.2.1 --- cvsagent/win32/cvsagent.vc170.vcxproj 18 Aug 2024 04:05:08 -0000 *************** *** 49,60 **** --- 49,62 ---- Debug\ true true + false Release\ Release\ false true + false *************** *** 168,174 **** ! {e634de84-6c6c-4111-90af-cc9ee0be9ec9} false --- 170,176 ---- ! {e634de84-6c6c-4111-90af-cc9ee0be9ec9} false Index: cvsagent/win32/stdafx.h =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsagent/win32/stdafx.h,v retrieving revision 1.1.2.7.8.1 diff -c -r1.1.2.7.8.1 stdafx.h *** cvsagent/win32/stdafx.h 8 Apr 2008 02:30:37 -0000 1.1.2.7.8.1 --- cvsagent/win32/stdafx.h 11 Aug 2024 11:38:15 -0000 *************** *** 9,16 **** --- 9,22 ---- #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers #define STRICT + #if _MSC_VER < 1930 #define WINVER 0x0501 #define _WIN32_WINNT 0x0501 + #else + // VS2022, then this is for Windows 10 and 11 only + #define WINVER 0x0A00 + #define _WIN32_WINNT 0x0A00 + #endif #define _CRT_SECURE_NO_DEPRECATE #pragma warning(disable:4996) Index: cvsapi/XmlApi.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsapi/XmlApi.cpp,v retrieving revision 1.5.2.3.8.1 diff -c -r1.5.2.3.8.1 XmlApi.cpp *** cvsapi/XmlApi.cpp 22 Jun 2016 08:10:02 -0000 1.5.2.3.8.1 --- cvsapi/XmlApi.cpp 12 Aug 2024 01:41:17 -0000 *************** *** 27,32 **** --- 27,33 ---- #include #include #include + #include #include #include Index: cvsapi/cvsapi.h =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsapi/cvsapi.h,v retrieving revision 1.1.2.21.4.4.2.1 diff -c -r1.1.2.21.4.4.2.1 cvsapi.h *** cvsapi/cvsapi.h 19 May 2010 07:32:31 -0000 1.1.2.21.4.4.2.1 --- cvsapi/cvsapi.h 11 Aug 2024 11:38:15 -0000 *************** *** 25,35 **** // what functions do we use that require this? // I'm going to try a compile that uses 0x05000400 (WIN2KSP4) instead #define WIN32_LEAN_AND_MEAN #ifndef WINVER ! #define WINVER 0x05000400 #endif #ifndef _WIN32_WINNT ! #define _WIN32_WINNT 0x05000400 #endif #ifdef _WIN32 --- 25,46 ---- // what functions do we use that require this? // I'm going to try a compile that uses 0x05000400 (WIN2KSP4) instead #define WIN32_LEAN_AND_MEAN + #if _MSC_VER < 1930 #ifndef WINVER ! #define WINVER 0x05000400 #endif #ifndef _WIN32_WINNT ! #define _WIN32_WINNT 0x05000400 ! #endif ! #else ! // VS2022, then this is for Windows 10 and 11 only ! #ifndef WINVER ! #define WINVER 0x0A00 ! #endif ! #ifndef _WIN32_WINNT ! #define _WIN32_WINNT 0x0A00 ! #define WINVER 0x0A00 ! #endif #endif #ifdef _WIN32 Index: cvsapi/cvsapi.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsapi/cvsapi.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 cvsapi.vc170.vcxproj *** cvsapi/cvsapi.vc170.vcxproj 10 Aug 2024 00:35:48 -0000 1.1.2.1 --- cvsapi/cvsapi.vc170.vcxproj 16 Aug 2024 03:29:13 -0000 *************** *** 62,68 **** Speed true .\lib;.\win32;..\expat\lib;..\..\cvsdeps\bonjour\include;..\..\cvsdeps\howl\include;..\..\cvsdeps\postgres\include;..\..\cvsdeps\sqlite\include;%(AdditionalIncludeDirectories) ! _WINDOWS;NDEBUG;WIN32;HAVE_CONFIG_H;CVSAPI_EXPORT=__declspec(dllexport);XML_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL false --- 62,68 ---- Speed true .\lib;.\win32;..\expat\lib;..\..\cvsdeps\bonjour\include;..\..\cvsdeps\howl\include;..\..\cvsdeps\postgres\include;..\..\cvsdeps\sqlite\include;%(AdditionalIncludeDirectories) ! _CRT_SECURE_NO_WARNINGS;_WINDOWS;NDEBUG;WIN32;HAVE_CONFIG_H;CVSAPI_EXPORT=__declspec(dllexport);XML_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL false *************** *** 106,112 **** Disabled false .\lib;.\win32;..\expat\lib;..\..\cvsdeps\bonjour\include;..\..\cvsdeps\howl\include;..\..\cvsdeps\postgres\include;..\..\cvsdeps\sqlite\include;%(AdditionalIncludeDirectories) ! _DEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H;CVSAPI_EXPORT=__declspec(dllexport);XML_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) true EnableFastChecks false --- 106,112 ---- Disabled false .\lib;.\win32;..\expat\lib;..\..\cvsdeps\bonjour\include;..\..\cvsdeps\howl\include;..\..\cvsdeps\postgres\include;..\..\cvsdeps\sqlite\include;%(AdditionalIncludeDirectories) ! _CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H;CVSAPI_EXPORT=__declspec(dllexport);XML_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) true EnableFastChecks false *************** *** 299,321 **** ! {7e59bceb-4fd9-42df-951e-c196f709bab8} false ! {e634de84-6c6c-4111-90af-cc9ee0be9ec9} false ! {3623b3b4-90a1-4fc4-b0c3-98580c2a69da} false ! {61d75468-3718-47ee-bf14-7b1ca51bbad6} false ! {79cee0ba-cdfc-4cd6-9875-599a91c7b2dc} false --- 299,321 ---- ! {7e59bceb-4fd9-42df-951e-c196f709bab8} false ! {e634de84-6c6c-4111-90af-cc9ee0be9ec9} false ! {3623b3b4-90a1-4fc4-b0c3-98580c2a69da} false ! {61d75468-3718-47ee-bf14-7b1ca51bbad6} false ! {79cee0ba-cdfc-4cd6-9875-599a91c7b2dc} false Index: cvsapi/db2/Db2Recordset.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsapi/db2/Db2Recordset.cpp,v retrieving revision 1.1.2.1.4.1 diff -c -r1.1.2.1.4.1 Db2Recordset.cpp *** cvsapi/db2/Db2Recordset.cpp 28 Feb 2008 06:46:53 -0000 1.1.2.1.4.1 --- cvsapi/db2/Db2Recordset.cpp 11 Aug 2024 12:21:29 -0000 *************** *** 28,35 **** --- 28,37 ---- #define WIN32_LEAN_AND_MEAN #include #include + #if defined _WINDOWS && !defined __WINE__ && _MSC_VER < 1900 /* 1900 == VS2015 has real snprintf */ #define vsnprintf _vsnprintf #define snprintf _snprintf + #endif #include Index: cvsapi/lib/api_system.h =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsapi/lib/api_system.h,v retrieving revision 1.1.2.27.4.2 diff -c -r1.1.2.27.4.2 api_system.h *** cvsapi/lib/api_system.h 4 Nov 2009 13:54:15 -0000 1.1.2.27.4.2 --- cvsapi/lib/api_system.h 11 Aug 2024 12:21:29 -0000 *************** *** 47,56 **** --- 47,58 ---- #define asctime wnt_asctime #define TIME_T_SPRINTF "I64" + #if defined _WINDOWS && !defined __WINE__ && _MSC_VER < 1900 /* 1900 == VS2015 has real snprintf */ #define vsnprintf _vsnprintf #define vsnwprintf _vsnwprintf #define snprintf _snprintf #define snwprintf _snwprintf + #endif #define strcasecmp stricmp #define strncasecmp strnicmp Index: cvsapi/lib/fnmatch.c =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsapi/lib/fnmatch.c,v retrieving revision 1.1.2.4 diff -c -r1.1.2.4 fnmatch.c *** cvsapi/lib/fnmatch.c 18 Jan 2006 10:17:57 -0000 1.1.2.4 --- cvsapi/lib/fnmatch.c 18 Aug 2024 12:33:08 -0000 *************** *** 34,39 **** --- 34,40 ---- #include "api_system.h" #include #include + #include #ifdef HAVE_STDDEF_H #include Index: cvsapi/lib/getmode.c =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsapi/lib/getmode.c,v retrieving revision 1.1.2.3 diff -c -r1.1.2.3 getmode.c *** cvsapi/lib/getmode.c 30 Jun 2005 16:41:07 -0000 1.1.2.3 --- cvsapi/lib/getmode.c 17 Aug 2024 07:44:21 -0000 *************** *** 35,43 **** --- 35,45 ---- #endif /* _MT */ } ioinfo; + #if _MSC_VER < 1930 #define _pioinfo(i) ( __pioinfo[(i) >> IOINFO_L2E] + ((i) & (IOINFO_ARRAY_ELTS - 1)) ) #define _osfile(i) ( _pioinfo(i)->osfile ) __declspec(dllimport) ioinfo * __pioinfo[]; + #endif #define FOPEN 0x01 /* file handle open */ #define FEOFLAG 0x02 /* end of file has been encountered */ *************** *** 48,53 **** --- 50,57 ---- #define FDEV 0x40 /* file handle refers to device */ #define FTEXT 0x80 /* file handle is in text mode */ + + #if _MSC_VER < 1930 int getmode(int fd) { unsigned char mode = _osfile(fd); *************** *** 56,60 **** --- 60,65 ---- else return _O_BINARY; } + #endif #endif Index: cvsapi/lib/getmode.h =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsapi/lib/getmode.h,v retrieving revision 1.1.2.3 diff -c -r1.1.2.3 getmode.h *** cvsapi/lib/getmode.h 30 Jun 2005 16:41:07 -0000 1.1.2.3 --- cvsapi/lib/getmode.h 17 Aug 2024 07:45:03 -0000 *************** *** 24,30 **** --- 24,32 ---- #ifdef _WIN32 + #if _MSC_VER < 1930 int getmode(int fd); + #endif #endif Index: cvsapi/mssql/MssqlRecordset.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsapi/mssql/MssqlRecordset.cpp,v retrieving revision 1.1.2.1.4.16 diff -c -r1.1.2.1.4.16 MssqlRecordset.cpp *** cvsapi/mssql/MssqlRecordset.cpp 12 Aug 2008 20:02:05 -0000 1.1.2.1.4.16 --- cvsapi/mssql/MssqlRecordset.cpp 11 Aug 2024 12:21:29 -0000 *************** *** 25,32 **** --- 25,34 ---- #define WIN32_LEAN_AND_MEAN #include #include + #if defined _WINDOWS && !defined __WINE__ && _MSC_VER < 1900 /* 1900 == VS2015 has real snprintf */ #define vsnprintf _vsnprintf #define snprintf _snprintf + #endif #include Index: cvsapi/odbc/OdbcRecordset.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsapi/odbc/OdbcRecordset.cpp,v retrieving revision 1.1.2.6.4.1 diff -c -r1.1.2.6.4.1 OdbcRecordset.cpp *** cvsapi/odbc/OdbcRecordset.cpp 28 Feb 2008 06:48:33 -0000 1.1.2.6.4.1 --- cvsapi/odbc/OdbcRecordset.cpp 11 Aug 2024 12:21:29 -0000 *************** *** 26,33 **** --- 26,35 ---- #define WIN32_LEAN_AND_MEAN #include #include + #if defined _WINDOWS && !defined __WINE__ && _MSC_VER < 1900 /* 1900 == VS2015 has real snprintf */ #define vsnprintf _vsnprintf #define snprintf _snprintf + #endif #endif #include Index: cvsapi/oracle/OracleRecordset.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsapi/oracle/OracleRecordset.cpp,v retrieving revision 1.1.2.15.2.2 diff -c -r1.1.2.15.2.2 OracleRecordset.cpp *** cvsapi/oracle/OracleRecordset.cpp 20 Feb 2020 04:35:45 -0000 1.1.2.15.2.2 --- cvsapi/oracle/OracleRecordset.cpp 11 Aug 2024 12:21:29 -0000 *************** *** 26,33 **** --- 26,35 ---- #define WIN32_LEAN_AND_MEAN #include #include + #if defined _WINDOWS && !defined __WINE__ && _MSC_VER < 1900 /* 1900 == VS2015 has real snprintf */ #define vsnprintf _vsnprintf #define snprintf _snprintf + #endif #define wcscasecmp wcsicmp #endif Index: cvsapi/postgres/PostgresRecordset.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsapi/postgres/PostgresRecordset.cpp,v retrieving revision 1.1.2.3 diff -c -r1.1.2.3 PostgresRecordset.cpp *** cvsapi/postgres/PostgresRecordset.cpp 15 Jul 2005 15:38:57 -0000 1.1.2.3 --- cvsapi/postgres/PostgresRecordset.cpp 11 Aug 2024 12:21:29 -0000 *************** *** 20,27 **** --- 20,29 ---- #define WIN32_LEAN_AND_MEAN #include #include + #if defined _WINDOWS && !defined __WINE__ && _MSC_VER < 1900 /* 1900 == VS2015 has real snprintf */ #define vsnprintf _vsnprintf #define snprintf _snprintf + #endif #endif #include Index: cvsapi/sqlite/SQLiteRecordset.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsapi/sqlite/SQLiteRecordset.cpp,v retrieving revision 1.7.2.2.4.1 diff -c -r1.7.2.2.4.1 SQLiteRecordset.cpp *** cvsapi/sqlite/SQLiteRecordset.cpp 28 Feb 2008 06:49:29 -0000 1.7.2.2.4.1 --- cvsapi/sqlite/SQLiteRecordset.cpp 11 Aug 2024 12:21:29 -0000 *************** *** 26,33 **** --- 26,35 ---- #define WIN32_LEAN_AND_MEAN #include #include + #if defined _WINDOWS && !defined __WINE__ && _MSC_VER < 1900 /* 1900 == VS2015 has real snprintf */ #define vsnprintf _vsnprintf #define snprintf _snprintf + #endif #endif #include Index: cvsapi/win32/HttpSocket.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsapi/win32/HttpSocket.cpp,v retrieving revision 1.6.2.2 diff -c -r1.6.2.2 HttpSocket.cpp *** cvsapi/win32/HttpSocket.cpp 13 Jul 2005 21:47:24 -0000 1.6.2.2 --- cvsapi/win32/HttpSocket.cpp 16 Aug 2024 11:36:23 -0000 *************** *** 289,295 **** return false; } if(m_requestHeaderList.find("User-Agent")==m_requestHeaderList.end()) ! m_requestHeaderList["User-Agent"].push_back("Cvsapi "CVSNT_PRODUCTVERSION_SHORT" (Win32)"); for(headerList_t::const_iterator i = m_requestHeaderList.begin(); i!=m_requestHeaderList.end(); i++) { if(!strcmp(i->first.c_str(),"Content-Length") || !strcmp(i->first.c_str(),"Host")) --- 289,295 ---- return false; } if(m_requestHeaderList.find("User-Agent")==m_requestHeaderList.end()) ! m_requestHeaderList["User-Agent"].push_back("Cvsapi " CVSNT_PRODUCTVERSION_SHORT" (Win32)"); for(headerList_t::const_iterator i = m_requestHeaderList.begin(); i!=m_requestHeaderList.end(); i++) { if(!strcmp(i->first.c_str(),"Content-Length") || !strcmp(i->first.c_str(),"Host")) Index: cvsapi/win32/RunFile.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsapi/win32/RunFile.cpp,v retrieving revision 1.1.2.28.4.1.2.11 diff -c -r1.1.2.28.4.1.2.11 RunFile.cpp *** cvsapi/win32/RunFile.cpp 31 May 2024 13:28:41 -0000 1.1.2.28.4.1.2.11 --- cvsapi/win32/RunFile.cpp 16 Aug 2024 07:15:19 -0000 *************** *** 429,435 **** const char *CRunFile::getVersion(void) { ! char *version_string = "Concurrent Versions System (CVSNT) "CVSNT_PRODUCTVERSION_STRING; m_version = version_string; return m_version.c_str(); } --- 429,435 ---- const char *CRunFile::getVersion(void) { ! char *version_string = "Concurrent Versions System (CVSNT) " CVSNT_PRODUCTVERSION_STRING; m_version = version_string; return m_version.c_str(); } *************** *** 463,469 **** m_help += "License v2, a copy of which can be found with the CVS distribution.\n"; m_help += "CVS Copyright (c) 1989-2001 Brian Berliner, david d `zoo' zuhn, \n"; m_help += "Jeff Polk, and other authors\n"; ! m_help += "CVSNT version ("__DATE__") Copyright (c) 1999-2024 March Hare Software UG,\n"; m_help += "Tony Hoyle and others\n"; m_help += "\n"; m_help += "The CVSNT Application API is licensed under the terms of the\n"; --- 463,469 ---- m_help += "License v2, a copy of which can be found with the CVS distribution.\n"; m_help += "CVS Copyright (c) 1989-2001 Brian Berliner, david d `zoo' zuhn, \n"; m_help += "Jeff Polk, and other authors\n"; ! m_help += "CVSNT version (" __DATE__ ") Copyright (c) 1999-2024 March Hare Software UG,\n"; m_help += "Tony Hoyle and others\n"; m_help += "\n"; m_help += "The CVSNT Application API is licensed under the terms of the\n"; Index: cvsntcpl/StdAfx.h =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsntcpl/StdAfx.h,v retrieving revision 1.8.2.9.8.2.2.3 diff -c -r1.8.2.9.8.2.2.3 StdAfx.h *** cvsntcpl/StdAfx.h 30 Jan 2018 04:42:09 -0000 1.8.2.9.8.2.2.3 --- cvsntcpl/StdAfx.h 11 Aug 2024 11:38:15 -0000 *************** *** 12,19 **** #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers #define STRICT #define WINVER 0x0501 ! #define WIN32_WINNT 0x0501 #define ISOLATION_AWARE_ENABLED 1 #include // MFC core and standard components #include // MFC extensions --- 12,25 ---- #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers #define STRICT + #if _MSC_VER < 1930 #define WINVER 0x0501 ! #define _WIN32_WINNT 0x0501 ! #else ! // VS2022, then this is for Windows 10 and 11 only ! #define WINVER 0x0A00 ! #define _WIN32_WINNT 0x0A00 ! #endif #define ISOLATION_AWARE_ENABLED 1 #include // MFC core and standard components #include // MFC extensions Index: cvsntcpl/cvsntcpl.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/cvsntcpl/cvsntcpl.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 cvsntcpl.vc170.vcxproj *** cvsntcpl/cvsntcpl.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- cvsntcpl/cvsntcpl.vc170.vcxproj 18 Aug 2024 04:05:08 -0000 *************** *** 49,60 **** --- 49,62 ---- .\Release\ false true + false .\Debug\ .\Debug\ true true + false *************** *** 227,249 **** ! {b94d88fc-69ab-488e-bc7f-aaa565aa8074} false ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false ! {e634de84-6c6c-4111-90af-cc9ee0be9ec9} false ! {86c5205d-21bc-4cde-86be-7ac921d0c6a5} false --- 229,251 ---- ! {b94d88fc-69ab-488e-bc7f-aaa565aa8074} false ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false ! {e634de84-6c6c-4111-90af-cc9ee0be9ec9} false ! {86c5205d-21bc-4cde-86be-7ac921d0c6a5} false Index: cvstools/ProtocolLibrary.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/cvstools/ProtocolLibrary.cpp,v retrieving revision 1.1.2.25.4.6.2.8 diff -c -r1.1.2.25.4.6.2.8 ProtocolLibrary.cpp *** cvstools/ProtocolLibrary.cpp 1 Oct 2023 01:18:10 -0000 1.1.2.25.4.6.2.8 --- cvstools/ProtocolLibrary.cpp 17 Aug 2024 07:39:30 -0000 *************** *** 191,197 **** fn = buf; else #endif ! cvs::sprintf(fn,128,"%s"SHARED_LIBRARY_EXTENSION,protocol); CServerIo::trace(3,"Loading protocol %s as %s",protocol,fn.c_str()); if(!lib.Load(fn.c_str(),CGlobalSettings::GetLibraryDirectory(CGlobalSettings::GLDProtocols))) --- 191,197 ---- fn = buf; else #endif ! cvs::sprintf(fn,128,"%s" SHARED_LIBRARY_EXTENSION,protocol); CServerIo::trace(3,"Loading protocol %s as %s",protocol,fn.c_str()); if(!lib.Load(fn.c_str(),CGlobalSettings::GetLibraryDirectory(CGlobalSettings::GLDProtocols))) *************** *** 374,380 **** { CServerIo::trace(3,"EnumerateProtocols: %s",CGlobalSettings::GetLibraryDirectory(CGlobalSettings::GLDProtocols)); m_acc.close(); ! if(!m_acc.open(CGlobalSettings::GetLibraryDirectory(CGlobalSettings::GLDProtocols),"*"SHARED_LIBRARY_EXTENSION)) { CServerIo::trace(3,"EnumeratePrototocols failed"); return NULL; --- 374,380 ---- { CServerIo::trace(3,"EnumerateProtocols: %s",CGlobalSettings::GetLibraryDirectory(CGlobalSettings::GLDProtocols)); m_acc.close(); ! if(!m_acc.open(CGlobalSettings::GetLibraryDirectory(CGlobalSettings::GLDProtocols),"*" SHARED_LIBRARY_EXTENSION)) { CServerIo::trace(3,"EnumeratePrototocols failed"); return NULL; Index: cvstools/TriggerLibrary.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/cvstools/TriggerLibrary.cpp,v retrieving revision 1.1.2.6.4.14.2.2 diff -c -r1.1.2.6.4.14.2.2 TriggerLibrary.cpp *** cvstools/TriggerLibrary.cpp 22 Oct 2015 23:55:25 -0000 1.1.2.6.4.14.2.2 --- cvstools/TriggerLibrary.cpp 17 Aug 2024 01:00:39 -0000 *************** *** 17,23 **** --- 17,30 ---- */ #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN + #if _MSC_VER < 1930 + #define WINVER 0x0400 #define _WIN32_WINNT 0x0400 + #else + // VS2022, then this is for Windows 10 and 11 only + #define WINVER 0x0A00 + #define _WIN32_WINNT 0x0A00 + #endif #include #endif *************** *** 360,372 **** DirectoryAccessInfo inf; // This is always first in, last out. ! if(!LoadTrigger("info"SHARED_LIBRARY_EXTENSION, inhostname)) { ! CServerIo::trace(3,"LoadAllTriggers couldn't load info"SHARED_LIBRARY_EXTENSION" - cannot continue"); return false; } ! if(!acc.open(CGlobalSettings::GetLibraryDirectory(CGlobalSettings::GLDTriggers),"*"SHARED_LIBRARY_EXTENSION)) { CServerIo::trace(3,"LoadAllTriggers failed"); return false; --- 367,379 ---- DirectoryAccessInfo inf; // This is always first in, last out. ! if(!LoadTrigger("info" SHARED_LIBRARY_EXTENSION, inhostname)) { ! CServerIo::trace(3,"LoadAllTriggers couldn't load info" SHARED_LIBRARY_EXTENSION" - cannot continue"); return false; } ! if(!acc.open(CGlobalSettings::GetLibraryDirectory(CGlobalSettings::GLDTriggers),"*" SHARED_LIBRARY_EXTENSION)) { CServerIo::trace(3,"LoadAllTriggers failed"); return false; *************** *** 399,405 **** /* COM filter */ CLSID id; wchar_t str[128]; ! char *p = strchr(library,'}'); if(!p) return 0; --- 406,412 ---- /* COM filter */ CLSID id; wchar_t str[128]; ! const char *p = strchr(library,'}'); if(!p) return 0; Index: cvstools/cvstools.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/cvstools/cvstools.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 cvstools.vc170.vcxproj *** cvstools/cvstools.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- cvstools/cvstools.vc170.vcxproj 16 Aug 2024 03:29:13 -0000 *************** *** 62,68 **** Speed true .\win32;..\cvsapi;..\cvsapi\win32;%(AdditionalIncludeDirectories) ! _WINDOWS;NDEBUG;WIN32;HAVE_CONFIG_H;CVSTOOLS_EXPORT=__declspec(dllexport);XML_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL false --- 62,68 ---- Speed true .\win32;..\cvsapi;..\cvsapi\win32;%(AdditionalIncludeDirectories) ! _CRT_SECURE_NO_WARNINGS;_WINDOWS;NDEBUG;WIN32;HAVE_CONFIG_H;CVSTOOLS_EXPORT=__declspec(dllexport);XML_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL false *************** *** 105,111 **** Disabled false .\win32;..\cvsapi;..\cvsapi\win32;%(AdditionalIncludeDirectories) ! _DEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H;CVSTOOLS_EXPORT=__declspec(dllexport);XML_STATIC;%(PreprocessorDefinitions) true EnableFastChecks false --- 105,111 ---- Disabled false .\win32;..\cvsapi;..\cvsapi\win32;%(AdditionalIncludeDirectories) ! _CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;WIN32;HAVE_CONFIG_H;CVSTOOLS_EXPORT=__declspec(dllexport);XML_STATIC;%(PreprocessorDefinitions) true EnableFastChecks false *************** *** 198,208 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {edf87796-6f09-4c8a-8202-77addb81284b} false --- 198,208 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {edf87796-6f09-4c8a-8202-77addb81284b} false Index: diff/libdiff.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/diff/libdiff.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 libdiff.vc170.vcxproj *** diff/libdiff.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- diff/libdiff.vc170.vcxproj 12 Aug 2024 02:04:41 -0000 *************** *** 146,156 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {2b05202e-5dd0-4543-99b9-188a23e8139d} false --- 146,156 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {2b05202e-5dd0-4543-99b9-188a23e8139d} false Index: extnt/extnt.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/extnt/extnt.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 extnt.vc170.vcxproj *** extnt/extnt.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- extnt/extnt.vc170.vcxproj 18 Aug 2024 04:05:08 -0000 *************** *** 48,59 **** --- 48,61 ---- .\Debug\ true true + false .\Release\ .\Release\ false true + false *************** *** 192,202 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false --- 194,204 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false Index: genbuild/genbuild.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/genbuild/genbuild.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 genbuild.vc170.vcxproj *** genbuild/genbuild.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- genbuild/genbuild.vc170.vcxproj 12 Aug 2024 02:04:42 -0000 *************** *** 91,96 **** --- 91,97 ---- Level3 EditAndContinue + $(IntDir)$(TargetName).pdb $(OutDir)genbuild.exe Index: lockservice/LockParse.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/lockservice/LockParse.cpp,v retrieving revision 1.8.2.39.6.8.2.4 diff -c -r1.8.2.39.6.8.2.4 LockParse.cpp *** lockservice/LockParse.cpp 22 Apr 2011 19:57:28 -0000 1.8.2.39.6.8.2.4 --- lockservice/LockParse.cpp 11 Aug 2024 12:21:29 -0000 *************** *** 35,41 **** --- 35,43 ---- #include "LockService.h" #ifdef _WIN32 + #if defined _WINDOWS && !defined __WINE__ && _MSC_VER < 1900 /* 1900 == VS2015 has real snprintf */ #define vsnprintf _vsnprintf + #endif #endif #ifdef HAVE_PTHREAD_H Index: lockservice/lockservice.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/lockservice/lockservice.cpp,v retrieving revision 1.5.2.25.4.4.2.8 diff -c -r1.5.2.25.4.4.2.8 lockservice.cpp *** lockservice/lockservice.cpp 13 Dec 2023 04:59:02 -0000 1.5.2.25.4.4.2.8 --- lockservice/lockservice.cpp 17 Aug 2024 07:39:31 -0000 *************** *** 213,221 **** --- 213,223 ---- } ioinfo; + #if _MSC_VER < 1930 #define _pioinfo(i) ( __pioinfo[(i) >> IOINFO_L2E] + ((i) & (IOINFO_ARRAY_ELTS - 1)) ) #define _osfile(i) ( _pioinfo(i)->osfile ) extern "C" __declspec(dllimport) ioinfo * __pioinfo[]; + #endif #define FOPEN 0x01 /* file handle open */ #define FEOFLAG 0x02 /* end of file has been encountered */ *************** *** 953,958 **** --- 955,966 ---- typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO); typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD); + #ifndef PRODUCT_MOBILE_ENTERPRISE + #define PRODUCT_IOTUAPCOMMERCIAL 0x00000083 + #define PRODUCT_MOBILE_CORE 0x00000068 + #define PRODUCT_MOBILE_ENTERPRISE 0x00000085 + #endif + #ifndef PRODUCT_ULTIMATE /* If not using vista/2008 SDK, define them */ // It's truly amazing how many 'editions' of windows there are.. #define PRODUCT_UNDEFINED 0x00000000 *************** *** 2568,2574 **** fprintf(output,"CRASH Diagnostic output\n"); fprintf(output,"-----------------------\n"); fprintf(output,"\n"); ! fprintf(output,"Server version: "CVSNT_PRODUCTVERSION_STRING"\n"); fprintf(output,"OS Version: %s %s\n",OSBuffer,SPBuffer); fprintf(output,"SCC Providers: %s\n",getexplorervals(HKEY_LOCAL_MACHINE,sccproviders,false)); fprintf(output,"Explorer Overlays: %s\n",getexplorerkeys(HKEY_LOCAL_MACHINE,explorer_overlays)); --- 2576,2582 ---- fprintf(output,"CRASH Diagnostic output\n"); fprintf(output,"-----------------------\n"); fprintf(output,"\n"); ! fprintf(output,"Server version: " CVSNT_PRODUCTVERSION_STRING"\n"); fprintf(output,"OS Version: %s %s\n",OSBuffer,SPBuffer); fprintf(output,"SCC Providers: %s\n",getexplorervals(HKEY_LOCAL_MACHINE,sccproviders,false)); fprintf(output,"Explorer Overlays: %s\n",getexplorerkeys(HKEY_LOCAL_MACHINE,explorer_overlays)); *************** *** 2843,2849 **** BOOL QueryResult; char QueryBuffer[8194]; DWORD QueryBufferSize, QueryIndex; ! CHAR mhOpenStr[] = "Mozilla/4.0+(CVSNT+"CVSNT_PRODUCTVERSION_SHORT")" ; CHAR mhConnectStr[] = "www.march-hare.com" ; CHAR mhRequestStr[] = "/cvspro/prods-pre.asp" ; HINTERNET hNet, hConn, hInet; --- 2851,2857 ---- BOOL QueryResult; char QueryBuffer[8194]; DWORD QueryBufferSize, QueryIndex; ! CHAR mhOpenStr[] = "Mozilla/4.0+(CVSNT+" CVSNT_PRODUCTVERSION_SHORT")" ; CHAR mhConnectStr[] = "www.march-hare.com" ; CHAR mhRequestStr[] = "/cvspro/prods-pre.asp" ; HINTERNET hNet, hConn, hInet; *************** *** 3112,3118 **** BOOL QueryResult; char QueryBuffer[8194]; DWORD QueryBufferSize, QueryIndex; ! CHAR mhOpenStr[] = "Mozilla/4.0+(CVSNT+"CVSNT_PRODUCTVERSION_SHORT")" ; CHAR mhConnectStr[] = "www.march-hare.com" ; CHAR mhRequestStr[] = "/cvspro/prods-pre.asp" ; LPSTR Func; --- 3120,3126 ---- BOOL QueryResult; char QueryBuffer[8194]; DWORD QueryBufferSize, QueryIndex; ! CHAR mhOpenStr[] = "Mozilla/4.0+(CVSNT+" CVSNT_PRODUCTVERSION_SHORT")" ; CHAR mhConnectStr[] = "www.march-hare.com" ; CHAR mhRequestStr[] = "/cvspro/prods-pre.asp" ; LPSTR Func; *************** *** 3434,3440 **** #endif } ! CServerIo::trace(3,"Build version is %s","CVSNT "CVSNT_PRODUCTVERSION_STRING); static char UserName[UNLEN+1]; DWORD len=sizeof(UserName); --- 3442,3448 ---- #endif } ! CServerIo::trace(3,"Build version is %s","CVSNT " CVSNT_PRODUCTVERSION_STRING); static char UserName[UNLEN+1]; DWORD len=sizeof(UserName); *************** *** 3748,3754 **** CServerIo::trace(3,"CVSLOCK ServiceMain RegisterServiceCtrlHandler"); if (!(g_hService = RegisterServiceCtrlHandler(SERVICE_NAME,ServiceHandler))) { ! CServerIo::log(CServerIo::logError,"Unable to start "SERVICE_NAME" - RegisterServiceCtrlHandler failed"); return; } NotifySCM(SERVICE_START_PENDING, 0, seq++); --- 3756,3762 ---- CServerIo::trace(3,"CVSLOCK ServiceMain RegisterServiceCtrlHandler"); if (!(g_hService = RegisterServiceCtrlHandler(SERVICE_NAME,ServiceHandler))) { ! CServerIo::log(CServerIo::logError,"Unable to start " SERVICE_NAME " - RegisterServiceCtrlHandler failed"); return; } NotifySCM(SERVICE_START_PENDING, 0, seq++); *************** *** 3765,3771 **** { g_bTestMode=TRUE; CServerIo::trace(3,"CVSLOCK ServiceMain g_bTestMode"); ! printf(SERVICE_NAME" " CVSNT_PRODUCTVERSION_STRING " ("__DATE__") starting in test mode.\n"); } } --- 3773,3779 ---- { g_bTestMode=TRUE; CServerIo::trace(3,"CVSLOCK ServiceMain g_bTestMode"); ! printf(SERVICE_NAME" " CVSNT_PRODUCTVERSION_STRING " (" __DATE__ ") starting in test mode.\n"); } } Index: lockservice/lockservice.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/lockservice/lockservice.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 lockservice.vc170.vcxproj *** lockservice/lockservice.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- lockservice/lockservice.vc170.vcxproj 18 Aug 2024 10:22:31 -0000 *************** *** 47,58 **** --- 47,60 ---- Debug\ true true + false Release\ Release\ false true + false *************** *** 164,182 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false ! {e634de84-6c6c-4111-90af-cc9ee0be9ec9} false ! {2c1a99cd-4854-4064-9484-f1eb57f366e5} false --- 166,184 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false ! {e634de84-6c6c-4111-90af-cc9ee0be9ec9} false ! {2c1a99cd-4854-4064-9484-f1eb57f366e5} false Index: mdnsclient/dns.h =================================================================== RCS file: /usr/local/cvs/cvsnt/mdnsclient/dns.h,v retrieving revision 1.1.2.3 diff -c -r1.1.2.3 dns.h *** mdnsclient/dns.h 14 Oct 2005 16:23:53 -0000 1.1.2.3 --- mdnsclient/dns.h 17 Aug 2024 03:33:52 -0000 *************** *** 31,36 **** --- 31,69 ---- #endif #include + #if defined(WIN32) + + typedef signed char int8_t; + typedef unsigned char u_int8_t; + typedef signed short int16_t; + typedef unsigned short u_int16_t; + #if defined(_LP64) || defined (__LP64__) + #if _MSC_VER < 1930 + typedef signed int int32_t; + #endif + typedef unsigned int u_int32_t; + #else + #if _MSC_VER < 1930 + typedef signed long int32_t; + #endif + typedef unsigned long u_int32_t; + #endif + //#if _MSC_VER < 1930 + // This type is defined in the C header which is part of the C++11 standard but not standard in C++03. + // According to the Wikipedia page on the header, it hasn't shipped with Visual Studio until VS2010. + typedef u_int32_t uint32_t; + //#endif + #if _MSC_VER < 1930 + typedef _int64 int64_t; + typedef _int64 u_int64_t; + #else + typedef __int64 int64_t; + //already defined in vs2022: u_int64_t + //typedef __int64 u_int64_t; + #endif + + #endif + struct dns_packet { size_t size, rindex; uint8_t data[9000]; Index: mdnsclient/mdnsclient.c =================================================================== RCS file: /usr/local/cvs/cvsnt/mdnsclient/mdnsclient.c,v retrieving revision 1.1.2.26.4.1.6.2 diff -c -r1.1.2.26.4.1.6.2 mdnsclient.c *** mdnsclient/mdnsclient.c 28 Jun 2010 19:59:12 -0000 1.1.2.26.4.1.6.2 --- mdnsclient/mdnsclient.c 16 Aug 2024 03:24:40 -0000 *************** *** 258,264 **** ssize_t l; int r; ! #if defined (IP_RECVTTL ) && ! defined (__HP_aCC) /* In theory anyone that has this also has recvmsg.. */ struct msghdr msg = {0}; struct iovec iov[1]; --- 258,264 ---- ssize_t l; int r; ! #if defined (IP_RECVTTL ) && ! defined (__HP_aCC) && ! defined (_WIN32) /* In theory anyone that has this also has recvmsg.. */ struct msghdr msg = {0}; struct iovec iov[1]; Index: mdnsclient/mdnsclient.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/mdnsclient/mdnsclient.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 mdnsclient.vc170.vcxproj *** mdnsclient/mdnsclient.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- mdnsclient/mdnsclient.vc170.vcxproj 16 Aug 2024 03:30:27 -0000 *************** *** 57,63 **** Disabled ! WIN32;_DEBUG;_WINDOWS;_USRDLL;MDNS_EXPORT=_declspec(dllexport);%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL --- 57,63 ---- Disabled ! _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;MDNS_EXPORT=_declspec(dllexport);%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL *************** *** 79,85 **** ! WIN32;NDEBUG;_WINDOWS;_USRDLL;MDNS_EXPORT=_declspec(dllexport);%(PreprocessorDefinitions) MultiThreadedDLL Level3 --- 79,85 ---- ! _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;MDNS_EXPORT=_declspec(dllexport);%(PreprocessorDefinitions) MultiThreadedDLL Level3 Index: mdnsclient/win32/inttypes.h =================================================================== RCS file: /usr/local/cvs/cvsnt/mdnsclient/win32/inttypes.h,v retrieving revision 1.1.2.2 diff -c -r1.1.2.2 inttypes.h *** mdnsclient/win32/inttypes.h 15 Oct 2005 19:33:13 -0000 1.1.2.2 --- mdnsclient/win32/inttypes.h 16 Aug 2024 11:56:16 -0000 *************** *** 25,32 **** --- 25,34 ---- typedef signed short int16_t; typedef unsigned short uint16_t; typedef unsigned short u_int16_t; + #if _MSC_VER < 1930 typedef signed long int32_t; // Note that this is the same for Win64..! typedef unsigned long uint32_t; + #endif typedef unsigned long u_int32_t; typedef signed __int64 int64_t; typedef unsigned __int64 uint64_t; Index: mdnsclient/win32/win32.h =================================================================== RCS file: /usr/local/cvs/cvsnt/mdnsclient/win32/win32.h,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 win32.h *** mdnsclient/win32/win32.h 26 Jun 2005 19:43:05 -0000 1.1.2.1 --- mdnsclient/win32/win32.h 11 Aug 2024 12:21:29 -0000 *************** *** 20,27 **** #define WIN32__H /* Some Win32 specific defines */ ! #define snprintf _snprintf #define vsnprintf _vsnprintf #define strcasecmp stricmp #define strncasecmp strnicmp --- 20,29 ---- #define WIN32__H /* Some Win32 specific defines */ ! #if defined _WINDOWS && !defined __WINE__ && _MSC_VER < 1900 /* 1900 == VS2015 has real snprintf */ #define vsnprintf _vsnprintf + #define snprintf _snprintf + #endif #define strcasecmp stricmp #define strncasecmp strnicmp Index: protocols/common.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/common.c,v retrieving revision 1.37.2.34.6.6.2.15 diff -c -r1.37.2.34.6.6.2.15 common.cpp *** protocols/common.cpp 14 Apr 2020 05:29:14 -0000 1.37.2.34.6.6.2.15 --- protocols/common.cpp 17 Aug 2024 03:33:52 -0000 *************** *** 21,31 **** #include #ifdef _WIN32 // needs windwos 2000 or later for SignalObjectAndWait #ifndef WINVER ! #define WINVER 0x500 #endif #ifndef _WIN32_WINNT ! #define _WIN32_WINNT 0x500 #endif #include #include --- 21,41 ---- #include #ifdef _WIN32 // needs windwos 2000 or later for SignalObjectAndWait + #if _MSC_VER < 1930 #ifndef WINVER ! #define WINVER 0x500 #endif #ifndef _WIN32_WINNT ! #define _WIN32_WINNT 0x500 ! #endif ! #else ! // VS2022, then this is for Windows 10 and 11 only ! #ifndef WINVER ! #define WINVER 0x0A00 ! #endif ! #ifndef _WIN32_WINNT ! #define _WIN32_WINNT 0x0A00 ! #endif #endif #include #include *************** *** 1183,1189 **** static DWORD startwaitres; static bool donestart, slowpeek; static int junk; ! static start_listen_thread_count; #endif char *dat = (char *)data; --- 1193,1199 ---- static DWORD startwaitres; static bool donestart, slowpeek; static int junk; ! static int start_listen_thread_count; #endif char *dat = (char *)data; Index: protocols/enum.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/enum.c,v retrieving revision 1.1.2.19.4.1.4.7 diff -c -r1.1.2.19.4.1.4.7 enum.cpp *** protocols/enum.cpp 30 May 2016 01:45:44 -0000 1.1.2.19.4.1.4.7 --- protocols/enum.cpp 17 Aug 2024 07:27:56 -0000 *************** *** 105,111 **** #endif }, "enum", ! "enum "CVSNT_PRODUCTVERSION_STRING, ":enum:", --- 105,111 ---- #endif }, "enum", ! "enum " CVSNT_PRODUCTVERSION_STRING, ":enum:", *************** *** 218,224 **** } } ! server_printf("Version: Concurrent Versions System (CVSNT) "CVSNT_PRODUCTVERSION_STRING"\n"); if(CGlobalSettings::GetGlobalValue("cvsnt","PServer","ServerName",buffer,sizeof(buffer))) strcpy(buffer,getHostname(inhostname)); --- 218,224 ---- } } ! server_printf("Version: Concurrent Versions System (CVSNT) " CVSNT_PRODUCTVERSION_STRING"\n"); if(CGlobalSettings::GetGlobalValue("cvsnt","PServer","ServerName",buffer,sizeof(buffer))) strcpy(buffer,getHostname(inhostname)); Index: protocols/enum_protocol.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/enum_protocol.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 enum_protocol.vc170.vcxproj *** protocols/enum_protocol.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- protocols/enum_protocol.vc170.vcxproj 12 Aug 2024 02:04:46 -0000 *************** *** 181,191 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false --- 181,191 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false Index: protocols/ext.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/ext.c,v retrieving revision 1.19.2.18.8.1.4.5 diff -c -r1.19.2.18.8.1.4.5 ext.cpp *** protocols/ext.cpp 30 May 2016 01:45:44 -0000 1.19.2.18.8.1.4.5 --- protocols/ext.cpp 17 Aug 2024 07:27:57 -0000 *************** *** 68,74 **** }, "ext", ! "ext "CVSNT_PRODUCTVERSION_STRING, ":ext[{program}][;keyword=value...]:[user@]host[:]/path", elemHostname, /* Required elements */ --- 68,74 ---- }, "ext", ! "ext " CVSNT_PRODUCTVERSION_STRING, ":ext[{program}][;keyword=value...]:[user@]host[:]/path", elemHostname, /* Required elements */ Index: protocols/ext_protocol.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/ext_protocol.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 ext_protocol.vc170.vcxproj *** protocols/ext_protocol.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- protocols/ext_protocol.vc170.vcxproj 12 Aug 2024 02:04:46 -0000 *************** *** 180,190 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false --- 180,190 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false Index: protocols/fork.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/fork.c,v retrieving revision 1.13.2.13.8.1.2.5 diff -c -r1.13.2.13.8.1.2.5 fork.cpp *** protocols/fork.cpp 30 May 2016 01:45:44 -0000 1.13.2.13.8.1.2.5 --- protocols/fork.cpp 17 Aug 2024 07:27:57 -0000 *************** *** 63,69 **** }, "fork", ! "fork "CVSNT_PRODUCTVERSION_STRING, ":fork[;keyword=value...]:/path", elemNone, /* Required elements */ --- 63,69 ---- }, "fork", ! "fork " CVSNT_PRODUCTVERSION_STRING, ":fork[;keyword=value...]:/path", elemNone, /* Required elements */ Index: protocols/fork_protocol.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/fork_protocol.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 fork_protocol.vc170.vcxproj *** protocols/fork_protocol.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- protocols/fork_protocol.vc170.vcxproj 12 Aug 2024 02:04:46 -0000 *************** *** 180,190 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false --- 180,190 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false Index: protocols/gserver.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/gserver.c,v retrieving revision 1.4.2.32.4.9.4.12 diff -c -r1.4.2.32.4.9.4.12 gserver.cpp *** protocols/gserver.cpp 30 May 2016 01:45:44 -0000 1.4.2.32.4.9.4.12 --- protocols/gserver.cpp 17 Aug 2024 03:33:51 -0000 *************** *** 121,129 **** "gserver", #ifdef GSS_AD ! "gserver "CVSNT_PRODUCTVERSION_STRING" (Active Directory)", #else ! "gserver "CVSNT_PRODUCTVERSION_STRING" (MIT)", #endif ":gserver[;keyword=value...]:host[:port][:]/path", --- 121,129 ---- "gserver", #ifdef GSS_AD ! "gserver " CVSNT_PRODUCTVERSION_STRING " (Active Directory)", #else ! "gserver " CVSNT_PRODUCTVERSION_STRING " (MIT)", #endif ":gserver[;keyword=value...]:host[:port][:]/path", Index: protocols/gserver_protocol_ad.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/gserver_protocol_ad.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 gserver_protocol_ad.vc170.vcxproj *** protocols/gserver_protocol_ad.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- protocols/gserver_protocol_ad.vc170.vcxproj 12 Aug 2024 02:04:46 -0000 *************** *** 181,195 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false ! {44d20481-5119-4d1b-a194-a7b5aef9c23c} false --- 181,195 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false ! {44d20481-5119-4d1b-a194-a7b5aef9c23c} false Index: protocols/pserver_protocol.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/pserver_protocol.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 pserver_protocol.vc170.vcxproj *** protocols/pserver_protocol.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- protocols/pserver_protocol.vc170.vcxproj 12 Aug 2024 02:04:47 -0000 *************** *** 181,191 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false --- 181,191 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false Index: protocols/server.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/server.c,v retrieving revision 1.4.2.13.8.1.4.5 diff -c -r1.4.2.13.8.1.4.5 server.cpp *** protocols/server.cpp 30 May 2016 01:45:44 -0000 1.4.2.13.8.1.4.5 --- protocols/server.cpp 17 Aug 2024 07:27:57 -0000 *************** *** 58,64 **** NULL }, "server", ! "server "CVSNT_PRODUCTVERSION_STRING, ":server[;keyword=value...]:[username[:password]@]host[:]/path", elemHostname, /* Required elements */ --- 58,64 ---- NULL }, "server", ! "server " CVSNT_PRODUCTVERSION_STRING, ":server[;keyword=value...]:[username[:password]@]host[:]/path", elemHostname, /* Required elements */ Index: protocols/server_protocol.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/server_protocol.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 server_protocol.vc170.vcxproj *** protocols/server_protocol.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- protocols/server_protocol.vc170.vcxproj 12 Aug 2024 02:04:47 -0000 *************** *** 180,190 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false --- 180,190 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false Index: protocols/sserver.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/sserver.c,v retrieving revision 1.16.2.44.4.2.2.17 diff -c -r1.16.2.44.4.2.2.17 sserver.cpp *** protocols/sserver.cpp 8 Jul 2024 10:34:45 -0000 1.16.2.44.4.2.2.17 --- protocols/sserver.cpp 17 Aug 2024 07:27:57 -0000 *************** *** 90,96 **** #endif }, "sserver", ! "sserver "CVSNT_PRODUCTVERSION_STRING, ":sserver[;keyword=value...]:[username[:password]@]host[:port][:]/path", elemHostname, /* Required elements */ --- 90,96 ---- #endif }, "sserver", ! "sserver " CVSNT_PRODUCTVERSION_STRING, ":sserver[;keyword=value...]:[username[:password]@]host[:port][:]/path", elemHostname, /* Required elements */ Index: protocols/sserver_protocol.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/sserver_protocol.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 sserver_protocol.vc170.vcxproj *** protocols/sserver_protocol.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- protocols/sserver_protocol.vc170.vcxproj 12 Aug 2024 02:04:47 -0000 *************** *** 184,194 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false --- 184,194 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false Index: protocols/ssh.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/ssh.c,v retrieving revision 1.10.2.31.6.1.4.9 diff -c -r1.10.2.31.6.1.4.9 ssh.cpp *** protocols/ssh.cpp 28 Apr 2024 04:00:49 -0000 1.10.2.31.6.1.4.9 --- protocols/ssh.cpp 17 Aug 2024 03:33:51 -0000 *************** *** 72,78 **** }, "ssh", ! plink_version("%s [%s]","ssh "CVSNT_PRODUCTVERSION_STRING), // PuTTY-Release-0.70 ":ssh[;keyword=value...]:[username[:password]@]host[:port][:]/path", elemHostname, /* Required elements */ --- 72,78 ---- }, "ssh", ! plink_version("%s [%s]","ssh " CVSNT_PRODUCTVERSION_STRING), // PuTTY-Release-0.70 ":ssh[;keyword=value...]:[username[:password]@]host[:port][:]/path", elemHostname, /* Required elements */ Index: protocols/ssh_protocol.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/ssh_protocol.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 ssh_protocol.vc170.vcxproj *** protocols/ssh_protocol.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- protocols/ssh_protocol.vc170.vcxproj 12 Aug 2024 02:04:47 -0000 *************** *** 181,195 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false ! {fe571818-1b67-41fb-b49d-850d650cf661} false --- 181,195 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false ! {fe571818-1b67-41fb-b49d-850d650cf661} false Index: protocols/sspi.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/sspi.c,v retrieving revision 1.25.2.49.6.6.2.10 diff -c -r1.25.2.49.6.6.2.10 sspi.cpp *** protocols/sspi.cpp 28 Nov 2019 04:59:20 -0000 1.25.2.49.6.6.2.10 --- protocols/sspi.cpp 17 Aug 2024 07:27:57 -0000 *************** *** 185,191 **** #endif }, "sspi", ! "sspi "CVSNT_PRODUCTVERSION_STRING, ":sspi[;keyword=value...]:[username[:password]@]host[:port][:]/path", elemHostname, /* Required elements */ --- 185,191 ---- #endif }, "sspi", ! "sspi " CVSNT_PRODUCTVERSION_STRING, ":sspi[;keyword=value...]:[username[:password]@]host[:port][:]/path", elemHostname, /* Required elements */ Index: protocols/sspi_protocol.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/sspi_protocol.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 sspi_protocol.vc170.vcxproj *** protocols/sspi_protocol.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- protocols/sspi_protocol.vc170.vcxproj 12 Aug 2024 02:04:47 -0000 *************** *** 181,195 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false ! {c69895b2-28e6-4e13-bc48-d4baed3dcc5a} false --- 181,195 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false ! {c69895b2-28e6-4e13-bc48-d4baed3dcc5a} false Index: protocols/sync.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/sync.cpp,v retrieving revision 1.8.8.7.2.9 diff -c -r1.8.8.7.2.9 sync.cpp *** protocols/sync.cpp 16 Oct 2020 04:04:48 -0000 1.8.8.7.2.9 --- protocols/sync.cpp 17 Aug 2024 07:39:30 -0000 *************** *** 89,95 **** #endif }, "sync", ! "sync "CVSNT_PRODUCTVERSION_STRING, "(for server use only)", elemHostname|elemPassword|flagAlwaysEncrypted|flagSystem, /* Required elements */ --- 89,95 ---- #endif }, "sync", ! "sync " CVSNT_PRODUCTVERSION_STRING, "(for server use only)", elemHostname|elemPassword|flagAlwaysEncrypted|flagSystem, /* Required elements */ Index: protocols/sync_protocol.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/protocols/sync_protocol.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 sync_protocol.vc170.vcxproj *** protocols/sync_protocol.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- protocols/sync_protocol.vc170.vcxproj 12 Aug 2024 02:04:47 -0000 *************** *** 181,191 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false --- 181,191 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false Index: rcs/co.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/rcs/co.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 co.vc170.vcxproj *** rcs/co.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- rcs/co.vc170.vcxproj 17 Aug 2024 00:40:13 -0000 *************** *** 45,57 **** .\Debug\ ! .\Debug\ true true .\Release\ ! .\Release\ false true --- 45,57 ---- .\Debug\ ! .\Debug\co\ true true .\Release\ ! .\Release\co\ false true *************** *** 81,88 **** stdafx.h .\Debug/co.pch $(IntDir) ! $(IntDir) ! $(IntDir) Level3 true EditAndContinue --- 81,87 ---- stdafx.h .\Debug/co.pch $(IntDir) ! $(IntDir)$(TargetName).pdb Level3 true EditAndContinue *************** *** 134,140 **** stdafx.h .\Release/co.pch $(IntDir) - $(IntDir) $(IntDir) Level3 true --- 133,138 ---- Index: rcs/ident.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/rcs/ident.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 ident.vc170.vcxproj *** rcs/ident.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- rcs/ident.vc170.vcxproj 18 Aug 2024 10:22:31 -0000 *************** *** 45,59 **** .\Debug\ ! .\Debug\ true true .\Release\ ! .\Release\ false true --- 45,61 ---- .\Debug\ ! .\Debug\ident\ true true + false .\Release\ ! .\Release\ident\ false true + false *************** *** 82,89 **** stdafx.h .\Debug/ident.pch $(IntDir) ! $(IntDir) ! $(IntDir) Level3 true EditAndContinue --- 84,90 ---- stdafx.h .\Debug/ident.pch $(IntDir) ! $(IntDir)$(TargetName).pdb Level3 true EditAndContinue *************** *** 136,143 **** stdafx.h .\Release/ident.pch $(IntDir) ! $(IntDir) ! $(IntDir) Level3 true ProgramDatabase --- 137,143 ---- stdafx.h .\Release/ident.pch $(IntDir) ! $(IntDir)$(TargetName).pdb Level3 true ProgramDatabase *************** *** 188,194 **** ! {2c1a99cd-4854-4064-9484-f1eb57f366e5} false --- 188,194 ---- ! {2c1a99cd-4854-4064-9484-f1eb57f366e5} false Index: rcs/rcsdiff.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/rcs/rcsdiff.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 rcsdiff.vc170.vcxproj *** rcs/rcsdiff.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- rcs/rcsdiff.vc170.vcxproj 17 Aug 2024 00:40:13 -0000 *************** *** 45,57 **** .\Debug\ ! .\Debug\ true true .\Release\ ! .\Release\ false true --- 45,57 ---- .\Debug\ ! .\Debug\rcsdiff\ true true .\Release\ ! .\Release\rcsdiff\ false true *************** *** 82,88 **** .\Debug/rcsdiff.pch $(IntDir) $(IntDir) ! $(IntDir) Level3 true EditAndContinue --- 82,88 ---- .\Debug/rcsdiff.pch $(IntDir) $(IntDir) ! $(IntDir)$(TargetName).pdb Level3 true EditAndContinue Index: rcs/rlog.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/rcs/rlog.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 rlog.vc170.vcxproj *** rcs/rlog.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- rcs/rlog.vc170.vcxproj 17 Aug 2024 00:40:13 -0000 *************** *** 45,57 **** .\Debug\ ! .\Debug\ true true .\Release\ ! .\Release\ false true --- 45,57 ---- .\Debug\ ! .\Debug\rlog\ true true .\Release\ ! .\Release\rlog\ false true *************** *** 80,88 **** stdafx.h .\Debug/rlog.pch - $(IntDir) - $(IntDir) - $(IntDir) Level3 true EditAndContinue --- 80,85 ---- *************** *** 133,141 **** stdafx.h .\Release/rlog.pch - $(IntDir) - $(IntDir) - $(IntDir) Level3 true ProgramDatabase --- 130,135 ---- Index: simcvs/simcpl.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/simcvs/simcpl.cpp,v retrieving revision 1.1.2.2.4.2.2.4 diff -c -r1.1.2.2.4.2.2.4 simcpl.cpp *** simcvs/simcpl.cpp 13 Dec 2023 04:59:02 -0000 1.1.2.2.4.2.2.4 --- simcvs/simcpl.cpp 11 Aug 2024 13:37:31 -0000 *************** *** 62,67 **** --- 62,73 ---- #define SM_SERVERR2 89 #endif + #ifndef PRODUCT_MOBILE_ENTERPRISE + #define PRODUCT_IOTUAPCOMMERCIAL 0x00000083 + #define PRODUCT_MOBILE_CORE 0x00000068 + #define PRODUCT_MOBILE_ENTERPRISE 0x00000085 + #endif + #ifndef PRODUCT_ULTIMATE /* If not using vista/2008 SDK, define them */ // It's truly amazing how many 'editions' of windows there are.. #define PRODUCT_UNDEFINED 0x00000000 Index: simcvs/simcpl.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/simcvs/simcpl.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 simcpl.vc170.vcxproj *** simcvs/simcpl.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- simcvs/simcpl.vc170.vcxproj 19 Aug 2024 00:57:47 -0000 *************** *** 45,57 **** Debug\ ! Debug\ true true Release\ ! Release\ false true --- 45,57 ---- Debug\ ! Debug\simcpl\ true true Release\ ! Release\simcpl\ false true *************** *** 66,71 **** --- 66,72 ---- Level3 EditAndContinue + $(IntDir)$(TargetName).pdb ..\WinDebug\simcpl.cpl *************** *** 99,104 **** --- 100,106 ---- Level3 ProgramDatabase Default + $(IntDir)$(TargetName).pdb ..\WinRel\simcpl.cpl Index: simcvs/simcvs.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/simcvs/simcvs.cpp,v retrieving revision 1.1.2.4.4.8.2.1 diff -c -r1.1.2.4.4.8.2.1 simcvs.cpp *** simcvs/simcvs.cpp 8 Apr 2011 21:49:36 -0000 1.1.2.4.4.8.2.1 --- simcvs/simcvs.cpp 11 Aug 2024 13:27:24 -0000 *************** *** 49,55 **** LPWSTR lpszCmdParam; size_t PathLen; ! lpszCmdParam = GetCommandLine(); if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,L"Software\\CVS\\PServer",0,KEY_QUERY_VALUE,&hKeyGlobal)) hKeyGlobal = NULL; --- 49,55 ---- LPWSTR lpszCmdParam; size_t PathLen; ! lpszCmdParam = GetCommandLine(); if(RegOpenKeyEx(HKEY_LOCAL_MACHINE,L"Software\\CVS\\PServer",0,KEY_QUERY_VALUE,&hKeyGlobal)) hKeyGlobal = NULL; *************** *** 86,93 **** --- 86,101 ---- else lstrcat(Path,L"\\cvs.exe"); + #if _MSC_VER < 1930 STARTUPINFO si = { 0 }; PROCESS_INFORMATION pi = { 0 }; + #else + // VS2022, then this is for Windows 10 and 11 only + STARTUPINFO si; + PROCESS_INFORMATION pi; + SecureZeroMemory(&si, sizeof(STARTUPINFO)); + SecureZeroMemory(&pi, sizeof(PROCESS_INFORMATION)); + #endif if(!CreateProcess(Path,lpszCmdParam,NULL,NULL,TRUE,0,NULL,NULL,&si,&pi)) { DisplayErrString(L"Couldn't run cvs process\n"); Index: simcvs/simcvs.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/simcvs/simcvs.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 simcvs.vc170.vcxproj *** simcvs/simcvs.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- simcvs/simcvs.vc170.vcxproj 19 Aug 2024 00:57:46 -0000 *************** *** 44,56 **** Debug\ ! Debug\ true true Release\ ! Release\ false true --- 44,56 ---- Debug\ ! Debug\simcvs\ true true Release\ ! Release\simcvs\ false true *************** *** 67,72 **** --- 67,73 ---- Level3 EditAndContinue + false /manifest Index: src/client.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/src/client.c,v retrieving revision 1.84.2.141.6.100.2.42 diff -c -r1.84.2.141.6.100.2.42 client.cpp *** src/client.cpp 22 Jun 2020 02:30:30 -0000 1.84.2.141.6.100.2.42 --- src/client.cpp 17 Aug 2024 07:27:58 -0000 *************** *** 2824,2830 **** break; *cp++ = '\0'; ! if(sscanf(rcs_timestamp_string,"%"TIME_T_SPRINTF"d",&rcs_timestamp)!=1) rcs_timestamp=(time_t)-1; edit_revision = cp; --- 2824,2830 ---- break; *cp++ = '\0'; ! if(sscanf(rcs_timestamp_string,"%" TIME_T_SPRINTF "d",&rcs_timestamp)!=1) rcs_timestamp=(time_t)-1; edit_revision = cp; *************** *** 4954,4960 **** curdir_str.replace(cvs_str_pos,1,"+"); // or maybe "%20" send_to_server (" -w ", 0); send_to_server (curdir_str.c_str(), 0); ! send_to_server (" -b "CVSNT_PRODUCTVERSION_STRING, 0); if (trace_file!=NULL) { // it's tempting to put quotes around this, but the --- 4954,4960 ---- curdir_str.replace(cvs_str_pos,1,"+"); // or maybe "%20" send_to_server (" -w ", 0); send_to_server (curdir_str.c_str(), 0); ! send_to_server (" -b " CVSNT_PRODUCTVERSION_STRING, 0); if (trace_file!=NULL) { // it's tempting to put quotes around this, but the *************** *** 5748,5754 **** char *server_version = NULL; send_to_server ("client-version ", 0); ! send_to_server ("CVSNT "CVSNT_PRODUCTVERSION_STRING, 0); if(CCvsgui::Active()) send_to_server(" (cvsgui active)", 0); send_to_server ("\n", 0); --- 5748,5754 ---- char *server_version = NULL; send_to_server ("client-version ", 0); ! send_to_server ("CVSNT " CVSNT_PRODUCTVERSION_STRING, 0); if(CCvsgui::Active()) send_to_server(" (cvsgui active)", 0); send_to_server ("\n", 0); *************** *** 5756,5762 **** if (!server_version) error(1,0,"Cannot continue - lost connection to server in during setup of 'server_version'"); TRACE(1,"Server version is %s",server_version); ! TRACE(1,"Client version is %s%s","CVSNT "CVSNT_PRODUCTVERSION_STRING,CCvsgui::Active()?" (cvsgui active)":""); #if (CVSNT_SPECIAL_BUILD_FLAG != 0) if (!strcasecmp(CVSNT_SPECIAL_BUILD,"Trial")) // EVS Windermere (b2) Build 3239 (Beta 2 Nov 6 2008, x86-ms-windows) --- 5756,5762 ---- if (!server_version) error(1,0,"Cannot continue - lost connection to server in during setup of 'server_version'"); TRACE(1,"Server version is %s",server_version); ! TRACE(1,"Client version is %s%s","CVSNT " CVSNT_PRODUCTVERSION_STRING,CCvsgui::Active()?" (cvsgui active)":""); #if (CVSNT_SPECIAL_BUILD_FLAG != 0) if (!strcasecmp(CVSNT_SPECIAL_BUILD,"Trial")) // EVS Windermere (b2) Build 3239 (Beta 2 Nov 6 2008, x86-ms-windows) Index: src/entries.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/src/entries.c,v retrieving revision 1.23.2.46.6.20.2.4 diff -c -r1.23.2.46.6.20.2.4 entries.cpp *** src/entries.cpp 2 Aug 2018 10:29:52 -0000 1.23.2.46.6.20.2.4 --- src/entries.cpp 17 Aug 2024 07:27:58 -0000 *************** *** 678,684 **** continue; *cp++ = '\0'; ! if(sscanf(rcs_timestamp_string,"%"TIME_T_SPRINTF"d",&ent->rcs_timestamp)!=1) ent->rcs_timestamp=(time_t)-1; if(!*cp) --- 678,684 ---- continue; *cp++ = '\0'; ! if(sscanf(rcs_timestamp_string,"%" TIME_T_SPRINTF "d",&ent->rcs_timestamp)!=1) ent->rcs_timestamp=(time_t)-1; if(!*cp) *************** *** 788,794 **** return 1; if(p->rcs_timestamp!=(time_t)-1) { ! fprintf (fp, "%"TIME_T_SPRINTF"d", p->rcs_timestamp); } fprintf(fp,"/%s/%s/%s/\n",p->edit_revision?p->edit_revision:"",p->edit_tag?p->edit_tag:"",p->edit_bugid?p->edit_bugid:""); --- 788,794 ---- return 1; if(p->rcs_timestamp!=(time_t)-1) { ! fprintf (fp, "%" TIME_T_SPRINTF "d", p->rcs_timestamp); } fprintf(fp,"/%s/%s/%s/\n",p->edit_revision?p->edit_revision:"",p->edit_tag?p->edit_tag:"",p->edit_bugid?p->edit_bugid:""); Index: src/history.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/src/history.c,v retrieving revision 1.20.2.33.6.6 diff -c -r1.20.2.33.6.6 history.cpp *** src/history.cpp 2 Mar 2010 07:10:31 -0000 1.20.2.33.6.6 --- src/history.cpp 17 Aug 2024 07:27:58 -0000 *************** *** 807,813 **** if(acc.isopen()) { ! cvs::sprintf(line,80,"%c%08"TIME_T_SPRINTF"x|%s|%s|%s|%s|%s|%s\n", type, global_real_session_time_t, username, workdir.c_str(), repos, revs, name, bugid?bugid:""); /* Lessen some race conditions on non-Posix-compliant hosts. */ --- 807,813 ---- if(acc.isopen()) { ! cvs::sprintf(line,80,"%c%08" TIME_T_SPRINTF "x|%s|%s|%s|%s|%s|%s\n", type, global_real_session_time_t, username, workdir.c_str(), repos, revs, name, bugid?bugid:""); /* Lessen some race conditions on non-Posix-compliant hosts. */ *************** *** 931,937 **** line++; hr->type = *(line++); ! sscanf(line,"%"TIME_T_SPRINTF"x",&hr->date); cp=line; while(*cp && (isdigit((unsigned char)*cp) || (tolower((unsigned char)*cp)>='a' && tolower((unsigned char)*cp)<='f'))) cp++; --- 931,937 ---- line++; hr->type = *(line++); ! sscanf(line,"%" TIME_T_SPRINTF "x",&hr->date); cp=line; while(*cp && (isdigit((unsigned char)*cp) || (tolower((unsigned char)*cp)>='a' && tolower((unsigned char)*cp)<='f'))) cp++; Index: src/main.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/src/main.c,v retrieving revision 1.71.2.151.6.54.2.56 diff -c -r1.71.2.151.6.54.2.56 main.cpp *** src/main.cpp 31 May 2024 13:28:41 -0000 1.71.2.151.6.54.2.56 --- src/main.cpp 17 Aug 2024 07:27:57 -0000 *************** *** 1265,1271 **** printf ("License v2, a copy of which can be found with the CVS distribution.\n"); printf ("CVS Copyright (c) 1989-2001 Brian Berliner, david d `zoo' zuhn, \n"); printf ("Jeff Polk, and other authors\n"); ! printf ("CVSNT version ("__DATE__") Copyright (c) 1999-2024 March Hare Software UG,\n"); printf ("Tony Hoyle and others\n"); printf ("\n"); printf ("The CVSNT Application API is licensed under the terms of the\n"); --- 1265,1271 ---- printf ("License v2, a copy of which can be found with the CVS distribution.\n"); printf ("CVS Copyright (c) 1989-2001 Brian Berliner, david d `zoo' zuhn, \n"); printf ("Jeff Polk, and other authors\n"); ! printf ("CVSNT version (" __DATE__ ") Copyright (c) 1999-2024 March Hare Software UG,\n"); printf ("Tony Hoyle and others\n"); printf ("\n"); printf ("The CVSNT Application API is licensed under the terms of the\n"); *************** *** 1707,1713 **** TRACE(3,"Client build platform is %s-%s-%s", CVSNT_TARGET_VENDOR, CVSNT_TARGET_OS, CVSNT_TARGET_CPU); if(server_active) ! TRACE(3,"Server: CVSNT "CVSNT_PRODUCTVERSION_STRING); #if defined(_WIN32) && defined(SERVER_SUPPORT) if(server_active) --- 1707,1713 ---- TRACE(3,"Client build platform is %s-%s-%s", CVSNT_TARGET_VENDOR, CVSNT_TARGET_OS, CVSNT_TARGET_CPU); if(server_active) ! TRACE(3,"Server: CVSNT " CVSNT_PRODUCTVERSION_STRING); #if defined(_WIN32) && defined(SERVER_SUPPORT) if(server_active) Index: src/parseinfo.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/src/parseinfo.c,v retrieving revision 1.22.2.31.6.8.2.3 diff -c -r1.22.2.31.6.8.2.3 parseinfo.cpp *** src/parseinfo.cpp 12 Dec 2010 22:11:43 -0000 1.22.2.31.6.8.2.3 --- src/parseinfo.cpp 17 Aug 2024 03:33:52 -0000 *************** *** 71,77 **** if(server_active) cv = serv_client_version; else ! cv = "CVSNT "CVSNT_PRODUCTVERSION_STRING; cvs::sprintf(infopath,512,"%s/%s/%s",current_parsed_root->directory,CVSROOTADM,CVSROOTADM_TRIGGERS); if((triggerfileptr=fopen(infopath.c_str(),"r"))==NULL) --- 71,77 ---- if(server_active) cv = serv_client_version; else ! cv = "CVSNT " CVSNT_PRODUCTVERSION_STRING; cvs::sprintf(infopath,512,"%s/%s/%s",current_parsed_root->directory,CVSROOTADM,CVSROOTADM_TRIGGERS); if((triggerfileptr=fopen(infopath.c_str(),"r"))==NULL) *************** *** 84,90 **** CDirectoryAccess da; DirectoryAccessInfo inf; ! if (da.open(CGlobalSettings::GetLibraryDirectory(CGlobalSettings::GLDTriggers),"*"SHARED_LIBRARY_EXTENSION)) { while(da.next(inf)) { --- 84,90 ---- CDirectoryAccess da; DirectoryAccessInfo inf; ! if (da.open(CGlobalSettings::GetLibraryDirectory(CGlobalSettings::GLDTriggers),"*" SHARED_LIBRARY_EXTENSION)) { while(da.next(inf)) { Index: src/server.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/src/server.c,v retrieving revision 1.106.2.210.6.99.2.72 diff -c -r1.106.2.210.6.99.2.72 server.cpp *** src/server.cpp 15 Nov 2023 11:13:19 -0000 1.106.2.210.6.99.2.72 --- src/server.cpp 17 Aug 2024 03:33:52 -0000 *************** *** 1538,1544 **** } strcpy (p, server_temp_dir); for (i = 0; i < lim; ++i) ! strcat (p, "/"CVSDUMMY); if (server_temp_dir != orig_server_temp_dir) xfree (server_temp_dir); server_temp_dir = p; --- 1538,1544 ---- } strcpy (p, server_temp_dir); for (i = 0; i < lim; ++i) ! strcat (p, "/" CVSDUMMY); if (server_temp_dir != orig_server_temp_dir) xfree (server_temp_dir); server_temp_dir = p; *************** *** 4358,4364 **** /* Entries.Extra stuff */ sprintf (entries_ex_line, "/%s/%s/%s/", name, merge_from_tag_1 ? merge_from_tag_1 : "",merge_from_tag_2 ? merge_from_tag_2 : ""); if(rcs_timestamp!=(time_t)-1) ! sprintf (entries_ex_line+strlen(entries_ex_line), "%"TIME_T_SPRINTF"d", rcs_timestamp); sprintf(entries_ex_line+strlen(entries_ex_line),"/%s/%s/%s/", edit_revision?edit_revision:"",edit_tag?edit_tag:"",edit_bugid?edit_bugid:""); } --- 4358,4364 ---- /* Entries.Extra stuff */ sprintf (entries_ex_line, "/%s/%s/%s/", name, merge_from_tag_1 ? merge_from_tag_1 : "",merge_from_tag_2 ? merge_from_tag_2 : ""); if(rcs_timestamp!=(time_t)-1) ! sprintf (entries_ex_line+strlen(entries_ex_line), "%" TIME_T_SPRINTF "d", rcs_timestamp); sprintf(entries_ex_line+strlen(entries_ex_line),"/%s/%s/%s/", edit_revision?edit_revision:"",edit_tag?edit_tag:"",edit_bugid?edit_bugid:""); } *************** *** 5066,5077 **** buf_output0(buf_to_net,"CVS 1.11.2\n"); break; default: ! buf_output0(buf_to_net,"CVSNT "CVSNT_PRODUCTVERSION_STRING"\n"); } buf_flush(buf_to_net,0); serv_client_version = xstrdup(arg); ! TRACE(99,"Server: CVSNT "CVSNT_PRODUCTVERSION_STRING); TRACE(99,"Client: %s",PATCH_NULL(serv_client_version)); // At the time of writing SmartCVS is hardcoded to (I think) ISO8859-1. This means that it can't --- 5066,5077 ---- buf_output0(buf_to_net,"CVS 1.11.2\n"); break; default: ! buf_output0(buf_to_net,"CVSNT " CVSNT_PRODUCTVERSION_STRING "\n"); } buf_flush(buf_to_net,0); serv_client_version = xstrdup(arg); ! TRACE(99,"Server: CVSNT " CVSNT_PRODUCTVERSION_STRING); TRACE(99,"Client: %s",PATCH_NULL(serv_client_version)); // At the time of writing SmartCVS is hardcoded to (I think) ISO8859-1. This means that it can't Index: src/version.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/src/version.c,v retrieving revision 1.18.2.11.6.9.2.7 diff -c -r1.18.2.11.6.9.2.7 version.cpp *** src/version.cpp 30 Jul 2023 08:57:29 -0000 1.18.2.11.6.9.2.7 --- src/version.cpp 18 Aug 2024 10:22:30 -0000 *************** *** 13,19 **** #include "cvs.h" #include "../version.h" ! char *version_string = "Concurrent Versions System (CVSNT) "CVSNT_PRODUCTVERSION_STRING; #ifdef SERVER_SUPPORT char *config_string = " (client/server)\n"; --- 13,19 ---- #include "cvs.h" #include "../version.h" ! char *version_string = "Concurrent Versions System (CVSNT) " CVSNT_PRODUCTVERSION_STRING; #ifdef SERVER_SUPPORT char *config_string = " (client/server)\n"; Index: su/stdafx.h =================================================================== RCS file: /usr/local/cvs/cvsnt/su/stdafx.h,v retrieving revision 1.1.2.2 diff -c -r1.1.2.2 stdafx.h *** su/stdafx.h 20 Jul 2005 10:17:11 -0000 1.1.2.2 --- su/stdafx.h 11 Aug 2024 11:38:14 -0000 *************** *** 6,12 **** --- 6,19 ---- #pragma once #define WIN32_LEAN_AND_MEAN + #if _MSC_VER < 1930 + #define WINVER 0x0400 #define _WIN32_WINNT 0x0400 + #else + // VS2022, then this is for Windows 10 and 11 only + #define WINVER 0x0A00 + #define _WIN32_WINNT 0x0A00 + #endif #include #include #include Index: su/su.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/su/su.cpp,v retrieving revision 1.1.2.3.8.1 diff -c -r1.1.2.3.8.1 su.cpp *** su/su.cpp 28 Aug 2015 06:26:59 -0000 1.1.2.3.8.1 --- su/su.cpp 16 Aug 2024 03:26:30 -0000 *************** *** 120,126 **** DWORD BreakNameIntoParts(LPCTSTR name, LPWSTR w_name, LPWSTR w_domain, LPWSTR w_pdc) { static wchar_t *pw_pdc; ! TCHAR *ptr; wchar_t w_defaultdomain[DNLEN+1]={0}; int is_domain = isDomainMember(w_defaultdomain); --- 120,126 ---- DWORD BreakNameIntoParts(LPCTSTR name, LPWSTR w_name, LPWSTR w_domain, LPWSTR w_pdc) { static wchar_t *pw_pdc; ! const TCHAR *ptr; wchar_t w_defaultdomain[DNLEN+1]={0}; int is_domain = isDomainMember(w_defaultdomain); *************** *** 131,143 **** TRACE(3,"Machine is standalone"); #endif ! ptr=_tcschr(name, '\\'); ! if (ptr) { #ifdef _UNICODE _tcscpy(w_name,ptr+1); _tcsncpy(w_domain,name,ptr-name); ! w_domain[ptr-name]='\0'; #else w_name[MultiByteToWideChar(CP_ACP,0,ptr+1,-1,w_name,UNLEN+1)]='\0'; w_domain[MultiByteToWideChar(CP_ACP,0,name,ptr-name,w_domain,DNLEN)]='\0'; --- 131,147 ---- TRACE(3,"Machine is standalone"); #endif ! #ifdef _UNICODE ! ptr = _tcschr(name, L'\\'); ! #else ! ptr = _tcschr(name, '\\'); ! #endif ! if (ptr) { #ifdef _UNICODE _tcscpy(w_name,ptr+1); _tcsncpy(w_domain,name,ptr-name); ! w_domain[ptr-name]=L'\0'; #else w_name[MultiByteToWideChar(CP_ACP,0,ptr+1,-1,w_name,UNLEN+1)]='\0'; w_domain[MultiByteToWideChar(CP_ACP,0,name,ptr-name,w_domain,DNLEN)]='\0'; Index: su/su.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/su/su.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 su.vc170.vcxproj *** su/su.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- su/su.vc170.vcxproj 16 Aug 2024 03:29:14 -0000 *************** *** 57,63 **** Disabled ! WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks false --- 57,63 ---- Disabled ! _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks false *************** *** 93,99 **** true Speed true ! WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL NotSet --- 93,99 ---- true Speed true ! _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL NotSet *************** *** 132,138 **** ! {c69895b2-28e6-4e13-bc48-d4baed3dcc5a} false --- 132,138 ---- ! {c69895b2-28e6-4e13-bc48-d4baed3dcc5a} false Index: triggers/audit_trigger.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/triggers/audit_trigger.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 audit_trigger.vc170.vcxproj *** triggers/audit_trigger.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- triggers/audit_trigger.vc170.vcxproj 19 Aug 2024 00:57:47 -0000 *************** *** 45,57 **** .\Debug\ ! .\Debug\ true true .\Release\ ! .\Release\ false true --- 45,57 ---- .\Debug\ ! .\Debug\audit\ true true .\Release\ ! .\Release\audit\ false true *************** *** 176,186 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false --- 176,186 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false Index: triggers/checkout_trigger.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/triggers/checkout_trigger.cpp,v retrieving revision 1.1.2.16.4.13.2.9 diff -c -r1.1.2.16.4.13.2.9 checkout_trigger.cpp *** triggers/checkout_trigger.cpp 17 Apr 2023 14:23:02 -0000 1.1.2.16.4.13.2.9 --- triggers/checkout_trigger.cpp 17 Aug 2024 07:39:30 -0000 *************** *** 409,420 **** cvs::sprintf(fn,80,"%s/%s",g_repos.c_str(),CVSROOT_SHADOW); if(!acc.open(fn.c_str(),"r")) { ! CServerIo::trace(3,"Could not open "CVSROOT_SHADOW); return 0; } else { ! CServerIo::trace(3,"Opened "CVSROOT_SHADOW); } if (g_cifslogin) --- 409,420 ---- cvs::sprintf(fn,80,"%s/%s",g_repos.c_str(),CVSROOT_SHADOW); if(!acc.open(fn.c_str(),"r")) { ! CServerIo::trace(3,"Could not open " CVSROOT_SHADOW); return 0; } else { ! CServerIo::trace(3,"Opened " CVSROOT_SHADOW); } if (g_cifslogin) *************** *** 440,446 **** if(tok.size()!=3) { ! CServerIo::error("Malformed line %d in "CVSROOT_SHADOW" - Need Module Tag Directory",linenum); continue; } --- 440,446 ---- if(tok.size()!=3) { ! CServerIo::error("Malformed line %d in " CVSROOT_SHADOW " - Need Module Tag Directory",linenum); continue; } Index: triggers/checkout_trigger.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/triggers/checkout_trigger.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 checkout_trigger.vc170.vcxproj *** triggers/checkout_trigger.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- triggers/checkout_trigger.vc170.vcxproj 19 Aug 2024 00:57:47 -0000 *************** *** 45,57 **** .\Debug\ ! .\Debug\ true true .\Release\ ! .\Release\ false true --- 45,57 ---- .\Debug\ ! .\Debug\checkout\ true true .\Release\ ! .\Release\checkout\ false true *************** *** 176,186 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false --- 176,186 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false Index: triggers/email_trigger.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/triggers/email_trigger.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 email_trigger.vc170.vcxproj *** triggers/email_trigger.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- triggers/email_trigger.vc170.vcxproj 19 Aug 2024 00:57:47 -0000 *************** *** 45,57 **** .\Debug\ ! .\Debug\ true true .\Release\ ! .\Release\ false true --- 45,57 ---- .\Debug\ ! .\Debug\email\ true true .\Release\ ! .\Release\email\ false true *************** *** 176,186 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false --- 176,186 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false Index: triggers/info_triggers.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/triggers/info_triggers.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 info_triggers.vc170.vcxproj *** triggers/info_triggers.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- triggers/info_triggers.vc170.vcxproj 19 Aug 2024 00:57:47 -0000 *************** *** 45,57 **** .\Debug\ ! .\Debug\ true true .\Release\ ! .\Release\ false true --- 45,57 ---- .\Debug\ ! .\Debug\info\ true true .\Release\ ! .\Release\info\ false true *************** *** 176,186 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false --- 176,186 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false Index: triggers/script_trigger.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/triggers/script_trigger.cpp,v retrieving revision 1.1.2.18.4.14.2.2 diff -c -r1.1.2.18.4.14.2.2 script_trigger.cpp *** triggers/script_trigger.cpp 30 May 2016 01:45:44 -0000 1.1.2.18.4.14.2.2 --- triggers/script_trigger.cpp 11 Aug 2024 11:38:15 -0000 *************** *** 20,26 **** #include #define STRICT #define WIN32_LEAN_AND_MEAN ! #define WINVER 0x0500 #include #include #include --- 20,33 ---- #include #define STRICT #define WIN32_LEAN_AND_MEAN ! #if _MSC_VER < 1930 ! #define WINVER 0x500 ! #define _WIN32_WINNT 0x500 ! #else ! // VS2022, then this is for Windows 10 and 11 only ! #define WINVER 0x0A00 ! #define _WIN32_WINNT 0x0A00 ! #endif #include #include #include Index: triggers/script_trigger.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/triggers/script_trigger.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 script_trigger.vc170.vcxproj *** triggers/script_trigger.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- triggers/script_trigger.vc170.vcxproj 19 Aug 2024 00:57:47 -0000 *************** *** 47,59 **** .\Debug\ ! .\Debug\ true true .\Release\ ! .\Release\ false true --- 47,59 ---- .\Debug\ ! .\Debug\script\ true true .\Release\ ! .\Release\script\ false true *************** *** 193,203 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false --- 193,203 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5f0b4a94-9332-45d5-881e-f9f4c4cd03f6} false Index: triggers/server.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/triggers/server.cpp,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 server.cpp *** triggers/server.cpp 13 Jun 2005 00:19:38 -0000 1.1.2.1 --- triggers/server.cpp 11 Aug 2024 11:38:14 -0000 *************** *** 19,25 **** #include #define STRICT #define WIN32_LEAN_AND_MEAN ! #define WINVER 0x0500 #include #include #include --- 19,32 ---- #include #define STRICT #define WIN32_LEAN_AND_MEAN ! #if _MSC_VER < 1930 ! #define WINVER 0x500 ! #define _WIN32_WINNT 0x500 ! #else ! // VS2022, then this is for Windows 10 and 11 only ! #define WINVER 0x0A00 ! #define _WIN32_WINNT 0x0A00 ! #endif #include #include #include Index: uninsthlp/uninsthlp.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/uninsthlp/uninsthlp.cpp,v retrieving revision 1.2.2.2 diff -c -r1.2.2.2 uninsthlp.cpp *** uninsthlp/uninsthlp.cpp 20 Oct 2005 15:15:33 -0000 1.2.2.2 --- uninsthlp/uninsthlp.cpp 11 Aug 2024 12:56:28 -0000 *************** *** 20,37 **** static std::string RemoveDirFromPath(LPCTSTR szPath, LPCTSTR szDir) { std::string path = szPath; ! char *p; if(!*szDir) return path; ! while((p=strstr(path.data(),szDir))!=NULL) { strcpy(p,p+strlen(szDir)); if(*p==';') strcpy(p,p+1); } path.resize(strlen(path.c_str())); return path; } --- 20,41 ---- static std::string RemoveDirFromPath(LPCTSTR szPath, LPCTSTR szDir) { std::string path = szPath; ! char *p, *pdup; if(!*szDir) return path; ! pdup = strdup(path.c_str()); ! while((p=strstr(pdup,szDir))!=NULL) { strcpy(p,p+strlen(szDir)); if(*p==';') strcpy(p,p+1); } + path = pdup; path.resize(strlen(path.c_str())); + free(pdup); + pdup = NULL; return path; } Index: windows-NT/config.h =================================================================== RCS file: /usr/local/cvs/cvsnt/windows-NT/config.h,v retrieving revision 1.55.2.60.6.5.4.7 diff -c -r1.55.2.60.6.5.4.7 config.h *** windows-NT/config.h 9 Apr 2020 06:20:20 -0000 1.55.2.60.6.5.4.7 --- windows-NT/config.h 11 Aug 2024 12:21:29 -0000 *************** *** 400,407 **** #define strcasecmp stricmp #define strncasecmp strnicmp ! #define snprintf _snprintf #define vsnprintf _vsnprintf #define HAVE_GSSAPI_GSSAPI_H #define HAVE_GSSAPI_GSSAPI_GENERIC_H --- 400,409 ---- #define strcasecmp stricmp #define strncasecmp strnicmp ! #if defined _WINDOWS && !defined __WINE__ && _MSC_VER < 1900 /* 1900 == VS2015 has real snprintf */ #define vsnprintf _vsnprintf + #define snprintf _snprintf + #endif #define HAVE_GSSAPI_GSSAPI_H #define HAVE_GSSAPI_GSSAPI_GENERIC_H Index: windows-NT/setuid.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/windows-NT/setuid.c,v retrieving revision 1.20.2.15.6.17 diff -c -r1.20.2.15.6.17 setuid.cpp *** windows-NT/setuid.cpp 14 Apr 2015 05:41:04 -0000 1.20.2.15.6.17 --- windows-NT/setuid.cpp 11 Aug 2024 11:38:14 -0000 *************** *** 4,10 **** --- 4,17 ---- //#define _WIN32_WINNT 0x0400 //ConvertSidToStringSidW fails to compile ... // I'm going to try a compile that uses 0x05000400 (WIN2KSP4) instead + #if _MSC_VER < 1930 + #define WINVER 0x05000400 #define _WIN32_WINNT 0x05000400 + #else + // VS2022, then this is for Windows 10 and 11 only + #define WINVER 0x0A00 + #define _WIN32_WINNT 0x0A00 + #endif #include #include #define SECURITY_WIN32 Index: windows-NT/win32.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/windows-NT/win32.c,v retrieving revision 1.72.2.150.6.44.2.58 diff -c -r1.72.2.150.6.44.2.58 win32.cpp *** windows-NT/win32.cpp 13 Dec 2023 04:58:28 -0000 1.72.2.150.6.44.2.58 --- windows-NT/win32.cpp 17 Aug 2024 07:42:10 -0000 *************** *** 173,181 **** --- 173,183 ---- } ioinfo; + #if _MSC_VER < 1930 #define _pioinfo(i) ( __pioinfo[(i) >> IOINFO_L2E] + ((i) & (IOINFO_ARRAY_ELTS - 1)) ) #define _osfile(i) ( _pioinfo(i)->osfile ) extern "C" __declspec(dllimport) ioinfo * __pioinfo[]; + #endif #define FOPEN 0x01 /* file handle open */ #define FEOFLAG 0x02 /* end of file has been encountered */ *************** *** 630,635 **** --- 632,643 ---- typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO); typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD); + #ifndef PRODUCT_MOBILE_ENTERPRISE + #define PRODUCT_IOTUAPCOMMERCIAL 0x00000083 + #define PRODUCT_MOBILE_CORE 0x00000068 + #define PRODUCT_MOBILE_ENTERPRISE 0x00000085 + #endif + #ifndef PRODUCT_ULTIMATE /* If not using vista/2008 SDK, define them */ // It's truly amazing how many 'editions' of windows there are.. #define PRODUCT_UNDEFINED 0x00000000 *************** *** 1761,1767 **** } } ! TRACE(3,"Build version is %s","CVSNT "CVSNT_PRODUCTVERSION_STRING); static char UserName[UNLEN+1]; DWORD len=sizeof(UserName); --- 1769,1775 ---- } } ! TRACE(3,"Build version is %s","CVSNT " CVSNT_PRODUCTVERSION_STRING); static char UserName[UNLEN+1]; DWORD len=sizeof(UserName); *************** *** 1867,1873 **** DWORD BreakNameIntoParts(LPCTSTR name, LPTSTR w_name, LPTSTR w_domain, LPTSTR w_pdc, const size_t w_pdc_siz, LPTSTR w_computer, const size_t w_computer_siz) { static WCHAR *pw_pdc; ! TCHAR *ptr; LPWSTR pw_domain; #ifdef _UNICODE pw_domain=w_domain; --- 1875,1881 ---- DWORD BreakNameIntoParts(LPCTSTR name, LPTSTR w_name, LPTSTR w_domain, LPTSTR w_pdc, const size_t w_pdc_siz, LPTSTR w_computer, const size_t w_computer_siz) { static WCHAR *pw_pdc; ! const TCHAR *ptr; LPWSTR pw_domain; #ifdef _UNICODE pw_domain=w_domain; *************** *** 1875,1882 **** pw_domain = (LPWSTR) LocalAlloc(LMEM_FIXED, (_tcslen(name)+10)*sizeof(WCHAR)); #endif ! ptr=_tcschr(name, '\\'); ! if (ptr) { _tcscpy(w_name,ptr+1); _tcsncpy(w_domain,name,ptr-name); --- 1883,1894 ---- pw_domain = (LPWSTR) LocalAlloc(LMEM_FIXED, (_tcslen(name)+10)*sizeof(WCHAR)); #endif ! #ifdef _UNICODE ! ptr=_tcschr(name, L'\\'); ! #else ! ptr = _tcschr(name, '\\'); ! #endif ! if (ptr) { _tcscpy(w_name,ptr+1); _tcsncpy(w_domain,name,ptr-name); *************** *** 2883,2889 **** int wnt_fclose(FILE *file) { assert(file); ! assert(file->_flag); // FlushFileBuffers((HANDLE)_get_osfhandle(fileno(file))); --- 2895,2901 ---- int wnt_fclose(FILE *file) { assert(file); ! //assert(file->_flag); // FlushFileBuffers((HANDLE)_get_osfhandle(fileno(file))); *************** *** 5203,5209 **** fprintf(output,"CRASH Diagnostic output\n"); fprintf(output,"-----------------------\n"); fprintf(output,"\n"); ! fprintf(output,"Version: "CVSNT_PRODUCTVERSION_STRING"\n"); LPTSTR cmdline; cmdline = GetCommandLine(); _ftprintf(output,_T("command: %s\n"),cmdline); --- 5215,5221 ---- fprintf(output,"CRASH Diagnostic output\n"); fprintf(output,"-----------------------\n"); fprintf(output,"\n"); ! fprintf(output,"Version: " CVSNT_PRODUCTVERSION_STRING"\n"); LPTSTR cmdline; cmdline = GetCommandLine(); _ftprintf(output,_T("command: %s\n"),cmdline); *************** *** 5613,5619 **** BOOL QueryResult; char QueryBuffer[8194]; DWORD QueryBufferSize, QueryIndex; ! CHAR mhOpenStr[] = "Mozilla/4.0+(CVSNT+"CVSNT_PRODUCTVERSION_SHORT")" ; CHAR mhConnectStr[] = "www.march-hare.com" ; CHAR mhRequestStr[] = "/cvspro/prods-pre.asp" ; HINTERNET hNet, hConn, hInet; --- 5625,5631 ---- BOOL QueryResult; char QueryBuffer[8194]; DWORD QueryBufferSize, QueryIndex; ! CHAR mhOpenStr[] = "Mozilla/4.0+(CVSNT+" CVSNT_PRODUCTVERSION_SHORT")" ; CHAR mhConnectStr[] = "www.march-hare.com" ; CHAR mhRequestStr[] = "/cvspro/prods-pre.asp" ; HINTERNET hNet, hConn, hInet; *************** *** 5882,5888 **** BOOL QueryResult; char QueryBuffer[8194]; DWORD QueryBufferSize, QueryIndex; ! CHAR mhOpenStr[] = "Mozilla/4.0+(CVSNT+"CVSNT_PRODUCTVERSION_SHORT")" ; CHAR mhConnectStr[] = "www.march-hare.com" ; CHAR mhRequestStr[] = "/cvspro/prods-pre.asp" ; LPSTR Func; --- 5894,5900 ---- BOOL QueryResult; char QueryBuffer[8194]; DWORD QueryBufferSize, QueryIndex; ! CHAR mhOpenStr[] = "Mozilla/4.0+(CVSNT+" CVSNT_PRODUCTVERSION_SHORT")" ; CHAR mhConnectStr[] = "www.march-hare.com" ; CHAR mhRequestStr[] = "/cvspro/prods-pre.asp" ; LPSTR Func; Index: windows-NT/chkmanifest/chkmanifest.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/windows-NT/chkmanifest/chkmanifest.cpp,v retrieving revision 1.2.2.2.4.3 diff -c -r1.2.2.2.4.3 chkmanifest.cpp *** windows-NT/chkmanifest/chkmanifest.cpp 17 Jan 2008 04:26:28 -0000 1.2.2.2.4.3 --- windows-NT/chkmanifest/chkmanifest.cpp 11 Aug 2024 12:49:38 -0000 *************** *** 277,283 **** debug = true; break; default: ! printf("cvsnt manifest checker "CVSNT_PRODUCTVERSION_STRING"\n"); printf("usage: chkmanifest \n"); return -1; } --- 277,283 ---- debug = true; break; default: ! printf("cvsnt manifest checker " CVSNT_PRODUCTVERSION_STRING "\n"); printf("usage: chkmanifest \n"); return -1; } *************** *** 287,293 **** if(argc<2) { ! printf("cvsnt manifest checker "CVSNT_PRODUCTVERSION_STRING"\n"); printf("usage: chkmanifest \n"); return -1; } --- 287,293 ---- if(argc<2) { ! printf("cvsnt manifest checker " CVSNT_PRODUCTVERSION_STRING "\n"); printf("usage: chkmanifest \n"); return -1; } *************** *** 350,356 **** if(load_manifest((const char *)pRsrc, array)) { if(debug) ! printf("%s\n",pRsrc); printf(" ** Invalid manifest\n"); FreeResource(hRsrc); return 1; --- 350,356 ---- if(load_manifest((const char *)pRsrc, array)) { if(debug) ! printf("%s\n",(char *)pRsrc); printf(" ** Invalid manifest\n"); FreeResource(hRsrc); return 1; Index: windows-NT/cvsdiag/cvsdiag.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/windows-NT/cvsdiag/cvsdiag.cpp,v retrieving revision 1.1.2.8.8.43.2.73 diff -c -r1.1.2.8.8.43.2.73 cvsdiag.cpp *** windows-NT/cvsdiag/cvsdiag.cpp 7 Aug 2024 11:13:13 -0000 1.1.2.8.8.43.2.73 --- windows-NT/cvsdiag/cvsdiag.cpp 16 Aug 2024 07:20:21 -0000 *************** *** 1022,1027 **** --- 1022,1033 ---- typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO); typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD); + #ifndef PRODUCT_MOBILE_ENTERPRISE + #define PRODUCT_IOTUAPCOMMERCIAL 0x00000083 + #define PRODUCT_MOBILE_CORE 0x00000068 + #define PRODUCT_MOBILE_ENTERPRISE 0x00000085 + #endif + #ifndef PRODUCT_ULTIMATE /* If not using vista/2008 SDK, define them */ // It's truly amazing how many 'editions' of windows there are.. #define PRODUCT_UNDEFINED 0x00000000 *************** *** 1909,1922 **** } int parse_config_config (FILE *output, LPCTSTR msgprefix, LPCTSTR cvsroot, LPCTSTR infopath, LPCTSTR line, int linenum) { LPTSTR p; /* The first '=' separates keyword from value. */ ! p = _tcschr (line, (TCHAR)'='); if (p == NULL) { /* Probably should be printing line number. */ _ftprintf (output, _T("parse_config: syntax error in %s: line '%s' is missing '='\n"), infopath, line); return -1; } --- 1915,1934 ---- } int parse_config_config (FILE *output, LPCTSTR msgprefix, LPCTSTR cvsroot, LPCTSTR infopath, LPCTSTR line, int linenum) { + LPTSTR linedup = _tcsdup(line); LPTSTR p; /* The first '=' separates keyword from value. */ ! #ifdef _UNICODE ! p = _tcschr(linedup, (TCHAR)L'='); ! #else ! p = _tcschr(linedup, (TCHAR)'='); ! #endif if (p == NULL) { /* Probably should be printing line number. */ _ftprintf (output, _T("parse_config: syntax error in %s: line '%s' is missing '='\n"), infopath, line); + free(linedup); return -1; } *************** *** 1939,1944 **** --- 1951,1957 ---- else { _ftprintf (output, _T("parse_config: unrecognized value '%s' for SystemAuth\n"), p); + free(linedup); return -1; } } *************** *** 1954,1959 **** --- 1967,1973 ---- else { _ftprintf (output, _T("parse_config: unrecognized value '%s' for TopLevelAdmin\n"), p); + free(linedup); return -1; } } *************** *** 1968,1973 **** --- 1982,1988 ---- else { _ftprintf (output, _T("parse_config: unrecognized value '%s' for AclMode\n"), p); + free(linedup); return -1; } } *************** *** 2001,2006 **** --- 2016,2022 ---- else { _ftprintf (output, _T("parse_config: unrecognized value '%s' for AtomicCommits\n"), p); + free(linedup); return -1; } } *************** *** 2013,2018 **** --- 2029,2035 ---- else { _ftprintf (output, _T("parse_config: unrecognized value '%s' for RereadLogAfterVerify\n"), p); + free(linedup); return -1; } } *************** *** 2035,2042 **** --- 2052,2061 ---- the new features. */ _ftprintf (output, _T("parse_config: %s: unrecognized keyword '%s'\n"), infopath, line); + free(linedup); return -1; } + free(linedup); return 0; } /* *************** *** 3160,3166 **** DWORD BreakNameIntoParts(LPCTSTR name, LPTSTR w_name, LPTSTR w_domain, LPTSTR w_pdc, const size_t w_pdc_siz, LPTSTR w_computer, const DWORD w_computer_siz) { static WCHAR *pw_pdc; ! TCHAR *ptr; LPWSTR pw_domain; #ifdef _UNICODE pw_domain=w_domain; --- 3179,3185 ---- DWORD BreakNameIntoParts(LPCTSTR name, LPTSTR w_name, LPTSTR w_domain, LPTSTR w_pdc, const size_t w_pdc_siz, LPTSTR w_computer, const DWORD w_computer_siz) { static WCHAR *pw_pdc; ! const TCHAR *ptr; LPWSTR pw_domain; #ifdef _UNICODE pw_domain=w_domain; *************** *** 3168,3181 **** pw_domain = (LPWSTR) LocalAlloc(LMEM_FIXED, (_tcslen(name)+10)*sizeof(WCHAR)); #endif ! ptr=_tcschr(name, '\\'); ! if (ptr) { _tcscpy(w_name,ptr+1); _tcsncpy(w_domain,name,ptr-name); - w_domain[ptr-name]='\0'; #ifndef _UNICODE pw_domain[MultiByteToWideChar(CP_UTF8,0,name,ptr-name,pw_domain,DNLEN)]='\0'; #endif } else --- 3187,3206 ---- pw_domain = (LPWSTR) LocalAlloc(LMEM_FIXED, (_tcslen(name)+10)*sizeof(WCHAR)); #endif ! #ifdef _UNICODE ! ptr=_tcschr(name, L'\\'); ! #else ! ptr = _tcschr(name, '\\'); ! #endif ! if (ptr) { _tcscpy(w_name,ptr+1); _tcsncpy(w_domain,name,ptr-name); #ifndef _UNICODE + w_domain[ptr - name] = '\0'; pw_domain[MultiByteToWideChar(CP_UTF8,0,name,ptr-name,pw_domain,DNLEN)]='\0'; + #else + w_domain[ptr - name] = L'\0'; #endif } else Index: windows-NT/cvsdiag/cvsdiag.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/windows-NT/cvsdiag/cvsdiag.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 cvsdiag.vc170.vcxproj *** windows-NT/cvsdiag/cvsdiag.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- windows-NT/cvsdiag/cvsdiag.vc170.vcxproj 18 Aug 2024 10:22:31 -0000 *************** *** 60,82 **** Debug\ true true Release\ Release\ false true $(Configuration)\ $(Configuration)\ false true Disabled ! WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks false --- 60,85 ---- Debug\ true true + false Release\ Release\ false true + false $(Configuration)\ $(Configuration)\ false true + false Disabled ! _CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true EnableFastChecks false *************** *** 112,118 **** true Speed true ! WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL NotSet --- 115,121 ---- true Speed true ! _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreadedDLL NotSet *************** *** 146,152 **** true Speed true ! WIN32;NDEBUG;_CONSOLE;_WIN64;%(PreprocessorDefinitions) true MultiThreadedDLL NotSet --- 149,155 ---- true Speed true ! _CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;_WIN64;%(PreprocessorDefinitions) true MultiThreadedDLL NotSet *************** *** 205,211 **** ! {c69895b2-28e6-4e13-bc48-d4baed3dcc5a} false --- 208,214 ---- ! {c69895b2-28e6-4e13-bc48-d4baed3dcc5a} false Index: windows-NT/cvsdiag/stdafx.h =================================================================== RCS file: /usr/local/cvs/cvsnt/windows-NT/cvsdiag/stdafx.h,v retrieving revision 1.1.2.2.8.2.2.3 diff -c -r1.1.2.2.8.2.2.3 stdafx.h *** windows-NT/cvsdiag/stdafx.h 12 Jun 2020 06:23:40 -0000 1.1.2.2.8.2.2.3 --- windows-NT/cvsdiag/stdafx.h 11 Aug 2024 11:38:14 -0000 *************** *** 6,13 **** #pragma once #define WIN32_LEAN_AND_MEAN #define WINVER 0x500 ! #define _WIN32_WINNT 0x0500 #include #include #include --- 6,19 ---- #pragma once #define WIN32_LEAN_AND_MEAN + #if _MSC_VER < 1930 #define WINVER 0x500 ! #define _WIN32_WINNT 0x500 ! #else ! // VS2022, then this is for Windows 10 and 11 only ! #define WINVER 0x0A00 ! #define _WIN32_WINNT 0x0A00 ! #endif #include #include #include Index: windows-NT/installer/installer.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/windows-NT/installer/installer.cpp,v retrieving revision 1.6.8.8.2.5 diff -c -r1.6.8.8.2.5 installer.cpp *** windows-NT/installer/installer.cpp 9 Nov 2016 04:05:27 -0000 1.6.8.8.2.5 --- windows-NT/installer/installer.cpp 11 Aug 2024 13:37:31 -0000 *************** *** 9,14 **** --- 9,20 ---- static const TCHAR *subscribe_url = _T("http://www.cvsnt.org/cgi-bin/mailman/subscribe/cvsnt"); static const TCHAR *check_url = _T("https://www.march-hare.com/WEBTOOLS/CUSTOMER/Login.aspx"); + #ifndef PRODUCT_MOBILE_ENTERPRISE + #define PRODUCT_IOTUAPCOMMERCIAL 0x00000083 + #define PRODUCT_MOBILE_CORE 0x00000068 + #define PRODUCT_MOBILE_ENTERPRISE 0x00000085 + #endif + #ifndef PRODUCT_ULTIMATE /* If not using vista/2008 SDK, define them */ // It's truly amazing how many 'editions' of windows there are.. #define PRODUCT_UNDEFINED 0x00000000 *************** *** 762,768 **** DWORD dwSize; DWORD dwStatusCode; ! _sntprintf(extra,sizeof(extra)/sizeof(extra[0]),_T("?email=%s&password=%s&?ReturnUrl=%2fwebtools%2fcustomer%2fchkreg.aspx"),email,password); if(!HttpRequest(hInstall, hInternet, check_url, extra, lpBuf, dwSize, dwStatusCode)) { --- 768,774 ---- DWORD dwSize; DWORD dwStatusCode; ! _sntprintf(extra,sizeof(extra)/sizeof(extra[0]),_T("?email=%s&password=%s&?ReturnUrl=%%2fwebtools%%2fcustomer%%2fchkreg.aspx"),email,password); if(!HttpRequest(hInstall, hInternet, check_url, extra, lpBuf, dwSize, dwStatusCode)) { Index: windows-NT/installer/stdafx.h =================================================================== RCS file: /usr/local/cvs/cvsnt/windows-NT/installer/stdafx.h,v retrieving revision 1.3.8.1.2.1 diff -c -r1.3.8.1.2.1 stdafx.h *** windows-NT/installer/stdafx.h 15 Dec 2010 07:09:25 -0000 1.3.8.1.2.1 --- windows-NT/installer/stdafx.h 11 Aug 2024 11:38:14 -0000 *************** *** 8,15 **** --- 8,21 ---- #define WIN32_LEAN_AND_MEAN #define STRICT + #if _MSC_VER < 1930 #define WINVER 0x500 #define _WIN32_WINNT 0x500 + #else + // VS2022, then this is for Windows 10 and 11 only + #define WINVER 0x0A00 + #define _WIN32_WINNT 0x0A00 + #endif #define _CRT_SECURE_NO_WARNINGS #include #include Index: windows-NT/ntsetuid/stdafx.h =================================================================== RCS file: /usr/local/cvs/cvsnt/windows-NT/ntsetuid/stdafx.h,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 stdafx.h *** windows-NT/ntsetuid/stdafx.h 17 Dec 2010 02:36:25 -0000 1.1.2.1 --- windows-NT/ntsetuid/stdafx.h 11 Aug 2024 11:38:14 -0000 *************** *** 8,15 **** --- 8,21 ---- #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define STRICT + #if _MSC_VER < 1930 #define WINVER 0x0600 #define _WIN32_WINNT 0x600 + #else + // VS2022, then this is for Windows 10 and 11 only + #define WINVER 0x0A00 + #define _WIN32_WINNT 0x0A00 + #endif #include #define _CRT_SECURE_NO_DEPRECATE #define _CRT_SECURE_NO_WARNINGS Index: windows-NT/posixdir/setci/setci.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/windows-NT/posixdir/setci/setci.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 setci.vc170.vcxproj *** windows-NT/posixdir/setci/setci.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- windows-NT/posixdir/setci/setci.vc170.vcxproj 12 Aug 2024 02:04:51 -0000 *************** *** 111,117 **** ! {86c5205d-21bc-4cde-86be-7ac921d0c6a5} false --- 111,117 ---- ! {86c5205d-21bc-4cde-86be-7ac921d0c6a5} false Index: windows-NT/setuid/setuid/LsaSetuid.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/windows-NT/setuid/setuid/LsaSetuid.cpp,v retrieving revision 1.1.2.21.10.20 diff -c -r1.1.2.21.10.20 LsaSetuid.cpp *** windows-NT/setuid/setuid/LsaSetuid.cpp 18 Sep 2015 06:59:06 -0000 1.1.2.21.10.20 --- windows-NT/setuid/setuid/LsaSetuid.cpp 16 Aug 2024 03:24:40 -0000 *************** *** 420,426 **** g_trace_file=&g_trace_file_str[0]; SuidWriteTrace(L"LSA Handler \"setuid\" trace started."); ! SuidWriteTrace(L"Build version is %S","setuid "CVSNT_PRODUCTVERSION_STRING); DEBUG(L" SuidOpenTrace: trace started %s.",(g_trace_file_fp==NULL)?L"** fail **":L"OK"); if (g_trace_file_fp==NULL) ReportError(TRUE, _T("LSA Handler \"setuid\" ") CVSNT_PRODUCTVERSION_TSTRING _T(" trace failed to start.")); --- 420,426 ---- g_trace_file=&g_trace_file_str[0]; SuidWriteTrace(L"LSA Handler \"setuid\" trace started."); ! SuidWriteTrace(L"Build version is %S","setuid " CVSNT_PRODUCTVERSION_STRING); DEBUG(L" SuidOpenTrace: trace started %s.",(g_trace_file_fp==NULL)?L"** fail **":L"OK"); if (g_trace_file_fp==NULL) ReportError(TRUE, _T("LSA Handler \"setuid\" ") CVSNT_PRODUCTVERSION_TSTRING _T(" trace failed to start.")); Index: windows-NT/setuid/setuid/stdafx.h =================================================================== RCS file: /usr/local/cvs/cvsnt/windows-NT/setuid/setuid/stdafx.h,v retrieving revision 1.1.2.8.14.4 diff -c -r1.1.2.8.14.4 stdafx.h *** windows-NT/setuid/setuid/stdafx.h 21 Dec 2012 10:54:04 -0000 1.1.2.8.14.4 --- windows-NT/setuid/setuid/stdafx.h 11 Aug 2024 11:38:13 -0000 *************** *** 8,15 **** --- 8,22 ---- #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #define WIN32_NO_STATUS + #if _MSC_VER < 1930 + #define WINVER 0x0500 #define _WIN32_WINNT 0x0500 //#define _WIN32_WINNT 0x0400 + #else + // VS2022, then this is for Windows 10 and 11 only + #define WINVER 0x0A00 + #define _WIN32_WINNT 0x0A00 + #endif //ConvertSidToStringSidW fails to compile ... // I'm going to try a compile that uses 0x05000400 (WIN2KSP4) instead //#define _WIN32_WINNT 0x05000400 Index: xdiff/ext_xdiff.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/xdiff/ext_xdiff.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 ext_xdiff.vc170.vcxproj *** xdiff/ext_xdiff.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- xdiff/ext_xdiff.vc170.vcxproj 18 Aug 2024 04:07:13 -0000 *************** *** 45,57 **** .\Release\ ! .\Release\ false true .\Debug\ ! .\Debug\ true true --- 45,57 ---- .\Release\ ! .\Release\ext\ false true .\Debug\ ! .\Debug\ext\ true true *************** *** 173,179 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false --- 173,179 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false Index: xdiff/xml_xdiff.cpp =================================================================== RCS file: /usr/local/cvs/cvsnt/xdiff/xml_xdiff.cpp,v retrieving revision 1.1.2.15.4.1.4.3 diff -c -r1.1.2.15.4.1.4.3 xml_xdiff.cpp *** xdiff/xml_xdiff.cpp 22 Jun 2016 08:10:03 -0000 1.1.2.15.4.1.4.3 --- xdiff/xml_xdiff.cpp 18 Aug 2024 04:05:07 -0000 *************** *** 168,177 **** { compareTree(file1Root,file2Root,changed); for(size_t i=0; i >::iterator ptr = changed.begin(); ptr < changed.end(); ptr++) for(size_t i=0; i *thispair = &changed[i + 1]; ! std::vector >::iterator it = changed.begin(); ! it += (i + 1); ! // at this point thispair == it ! if (it._Ptr != thispair) ! { ! xdiff_print("did not find the iterator for this changed pair!\n"); ! return 1; ! } ! changed.erase(it); ! } else xdiff_print("%s",getPath(changed[i].first,changed[i].second?"- ":"+ ")); } Index: xdiff/xml_xdiff.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/xdiff/xml_xdiff.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 xml_xdiff.vc170.vcxproj *** xdiff/xml_xdiff.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- xdiff/xml_xdiff.vc170.vcxproj 18 Aug 2024 04:07:13 -0000 *************** *** 46,58 **** .\Release\ ! .\Release\ false true .\Debug\ ! .\Debug\ true true --- 46,58 ---- .\Release\ ! .\Release\xml\ false true .\Debug\ ! .\Debug\xml\ true true *************** *** 174,188 **** ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5cd43033-b004-4886-8e4d-3a622a7ad677} false ! {2b05202e-5dd0-4543-99b9-188a23e8139d} false --- 174,188 ---- ! {bcf71d75-2c0f-4b0f-967e-20d2ee52ab08} false ! {5cd43033-b004-4886-8e4d-3a622a7ad677} false ! {2b05202e-5dd0-4543-99b9-188a23e8139d} false Index: zlib/gzio.c =================================================================== RCS file: /usr/local/cvs/cvsnt/zlib/gzio.c,v retrieving revision 1.13.2.2.6.1 diff -c -r1.13.2.2.6.1 gzio.c *** zlib/gzio.c 3 May 2022 11:52:34 -0000 1.13.2.2.6.1 --- zlib/gzio.c 11 Aug 2024 12:21:29 -0000 *************** *** 600,606 **** --- 600,608 ---- #ifdef STDC #include + #if defined _WINDOWS && !defined __WINE__ && _MSC_VER < 1900 /* 1900 == VS2015 has real snprintf */ #define vsnprintf _vsnprintf + #endif int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...) Index: zlib/win32/zlib.vc170.vcxproj =================================================================== RCS file: /usr/local/cvs/cvsnt/zlib/win32/zlib.vc170.vcxproj,v retrieving revision 1.1.2.1 diff -c -r1.1.2.1 zlib.vc170.vcxproj *** zlib/win32/zlib.vc170.vcxproj 10 Aug 2024 00:35:49 -0000 1.1.2.1 --- zlib/win32/zlib.vc170.vcxproj 12 Aug 2024 02:04:52 -0000 *************** *** 71,77 **** .\Debug/zlib.pch $(IntDir) $(IntDir) ! $(IntDir) Level3 true EditAndContinue --- 71,77 ---- .\Debug/zlib.pch $(IntDir) $(IntDir) ! $(IntDir)$(TargetName).pdb Level3 true EditAndContinue