[CONUTILS] Addendum to r72913. CORE-10504

svn path=/trunk/; revision=72921
This commit is contained in:
Amine Khaldi 2016-10-06 14:20:16 +00:00
parent fe98303465
commit 9593c338c3
2 changed files with 7 additions and 11 deletions

View file

@ -1,8 +1,3 @@
## Temporary HACK before we cleanly support UNICODE functions
add_definitions(-DUNICODE -D_UNICODE)
add_library(conutils conutils.c) add_library(conutils conutils.c)
add_dependencies(conutils psdk) add_dependencies(conutils xdk)
target_link_libraries(conutils ${PSEH_LIB})
# add_importlibs(conutils msvcrt kernel32) ## ntdll

View file

@ -18,27 +18,28 @@
/** NOTE: Experimental! Don't use USE_CRT yet because output to console is a bit broken **/ /** NOTE: Experimental! Don't use USE_CRT yet because output to console is a bit broken **/
// #define USE_CRT // #define USE_CRT
/* FIXME: Temporary HACK before we cleanly support UNICODE functions */
#define UNICODE
#define _UNICODE
#include <stdlib.h> // limits.h // For MB_LEN_MAX #include <stdlib.h> // limits.h // For MB_LEN_MAX
#ifdef USE_CRT #ifdef USE_CRT
#include <fcntl.h> #include <fcntl.h>
#include <io.h> #include <io.h>
#endif /* defined(USE_CRT) */ #endif /* USE_CRT */
#include <windef.h> #include <windef.h>
#include <winbase.h> #include <winbase.h>
#include <winnls.h> #include <winnls.h>
#include <winuser.h> // MAKEINTRESOURCEW, RT_STRING #include <winuser.h> // MAKEINTRESOURCEW, RT_STRING
#include <wincon.h> // Console APIs (only if kernel32 support included) #include <wincon.h> // Console APIs (only if kernel32 support included)
#include "conutils.h"
#include <strsafe.h> #include <strsafe.h>
/* PSEH for SEH Support */ /* PSEH for SEH Support */
#include <pseh/pseh2.h> #include <pseh/pseh2.h>
#include "conutils.h"
// #define RC_STRING_MAX_SIZE 4096 // #define RC_STRING_MAX_SIZE 4096
// #define MAX_BUFFER_SIZE 4096 // #define MAX_BUFFER_SIZE 4096