[PARTINFO][ARP]

Arch, manual define of UNICODE/_UNICODE is a call for trouble.

svn path=/trunk/; revision=69813

diff --git a/reactos/base/applications/network/arp/CMakeLists.txt b/reactos/base/applications/network/arp/CMakeLists.txt
index 7f86c4c..ad2c177 100644 (file)
--- a/reactos/base/applications/network/arp/CMakeLists.txt
+++ b/reactos/base/applications/network/arp/CMakeLists.txt
@@ -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)

diff --git a/reactos/base/applications/network/arp/arp.c b/reactos/base/applications/network/arp/arp.c
index 1be6f18..55576fc 100644 (file)
--- a/reactos/base/applications/network/arp/arp.c
+++ b/reactos/base/applications/network/arp/arp.c
@@ -39,9 +39,6 @@
 #include <winsock2.h>
 #include <iphlpapi.h>
 
-#define UNICODE
-#define _UNICODE
-
 /*
  * Globals
  */

diff --git a/rosapps/applications/sysutils/utils/partinfo/partinfo.c b/rosapps/applications/sysutils/utils/partinfo/partinfo.c
index 92205e4..aebb04a 100644 (file)
--- a/rosapps/applications/sysutils/utils/partinfo/partinfo.c
+++ b/rosapps/applications/sysutils/utils/partinfo/partinfo.c
@@ -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 @@ int main (int argc, char *argv[])
   sprintf(DriveName, "\\\\.\\PHYSICALDRIVE%lu", ulDrive);
 
   /* Open drive */
-  hDisk = CreateFile(DriveName,
+  hDisk = CreateFileA(DriveName,
                     GENERIC_READ,
                     FILE_SHARE_READ | FILE_SHARE_WRITE,
                     NULL,