Author: akhaldi
Date: Thu Oct 6 14:20:16 2016
New Revision: 72921
URL: http://svn.reactos.org/svn/reactos?rev=72921&view=rev
Log:
[CONUTILS] Addendum to r72913. CORE-10504
Modified:
trunk/reactos/sdk/lib/conutils/CMakeLists.txt
trunk/reactos/sdk/lib/conutils/conutils.c
Modified: trunk/reactos/sdk/lib/conutils/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/conutils/CMakeLists.txt?rev=72921&r1=72920&r2=72921&view=diff
==============================================================================
--- trunk/reactos/sdk/lib/conutils/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/sdk/lib/conutils/CMakeLists.txt [iso-8859-1] Thu Oct 6
14:20:16 2016
@@ -1,8 +1,3 @@
-
-## Temporary HACK before we cleanly support UNICODE functions
-add_definitions(-DUNICODE -D_UNICODE)
add_library(conutils conutils.c)
-add_dependencies(conutils psdk)
-target_link_libraries(conutils ${PSEH_LIB})
-# add_importlibs(conutils msvcrt kernel32) ## ntdll
+add_dependencies(conutils xdk)
Modified: trunk/reactos/sdk/lib/conutils/conutils.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/conutils/conutils.c?rev=72921&r1=72920&r2=72921&view=diff
==============================================================================
--- trunk/reactos/sdk/lib/conutils/conutils.c [iso-8859-1] (original)
+++ trunk/reactos/sdk/lib/conutils/conutils.c [iso-8859-1] Thu Oct 6
14:20:16 2016
@@ -18,27 +18,28 @@
/** NOTE: Experimental! Don't use USE_CRT yet because output to console is a
bit broken **/
// #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
#ifdef USE_CRT
#include <fcntl.h>
#include <io.h>
-#endif /* defined(USE_CRT) */
+#endif /* USE_CRT */
#include <windef.h>
#include <winbase.h>
-
#include <winnls.h>
#include <winuser.h> // MAKEINTRESOURCEW, RT_STRING
-
#include <wincon.h> // Console APIs (only if kernel32 support included)
-
-#include "conutils.h"
#include <strsafe.h>
/* PSEH for SEH Support */
#include <pseh/pseh2.h>
+#include "conutils.h"
// #define RC_STRING_MAX_SIZE 4096
// #define MAX_BUFFER_SIZE 4096
