github
/
openvpn-gui
mirror of https://github.com/OpenVPN/openvpn-gui
1
0
Fork 0
Code Issues Releases Wiki Activity

always compile a unicode binary

pull/1/head
Heiko Hund 2011-08-29 13:56:32 +00:00
parent a1c152d3af
commit 54d74f5861
4 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -7,7 +7,7 @@ WINDRES = @WINDRES@
LDFLAGS = @CRYPTO_LDFLAGS@ @LDFLAGS@ LDFLAGS = @CRYPTO_LDFLAGS@ @LDFLAGS@
LIBS = @CRYPTO_LIBS@ @LIBS@ LIBS = @CRYPTO_LIBS@ @LIBS@
CFLAGS = @CRYPTO_CPPFLAGS@ @CFLAGS@ @CPPFLAGS@ CFLAGS = @CRYPTO_CPPFLAGS@ @CFLAGS@ @CPPFLAGS@ -DUNICODE -D_UNICODE
CFLAGS += -W -Wall -Wno-unused-parameter -pedantic CFLAGS += -W -Wall -Wno-unused-parameter -pedantic
OBJS = main.o tray.o openvpn.o viewlog.o \ OBJS = main.o tray.o openvpn.o viewlog.o \

5
configure.ac
View File

@ -19,11 +19,6 @@ AC_DEFINE(PACKAGE_RELEASE, [RELEASE],
AC_PROG_CC_C99 AC_PROG_CC_C99
AC_ARG_ENABLE([unicode],
AS_HELP_STRING([--disable-unicode],
[produce a binary without Unicode support]), [],
[CPPFLAGS="$CPPFLAGS -DUNICODE -D_UNICODE"])
AC_CANONICAL_HOST AC_CANONICAL_HOST
case $host in case $host in
*-cygwin) *-cygwin)

5
localization.c
View File

@ -131,12 +131,7 @@ LoadStringLang(UINT stringId, LANGID langId, PTSTR buffer, int bufferSize, va_li
break; break;
formatStr[*entry] = 0; formatStr[*entry] = 0;
#ifdef _UNICODE
wcsncpy(formatStr, entry + 1, *entry); wcsncpy(formatStr, entry + 1, *entry);
#else
WideCharToMultiByte(CP_ACP, 0, entry + 1, *entry, formatStr, *entry, "?", NULL);
#endif
_vsntprintf(buffer, bufferSize, formatStr, args); _vsntprintf(buffer, bufferSize, formatStr, args);
buffer[bufferSize - 1] = 0; buffer[bufferSize - 1] = 0;
free(formatStr); free(formatStr);

4
openvpn.c
View File

@ -153,12 +153,8 @@ OnStateChange(connection_t *c, char *data)
if (pos != NULL) if (pos != NULL)
*pos = '\0'; *pos = '\0';
#ifdef _UNICODE
/* Convert the IP address to Unicode */ /* Convert the IP address to Unicode */
MultiByteToWideChar(CP_ACP, 0, local_ip, -1, c->ip, _tsizeof(c->ip)); MultiByteToWideChar(CP_ACP, 0, local_ip, -1, c->ip, _tsizeof(c->ip));
#else
strncpy(c->ip, local_ip, sizeof(c->ip));
#endif
/* Show connection tray balloon */ /* Show connection tray balloon */
if ((c->state == connecting && o.show_balloon[0] != '0') if ((c->state == connecting && o.show_balloon[0] != '0')