[spetreolle] 69813: [PARTINFO][ARP] Arch, manual define of UNICODE/_UNICODE is a call for trouble.

Author: spetreolle
Date: Wed Nov  4 21:19:45 2015
New Revision: 69813

URL: http://svn.reactos.org/svn/reactos?rev=69813&view=rev
Log:
[PARTINFO][ARP]
Arch, manual define of UNICODE/_UNICODE is a call for trouble.

Modified:
    trunk/reactos/base/applications/network/arp/CMakeLists.txt
    trunk/reactos/base/applications/network/arp/arp.c
    trunk/rosapps/applications/sysutils/utils/partinfo/partinfo.c

Modified: trunk/reactos/base/applications/network/arp/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/a...
==============================================================================
--- trunk/reactos/base/applications/network/arp/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/arp/CMakeLists.txt	[iso-8859-1] Wed Nov  4 21:19:45 2015
@@ -1,5 +1,5 @@

add_executable(arp arp.c arp.rc)
-set_module_type(arp win32cui)
+set_module_type(arp win32cui ANSI)
 add_importlibs(arp iphlpapi ws2_32 shlwapi msvcrt kernel32)
 add_cd_file(TARGET arp DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/base/applications/network/arp/arp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/a...
==============================================================================
--- trunk/reactos/base/applications/network/arp/arp.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/arp/arp.c	[iso-8859-1] Wed Nov  4 21:19:45 2015
@@ -38,9 +38,6 @@
 #define _INC_WINDOWS
 #include <winsock2.h>
 #include <iphlpapi.h>
-
-#define UNICODE
-#define _UNICODE

/*
  * Globals

Modified: trunk/rosapps/applications/sysutils/utils/partinfo/partinfo.c
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/utils...
==============================================================================
--- trunk/rosapps/applications/sysutils/utils/partinfo/partinfo.c	[iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/utils/partinfo/partinfo.c	[iso-8859-1] Wed Nov  4 21:19:45 2015
@@ -10,7 +10,6 @@

//#define DUMP_DATA
 #define DUMP_SIZE_INFO
-#define UNICODE

#ifdef DUMP_DATA
 void HexDump(char *buffer, ULONG size)
@@ -116,7 +115,7 @@
   sprintf(DriveName, "\\.\PHYSICALDRIVE%lu", ulDrive);

/* Open drive */
-  hDisk = CreateFile(DriveName,
+  hDisk = CreateFileA(DriveName,
    	     GENERIC_READ,
    	     FILE_SHARE_READ | FILE_SHARE_WRITE,
    	     NULL,