make Subsurface extensions compile with MSVC

The Garmin / usb-storage code uses a bunch of POSIX functions that need Windows
workarounds.

Also, msvc throws up on arrays of structures with variable fields. So work
around that.

And the vcxproj file was of course missing the new files that we
had added for our fork.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

Author: dirkhh

contrib/msvc/libdivecomputer.vcxproj

@@ -207,6 +207,9 @@
     <ClCompile Include="..\..\src\divesoft_freedom_parser.c" />
     <ClCompile Include="..\..\src\divesystem_idive.c" />
     <ClCompile Include="..\..\src\divesystem_idive_parser.c" />
+    <ClCompile Include="..\..\src\field-cache.c" />
+    <ClCompile Include="..\..\src\garmin.c" />
+    <ClCompile Include="..\..\src\garmin_parser.c" />
     <ClCompile Include="..\..\src\halcyon_symbios.c" />
     <ClCompile Include="..\..\src\halcyon_symbios_parser.c" />
     <ClCompile Include="..\..\src\hdlc.c" />
@@ -280,6 +283,7 @@
     <ClCompile Include="..\..\src\tecdiving_divecomputereu_parser.c" />
     <ClCompile Include="..\..\src\timer.c" />
     <ClCompile Include="..\..\src\usb.c" />
+    <ClCompile Include="..\..\src\usb_storage.c" />
     <ClCompile Include="..\..\src\usbhid.c" />
     <ClCompile Include="..\..\src\uwatec_aladin.c" />
     <ClCompile Include="..\..\src\uwatec_memomouse.c" />
@@ -340,6 +344,8 @@
     <ClInclude Include="..\..\src\diverite_nitekq.h" />
     <ClInclude Include="..\..\src\divesoft_freedom.h" />
     <ClInclude Include="..\..\src\divesystem_idive.h" />
+    <ClInclude Include="..\..\src\field-cache.h" />
+    <ClInclude Include="..\..\src\garmin.h" />
     <ClInclude Include="..\..\src\halcyon_symbios.h" />
     <ClInclude Include="..\..\src\hdlc.h" />
     <ClInclude Include="..\..\src\hw_frog.h" />

src/garmin.c

@@ -22,13 +22,37 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <dirent.h>
-#include <sys/types.h>
+
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#define NOGDI
+#include <windows.h>
+#include <io.h>
+#include <fcntl.h>
+#ifndef PATH_MAX
+#define PATH_MAX MAX_PATH
+#endif
+#define dc_open _open
+#define dc_read _read
+#define dc_close _close
+#define DC_O_RDONLY _O_RDONLY
+#define DC_O_BINARY _O_BINARY
+#else
 #include <dirent.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
+#define dc_open open
+#define dc_read read
+#define dc_close close
+#define DC_O_RDONLY O_RDONLY
+#ifdef O_BINARY
+#define DC_O_BINARY O_BINARY
+#else
+#define DC_O_BINARY 0
+#endif
+#endif
 
 #include "garmin.h"
 #include "context-private.h"
@@ -275,6 +299,49 @@ add_name(struct file_list *files, const char *name, unsigned int mtp_id)
 	entry->mtp_id = mtp_id;
 }
 
+#ifdef _WIN32
+static dc_status_t
+get_file_list(dc_device_t *abstract, const char *pathname, struct file_list *files)
+{
+	WIN32_FIND_DATAA findData;
+	HANDLE hFind;
+	char searchPath[PATH_MAX];
+
+	DEBUG(abstract->context, "Iterating over Garmin files");
+
+	// Create search pattern (pathname\*.fit)
+	snprintf(searchPath, sizeof(searchPath), "%s\\*", pathname);
+
+	hFind = FindFirstFileA(searchPath, &findData);
+	if (hFind == INVALID_HANDLE_VALUE) {
+		return DC_STATUS_IO;
+	}
+
+	do {
+		// Skip directories
+		if (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+			continue;
+
+		if (!check_filename(abstract, findData.cFileName))
+			continue;
+
+		dc_status_t rc = make_space(files);
+		if (rc != DC_STATUS_SUCCESS) {
+			FindClose(hFind);
+			return rc;
+		}
+		add_name(files, findData.cFileName, 0);
+	} while (FindNextFileA(hFind, &findData));
+
+	FindClose(hFind);
+
+	DEBUG(abstract->context, "Found %d files", files->nr);
+
+	if (files->array)
+		qsort(files->array, files->nr, sizeof(struct fit_file), name_cmp);
+	return DC_STATUS_SUCCESS;
+}
+#else
 static dc_status_t
 get_file_list(dc_device_t *abstract, DIR *dir, struct file_list *files)
 {
@@ -296,6 +363,7 @@ get_file_list(dc_device_t *abstract, DIR *dir, struct file_list *files)
 		qsort(files->array, files->nr, sizeof(struct fit_file), name_cmp);
 	return DC_STATUS_SUCCESS;
 }
+#endif
 
 #ifdef HAVE_LIBMTP
 static unsigned int
@@ -438,18 +506,14 @@ mtp_read_file(garmin_device_t *device, unsigned int file_id, dc_buffer_t *file)
 }
 #endif /* HAVE_LIBMTP */
 
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
 static dc_status_t
 read_file(char *pathname, int pathlen, const char *name, dc_buffer_t *file)
 {
 	int fd, rc;
 
 	pathname[pathlen] = '/';
 	memcpy(pathname+pathlen+1, name, FILE_NAME_SIZE);
-	fd = open(pathname, O_RDONLY | O_BINARY);
+	fd = dc_open(pathname, DC_O_RDONLY | DC_O_BINARY);
 
 	if (fd < 0)
 		return DC_STATUS_IO;
@@ -459,7 +523,7 @@ read_file(char *pathname, int pathlen, const char *name, dc_buffer_t *file)
 		char buffer[4096];
 		int n;
 
-		n = read(fd, buffer, sizeof(buffer));
+		n = dc_read(fd, buffer, sizeof(buffer));
 		if (!n)
 			break;
 		if (n > 0) {
@@ -470,7 +534,7 @@ read_file(char *pathname, int pathlen, const char *name, dc_buffer_t *file)
 		break;
 	}
 
-	close(fd);
+	dc_close(fd);
 	return rc;
 }
 
@@ -488,7 +552,9 @@ garmin_device_foreach (dc_device_t *abstract, dc_dive_callback_t callback, void
 		NULL   // array of file names / ids
 	};
 	dc_buffer_t *file;
+#ifndef _WIN32
 	DIR *dir;
+#endif
 	dc_status_t rc;
 
 	// Read the directory name from the iostream
@@ -526,6 +592,25 @@ garmin_device_foreach (dc_device_t *abstract, dc_dive_callback_t callback, void
 	} else
 #endif
 	{ // slight coding style violation to deal with the non-MTP case
+#ifdef _WIN32
+		// On Windows, get_file_list takes the pathname directly
+		rc = get_file_list(abstract, pathname, &files);
+		if (rc != DC_STATUS_SUCCESS) {
+			// Try the input path directly
+			rc = get_file_list(abstract, pathname_input, &files);
+			if (rc != DC_STATUS_SUCCESS) {
+				ERROR (abstract->context, "Failed to open directory '%s' or '%s'.", pathname, pathname_input);
+				free(files.array);
+				return DC_STATUS_IO;
+			}
+			strcpy(pathname, pathname_input);
+			pathlen = strlen(pathname);
+		}
+		if (!files.nr) {
+			free(files.array);
+			return rc;
+		}
+#else
 		dir = opendir(pathname);
 		if (!dir) {
 			dir = opendir(pathname_input);
@@ -543,6 +628,7 @@ garmin_device_foreach (dc_device_t *abstract, dc_dive_callback_t callback, void
 			free(files.array);
 			return rc;
 		}
+#endif
 	}
 	// We found at least one file
 	// Can we find the fingerprint entry?

src/garmin_parser.c

@@ -1217,9 +1217,16 @@ static const struct {
 #define MSG_NAME_LEN 16
 static const struct msg_desc *lookup_msg_desc(unsigned short msg, int local, const char **namep)
 {
-	static struct msg_desc local_array[16];
+	/*
+	 * msg_desc has a flexible array member, so we can't create an array of them.
+	 * Use a compatible struct for local "fake" descriptors that have no fields.
+	 */
+	struct msg_desc_stub {
+		unsigned char maxfield;
+	};
+	static struct msg_desc_stub local_array[16];
 	static char local_name[16][MSG_NAME_LEN];
-	struct msg_desc *desc;
+	struct msg_desc_stub *stub;
 	char *name;
 
 	/* Do we have a real one? */
@@ -1229,13 +1236,13 @@ static const struct msg_desc *lookup_msg_desc(unsigned short msg, int local, con
 	}
 
 	/* If not, fake it */
-	desc = &local_array[local];
-	memset(desc, 0, sizeof(*desc));
+	stub = &local_array[local];
+	memset(stub, 0, sizeof(*stub));
 
 	name = local_name[local];
 	snprintf(name, MSG_NAME_LEN, "msg-%d", msg);
 	*namep = name;
-	return desc;
+	return (const struct msg_desc *)stub;
 }
 
 static int all_data_inval(const unsigned char *data, int base_type, int len)

src/usb_storage.c

@@ -23,13 +23,31 @@
 #include "config.h"
 #endif
 
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
+#define NOGDI
+#include <windows.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#ifndef PATH_MAX
+#define PATH_MAX MAX_PATH
+#endif
+#define dc_stat _stat
+#define dc_stat_t struct _stat
+#define DC_S_ISDIR(mode) (((mode) & _S_IFMT) == _S_IFDIR)
+#else
 #include <limits.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
+#define dc_stat stat
+#define dc_stat_t struct stat
+#define DC_S_ISDIR(mode) S_ISDIR(mode)
+#endif
 
 #include "common-private.h"
 #include "context-private.h"
@@ -70,7 +88,7 @@ dc_status_t
 dc_usb_storage_open (dc_iostream_t **out, dc_context_t *context, const char *name)
 {
 	dc_usbstorage_t *device = NULL;
-	struct stat st;
+	dc_stat_t st;
 
 	if (out == NULL || name == NULL)
 		return DC_STATUS_INVALIDARGS;
@@ -80,7 +98,7 @@ dc_usb_storage_open (dc_iostream_t **out, dc_context_t *context, const char *nam
 		INFO (context, "Open MTP device");
 	} else {
 		INFO (context, "Open: name=%s", name);
-		if (stat(name, &st) < 0 || !S_ISDIR(st.st_mode))
+		if (dc_stat(name, &st) < 0 || !DC_S_ISDIR(st.st_mode))
 			return DC_STATUS_NODEVICE;
 	}
 	// Allocate memory.