Merge Benjamin's fix for FFB Block Index and updated version to 2.2.0.0

.gitignore

@@ -15,8 +15,6 @@
 *.suo
 *.user
 
-/apps/vJoyFeeder/vJoyFeeder01.vcxproj
-
 # Folders
 win32/
 x64/
@@ -56,7 +54,6 @@ apps/common/vJoyInterfaceCS/vJoyInterfaceWrap/obj/Debug_CPP/build.force
 apps/common/vJoyInterfaceCS/WrapperTest/obj/
 apps/common/vJoyInterfaceCS/vJoyInterfaceWrap/bin/
 apps/common/vJoyInterfaceCS/vJoyInterfaceWrap/obj/
-Release_STAT/
 apps/common/vJoyInterfaceStat/bldInterface.bat
 apps/common/vJoyInterfaceStat/makefile
 apps/common/vJoyInterfaceStat/makefile.inc
@@ -74,9 +71,11 @@ apps/common/vJoyInterfaceStat/gen-versioninfo.h
 driver/sys/gen-versioninfo.h
 apps/vJoyInstall/CmdLine/gen-versioninfo.h
 driver/Package/gen-versioninfo.h
+driver/sys/vJoy.vcxproj.user
 SDK/ReadMe-2.1.5.odt
 apps/vJoyList/gen-versioninfo.h
 SDK.zip
 SDK/ReadMe.pdf
 SDK/c#/ReadMe.pdf
 apps/vJoyConf/vJoyConf.aps
+/apps/vJoyList/vJoyList.aps

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "extern/pybind11"]
+	path = extern/pybind11
+	url = ../../pybind/pybind11
+	branch = stable

BuildAll.bat

@@ -1,38 +1,44 @@
 echo off
-SET VS=14.0
-SET BUILDER=%ProgramFiles(x86)%\MSBuild\%VS%\Bin\MSBuild.exe
-SET Target64=x64\Release
-SET Target32=Win32\Release
-SET DigiCertUtil=%USERPROFILE%\DESKTOP\DigiCertUtil.exe
-SET InnoCompiler=%ProgramFiles(x86)%\Inno Setup 5\ISCC.exe
 
+SET BuildMode=Release
+REM SET BuildMode=Debug
+
+SET VS=2022\Community
+SET BUILDER=%ProgramFiles%\Microsoft Visual Studio\%VS%\MSBuild\Current\Bin\MSBuild.exe
+SET Target64=x64\%BuildMode%
+SET Target32=Win32\%BuildMode%
+SET DigiCertUtil=DigiCertUtil.exe
+SET InnoCompiler=%ProgramFiles(x86)%\Inno Setup 6\ISCC.exe
+
+REM Skip x86 for Windows 10 and above
+goto build64
 
 :build32
 echo %DATE% %TIME%: Cleaning vJoy (x86) 
-"%BUILDER%"  vjoy.sln  /maxcpucount:1 /t:clean /p:Platform=Win32;Configuration=Release
+"%BUILDER%" vJoyAll.sln  /maxcpucount:1 /t:clean /p:Platform=Win32;Configuration=%BuildMode%
 set BUILD_STATUS=%ERRORLEVEL%
 if not %BUILD_STATUS%==0 goto fail
 
 echo %DATE% %TIME%: Building vJoy (x86)
-"%BUILDER%"  vjoy.sln  /maxcpucount:4  /p:Platform=Win32;Configuration=Release
+"%BUILDER%" vJoyAll.sln  /maxcpucount:4  /p:Platform=Win32;Configuration=%BuildMode%
 set BUILD_STATUS=%ERRORLEVEL%
 if not %BUILD_STATUS%==0 goto fail
 
 :build64
 echo %DATE% %TIME%: Cleaning vJoy (x64)
-"%BUILDER%"  vjoy.sln  /maxcpucount:1 /t:clean /p:Platform=x64;Configuration=Release
+"%BUILDER%" vJoyAll.sln  /maxcpucount:1 /t:clean /p:Platform=x64;Configuration=%BuildMode%
 set BUILD_STATUS=%ERRORLEVEL%
 if not %BUILD_STATUS%==0 goto fail
 
 echo %DATE% %TIME%: Building vJoy (x64)
-"%BUILDER%"  vjoy.sln  /maxcpucount:4  /p:Platform=x64;Configuration=Release
+"%BUILDER%" vJoyAll.sln  /maxcpucount:4  /p:Platform=x64;Configuration=%BuildMode%
 set BUILD_STATUS=%ERRORLEVEL%
 if not %BUILD_STATUS%==0 goto fail
 
 :signapps
 echo %DATE% %TIME%: Signing the applications
 IF NOT EXIST %DigiCertUtil% GOTO NOUTIL
-%DigiCertUtil% sign /sha1 "6d 54 71 df 6b bf af a5 d5 90 0c 88 c0 8d f0 e9 c5 13 69 0a" /noInput .\%Target64%\vJoyList.exe*.\%Target32%\vJoyList.exe*.\%Target64%\vJoyConf.exe*.\%Target32%\vJoyConf.exe*.\%Target64%\vJoyFeeder.exe*.\%Target32%\vJoyFeeder.exe
+%DigiCertUtil% sign /sha1 "6b 05 e5 cc 0d b8 8a 0d 89 62 48 2e cb 9c d9 59 e1 b0 57 90" /noInput .\%Target64%\vJoyList.exe*.\%Target32%\vJoyList.exe*.\%Target64%\vJoyConf.exe*.\%Target32%\vJoyConf.exe*.\%Target64%\vJoyFeeder.exe*.\%Target32%\vJoyFeeder.exe
 set SIGN_STATUS=%ERRORLEVEL%
 if not %SIGN_STATUS%==0 goto fail
 echo %DATE% %TIME%: Signing the applications - OK

CodingStyleCPP.vssettings

@@ -0,0 +1 @@
+<UserSettings><ApplicationIdentity version="16.0"/><ToolsOptions><ToolsOptionsCategory name="TextEditor" RegisteredName="TextEditor"><ToolsOptionsSubCategory name="C/C++" RegisteredName="C/C++" PackageName="Text Management Package"><PropertyValue name="TabSize">4</PropertyValue><PropertyValue name="ShowChanges">true</PropertyValue><PropertyValue name="AutoListMembers">true</PropertyValue><PropertyValue name="ShowPreview">true</PropertyValue><PropertyValue name="ShowMarks">true</PropertyValue><PropertyValue name="IndentStyle">2</PropertyValue><PropertyValue name="ShowCaretPosition">true</PropertyValue><PropertyValue name="HideAdvancedMembers">true</PropertyValue><PropertyValue name="ShowNavigationBar">true</PropertyValue><PropertyValue name="UseMapMode">false</PropertyValue><PropertyValue name="VirtualSpace">false</PropertyValue><PropertyValue name="ShowAnnotations">true</PropertyValue><PropertyValue name="ShowVerticalScrollBar">true</PropertyValue><PropertyValue name="InsertTabs">false</PropertyValue><PropertyValue name="WordWrapGlyphs">true</PropertyValue><PropertyValue name="EnableLeftClickForURLs">true</PropertyValue><PropertyValue name="ShowErrors">true</PropertyValue><PropertyValue name="OverviewWidth">58</PropertyValue><PropertyValue name="ShowLineNumbers">true</PropertyValue><PropertyValue name="WordWrap">false</PropertyValue><PropertyValue name="IndentSize">4</PropertyValue><PropertyValue name="BraceCompletion">true</PropertyValue><PropertyValue name="ShowHorizontalScrollBar">true</PropertyValue><PropertyValue name="CutCopyBlankLines">true</PropertyValue><PropertyValue name="AutoListParams">true</PropertyValue></ToolsOptionsSubCategory></ToolsOptionsCategory></ToolsOptions></UserSettings>

CreateSdk.bat

@@ -0,0 +1,22 @@
+REM Automate the creation of an SDK package
+set SDK_PATH=SDK
+set X64RELEASE_PATH=X64\Release
+REM set X86RELEASE_PATH=Win32\Release
+set INC_PATH=Inc
+
+REM C#
+REM COPY %X86RELEASE_PATH%\vJoyInterface.dll "%SDK_PATH%\c#\x86\vJoyInterface.dll"
+REM COPY %X86RELEASE_PATH%\vJoyInterfaceWrap.dll "%SDK_PATH%\c#\x86\vJoyInterfaceWrap.dll"
+COPY %X64RELEASE_PATH%\vJoyInterface.dll "%SDK_PATH%\c#\x64\vJoyInterface.dll"
+COPY %X64RELEASE_PATH%\vJoyInterfaceWrap.dll "%SDK_PATH%\c#\x64\vJoyInterfaceWrap.dll"
+
+REM Include Files
+COPY %INC_PATH%\public.h "%SDK_PATH%\Inc\public.h"
+COPY %INC_PATH%\gen-versioninfo.h "%SDK_PATH%\Inc\gen-versioninfo.h"
+COPY apps\common\vJoyInterface\vjoyinterface.h "%SDK_PATH%\Inc\vjoyinterface.h"
+
+REM Library Files
+REM COPY %X86RELEASE_PATH%\vJoyInterface.dll "%SDK_PATH%\LIB\x86\vJoyInterface.dll"
+REM COPY %X86RELEASE_PATH%\vJoyInterface.lib "%SDK_PATH%\LIB\x86\vJoyInterface.lib"
+COPY %X64RELEASE_PATH%\vJoyInterface.dll "%SDK_PATH%\LIB\x64\vJoyInterface.dll"
+COPY %X64RELEASE_PATH%\vJoyInterface.lib "%SDK_PATH%\LIB\x64\vJoyInterface.lib"

CreateVersion/CreateVersion.cpp

@@ -3,119 +3,136 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
+
+// When building without git tools, use hardcoded version below
+#define ALWAYS_USE_HARD_CODED_VERSION
+
+#define HARD_CODED_VERSION "v2.2.2.0"
+#define HARD_CODED_VERSIONSHA "000000"
+
 #ifdef _WIN32
 #define popen _popen
 #define pclose _pclose
 #endif
 
-static void find_delim(char *s, char **res, int *ix)
+static void find_delim(char* s, char** res, int* ix)
 {
-	for (; *ix && s[*ix] != '-'; *ix -= 1);
-	if (*ix) {
-		s[*ix] = '\0';
-		*res = s + *ix + 1;
-	}
-	else {
-		*res = s;
-	}
+    for (; *ix && s[*ix] != '-'; *ix -= 1);
+    if (*ix) {
+        s[*ix] = '\0';
+        *res = s + *ix + 1;
+    } else {
+        *res = s;
+    }
 }
 
-int main(int argc, char **argv)
+int main(int argc, char** argv)
 {
-	unsigned int major = 0, mid = 0, minor = 0, commits = 0;
-	char vbuf[4096] = { 0 };
-	char *version="0.0.0", *ncommits="0", *sha="0";
-	FILE *po;
-	int buflen;
-	int outval;
-
-	// Open output file
-	char * filename = argv[1];
-	if (!filename) {
-		fprintf(stderr, "Bad output file name\n");
-		return -5;
-	}
-
-	FILE * f;
-	errno_t err = fopen_s(&f, filename, "w+");
-	if (err || !f)
-	{
-		fprintf(stderr, "Could not oupen output file name (errno=%d)\n", err);
-		return -6;
-	}
-
-	fprintf(stderr, "Starting CreateVersion\n");
-	if (argc != 2) {
-		fprintf(stderr, "Usage: %s <Outputfile>\n", argv[0]);
-		outval = -1;
-		goto FINAL;
-	}
-
-	/** Get the output */
-	po = popen("git describe --long --match  v*", "r");
-	if (!po) {
-		perror("git describe");
-		outval = -2;
-		goto FINAL;
-	}
-
-	if (!fgets(vbuf, sizeof(vbuf), po)) {
-		fprintf(stderr, "git describe closed stream\n");
-		outval = -3;
-		goto FINAL;
-	}
-	pclose(po);
-	buflen = (int)strlen(vbuf);
-	vbuf[buflen - 2] = '\0';
-	buflen -= 1;
-
-	// SHA1	 (Remove the leading 'g')
-	find_delim(vbuf, &sha, &buflen);
-	sha++;
-
-	// Commit #	 - Will be used as build number
-	find_delim(vbuf, &ncommits, &buflen);
-
-
-	// Version
-	version = vbuf;
-
-	// Break the version number into its components
-	int nFields = sscanf_s(version, "v%u.%u.%u.%u",&major, &mid, &minor, &commits) ;
-	if (nFields < 3) {
-		fprintf(stderr, "Version string corrupt\n");
-		outval = -4;
-		goto FINAL;
-	}
-
-	// Case of version of type v2.1.8
-	if (nFields == 3)
-		sscanf_s(ncommits, "%u", &commits);
+    unsigned int major = 0, mid = 0, minor = 0, bugfix = 0, nbcommits = 0;
+    char vbuf[4096] = { 0 };
+    // Hardcoded for v221 branch development
+    char* version = HARD_CODED_VERSION, * build_ncommits = "0", * sha1 = "0";
+    int outval;
+
+    // Open output file
+    char* filename = argv[1];
+    if (!filename) {
+        fprintf(stderr, "Bad output file name\n");
+        return -5;
+    }
+
+    FILE* f;
+    errno_t err = fopen_s(&f, filename, "w+");
+    if (err || !f) {
+        fprintf(stderr, "Could not oupen output file name (errno=%d)\n", err);
+        return -6;
+    }
+
+    fprintf(stderr, "Starting CreateVersion\n");
+    if (argc != 2) {
+        fprintf(stderr, "Usage: %s <Outputfile>\n", argv[0]);
+        return -1;
+    }
+
+#ifdef ALWAYS_USE_HARD_CODED_VERSION
+    build_ncommits = "0";
+    sha1 = HARD_CODED_VERSIONSHA;
+#else
+    /** Get the output */
+    int buflen;
+    FILE* po = popen("git describe --long --match  v*", "r");
+    if (!po) {
+        fprintf(stderr, "git describe is missing, please install git for windows. Using default hardcoded version.\n");
+        outval = -2;
+        goto PARSE_VERSION;
+    }
+
+    if (!fgets(vbuf, sizeof(vbuf), po)) {
+        fprintf(stderr, "git describe closed stream is missing, please install git for windows. Using default hardcoded version.\n");
+        outval = -3;
+        goto PARSE_VERSION;
+    }
+    pclose(po);
+    buflen = (int)strlen(vbuf);
+    vbuf[buflen - 2] = '\0';
+    buflen -= 1;
+
+    // SHA1	 (Remove the leading 'g')
+    find_delim(vbuf, &sha1, &buflen);
+    sha1++;
+
+    // Commit #	 - Will be used as build number
+    find_delim(vbuf, &build_ncommits, &buflen);
+
+PARSE_VERSION:
+    // Version
+    version = vbuf;
+#endif
 
+    // Break the version number into its components
+    int nFieldsVersion = sscanf_s(version, "v%u.%u.%u.%u", &major, &mid, &minor, &bugfix);
+    if (nFieldsVersion < 3) {
+        fprintf(stderr, "Version string wrongly formatted, value was %s\n", version);
+        outval = -4;
+        goto FINAL;
+    }
+
+    // Get number of commits
+    int nFieldsCommits = sscanf_s(build_ncommits, "%u", &nbcommits);
+
+    // Case of version of type v2.1.9, in this case take last 4th number to be nb of commits
+    if (nFieldsVersion == 3 && nFieldsCommits>0) {
+        bugfix = nbcommits;
+    }
+
+    // Check intermediate values are a nibble
+    if (major>0xF ||
+        mid>0xF ||
+        minor>0xF ||
+        bugfix>0xF
+        ) {
+        fprintf(stderr, "Error invalid version number, one field is greater than 15 (a nibble in 4bits): v%d.%d.%d.%d", major, mid, minor, bugfix);
+        outval = -5;
+        goto FINAL;
+    }
 
 
 FINAL:
-	// Put data into file
-	fprintf(f, "#pragma once\n");
-	fprintf(f, "#define VER_H_ %u\n", major);
-	fprintf(f, "#define VER_M_ %u\n", mid);
-	fprintf(f, "#define VER_L_ %u\n", minor);
-	fprintf(f, "#define BUILD %u\n", commits);
- 	fprintf(f, "\n");
-	fprintf(f, "#define FILEVER\t\t\t\t\"%u, %u, %u, %u\"\n", major, mid, minor, commits);
-	fprintf(f, "#define PRODVER_TAG\t\t\t\"%s\"\n", version);
-	fprintf(f, "#define PRODVER_SHA1\t\t\"%s\"\n", sha);
- 	fprintf(f, "\n");
-
-
-	return 0;
+    // Put data into file
+    fprintf(f, "#pragma once\n");
+    fprintf(f, "// Version as four nibbles as X.H.M.L\n");
+    fprintf(f, "#define VER_X_ %u\n", major);
+    fprintf(f, "#define VER_H_ %u\n", mid);
+    fprintf(f, "#define VER_M_ %u\n", minor);
+    fprintf(f, "#define VER_L_ %u\n", bugfix);
+    fprintf(f, "// Internal use only\n");
+    fprintf(f, "#define BUILD %u\n", nbcommits);
+    fprintf(f, "\n");
+    fprintf(f, "#define FILEVER\t\t\t\t\"%u, %u, %u, %u\"\n", major, mid, minor, bugfix);
+    fprintf(f, "#define PRODVER_TAG\t\t\t\"%s\"\n", version);
+    fprintf(f, "#define PRODVER_SHA1\t\t\"%s\"\n", sha1);
+    fprintf(f, "\n");
+
+
+    return 0;
 }
-
-//#include "stdafx.h"
-//
-//
-//int main()
-//{
-//    return 0;
-//}
-//