Attempt to remove _CRT_SECURE_NO_WARNINGS

- use *_s version of swprintf/wcsncpy/sscanf when possible

Fixes: #770

Author: Youw

windows/hid.c

@@ -20,12 +20,6 @@
         https://github.com/libusb/hidapi .
 ********************************************************/
 
-#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
-/* Do not warn about wcsncpy usage.
-   https://docs.microsoft.com/cpp/c-runtime-library/security-features-in-the-crt */
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -60,6 +54,16 @@ typedef LONG NTSTATUS;
 #include <stdlib.h>
 #include <string.h>
 
+/* MSVC secure CRT (VS2005+) provides swprintf_s/wcsncpy_s.
+   Older MSVC and GCC/MinGW/Cygwin use the classic variants. */
+#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#define HIDAPI_SWPRINTF swprintf_s
+#define HIDAPI_WCSNCPY(dest, dest_count, src) wcsncpy_s((dest), (dest_count), (src), _TRUNCATE)
+#else
+#define HIDAPI_SWPRINTF swprintf
+#define HIDAPI_WCSNCPY(dest, dest_count, src) wcsncpy((dest), (src), (dest_count))
+#endif
+
 #ifdef MIN
 #undef MIN
 #endif
@@ -280,7 +284,8 @@ static void register_winapi_error_to_buffer(wchar_t **error_buffer, const WCHAR
 	if (!msg)
 		return;
 
-	int printf_written = swprintf(msg, msg_len + 1, L"%.*ls: (0x%08X) %.*ls", (int)op_len, op, error_code, (int)system_err_len, system_err_buf);
+	int printf_written = HIDAPI_SWPRINTF(msg, msg_len + 1, L"%.*ls: (0x%08X) %.*ls", (int)op_len, op, error_code, (int)system_err_len, system_err_buf);
+	msg[msg_len] = L'\0';
 
 	if (printf_written < 0)
 	{
@@ -1426,7 +1431,7 @@ int HID_API_EXPORT_CALL HID_API_CALL hid_get_manufacturer_string(hid_device *dev
 		return -1;
 	}
 
-	wcsncpy(string, dev->device_info->manufacturer_string, maxlen);
+	HIDAPI_WCSNCPY(string, maxlen, dev->device_info->manufacturer_string);
 	string[maxlen - 1] = L'\0';
 
 	register_string_error(dev, NULL);
@@ -1446,7 +1451,7 @@ int HID_API_EXPORT_CALL HID_API_CALL hid_get_product_string(hid_device *dev, wch
 		return -1;
 	}
 
-	wcsncpy(string, dev->device_info->product_string, maxlen);
+	HIDAPI_WCSNCPY(string, maxlen, dev->device_info->product_string);
 	string[maxlen - 1] = L'\0';
 
 	register_string_error(dev, NULL);
@@ -1466,7 +1471,7 @@ int HID_API_EXPORT_CALL HID_API_CALL hid_get_serial_number_string(hid_device *de
 		return -1;
 	}
 
-	wcsncpy(string, dev->device_info->serial_number, maxlen);
+	HIDAPI_WCSNCPY(string, maxlen, dev->device_info->serial_number);
 	string[maxlen - 1] = L'\0';
 
 	register_string_error(dev, NULL);

windows/hidapi_descriptor_reconstruct.h

@@ -19,12 +19,6 @@
 #ifndef HIDAPI_DESCRIPTOR_RECONSTRUCT_H__
 #define HIDAPI_DESCRIPTOR_RECONSTRUCT_H__
 
-#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_WARNINGS)
-/* Do not warn about wcsncpy usage.
-   https://docs.microsoft.com/cpp/c-runtime-library/security-features-in-the-crt */
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
 #include "hidapi_winapi.h"
 
 #ifdef _MSC_VER

windows/test/hid_report_reconstructor_test.c

@@ -9,6 +9,14 @@
 #include <stdio.h>
 #include <string.h>
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1400)
+#define HIDAPI_SSCANF sscanf_s
+#define HIDAPI_SCANSET_SIZE(buf) , (unsigned)_countof(buf)
+#else
+#define HIDAPI_SSCANF sscanf
+#define HIDAPI_SCANSET_SIZE(buf)
+#endif
+
 static hidp_preparsed_data * alloc_preparsed_data_from_file(char* filename)
 {
 	FILE* file;
@@ -45,15 +53,15 @@ static hidp_preparsed_data * alloc_preparsed_data_from_file(char* filename)
 				header_read_success = TRUE;
 				break;
 			}
-			if (sscanf(line, "dev->vendor_id           = 0x%04hX\n", &vendor_id)) continue;
-			if (sscanf(line, "dev->product_id          = 0x%04hX\n", &product_id)) continue;
-			if (sscanf(line, "dev->usage_page          = 0x%04hX\n", &usage_page)) continue;
-			if (sscanf(line, "dev->usage               = 0x%04hX\n", &usage)) continue;
-			if (sscanf(line, "dev->manufacturer_string = \"%127[^\"\n]", manufacturer_string)) continue;
-			if (sscanf(line, "dev->product_string      = \"%127[^\"\n]", product_string)) continue;
-			if (sscanf(line, "dev->release_number      = 0x%04hX\n", &release_number)) continue;
-			if (sscanf(line, "dev->interface_number    = %d\n", &interface_number)) continue;
-			// if (sscanf(line, "dev->path                = \"%127[^\"]\n", path)) continue;
+			if (HIDAPI_SSCANF(line, "dev->vendor_id           = 0x%04hX\n", &vendor_id)) continue;
+			if (HIDAPI_SSCANF(line, "dev->product_id          = 0x%04hX\n", &product_id)) continue;
+			if (HIDAPI_SSCANF(line, "dev->usage_page          = 0x%04hX\n", &usage_page)) continue;
+			if (HIDAPI_SSCANF(line, "dev->usage               = 0x%04hX\n", &usage)) continue;
+			if (HIDAPI_SSCANF(line, "dev->manufacturer_string = \"%127[^\"\n]", manufacturer_string HIDAPI_SCANSET_SIZE(manufacturer_string))) continue;
+			if (HIDAPI_SSCANF(line, "dev->product_string      = \"%127[^\"\n]", product_string HIDAPI_SCANSET_SIZE(product_string))) continue;
+			if (HIDAPI_SSCANF(line, "dev->release_number      = 0x%04hX\n", &release_number)) continue;
+			if (HIDAPI_SSCANF(line, "dev->interface_number    = %d\n", &interface_number)) continue;
+			// if (HIDAPI_SSCANF(line, "dev->path                = \"%127[^\"]\n", path)) continue;
 		}
 		if (!header_read_success) {
 			fprintf(stderr, "ERROR: Couldn't read PP Data header (missing newline)\n");