@@ -17,6 +17,7 @@ target_sources(openvpnserv PRIVATE

     interactive.c

     service.c service.h

     validate.c validate.h

+    ../tapctl/basic.h

     ../openvpn/wfp_block.c ../openvpn/wfp_block.h

     openvpnserv_resources.rc

     ../openvpn/ring_buffer.h

@@ -45,7 +45,7 @@ GetRegString(HKEY key, LPCTSTR value, LPTSTR data, DWORD size, LPCTSTR default_v

     if (status != ERROR_SUCCESS)

     {

         SetLastError(status);

-        return MsgToEventLog(M_SYSERR, TEXT("Error querying registry value: HKLM\\SOFTWARE\\" PACKAGE_NAME "%ls\\%ls"), service_instance, value);

+        return MsgToEventLog(M_SYSERR, TEXT("Error querying registry value: HKLM\\SOFTWARE\\") TEXT(PACKAGE_NAME) TEXT("%ls\\%ls"), service_instance, value);

     }

     return ERROR_SUCCESS;

@@ -63,7 +63,7 @@ GetOpenvpnSettings(settings_t *s)

     TCHAR install_path[MAX_PATH];

     TCHAR default_value[MAX_PATH];

-    swprintf(reg_path, _countof(reg_path), TEXT("SOFTWARE\\" PACKAGE_NAME "%ls"), service_instance);

+    swprintf(reg_path, _countof(reg_path), TEXT("SOFTWARE\\") TEXT(PACKAGE_NAME) TEXT("%ls"), service_instance);

     LONG status = RegOpenKeyEx(HKEY_LOCAL_MACHINE, reg_path, 0, KEY_READ, &key);

     if (status != ERROR_SUCCESS)

@@ -60,9 +60,9 @@ static HANDLE rdns_semaphore = NULL;

 openvpn_service_t interactive_service = {

     interactive,

-    TEXT(PACKAGE_NAME "ServiceInteractive"),

-    TEXT(PACKAGE_NAME " Interactive Service"),

-    TEXT(SERVICE_DEPENDENCIES),

+    TEXT(PACKAGE_NAME) TEXT("ServiceInteractive"),

+    TEXT(PACKAGE_NAME) TEXT(" Interactive Service"),

+    SERVICE_DEPENDENCIES,

     SERVICE_AUTO_START

 };

@@ -1973,7 +1973,7 @@ RunOpenvpn(LPVOID p)

     }

     swprintf(ovpn_pipe_name, _countof(ovpn_pipe_name),

-             TEXT("\\\\.\\pipe\\" PACKAGE "%ls\\service_%lu"), service_instance, GetCurrentThreadId());

+             TEXT("\\\\.\\pipe\\") TEXT(PACKAGE) TEXT("%ls\\service_%lu"), service_instance, GetCurrentThreadId());

     ovpn_pipe = CreateNamedPipe(ovpn_pipe_name,

                                 PIPE_ACCESS_DUPLEX | FILE_FLAG_FIRST_PIPE_INSTANCE | FILE_FLAG_OVERLAPPED,

                                 PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT, 1, 128, 128, 0, NULL);

@@ -2173,7 +2173,7 @@ CreateClientPipeInstance(VOID)

     }

     TCHAR pipe_name[256]; /* The entire pipe name string can be up to 256 characters long according to MSDN. */

-    swprintf(pipe_name, _countof(pipe_name), TEXT("\\\\.\\pipe\\" PACKAGE "%ls\\service"), service_instance);

+    swprintf(pipe_name, _countof(pipe_name), TEXT("\\\\.\\pipe\\") TEXT(PACKAGE) TEXT("%ls\\service"), service_instance);

     HANDLE pipe = CreateNamedPipe(pipe_name, flags,

                                   PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_REJECT_REMOTE_CLIENTS,

                                   PIPE_UNLIMITED_INSTANCES, 1024, 1024, 0, &sa);

@@ -282,8 +282,8 @@ _tmain(int argc, TCHAR *argv[])

                 wprintf(TEXT("-instance interactive <id>\n")

                         TEXT("   Runs the service as an alternate instance.\n")

                         TEXT("   The service settings will be loaded from\n")

-                        TEXT("   HKLM\\Software\\" PACKAGE_NAME "<id> registry key, and the service will accept\n")

-                        TEXT("   requests on \\\\.\\pipe\\" PACKAGE "<id>\\service named pipe.\n"));

+                        TEXT("   HKLM\\Software\\") TEXT(PACKAGE_NAME) TEXT("<id> registry key, and the service will accept\n")

+                        TEXT("   requests on \\\\.\\pipe\\") TEXT(PACKAGE) TEXT("<id>\\service named pipe.\n"));

                 return 0;

             }

@@ -37,9 +37,10 @@

 #include <windows.h>

 #include <stdlib.h>

 #include <tchar.h>

+#include "../tapctl/basic.h"

-#define APPNAME  TEXT(PACKAGE "serv")

-#define SERVICE_DEPENDENCIES  TAP_WIN_COMPONENT_ID "\0Dhcp\0\0"

+#define APPNAME  TEXT(PACKAGE) TEXT("serv")

+#define SERVICE_DEPENDENCIES  TEXT(TAP_WIN_COMPONENT_ID) TEXT("\0Dhcp\0\0")

 /*

  * Message handling