From 2697f3bf43df6e6fea0725926785e96a80bd4080 Mon Sep 17 00:00:00 2001 From: MMS Date: Mon, 29 Mar 2021 10:20:42 -0400 Subject: [PATCH] 6.9.2b Augmented QP/C ports to Win32 by adding QSpy64/x64 build configurations --- examples/workstation/dpp/dpp.sln | 29 +++- examples/workstation/dpp/dpp.vcxproj | 203 +++++++++++++++++++++++++ ports/win32-qutest/qp.sln | 16 +- ports/win32-qutest/qp.vcxproj | 108 ++++++++++++++ ports/win32-qutest/qutest_port.c | 6 +- ports/win32-qv/qp.sln | 31 +++- ports/win32-qv/qp.vcxproj | 203 +++++++++++++++++++++++++ ports/win32-qv/qs_port.c | 18 +-- ports/win32/qp.sln | 31 +++- ports/win32/qp.vcxproj | 212 ++++++++++++++++++++++++++- ports/win32/qp.vcxproj.filters | 21 --- ports/win32/qs_port.c | 18 +-- 12 files changed, 826 insertions(+), 70 deletions(-) diff --git a/examples/workstation/dpp/dpp.sln b/examples/workstation/dpp/dpp.sln index 845e32cf4..f58180526 100644 --- a/examples/workstation/dpp/dpp.sln +++ b/examples/workstation/dpp/dpp.sln @@ -1,25 +1,42 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2013 for Windows Desktop -VisualStudioVersion = 12.0.21005.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30804.86 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dpp", "dpp.vcxproj", "{8CC465F7-872E-4D03-B93C-1B64858B4E11}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 + Debug|x64 = Debug|x64 QSpy|Win32 = QSpy|Win32 + QSpy|x64 = QSpy|x64 + QSpy64|Win32 = QSpy64|Win32 + QSpy64|x64 = QSpy64|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {8CC465F7-872E-4D03-B93C-1B64858B4E11}.Debug|Win32.ActiveCfg = Debug|Win32 {8CC465F7-872E-4D03-B93C-1B64858B4E11}.Debug|Win32.Build.0 = Debug|Win32 - {8CC465F7-872E-4D03-B93C-1B64858B4E11}.Release|Win32.ActiveCfg = Release|Win32 - {8CC465F7-872E-4D03-B93C-1B64858B4E11}.Release|Win32.Build.0 = Release|Win32 + {8CC465F7-872E-4D03-B93C-1B64858B4E11}.Debug|x64.ActiveCfg = Debug|x64 + {8CC465F7-872E-4D03-B93C-1B64858B4E11}.Debug|x64.Build.0 = Debug|x64 {8CC465F7-872E-4D03-B93C-1B64858B4E11}.QSpy|Win32.ActiveCfg = QSpy|Win32 {8CC465F7-872E-4D03-B93C-1B64858B4E11}.QSpy|Win32.Build.0 = QSpy|Win32 + {8CC465F7-872E-4D03-B93C-1B64858B4E11}.QSpy|x64.ActiveCfg = QSpy|x64 + {8CC465F7-872E-4D03-B93C-1B64858B4E11}.QSpy|x64.Build.0 = QSpy|x64 + {8CC465F7-872E-4D03-B93C-1B64858B4E11}.QSpy64|Win32.ActiveCfg = QSpy64|Win32 + {8CC465F7-872E-4D03-B93C-1B64858B4E11}.QSpy64|Win32.Build.0 = QSpy64|Win32 + {8CC465F7-872E-4D03-B93C-1B64858B4E11}.QSpy64|x64.ActiveCfg = QSpy64|x64 + {8CC465F7-872E-4D03-B93C-1B64858B4E11}.QSpy64|x64.Build.0 = QSpy64|x64 + {8CC465F7-872E-4D03-B93C-1B64858B4E11}.Release|Win32.ActiveCfg = Release|Win32 + {8CC465F7-872E-4D03-B93C-1B64858B4E11}.Release|Win32.Build.0 = Release|Win32 + {8CC465F7-872E-4D03-B93C-1B64858B4E11}.Release|x64.ActiveCfg = Release|x64 + {8CC465F7-872E-4D03-B93C-1B64858B4E11}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {81C44522-3086-4233-AE6E-002359F230DE} + EndGlobalSection EndGlobal diff --git a/examples/workstation/dpp/dpp.vcxproj b/examples/workstation/dpp/dpp.vcxproj index 2032f831d..578ed4039 100644 --- a/examples/workstation/dpp/dpp.vcxproj +++ b/examples/workstation/dpp/dpp.vcxproj @@ -5,6 +5,22 @@ Debug Win32 + + Debug + x64 + + + QSpy64 + Win32 + + + QSpy64 + x64 + + + QSpy + x64 + Release Win32 @@ -13,6 +29,10 @@ QSpy Win32 + + Release + x64 + {8CC465F7-872E-4D03-B93C-1B64858B4E11} @@ -26,41 +46,93 @@ NotSet v142 + + Application + NotSet + v142 + + + Application + NotSet + v142 + + + Application + NotSet + v142 + Application NotSet true v142 + + Application + NotSet + true + v142 + Application NotSet v142 + + Application + NotSet + v142 + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)$(Configuration)\ $(Configuration)\ true + true $(SolutionDir)$(Configuration)\ $(Configuration)\ false + false $(SolutionDir)$(Configuration)\ + QSpy64\ $(Configuration)\ + QSpy64\ true + true + true + true + + + QSpy64\ + QSpy64\ @@ -89,6 +161,32 @@ cmd /c "del $(OutDir)qstamp.obj" + + + Disabled + .;../../../include;../../../ports/win32-qv;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + false + + + Default + MultiThreaded + NotUsing + Level4 + ProgramDatabase + 4127 + Default + + + qp.lib;%(AdditionalDependencies) + ../../../ports/win32-qv/$(Configuration);%(AdditionalLibraryDirectories) + true + Console + + + cmd /c "del $(OutDir)qstamp.obj" + + MaxSpeed @@ -119,6 +217,35 @@ cmd /c "del $(OutDir)qstamp.obj" + + + MaxSpeed + true + .;../../../include;../../../ports/win32-qv;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions) + false + + + Default + MultiThreaded + true + NotUsing + Level4 + ProgramDatabase + 4127 + + + qp.lib;%(AdditionalDependencies) + ../../../ports/win32-qv/$(Configuration);%(AdditionalLibraryDirectories) + true + Console + true + true + + + cmd /c "del $(OutDir)qstamp.obj" + + Disabled @@ -145,6 +272,82 @@ cmd /c "del $(OutDir)qstamp.obj" + + + Disabled + .;../../../include;../../../ports/win32-qv;$(QTOOLS)/qspy/include;%(AdditionalIncludeDirectories) + Q_SPY;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + + + Default + MultiThreaded + NotUsing + Level4 + ProgramDatabase + 4127 + + + qp.lib;ws2_32.lib;%(AdditionalDependencies) + ../../../ports/win32-qv/$(Configuration);%(AdditionalLibraryDirectories) + true + Console + + + cmd /c "del $(OutDir)qstamp.obj" + + + + + Disabled + .;../../../include;../../../ports/win32-qv;$(QTOOLS)/qspy/include;%(AdditionalIncludeDirectories) + Q_SPY;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + + + Default + MultiThreaded + NotUsing + Level4 + ProgramDatabase + 4127 + + + qp.lib;ws2_32.lib;%(AdditionalDependencies) + ../../../ports/win32-qv/$(Configuration);%(AdditionalLibraryDirectories) + true + Console + MachineX86 + + + cmd /c "del $(OutDir)qstamp.obj" + + + + + Disabled + .;../../../include;../../../ports/win32-qv;$(QTOOLS)/qspy/include;%(AdditionalIncludeDirectories) + Q_SPY;WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + false + + + Default + MultiThreaded + NotUsing + Level4 + ProgramDatabase + 4127 + + + qp.lib;ws2_32.lib;%(AdditionalDependencies) + ../../../ports/win32-qv/$(Configuration);%(AdditionalLibraryDirectories) + true + Console + + + cmd /c "del $(OutDir)qstamp.obj" + + diff --git a/ports/win32-qutest/qp.sln b/ports/win32-qutest/qp.sln index 098e6a706..7720f89a2 100644 --- a/ports/win32-qutest/qp.sln +++ b/ports/win32-qutest/qp.sln @@ -1,18 +1,30 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30804.86 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qp", "qp.vcxproj", "{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + vc64|Win32 = vc64|Win32 + vc64|x64 = vc64|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Debug|Win32.ActiveCfg = vc|Win32 {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Debug|Win32.Build.0 = vc|Win32 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Debug|x64.ActiveCfg = vc|x64 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Debug|x64.Build.0 = vc|x64 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.vc64|Win32.ActiveCfg = vc64|Win32 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.vc64|Win32.Build.0 = vc64|Win32 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.vc64|x64.ActiveCfg = vc64|x64 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.vc64|x64.Build.0 = vc64|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C6427684-BAD9-48AF-A46A-5EAD5C053A5D} + EndGlobalSection EndGlobal diff --git a/ports/win32-qutest/qp.vcxproj b/ports/win32-qutest/qp.vcxproj index c3f3eef1c..8c587c91c 100644 --- a/ports/win32-qutest/qp.vcxproj +++ b/ports/win32-qutest/qp.vcxproj @@ -1,10 +1,22 @@  + + vc64 + Win32 + + + vc64 + x64 + vc Win32 + + vc + x64 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9} @@ -19,18 +31,54 @@ false v142 + + StaticLibrary + NotSet + false + v142 + + + StaticLibrary + NotSet + false + v142 + + + StaticLibrary + NotSet + false + v142 + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)$(Configuration)\ + $(SolutionDir)$(Configuration)\ $(Configuration)\ + $(Configuration)\ false + false + false + false + + + $(SolutionDir)$(Configuration)\ + $(Configuration)\ @@ -51,6 +99,63 @@ del $(IntDir)*.obj $(IntDir)*.tlog $(IntDir)*.lastbuildstate + + + Disabled + .;../../include;../../src;%(AdditionalIncludeDirectories) + Q_SPY; Q_UTEST;Q_HOST;_DEBUG;%(PreprocessorDefinitions) + + + MultiThreaded + NotUsing + Level4 + ProgramDatabase + Default + 4127;%(DisableSpecificWarnings) + + + Cleanup + del $(IntDir)*.obj $(IntDir)*.tlog $(IntDir)*.lastbuildstate + + + + + Disabled + .;../../include;../../src;%(AdditionalIncludeDirectories) + Q_SPY; Q_UTEST;Q_HOST;_DEBUG;%(PreprocessorDefinitions) + + + MultiThreaded + NotUsing + Level4 + ProgramDatabase + Default + 4127;%(DisableSpecificWarnings) + + + Cleanup + del $(IntDir)*.obj $(IntDir)*.tlog $(IntDir)*.lastbuildstate + + + + + Disabled + .;../../include;../../src;%(AdditionalIncludeDirectories) + Q_SPY; Q_UTEST;Q_HOST;_DEBUG;%(PreprocessorDefinitions) + + + MultiThreaded + NotUsing + Level4 + ProgramDatabase + Default + 4127;%(DisableSpecificWarnings) + + + Cleanup + del $(IntDir)*.obj $(IntDir)*.tlog $(IntDir)*.lastbuildstate + + true @@ -68,6 +173,9 @@ true + true + true + true diff --git a/ports/win32-qutest/qutest_port.c b/ports/win32-qutest/qutest_port.c index e5fc9c836..643d65805 100644 --- a/ports/win32-qutest/qutest_port.c +++ b/ports/win32-qutest/qutest_port.c @@ -4,8 +4,8 @@ * @ingroup ports * @cond ****************************************************************************** -* Last updated for version 6.9.2 -* Last updated on 2021-01-14 +* Last updated for version 6.9.3 +* Last updated on 2021-03-16 * * Q u a n t u m L e a P s * ------------------------ @@ -136,7 +136,7 @@ uint8_t QS_onStartup(void const *arg) { for (rp = result; rp != NULL; rp = rp->ai_next) { l_sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); if (l_sock != INVALID_SOCKET) { - if (connect(l_sock, rp->ai_addr, rp->ai_addrlen) + if (connect(l_sock, rp->ai_addr, (int)rp->ai_addrlen) == SOCKET_ERROR) { closesocket(l_sock); diff --git a/ports/win32-qv/qp.sln b/ports/win32-qv/qp.sln index f07f9a58e..e7b22a569 100644 --- a/ports/win32-qv/qp.sln +++ b/ports/win32-qv/qp.sln @@ -1,23 +1,42 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30804.86 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qp", "qp.vcxproj", "{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 + Debug|x64 = Debug|x64 QSpy|Win32 = QSpy|Win32 + QSpy|x64 = QSpy|x64 + QSpy64|Win32 = QSpy64|Win32 + QSpy64|x64 = QSpy64|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Debug|Win32.ActiveCfg = Debug|Win32 {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Debug|Win32.Build.0 = Debug|Win32 - {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Release|Win32.ActiveCfg = Release|Win32 - {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Release|Win32.Build.0 = Release|Win32 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Debug|x64.ActiveCfg = Debug|x64 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Debug|x64.Build.0 = Debug|x64 {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.QSpy|Win32.ActiveCfg = QSpy|Win32 {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.QSpy|Win32.Build.0 = QSpy|Win32 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.QSpy|x64.ActiveCfg = QSpy|x64 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.QSpy|x64.Build.0 = QSpy|x64 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.QSpy64|Win32.ActiveCfg = QSpy64|Win32 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.QSpy64|Win32.Build.0 = QSpy64|Win32 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.QSpy64|x64.ActiveCfg = QSpy64|x64 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.QSpy64|x64.Build.0 = QSpy64|x64 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Release|Win32.ActiveCfg = Release|Win32 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Release|Win32.Build.0 = Release|Win32 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Release|x64.ActiveCfg = Release|x64 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {26B33241-845D-43F5-BCB4-456C2AB98376} + EndGlobalSection EndGlobal diff --git a/ports/win32-qv/qp.vcxproj b/ports/win32-qv/qp.vcxproj index be715c433..b243eccaf 100644 --- a/ports/win32-qv/qp.vcxproj +++ b/ports/win32-qv/qp.vcxproj @@ -5,6 +5,22 @@ Debug Win32 + + Debug + x64 + + + QSpy64 + Win32 + + + QSpy64 + x64 + + + QSpy + x64 + Release Win32 @@ -13,6 +29,10 @@ QSpy Win32 + + Release + x64 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9} @@ -27,6 +47,24 @@ false v142 + + StaticLibrary + NotSet + false + v142 + + + StaticLibrary + NotSet + false + v142 + + + StaticLibrary + NotSet + false + v142 + StaticLibrary NotSet @@ -34,36 +72,75 @@ true v142 + + StaticLibrary + NotSet + false + true + v142 + StaticLibrary NotSet false v142 + + StaticLibrary + NotSet + false + v142 + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)$(Configuration)\ $(Configuration)\ false + false $(SolutionDir)$(Configuration)\ $(Configuration)\ false + false $(SolutionDir)$(Configuration)\ + QSpy64\ $(Configuration)\ + QSpy64\ false + false + false + false + + + QSpy64\ + QSpy64\ @@ -84,6 +161,25 @@ del $(IntDir)*.obj $(IntDir)*.tlog $(IntDir)*.lastbuildstate + + + Disabled + .;../../include;../../src;%(AdditionalIncludeDirectories) + QWIN_GUI;_DEBUG;%(PreprocessorDefinitions) + + + MultiThreaded + NotUsing + Level4 + ProgramDatabase + Default + 4127;%(DisableSpecificWarnings) + + + Cleanup + del $(IntDir)*.obj $(IntDir)*.tlog $(IntDir)*.lastbuildstate + + Full @@ -105,6 +201,27 @@ del $(IntDir)*.obj $(IntDir)*.tlog $(IntDir)*.lastbuildstate + + + Full + .;../../include;../../src;%(AdditionalIncludeDirectories) + QWIN_GUI;NDEBUG;%(PreprocessorDefinitions) + + + MultiThreaded + NotUsing + Level4 + + + Default + 4127;%(DisableSpecificWarnings) + false + + + Cleanup + del $(IntDir)*.obj $(IntDir)*.tlog $(IntDir)*.lastbuildstate + + Disabled @@ -124,6 +241,63 @@ del $(IntDir)*.obj $(IntDir)*.tlog $(IntDir)*.lastbuildstate + + + Disabled + .;../../include;../../src;%(AdditionalIncludeDirectories) + Q_SPY;QWIN_GUI;_DEBUG;%(PreprocessorDefinitions) + + + MultiThreaded + NotUsing + Level4 + ProgramDatabase + Default + 4127;%(DisableSpecificWarnings) + + + Cleanup + del $(IntDir)*.obj $(IntDir)*.tlog $(IntDir)*.lastbuildstate + + + + + Disabled + .;../../include;../../src;%(AdditionalIncludeDirectories) + Q_SPY;QWIN_GUI;_DEBUG;%(PreprocessorDefinitions) + + + MultiThreaded + NotUsing + Level4 + ProgramDatabase + Default + 4127;%(DisableSpecificWarnings) + + + Cleanup + del $(IntDir)*.obj $(IntDir)*.tlog $(IntDir)*.lastbuildstate + + + + + Disabled + .;../../include;../../src;%(AdditionalIncludeDirectories) + Q_SPY;QWIN_GUI;_DEBUG;%(PreprocessorDefinitions) + + + MultiThreaded + NotUsing + Level4 + ProgramDatabase + Default + 4127;%(DisableSpecificWarnings) + + + Cleanup + del $(IntDir)*.obj $(IntDir)*.tlog $(IntDir)*.lastbuildstate + + true @@ -141,7 +315,9 @@ true + true true + true @@ -159,33 +335,60 @@ true + true false + false + false + false true + true true + true false + false + false + false true + true true + true false + false + false + false true + true true + true false + false + false + false true + true true + true true + true + true + true true + true true + true true + true diff --git a/ports/win32-qv/qs_port.c b/ports/win32-qv/qs_port.c index 060a2bae0..69a91c4dd 100644 --- a/ports/win32-qv/qs_port.c +++ b/ports/win32-qv/qs_port.c @@ -4,8 +4,8 @@ * @ingroup ports * @cond ****************************************************************************** -* Last updated for version 6.9.2 -* Last updated on 2021-01-14 +* Last updated for version 6.9.3 +* Last updated on 2021-03-16 * * Q u a n t u m L e a P s * ------------------------ @@ -80,7 +80,7 @@ uint8_t QS_onStartup(void const *arg) { static uint8_t qsBuf[QS_TX_SIZE]; /* buffer for QS-TX channel */ static uint8_t qsRxBuf[QS_RX_SIZE]; /* buffer for QS-RX channel */ char hostName[128]; - char const *serviceName = "6601"; /* default QSPY server port */ + char const *serviceName = "6601"; /* default QSPY server port */ char const *src; char *dst; int status; @@ -136,7 +136,7 @@ uint8_t QS_onStartup(void const *arg) { for (rp = result; rp != NULL; rp = rp->ai_next) { l_sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); if (l_sock != INVALID_SOCKET) { - if (connect(l_sock, rp->ai_addr, rp->ai_addrlen) + if (connect(l_sock, rp->ai_addr, (int)rp->ai_addrlen) == SOCKET_ERROR) { closesocket(l_sock); @@ -159,8 +159,8 @@ uint8_t QS_onStartup(void const *arg) { /* set the socket to non-blocking mode */ ioctl_opt = 1; if (ioctlsocket(l_sock, FIONBIO, &ioctl_opt) != NO_ERROR) { - FPRINTF_S(stderr, " ERROR Failed to set non-blocking socket " - "WASErr=%d\n", WSAGetLastError()); + FPRINTF_S(stderr, " ERROR %s WASErr=%d\n,", + "Failed to set non-blocking socket", WSAGetLastError()); goto error; } @@ -219,8 +219,8 @@ void QS_onFlush(void) { Sleep(QS_TIMEOUT_MS); } else { /* some other socket error... */ - FPRINTF_S(stderr, " ERROR sending data over TCP," - "WASErr=%d\n", err); + FPRINTF_S(stderr, " ERROR %s WASErr=%d\n", + "sending data over TCP", err); return; } } @@ -231,7 +231,7 @@ void QS_onFlush(void) { nBytes -= (uint16_t)nSent; } else { - break; + break; /* break out of the for-ever loop */ } } /* set nBytes for the next call to QS_getBlock() */ diff --git a/ports/win32/qp.sln b/ports/win32/qp.sln index f07f9a58e..e7b22a569 100644 --- a/ports/win32/qp.sln +++ b/ports/win32/qp.sln @@ -1,23 +1,42 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual C++ Express 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30804.86 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qp", "qp.vcxproj", "{3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 + Debug|x64 = Debug|x64 QSpy|Win32 = QSpy|Win32 + QSpy|x64 = QSpy|x64 + QSpy64|Win32 = QSpy64|Win32 + QSpy64|x64 = QSpy64|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Debug|Win32.ActiveCfg = Debug|Win32 {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Debug|Win32.Build.0 = Debug|Win32 - {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Release|Win32.ActiveCfg = Release|Win32 - {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Release|Win32.Build.0 = Release|Win32 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Debug|x64.ActiveCfg = Debug|x64 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Debug|x64.Build.0 = Debug|x64 {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.QSpy|Win32.ActiveCfg = QSpy|Win32 {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.QSpy|Win32.Build.0 = QSpy|Win32 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.QSpy|x64.ActiveCfg = QSpy|x64 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.QSpy|x64.Build.0 = QSpy|x64 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.QSpy64|Win32.ActiveCfg = QSpy64|Win32 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.QSpy64|Win32.Build.0 = QSpy64|Win32 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.QSpy64|x64.ActiveCfg = QSpy64|x64 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.QSpy64|x64.Build.0 = QSpy64|x64 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Release|Win32.ActiveCfg = Release|Win32 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Release|Win32.Build.0 = Release|Win32 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Release|x64.ActiveCfg = Release|x64 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {26B33241-845D-43F5-BCB4-456C2AB98376} + EndGlobalSection EndGlobal diff --git a/ports/win32/qp.vcxproj b/ports/win32/qp.vcxproj index 0f1a42b55..b243eccaf 100644 --- a/ports/win32/qp.vcxproj +++ b/ports/win32/qp.vcxproj @@ -5,6 +5,22 @@ Debug Win32 + + Debug + x64 + + + QSpy64 + Win32 + + + QSpy64 + x64 + + + QSpy + x64 + Release Win32 @@ -13,6 +29,10 @@ QSpy Win32 + + Release + x64 + {3E9F0C4A-01B7-4357-95C6-0FE86BACB6D9} @@ -27,6 +47,24 @@ false v142 + + StaticLibrary + NotSet + false + v142 + + + StaticLibrary + NotSet + false + v142 + + + StaticLibrary + NotSet + false + v142 + StaticLibrary NotSet @@ -34,36 +72,75 @@ true v142 + + StaticLibrary + NotSet + false + true + v142 + StaticLibrary NotSet false v142 + + StaticLibrary + NotSet + false + v142 + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 $(SolutionDir)$(Configuration)\ $(Configuration)\ false + false $(SolutionDir)$(Configuration)\ $(Configuration)\ false + false $(SolutionDir)$(Configuration)\ + QSpy64\ $(Configuration)\ + QSpy64\ false + false + false + false + + + QSpy64\ + QSpy64\ @@ -84,6 +161,25 @@ del $(IntDir)*.obj $(IntDir)*.tlog $(IntDir)*.lastbuildstate + + + Disabled + .;../../include;../../src;%(AdditionalIncludeDirectories) + QWIN_GUI;_DEBUG;%(PreprocessorDefinitions) + + + MultiThreaded + NotUsing + Level4 + ProgramDatabase + Default + 4127;%(DisableSpecificWarnings) + + + Cleanup + del $(IntDir)*.obj $(IntDir)*.tlog $(IntDir)*.lastbuildstate + + Full @@ -105,6 +201,27 @@ del $(IntDir)*.obj $(IntDir)*.tlog $(IntDir)*.lastbuildstate + + + Full + .;../../include;../../src;%(AdditionalIncludeDirectories) + QWIN_GUI;NDEBUG;%(PreprocessorDefinitions) + + + MultiThreaded + NotUsing + Level4 + + + Default + 4127;%(DisableSpecificWarnings) + false + + + Cleanup + del $(IntDir)*.obj $(IntDir)*.tlog $(IntDir)*.lastbuildstate + + Disabled @@ -124,6 +241,63 @@ del $(IntDir)*.obj $(IntDir)*.tlog $(IntDir)*.lastbuildstate + + + Disabled + .;../../include;../../src;%(AdditionalIncludeDirectories) + Q_SPY;QWIN_GUI;_DEBUG;%(PreprocessorDefinitions) + + + MultiThreaded + NotUsing + Level4 + ProgramDatabase + Default + 4127;%(DisableSpecificWarnings) + + + Cleanup + del $(IntDir)*.obj $(IntDir)*.tlog $(IntDir)*.lastbuildstate + + + + + Disabled + .;../../include;../../src;%(AdditionalIncludeDirectories) + Q_SPY;QWIN_GUI;_DEBUG;%(PreprocessorDefinitions) + + + MultiThreaded + NotUsing + Level4 + ProgramDatabase + Default + 4127;%(DisableSpecificWarnings) + + + Cleanup + del $(IntDir)*.obj $(IntDir)*.tlog $(IntDir)*.lastbuildstate + + + + + Disabled + .;../../include;../../src;%(AdditionalIncludeDirectories) + Q_SPY;QWIN_GUI;_DEBUG;%(PreprocessorDefinitions) + + + MultiThreaded + NotUsing + Level4 + ProgramDatabase + Default + 4127;%(DisableSpecificWarnings) + + + Cleanup + del $(IntDir)*.obj $(IntDir)*.tlog $(IntDir)*.lastbuildstate + + true @@ -141,7 +315,9 @@ true + true true + true @@ -159,44 +335,64 @@ true + true false + false + false + false true + true true + true false + false + false + false true + true true + true false + false + false + false true + true true + true false + false + false + false true + true true + true true + true + true + true true + true - true true + true + true + true - - - - - - - diff --git a/ports/win32/qp.vcxproj.filters b/ports/win32/qp.vcxproj.filters index 37fddc033..3dfce37da 100644 --- a/ports/win32/qp.vcxproj.filters +++ b/ports/win32/qp.vcxproj.filters @@ -86,26 +86,5 @@ QWIN-GUI - - QP - - - QP - - - QP - - - QP - - - QP - - - QP - - - QP - \ No newline at end of file diff --git a/ports/win32/qs_port.c b/ports/win32/qs_port.c index 060a2bae0..69a91c4dd 100644 --- a/ports/win32/qs_port.c +++ b/ports/win32/qs_port.c @@ -4,8 +4,8 @@ * @ingroup ports * @cond ****************************************************************************** -* Last updated for version 6.9.2 -* Last updated on 2021-01-14 +* Last updated for version 6.9.3 +* Last updated on 2021-03-16 * * Q u a n t u m L e a P s * ------------------------ @@ -80,7 +80,7 @@ uint8_t QS_onStartup(void const *arg) { static uint8_t qsBuf[QS_TX_SIZE]; /* buffer for QS-TX channel */ static uint8_t qsRxBuf[QS_RX_SIZE]; /* buffer for QS-RX channel */ char hostName[128]; - char const *serviceName = "6601"; /* default QSPY server port */ + char const *serviceName = "6601"; /* default QSPY server port */ char const *src; char *dst; int status; @@ -136,7 +136,7 @@ uint8_t QS_onStartup(void const *arg) { for (rp = result; rp != NULL; rp = rp->ai_next) { l_sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); if (l_sock != INVALID_SOCKET) { - if (connect(l_sock, rp->ai_addr, rp->ai_addrlen) + if (connect(l_sock, rp->ai_addr, (int)rp->ai_addrlen) == SOCKET_ERROR) { closesocket(l_sock); @@ -159,8 +159,8 @@ uint8_t QS_onStartup(void const *arg) { /* set the socket to non-blocking mode */ ioctl_opt = 1; if (ioctlsocket(l_sock, FIONBIO, &ioctl_opt) != NO_ERROR) { - FPRINTF_S(stderr, " ERROR Failed to set non-blocking socket " - "WASErr=%d\n", WSAGetLastError()); + FPRINTF_S(stderr, " ERROR %s WASErr=%d\n,", + "Failed to set non-blocking socket", WSAGetLastError()); goto error; } @@ -219,8 +219,8 @@ void QS_onFlush(void) { Sleep(QS_TIMEOUT_MS); } else { /* some other socket error... */ - FPRINTF_S(stderr, " ERROR sending data over TCP," - "WASErr=%d\n", err); + FPRINTF_S(stderr, " ERROR %s WASErr=%d\n", + "sending data over TCP", err); return; } } @@ -231,7 +231,7 @@ void QS_onFlush(void) { nBytes -= (uint16_t)nSent; } else { - break; + break; /* break out of the for-ever loop */ } } /* set nBytes for the next call to QS_getBlock() */