misc: fix path compiling, fix apm3 server detection

common/hooklib/path.h

@@ -5,24 +5,11 @@
 #include <stdbool.h>
 #include <stddef.h>
 
-typedef HRESULT (*path_hook_t)(
-        const wchar_t *src,
-        wchar_t *dest,
-        size_t *count);
-
-HRESULT path_hook_push(path_hook_t hook);
-void path_hook_insert_hooks(HMODULE target);
-int path_compare_w(const wchar_t *string1, const wchar_t *string2, size_t count);
-BOOL path_transform_a(char **out, const char *src);
-BOOL path_transform_w(wchar_t **out, const wchar_t *src);
-BOOL path_transform_args_a(const char* str, char delimiter, char* buf, size_t size);
-BOOL path_transform_args_w(const wchar_t* str, wchar_t delimiter, wchar_t* buf, size_t size);
-
-static inline bool path_is_separator_w(wchar_t c)
-{
-    return c == L'\\' || c == L'/';
-}
+#ifdef __MINGW32__
+// MinGW already has this definition
+#include <ntdef.h> 
 
+#else
 // This is only defined in the Windows Driver SDK, so we copy the definition in here
 typedef struct _REPARSE_DATA_BUFFER
 {
@@ -53,4 +40,23 @@ typedef struct _REPARSE_DATA_BUFFER
             UCHAR  DataBuffer[1];
         } GenericReparseBuffer;
     };
-} REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER;
+} REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER;
+#endif
+
+typedef HRESULT (*path_hook_t)(
+        const wchar_t *src,
+        wchar_t *dest,
+        size_t *count);
+
+HRESULT path_hook_push(path_hook_t hook);
+void path_hook_insert_hooks(HMODULE target);
+int path_compare_w(const wchar_t *string1, const wchar_t *string2, size_t count);
+BOOL path_transform_a(char **out, const char *src);
+BOOL path_transform_w(wchar_t **out, const wchar_t *src);
+BOOL path_transform_args_a(const char* str, char delimiter, char* buf, size_t size);
+BOOL path_transform_args_w(const wchar_t* str, wchar_t delimiter, wchar_t* buf, size_t size);
+
+static inline bool path_is_separator_w(wchar_t c)
+{
+    return c == L'\\' || c == L'/';
+}

dist/apm3/launch.bat

@@ -21,8 +21,8 @@ inject -w -k apm3hook.dll hwvalue.exe modeltype
 if %ERRORLEVEL% == 5 goto BEGIN
 
 inject -w -k apm3hook.dll hwvalue.exe dipsw
-set AMDAEMON_CONFIG=server.json
-if %ERRORLEVEL% == 1 set AMDAEMON_CONFIG=client.json
+set AMDAEMON_CONFIG=client.json
+if %ERRORLEVEL% == 1 set AMDAEMON_CONFIG=server.json
 
 :BEGIN