mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-27 17:37:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix windows compilation after having merged in csync.

Browse source
This commit is contained in:
Klaas Freitag 2014-01-23 15:19:27 +01:00
parent 3d6718315c
commit d868df3b9b
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
csync/src/csync_misc.c
View file

@ -66,18 +66,20 @@ char *csync_get_user_home_dir(void) {
char *csync_get_local_username(void) { char *csync_get_local_username(void) {
DWORD size = 0; DWORD size = 0;
char *user; wchar_t *user;
/* get the size */ /* get the size */
GetUserName(NULL, &size); GetUserName(NULL, &size);
user = (char *) c_malloc(size); user = (wchar_t *) c_malloc(2*size);
if (user == NULL) { if (user == NULL) {
return NULL; return NULL;
} }
if (GetUserName(user, &size)) { if (GetUserName(user, &size)) {
return user; char *uuser = c_utf8_from_locale(user);
SAFE_FREE(user);
return uuser;
} }
return NULL; return NULL;
@ -144,9 +146,20 @@ int csync_fnmatch(__const char *__pattern, __const char *__name, int __flags) {
#include <shlwapi.h> #include <shlwapi.h>
int csync_fnmatch(__const char *__pattern, __const char *__name, int __flags) { int csync_fnmatch(__const char *__pattern, __const char *__name, int __flags) {
wchar_t *pat = NULL;
wchar_t *name = NULL;
BOOL match;
(void) __flags; (void) __flags;
/* FIXME check if we rather should use the PathMatchSpecW variant here? */
if(PathMatchSpec(__name, __pattern)) name = c_utf8_to_locale(__name);
pat = c_utf8_to_locale(__pattern);
match = PathMatchSpec(name, pat);
c_free_locale_string(pat);
c_free_locale_string(name);
if(match)
return 0; return 0;
else else
return 1; return 1;

1
csync/src/vio/csync_vio_local.c
View file

@ -27,7 +27,6 @@
#ifdef _WIN32 #ifdef _WIN32
#include "windows.h" #include "windows.h"
#define _UNICODE
#endif #endif
#include "c_private.h" #include "c_private.h"