rewrote to use ReadConsole/WriteConsole instead of cwprinf and cwgets on win32

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2024 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/lib/winapi.c b/bacula/src/lib/winapi.c
index 9a5f6532cf936323d2e279ad51b7b4e39a35142a..b7bf9d613ea8e4e3ac2af8ac0872e59c5d8e8e0a 100644 (file)
--- a/bacula/src/lib/winapi.c
+++ b/bacula/src/lib/winapi.c
@@ -50,9 +50,6 @@ t_wunlink p_wunlink = NULL;
 t_wmkdir p_wmkdir = NULL;
 t_wopen p_wopen = NULL;
 
-t_cgetws p_cgetws = NULL;
-t_cwprintf p_cwprintf = NULL;
-
 t_GetFileAttributesA    p_GetFileAttributesA = NULL;
 t_GetFileAttributesW    p_GetFileAttributesW = NULL;
 
@@ -149,14 +146,7 @@ InitWinAPIWrapper()
       /* wopen */
       p_wopen = (t_wopen)
       GetProcAddress(hLib, "_wopen");
-      
-      /* cgetws */
-      p_cgetws = (t_cgetws)
-      GetProcAddress (hLib, "_cgetws");
-      /* cwprintf */
-      p_cwprintf = (t_cwprintf)
-      GetProcAddress (hLib, "_cwprintf");
-      
+        
       FreeLibrary(hLib);
    }
    

diff --git a/bacula/src/lib/winapi.h b/bacula/src/lib/winapi.h
index b57dbb6802abe8405ac7e8e996bafd98495b1248..de5ebf55078cff235fb30469dc38a77c547e24e7 100644 (file)
--- a/bacula/src/lib/winapi.h
+++ b/bacula/src/lib/winapi.h
@@ -66,15 +66,10 @@ typedef int (__cdecl * t_wunlink) (const wchar_t *);
 typedef int (__cdecl * t_wmkdir) (const wchar_t *);
 typedef int (__cdecl * t_wopen)  (const wchar_t *, int, ...);
 
-typedef wchar_t* (__cdecl *t_cgetws) (wchar_t *);
-typedef int      (__cdecl *t_cwprintf) (const wchar_t *, ...);
-
 extern t_wunlink   p_wunlink;
 extern t_wmkdir    p_wmkdir;
 extern t_wopen     p_wopen;
 
-extern t_cgetws    p_cgetws;
-extern t_cwprintf  p_cwprintf;
 /* In KERNEL32.DLL */
 typedef BOOL (WINAPI * t_GetFileAttributesExA)(LPCSTR, GET_FILEEX_INFO_LEVELS,
        LPVOID);