Merge pull request #28 from BeneSim/develop

Added workflow, bumped version and some additional fixes

.github/workflows/build-app.yml

@@ -0,0 +1,60 @@
+name: Build App
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+    - name: Login
+      uses: azure/docker-login@v1
+      with:
+        login-server: docker.pkg.github.com
+        username: BeneSim
+        password: ${{ secrets.GITHUB_TOKEN }}
+    - name: Compile
+      run: |
+        mkdir build
+        docker container run --rm -v $(pwd):/app -w /app/build docker.pkg.github.com/benesim/beneoverlay/gcc-windows:latest -c "qmake .."
+        docker container run --rm -v $(pwd):/app -w /app/build docker.pkg.github.com/benesim/beneoverlay/gcc-windows:latest -c make
+        echo ${{ github.ref }}
+    - name: Package
+      run: |
+        cd build
+        zip BeneOverlay.zip BeneOverlay.exe
+    - name: Archive Artifact
+      uses: actions/upload-artifact@v1
+      with:
+        name: BeneOverlay
+        path: build/BeneOverlay.zip
+  release:
+    runs-on: ubuntu-latest
+    needs: build
+    if: startsWith(github.ref, 'refs/tags/v')
+    steps:
+    - name: Download Artifact
+      uses: actions/download-artifact@v1
+      with:
+        name: BeneOverlay
+    - name: Create Release
+      id: create_release
+      uses: actions/[email protected]
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ github.ref }}
+        release_name: Release ${{ github.ref }}
+        draft: true
+        prerelease: false
+    - name: Upload Release Assets
+      id: upload-release-asset
+      uses: actions/[email protected]
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: ./BeneOverlay/BeneOverlay.zip
+        asset_name: BeneOverlay_x86-64-windows.zip
+        asset_content_type: application/zip

fsuipc/FSUIPC_User.h

@@ -0,0 +1,60 @@
+#ifndef _FSUIPC_H_
+#define _FSUIPC_H_
+
+// Supported Sims
+#define SIM_ANY	0
+#define SIM_FS98	1
+#define SIM_FS2K	2
+#define SIM_CFS2	3
+#define SIM_CFS1	4
+#define SIM_FLY		5
+#define SIM_FS2K2	6
+#define SIM_FS2K4	7
+#define SIM_FSX		8
+#define SIM_ESP		9
+#define SIM_P3D	 10
+
+// Error numbers
+#define FSUIPC_ERR_OK		0
+#define FSUIPC_ERR_OPEN		1	// Attempt to Open when already Open
+#define FSUIPC_ERR_NOFS		2	// Cannot link to FSUIPC or WideClient
+#define FSUIPC_ERR_REGMSG	3	// Failed to Register common message with Windows
+#define FSUIPC_ERR_ATOM		4	// Failed to create Atom for mapping filename
+#define FSUIPC_ERR_MAP		5	// Failed to create a file mapping object
+#define FSUIPC_ERR_VIEW		6	// Failed to open a view to the file map
+#define FSUIPC_ERR_VERSION	7	// Incorrect version of FSUIPC, or not FSUIPC
+#define FSUIPC_ERR_WRONGFS	8	// Sim is not version requested
+#define FSUIPC_ERR_NOTOPEN	9	// Call cannot execute, link not Open
+#define FSUIPC_ERR_NODATA	10	// Call cannot execute: no requests accumulated
+#define FSUIPC_ERR_TIMEOUT	11	// IPC timed out all retries
+#define FSUIPC_ERR_SENDMSG	12	// IPC sendmessage failed all retries
+#define FSUIPC_ERR_DATA		13	// IPC request contains bad data
+#define FSUIPC_ERR_RUNNING	14	// Maybe running on WideClient, but FS not running on Server, or wrong FSUIPC
+#define FSUIPC_ERR_SIZE		15	// Read or Write request cannot be added, memory for Process is full
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Globals accessible from main code
+extern DWORD FSUIPC_Version;	// HIWORD is 1000 x Version Number, minimum 1998
+										// LOWORD is build letter, with a = 1 etc. For 1998 this must be at least 5 (1998e)
+extern DWORD FSUIPC_FS_Version;
+										// FS98=1, FS2k=2, CFS2=3. See above.
+extern DWORD FSUIPC_Lib_Version;
+										// HIWORD is 1000 x version, LOWORD is build letter, a = 1 etc.
+
+// Library routines
+extern BOOL FSUIPC_Open(DWORD dwFSReq, DWORD *pdwResult); // For use externally (IPCuser.lib)
+extern BOOL FSUIPC_Open2(DWORD dwFSReq, DWORD *pdwResult, BYTE *pMem, DWORD dwSize); // For use internally (ModuleUser.lib)
+extern void FSUIPC_Close(void);
+extern BOOL FSUIPC_Read(DWORD dwOffset, DWORD dwSize, void *pDest, DWORD *pdwResult);
+extern BOOL FSUIPC_ReadSpecial(DWORD dwOffset, DWORD dwSize, void *pDest, DWORD *pdwResult);
+extern BOOL FSUIPC_Write(DWORD dwOffset, DWORD dwSize, void *pSrce, DWORD *pdwResult);
+extern BOOL FSUIPC_Process(DWORD *pdwResult);
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif // _FSUIPC_H_

html/progress.html

@@ -64,7 +64,5 @@
             </table>
         </div>
     </body>
-    <script type="text/javascript" src="js/progress.js"></script>
-
 </html>
 

include/version.h

@@ -3,7 +3,7 @@
 
 int const VERSION_MAJOR = 1;
 int const VERSION_MINOR = 2;
-int const VERSION_PATCH = 0;
+int const VERSION_PATCH = 1;
 bool const VERSION_PRERELEASE = false;
 
 QString const VERSION_STRING = VERSION_PRERELEASE ? QString("%1.%2.%3 (Beta)")